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

Commit 4a6f4fd

Browse files
crypto-facsfedekunze
crypto-facs
and
fedekunze
authoredJul 8, 2022
imp(deps): Geth upgrade v1.10.19 (#1159)
* upgrade geth and fix build * add support for * update EIPs * fix keeper tests * update traceTx function with latest geth changes * remove unnecessary comments * fix tests * update proto * add migrations * update module version * fix grpc test * fix lint * fix lint * update changelog * fix typo * remove unnecessary format logs * Update proto/ethermint/evm/v1/evm.proto Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com> * remove debug true on default * update comments * fixing ante tests * fixed cycle imports on migrate_test * fix wrong naming * update comment Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
·
v0.22.0v0.20.0-rc1
1 parent 4a66ff9 commit 4a6f4fd

23 files changed

+4512
-402
lines changed
 

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ Ref: https://keepachangelog.com/en/1.0.0/
3838

3939
## Unreleased
4040

41+
### State Machine Breaking
42+
* (deps) [\#1159](https://github.com/evmos/ethermint/pull/1159) Bump Geth version to `v1.10.19`.
43+
4144
### Improvements
4245

4346
* (feemarket) [\#1165](https://github.com/evmos/ethermint/pull/1165) Add hint in specs about different gas terminology for gas in Cosmos and Ethereum.

‎app/ante/utils_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ func (suite *AnteTestSuite) SetupTest() {
8181
maxInt := sdk.NewInt(math.MaxInt64)
8282
evmGenesis.Params.ChainConfig.LondonBlock = &maxInt
8383
evmGenesis.Params.ChainConfig.ArrowGlacierBlock = &maxInt
84-
evmGenesis.Params.ChainConfig.MergeForkBlock = &maxInt
84+
evmGenesis.Params.ChainConfig.GrayGlacierBlock = &maxInt
85+
evmGenesis.Params.ChainConfig.MergeNetsplitBlock = &maxInt
8586
}
8687
if suite.evmParamsOption != nil {
8788
suite.evmParamsOption(&evmGenesis.Params)

‎docs/api/proto-docs.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ instead of *big.Int.
182182
| `berlin_block` | [string](#string) | | Berlin switch block (nil = no fork, 0 = already on berlin) |
183183
| `london_block` | [string](#string) | | London switch block (nil = no fork, 0 = already on london) |
184184
| `arrow_glacier_block` | [string](#string) | | Eip-4345 (bomb delay) switch block (nil = no fork, 0 = already activated) |
185-
| `merge_fork_block` | [string](#string) | | EIP-3675 (TheMerge) switch block (nil = no fork, 0 = already in merge proceedings) |
185+
| `gray_glacier_block` | [string](#string) | | EIP-5133 (bomb delay) switch block (nil = no fork, 0 = already activated) |
186+
| `merge_netsplit_block` | [string](#string) | | Virtual fork after The Merge to use as a network splitter |
186187

187188

188189

‎go.mod

+10-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,12 @@ require (
1010
github.com/cosmos/go-bip39 v1.0.0
1111
github.com/cosmos/ibc-go/v3 v3.1.0
1212
github.com/davecgh/go-spew v1.1.1
13-
github.com/ethereum/go-ethereum v1.10.16
13+
github.com/ethereum/go-ethereum v1.10.19
1414
github.com/gogo/protobuf v1.3.3
1515
github.com/golang/protobuf v1.5.2
1616
github.com/gorilla/mux v1.8.0
1717
github.com/gorilla/websocket v1.5.0
1818
github.com/grpc-ecosystem/grpc-gateway v1.16.0
19-
github.com/holiman/uint256 v1.2.0
2019
github.com/improbable-eng/grpc-web v0.15.0
2120
github.com/miguelmota/go-ethereum-hdwallet v0.1.1
2221
github.com/onsi/ginkgo/v2 v2.1.4
@@ -34,7 +33,7 @@ require (
3433
github.com/tendermint/tm-db v0.6.7
3534
github.com/tyler-smith/go-bip39 v1.1.0
3635
golang.org/x/text v0.3.7
37-
google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad
36+
google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03
3837
google.golang.org/grpc v1.47.0
3938
google.golang.org/protobuf v1.28.0
4039
gopkg.in/yaml.v2 v2.4.0
@@ -50,6 +49,7 @@ require (
5049
github.com/Workiva/go-datastructures v1.0.53 // indirect
5150
github.com/beorn7/perks v1.0.1 // indirect
5251
github.com/bgentry/speakeasy v0.1.0 // indirect
52+
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
5353
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect
5454
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
5555
github.com/cespare/xxhash v1.1.0 // indirect
@@ -63,10 +63,13 @@ require (
6363
github.com/cosmos/ledger-go v0.9.2 // indirect
6464
github.com/danieljoos/wincred v1.0.2 // indirect
6565
github.com/deckarep/golang-set v1.8.0 // indirect
66+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
6667
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
6768
github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
6869
github.com/dgraph-io/ristretto v0.0.3 // indirect
6970
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
71+
github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91 // indirect
72+
github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf // indirect
7073
github.com/dustin/go-humanize v1.0.0 // indirect
7174
github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect
7275
github.com/edsrzf/mmap-go v1.0.0 // indirect
@@ -78,6 +81,7 @@ require (
7881
github.com/go-logfmt/logfmt v0.5.1 // indirect
7982
github.com/go-ole/go-ole v1.2.1 // indirect
8083
github.com/go-playground/validator/v10 v10.4.1 // indirect
84+
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
8185
github.com/go-stack/stack v1.8.0 // indirect
8286
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
8387
github.com/gogo/gateway v1.1.0 // indirect
@@ -95,7 +99,8 @@ require (
9599
github.com/hashicorp/hcl v1.0.0 // indirect
96100
github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect
97101
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
98-
github.com/huin/goupnp v1.0.2 // indirect
102+
github.com/holiman/uint256 v1.2.0 // indirect
103+
github.com/huin/goupnp v1.0.3 // indirect
99104
github.com/inconshreveable/mousetrap v1.0.0 // indirect
100105
github.com/jackpal/go-nat-pmp v1.0.2 // indirect
101106
github.com/jmhodges/levigo v1.0.0 // indirect
@@ -138,14 +143,13 @@ require (
138143
github.com/tklauser/numcpus v0.2.2 // indirect
139144
github.com/zondax/hid v0.9.0 // indirect
140145
go.etcd.io/bbolt v1.3.6 // indirect
141-
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
146+
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
142147
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
143148
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
144149
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
145150
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
146151
gopkg.in/ini.v1 v1.66.4 // indirect
147152
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
148-
gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6 // indirect
149153
gopkg.in/yaml.v3 v3.0.1 // indirect
150154
nhooyr.io/websocket v1.8.6 // indirect
151155
)

0 commit comments

Comments
 (0)
This repository has been archived.