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.

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

feat: cosmos v0.47 upgrade #2039

Merged
merged 77 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 69 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
faf57e9
Remove unused params from fungible module
skosito Apr 9, 2024
39d8eeb
Make generate
skosito Apr 9, 2024
ec1cbec
Changelog
skosito Apr 9, 2024
697395e
Lint fix
skosito Apr 9, 2024
3ad1bc3
Lint fix
skosito Apr 9, 2024
5b7e6ca
Migrate emissions params to store
skosito Apr 10, 2024
c4a7328
Migrate observer params to its own store
skosito Apr 11, 2024
59326cb
Merge branch 'remove-broadcastmode-block' into params-upgrade
skosito Apr 11, 2024
c3e0ce6
Make generate
skosito Apr 11, 2024
5c311a8
Changelog
skosito Apr 11, 2024
cdbd412
Lint fixes
skosito Apr 11, 2024
c185179
Add observer slash amount param to migrate script
skosito Apr 11, 2024
d32aa34
Fix tests
skosito Apr 11, 2024
dbfb052
Lint fixes
skosito Apr 11, 2024
6aad8db
Fixes
skosito Apr 11, 2024
90d99d3
Lint fixes
skosito Apr 11, 2024
e146fc5
Fixes
skosito Apr 11, 2024
6eb076b
Tests
skosito Apr 11, 2024
4edfbd0
Small cleanup
skosito Apr 11, 2024
54c26d0
Try upgrade with simapp change
skosito Apr 11, 2024
dc97a25
Remove not needed params store mock
skosito Apr 12, 2024
802e51b
fix compile errors
skosito Apr 15, 2024
b306a42
proto changes
skosito Apr 16, 2024
a7f8db7
Fixes
skosito Apr 16, 2024
e69aaa5
Upgrade handler changes
skosito Apr 16, 2024
821c027
Fixes
skosito Apr 17, 2024
d04c043
Merge branch 'remove-broadcastmode-block' into params-upgrade
skosito Apr 17, 2024
b8565ce
Fix e2e test
skosito Apr 17, 2024
5666209
Merge branch 'feat-cosmos-sdk-0.47.10-upgrade' into params-upgrade
skosito Apr 18, 2024
2c84db6
Fixes after merge
skosito Apr 18, 2024
575a12c
Add found flag to get params method
skosito Apr 18, 2024
e63b4c0
Move ballot maturity blocks param to emissions module
skosito Apr 18, 2024
69aaadc
Remove params from observer module
skosito Apr 19, 2024
8231e45
Fix build
skosito Apr 19, 2024
b4df472
Merge branch 'params-upgrade' into cosmos-v0.47-upgrade
skosito Apr 19, 2024
40330c5
Regen proto
skosito Apr 19, 2024
be591fe
Fixes for e2e tests
skosito Apr 19, 2024
7e86f63
Fix some unit tests
skosito Apr 19, 2024
a43eb77
Fix some lint errors
skosito Apr 19, 2024
cab4dc1
Fix more unit tests
skosito Apr 19, 2024
1d706fc
PR comments
skosito Apr 19, 2024
b2896d9
Merge branch 'params-upgrade' into cosmos-v0.47-upgrade
skosito Apr 19, 2024
b20ff73
Proto paths fixes
skosito Apr 19, 2024
3d7e7c0
Linters
skosito Apr 19, 2024
167b5e5
make typescript
skosito Apr 19, 2024
ecff4b1
proto format
skosito Apr 19, 2024
30f9867
make specs
skosito Apr 19, 2024
16e15c7
make docs
skosito Apr 19, 2024
81e6868
make gen
skosito Apr 19, 2024
9a7743a
lint
skosito Apr 19, 2024
38f0d64
Fix some unit tests
skosito Apr 19, 2024
caeef08
Fix cli test suites
skosito Apr 20, 2024
c0fd32a
Fix lints
skosito Apr 20, 2024
8d98448
Tmp comment unit test
skosito Apr 20, 2024
28abd7c
lint
skosito Apr 20, 2024
eb76373
Use latest ethermint change and fix test
skosito Apr 20, 2024
309745d
PR comment
skosito Apr 22, 2024
3b4d35c
Merge branch 'params-upgrade' into cosmos-v0.47-upgrade
skosito Apr 22, 2024
700fb8d
PR comments
skosito Apr 22, 2024
4966fa5
Fix one more import
skosito Apr 22, 2024
3eb285b
Cleanup
skosito Apr 22, 2024
897501a
Lint fix
skosito Apr 22, 2024
9285663
Merge branch 'params-upgrade' into cosmos-v0.47-upgrade
skosito Apr 22, 2024
7918ddc
Bump zetachain ethermint
skosito Apr 23, 2024
eb4b62c
Remove cometbft replace
skosito Apr 23, 2024
4a8fee0
go mod tidy
skosito Apr 23, 2024
f376b74
bump ethermint
skosito Apr 23, 2024
b1f4ef1
Revert replace
skosito Apr 23, 2024
a6baf2e
Bump ethermint
skosito Apr 23, 2024
0c679ff
Merge branch 'feat-cosmos-sdk-0.47.10-upgrade' into cosmos-v0.47-upgrade
skosito Apr 26, 2024
fbe40f5
Proto files updates after merge
skosito Apr 26, 2024
70eec6f
Make generate
skosito Apr 26, 2024
79a7d2e
Bump ethermint
skosito Apr 26, 2024
0d7c4b8
Fix PR comments
skosito Apr 26, 2024
49802da
Formatting
skosito Apr 26, 2024
6aa34c5
Mention observer params removal in breaking changes in changelog
skosito Apr 29, 2024
519fb01
bump ethermint
skosito Apr 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -142,21 +142,21 @@ gosec:
### Generation commands ###
###############################################################################

proto:
@echo "--> Removing old Go types "
@find . -name '*.pb.go' -type f -delete
@echo "--> Generating new Go types from protocol buffer files"
@bash ./scripts/protoc-gen-go.sh
@buf format -w
.PHONY: proto

typescript:
@echo "--> Generating TypeScript bindings"
@bash ./scripts/protoc-gen-typescript.sh
.PHONY: typescript

protoVer=0.13.0
skosito marked this conversation as resolved.
Show resolved Hide resolved
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

proto-gen:
@echo "Generating Protobuf files"
@$(protoImage) sh ./scripts/protoc-gen-go.sh

proto-format:
@bash ./scripts/proto-format.sh
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;

openapi:
@echo "--> Generating OpenAPI specs"
Expand Down
2 changes: 1 addition & 1 deletion app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"runtime/debug"

errorsmod "cosmossdk.io/errors"
tmlog "github.com/cometbft/cometbft/libs/log"
sdk "github.com/cosmos/cosmos-sdk/types"
errortypes "github.com/cosmos/cosmos-sdk/types/errors"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/authz"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
tmlog "github.com/tendermint/tendermint/libs/log"
cctxtypes "github.com/zeta-chain/zetacore/x/crosschain/types"
observertypes "github.com/zeta-chain/zetacore/x/observer/types"
)
Expand Down
4 changes: 2 additions & 2 deletions app/ante/handler_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
ethante "github.com/evmos/ethermint/app/ante"
ethermint "github.com/evmos/ethermint/types"
evmtypes "github.com/evmos/ethermint/x/evm/types"
Expand Down
6 changes: 3 additions & 3 deletions app/ante/vesting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/cosmos/cosmos-sdk/simapp/helpers"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
vesting "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand Down Expand Up @@ -73,14 +73,14 @@ func TestVesting_AnteHandle(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tx, err := helpers.GenSignedMockTx(
tx, err := simtestutil.GenSignedMockTx(
rand.New(rand.NewSource(time.Now().UnixNano())),
txConfig,
[]sdk.Msg{
tt.msg,
},
sdk.NewCoins(),
helpers.DefaultGenTxGas,
simtestutil.DefaultGenTxGas,
"testing-chain-id",
[]uint64{0},
[]uint64{0},
Expand Down
Loading
Loading