Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Geth 1.13 #2083

Merged
merged 8 commits into from
Jan 24, 2024
Merged

Geth 1.13 #2083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4570eef
update storage/database API to geth 1.13
tsahee Jan 18, 2024
50b340a
update txpool API for geth 1.13
tsahee Jan 18, 2024
dc3d8c9
upgate geth to 1.13
tsahee Jan 18, 2024
c71ba2d
Merge remote-tracking branch 'origin/master' into geth-1.13
tsahee Jan 22, 2024
189912a
update go.mod
tsahee Jan 22, 2024
89d5415
broadcastclient_test: avoid deadlock in test
tsahee Jan 24, 2024
f870d9d
Merge remote-tracking branch 'origin/master' into geth-1.13
tsahee Jan 24, 2024
18a47f7
update geth commit
tsahee Jan 24, 2024
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 arbnode/dataposter/storage_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func newLevelDBStorage(t *testing.T, encF storage.EncoderDecoderF) *dbstorage.St

func newPebbleDBStorage(t *testing.T, encF storage.EncoderDecoderF) *dbstorage.Storage {
t.Helper()
db, err := rawdb.NewPebbleDBDatabase(path.Join(t.TempDir(), "pebble.db"), 0, 0, "default", false)
db, err := rawdb.NewPebbleDBDatabase(path.Join(t.TempDir(), "pebble.db"), 0, 0, "default", false, true)
if err != nil {
t.Fatalf("NewPebbleDBDatabase() unexpected error: %v", err)
}
Expand Down
2 changes: 1 addition & 1 deletion arbos/arbosState/initialization_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ func checkAccounts(db *state.StateDB, arbState *ArbosState, accts []statetransfe
if !bytes.Equal(acct.ContractInfo.Code, db.GetCode(addr)) {
t.Fatal()
}
err := db.ForEachStorage(addr, func(key common.Hash, value common.Hash) bool {
err := state.ForEachStorage(db, addr, func(key common.Hash, value common.Hash) bool {
if key == (common.Hash{}) {
// Unfortunately, geth doesn't seem capable of giving us storage keys any more.
// Even with the triedb Preimages set to true, it doesn't record the necessary
Expand Down
16 changes: 15 additions & 1 deletion broadcastclient/broadcastclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,21 @@ func startMakeBroadcastClient(ctx context.Context, t *testing.T, clientConfig Co

go func() {
defer wg.Done()
defer broadcastClient.StopAndWait()
// drain messages so messages could be sent on ts.messageReceiver
defer func() {
clientDone := make(chan struct{})
go func() {
for {
select {
case <-ts.messageReceiver:
case <-clientDone:
return
}
}
}()
broadcastClient.StopAndWait()
close(clientDone)
}()
var timeout time.Duration
if expectedCount == 0 {
timeout = 1 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion go-ethereum
Open in desktop
Submodule go-ethereum updated 323 files
16 changes: 8 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.10
github.com/aws/aws-sdk-go-v2/service/s3 v1.26.9
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811
github.com/cockroachdb/pebble v0.0.0-20230906160148-46873a6a7a06
github.com/codeclysm/extract/v3 v3.0.2
github.com/dgraph-io/badger/v3 v3.2103.2
github.com/enescakir/emoji v1.0.0
Expand Down Expand Up @@ -53,6 +53,7 @@ require (
bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc // indirect
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5 // indirect
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
Expand Down Expand Up @@ -97,7 +98,7 @@ require (
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dop251/goja v0.0.0-20230605162241-28ee0ee714f3 // indirect
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
Expand Down Expand Up @@ -131,7 +132,7 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
github.com/huin/goupnp v1.1.0 // indirect
github.com/huin/goupnp v1.3.0 // indirect
github.com/ipfs/bbloom v0.0.4 // indirect
github.com/ipfs/go-bitfield v1.1.0 // indirect
github.com/ipfs/go-block-format v0.1.1 // indirect
Expand Down Expand Up @@ -307,13 +308,13 @@ require (
)

require (
github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
github.com/go-ole/go-ole v1.2.1 // indirect
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-redis/redis/v8 v8.11.4
github.com/go-stack/stack v1.8.1 // indirect
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
Expand All @@ -333,8 +334,7 @@ require (
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/tklauser/go-sysconf v0.3.5 // indirect
github.com/tklauser/numcpus v0.2.2 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
)
Loading
Loading