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

sync: sync master back to develop #412

Merged
merged 6 commits into from
Mar 14, 2024
Merged

sync: sync master back to develop #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef1f7f0
Merge pull request #399 from bnb-chain/develop
alexgao001 Feb 21, 2024
fc25bc2
fix: sync failed from genesis
j75689 Mar 7, 2024
63dcefe
ci: add failfast to go test
j75689 Mar 7, 2024
74c1626
Merge pull request #401 from j75689/fix/sync_from_genesis
j75689 Mar 7, 2024
bc07b42
set Pawnee upgrade time
alexgao001 Mar 13, 2024
bf28a18
Merge pull request #402 from alexgao001/v1.5.0
alexgao001 Mar 13, 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
8 changes: 4 additions & 4 deletions tests/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
test-integration:
go test ./integration/... -timeout 30m
go test -failfast ./integration/... -timeout 30m

test-integration-cov:
go test ./integration/... -timeout 30m -coverpkg=../... -coverprofile=integration-profile.out -covermode=atomic
go test -failfast ./integration/... -timeout 30m -coverpkg=../... -coverprofile=integration-profile.out -covermode=atomic

test-e2e:
go test ./e2e/... -mod=readonly -timeout 30m -race -tags='e2e'
go test ./e2e/... -failfast -mod=readonly -timeout 30m -race -tags='e2e'

test-e2e-cov:
go test ./e2e/... -mod=readonly -timeout 30m -race -tags='e2e' -coverpkg=../... -coverprofile=e2e-profile.out -covermode=atomic
go test ./e2e/... -failfast -mod=readonly -timeout 30m -race -tags='e2e' -coverpkg=../... -coverprofile=e2e-profile.out -covermode=atomic
2 changes: 1 addition & 1 deletion x/upgrade/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ func (k Keeper) IsUpgraded(ctx sdk.Context, name string) bool {

// InitUpgraded execute the upgrade initializer that the upgrade is already applied.
func (k Keeper) InitUpgraded(ctx sdk.Context) error {
iter := storetypes.KVStorePrefixIterator(ctx.KVStore(k.storeKey), []byte{types.DoneByte})
iter := storetypes.KVStorePrefixIterator(ctx.KVStoreWithZeroRead(k.storeKey), []byte{types.DoneByte})
defer iter.Close()

for ; iter.Valid(); iter.Next() {
Expand Down
8 changes: 8 additions & 0 deletions x/upgrade/types/upgrade_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ var (
Name: Ural,
Height: 5347231,
Info: "Ural hardfork",
}).SetPlan(&Plan{
Name: Pawnee,
Height: 6239520,
Info: "Pawnee hardfork",
})

TestnetChainID = "greenfield_5600-1"
Expand Down Expand Up @@ -85,6 +89,10 @@ var (
Name: Ural,
Height: 5761391,
Info: "Ural hardfork",
}).SetPlan(&Plan{
Name: Pawnee,
Height: 6623127,
Info: "Pawnee hardfork",
})
)

Expand Down
Loading