From 36c104f4db4ae85e7d7d21944121a2971749ab3a Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 15 May 2023 11:34:22 -0500 Subject: [PATCH] update geth dep --- go.mod | 2 +- go.sum | 4 ++-- pkg/builder.go | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index ebfe2f5..fa9f291 100644 --- a/go.mod +++ b/go.mod @@ -126,4 +126,4 @@ require ( lukechampine.com/blake3 v1.1.6 // indirect ) -replace github.com/ethereum/go-ethereum v1.11.5 => github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.1-alpha +replace github.com/ethereum/go-ethereum v1.11.5 => github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha diff --git a/go.sum b/go.sum index c49b93b..b68eee7 100644 --- a/go.sum +++ b/go.sum @@ -96,8 +96,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOF github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.1-alpha h1:x9muuG0Z2W/UAkwAq+0SXhYG9MCP6SJlGEfFNQa6JPI= -github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.1-alpha/go.mod h1:DIk2wFexjyzvyjuzSOtBEIAPRNZTnLXNbIHEyq1Igek= +github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha h1:Rj/5+dDbYWa5k58g7h1jNytbWa0NY8IEKExFWaI8bcA= +github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha/go.mod h1:DIk2wFexjyzvyjuzSOtBEIAPRNZTnLXNbIHEyq1Igek= github.com/cerc-io/leveldb-ethdb-rpc v1.1.13 h1:XM+e/JLKjNoYc4Xj7DJNNlFI4+3HpqZ9VkVlrWBlwHg= github.com/cerc-io/leveldb-ethdb-rpc v1.1.13/go.mod h1:ZNa5ySrKJ0ZLsJ0nSNaQ+11PkX29Juy9+omMgP6mw1c= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= diff --git a/pkg/builder.go b/pkg/builder.go index 936ad45..a0b77e8 100644 --- a/pkg/builder.go +++ b/pkg/builder.go @@ -84,10 +84,10 @@ func (sdb *builder) WriteStateDiffObject(args sd.Args, params sd.Params, output } // Split old and new tries into corresponding subtrie iterators - oldIters1 := iter.SubtrieIterators(oldTrie, sdb.numWorkers) - oldIters2 := iter.SubtrieIterators(oldTrie, sdb.numWorkers) - newIters1 := iter.SubtrieIterators(newTrie, sdb.numWorkers) - newIters2 := iter.SubtrieIterators(newTrie, sdb.numWorkers) + oldIters1 := iter.SubtrieIterators(oldTrie.NodeIterator, sdb.numWorkers) + oldIters2 := iter.SubtrieIterators(oldTrie.NodeIterator, sdb.numWorkers) + newIters1 := iter.SubtrieIterators(newTrie.NodeIterator, sdb.numWorkers) + newIters2 := iter.SubtrieIterators(newTrie.NodeIterator, sdb.numWorkers) // Create iterators ahead of time to avoid race condition in state.Trie access // We do two state iterations per subtrie: one for new/updated nodes, @@ -115,7 +115,7 @@ func (sdb *builder) WriteStateDiffObject(args sd.Args, params sd.Params, output defer wg.Done() var err error logger := log.New("hash", args.BlockHash.Hex(), "number", args.BlockNumber) - err = sdb.BuildStateDiffWithIntermediateStateNodes(iterPairs[worker], params, nodeSender, ipldSender, logger) + err = sdb.BuildStateDiffWithIntermediateStateNodes(iterPairs[worker], params, nodeSender, ipldSender, logger, nil) if err != nil { logrus.Errorf("buildStateDiff error for worker %d, params %+v", worker, params) }