From 7ee5bba220b08e77f90b8050b392d228568700e9 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Fri, 25 Aug 2023 13:34:00 +0800 Subject: [PATCH] swap geth-statediff for plugeth-statediff --- cmd/root.go | 12 ++-- cmd/util.go | 7 +- go.mod | 121 ++------------------------------- pkg/api.go | 2 +- pkg/builder.go | 9 ++- pkg/builder_test.go | 8 +-- pkg/prom/db_stats_collector.go | 2 +- pkg/service.go | 6 +- pkg/types.go | 4 +- 9 files changed, 31 insertions(+), 140 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index e957938..75d55ec 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -23,13 +23,13 @@ import ( "strings" "time" + "github.com/cerc-io/plugeth-statediff/indexer/database/dump" + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/shared" "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/statediff/indexer/database/dump" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/util.go b/cmd/util.go index 9586f3b..d68dca7 100644 --- a/cmd/util.go +++ b/cmd/util.go @@ -3,12 +3,11 @@ package cmd import ( "context" + "github.com/cerc-io/plugeth-statediff" + gethsd "github.com/cerc-io/plugeth-statediff" + ind "github.com/cerc-io/plugeth-statediff/indexer" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/statediff" - ind "github.com/ethereum/go-ethereum/statediff/indexer" - "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" "github.com/ethereum/go-ethereum/trie" "github.com/spf13/viper" diff --git a/go.mod b/go.mod index 99d615c..59d4ab1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cerc-io/eth-statediff-service -go 1.18 +go 1.19 require ( github.com/cerc-io/leveldb-ethdb-rpc v1.1.13 @@ -12,119 +12,8 @@ require ( github.com/spf13/viper v1.10.1 ) -require ( - github.com/DataDog/zstd v1.5.2 // indirect - github.com/VictoriaMetrics/fastcache v1.6.0 // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect - github.com/cespare/xxhash/v2 v2.2.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/redact v1.1.3 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/deckarep/golang-set/v2 v2.1.0 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect - github.com/deepmap/oapi-codegen v1.8.2 // indirect - github.com/edsrzf/mmap-go v1.0.0 // indirect - github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect - github.com/georgysavva/scany v1.2.1 // indirect - github.com/getsentry/sentry-go v0.18.0 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-stack/stack v1.8.1 // indirect - github.com/gofrs/flock v0.8.1 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.3.0 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/gorilla/websocket v1.4.2 // indirect - github.com/graph-gophers/graphql-go v1.3.0 // indirect - github.com/hashicorp/go-bexpr v0.1.10 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect - github.com/holiman/bloomfilter/v2 v2.0.3 // indirect - github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect - github.com/huin/goupnp v1.0.3 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect - github.com/influxdata/influxdb-client-go/v2 v2.4.0 // 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/ipfs/go-cid v0.2.0 // indirect - github.com/jackc/chunkreader/v2 v2.0.1 // indirect - github.com/jackc/pgconn v1.10.0 // indirect - github.com/jackc/pgio v1.0.0 // indirect - github.com/jackc/pgpassfile v1.0.0 // indirect - github.com/jackc/pgproto3/v2 v2.1.1 // indirect - github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect - github.com/jackc/pgtype v1.8.1 // indirect - github.com/jackc/pgx/v4 v4.13.0 // indirect - github.com/jackc/puddle v1.1.3 // indirect - github.com/jackpal/go-nat-pmp v1.0.2 // indirect - github.com/klauspost/compress v1.15.15 // indirect - github.com/klauspost/cpuid/v2 v2.0.9 // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/lib/pq v1.10.7 // indirect - github.com/magiconair/properties v1.8.5 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.16 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 // indirect - github.com/minio/sha256-simd v1.0.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect - github.com/mitchellh/pointerstructure v1.2.0 // indirect - github.com/mr-tron/base58 v1.2.0 // indirect - github.com/multiformats/go-base32 v0.0.3 // indirect - github.com/multiformats/go-base36 v0.1.0 // indirect - github.com/multiformats/go-multibase v0.0.3 // indirect - github.com/multiformats/go-multihash v0.1.0 // indirect - github.com/multiformats/go-varint v0.0.6 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/opentracing/opentracing-go v1.2.0 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect - github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect - github.com/pganalyze/pg_query_go/v2 v2.2.0 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.39.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - github.com/rs/cors v1.7.0 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/shopspring/decimal v1.2.0 // indirect - github.com/spaolacci/murmur3 v1.1.0 // indirect - github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cast v1.4.1 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/status-im/keycard-go v0.2.0 // indirect - github.com/subosito/gotenv v1.2.0 // indirect - github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect - github.com/thoas/go-funk v0.9.3 // indirect - github.com/tklauser/go-sysconf v0.3.11 // indirect - github.com/tklauser/numcpus v0.6.0 // indirect - github.com/tyler-smith/go-bip39 v1.1.0 // indirect - github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa // indirect - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - github.com/yusufpapurcu/wmi v1.2.2 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect - golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect - google.golang.org/protobuf v1.28.1 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect - gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - lukechampine.com/blake3 v1.1.6 // indirect +replace ( + github.com/cerc-io/plugeth-statediff => git.vdb.to/cerc-io/plugeth-statediff 840d4a4e5d42110e694941afa734dac8fea126fe + github.com/ethereum/go-ethereum => git.vdb.to/cerc-io/plugeth v0.0.0-20230808125822-691dc334fab1 + // github.com/openrelayxyz/plugeth-utils => git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230706160122-cd41de354c46 ) - -replace github.com/ethereum/go-ethereum v1.11.6 => github.com/cerc-io/go-ethereum v1.11.6-statediff-5.0.8 diff --git a/pkg/api.go b/pkg/api.go index 2e0b00a..33eb0c8 100644 --- a/pkg/api.go +++ b/pkg/api.go @@ -18,7 +18,7 @@ package statediff import ( "context" - sd "github.com/ethereum/go-ethereum/statediff" + sd "github.com/cerc-io/plugeth-statediff" ) // APIName is the namespace used for the state diffing service API diff --git a/pkg/builder.go b/pkg/builder.go index a0b77e8..0017fe6 100644 --- a/pkg/builder.go +++ b/pkg/builder.go @@ -24,11 +24,14 @@ import ( "math/bits" "sync" + sd "github.com/cerc-io/plugeth-statediff" + sdtrie "github.com/cerc-io/plugeth-statediff/trie_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/log" - sd "github.com/ethereum/go-ethereum/statediff" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" - iter "github.com/ethereum/go-ethereum/trie/concurrent_iterator" + "github.com/ethereum/go-ethereum/rlp" + "github.com/ethereum/go-ethereum/trie" "github.com/sirupsen/logrus" ) diff --git a/pkg/builder_test.go b/pkg/builder_test.go index cc2dc3f..7aec612 100644 --- a/pkg/builder_test.go +++ b/pkg/builder_test.go @@ -23,15 +23,13 @@ import ( "sort" "testing" + "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/test_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/rlp" - sd "github.com/ethereum/go-ethereum/statediff" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - "github.com/ethereum/go-ethereum/statediff/test_helpers" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" statediff "github.com/cerc-io/eth-statediff-service/pkg" ) diff --git a/pkg/prom/db_stats_collector.go b/pkg/prom/db_stats_collector.go index df98e8a..62e3be5 100644 --- a/pkg/prom/db_stats_collector.go +++ b/pkg/prom/db_stats_collector.go @@ -19,7 +19,7 @@ package prom import ( "github.com/prometheus/client_golang/prometheus" - dbmetrics "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" + dbmetrics "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" ) const ( diff --git a/pkg/service.go b/pkg/service.go index bde2a9d..e0b2644 100644 --- a/pkg/service.go +++ b/pkg/service.go @@ -22,15 +22,15 @@ import ( "sync" "time" + sd "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + sdtypes "github.com/cerc-io/plugeth-statediff/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/node" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" - sd "github.com/ethereum/go-ethereum/statediff" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" "github.com/sirupsen/logrus" "github.com/cerc-io/eth-statediff-service/pkg/prom" diff --git a/pkg/types.go b/pkg/types.go index 0a7e89e..dd9a0c3 100644 --- a/pkg/types.go +++ b/pkg/types.go @@ -20,7 +20,9 @@ package statediff import ( - sd "github.com/ethereum/go-ethereum/statediff" + sd "github.com/cerc-io/plugeth-statediff" + sdTypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/ethereum/go-ethereum/core/types" ) // RangeRequest holds range quest work params