Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release v7.5.0-rc1 #631

Merged
merged 3 commits into from
Aug 8, 2024
Merged

chore: release v7.5.0-rc1 #631

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3f8fa1
chore: release v7.5.0-rc1
zakir-code Aug 8, 2024
b50587e
fix(631): Dockerfile (#632)
zakir-code Aug 8, 2024
19a62b4
chore(631): update change log (#633)
zakir-code Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions cmd/doctor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 4 additions & 26 deletions cosmovisor.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -39,23 +28,12 @@ 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/genesis /root/.fxcore/cosmovisor/genesis
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
COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.4.x/bin/fxcored
COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.5.x/bin/fxcored

RUN cosmovisor init /root/.fxcore/cosmovisor/genesis/bin/fxcored

Expand Down
14 changes: 3 additions & 11 deletions cosmovisor_lite.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -32,15 +28,11 @@ 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
COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.4.x/bin/fxcored
COPY --from=builder /app/build/bin/fxcored /root/.fxcore/cosmovisor/upgrades/v7.5.x/bin/fxcored

RUN cosmovisor init /root/.fxcore/cosmovisor/upgrades/v6.0.x/bin/fxcored

Expand Down
1 change: 1 addition & 0 deletions types/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Loading