chore(go/mod): bump go-ethereum (#1023)

`go: upgraded github.com/ethereum/go-ethereum v1.14.0 => v1.14.2` Also update geth genesis difficulty to 0 as per [geth PR](ethereum/go-ethereum#29579). task: none
omni-network · May 9, 2024 · 2833c7f · 2833c7f
1 parent 39c0a71
commit 2833c7f
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 23 deletions.
diff --git a/e2e/app/geth/types.go b/e2e/app/geth/types.go
@@ -14,7 +14,7 @@ import (
 )
 
 // Version defines the geth version deployed to all networks.
-const Version = "v1.14.0"
+const Version = "v1.14.2"
 
 // Config is the configurable options for the standard omni geth config.
 type Config struct {

diff --git a/e2e/docker/testdata/TestComposeTemplate_commit_no_explorer.golden b/e2e/docker/testdata/TestComposeTemplate_commit_no_explorer.golden
@@ -77,7 +77,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./omni_evm_0:/geth
@@ -88,7 +88,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden b/e2e/docker/testdata/TestComposeTemplate_empheral_network.golden
@@ -77,7 +77,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./omni_evm_0:/geth
@@ -88,7 +88,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/docker/testdata/TestComposeTemplate_main_explorer.golden b/e2e/docker/testdata/TestComposeTemplate_main_explorer.golden
@@ -77,7 +77,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./omni_evm_0:/geth
@@ -88,7 +88,7 @@ services:
     labels:
       e2e: true
     container_name: omni_evm_0
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/vmcompose/testdata/TestSetup_127_0_0_1_compose.yaml.golden b/e2e/vmcompose/testdata/TestSetup_127_0_0_1_compose.yaml.golden
@@ -32,7 +32,7 @@ services:
     labels:
       e2e: true
     container_name: validator01_evm-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./validator01_evm:/geth
@@ -43,7 +43,7 @@ services:
     labels:
       e2e: true
     container_name: validator01_evm
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/vmcompose/testdata/TestSetup_127_0_0_2_compose.yaml.golden b/e2e/vmcompose/testdata/TestSetup_127_0_0_2_compose.yaml.golden
@@ -32,7 +32,7 @@ services:
     labels:
       e2e: true
     container_name: validator02_evm-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./validator02_evm:/geth
@@ -43,7 +43,7 @@ services:
     labels:
       e2e: true
     container_name: validator02_evm
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/vmcompose/testdata/TestSetup_127_0_0_4_compose.yaml.golden b/e2e/vmcompose/testdata/TestSetup_127_0_0_4_compose.yaml.golden
@@ -32,7 +32,7 @@ services:
     labels:
       e2e: true
     container_name: seed01_evm-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./seed01_evm:/geth
@@ -43,7 +43,7 @@ services:
     labels:
       e2e: true
     container_name: seed01_evm
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/e2e/vmcompose/testdata/TestSetup_127_0_0_5_compose.yaml.golden b/e2e/vmcompose/testdata/TestSetup_127_0_0_5_compose.yaml.golden
@@ -32,7 +32,7 @@ services:
     labels:
       e2e: true
     container_name: fullnode01_evm-init
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command: --state.scheme=path --datadir=/geth init /geth/genesis.json
     volumes:
       - ./fullnode01_evm:/geth
@@ -43,7 +43,7 @@ services:
     labels:
       e2e: true
     container_name: fullnode01_evm
-    image: "ethereum/client-go:v1.14.0"
+    image: "ethereum/client-go:v1.14.2"
     command:
       - --config=/geth/config.toml
       # Flags not available via config.toml

diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.50.6
 	github.com/cosmos/gogoproto v1.4.12
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
-	github.com/ethereum/go-ethereum v1.14.0
+	github.com/ethereum/go-ethereum v1.14.2
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/go-cmp v0.6.0
 	github.com/google/gofuzz v1.2.0

diff --git a/go.sum b/go.sum
@@ -307,8 +307,8 @@ github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU
 github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew=
 github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
 github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
-github.com/ethereum/go-ethereum v1.14.0 h1:xRWC5NlB6g1x7vNy4HDBLuqVNbtLrc7v8S6+Uxim1LU=
-github.com/ethereum/go-ethereum v1.14.0/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8=
+github.com/ethereum/go-ethereum v1.14.2 h1:3ketymsXTLiXmtnCrXab/EUsV+X8KhwUqv572TriDaU=
+github.com/ethereum/go-ethereum v1.14.2/go.mod h1:1STrq471D0BQbCX9He0hUj4bHxX2k6mt5nOQJhDNOJ8=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=

diff --git a/halo/evmengine/keeper/abci_internal_test.go b/halo/evmengine/keeper/abci_internal_test.go
@@ -551,7 +551,7 @@ func (m *mockEngineAPI) nextBlock(t *testing.T, height uint64, timestamp uint64,
 	header.MixDigest = parentHash
 
 	// Convert header to block
-	block := types.NewBlock(&header, nil, nil, nil, trie.NewStackTrie(nil))
+	block := types.NewBlock(&header, nil, nil, trie.NewStackTrie(nil))
 
 	// Convert block to payload
 	env := eengine.BlockToExecutableData(block, big.NewInt(0), nil)

diff --git a/halo/genutil/evm/evm.go b/halo/genutil/evm/evm.go
@@ -45,7 +45,7 @@ func MakeGenesis(network netconf.ID) (core.Genesis, error) {
 		Config:     defaultChainConfig(network),
 		GasLimit:   miner.DefaultConfig.GasCeil,
 		BaseFee:    big.NewInt(params.InitialBaseFee),
-		Difficulty: big.NewInt(1),
+		Difficulty: big.NewInt(0),
 		Alloc:      allocs,
 	}, nil
 }

diff --git a/halo/genutil/evm/testdata/TestMakeGenesis.golden b/halo/genutil/evm/testdata/TestMakeGenesis.golden
@@ -23,7 +23,7 @@
  "timestamp": "0x0",
  "extraData": "0x",
  "gasLimit": "0x1c9c380",
- "difficulty": "0x1",
+ "difficulty": "0x0",
  "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
  "coinbase": "0x0000000000000000000000000000000000000000",
  "alloc": {

diff --git a/lib/ethclient/enginemock.go b/lib/ethclient/enginemock.go
@@ -289,7 +289,7 @@ func makePayload(fuzzer *fuzz.Fuzzer, height uint64, timestamp uint64, parentHas
 	header.Coinbase = feeRecipient // this corresponds to SuggestedFeeRecipient field in PayloadAttributes
 
 	// Convert header to block
-	block := types.NewBlock(&header, nil, nil, nil, trie.NewStackTrie(nil))
+	block := types.NewBlock(&header, nil, nil, trie.NewStackTrie(nil))
 
 	// Convert block to payload
 	env := engine.BlockToExecutableData(block, big.NewInt(0), nil)

diff --git a/lib/ethclient/fuzz.go b/lib/ethclient/fuzz.go
@@ -33,7 +33,7 @@ func NewFuzzer(seed int64) *fuzz.Fuzzer {
 			var header types.Header
 			c.Fuzz(&header)
 
-			block := types.NewBlock(&header, nil, nil, nil, trie.NewStackTrie(nil))
+			block := types.NewBlock(&header, nil, nil, trie.NewStackTrie(nil))
 
 			*b = *block //nolint:govet // Copy lock isn't a problem since we are creating a new object.
 		},