Merge pull request #123 from cerc-io/ian/v4_dev

[v4] bump to vdb v4 geth v1.11.5
This commit is contained in:
Ian Norden 2023-03-31 09:53:11 -05:00 committed by GitHub
commit 2eaa2c2262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions

5
go.mod
View File

@ -3,9 +3,8 @@ module github.com/cerc-io/eth-statediff-service
go 1.18 go 1.18
require ( require (
github.com/cerc-io/go-eth-state-node-iterator v1.1.11
github.com/cerc-io/leveldb-ethdb-rpc v1.1.12 github.com/cerc-io/leveldb-ethdb-rpc v1.1.12
github.com/ethereum/go-ethereum v1.11.4 github.com/ethereum/go-ethereum v1.11.5
github.com/jmoiron/sqlx v1.3.5 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect
github.com/prometheus/client_golang v1.14.0 github.com/prometheus/client_golang v1.14.0
github.com/sirupsen/logrus v1.9.0 github.com/sirupsen/logrus v1.9.0
@ -141,4 +140,4 @@ require (
lukechampine.com/blake3 v1.1.6 // indirect lukechampine.com/blake3 v1.1.6 // indirect
) )
replace github.com/ethereum/go-ethereum v1.11.4 => github.com/cerc-io/go-ethereum v1.11.4-statediff-4.3.9-alpha replace github.com/ethereum/go-ethereum v1.11.5 => github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha

6
go.sum
View File

@ -97,10 +97,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/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.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cerc-io/go-eth-state-node-iterator v1.1.11 h1:KrrmEO4byx37sZmq4QmJ8PxU6bfUeH48nQOiZBzPcdw= github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha h1:nzy/bUmzq8ImRIxchClNoO7Bytom8ETDuOFHzuHFBXs=
github.com/cerc-io/go-eth-state-node-iterator v1.1.11/go.mod h1:te4Jw+t3Rpykj/ZdCTXkKItA/8oZyZHjV7UpOaneV8o= github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha/go.mod h1:Q4LXiMcJCctVW1uoIuF59VRCW1W+zrc5GkewoARwAmk=
github.com/cerc-io/go-ethereum v1.11.4-statediff-4.3.9-alpha h1:6sUU9DD33TK3eOeDd9NuCmDXNYLOd9FsgHWyn/tmtwc=
github.com/cerc-io/go-ethereum v1.11.4-statediff-4.3.9-alpha/go.mod h1:Q4LXiMcJCctVW1uoIuF59VRCW1W+zrc5GkewoARwAmk=
github.com/cerc-io/leveldb-ethdb-rpc v1.1.12 h1:SZn1g64gYTS3xSF6R/wZat3GYm8BGl7M5PlVVXN0yns= github.com/cerc-io/leveldb-ethdb-rpc v1.1.12 h1:SZn1g64gYTS3xSF6R/wZat3GYm8BGl7M5PlVVXN0yns=
github.com/cerc-io/leveldb-ethdb-rpc v1.1.12/go.mod h1:ra/wYVfEih/XU8TZosmeu0Y6vpQEl/V2gbiQH2WjFEM= github.com/cerc-io/leveldb-ethdb-rpc v1.1.12/go.mod h1:ra/wYVfEih/XU8TZosmeu0Y6vpQEl/V2gbiQH2WjFEM=
github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=

View File

@ -28,9 +28,8 @@ import (
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
sd "github.com/ethereum/go-ethereum/statediff" sd "github.com/ethereum/go-ethereum/statediff"
sdtypes "github.com/ethereum/go-ethereum/statediff/types" sdtypes "github.com/ethereum/go-ethereum/statediff/types"
iter "github.com/ethereum/go-ethereum/trie/concurrent_iterator"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
iter "github.com/cerc-io/go-eth-state-node-iterator"
) )
type builder struct { type builder struct {