Skip to content

Commit 777f7b9

Browse files
tsaheetsahee
authored
Merge pull request #340 from OffchainLabs/merge-v1.13.13
[NIT-2670] Merge v1.13.13
2 parents 64d5c61 + 16eb694 commit 777f7b9

File tree

154 files changed

+1805
-1175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1805
-1175
lines changed

‎accounts/abi/bind/backends/simulated.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"context"
2121

2222
"github.com/ethereum/go-ethereum/common"
23-
"github.com/ethereum/go-ethereum/core"
23+
"github.com/ethereum/go-ethereum/core/types"
2424
"github.com/ethereum/go-ethereum/ethclient/simulated"
2525
)
2626

@@ -43,7 +43,7 @@ func (b *SimulatedBackend) Fork(ctx context.Context, parentHash common.Hash) err
4343
//
4444
// Deprecated: please use simulated.Backend from package
4545
// github.com/ethereum/go-ethereum/ethclient/simulated instead.
46-
func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
46+
func NewSimulatedBackend(alloc types.GenesisAlloc, gasLimit uint64) *SimulatedBackend {
4747
b := simulated.NewBackend(alloc, simulated.WithBlockGasLimit(gasLimit))
4848
return &SimulatedBackend{
4949
Backend: b,

‎accounts/abi/bind/bind_test.go

+50-50
Large diffs are not rendered by default.

‎accounts/abi/bind/util_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"github.com/ethereum/go-ethereum/accounts/abi/bind"
2727
"github.com/ethereum/go-ethereum/common"
28-
"github.com/ethereum/go-ethereum/core"
2928
"github.com/ethereum/go-ethereum/core/types"
3029
"github.com/ethereum/go-ethereum/crypto"
3130
"github.com/ethereum/go-ethereum/ethclient/simulated"
@@ -57,7 +56,7 @@ func TestWaitDeployed(t *testing.T) {
5756
t.Parallel()
5857
for name, test := range waitDeployedTests {
5958
backend := simulated.NewBackend(
60-
core.GenesisAlloc{
59+
types.GenesisAlloc{
6160
crypto.PubkeyToAddress(testKey.PublicKey): {Balance: big.NewInt(10000000000000000)},
6261
},
6362
)
@@ -102,7 +101,7 @@ func TestWaitDeployed(t *testing.T) {
102101

103102
func TestWaitDeployedCornerCases(t *testing.T) {
104103
backend := simulated.NewBackend(
105-
core.GenesisAlloc{
104+
types.GenesisAlloc{
106105
crypto.PubkeyToAddress(testKey.PublicKey): {Balance: big.NewInt(10000000000000000)},
107106
},
108107
)

‎accounts/usbwallet/trezor/trezor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
// This file contains the implementation for interacting with the Trezor hardware
1818
// wallets. The wire protocol spec can be found on the SatoshiLabs website:
19-
// https://wiki.trezor.io/Developers_guide-Message_Workflows
19+
// https://docs.trezor.io/trezor-firmware/common/message-workflows.html
2020

2121
// !!! STAHP !!!
2222
//

‎arbitrum/apibackend.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/ethereum/go-ethereum"
13-
"github.com/ethereum/go-ethereum/arbitrum_types"
14-
"github.com/ethereum/go-ethereum/eth"
15-
"github.com/ethereum/go-ethereum/eth/tracers"
16-
"github.com/ethereum/go-ethereum/log"
17-
"github.com/ethereum/go-ethereum/metrics"
18-
"github.com/ethereum/go-ethereum/trie"
19-
2013
"github.com/ethereum/go-ethereum/accounts"
14+
"github.com/ethereum/go-ethereum/arbitrum_types"
2115
"github.com/ethereum/go-ethereum/common"
2216
"github.com/ethereum/go-ethereum/consensus"
2317
"github.com/ethereum/go-ethereum/core"
@@ -27,12 +21,17 @@ import (
2721
"github.com/ethereum/go-ethereum/core/state/snapshot"
2822
"github.com/ethereum/go-ethereum/core/types"
2923
"github.com/ethereum/go-ethereum/core/vm"
24+
"github.com/ethereum/go-ethereum/eth"
3025
"github.com/ethereum/go-ethereum/eth/filters"
26+
"github.com/ethereum/go-ethereum/eth/tracers"
3127
"github.com/ethereum/go-ethereum/ethdb"
3228
"github.com/ethereum/go-ethereum/event"
3329
"github.com/ethereum/go-ethereum/internal/ethapi"
30+
"github.com/ethereum/go-ethereum/log"
31+
"github.com/ethereum/go-ethereum/metrics"
3432
"github.com/ethereum/go-ethereum/params"
3533
"github.com/ethereum/go-ethereum/rpc"
34+
"github.com/ethereum/go-ethereum/triedb"
3635
)
3736

3837
var (
@@ -494,7 +493,7 @@ func StateAndHeaderFromHeader(ctx context.Context, chainDb ethdb.Database, bc *c
494493
// note: triedb cleans cache is disabled in trie.HashDefaults
495494
// note: only states committed to diskdb can be found as we're creating new triedb
496495
// note: snapshots are not used here
497-
ephemeral := state.NewDatabaseWithConfig(chainDb, trie.HashDefaults)
496+
ephemeral := state.NewDatabaseWithConfig(chainDb, triedb.HashDefaults)
498497
lastState, lastHeader, lastStateRelease, err := FindLastAvailableState(ctx, bc, stateFor(ephemeral, nil), header, nil, maxRecreateStateDepth)
499498
if err != nil {
500499
return nil, nil, err

‎arbitrum/recordingdb.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/ethereum/go-ethereum/log"
2020
"github.com/ethereum/go-ethereum/metrics"
2121
"github.com/ethereum/go-ethereum/rlp"
22-
"github.com/ethereum/go-ethereum/trie"
23-
"github.com/ethereum/go-ethereum/trie/triedb/hashdb"
22+
"github.com/ethereum/go-ethereum/triedb"
23+
"github.com/ethereum/go-ethereum/triedb/hashdb"
2424
flag "github.com/spf13/pflag"
2525
)
2626

@@ -30,13 +30,13 @@ var (
3030
)
3131

3232
type RecordingKV struct {
33-
inner *trie.Database
33+
inner *triedb.Database
3434
diskDb ethdb.KeyValueStore
3535
readDbEntries map[common.Hash][]byte
3636
enableBypass bool
3737
}
3838

39-
func newRecordingKV(inner *trie.Database, diskDb ethdb.KeyValueStore) *RecordingKV {
39+
func newRecordingKV(inner *triedb.Database, diskDb ethdb.KeyValueStore) *RecordingKV {
4040
return &RecordingKV{inner, diskDb, make(map[common.Hash][]byte), false}
4141
}
4242

@@ -184,7 +184,7 @@ type RecordingDatabase struct {
184184
func NewRecordingDatabase(config *RecordingDatabaseConfig, ethdb ethdb.Database, blockchain *core.BlockChain) *RecordingDatabase {
185185
hashConfig := *hashdb.Defaults
186186
hashConfig.CleanCacheSize = config.TrieCleanCache
187-
trieConfig := trie.Config{
187+
trieConfig := triedb.Config{
188188
Preimages: false,
189189
HashDB: &hashConfig,
190190
}

‎beacon/engine/types.go

+18
Original file line numberDiff line numberDiff line change
@@ -303,3 +303,21 @@ type ExecutionPayloadBodyV1 struct {
303303
TransactionData []hexutil.Bytes `json:"transactions"`
304304
Withdrawals []*types.Withdrawal `json:"withdrawals"`
305305
}
306+
307+
// Client identifiers to support ClientVersionV1.
308+
const (
309+
ClientCode = "GE"
310+
ClientName = "go-ethereum"
311+
)
312+
313+
// ClientVersionV1 contains information which identifies a client implementation.
314+
type ClientVersionV1 struct {
315+
Code string `json:"code"`
316+
Name string `json:"clientName"`
317+
Version string `json:"version"`
318+
Commit string `json:"commit"`
319+
}
320+
321+
func (v *ClientVersionV1) String() string {
322+
return fmt.Sprintf("%s-%s-%s-%s", v.Code, v.Name, v.Version, v.Commit)
323+
}

‎build/checksums.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# This file contains sha256 checksums of optional build dependencies.
22

3-
# version:spec-tests 1.0.6
3+
# version:spec-tests 2.1.0
44
# https://github.com/ethereum/execution-spec-tests/releases
5-
# https://github.com/ethereum/execution-spec-tests/releases/download/v1.0.6/
6-
485af7b66cf41eb3a8c1bd46632913b8eb95995df867cf665617bbc9b4beedd1 fixtures_develop.tar.gz
5+
# https://github.com/ethereum/execution-spec-tests/releases/download/v2.1.0/
6+
ca89c76851b0900bfcc3cbb9a26cbece1f3d7c64a3bed38723e914713290df6c fixtures_develop.tar.gz
77

88
# version:golang 1.21.6
99
# https://go.dev/dl/

‎build/ci.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,13 @@ var (
121121
// Note: vivid is unsupported because there is no golang-1.6 package for it.
122122
// Note: the following Ubuntu releases have been officially deprecated on Launchpad:
123123
// wily, yakkety, zesty, artful, cosmic, disco, eoan, groovy, hirsuite, impish,
124-
// kinetic
124+
// kinetic, lunar
125125
debDistroGoBoots = map[string]string{
126126
"trusty": "golang-1.11", // 14.04, EOL: 04/2024
127127
"xenial": "golang-go", // 16.04, EOL: 04/2026
128128
"bionic": "golang-go", // 18.04, EOL: 04/2028
129129
"focal": "golang-go", // 20.04, EOL: 04/2030
130130
"jammy": "golang-go", // 22.04, EOL: 04/2032
131-
"lunar": "golang-go", // 23.04, EOL: 01/2024
132131
"mantic": "golang-go", // 23.10, EOL: 07/2024
133132
}
134133

0 commit comments

Comments
 (0)