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

protoVer=v0.2
protoImageName=tendermintdev/sdk-proto-gen:$(protoVer)
protoVer=0.11.0
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
containerProtoGen=$(PROJECT_NAME)-proto-gen-$(protoVer)
containerProtoGenAny=$(PROJECT_NAME)-proto-gen-any-$(protoVer)
containerProtoGenSwagger=$(PROJECT_NAME)-proto-gen-swagger-$(protoVer)
Expand Down
2 changes: 1 addition & 1 deletion app/ante/ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
sdkmath "cosmossdk.io/math"
kmultisig "github.com/cosmos/cosmos-sdk/crypto/keys/multisig"

"cosmossdk.io/simapp"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
"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 Down
8 changes: 4 additions & 4 deletions app/ante/eth.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (

sdkmath "cosmossdk.io/math"

storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
Expand Down Expand Up @@ -520,9 +519,10 @@ func (esc EthSetupContextDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simul
}

// We need to setup an empty gas config so that the gas is consistent with Ethereum.
newCtx = ctx.WithGasMeter(sdk.NewInfiniteGasMeter()).
WithKVGasConfig(storetypes.GasConfig{}).
itsdevbear marked this conversation as resolved.
Show resolved Hide resolved
WithTransientKVGasConfig(storetypes.GasConfig{})
newCtx = ctx.WithGasMeter(sdk.NewInfiniteGasMeter())
//todo: fix .
// WithKVGasConfig(storetypes.GasConfig{}).
// WithTransientKVGasConfig(storetypes.GasConfig{})

// Reset transient gas used to prepare the execution of current cosmos tx.
// Transient gas-used is necessary to sum the gas-used of cosmos tx, when it contains multiple eth msgs.
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 @@ -8,8 +8,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 @@ -22,13 +22,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