diff --git a/CHANGELOG.md b/CHANGELOG.md index a3b19142..4b35d63a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change log +## [v7.5.0-rc1] + +* Fixed gov MsgServer unregistered + +--- + ## [v7.4.0-rc6] * Fixed nil consensus params in BeginBlock during migration diff --git a/cmd/doctor.go b/cmd/doctor.go index 8523cc90..32c9cbb3 100644 --- a/cmd/doctor.go +++ b/cmd/doctor.go @@ -317,6 +317,8 @@ func checkBlockchainData(bc blockchain, genesisId, privValidatorKeyFile string) fmt.Printf("%sVersion: V7.2\n", SPACE) } else if blockHeight < fxtypes.TestnetBlockHeightV74 { fmt.Printf("%sVersion: V7.3\n", SPACE) + } else if blockHeight < fxtypes.TestnetBlockHeightV75 { + fmt.Printf("%sVersion: V7.4\n", SPACE) } } return plan != nil, nil diff --git a/cosmovisor.Dockerfile b/cosmovisor.Dockerfile index d1a301e7..ac9f6d49 100644 --- a/cosmovisor.Dockerfile +++ b/cosmovisor.Dockerfile @@ -10,18 +10,7 @@ COPY . . RUN make build -FROM functionx/fx-core:1.1.4 as fxv1 -FROM functionx/fx-core:2.4.3 as fxv2 -FROM functionx/fx-core:3.1.2 as fxv3 -FROM functionx/fx-core:4.0.1-rc1 as fxv4 -FROM functionx/fx-core:4.1.1-rc0 as fxv4_1 -FROM functionx/fx-core:4.2.2 as fxv4_2 -FROM functionx/fx-core:5.0.0 as fxv5 -FROM functionx/fx-core:6.0.0 as fxv6 -FROM functionx/fx-core:7.0.1-rc0 as fxv7 -FROM functionx/fx-core:7.1.0-rc1 as fxv7_1 -FROM functionx/fx-core:7.2.0-rc2 as fxv7_2 -FROM functionx/fx-core:7.3.0-rc3 as fxv7_3 +FROM ghcr.io/functionx/fxcorevisor:7.4.0-rc6 as fxv7_4 FROM alpine:3.18 @@ -39,19 +28,7 @@ ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 ENV COSMOVISOR_DISABLE_LOGS=false ENV COSMOVISOR_COLOR_LOGS=true -# The copy directory needs to be changed in the next version -COPY --from=fxv1 /usr/bin/fxcored /root/.fxcore/cosmovisor/genesis/bin/fxcored -COPY --from=fxv2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/fxv2/bin/fxcored -COPY --from=fxv3 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/fxv3/bin/fxcored -COPY --from=fxv4 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/fxv4/bin/fxcored -COPY --from=fxv4_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v4.1.x/bin/fxcored -COPY --from=fxv4_2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v4.2.x/bin/fxcored -COPY --from=fxv5 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v5.0.x/bin/fxcored -COPY --from=fxv6 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v6.0.x/bin/fxcored -COPY --from=fxv7 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.0.x/bin/fxcored -COPY --from=fxv7_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.1.x/bin/fxcored -COPY --from=fxv7_2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.2.x/bin/fxcored -COPY --from=fxv7_3 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.3.x/bin/fxcored +COPY --from=fxv7_4 /root/.fxcore/cosmovisor/upgrades /root/.fxcore/cosmovisor/upgrades COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored diff --git a/cosmovisor_lite.Dockerfile b/cosmovisor_lite.Dockerfile index 8d7b4ca6..030c8527 100644 --- a/cosmovisor_lite.Dockerfile +++ b/cosmovisor_lite.Dockerfile @@ -10,11 +10,7 @@ COPY . . RUN make build -FROM functionx/fx-core:6.0.0 as fxv6 -FROM functionx/fx-core:7.0.1-rc0 as fxv7 -FROM functionx/fx-core:7.1.0-rc1 as fxv7_1 -FROM functionx/fx-core:7.2.0-rc2 as fxv7_2 -FROM functionx/fx-core:7.3.0-rc3 as fxv7_3 +FROM ghcr.io/functionx/fxcorevisor-lite:7.4.0-rc6 as fxv7_4 FROM alpine:3.18 @@ -32,11 +28,7 @@ ENV DAEMON_PREUPGRADE_MAX_RETRIES=3 ENV COSMOVISOR_DISABLE_LOGS=false ENV COSMOVISOR_COLOR_LOGS=true -COPY --from=fxv6 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v6.0.x/bin/fxcored -COPY --from=fxv7 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.0.x/bin/fxcored -COPY --from=fxv7_1 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.1.x/bin/fxcored -COPY --from=fxv7_2 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.2.x/bin/fxcored -COPY --from=fxv7_3 /usr/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.3.x/bin/fxcored +COPY --from=fxv7_4 /root/.fxcore/cosmovisor/upgrades /root/.fxcore/cosmovisor/upgrades COPY --from=builder /go/bin/cosmovisor /usr/bin/cosmovisor COPY --from=builder /app/build/bin/fxcored /usr/bin/fxcored diff --git a/types/version.go b/types/version.go index cd41f231..e3a315e2 100644 --- a/types/version.go +++ b/types/version.go @@ -38,6 +38,7 @@ const ( TestnetBlockHeightV72 = 14_389_000 // v7.2 TestnetBlockHeightV73 = 14_551_500 // v7.3 TestnetBlockHeightV74 = 15_614_000 // v7.4 + TestnetBlockHeightV75 = 15_660_500 // v7.5 ) var (