Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Upgrade SDK to 0.47 #1465

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
448e0bf
builds
Nov 16, 2022
4d5e21a
update
Nov 16, 2022
643809c
fix export
Nov 16, 2022
10ffe30
fix validate genesis
Nov 16, 2022
8278761
Merge branch 'main' into setup-sdk-0.47
Nov 16, 2022
d8a6449
codec
Nov 16, 2022
801a0c5
reee
Nov 16, 2022
7c93ba6
transactions work now, just need to fix tests
Nov 16, 2022
bc81b4b
Merge branch 'main' into setup-sdk-0.47
Nov 16, 2022
f747c20
merge main
Nov 16, 2022
35c2522
fix 1559 test
Nov 16, 2022
79a8f9c
bump sdk and gas config fix
Nov 16, 2022
a3c16c4
fix BlockMaxGasFromConsensusParams
Nov 16, 2022
f215687
fix consensus params
Nov 16, 2022
2aa523b
fix gas test
Nov 16, 2022
d39b38f
undo param change
Nov 16, 2022
2c30f70
adjust proto gen
Nov 16, 2022
705e503
fix pruning, rosetta
Nov 16, 2022
b694dde
fix module authorities
Nov 16, 2022
1c7ee41
pruning
Nov 16, 2022
bfa0346
fix rpc tests
Nov 16, 2022
a7c12c0
fix todo in feemarket
Nov 16, 2022
f9441dd
reduce diff size
Nov 16, 2022
24bdbd2
fix buf
Nov 17, 2022
da2921b
Merge branch 'main' into setup-sdk-0.47
Nov 17, 2022
65dcb07
merge main
Nov 17, 2022
420c34f
Merge branch 'main' into setup-sdk-0.47
Nov 17, 2022
200c908
pause
Nov 20, 2022
bc73063
bingbong
Nov 20, 2022
c2d42f5
Merge branch 'main' into setup-sdk-0.47
Nov 21, 2022
54ef5e4
bing bong
Nov 21, 2022
b1cbc11
simple mempool
Nov 21, 2022
57ec9c5
woops
Nov 21, 2022
b1d2c54
test
Nov 21, 2022
933e725
fix txn issue
Nov 22, 2022
ea44a13
fix tests
Nov 22, 2022
00d6565
fix gas issue
Nov 22, 2022
5cb8eb3
rebase gas fix
Nov 22, 2022
d71cff4
remove gas fix
Nov 22, 2022
1413e35
Merge branch 'main' into setup-sdk-0.47
Nov 25, 2022
50867e4
Merge branch 'evmos:main' into main
Nov 25, 2022
e3c8b0e
Revert "fix gas issue"
Nov 25, 2022
d62be68
merge
Nov 25, 2022
8f50a98
merge main
Nov 25, 2022
1dfe2c0
Merge branch 'evmos:main' into main
Dec 1, 2022
71a1520
merge main
Dec 1, 2022
b32dbd3
remove more sim stuff
Dec 1, 2022
c0b499c
Merge branch 'evmos:main' into main
Dec 3, 2022
68ca466
push
Dec 3, 2022
6008fc0
remove artifacts
Dec 3, 2022
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ build, in which case we can fall back on `go mod tidy -v`.

## Protobuf

We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/gogo/protobuf) to generate code for use in Ethermint.
We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along with [gogoproto](https://github.com/cosmos/gogoproto) to generate code for use in Ethermint.

For determinstic behavior around Protobuf tooling, everything is containerized using Docker. Make sure to have Docker installed on your machine, or head to [Docker's website](https://docs.docker.com/get-docker/) to install it.

Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ tools-clean:

go.sum: go.mod
echo "Ensure dependencies have not been modified ..." >&2
go mod verify
go mod tidy

vulncheck: $(BUILDDIR)/
Expand Down Expand Up @@ -413,7 +412,7 @@ proto-all: proto-format proto-lint proto-gen

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


# TODO: Rethink API docs generation
Expand All @@ -432,7 +431,7 @@ proto-lint:

proto-check-breaking:
@echo "Checking Protobuf files for breaking changes"
$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
$(protoCosmosImage) buf breaking --against $(HTTPS_GIT)#branch=main


.PHONY: proto-all proto-gen proto-gen-any proto-format proto-lint proto-check-breaking
Expand Down
4 changes: 2 additions & 2 deletions app/ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256r1"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/types/tx/signing"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

Expand All @@ -30,6 +29,7 @@ import (
"github.com/evmos/ethermint/tests"
evmtypes "github.com/evmos/ethermint/x/evm/types"

moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
)
Expand Down Expand Up @@ -1291,7 +1291,7 @@ func (suite AnteTestSuite) TestAnteHandlerWithParams() {
func (suite *AnteTestSuite) TestConsumeSignatureVerificationGas() {
params := authtypes.DefaultParams()
msg := []byte{1, 2, 3, 4}
cdc := simapp.MakeTestEncodingConfig().Amino
cdc := moduletestutil.MakeTestEncodingConfig().Amino

p := authtypes.DefaultParams()
skR1, _ := secp256r1.GenPrivKey()
Expand Down
2 changes: 1 addition & 1 deletion app/ante/eip712.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
ibcante "github.com/cosmos/ibc-go/v5/modules/core/ante"
ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"

ethcrypto "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/crypto/secp256k1"
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 @@ -9,8 +9,8 @@ import (
authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

ibcante "github.com/cosmos/ibc-go/v5/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"

evmtypes "github.com/evmos/ethermint/x/evm/types"
)
Expand Down
2 changes: 1 addition & 1 deletion app/ante/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"

"cosmossdk.io/simapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/crypto/types/multisig"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
Expand Down
Loading