Upgrade for Cancun fork (Geth 1.14) #10

Merged
roysc merged 13 commits from update-geth1.13 into v5 2024-08-05 13:17:00 +00:00
3 changed files with 4 additions and 4 deletions
Showing only changes of commit e5b49dd1a0 - Show all commits

2
go.mod
View File

@ -124,4 +124,4 @@ require (
rsc.io/tmplfunc v0.0.3 // indirect rsc.io/tmplfunc v0.0.3 // indirect
) )
replace github.com/cerc-io/plugeth-statediff => github.com/cerc-io/plugeth-statediff v0.2.1-0.20240415132102-d94b880cb785 replace github.com/cerc-io/plugeth-statediff => github.com/cerc-io/plugeth-statediff v0.2.1-0.20240424103344-353d0ce688a6

4
go.sum
View File

@ -60,8 +60,8 @@ github.com/cerc-io/eth-iterator-utils v0.2.0 h1:wikAfWZ0fAqLqUy/Ud/a1n9p/arVeKG8
github.com/cerc-io/eth-iterator-utils v0.2.0/go.mod h1:wDUJvwKDSOdqTIyeG+yXJ2ckzc9f2Fem614fV61DBcg= github.com/cerc-io/eth-iterator-utils v0.2.0/go.mod h1:wDUJvwKDSOdqTIyeG+yXJ2ckzc9f2Fem614fV61DBcg=
github.com/cerc-io/eth-testing v0.4.0 h1:ivGbXnEqlXMt/3m3jbsPJaVT7ZDTenFQWCryt1Rd/Jk= github.com/cerc-io/eth-testing v0.4.0 h1:ivGbXnEqlXMt/3m3jbsPJaVT7ZDTenFQWCryt1Rd/Jk=
github.com/cerc-io/eth-testing v0.4.0/go.mod h1:CVsmHjFldX9gwaQSQwGmKbmh0g6Dq+bsqB2CxBf9zbk= github.com/cerc-io/eth-testing v0.4.0/go.mod h1:CVsmHjFldX9gwaQSQwGmKbmh0g6Dq+bsqB2CxBf9zbk=
github.com/cerc-io/plugeth-statediff v0.2.1-0.20240415132102-d94b880cb785 h1:Mmaqrd+xhuo4/dSfHpJvK0YfIRgv+xYJPJqqonuoZlQ= github.com/cerc-io/plugeth-statediff v0.2.1-0.20240424103344-353d0ce688a6 h1:m4TVSwdDNaB4nZ4i64iMAWM2G1jGdqYlQxIPoH2000E=
github.com/cerc-io/plugeth-statediff v0.2.1-0.20240415132102-d94b880cb785/go.mod h1:Jle0lQ64GBMvoCPLLWvr0IOL3TUCS45yXZTuZ4tfSFU= github.com/cerc-io/plugeth-statediff v0.2.1-0.20240424103344-353d0ce688a6/go.mod h1:BLqUGWUWrITtPr92L9KV2xFL4bIP2TC2uonnxqmJR2g=
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=

View File

@ -140,7 +140,7 @@ func (s *Service) CreateSnapshot(params SnapshotParams) error {
sdparams.ComputeWatchedAddressesLeafPaths() sdparams.ComputeWatchedAddressesLeafPaths()
builder := statediff.NewBuilder(adapt.GethStateView(s.stateDB)) builder := statediff.NewBuilder(adapt.GethStateView(s.stateDB))
builder.SetSubtrieWorkers(params.Workers) builder.SetSubtrieWorkers(params.Workers)
if err = builder.WriteStateSnapshot(header.Root, sdparams, nodeSink, ipldSink, tr); err != nil { if err = builder.WriteStateSnapshot(ctx, header.Root, sdparams, nodeSink, ipldSink, tr); err != nil {
return err return err
} }