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

Upgrade geth to 1.13 #2416

Merged
merged 27 commits into from
Jun 9, 2024
Merged

Upgrade geth to 1.13 #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
640951a
Upgrade geth to 1.12
aureliusbtc Apr 1, 2024
6a6304f
Upgrade geth to 1.12
aureliusbtc Apr 1, 2024
dcda316
fix ethergo test
aureliusbtc Apr 1, 2024
5454e4f
Upgrade geth to 1.13 (#2419)
aureliusbtc Apr 1, 2024
80b06f9
fix presets (pre merge no longer supported)
aureliusbtc Apr 1, 2024
3cbc555
geth upgrade
trajan0x Jun 8, 2024
6e09afc
cleanup
trajan0x Jun 8, 2024
2a952ba
cleanup
trajan0x Jun 8, 2024
24f5511
attempted fix for https://github.com/ethereum/go-ethereum/issues/17443
trajan0x Jun 8, 2024
caf227c
use mock consensus client
trajan0x Jun 8, 2024
1a40752
cleanup
trajan0x Jun 8, 2024
c2f3a8b
clique
trajan0x Jun 8, 2024
297dfcd
test fix
trajan0x Jun 8, 2024
29c2d95
version bump
trajan0x Jun 8, 2024
74605c8
version bump
trajan0x Jun 8, 2024
2d1dde4
cleanup
trajan0x Jun 8, 2024
4161ef5
bump again
trajan0x Jun 8, 2024
16ec667
cleanup [goreleaser]
trajan0x Jun 8, 2024
60bd563
build
trajan0x Jun 8, 2024
95c5128
c
trajan0x Jun 8, 2024
c802d1a
omplete
trajan0x Jun 8, 2024
65d2116
cleanup
trajan0x Jun 9, 2024
f3f4dd6
cleanup
trajan0x Jun 9, 2024
4b954b8
delv
trajan0x Jun 9, 2024
7be51c6
make tracely optional
trajan0x Jun 9, 2024
c45c453
cleanup
trajan0x Jun 9, 2024
f458ffe
interpolation fix
trajan0x Jun 9, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,4 @@ fastcache.tmp*
main
.devnet/

**/__debug_bin*
3 changes: 1 addition & 2 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ run:
- grpc/client/rest/*
- bundle/*
- generated/*
- tracely/*
timeout: 15m
skip-files:
- '.*\\.abigen\\.go$'
Expand Down Expand Up @@ -135,4 +134,4 @@ issues:
- cyclop

exclude-use-default: false
new-from-rev: 5f8d480f4e3f1f2a318243a9924f50ec90ec4945
new-from-rev: a9a6f84f0569de877d06a027257aeca266aeda49
2 changes: 1 addition & 1 deletion agents/agents/agentsintegration/agentsintegration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func (u *AgentsIntegrationSuite) TestAgentsE2E() {

tips := types.NewTips(big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0))
optimisticSeconds := uint32(1)
recipientDestination := u.TestClientMetadataOnDestination.Address().Hash()
recipientDestination := common.BytesToHash(u.TestClientMetadataOnDestination.Address().Bytes())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of common.BytesToHash directly in the test setup could be abstracted to a helper function for better readability and reuse.

// Suggested helper function
func hashFromBytes(bytes []byte) common.Hash {
    return common.BytesToHash(bytes)
}

nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}
txContextOrigin := u.TestBackendOrigin.GetTxContext(u.GetTestContext(), u.OriginContractMetadata.OwnerPtr())
Expand Down
2 changes: 1 addition & 1 deletion agents/agents/executor/executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ func (e *ExecutorSuite) TestExecutor() {

optimisticSeconds := uint32(10)

recipient := testContractDest.Address().Hash()
recipient := common.BytesToHash(testContractDest.Address().Bytes())
nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}

Expand Down
2 changes: 1 addition & 1 deletion agents/agents/guard/fraud_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ func (g *GuardSuite) TestInvalidReceipt() {
deliveryTip := big.NewInt(int64(gofakeit.Uint32()))
tips := types.NewTips(summitTip, attestationTip, executorTip, deliveryTip)
optimisticSeconds := uint32(1)
recipientDestination := g.TestClientMetadataOnDestination.Address().Hash()
recipientDestination := common.BytesToHash(g.TestClientMetadataOnDestination.Address().Bytes())
nonce := uint32(1)
body := []byte{byte(gofakeit.Uint32())}
txContextOrigin := g.TestBackendOrigin.GetTxContext(g.GetTestContext(), g.OriginContractMetadata.OwnerPtr())
Expand Down
22 changes: 15 additions & 7 deletions agents/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/brianvoe/gofakeit/v6 v6.27.0
github.com/coinbase/rosetta-sdk-go v0.8.1
github.com/davecgh/go-spew v1.1.1
github.com/ethereum/go-ethereum v1.11.6
github.com/ethereum/go-ethereum v1.13.8
github.com/hedzr/log v1.6.3
github.com/imkira/go-interpol v1.1.0
github.com/ipfs/go-log v1.0.5
Expand Down Expand Up @@ -48,43 +48,52 @@ require (
github.com/alecthomas/colour v0.1.0 // indirect
github.com/alecthomas/repr v0.0.0-20210801044451-80ca428c5142 // indirect
github.com/bcicen/jstream v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.10.0 // indirect
github.com/chenzhuoyu/iasm v0.9.0 // indirect
github.com/cockroachdb/errors v1.9.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/consensys/gnark-crypto v0.12.1 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
github.com/deepmap/oapi-codegen v1.8.2 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
github.com/flowchartsman/swaggerui v0.0.0-20221017034628-909ed4f3701b // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
github.com/getsentry/sentry-go v0.18.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/gofrs/flock v0.8.1 // indirect
github.com/grafana/otel-profiling-go v0.5.1 // indirect
github.com/grafana/pyroscope-go v1.1.1 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
github.com/graph-gophers/graphql-go v1.3.0 // indirect
github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
github.com/influxdata/influxdb-client-go/v2 v2.5.1 // indirect
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-libp2p v0.33.0 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/peterh/liner v1.2.1 // indirect
github.com/puzpuzpuz/xsync/v2 v2.5.1 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/supranational/blst v0.3.11 // indirect
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.3 // indirect
github.com/uptrace/opentelemetry-go-extra/otelzap v0.2.3 // indirect
github.com/valyala/fastjson v1.6.4 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

require (
Expand Down Expand Up @@ -145,7 +154,7 @@ require (
github.com/disintegration/imaging v1.6.2 // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/docker/cli v20.10.17+incompatible // indirect
github.com/docker/docker v20.10.23+incompatible // indirect
github.com/docker/docker v24.0.5+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/eliukblau/pixterm/pkg/ansimage v0.0.0-20191210081756-9fb6cf8c2f75 // indirect
Expand Down Expand Up @@ -330,5 +339,4 @@ replace (
github.com/synapsecns/sanguine/services/omnirpc => ../services/omnirpc
github.com/synapsecns/sanguine/services/scribe => ../services/scribe
github.com/synapsecns/sanguine/tools => ../tools
gopkg.in/DataDog/dd-trace-go.v1 v1.50.0 => gopkg.in/DataDog/dd-trace-go.v1 v1.39.0-alpha.1.0.20230428193534-5deb295b7662
)
Loading
Loading