From c96a07e1d5de74768e287d9a994c9fb84e072a2c Mon Sep 17 00:00:00 2001 From: Aman Sanghi Date: Mon, 15 Jul 2024 15:46:08 +0530 Subject: [PATCH 1/5] Merge v1.13.13 --- go-ethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-ethereum b/go-ethereum index e35bf9cdd3..90b36cf0b8 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit e35bf9cdd3d02034ac1be34a479d101f12012ba6 +Subproject commit 90b36cf0b87b96e0a74acf91d9603b341d8165d4 From df164cd61630de5e483fee1e5fbca6aa8c2f34f0 Mon Sep 17 00:00:00 2001 From: Aman Sanghi Date: Mon, 15 Jul 2024 15:48:52 +0530 Subject: [PATCH 2/5] update module --- go-ethereum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-ethereum b/go-ethereum index 90b36cf0b8..7c6e05f753 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit 90b36cf0b87b96e0a74acf91d9603b341d8165d4 +Subproject commit 7c6e05f75337d59562a6e2b8e1bdf1e445ad14fb From 47bfc4c1c60840bd3516ab0aeee731759801f798 Mon Sep 17 00:00:00 2001 From: Aman Sanghi Date: Mon, 15 Jul 2024 16:09:04 +0530 Subject: [PATCH 3/5] update import --- cmd/staterecovery/staterecovery.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/staterecovery/staterecovery.go b/cmd/staterecovery/staterecovery.go index 58ad06ad14..a7de58b2c9 100644 --- a/cmd/staterecovery/staterecovery.go +++ b/cmd/staterecovery/staterecovery.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" + "github.com/ethereum/go-ethereum/triedb/hashdb" ) func RecreateMissingStates(chainDb ethdb.Database, bc *core.BlockChain, cacheConfig *core.CacheConfig, startBlock uint64) error { From 3942bc500dcd61a110332cbc08fb59614c98b818 Mon Sep 17 00:00:00 2001 From: Aman Sanghi Date: Mon, 15 Jul 2024 17:03:36 +0530 Subject: [PATCH 4/5] fix --- cmd/staterecovery/staterecovery.go | 4 ++-- go.mod | 4 ++-- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/staterecovery/staterecovery.go b/cmd/staterecovery/staterecovery.go index a7de58b2c9..19ed51ef2d 100644 --- a/cmd/staterecovery/staterecovery.go +++ b/cmd/staterecovery/staterecovery.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" + "github.com/ethereum/go-ethereum/triedb" "github.com/ethereum/go-ethereum/triedb/hashdb" ) @@ -32,7 +32,7 @@ func RecreateMissingStates(chainDb ethdb.Database, bc *core.BlockChain, cacheCon } hashConfig := *hashdb.Defaults hashConfig.CleanCacheSize = cacheConfig.TrieCleanLimit * 1024 * 1024 - trieConfig := &trie.Config{ + trieConfig := &triedb.Config{ Preimages: false, HashDB: &hashConfig, } diff --git a/go.mod b/go.mod index 00cee1a99a..d0c8d5e719 100644 --- a/go.mod +++ b/go.mod @@ -118,7 +118,7 @@ require ( github.com/graph-gophers/graphql-go v1.3.0 // indirect github.com/h2non/filetype v1.0.6 // indirect github.com/hashicorp/go-bexpr v0.1.10 // indirect - github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect + github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect github.com/holiman/bloomfilter/v2 v2.0.3 // indirect github.com/huin/goupnp v1.3.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect @@ -162,7 +162,7 @@ require ( go.opencensus.io v0.22.5 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.21.0 // indirect - golang.org/x/sync v0.5.0 // indirect + golang.org/x/sync v0.5.0 golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/protobuf v1.30.0 // indirect diff --git a/go.sum b/go.sum index 8676c270c4..ff4726b22f 100644 --- a/go.sum +++ b/go.sum @@ -420,8 +420,8 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw= -github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4= +github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= From 74da3216fa1430c74e617a6498a83e728f2943df Mon Sep 17 00:00:00 2001 From: Aman Sanghi Date: Mon, 15 Jul 2024 17:22:47 +0530 Subject: [PATCH 5/5] fix --- system_tests/test_info.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/system_tests/test_info.go b/system_tests/test_info.go index 764a8ae396..ee84564bdc 100644 --- a/system_tests/test_info.go +++ b/system_tests/test_info.go @@ -16,7 +16,6 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" @@ -110,8 +109,8 @@ func (b *BlockchainTestInfo) GenerateGenesisAccount(name string, balance *big.In }) } -func (b *BlockchainTestInfo) GetGenesisAlloc() core.GenesisAlloc { - alloc := make(core.GenesisAlloc) +func (b *BlockchainTestInfo) GetGenesisAlloc() types.GenesisAlloc { + alloc := make(types.GenesisAlloc) for _, info := range b.ArbInitData.Accounts { var contractCode []byte contractStorage := make(map[common.Hash]common.Hash) @@ -121,7 +120,7 @@ func (b *BlockchainTestInfo) GetGenesisAlloc() core.GenesisAlloc { contractStorage[k] = v } } - alloc[info.Addr] = core.GenesisAccount{ + alloc[info.Addr] = types.Account{ Balance: new(big.Int).Set(info.EthBalance), Nonce: info.Nonce, Code: contractCode,