From ebc2eb37e76a78c89a759b36fa23adfbfcc8ed02 Mon Sep 17 00:00:00 2001 From: Roy Crihfield Date: Fri, 23 Jun 2023 20:42:55 +0800 Subject: [PATCH] Initial plugin implementation * refactor packages, flags, subscriptions * DRY refactor builder tests * use mockgen to generate mocks * update README * MODE=statediff no longer needed for unit tests * simplify func names, clean up metrics * move write params to service field * sql indexer: confirm quit after ipld cache reset prevents negative waitgroup panic * don't let TotalDifficulty become nil * use forked plugeth, plugeth-utils for now --- .dockerignore | 3 + .gitignore | 1 + Dockerfile | 17 + Makefile | 13 + README.md | 401 +++-- adapt/state.go | 74 + adapt/util.go | 38 + api.go | 157 +- blockchain.go | 124 ++ builder.go | 403 +++-- builder_test.go | 1380 ++++++----------- config.go | 20 +- docs/KnownGaps.md | 17 - docs/README.md | 3 - docs/database.md | 21 - docs/diagrams/KnownGapsProcess.png | Bin 33340 -> 0 bytes docs/indexer.md | 13 + go.mod | 129 ++ go.sum | 762 +++++++++ indexer/constructor.go | 19 +- indexer/database/dump/batch_tx.go | 4 +- indexer/database/dump/config.go | 45 +- indexer/database/dump/indexer.go | 25 +- indexer/database/file/config.go | 33 +- .../database/file/csv_indexer_legacy_test.go | 12 +- indexer/database/file/csv_indexer_test.go | 35 +- indexer/database/file/csv_writer.go | 17 +- indexer/database/file/indexer.go | 32 +- indexer/database/file/interfaces.go | 10 +- .../file/mainnet_tests/indexer_test.go | 22 +- .../database/file/sql_indexer_legacy_test.go | 14 +- indexer/database/file/sql_indexer_test.go | 33 +- indexer/database/file/sql_writer.go | 19 +- indexer/database/metrics/metrics.go | 133 +- indexer/database/sql/batch_tx.go | 13 +- indexer/database/sql/indexer.go | 56 +- indexer/database/sql/indexer_shared_test.go | 6 +- indexer/database/sql/interfaces.go | 2 +- indexer/database/sql/lazy_tx.go | 4 +- .../sql/mainnet_tests/indexer_test.go | 19 +- .../database/sql/pgx_indexer_legacy_test.go | 6 +- indexer/database/sql/pgx_indexer_test.go | 38 +- indexer/database/sql/postgres/config.go | 94 +- indexer/database/sql/postgres/database.go | 4 +- indexer/database/sql/postgres/log_adapter.go | 30 +- indexer/database/sql/postgres/pgx.go | 16 +- indexer/database/sql/postgres/pgx_test.go | 4 +- .../sql/postgres/postgres_suite_test.go | 33 - indexer/database/sql/postgres/sqlx.go | 6 +- indexer/database/sql/postgres/sqlx_test.go | 4 +- indexer/database/sql/postgres/test_helpers.go | 4 +- .../database/sql/sqlx_indexer_legacy_test.go | 6 +- indexer/database/sql/sqlx_indexer_test.go | 30 +- indexer/database/sql/writer.go | 4 +- indexer/interfaces/interfaces.go | 7 +- indexer/ipld/eth_log.go | 5 +- indexer/ipld/eth_parser.go | 27 +- indexer/mocks/test_data.go | 18 +- indexer/shared/db_kind.go | 15 +- indexer/shared/functions.go | 6 +- indexer/shared/schema/table_test.go | 2 +- indexer/test/test.go | 91 +- indexer/test/test_init.go | 16 +- indexer/test/test_legacy.go | 10 +- indexer/test/test_mainnet.go | 8 +- indexer/test/test_watched_addresses.go | 7 +- indexer/test_helpers/test_helpers.go | 58 +- main/flags.go | 182 +++ main/main.go | 107 ++ mainnet_tests/builder_test.go | 116 +- metrics_helpers.go | 51 +- service.go | 740 ++++----- service_test.go | 330 ++-- test/compose.yml | 27 + test_helpers/builder.go | 71 + test_helpers/helpers.go | 22 +- test_helpers/mocks/backend.go | 297 +--- test_helpers/mocks/backend_test.go | 17 + test_helpers/mocks/blockchain.go | 10 +- test_helpers/mocks/builder.go | 16 +- test_helpers/mocks/indexer.go | 9 +- test_helpers/test_data.go | 12 +- trie_helpers/helpers.go | 4 +- utils/bytes.go | 26 + utils/encoding.go | 64 + utils/iterator.go | 1 + utils/log/log.go | 73 + utils/trie.go | 28 + utils/utils.go | 23 + 89 files changed, 3743 insertions(+), 3161 deletions(-) create mode 100644 .dockerignore create mode 100644 .gitignore create mode 100644 Dockerfile create mode 100644 Makefile create mode 100644 adapt/state.go create mode 100644 adapt/util.go create mode 100644 blockchain.go delete mode 100644 docs/KnownGaps.md delete mode 100644 docs/README.md delete mode 100644 docs/database.md delete mode 100644 docs/diagrams/KnownGapsProcess.png create mode 100644 docs/indexer.md create mode 100644 go.mod create mode 100644 go.sum delete mode 100644 indexer/database/sql/postgres/postgres_suite_test.go create mode 100644 main/flags.go create mode 100644 main/main.go create mode 100644 test/compose.yml create mode 100644 test_helpers/builder.go create mode 100644 test_helpers/mocks/backend_test.go create mode 100644 utils/bytes.go create mode 100644 utils/encoding.go create mode 100644 utils/iterator.go create mode 100644 utils/log/log.go create mode 100644 utils/trie.go create mode 100644 utils/utils.go diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..7586590 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +.git +**/*_test.go +*.so diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f1fe8d1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.so \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..62a4407 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +# Using the same base golang image as geth +FROM golang:1.20-alpine as builder + +RUN apk add --no-cache gcc musl-dev binutils-gold linux-headers git + +# Get and cache deps +COPY go.mod /plugeth-statediff/ +COPY go.sum /plugeth-statediff/ +RUN cd /plugeth-statediff && go mod download + +ADD . /plugeth-statediff +RUN cd /plugeth-statediff && \ + go build --tags linkgeth --buildmode=plugin --trimpath -o statediff.so ./main + +FROM alpine:latest + +COPY --from=builder /plugeth-statediff/statediff.so /usr/local/lib/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9f28264 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +MOCKGEN ?= mockgen +MOCKS_DIR := $(CURDIR)/test_helpers/mocks + +mocks: $(MOCKS_DIR)/gen_backend.go +.PHONY: mocks + +$(MOCKS_DIR)/gen_backend.go: + $(MOCKGEN) --package mocks --destination $@ \ + github.com/openrelayxyz/plugeth-utils/core Backend,Downloader + +docker: mocks + docker build . -t "cerc/plugeth-statediff:local" +.PHONY: docker diff --git a/README.md b/README.md index 027b258..c26d401 100644 --- a/README.md +++ b/README.md @@ -4,169 +4,169 @@ ## Package -This package provides an auxiliary service that asynchronously processes state diff objects from chain events, -either relaying the state objects to RPC subscribers or writing them directly to Postgres as IPLD objects. +This package provides a [PluGeth](https://github.com/openrelayxyz/plugeth) plugin implementing an +auxiliary service that asynchronously computes changes in the `go-ethereum` state trie. The service +continuously listens for chain updates and builds state diffs, then relays the data to RPC +subscribers or writes them directly to Postgres as IPLD objects. -It also exposes RPC endpoints for fetching or writing to Postgres the state diff at a specific block height -or for a specific block hash, this operates on historical block and state data and so depends on a complete state archive. +It also exposes RPC endpoints for fetching or writing to Postgres the state diff at a specific block +height or for a specific block hash. This operates on historical block and state data, and so +depends on a complete state archive. -Data is emitted in this differential format in order to make it feasible to IPLD-ize and index the _entire_ Ethereum state -(including intermediate state and storage trie nodes). If this state diff process is ran continuously from genesis, -the entire state at any block can be materialized from the cumulative differentials up to that point. +Data is emitted in this differential format in order to make it feasible to the _entire_ Ethereum +state and publish it to IPLD (including intermediate state and storage trie nodes). If this service +is run continuously from genesis, the entire state at any block can be materialized from the +cumulative differentials up to that point. -## Statediff object +## Interface types -A state diff `StateObject` is the collection of all the state and storage trie nodes that have been updated in a given block. -For convenience, we also associate these nodes with the block number and hash, and optionally the set of code hashes and code for any -contracts deployed in this block. +The primary interface type is `Payload`, which serves as the main interface for accessing data in a +service. It packages various data components such as block RLP, total difficulty, receipts RLP, and +state object RLP. This encapsulates all of the differential data at a given block, and allows us to +index the entire Ethereum data structure as hash-linked IPLD objects. -A complete state diff `StateObject` will include all state and storage intermediate nodes, which is necessary for generating proofs and for -traversing the tries. +The `StateObject` type represents the final diff output structure, including an array of state leaf +nodes and IPLD objects. For convenience, we also associate this object with the block number and +hash. -```go -// StateObject is a collection of state (and linked storage nodes) as well as the associated block number, block hash, -// and a set of code hashes and their code -type StateObject struct { - BlockNumber *big.Int `json:"blockNumber" gencodec:"required"` - BlockHash common.Hash `json:"blockHash" gencodec:"required"` - Nodes []StateNode `json:"nodes" gencodec:"required"` - CodeAndCodeHashes []CodeAndCodeHash `json:"codeMapping"` -} - -// StateNode holds the data for a single state diff node -type StateNode struct { - NodeType NodeType `json:"nodeType" gencodec:"required"` - Path []byte `json:"path" gencodec:"required"` - NodeValue []byte `json:"value" gencodec:"required"` - StorageNodes []StorageNode `json:"storage"` - LeafKey []byte `json:"leafKey"` -} - -// StorageNode holds the data for a single storage diff node -type StorageNode struct { - NodeType NodeType `json:"nodeType" gencodec:"required"` - Path []byte `json:"path" gencodec:"required"` - NodeValue []byte `json:"value" gencodec:"required"` - LeafKey []byte `json:"leafKey"` -} - -// CodeAndCodeHash struct for holding codehash => code mappings -// we can't use an actual map because they are not rlp serializable -type CodeAndCodeHash struct { - Hash common.Hash `json:"codeHash"` - Code []byte `json:"code"` -} -``` - -These objects are packed into a `Payload` structure which can additionally associate the `StateObject` -with the block (header, uncles, and transactions), receipts, and total difficulty. -This `Payload` encapsulates all of the differential data at a given block, and allows us to index the entire Ethereum data structure -as hash-linked IPLD objects. +State leaf nodes contain information about account changes, including whether they are removed, an +account wrapper with account details and identifiers, and an array of storage leaf nodes +representing storage changes. The IPLD type encapsulates CID-content pairs, used for code mappings +and trie node (both intermediate and leaf) IPLD objects. Lastly, `CodeAndCodeHash` stores +codehash-to-code mappings. ```go // Payload packages the data to send to state diff subscriptions type Payload struct { - BlockRlp []byte `json:"blockRlp"` - TotalDifficulty *big.Int `json:"totalDifficulty"` - ReceiptsRlp []byte `json:"receiptsRlp"` - StateObjectRlp []byte `json:"stateObjectRlp" gencodec:"required"` + BlockRlp []byte `json:"blockRlp"` + TotalDifficulty *big.Int `json:"totalDifficulty"` + ReceiptsRlp []byte `json:"receiptsRlp"` + StateObjectRlp []byte `json:"stateObjectRlp" gencodec:"required"` - encoded []byte - err error + // ... +} + +// in package "types": + +// StateObject is the final output structure from the builder +type StateObject struct { + BlockNumber *big.Int `json:"blockNumber" gencodec:"required"` + BlockHash common.Hash `json:"blockHash" gencodec:"required"` + Nodes []StateLeafNode `json:"nodes" gencodec:"required"` + IPLDs []IPLD `json:"iplds"` +} + +// StateLeafNode holds the data for a single state diff leaf node +type StateLeafNode struct { + Removed bool + AccountWrapper AccountWrapper + StorageDiff []StorageLeafNode +} + +// AccountWrapper is used to temporarily associate the unpacked node with its raw values +type AccountWrapper struct { + Account *types.StateAccount + LeafKey []byte + CID string +} + +// StorageLeafNode holds the data for a single storage diff node leaf node +type StorageLeafNode struct { + Removed bool + Value []byte + LeafKey []byte + CID string +} + +// IPLD holds a cid:content pair, e.g. for codehash to code mappings or for intermediate node IPLD objects +type IPLD struct { + CID string + Content []byte +} + +// CodeAndCodeHash struct to hold codehash => code mappings +type CodeAndCodeHash struct { + Hash common.Hash + Code []byte } ``` ## Usage -This state diffing service runs as an auxiliary service concurrent to the regular syncing process of the geth node. +The service is started when the plugin library is loaded by PluGeth and runs as an auxiliary component of the node as it syncs. ### CLI configuration -This service introduces a CLI flag namespace `statediff` +This service introduces a CLI flag namespace `statediff`. Note that PluGeth plugin arguments must be separated from geth arguments by `--`, e.g. `geth --datadir data -- --statediff`. -`--statediff` flag is used to turn on the service - -`--statediff.writing` is used to tell the service to write state diff objects it produces from synced ChainEvents directly to a configured Postgres database - -`--statediff.workers` is used to set the number of concurrent workers to process state diff objects and write them into the database - -`--statediff.db.type` is the type of database we write out to (current options: postgres, dump, file) - -`--statediff.dump.dst` is the destination to write to when operating in database dump mode (stdout, stderr, discard) - -`--statediff.db.driver` is the specific driver to use for the database (current options for postgres: pgx and sqlx) - -`--statediff.db.host` is the hostname/ip to dial to connect to the database - -`--statediff.db.port` is the port to dial to connect to the database - -`--statediff.db.name` is the name of the database to connect to - -`--statediff.db.user` is the user to connect to the database as - -`--statediff.db.password` is the password to use to connect to the database - -`--statediff.db.conntimeout` is the connection timeout (in seconds) - -`--statediff.db.maxconns` is the maximum number of database connections - -`--statediff.db.minconns` is the minimum number of database connections - -`--statediff.db.maxidleconns` is the maximum number of idle connections - -`--statediff.db.maxconnidletime` is the maximum lifetime for an idle connection (in seconds) - -`--statediff.db.maxconnlifetime` is the maximum lifetime for a connection (in seconds) - -`--statediff.db.nodeid` is the node id to use in the Postgres database - -`--statediff.db.clientname` is the client name to use in the Postgres database - -`--statediff.db.upsert` whether or not the service, when operating in a direct database writing mode, should overwrite any existing conflicting data - -`--statediff.file.path` full path (including filename) to write statediff data out to when operating in file mode - -`--statediff.file.wapath` full path (including filename) to write statediff watched addresses out to when operating in file mode +* `--statediff` is used to enable the service +* `--statediff.writing` is used to tell the service to write state diff objects it produces from synced `ChainEvent`s directly to a configured Postgres database +* `--statediff.workers` is used to set the number of concurrent workers to process state diff objects and write them into the database +* `--statediff.db.type` is the type of database we write out to (current options: `postgres`, `dump`, `file`) +* `--statediff.dump.dst` is the destination to write to when operating in database dump mode (`stdout`, `stderr`, `discard`) +* `--statediff.db.driver` is the specific driver to use for the database (current options for postgres: `pgx` and `sqlx`) +* `--statediff.db.host` is the hostname address to dial to connect to the database +* `--statediff.db.port` is the port to dial to connect to the database +* `--statediff.db.name` is the name of the database to connect to +* `--statediff.db.user` is the user to connect to the database as +* `--statediff.db.password` is the password to use to connect to the database +* `--statediff.db.conntimeout` is the connection timeout (in seconds) +* `--statediff.db.maxconns` is the maximum number of database connections +* `--statediff.db.minconns` is the minimum number of database connections +* `--statediff.db.maxidleconns` is the maximum number of idle connections +* `--statediff.db.maxconnidletime` is the maximum lifetime for an idle connection (in seconds) +* `--statediff.db.maxconnlifetime` is the maximum lifetime for a connection (in seconds) +* `--statediff.db.nodeid` is the node id to use in the Postgres database +* `--statediff.db.clientname` is the client name to use in the Postgres database +* `--statediff.db.upsert` whether or not the service, when operating in a direct database writing mode, should overwrite any existing conflicting data +* `--statediff.file.path` full path (including filename) to write statediff data out to when operating in file mode +* `--statediff.file.wapath` full path (including filename) to write statediff watched addresses out to when operating in file mode The service can only operate in full sync mode (`--syncmode=full`), but only the historical RPC endpoints require an archive node (`--gcmode=archive`) e.g. -`./build/bin/geth --syncmode=full --gcmode=archive --statediff --statediff.writing --statediff.db.type=postgres --statediff.db.driver=sqlx --statediff.db.host=localhost --statediff.db.port=5432 --statediff.db.name=cerc_testing --statediff.db.user=postgres --statediff.db.nodeid=nodeid --statediff.db.clientname=clientname` +`geth --syncmode=full --gcmode=archive -- --statediff --statediff.writing --statediff.db.type=postgres --statediff.db.driver=sqlx --statediff.db.host=localhost --statediff.db.port=5432 --statediff.db.name=cerc_testing --statediff.db.user=postgres --statediff.db.nodeid=nodeid --statediff.db.clientname=clientname` -When operating in `--statediff.db.type=file` mode, the service will write SQL statements out to the file designated by -`--statediff.file.path`. Please note that it writes out SQL statements with all `ON CONFLICT` constraint checks dropped. -This is done so that we can scale out the production of the SQL statements horizontally, merge the separate SQL files produced, -de-duplicate using unix tools (`sort statediff.sql | uniq` or `sort -u statediff.sql`), bulk load using psql -(`psql db_name --set ON_ERROR_STOP=on -f statediff.sql`), and then add our primary and foreign key constraints and indexes -back afterwards. +When operating in `--statediff.db.type=file` mode, the service will save SQL statements to the file +specified by `--statediff.file.path`. It's important to note that these SQL statements are written +without any `ON CONFLICT` constraint checks. This omission allows us to: + * horizontally expand the production of SQL statements, + * merge the individual SQL files generated, + * remove duplicates using Unix tools (`sort statediff.sql | uniq` or `sort -u statediff.sql`), + * perform bulk loading using psql (`psql db_name --set ON_ERROR_STOP=on -f statediff.sql`), + * and then reinstate our primary and foreign key constraints and indexes. -### RPC endpoints +### Payload retrieval -The state diffing service exposes both a WS subscription endpoint, and a number of HTTP unary endpoints. +The state diffing service exposes both a websocket subscription endpoint, and a number of HTTP unary +endpoints for retrieving data payloads. -Each of these endpoints requires a set of parameters provided by the caller +Each of these endpoints requires a set of parameters provided by the caller: ```go // Params is used to carry in parameters from subscribing/requesting clients configuration type Params struct { - IntermediateStateNodes bool - IntermediateStorageNodes bool - IncludeBlock bool - IncludeReceipts bool - IncludeTD bool - IncludeCode bool - WatchedAddresses []common.Address + IntermediateStateNodes bool + IntermediateStorageNodes bool + IncludeBlock bool + IncludeReceipts bool + IncludeTD bool + IncludeCode bool + WatchedAddresses []core.Address } ``` -Using these params we can tell the service whether to include state and/or storage intermediate nodes; whether -to include the associated block (header, uncles, and transactions); whether to include the associated receipts; -whether to include the total difficulty for this block; whether to include the set of code hashes and code for -contracts deployed in this block; whether to limit the diffing process to a list of specific addresses. +Using these params we can tell the service: + * whether to include state and/or storage intermediate nodes + * whether to include the associated block (header, uncles, and transactions) + * whether to include the associated receipts + * whether to include the total difficulty for this block + * whether to include the set of code hashes and code for contracts deployed in this block, and + * whether to limit the diffing process to a list of specific addresses. -#### Subscription endpoint +#### Subscription endpoints -A websocket supporting RPC endpoint is exposed for subscribing to state diff `StateObjects` that come off the head of the chain while the geth node syncs. +A websocket-supporting RPC endpoint is exposed for subscribing to state diff `StateObjects` that come off the head of the chain while the geth node syncs. ```go // Stream is a subscription endpoint that fires off state diff payloads as they are created @@ -182,10 +182,9 @@ with the "statediff" namespace, a `statediff.Payload` channel, and the name of t e.g. ```go - cli, err := rpc.Dial("ipcPathOrWsURL") if err != nil { - // handle error + // handle error } stateDiffPayloadChan := make(chan statediff.Payload, 20000) methodName := "stream" @@ -198,18 +197,20 @@ params := statediff.Params{ } rpcSub, err := cli.Subscribe(context.Background(), statediff.APIName, stateDiffPayloadChan, methodName, params) if err != nil { - // handle error + // handle error } for { - select { - case stateDiffPayload := <- stateDiffPayloadChan: - // process the payload - case err := <- rpcSub.Err(): - // handle rpc subscription error - } + select { + case stateDiffPayload := <- stateDiffPayloadChan: + // process the payload + case err := <- rpcSub.Err(): + // handle rpc subscription error + } } ``` +Additionally, the `StreamCodeAndCodeHash` subscription method streams codehash-to-code pairs at a given block to a websocket channel. + #### Unary endpoints The service also exposes unary RPC endpoints for retrieving the state diff `StateObject` for a specific block height/hash. @@ -219,7 +220,7 @@ The service also exposes unary RPC endpoints for retrieving the state diff `Stat StateDiffAt(ctx context.Context, blockNumber uint64, params Params) (*Payload, error) // StateDiffFor returns a state diff payload for the specific blockhash -StateDiffFor(ctx context.Context, blockHash common.Hash, params Params) (*Payload, error) +StateDiffFor(ctx context.Context, blockHash core.Hash, params Params) (*Payload, error) ``` To expose this endpoint the node needs to have the HTTP server turned on (`--http`), @@ -227,98 +228,66 @@ and the `statediff` namespace exposed (`--http.api=statediff`). ### Direct indexing into Postgres -If `--statediff.writing` is set, the service will convert the state diff `StateObject` data into IPLD objects, persist them directly to Postgres, -and generate secondary indexes around the IPLD data. +If `--statediff.writing` is enabled, the service will convert the `StateObject`s and all associated +data into IPLD objects, persist them directly to Postgres, and generate secondary indexes around the +IPLD data. -The schema and migrations for this Postgres database are provided in `statediff/db/`. +The schema and migrations for this Postgres database are defined in . -#### Postgres setup +#### RPC endpoints -We use [pressly/goose](https://github.com/pressly/goose) as our Postgres migration manager. -You can also load the Postgres schema directly into a database using +If enabled, direct indexing will be triggered on every `ChainEvent`, writing diffs for all new +blocks as they are received. However, the service also provides methods for clients to trigger and +track this process: -`psql database_name < schema.sql` + * The `WriteStateDiffAt` method directly writes a state diff object to the database at a specific + block height. + * Likewise, the `WriteStateDiffFor` method directly writes a state diff object to the database for + a specific block hash + * The `StreamWrites` method sets up a subscription to stream the status of completed calls to the + above methods. + * The `WatchAddress` method enables the modification of the watched addresses list, restricting + direct indexing for a given operation and arguments. -This will only work on a version 12.4 Postgres database. #### Schema overview -Our Postgres schemas are built around a single IPFS backing Postgres IPLD blockstore table (`ipld.blocks`) that conforms with [go-ds-sql](https://github.com/ipfs/go-ds-sql/blob/master/postgres/postgres.go). -All IPLD objects are stored in this table, where `key` is the blockstore-prefixed multihash key for the IPLD object and `data` contains -the bytes for the IPLD block (in the case of all Ethereum IPLDs, this is the RLP byte encoding of the Ethereum object). +Our Postgres schemas are built around a single IPFS backing Postgres IPLD blockstore table +(`ipld.blocks`) that conforms with +[go-ds-sql](https://github.com/ipfs/go-ds-sql/blob/master/postgres/postgres.go). All IPLD objects +are stored in this table, where `key` is the blockstore-prefixed multihash key for the IPLD object +and `data` contains the bytes for the IPLD block (in the case of all Ethereum IPLDs, this is the RLP +byte encoding of the Ethereum object). -The IPLD objects in this table can be traversed using an IPLD DAG interface, but since this table only maps multihash to raw IPLD object -it is not particularly useful for searching through the data by looking up Ethereum objects by their constituent fields -(e.g. by block number, tx source/recipient, state/storage trie node path). To improve the accessibility of these objects -we create an Ethereum [advanced data layout](https://github.com/ipld/specs#schemas-and-advanced-data-layouts) (ADL) by generating secondary -indexes on top of the raw IPLDs in other Postgres tables. +The IPLD objects in this table can be traversed using an IPLD DAG interface, but since this table +only maps multihash to raw IPLD object it is not particularly useful for searching through the data +by looking up Ethereum objects by their constituent fields (e.g. by block number, tx +source/recipient, state/storage trie node path). To improve the accessibility of these objects we +create an Ethereum [advanced data +layout](https://github.com/ipld/specs#schemas-and-advanced-data-layouts) (ADL) by generating +secondary indexes on top of the raw IPLDs in other Postgres tables. -These secondary index tables fall under the `eth` schema and follow an `{objectType}_cids` naming convention. -These tables provide a view into individual fields of the underlying Ethereum IPLD objects, allowing lookups on these fields, and reference the raw IPLD objects stored in `ipld.blocks` -by foreign keys to their multihash keys. -Additionally, these tables maintain the hash-linked nature of Ethereum objects to one another. E.g. a storage trie node entry in the `storage_cids` -table contains a `state_id` foreign key which references the `id` for the `state_cids` entry that contains the state leaf node for the contract that storage node belongs to, -and in turn that `state_cids` entry contains a `header_id` foreign key which references the `id` of the `header_cids` entry that contains the header for the block these state and storage nodes were updated (diffed). +These secondary index tables fall under the `eth` schema and follow an `{objectType}_cids` naming +convention. These tables provide a view into individual fields of the underlying Ethereum IPLD +objects, allowing lookups on these fields, and reference the raw IPLD objects stored in +`ipld.blocks` by foreign keys to their multihash keys. Additionally, these tables maintain the +hash-linked nature of Ethereum objects to one another. E.g. a storage trie node entry in the +`storage_cids` table contains a `state_id` foreign key which references the `id` for the +`state_cids` entry that contains the state leaf node for the contract that storage node belongs to, +and in turn that `state_cids` entry contains a `header_id` foreign key which references the `id` of +the `header_cids` entry that contains the header for the block these state and storage nodes were +updated (diffed). ### Optimization -On mainnet this process is extremely IO intensive and requires significant resources to allow it to keep up with the head of the chain. -The state diff processing time for a specific block is dependent on the number and complexity of the state changes that occur in a block and -the number of updated state nodes that are available in the in-memory cache vs must be retrieved from disc. +On mainnet this process is extremely IO intensive and requires significant resources to allow it to +keep up with the head of the chain. The state diff processing time for a specific block is +dependent on the number and complexity of the state changes that occur in a block and the number of +updated state nodes that are available in the in-memory cache vs must be retrieved from disc. -If memory permits, one means of improving the efficiency of this process is to increase the in-memory trie cache allocation. -This can be done by increasing the overall `--cache` allocation and/or by increasing the % of the cache allocated to trie -usage with `--cache.trie`. +If memory permits, one means of improving the efficiency of this process is to increase the +in-memory trie cache allocation. This can be done by increasing the overall `--cache` allocation +and/or by increasing the % of the cache allocated to trie usage with `--cache.trie`. -## Versioning, Branches, Rebasing, and Releasing - -Internal tagged releases are maintained for building the latest version of statediffing geth or using it as a go mod dependency. -When a new core go-ethereum version is released, statediffing geth is rebased onto and adjusted to work with the new tag. - -We want to maintain a complete record of our git history, but in order to make frequent and timely rebases feasible we also -need to be able to squash our work before performing a rebase. To this end we retain multiple branches with partial incremental history that culminate in -the full incremental history. - -### Versioning - -Example: `v1.10.16-statediff-3.0.2` - -- The first section, `v1.10.16`, corresponds to the release of the root branch this version is rebased onto (e.g., [](https://github.com/ethereum/go-ethereum/releases/tag/v1.10.16)[https://github.com/ethereum/go-ethereum/releases/tag/v1.10.16](https://github.com/ethereum/go-ethereum/releases/tag/v1.10.16)) -- The second section, `3.0.2`, corresponds to the version of our statediffing code. The major version here (3) should always correspond with the major version of the `ipld-eth-db` schema version it works with (e.g., [](https://github.com/cerc-io/ipld-eth-db/releases/tag/v3.0.6)[https://github.com/vulcanize/ipld-eth-db/releases/tag/v3.0.6](https://github.com/vulcanize/ipld-eth-db/releases/tag/v3.0.6)); it is only bumped when we bump the major version of the schema. - - The major version of the schema is only bumped when a breaking change is made to the schema. - - The minor version is bumped when a new feature is added, or a fix is performed that breaks or updates the statediffing API or CLI in some way. - - The patch version is bumped whenever minor fixes/patches/features are done that don’t change/break API/CLI compatibility. -- We are very strict about the first section and the major version of the statediffing code, but some discretion is required when deciding to bump minor versus patch version of the statediffing code. - -The statediff version is included in the `VersionMeta` in params/version.go - -### Branches - -We maintain two official kinds of branches: - -Major Branch: `{Root Version}-statediff` -Major branches retain the cumulative state of all changes made before the latest root version rebase and track the full incremental history of changes made between the latest root version rebase and the next. -Aside from creating the branch by performing the rebase described in the section below, these branches are never worked off of or committed to directly. - -Feature Branch: `{Root Version}-statediff-{Statediff Version}` -Feature branches are checked out from a major branch in order to work on a new feature or fix for the statediffing code. -The statediff version of a feature branch is the new version it affects on the major branch when merged. Internal tagged releases -are cut against these branches after they are merged back to the major branch. - -If a developer is unsure what version their patch should affect, they should remain working on an unofficial branch. From there -they can open a PR against the targeted root branch and be directed to the appropriate feature version and branch. - -### Rebasing - -When a new root tagged release comes out we rebase our statediffing code on top of the new tag using the following process: - -1. Checkout a new major branch for the tag from the current major branch -2. On the new major branch, squash all our commits since the last major rebase -3. On the new major branch, perform the rebase against the new tag -4. Push the new major branch to the remote -5. From the new major branch, checkout a new feature branch based on the new major version and the last statediff version -6. On this new feature branch, add the new major branch to the .github/workflows/on-master.yml list of "on push" branches -7. On this new feature branch, make any fixes/adjustments required for all statediffing geth tests to pass -8. PR this feature branch into the new major branch, this PR will trigger CI tests and builds. -9. After merging PR, rebase feature branch onto major branch -10. Cut a new release targeting the feature branch, this release should have the new root version but the same statediff version as the last release + + diff --git a/adapt/state.go b/adapt/state.go new file mode 100644 index 0000000..2ee3144 --- /dev/null +++ b/adapt/state.go @@ -0,0 +1,74 @@ +package adapt + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" + "github.com/ethereum/go-ethereum/trie" + + plugeth "github.com/openrelayxyz/plugeth-utils/core" +) + +// StateView exposes a minimal interface for state access for diff building +type StateView interface { + OpenTrie(root common.Hash) (StateTrie, error) + ContractCode(codeHash common.Hash) ([]byte, error) +} + +// StateTrie is an interface exposing only the necessary methods from state.Trie +type StateTrie interface { + GetKey([]byte) []byte + NodeIterator([]byte) trie.NodeIterator +} + +// adapts a state.Database to StateView - used in tests +type stateDatabaseView struct { + db state.Database +} + +var _ StateView = stateDatabaseView{} + +func GethStateView(db state.Database) StateView { + return stateDatabaseView{db} +} + +func (a stateDatabaseView) OpenTrie(root common.Hash) (StateTrie, error) { + return a.db.OpenTrie(common.Hash(root)) +} + +func (a stateDatabaseView) ContractCode(hash common.Hash) ([]byte, error) { + return a.db.ContractCode(common.Hash{}, hash) +} + +// adapts geth Trie to plugeth +type adaptTrie struct { + plugeth.Trie +} + +func NewStateTrie(t plugeth.Trie) StateTrie { return adaptTrie{t} } + +func (a adaptTrie) NodeIterator(start []byte) trie.NodeIterator { + return NodeIterator(a.Trie.NodeIterator(start)) +} + +func NodeIterator(it plugeth.NodeIterator) trie.NodeIterator { + return adaptIter{it} +} + +type adaptIter struct { + plugeth.NodeIterator +} + +func (it adaptIter) Hash() common.Hash { + return common.Hash(it.NodeIterator.Hash()) +} + +func (it adaptIter) Parent() common.Hash { + return common.Hash(it.NodeIterator.Parent()) +} + +func (it adaptIter) AddResolver(resolver trie.NodeResolver) { + r := func(owner plugeth.Hash, path []byte, hash plugeth.Hash) []byte { + return resolver(common.Hash(owner), path, common.Hash(hash)) + } + it.NodeIterator.AddResolver(r) +} diff --git a/adapt/util.go b/adapt/util.go new file mode 100644 index 0000000..4432eff --- /dev/null +++ b/adapt/util.go @@ -0,0 +1,38 @@ +package adapt + +import ( + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/params" + + plugeth "github.com/openrelayxyz/plugeth-utils/core" + plugeth_params "github.com/openrelayxyz/plugeth-utils/restricted/params" +) + +func StateAccount(a *plugeth.StateAccount) *types.StateAccount { + return &types.StateAccount{ + Nonce: a.Nonce, + Balance: a.Balance, + Root: common.Hash(a.Root), + CodeHash: a.CodeHash, + } +} + +func ChainConfig(cc *plugeth_params.ChainConfig) *params.ChainConfig { + return ¶ms.ChainConfig{ + ChainID: cc.ChainID, + HomesteadBlock: cc.HomesteadBlock, + DAOForkBlock: cc.DAOForkBlock, + DAOForkSupport: cc.DAOForkSupport, + EIP150Block: cc.EIP150Block, + EIP155Block: cc.EIP155Block, + EIP158Block: cc.EIP158Block, + ByzantiumBlock: cc.ByzantiumBlock, + ConstantinopleBlock: cc.ConstantinopleBlock, + PetersburgBlock: cc.PetersburgBlock, + IstanbulBlock: cc.IstanbulBlock, + MuirGlacierBlock: cc.MuirGlacierBlock, + BerlinBlock: cc.BerlinBlock, + LondonBlock: cc.LondonBlock, + } +} diff --git a/api.go b/api.go index 1c19e31..bb28248 100644 --- a/api.go +++ b/api.go @@ -19,112 +19,91 @@ package statediff import ( "context" - "github.com/ethereum/go-ethereum/statediff/types" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + + "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) // APIName is the namespace used for the state diffing service API const APIName = "statediff" // APIVersion is the version of the state diffing service API +// TODO: match package version? const APIVersion = "0.0.1" // PublicStateDiffAPI provides an RPC subscription interface // that can be used to stream out state diffs as they // are produced by a full node -type PublicStateDiffAPI struct { - sds IService +type PublicAPI struct { + sds *Service } // NewPublicStateDiffAPI creates an rpc subscription interface for the underlying statediff service -func NewPublicStateDiffAPI(sds IService) *PublicStateDiffAPI { - return &PublicStateDiffAPI{ +func NewPublicAPI(sds *Service) *PublicAPI { + return &PublicAPI{ sds: sds, } } -// Stream is the public method to setup a subscription that fires off statediff service payloads as they are created -func (api *PublicStateDiffAPI) Stream(ctx context.Context, params Params) (*rpc.Subscription, error) { - // ensure that the RPC connection supports subscriptions - notifier, supported := rpc.NotifierFromContext(ctx) - if !supported { - return nil, rpc.ErrNotificationsUnsupported - } - - // create subscription and start waiting for events - rpcSub := notifier.CreateSubscription() +// Stream subscribes to statediff payloads as they are created. +func (api *PublicAPI) Stream(ctx context.Context, params Params) (<-chan Payload, error) { + payloadChan := make(chan Payload, chainEventChanSize) + clientChan := make(chan Payload, chainEventChanSize) + quitChan := make(chan bool, 1) + // subscribe to the service's payload broadcasts + id := api.sds.Subscribe(payloadChan, quitChan, params) go func() { - // subscribe to events from the statediff service - payloadChannel := make(chan Payload, chainEventChanSize) - quitChan := make(chan bool, 1) - api.sds.Subscribe(rpcSub.ID, payloadChannel, quitChan, params) - // loop and await payloads and relay them to the subscriber with the notifier + defer close(clientChan) + defer close(payloadChan) + defer func() { + if err := api.sds.Unsubscribe(id); err != nil { + log.Error("Failed to unsubscribe from statediff service", "error", err) + } + }() + for { select { - case payload := <-payloadChannel: - if err := notifier.Notify(rpcSub.ID, payload); err != nil { - log.Error("Failed to send state diff packet; error: " + err.Error()) - if err := api.sds.Unsubscribe(rpcSub.ID); err != nil { - log.Error("Failed to unsubscribe from the state diff service; error: " + err.Error()) - } - return - } - case err := <-rpcSub.Err(): - if err != nil { - log.Error("State diff service rpcSub error: " + err.Error()) - err = api.sds.Unsubscribe(rpcSub.ID) - if err != nil { - log.Error("Failed to unsubscribe from the state diff service; error: " + err.Error()) - } - return - } + case payload := <-payloadChan: + clientChan <- payload + case <-ctx.Done(): + return case <-quitChan: - // don't need to unsubscribe, service does so before sending the quit signal return } } }() - return rpcSub, nil + return clientChan, nil } // StateDiffAt returns a state diff payload at the specific blockheight -func (api *PublicStateDiffAPI) StateDiffAt(ctx context.Context, blockNumber uint64, params Params) (*Payload, error) { +func (api *PublicAPI) StateDiffAt(ctx context.Context, blockNumber uint64, params Params) (*Payload, error) { return api.sds.StateDiffAt(blockNumber, params) } // StateDiffFor returns a state diff payload for the specific blockhash -func (api *PublicStateDiffAPI) StateDiffFor(ctx context.Context, blockHash common.Hash, params Params) (*Payload, error) { +func (api *PublicAPI) StateDiffFor(ctx context.Context, blockHash common.Hash, params Params) (*Payload, error) { return api.sds.StateDiffFor(blockHash, params) } -// StreamCodeAndCodeHash writes all of the codehash=>code pairs out to a websocket channel -func (api *PublicStateDiffAPI) StreamCodeAndCodeHash(ctx context.Context, blockNumber uint64) (*rpc.Subscription, error) { - // ensure that the RPC connection supports subscriptions - notifier, supported := rpc.NotifierFromContext(ctx) - if !supported { - return nil, rpc.ErrNotificationsUnsupported - } - - // create subscription and start waiting for events - rpcSub := notifier.CreateSubscription() +// StreamCodeAndCodeHash writes all of the codehash=>code pairs at a given block to a websocket channel. +func (api *PublicAPI) StreamCodeAndCodeHash(ctx context.Context, blockNumber uint64) (<-chan types.CodeAndCodeHash, error) { payloadChan := make(chan types.CodeAndCodeHash, chainEventChanSize) - quitChan := make(chan bool) + clientChan := make(chan types.CodeAndCodeHash, chainEventChanSize) + quitChan := make(chan bool, 1) api.sds.StreamCodeAndCodeHash(blockNumber, payloadChan, quitChan) + go func() { + defer close(clientChan) + defer close(payloadChan) + for { select { case payload := <-payloadChan: - if err := notifier.Notify(rpcSub.ID, payload); err != nil { - log.Error("Failed to send code and codehash packet", "err", err) - return - } - case err := <-rpcSub.Err(): - log.Error("State diff service rpcSub error", "err", err) + clientChan <- payload + case <-ctx.Done(): return case <-quitChan: return @@ -132,11 +111,11 @@ func (api *PublicStateDiffAPI) StreamCodeAndCodeHash(ctx context.Context, blockN } }() - return rpcSub, nil + return clientChan, nil } // WriteStateDiffAt writes a state diff object directly to DB at the specific blockheight -func (api *PublicStateDiffAPI) WriteStateDiffAt(ctx context.Context, blockNumber uint64, params Params) JobID { +func (api *PublicAPI) WriteStateDiffAt(ctx context.Context, blockNumber uint64, params Params) JobID { var err error start, logger := countApiRequestBegin("writeStateDiffAt", blockNumber) defer countApiRequestEnd(start, logger, err) @@ -145,62 +124,44 @@ func (api *PublicStateDiffAPI) WriteStateDiffAt(ctx context.Context, blockNumber } // WriteStateDiffFor writes a state diff object directly to DB for the specific block hash -func (api *PublicStateDiffAPI) WriteStateDiffFor(ctx context.Context, blockHash common.Hash, params Params) error { +func (api *PublicAPI) WriteStateDiffFor(ctx context.Context, blockHash common.Hash, params Params) error { var err error - start, logger := countApiRequestBegin("writeStateDiffFor", blockHash.Hex()) + start, logger := countApiRequestBegin("writeStateDiffFor", blockHash.String()) defer countApiRequestEnd(start, logger, err) err = api.sds.WriteStateDiffFor(blockHash, params) return err } -// WatchAddress changes the list of watched addresses to which the direct indexing is restricted according to given operation -func (api *PublicStateDiffAPI) WatchAddress(operation types.OperationType, args []types.WatchAddressArg) error { +// WatchAddress changes the list of watched addresses to which the direct indexing is restricted +// for the given operation. +func (api *PublicAPI) WatchAddress(operation types.OperationType, args []types.WatchAddressArg) error { return api.sds.WatchAddress(operation, args) } // StreamWrites sets up a subscription that streams the status of completed calls to WriteStateDiff* -func (api *PublicStateDiffAPI) StreamWrites(ctx context.Context) (*rpc.Subscription, error) { - // ensure that the RPC connection supports subscriptions - notifier, supported := rpc.NotifierFromContext(ctx) - if !supported { - return nil, rpc.ErrNotificationsUnsupported - } - - // create subscription and start waiting for events - rpcSub := notifier.CreateSubscription() +func (api *PublicAPI) StreamWrites(ctx context.Context) (<-chan JobStatus, error) { + // subscribe to events from the statediff service + statusChan := make(chan JobStatus, chainEventChanSize) + clientChan := make(chan JobStatus, chainEventChanSize) + id := api.sds.SubscribeWriteStatus(statusChan) go func() { - // subscribe to events from the statediff service - statusChan := make(chan JobStatus, chainEventChanSize) - quitChan := make(chan bool, 1) - api.sds.SubscribeWriteStatus(rpcSub.ID, statusChan, quitChan) - - var err error defer func() { - if err = api.sds.UnsubscribeWriteStatus(rpcSub.ID); err != nil { - log.Error("Failed to unsubscribe from job status stream: " + err.Error()) - } + close(statusChan) + close(clientChan) }() - // loop and await payloads and relay them to the subscriber with the notifier + for { select { case status := <-statusChan: - if err = notifier.Notify(rpcSub.ID, status); err != nil { - log.Error("Failed to send job status; error: " + err.Error()) - return - } - case err = <-rpcSub.Err(): - if err != nil { - log.Error("statediff_StreamWrites RPC subscription error: " + err.Error()) - return - } - case <-quitChan: - // don't need to unsubscribe, service does so before sending the quit signal + clientChan <- status + case <-ctx.Done(): + api.sds.UnsubscribeWriteStatus(id) return } } }() - return rpcSub, nil + return clientChan, nil } diff --git a/blockchain.go b/blockchain.go new file mode 100644 index 0000000..e5f4ef6 --- /dev/null +++ b/blockchain.go @@ -0,0 +1,124 @@ +package statediff + +import ( + "context" + "encoding/json" + "math/big" + + "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/event" + "github.com/ethereum/go-ethereum/params" + + plugeth "github.com/openrelayxyz/plugeth-utils/core" + "github.com/openrelayxyz/plugeth-utils/restricted" + + "github.com/cerc-io/plugeth-statediff/adapt" + "github.com/cerc-io/plugeth-statediff/utils" +) + +type BlockChain interface { + SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription + CurrentBlock() *types.Header + GetBlockByHash(hash common.Hash) *types.Block + GetBlockByNumber(number uint64) *types.Block + GetReceiptsByHash(hash common.Hash) types.Receipts + GetTd(hash common.Hash, number uint64) *big.Int + // TODO LockTrie is never used + // UnlockTrie(root core.Hash) + StateCache() adapt.StateView +} + +// pluginBlockChain adapts the plugeth Backend to the blockChain interface +type pluginBlockChain struct { + restricted.Backend + ctx context.Context +} + +func NewPluginBlockChain(backend restricted.Backend) BlockChain { + return &pluginBlockChain{ + Backend: backend, + ctx: context.Background(), + } +} + +func (b *pluginBlockChain) SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription { + bufferChan := make(chan plugeth.ChainEvent, chainEventChanSize) + sub := b.Backend.SubscribeChainEvent(bufferChan) + go func() { + for event := range bufferChan { + block := utils.MustDecode[types.Block](event.Block) + // TODO: apparently we ignore the logs + // logs := utils.MustDecode[types.Log](chainEvent.Logs) + ch <- core.ChainEvent{ + Block: block, + Hash: common.Hash(event.Hash), + } + } + }() + return sub +} + +func (b *pluginBlockChain) CurrentBlock() *types.Header { + buf := b.Backend.CurrentBlock() + return utils.MustDecode[types.Header](buf) +} + +func (b *pluginBlockChain) GetBlockByHash(hash common.Hash) *types.Block { + buf, err := b.Backend.BlockByHash(b.ctx, plugeth.Hash(hash)) + if err != nil { + panic(err) + } + return utils.MustDecode[types.Block](buf) +} + +func (b *pluginBlockChain) GetBlockByNumber(number uint64) *types.Block { + buf, err := b.Backend.BlockByNumber(b.ctx, int64(number)) + if err != nil { + panic(err) + } + return utils.MustDecode[types.Block](buf) +} + +func (b *pluginBlockChain) GetReceiptsByHash(hash common.Hash) types.Receipts { + buf, err := b.Backend.GetReceipts(b.ctx, plugeth.Hash(hash)) + if err != nil { + panic(err) + } + var receipts types.Receipts + err = json.Unmarshal(buf, &receipts) + if err != nil { + panic(err) + } + return receipts +} + +func (b *pluginBlockChain) GetTd(hash common.Hash, number uint64) *big.Int { + return b.Backend.GetTd(b.ctx, plugeth.Hash(hash)) +} + +func (b *pluginBlockChain) StateCache() adapt.StateView { + return &pluginStateView{backend: b} +} + +func (b *pluginBlockChain) ChainConfig() *params.ChainConfig { + return adapt.ChainConfig(b.Backend.ChainConfig()) +} + +// exposes a StateView from a combination of plugeth's core Backend and cached contract code +type pluginStateView struct { + backend *pluginBlockChain +} + +func (p *pluginStateView) OpenTrie(root common.Hash) (adapt.StateTrie, error) { + t, err := p.backend.GetTrie(plugeth.Hash(root)) + if err != nil { + return nil, err + } + return adapt.NewStateTrie(t), nil +} + +func (p *pluginStateView) ContractCode(hash common.Hash) ([]byte, error) { + return p.backend.GetContractCode(plugeth.Hash(hash)) +} diff --git a/builder.go b/builder.go index 6299edb..7bc97d6 100644 --- a/builder.go +++ b/builder.go @@ -21,80 +21,83 @@ package statediff import ( "bytes" + "encoding/hex" "fmt" "time" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - metrics2 "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - ipld2 "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - "github.com/ethereum/go-ethereum/statediff/trie_helpers" - types2 "github.com/ethereum/go-ethereum/statediff/types" "github.com/ethereum/go-ethereum/trie" + + "github.com/cerc-io/plugeth-statediff/adapt" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/trie_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils" + "github.com/cerc-io/plugeth-statediff/utils/log" ) var ( emptyNode, _ = rlp.EncodeToBytes(&[]byte{}) emptyContractRoot = crypto.Keccak256Hash(emptyNode) nullCodeHash = crypto.Keccak256Hash([]byte{}).Bytes() - nullNodeHash = common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000000") + zeroHash common.Hash ) // Builder interface exposes the method for building a state diff between two blocks type Builder interface { - BuildStateDiffObject(args Args, params Params) (types2.StateObject, error) - WriteStateDiffObject(args Args, params Params, output types2.StateNodeSink, ipldOutput types2.IPLDSink) error + BuildStateDiffObject(args Args, params Params) (sdtypes.StateObject, error) + WriteStateDiffObject(args Args, params Params, output sdtypes.StateNodeSink, ipldOutput sdtypes.IPLDSink) error } type StateDiffBuilder struct { - StateCache state.Database + StateCache adapt.StateView } type IterPair struct { Older, Newer trie.NodeIterator } -func StateNodeAppender(nodes *[]types2.StateLeafNode) types2.StateNodeSink { - return func(node types2.StateLeafNode) error { +func StateNodeAppender(nodes *[]sdtypes.StateLeafNode) sdtypes.StateNodeSink { + return func(node sdtypes.StateLeafNode) error { *nodes = append(*nodes, node) return nil } } -func StorageNodeAppender(nodes *[]types2.StorageLeafNode) types2.StorageNodeSink { - return func(node types2.StorageLeafNode) error { +func StorageNodeAppender(nodes *[]sdtypes.StorageLeafNode) sdtypes.StorageNodeSink { + return func(node sdtypes.StorageLeafNode) error { *nodes = append(*nodes, node) return nil } } -func IPLDMappingAppender(iplds *[]types2.IPLD) types2.IPLDSink { - return func(c types2.IPLD) error { +func IPLDMappingAppender(iplds *[]sdtypes.IPLD) sdtypes.IPLDSink { + return func(c sdtypes.IPLD) error { *iplds = append(*iplds, c) return nil } } // NewBuilder is used to create a statediff builder -func NewBuilder(stateCache state.Database) Builder { +func NewBuilder(stateCache adapt.StateView) Builder { return &StateDiffBuilder{ StateCache: stateCache, // state cache is safe for concurrent reads } } // BuildStateDiffObject builds a statediff object from two blocks and the provided parameters -func (sdb *StateDiffBuilder) BuildStateDiffObject(args Args, params Params) (types2.StateObject, error) { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildStateDiffObjectTimer) - var stateNodes []types2.StateLeafNode - var iplds []types2.IPLD +func (sdb *StateDiffBuilder) BuildStateDiffObject(args Args, params Params) (sdtypes.StateObject, error) { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildStateDiffObjectTimer) + var stateNodes []sdtypes.StateLeafNode + var iplds []sdtypes.IPLD err := sdb.WriteStateDiffObject(args, params, StateNodeAppender(&stateNodes), IPLDMappingAppender(&iplds)) if err != nil { - return types2.StateObject{}, err + return sdtypes.StateObject{}, err } - return types2.StateObject{ + return sdtypes.StateObject{ BlockHash: args.BlockHash, BlockNumber: args.BlockNumber, Nodes: stateNodes, @@ -103,17 +106,17 @@ func (sdb *StateDiffBuilder) BuildStateDiffObject(args Args, params Params) (typ } // WriteStateDiffObject writes a statediff object to output sinks -func (sdb *StateDiffBuilder) WriteStateDiffObject(args Args, params Params, output types2.StateNodeSink, - ipldOutput types2.IPLDSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.WriteStateDiffObjectTimer) +func (sdb *StateDiffBuilder) WriteStateDiffObject(args Args, params Params, output sdtypes.StateNodeSink, + ipldOutput sdtypes.IPLDSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.WriteStateDiffObjectTimer) // Load tries for old and new states oldTrie, err := sdb.StateCache.OpenTrie(args.OldStateRoot) if err != nil { - return fmt.Errorf("error creating trie for oldStateRoot: %v", err) + return fmt.Errorf("error creating trie for oldStateRoot: %w", err) } newTrie, err := sdb.StateCache.OpenTrie(args.NewStateRoot) if err != nil { - return fmt.Errorf("error creating trie for newStateRoot: %v", err) + return fmt.Errorf("error creating trie for newStateRoot: %w", err) } // we do two state trie iterations: @@ -131,21 +134,21 @@ func (sdb *StateDiffBuilder) WriteStateDiffObject(args Args, params Params, outp }, } - logger := log.New("hash", args.BlockHash.Hex(), "number", args.BlockNumber) - return sdb.BuildStateDiffWithIntermediateStateNodes(iterPairs, params, output, ipldOutput, logger, nil) + logger := log.New("hash", args.BlockHash.String(), "number", args.BlockNumber) + return sdb.BuildStateDiff(iterPairs, params, output, ipldOutput, logger, nil) } -func (sdb *StateDiffBuilder) BuildStateDiffWithIntermediateStateNodes(iterPairs []IterPair, params Params, - output types2.StateNodeSink, ipldOutput types2.IPLDSink, logger log.Logger, prefixPath []byte) error { - logger.Debug("statediff BEGIN BuildStateDiffWithIntermediateStateNodes") - defer metrics2.ReportAndUpdateDuration("statediff END BuildStateDiffWithIntermediateStateNodes", time.Now(), logger, metrics2.IndexerMetrics.BuildStateDiffWithIntermediateStateNodesTimer) +func (sdb *StateDiffBuilder) BuildStateDiff(iterPairs []IterPair, params Params, + output sdtypes.StateNodeSink, ipldOutput sdtypes.IPLDSink, logger log.Logger, prefixPath []byte) error { + logger.Debug("statediff BEGIN BuildStateDiff") + defer metrics.ReportAndUpdateDuration("statediff END BuildStateDiff", time.Now(), logger, metrics.IndexerMetrics.BuildStateDiffTimer) // collect a slice of all the nodes that were touched and exist at B (B-A) // a map of their leafkey to all the accounts that were touched and exist at B // and a slice of all the paths for the nodes in both of the above sets diffAccountsAtB, err := sdb.createdAndUpdatedState( iterPairs[0].Older, iterPairs[0].Newer, params.watchedAddressesLeafPaths, ipldOutput, logger, prefixPath) if err != nil { - return fmt.Errorf("error collecting createdAndUpdatedNodes: %v", err) + return fmt.Errorf("error collecting createdAndUpdatedNodes: %w", err) } // collect a slice of all the nodes that existed at a path in A that doesn't exist in B @@ -154,14 +157,14 @@ func (sdb *StateDiffBuilder) BuildStateDiffWithIntermediateStateNodes(iterPairs iterPairs[1].Older, iterPairs[1].Newer, diffAccountsAtB, params.watchedAddressesLeafPaths, output, logger, prefixPath) if err != nil { - return fmt.Errorf("error collecting deletedOrUpdatedNodes: %v", err) + return fmt.Errorf("error collecting deletedOrUpdatedNodes: %w", err) } // collect and sort the leafkey keys for both account mappings into a slice t := time.Now() createKeys := trie_helpers.SortKeys(diffAccountsAtB) deleteKeys := trie_helpers.SortKeys(diffAccountsAtA) - logger.Debug(fmt.Sprintf("statediff BuildStateDiffWithIntermediateStateNodes sort duration=%dms", time.Since(t).Milliseconds())) + logger.Debug("statediff BuildStateDiff sort", "duration", time.Since(t)) // and then find the intersection of these keys // these are the leafkeys for the accounts which exist at both A and B but are different @@ -169,19 +172,19 @@ func (sdb *StateDiffBuilder) BuildStateDiffWithIntermediateStateNodes(iterPairs // and leaving the truly created or deleted keys in place t = time.Now() updatedKeys := trie_helpers.FindIntersection(createKeys, deleteKeys) - logger.Debug(fmt.Sprintf("statediff BuildStateDiffWithIntermediateStateNodes intersection count=%d duration=%dms", - len(updatedKeys), - time.Since(t).Milliseconds())) + logger.Debug("statediff BuildStateDiff intersection", + "count", len(updatedKeys), + "duration", time.Since(t)) // build the diff nodes for the updated accounts using the mappings at both A and B as directed by the keys found as the intersection of the two err = sdb.buildAccountUpdates(diffAccountsAtB, diffAccountsAtA, updatedKeys, output, ipldOutput, logger) if err != nil { - return fmt.Errorf("error building diff for updated accounts: %v", err) + return fmt.Errorf("error building diff for updated accounts: %w", err) } // build the diff nodes for created accounts err = sdb.buildAccountCreations(diffAccountsAtB, output, ipldOutput, logger) if err != nil { - return fmt.Errorf("error building diff for created accounts: %v", err) + return fmt.Errorf("error building diff for created accounts: %w", err) } return nil } @@ -191,22 +194,23 @@ func (sdb *StateDiffBuilder) BuildStateDiffWithIntermediateStateNodes(iterPairs // a mapping of their leafkeys to all the accounts that exist in a different state at B than A // and a slice of the paths for all of the nodes included in both func (sdb *StateDiffBuilder) createdAndUpdatedState(a, b trie.NodeIterator, - watchedAddressesLeafPaths [][]byte, output types2.IPLDSink, logger log.Logger, prefixPath []byte) (types2.AccountMap, error) { + watchedAddressesLeafPaths [][]byte, output sdtypes.IPLDSink, logger log.Logger, prefixPath []byte) (sdtypes.AccountMap, error) { logger.Debug("statediff BEGIN createdAndUpdatedState") - defer metrics2.ReportAndUpdateDuration("statediff END createdAndUpdatedState", time.Now(), logger, metrics2.IndexerMetrics.CreatedAndUpdatedStateTimer) - diffAccountsAtB := make(types2.AccountMap) - watchingAddresses := len(watchedAddressesLeafPaths) > 0 + defer metrics.ReportAndUpdateDuration("statediff END createdAndUpdatedState", time.Now(), logger, metrics.IndexerMetrics.CreatedAndUpdatedStateTimer) + diffAccountsAtB := make(sdtypes.AccountMap) + // cache the RLP of the previous node, so when we hit a leaf we have the parent (containing) node + var prevBlob []byte it, itCount := trie.NewDifferenceIterator(a, b) for it.Next(true) { // ignore node if it is not along paths of interest - if watchingAddresses && !isValidPrefixPath(watchedAddressesLeafPaths, append(prefixPath, it.Path()...)) { + if !isWatchedPathPrefix(watchedAddressesLeafPaths, it.Path()) { continue } // index values by leaf key if it.Leaf() { // if it is a "value" node, we will index the value by leaf key - accountW, err := sdb.processStateValueNode(it, watchedAddressesLeafPaths, prefixPath) + accountW, err := sdb.processStateValueNode(it, prevBlob) if err != nil { return nil, err } @@ -216,14 +220,17 @@ func (sdb *StateDiffBuilder) createdAndUpdatedState(a, b trie.NodeIterator, // for now, just add it to diffAccountsAtB // we will compare to diffAccountsAtA to determine which diffAccountsAtB // were creations and which were updates and also identify accounts that were removed going A->B - diffAccountsAtB[common.Bytes2Hex(accountW.LeafKey)] = *accountW - } else { // trie nodes will be written to blockstore only - // reminder that this includes leaf nodes, since the geth iterator.Leaf() actually signifies a "value" node - if bytes.Equal(it.Hash().Bytes(), nullNodeHash) { + diffAccountsAtB[hex.EncodeToString(accountW.LeafKey)] = *accountW + } else { + // trie nodes will be written to blockstore only + // reminder that this includes leaf nodes, since the geth iterator.Leaf() actually + // signifies a "value" node + if it.Hash() == zeroHash { continue } nodeVal := make([]byte, len(it.NodeBlob())) copy(nodeVal, it.NodeBlob()) + // if doing a selective diff, we need to ensure this is a watched path if len(watchedAddressesLeafPaths) > 0 { var elements []interface{} if err := rlp.DecodeBytes(nodeVal, &elements); err != nil { @@ -233,103 +240,74 @@ func (sdb *StateDiffBuilder) createdAndUpdatedState(a, b trie.NodeIterator, if err != nil { return nil, err } - if ok { - nodePath := append(prefixPath, it.Path()...) - partialPath := trie.CompactToHex(elements[0].([]byte)) - valueNodePath := append(nodePath, partialPath...) - if !isWatchedAddress(watchedAddressesLeafPaths, valueNodePath) { - continue - } + partialPath := utils.CompactToHex(elements[0].([]byte)) + valueNodePath := append(it.Path(), partialPath...) + if ok && !isWatchedPath(watchedAddressesLeafPaths, valueNodePath) { + continue } } - nodeHash := make([]byte, len(it.Hash().Bytes())) - copy(nodeHash, it.Hash().Bytes()) - if err := output(types2.IPLD{ - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, nodeHash).String(), + if err := output(sdtypes.IPLD{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, it.Hash().Bytes()).String(), Content: nodeVal, }); err != nil { return nil, err } + prevBlob = nodeVal } } - logger.Debug("statediff COUNTS createdAndUpdatedStateWithIntermediateNodes", "it", itCount, "diffAccountsAtB", len(diffAccountsAtB)) - metrics2.IndexerMetrics.DifferenceIteratorCounter.Inc(int64(*itCount)) + logger.Debug("statediff COUNTS createdAndUpdatedState", "it", itCount, "diffAccountsAtB", len(diffAccountsAtB)) + metrics.IndexerMetrics.DifferenceIteratorCounter.Inc(int64(*itCount)) return diffAccountsAtB, it.Error() } -// reminder: it.Leaf() == true when the iterator is positioned at a "value node" which is not something that actually exists in an MMPT -func (sdb *StateDiffBuilder) processStateValueNode(it trie.NodeIterator, watchedAddressesLeafPaths [][]byte, prefixPath []byte) (*types2.AccountWrapper, error) { - // skip if it is not a watched address - // If we aren't watching any specific addresses, we are watching everything - if len(watchedAddressesLeafPaths) > 0 && !isWatchedAddress(watchedAddressesLeafPaths, append(prefixPath, it.Path()...)) { - return nil, nil - } - - // since this is a "value node", we need to move up to the "parent" node which is the actual leaf node - // it should be in the fastcache since it necessarily was recently accessed to reach the current node - parentNodeRLP, err := sdb.StateCache.TrieDB().Node(it.Parent()) - if err != nil { - return nil, err - } - var nodeElements []interface{} - if err = rlp.DecodeBytes(parentNodeRLP, &nodeElements); err != nil { - return nil, err - } - parentSubPath := make([]byte, len(it.ParentPath())) - copy(parentSubPath, it.ParentPath()) - parentPath := append(prefixPath, parentSubPath...) - partialPath := trie.CompactToHex(nodeElements[0].([]byte)) - valueNodePath := append(parentPath, partialPath...) - encodedPath := trie.HexToCompact(valueNodePath) - leafKey := encodedPath[1:] - +// decodes account at leaf and encodes RLP data to CID +// reminder: it.Leaf() == true when the iterator is positioned at a "value node" (which is not something +// that actually exists in an MMPT), therefore we pass the parent node blob as the leaf RLP. +func (sdb *StateDiffBuilder) processStateValueNode(it trie.NodeIterator, parentBlob []byte) (*sdtypes.AccountWrapper, error) { var account types.StateAccount - accountRLP := make([]byte, len(it.LeafBlob())) - copy(accountRLP, it.LeafBlob()) - if err := rlp.DecodeBytes(accountRLP, &account); err != nil { - return nil, fmt.Errorf("error decoding account for leaf value at leaf key %x\nerror: %v", leafKey, err) + if err := rlp.DecodeBytes(it.LeafBlob(), &account); err != nil { + return nil, fmt.Errorf("error decoding account at leaf key %x: %w", it.LeafKey(), err) } - return &types2.AccountWrapper{ - LeafKey: leafKey, + return &sdtypes.AccountWrapper{ + LeafKey: it.LeafKey(), Account: &account, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(parentNodeRLP)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(parentBlob)).String(), }, nil } -// deletedOrUpdatedState returns a slice of all the pathes that are emptied at B +// deletedOrUpdatedState returns a slice of all the paths that are emptied at B // and a mapping of their leafkeys to all the accounts that exist in a different state at A than B -func (sdb *StateDiffBuilder) deletedOrUpdatedState(a, b trie.NodeIterator, diffAccountsAtB types2.AccountMap, - watchedAddressesLeafPaths [][]byte, output types2.StateNodeSink, logger log.Logger, prefixPath []byte) (types2.AccountMap, error) { +func (sdb *StateDiffBuilder) deletedOrUpdatedState(a, b trie.NodeIterator, diffAccountsAtB sdtypes.AccountMap, + watchedAddressesLeafPaths [][]byte, output sdtypes.StateNodeSink, logger log.Logger, prefixPath []byte) (sdtypes.AccountMap, error) { logger.Debug("statediff BEGIN deletedOrUpdatedState") - defer metrics2.ReportAndUpdateDuration("statediff END deletedOrUpdatedState", time.Now(), logger, metrics2.IndexerMetrics.DeletedOrUpdatedStateTimer) - diffAccountAtA := make(types2.AccountMap) - watchingAddresses := len(watchedAddressesLeafPaths) > 0 + defer metrics.ReportAndUpdateDuration("statediff END deletedOrUpdatedState", time.Now(), logger, metrics.IndexerMetrics.DeletedOrUpdatedStateTimer) + diffAccountAtA := make(sdtypes.AccountMap) + var prevBlob []byte it, _ := trie.NewDifferenceIterator(b, a) for it.Next(true) { - // ignore node if it is not along paths of interest - if watchingAddresses && !isValidPrefixPath(watchedAddressesLeafPaths, append(prefixPath, it.Path()...)) { + if !isWatchedPathPrefix(watchedAddressesLeafPaths, it.Path()) { continue } if it.Leaf() { - accountW, err := sdb.processStateValueNode(it, watchedAddressesLeafPaths, prefixPath) + accountW, err := sdb.processStateValueNode(it, prevBlob) if err != nil { return nil, err } if accountW == nil { continue } - leafKey := common.Bytes2Hex(accountW.LeafKey) + leafKey := hex.EncodeToString(accountW.LeafKey) diffAccountAtA[leafKey] = *accountW // if this node's leaf key did not show up in diffAccountsAtB // that means the account was deleted // in that case, emit an empty "removed" diff state node // include empty "removed" diff storage nodes for all the storage slots if _, ok := diffAccountsAtB[leafKey]; !ok { - diff := types2.StateLeafNode{ - AccountWrapper: types2.AccountWrapper{ + diff := sdtypes.StateLeafNode{ + AccountWrapper: sdtypes.AccountWrapper{ Account: nil, LeafKey: accountW.LeafKey, CID: shared.RemovedNodeStateCID, @@ -337,16 +315,19 @@ func (sdb *StateDiffBuilder) deletedOrUpdatedState(a, b trie.NodeIterator, diffA Removed: true, } - storageDiff := make([]types2.StorageLeafNode, 0) + storageDiff := make([]sdtypes.StorageLeafNode, 0) err := sdb.buildRemovedAccountStorageNodes(accountW.Account.Root, StorageNodeAppender(&storageDiff)) if err != nil { - return nil, fmt.Errorf("failed building storage diffs for removed state account with key %x\r\nerror: %v", leafKey, err) + return nil, fmt.Errorf("failed building storage diffs for removed state account with key %x\r\nerror: %w", leafKey, err) } diff.StorageDiff = storageDiff if err := output(diff); err != nil { return nil, err } } + } else { + prevBlob = make([]byte, len(it.NodeBlob())) + copy(prevBlob, it.NodeBlob()) } } return diffAccountAtA, it.Error() @@ -356,25 +337,27 @@ func (sdb *StateDiffBuilder) deletedOrUpdatedState(a, b trie.NodeIterator, diffA // to generate the statediff node objects for all of the accounts that existed at both A and B but in different states // needs to be called before building account creations and deletions as this mutates // those account maps to remove the accounts which were updated -func (sdb *StateDiffBuilder) buildAccountUpdates(creations, deletions types2.AccountMap, updatedKeys []string, - output types2.StateNodeSink, ipldOutput types2.IPLDSink, logger log.Logger) error { - logger.Debug("statediff BEGIN buildAccountUpdates", "creations", len(creations), "deletions", len(deletions), "updatedKeys", len(updatedKeys)) - defer metrics2.ReportAndUpdateDuration("statediff END buildAccountUpdates ", time.Now(), logger, metrics2.IndexerMetrics.BuildAccountUpdatesTimer) +func (sdb *StateDiffBuilder) buildAccountUpdates(creations, deletions sdtypes.AccountMap, updatedKeys []string, + output sdtypes.StateNodeSink, ipldOutput sdtypes.IPLDSink, logger log.Logger) error { + logger.Debug("statediff BEGIN buildAccountUpdates", + "creations", len(creations), "deletions", len(deletions), "updated", len(updatedKeys)) + defer metrics.ReportAndUpdateDuration("statediff END buildAccountUpdates ", + time.Now(), logger, metrics.IndexerMetrics.BuildAccountUpdatesTimer) var err error for _, key := range updatedKeys { createdAcc := creations[key] deletedAcc := deletions[key] - storageDiff := make([]types2.StorageLeafNode, 0) + storageDiff := make([]sdtypes.StorageLeafNode, 0) if deletedAcc.Account != nil && createdAcc.Account != nil { - oldSR := deletedAcc.Account.Root - newSR := createdAcc.Account.Root err = sdb.buildStorageNodesIncremental( - oldSR, newSR, StorageNodeAppender(&storageDiff), ipldOutput) + deletedAcc.Account.Root, createdAcc.Account.Root, + StorageNodeAppender(&storageDiff), ipldOutput, + ) if err != nil { - return fmt.Errorf("failed building incremental storage diffs for account with leafkey %s\r\nerror: %v", key, err) + return fmt.Errorf("failed building incremental storage diffs for account with leafkey %x\r\nerror: %w", key, err) } } - if err = output(types2.StateLeafNode{ + if err = output(sdtypes.StateLeafNode{ AccountWrapper: createdAcc, Removed: false, StorageDiff: storageDiff, @@ -390,31 +373,32 @@ func (sdb *StateDiffBuilder) buildAccountUpdates(creations, deletions types2.Acc // buildAccountCreations returns the statediff node objects for all the accounts that exist at B but not at A // it also returns the code and codehash for created contract accounts -func (sdb *StateDiffBuilder) buildAccountCreations(accounts types2.AccountMap, output types2.StateNodeSink, - ipldOutput types2.IPLDSink, logger log.Logger) error { +func (sdb *StateDiffBuilder) buildAccountCreations(accounts sdtypes.AccountMap, output sdtypes.StateNodeSink, + ipldOutput sdtypes.IPLDSink, logger log.Logger) error { logger.Debug("statediff BEGIN buildAccountCreations") - defer metrics2.ReportAndUpdateDuration("statediff END buildAccountCreations", time.Now(), logger, metrics2.IndexerMetrics.BuildAccountCreationsTimer) + defer metrics.ReportAndUpdateDuration("statediff END buildAccountCreations", + time.Now(), logger, metrics.IndexerMetrics.BuildAccountCreationsTimer) for _, val := range accounts { - diff := types2.StateLeafNode{ + diff := sdtypes.StateLeafNode{ AccountWrapper: val, Removed: false, } if !bytes.Equal(val.Account.CodeHash, nullCodeHash) { // For contract creations, any storage node contained is a diff - storageDiff := make([]types2.StorageLeafNode, 0) + storageDiff := make([]sdtypes.StorageLeafNode, 0) err := sdb.buildStorageNodesEventual(val.Account.Root, StorageNodeAppender(&storageDiff), ipldOutput) if err != nil { - return fmt.Errorf("failed building eventual storage diffs for node with leaf key %x\r\nerror: %v", val.LeafKey, err) + return fmt.Errorf("failed building eventual storage diffs for node with leaf key %x\r\nerror: %w", val.LeafKey, err) } diff.StorageDiff = storageDiff // emit codehash => code mappings for contract codeHash := common.BytesToHash(val.Account.CodeHash) - code, err := sdb.StateCache.ContractCode(common.Hash{}, codeHash) + code, err := sdb.StateCache.ContractCode(codeHash) if err != nil { - return fmt.Errorf("failed to retrieve code for codehash %s\r\n error: %v", codeHash.String(), err) + return fmt.Errorf("failed to retrieve code for codehash %x\r\n error: %w", codeHash, err) } - if err := ipldOutput(types2.IPLD{ - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, codeHash.Bytes()).String(), + if err := ipldOutput(sdtypes.IPLD{ + CID: ipld.Keccak256ToCid(ipld.RawBinary, codeHash.Bytes()).String(), Content: code, }); err != nil { return err @@ -430,106 +414,89 @@ func (sdb *StateDiffBuilder) buildAccountCreations(accounts types2.AccountMap, o // buildStorageNodesEventual builds the storage diff node objects for a created account // i.e. it returns all the storage nodes at this state, since there is no previous state -func (sdb *StateDiffBuilder) buildStorageNodesEventual(sr common.Hash, output types2.StorageNodeSink, - ipldOutput types2.IPLDSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildStorageNodesEventualTimer) - if bytes.Equal(sr.Bytes(), emptyContractRoot.Bytes()) { +func (sdb *StateDiffBuilder) buildStorageNodesEventual(sr common.Hash, output sdtypes.StorageNodeSink, + ipldOutput sdtypes.IPLDSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildStorageNodesEventualTimer) + if sr == emptyContractRoot { return nil } - log.Debug("Storage Root For Eventual Diff", "root", sr.Hex()) + log.Debug("Storage root for eventual diff", "root", sr.String()) sTrie, err := sdb.StateCache.OpenTrie(sr) if err != nil { log.Info("error in build storage diff eventual", "error", err) return err } it := sTrie.NodeIterator(make([]byte, 0)) - err = sdb.buildStorageNodesFromTrie(it, output, ipldOutput) - if err != nil { - return err - } - return nil + return sdb.buildStorageNodesFromTrie(it, output, ipldOutput) } -// buildStorageNodesFromTrie returns all the storage diff node objects in the provided node interator -// including intermediate nodes can be turned on or off -func (sdb *StateDiffBuilder) buildStorageNodesFromTrie(it trie.NodeIterator, output types2.StorageNodeSink, - ipldOutput types2.IPLDSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildStorageNodesFromTrieTimer) +// buildStorageNodesFromTrie returns all the storage diff node objects in the provided node iterator +func (sdb *StateDiffBuilder) buildStorageNodesFromTrie(it trie.NodeIterator, output sdtypes.StorageNodeSink, + ipldOutput sdtypes.IPLDSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildStorageNodesFromTrieTimer) + + var prevBlob []byte for it.Next(true) { if it.Leaf() { - storageLeafNode, err := sdb.processStorageValueNode(it) - if err != nil { - return err - } + storageLeafNode := sdb.processStorageValueNode(it, prevBlob) if err := output(storageLeafNode); err != nil { return err } } else { nodeVal := make([]byte, len(it.NodeBlob())) copy(nodeVal, it.NodeBlob()) - nodeHash := make([]byte, len(it.Hash().Bytes())) - copy(nodeHash, it.Hash().Bytes()) - if err := ipldOutput(types2.IPLD{ - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, nodeHash).String(), + if err := ipldOutput(sdtypes.IPLD{ + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, it.Hash().Bytes()).String(), Content: nodeVal, }); err != nil { return err } + prevBlob = nodeVal } } return it.Error() } -// reminder: it.Leaf() == true when the iterator is positioned at a "value node" which is not something that actually exists in an MMPT -func (sdb *StateDiffBuilder) processStorageValueNode(it trie.NodeIterator) (types2.StorageLeafNode, error) { - // skip if it is not a watched address +// decodes account at leaf and encodes RLP data to CID +// reminder: it.Leaf() == true when the iterator is positioned at a "value node" (which is not something +// that actually exists in an MMPT), therefore we pass the parent node blob as the leaf RLP. +func (sdb *StateDiffBuilder) processStorageValueNode(it trie.NodeIterator, parentBlob []byte) sdtypes.StorageLeafNode { leafKey := make([]byte, len(it.LeafKey())) copy(leafKey, it.LeafKey()) value := make([]byte, len(it.LeafBlob())) copy(value, it.LeafBlob()) - // since this is a "value node", we need to move up to the "parent" node which is the actual leaf node - // it should be in the fastcache since it necessarily was recently accessed to reach the current node - parentNodeRLP, err := sdb.StateCache.TrieDB().Node(it.Parent()) - if err != nil { - return types2.StorageLeafNode{}, err - } - - return types2.StorageLeafNode{ + return sdtypes.StorageLeafNode{ LeafKey: leafKey, Value: value, - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(parentNodeRLP)).String(), - }, nil + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(parentBlob)).String(), + } } // buildRemovedAccountStorageNodes builds the "removed" diffs for all the storage nodes for a destroyed account -func (sdb *StateDiffBuilder) buildRemovedAccountStorageNodes(sr common.Hash, output types2.StorageNodeSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildRemovedAccountStorageNodesTimer) - if bytes.Equal(sr.Bytes(), emptyContractRoot.Bytes()) { +func (sdb *StateDiffBuilder) buildRemovedAccountStorageNodes(sr common.Hash, output sdtypes.StorageNodeSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildRemovedAccountStorageNodesTimer) + if sr == emptyContractRoot { return nil } - log.Debug("Storage Root For Removed Diffs", "root", sr.Hex()) + log.Debug("Storage root for removed diffs", "root", sr.String()) sTrie, err := sdb.StateCache.OpenTrie(sr) if err != nil { log.Info("error in build removed account storage diffs", "error", err) return err } it := sTrie.NodeIterator(make([]byte, 0)) - err = sdb.buildRemovedStorageNodesFromTrie(it, output) - if err != nil { - return err - } - return nil + return sdb.buildRemovedStorageNodesFromTrie(it, output) } // buildRemovedStorageNodesFromTrie returns diffs for all the storage nodes in the provided node interator -func (sdb *StateDiffBuilder) buildRemovedStorageNodesFromTrie(it trie.NodeIterator, output types2.StorageNodeSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildRemovedStorageNodesFromTrieTimer) +func (sdb *StateDiffBuilder) buildRemovedStorageNodesFromTrie(it trie.NodeIterator, output sdtypes.StorageNodeSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildRemovedStorageNodesFromTrieTimer) for it.Next(true) { if it.Leaf() { // only leaf values are indexed, don't need to demarcate removed intermediate nodes leafKey := make([]byte, len(it.LeafKey())) copy(leafKey, it.LeafKey()) - if err := output(types2.StorageLeafNode{ + if err := output(sdtypes.StorageLeafNode{ CID: shared.RemovedNodeStorageCID, Removed: true, LeafKey: leafKey, @@ -543,18 +510,18 @@ func (sdb *StateDiffBuilder) buildRemovedStorageNodesFromTrie(it trie.NodeIterat } // buildStorageNodesIncremental builds the storage diff node objects for all nodes that exist in a different state at B than A -func (sdb *StateDiffBuilder) buildStorageNodesIncremental(oldSR common.Hash, newSR common.Hash, output types2.StorageNodeSink, - ipldOutput types2.IPLDSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.BuildStorageNodesIncrementalTimer) - if bytes.Equal(newSR.Bytes(), oldSR.Bytes()) { +func (sdb *StateDiffBuilder) buildStorageNodesIncremental(oldroot common.Hash, newroot common.Hash, output sdtypes.StorageNodeSink, + ipldOutput sdtypes.IPLDSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.BuildStorageNodesIncrementalTimer) + if newroot == oldroot { return nil } - log.Trace("Storage Roots for Incremental Diff", "old", oldSR.Hex(), "new", newSR.Hex()) - oldTrie, err := sdb.StateCache.OpenTrie(oldSR) + log.Trace("Storage roots for incremental diff", "old", oldroot.String(), "new", newroot.String()) + oldTrie, err := sdb.StateCache.OpenTrie(oldroot) if err != nil { return err } - newTrie, err := sdb.StateCache.OpenTrie(newSR) + newTrie, err := sdb.StateCache.OpenTrie(newroot) if err != nil { return err } @@ -564,50 +531,46 @@ func (sdb *StateDiffBuilder) buildStorageNodesIncremental(oldSR common.Hash, new if err != nil { return err } - err = sdb.deletedOrUpdatedStorage(oldTrie.NodeIterator([]byte{}), newTrie.NodeIterator([]byte{}), + return sdb.deletedOrUpdatedStorage(oldTrie.NodeIterator([]byte{}), newTrie.NodeIterator([]byte{}), diffSlotsAtB, output) - if err != nil { - return err - } - return nil } -func (sdb *StateDiffBuilder) createdAndUpdatedStorage(a, b trie.NodeIterator, output types2.StorageNodeSink, - ipldOutput types2.IPLDSink) (map[string]bool, error) { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.CreatedAndUpdatedStorageTimer) +func (sdb *StateDiffBuilder) createdAndUpdatedStorage(a, b trie.NodeIterator, output sdtypes.StorageNodeSink, + ipldOutput sdtypes.IPLDSink) (map[string]bool, error) { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.CreatedAndUpdatedStorageTimer) diffSlotsAtB := make(map[string]bool) + + var prevBlob []byte it, _ := trie.NewDifferenceIterator(a, b) for it.Next(true) { if it.Leaf() { - storageLeafNode, err := sdb.processStorageValueNode(it) - if err != nil { - return nil, err - } + storageLeafNode := sdb.processStorageValueNode(it, prevBlob) if err := output(storageLeafNode); err != nil { return nil, err } - diffSlotsAtB[common.Bytes2Hex(storageLeafNode.LeafKey)] = true + diffSlotsAtB[hex.EncodeToString(storageLeafNode.LeafKey)] = true } else { - if bytes.Equal(it.Hash().Bytes(), nullNodeHash) { + if it.Hash() == zeroHash { continue } nodeVal := make([]byte, len(it.NodeBlob())) copy(nodeVal, it.NodeBlob()) nodeHash := make([]byte, len(it.Hash().Bytes())) copy(nodeHash, it.Hash().Bytes()) - if err := ipldOutput(types2.IPLD{ - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, nodeHash).String(), + if err := ipldOutput(sdtypes.IPLD{ + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, nodeHash).String(), Content: nodeVal, }); err != nil { return nil, err } + prevBlob = nodeVal } } return diffSlotsAtB, it.Error() } -func (sdb *StateDiffBuilder) deletedOrUpdatedStorage(a, b trie.NodeIterator, diffSlotsAtB map[string]bool, output types2.StorageNodeSink) error { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.DeletedOrUpdatedStorageTimer) +func (sdb *StateDiffBuilder) deletedOrUpdatedStorage(a, b trie.NodeIterator, diffSlotsAtB map[string]bool, output sdtypes.StorageNodeSink) error { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.DeletedOrUpdatedStorageTimer) it, _ := trie.NewDifferenceIterator(b, a) for it.Next(true) { if it.Leaf() { @@ -616,8 +579,8 @@ func (sdb *StateDiffBuilder) deletedOrUpdatedStorage(a, b trie.NodeIterator, dif // if this node's leaf key did not show up in diffSlotsAtB // that means the storage slot was vacated // in that case, emit an empty "removed" diff storage node - if _, ok := diffSlotsAtB[common.Bytes2Hex(leafKey)]; !ok { - if err := output(types2.StorageLeafNode{ + if _, ok := diffSlotsAtB[hex.EncodeToString(leafKey)]; !ok { + if err := output(sdtypes.StorageLeafNode{ CID: shared.RemovedNodeStorageCID, Removed: true, LeafKey: leafKey, @@ -631,26 +594,28 @@ func (sdb *StateDiffBuilder) deletedOrUpdatedStorage(a, b trie.NodeIterator, dif return it.Error() } -// isValidPrefixPath is used to check if a node at currentPath is a parent | ancestor to one of the addresses the builder is configured to watch -func isValidPrefixPath(watchedAddressesLeafPaths [][]byte, currentPath []byte) bool { - for _, watchedAddressPath := range watchedAddressesLeafPaths { - if bytes.HasPrefix(watchedAddressPath, currentPath) { +// isWatchedPathPrefix checks if a node path is a prefix (ancestor) to one of the watched addresses. +// An empty watch list means all paths are watched. +func isWatchedPathPrefix(watchedLeafPaths [][]byte, path []byte) bool { + if len(watchedLeafPaths) == 0 { + return true + } + for _, watched := range watchedLeafPaths { + if bytes.HasPrefix(watched, path) { return true } } - return false } -// isWatchedAddress is used to check if a state account corresponds to one of the addresses the builder is configured to watch -func isWatchedAddress(watchedAddressesLeafPaths [][]byte, valueNodePath []byte) bool { - defer metrics2.UpdateDuration(time.Now(), metrics2.IndexerMetrics.IsWatchedAddressTimer) - for _, watchedAddressPath := range watchedAddressesLeafPaths { - if bytes.Equal(watchedAddressPath, valueNodePath) { +// isWatchedPath checks if a node path corresponds to one of the watched addresses +func isWatchedPath(watchedLeafPaths [][]byte, leafPath []byte) bool { + defer metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.IsWatchedAddressTimer) + for _, watched := range watchedLeafPaths { + if bytes.Equal(watched, leafPath) { return true } } - return false } diff --git a/builder_test.go b/builder_test.go index 865da91..b4bb573 100644 --- a/builder_test.go +++ b/builder_test.go @@ -17,65 +17,62 @@ package statediff_test import ( - "bytes" - "encoding/json" - "fmt" + "encoding/hex" "math/big" - "os" - "sort" "testing" - ipld2 "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - - types2 "github.com/ethereum/go-ethereum/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" - "github.com/ethereum/go-ethereum/statediff" - "github.com/ethereum/go-ethereum/statediff/test_helpers" + + statediff "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/adapt" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/test_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils" ) var ( contractLeafKey []byte - emptyDiffs = make([]types2.StateLeafNode, 0) - emptyStorage = make([]types2.StorageLeafNode, 0) + emptyDiffs = make([]sdtypes.StateLeafNode, 0) + emptyStorage = make([]sdtypes.StorageLeafNode, 0) block0, block1, block2, block3, block4, block5, block6 *types.Block builder statediff.Builder minerAddress = common.HexToAddress("0x0") minerLeafKey = test_helpers.AddressToLeafKey(minerAddress) - slot0 = common.BigToHash(big.NewInt(0)) - slot1 = common.BigToHash(big.NewInt(1)) - slot2 = common.BigToHash(big.NewInt(2)) - slot3 = common.BigToHash(big.NewInt(3)) + slot0 = common.HexToHash("0") + slot1 = common.HexToHash("1") + slot2 = common.HexToHash("2") + slot3 = common.HexToHash("3") slot0StorageKey = crypto.Keccak256Hash(slot0[:]) slot1StorageKey = crypto.Keccak256Hash(slot1[:]) slot2StorageKey = crypto.Keccak256Hash(slot2[:]) slot3StorageKey = crypto.Keccak256Hash(slot3[:]) - slot0StorageValue = common.Hex2Bytes("94703c4b2bd70c169f5717101caee543299fc946c7") // prefixed AccountAddr1 - slot1StorageValue = common.Hex2Bytes("01") - slot2StorageValue = common.Hex2Bytes("09") - slot3StorageValue = common.Hex2Bytes("03") + slot0StorageValue, _ = hex.DecodeString("94703c4b2bd70c169f5717101caee543299fc946c7") // prefixed AccountAddr1 + slot1StorageValue, _ = hex.DecodeString("01") + slot2StorageValue, _ = hex.DecodeString("09") + slot3StorageValue, _ = hex.DecodeString("03") slot0StorageLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("390decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"), + utils.Hex2Bytes("390decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"), slot0StorageValue, }) slot1StorageLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("310e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"), + utils.Hex2Bytes("310e2d527612073b26eecdfd717e6a320cf44b4afac2b0732d9fcbe2b7fa0cf6"), slot1StorageValue, }) slot2StorageLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("305787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace"), + utils.Hex2Bytes("305787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace"), slot2StorageValue, }) slot3StorageLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("32575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b"), + utils.Hex2Bytes("32575a0e9e593c00f959f8c92f12db2869c3395a3b0502d05e2516446f71f85b"), slot3StorageValue, }) contractAccountAtBlock2 = &types.StateAccount{ @@ -86,7 +83,7 @@ var ( } contractAccountAtBlock2RLP, _ = rlp.EncodeToBytes(contractAccountAtBlock2) contractAccountAtBlock2LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), + utils.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), contractAccountAtBlock2RLP, }) contractAccountAtBlock3 = &types.StateAccount{ @@ -97,7 +94,7 @@ var ( } contractAccountAtBlock3RLP, _ = rlp.EncodeToBytes(contractAccountAtBlock3) contractAccountAtBlock3LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), + utils.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), contractAccountAtBlock3RLP, }) contractAccountAtBlock4 = &types.StateAccount{ @@ -108,7 +105,7 @@ var ( } contractAccountAtBlock4RLP, _ = rlp.EncodeToBytes(contractAccountAtBlock4) contractAccountAtBlock4LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), + utils.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), contractAccountAtBlock4RLP, }) contractAccountAtBlock5 = &types.StateAccount{ @@ -119,7 +116,7 @@ var ( } contractAccountAtBlock5RLP, _ = rlp.EncodeToBytes(contractAccountAtBlock5) contractAccountAtBlock5LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), + utils.Hex2Bytes("3114658a74d9cc9f7acf2c5cd696c3494d7c344d78bfec3add0d91ec4e8d1c45"), contractAccountAtBlock5RLP, }) minerAccountAtBlock1 = &types.StateAccount{ @@ -130,7 +127,7 @@ var ( } minerAccountAtBlock1RLP, _ = rlp.EncodeToBytes(minerAccountAtBlock1) minerAccountAtBlock1LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), + utils.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), minerAccountAtBlock1RLP, }) minerAccountAtBlock2 = &types.StateAccount{ @@ -141,7 +138,7 @@ var ( } minerAccountAtBlock2RLP, _ = rlp.EncodeToBytes(minerAccountAtBlock2) minerAccountAtBlock2LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), + utils.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), minerAccountAtBlock2RLP, }) @@ -153,7 +150,7 @@ var ( } account1AtBlock1RLP, _ = rlp.EncodeToBytes(account1AtBlock1) account1AtBlock1LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock1RLP, }) account1AtBlock2 = &types.StateAccount{ @@ -164,7 +161,7 @@ var ( } account1AtBlock2RLP, _ = rlp.EncodeToBytes(account1AtBlock2) account1AtBlock2LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock2RLP, }) account1AtBlock5 = &types.StateAccount{ @@ -175,7 +172,7 @@ var ( } account1AtBlock5RLP, _ = rlp.EncodeToBytes(account1AtBlock5) account1AtBlock5LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock5RLP, }) account1AtBlock6 = &types.StateAccount{ @@ -186,7 +183,7 @@ var ( } account1AtBlock6RLP, _ = rlp.EncodeToBytes(account1AtBlock6) account1AtBlock6LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock6RLP, }) account2AtBlock2 = &types.StateAccount{ @@ -197,7 +194,7 @@ var ( } account2AtBlock2RLP, _ = rlp.EncodeToBytes(account2AtBlock2) account2AtBlock2LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), + utils.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), account2AtBlock2RLP, }) account2AtBlock3 = &types.StateAccount{ @@ -208,7 +205,7 @@ var ( } account2AtBlock3RLP, _ = rlp.EncodeToBytes(account2AtBlock3) account2AtBlock3LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), + utils.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), account2AtBlock3RLP, }) account2AtBlock4 = &types.StateAccount{ @@ -219,7 +216,7 @@ var ( } account2AtBlock4RLP, _ = rlp.EncodeToBytes(account2AtBlock4) account2AtBlock4LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), + utils.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), account2AtBlock4RLP, }) account2AtBlock6 = &types.StateAccount{ @@ -230,7 +227,7 @@ var ( } account2AtBlock6RLP, _ = rlp.EncodeToBytes(account2AtBlock6) account2AtBlock6LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), + utils.Hex2Bytes("3957f3e2f04a0764c3a0491b175f69926da61efbcc8f61fa1455fd2d2b4cdd45"), account2AtBlock6RLP, }) bankAccountAtBlock0 = &types.StateAccount{ @@ -241,7 +238,7 @@ var ( } bankAccountAtBlock0RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock0) bankAccountAtBlock0LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("2000bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("2000bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock0RLP, }) @@ -254,7 +251,7 @@ var ( } bankAccountAtBlock1RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock1) bankAccountAtBlock1LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock1RLP, }) @@ -267,7 +264,7 @@ var ( } bankAccountAtBlock2RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock2) bankAccountAtBlock2LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock2RLP, }) bankAccountAtBlock3 = &types.StateAccount{ @@ -278,7 +275,7 @@ var ( } bankAccountAtBlock3RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock3) bankAccountAtBlock3LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock3RLP, }) bankAccountAtBlock4 = &types.StateAccount{ @@ -289,7 +286,7 @@ var ( } bankAccountAtBlock4RLP, _ = rlp.EncodeToBytes(&bankAccountAtBlock4) bankAccountAtBlock4LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock4RLP, }) bankAccountAtBlock5 = &types.StateAccount{ @@ -300,7 +297,7 @@ var ( } bankAccountAtBlock5RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock5) bankAccountAtBlock5LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock5RLP, }) @@ -497,13 +494,6 @@ var ( }) ) -func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } -} - func TestBuilder(t *testing.T) { blocks, chain := test_helpers.MakeChain(3, test_helpers.Genesis, test_helpers.TestChainGen) contractLeafKey = test_helpers.AddressToLeafKey(test_helpers.ContractAddr) @@ -513,13 +503,8 @@ func TestBuilder(t *testing.T) { block2 = blocks[1] block3 = blocks[2] params := statediff.Params{} - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testEmptyDiff", statediff.Args{ @@ -528,7 +513,7 @@ func TestBuilder(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), Nodes: emptyDiffs, @@ -543,26 +528,22 @@ func TestBuilder(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock0, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String(), Content: bankAccountAtBlock0LeafNode, }, }, @@ -577,62 +558,50 @@ func TestBuilder(t *testing.T) { BlockNumber: block1.Number(), BlockHash: block1.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block1.Number(), BlockHash: block1.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock1, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: minerAccountAtBlock1, LeafKey: minerLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock1, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1BranchRootNode)).String(), Content: block1BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1LeafNode)).String(), Content: bankAccountAtBlock1LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String(), Content: minerAccountAtBlock1LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String(), Content: account1AtBlock1LeafNode, }, }, @@ -649,123 +618,103 @@ func TestBuilder(t *testing.T) { BlockNumber: block2.Number(), BlockHash: block2.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block2.Number(), BlockHash: block2.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock2, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock2LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock2LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: minerAccountAtBlock2, LeafKey: minerLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock2, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock2, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot0StorageValue, LeafKey: slot0StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), }, { Removed: false, Value: slot1StorageValue, LeafKey: slot1StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), }, }, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock2, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock2LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock2LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, test_helpers.CodeHash.Bytes()).String(), + CID: ipld.Keccak256ToCid(ipld.RawBinary, test_helpers.CodeHash.Bytes()).String(), Content: test_helpers.ByteCodeAfterDeployment, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2BranchRootNode)).String(), Content: block2BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock2LeafNode)).String(), Content: bankAccountAtBlock2LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2LeafNode)).String(), Content: minerAccountAtBlock2LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String(), Content: account1AtBlock2LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String(), Content: contractAccountAtBlock2LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), Content: block2StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), Content: slot0StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), Content: slot1StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock2LeafNode)).String(), Content: account2AtBlock2LeafNode, }, }, @@ -781,77 +730,65 @@ func TestBuilder(t *testing.T) { BlockNumber: block3.Number(), BlockHash: block3.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block3.Number(), BlockHash: block3.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock3, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock3, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot3StorageValue, LeafKey: slot3StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), }, }, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock3, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock3LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock3LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3BranchRootNode)).String(), Content: block3BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3LeafNode)).String(), Content: bankAccountAtBlock3LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String(), Content: contractAccountAtBlock3LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3StorageBranchRootNode)).String(), Content: block3StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), Content: slot3StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock3LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock3LeafNode)).String(), Content: account2AtBlock3LeafNode, }, }, @@ -859,47 +796,13 @@ func TestBuilder(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block0.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock0LeafNode)) { - t.Errorf("block0 expected root %x does not match actual root %x", block0.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock0LeafNode)) - } - if !bytes.Equal(block1.Root().Bytes(), crypto.Keccak256(block1BranchRootNode)) { - t.Errorf("block1 expected root %x does not match actual root %x", block1.Root().Bytes(), crypto.Keccak256(block1BranchRootNode)) - } - if !bytes.Equal(block2.Root().Bytes(), crypto.Keccak256(block2BranchRootNode)) { - t.Errorf("block2 expected root %x does not match actual root %x", block2.Root().Bytes(), crypto.Keccak256(block2BranchRootNode)) - } - if !bytes.Equal(block3.Root().Bytes(), crypto.Keccak256(block3BranchRootNode)) { - t.Errorf("block3 expected root %x does not match actual root %x", block3.Root().Bytes(), crypto.Keccak256(block3BranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), + tests, params, test_helpers.CheckedRoots{ + block0: bankAccountAtBlock0LeafNode, + block1: block1BranchRootNode, + block2: block2BranchRootNode, + block3: block3BranchRootNode, + }) } func TestBuilderWithWatchedAddressList(t *testing.T) { @@ -914,13 +817,8 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { WatchedAddresses: []common.Address{test_helpers.Account1Addr, test_helpers.ContractAddr}, } params.ComputeWatchedAddressesLeafPaths() - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testEmptyDiff", statediff.Args{ @@ -929,7 +827,7 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), Nodes: emptyDiffs, @@ -944,7 +842,7 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), Nodes: emptyDiffs, @@ -959,30 +857,26 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { BlockNumber: block1.Number(), BlockHash: block1.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block1.Number(), BlockHash: block1.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock1, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1BranchRootNode)).String(), Content: block1BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1LeafNode)).String(), Content: account1AtBlock1LeafNode, }, }, @@ -998,75 +892,67 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { BlockNumber: block2.Number(), BlockHash: block2.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block2.Number(), BlockHash: block2.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock2, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot0StorageValue, LeafKey: slot0StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), }, { Removed: false, Value: slot1StorageValue, LeafKey: slot1StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), }, }, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock2, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, test_helpers.CodeHash.Bytes()).String(), + CID: ipld.Keccak256ToCid(ipld.RawBinary, test_helpers.CodeHash.Bytes()).String(), Content: test_helpers.ByteCodeAfterDeployment, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2BranchRootNode)).String(), Content: block2BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2LeafNode)).String(), Content: contractAccountAtBlock2LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), Content: block2StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), Content: slot0StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), Content: slot1StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2LeafNode)).String(), Content: account1AtBlock2LeafNode, }, }, @@ -1082,45 +968,41 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { BlockNumber: block3.Number(), BlockHash: block3.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block3.Number(), BlockHash: block3.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock3, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot3StorageValue, LeafKey: slot3StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3BranchRootNode)).String(), Content: block3BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3LeafNode)).String(), Content: contractAccountAtBlock3LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3StorageBranchRootNode)).String(), Content: block3StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), Content: slot3StorageLeafNode, }, }, @@ -1128,47 +1010,12 @@ func TestBuilderWithWatchedAddressList(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block0.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock0LeafNode)) { - t.Errorf("block0 expected root %x does not match actual root %x", block0.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock0LeafNode)) - } - if !bytes.Equal(block1.Root().Bytes(), crypto.Keccak256(block1BranchRootNode)) { - t.Errorf("block1 expected root %x does not match actual root %x", block1.Root().Bytes(), crypto.Keccak256(block1BranchRootNode)) - } - if !bytes.Equal(block2.Root().Bytes(), crypto.Keccak256(block2BranchRootNode)) { - t.Errorf("block2 expected root %x does not match actual root %x", block2.Root().Bytes(), crypto.Keccak256(block2BranchRootNode)) - } - if !bytes.Equal(block3.Root().Bytes(), crypto.Keccak256(block3BranchRootNode)) { - t.Errorf("block3 expected root %x does not match actual root %x", block3.Root().Bytes(), crypto.Keccak256(block3BranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block0: bankAccountAtBlock0LeafNode, + block1: block1BranchRootNode, + block2: block2BranchRootNode, + block3: block3BranchRootNode, + }) } func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { @@ -1180,13 +1027,8 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { block5 = blocks[4] block6 = blocks[5] params := statediff.Params{} - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ // blocks 0-3 are the same as in TestBuilderWithIntermediateNodes { "testBlock4", @@ -1196,38 +1038,30 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { BlockNumber: block4.Number(), BlockHash: block4.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block4.Number(), BlockHash: block4.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock4, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock4LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock4LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock4, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot2StorageValue, LeafKey: slot2StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), }, { Removed: true, @@ -1245,40 +1079,36 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock4, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), Content: block4BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock4LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock4LeafNode)).String(), Content: bankAccountAtBlock4LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String(), Content: contractAccountAtBlock4LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block4StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block4StorageBranchRootNode)).String(), Content: block4StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), Content: slot2StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String(), Content: account2AtBlock4LeafNode, }, }, @@ -1292,38 +1122,30 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { BlockNumber: block5.Number(), BlockHash: block5.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block5.Number(), BlockHash: block5.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock5, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock5LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock5LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock5, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot3StorageValue, LeafKey: slot3StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), }, { Removed: true, @@ -1335,40 +1157,36 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock5, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), Content: block5BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock5LeafNode)).String(), Content: bankAccountAtBlock5LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String(), Content: contractAccountAtBlock5LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block5StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block5StorageBranchRootNode)).String(), Content: block5StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), Content: slot3StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), Content: account1AtBlock5LeafNode, }, }, @@ -1382,21 +1200,17 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { BlockNumber: block6.Number(), BlockHash: block6.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block6.Number(), BlockHash: block6.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: true, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: nil, LeafKey: contractLeafKey, CID: shared.RemovedNodeStateCID}, - StorageDiff: []types2.StorageLeafNode{ + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: true, LeafKey: slot0StorageKey.Bytes(), @@ -1413,40 +1227,32 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock6, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock6, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), Content: block6BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String(), Content: account2AtBlock6LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), Content: account1AtBlock6LeafNode, }, }, @@ -1454,44 +1260,11 @@ func TestBuilderWithRemovedAccountAndStorage(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) { - t.Errorf("block4 expected root %x does not match actual root %x", block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) - } - if !bytes.Equal(block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) { - t.Errorf("block5 expected root %x does not match actual root %x", block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) - } - if !bytes.Equal(block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) { - t.Errorf("block6 expected root %x does not match actual root %x", block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block4: block4BranchRootNode, + block5: block5BranchRootNode, + block6: block6BranchRootNode, + }) } func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { @@ -1506,13 +1279,8 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { WatchedAddresses: []common.Address{test_helpers.Account1Addr, test_helpers.Account2Addr}, } params.ComputeWatchedAddressesLeafPaths() - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testBlock4", statediff.Args{ @@ -1521,30 +1289,26 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { BlockNumber: block4.Number(), BlockHash: block4.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block4.Number(), BlockHash: block4.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock4, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), Content: block4BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock4LeafNode)).String(), Content: account2AtBlock4LeafNode, }, }, @@ -1558,30 +1322,26 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { BlockNumber: block5.Number(), BlockHash: block5.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block5.Number(), BlockHash: block5.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock5, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), Content: block5BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), Content: account1AtBlock5LeafNode, }, }, @@ -1595,46 +1355,38 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { BlockNumber: block6.Number(), BlockHash: block6.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block6.Number(), BlockHash: block6.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account2AtBlock6, LeafKey: test_helpers.Account2LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock6, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), Content: block6BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account2AtBlock6LeafNode)).String(), Content: account2AtBlock6LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), Content: account1AtBlock6LeafNode, }, }, @@ -1642,46 +1394,11 @@ func TestBuilderWithRemovedNonWatchedAccount(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) { - t.Errorf("block4 expected root %x does not match actual root %x", block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) - } - if !bytes.Equal(block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) { - t.Errorf("block5 expected root %x does not match actual root %x", block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) - } - if !bytes.Equal(block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) { - t.Errorf("block6 expected root %x does not match actual root %x", block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block4: block4BranchRootNode, + block5: block5BranchRootNode, + block6: block6BranchRootNode, + }) } func TestBuilderWithRemovedWatchedAccount(t *testing.T) { @@ -1696,13 +1413,8 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { WatchedAddresses: []common.Address{test_helpers.Account1Addr, test_helpers.ContractAddr}, } params.ComputeWatchedAddressesLeafPaths() - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testBlock4", statediff.Args{ @@ -1711,26 +1423,22 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { BlockNumber: block4.Number(), BlockHash: block4.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block4.Number(), BlockHash: block4.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock4, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, LeafKey: slot2StorageKey.Bytes(), Value: slot2StorageValue, - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), }, { Removed: true, @@ -1747,21 +1455,21 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block4BranchRootNode)).String(), Content: block4BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock4LeafNode)).String(), Content: contractAccountAtBlock4LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block4StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block4StorageBranchRootNode)).String(), Content: block4StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot2StorageLeafNode)).String(), Content: slot2StorageLeafNode, }, }, @@ -1775,26 +1483,22 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { BlockNumber: block5.Number(), BlockHash: block5.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block5.Number(), BlockHash: block5.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock5, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, LeafKey: slot3StorageKey.Bytes(), Value: slot3StorageValue, - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), }, { Removed: true, @@ -1806,36 +1510,32 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock5, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block5BranchRootNode)).String(), Content: block5BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock5LeafNode)).String(), Content: contractAccountAtBlock5LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block5StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block5StorageBranchRootNode)).String(), Content: block5StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot3StorageLeafNode)).String(), Content: slot3StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock5LeafNode)).String(), Content: account1AtBlock5LeafNode, }, }, @@ -1849,21 +1549,17 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { BlockNumber: block6.Number(), BlockHash: block6.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block6.Number(), BlockHash: block6.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: true, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: nil, LeafKey: contractLeafKey, CID: shared.RemovedNodeStateCID}, - StorageDiff: []types2.StorageLeafNode{ + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: true, LeafKey: slot0StorageKey.Bytes(), @@ -1880,24 +1576,20 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock6, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block6BranchRootNode)).String(), Content: block6BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock6LeafNode)).String(), Content: account1AtBlock6LeafNode, }, }, @@ -1905,53 +1597,18 @@ func TestBuilderWithRemovedWatchedAccount(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) { - t.Errorf("block4 expected root %x does not match actual root %x", block4.Root().Bytes(), crypto.Keccak256(block4BranchRootNode)) - } - if !bytes.Equal(block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) { - t.Errorf("block5 expected root %x does not match actual root %x", block5.Root().Bytes(), crypto.Keccak256(block5BranchRootNode)) - } - if !bytes.Equal(block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) { - t.Errorf("block6 expected root %x does not match actual root %x", block6.Root().Bytes(), crypto.Keccak256(block6BranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block4: block4BranchRootNode, + block5: block5BranchRootNode, + block6: block6BranchRootNode, + }) } var ( - slot00StorageValue = common.Hex2Bytes("9471562b71999873db5b286df957af199ec94617f7") // prefixed TestBankAddress + slot00StorageValue = utils.Hex2Bytes("9471562b71999873db5b286df957af199ec94617f7") // prefixed TestBankAddress slot00StorageLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("390decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"), + utils.Hex2Bytes("390decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"), slot00StorageValue, }) @@ -1963,7 +1620,7 @@ var ( } contractAccountAtBlock01RLP, _ = rlp.EncodeToBytes(contractAccountAtBlock01) contractAccountAtBlock01LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3cb2583748c26e89ef19c2a8529b05a270f735553b4d44b6f2a1894987a71c8b"), + utils.Hex2Bytes("3cb2583748c26e89ef19c2a8529b05a270f735553b4d44b6f2a1894987a71c8b"), contractAccountAtBlock01RLP, }) @@ -1975,7 +1632,7 @@ var ( } bankAccountAtBlock01RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock01) bankAccountAtBlock01LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock01RLP, }) bankAccountAtBlock02 = &types.StateAccount{ @@ -1986,7 +1643,7 @@ var ( } bankAccountAtBlock02RLP, _ = rlp.EncodeToBytes(bankAccountAtBlock02) bankAccountAtBlock02LeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("2000bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("2000bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock02RLP, }) @@ -2039,13 +1696,8 @@ func TestBuilderWithMovedAccount(t *testing.T) { block1 = blocks[0] block2 = blocks[1] params := statediff.Params{} - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testBlock1", statediff.Args{ @@ -2054,75 +1706,67 @@ func TestBuilderWithMovedAccount(t *testing.T) { BlockNumber: block1.Number(), BlockHash: block1.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block1.Number(), BlockHash: block1.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock01, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock01LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock01LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock01, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock01LeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock01LeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, LeafKey: slot0StorageKey.Bytes(), Value: slot00StorageValue, - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot00StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot00StorageLeafNode)).String(), }, { Removed: false, LeafKey: slot1StorageKey.Bytes(), Value: slot1StorageValue, - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, test_helpers.CodeHash.Bytes()).String(), + CID: ipld.Keccak256ToCid(ipld.RawBinary, test_helpers.CodeHash.Bytes()).String(), Content: test_helpers.ByteCodeAfterDeployment, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block01BranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block01BranchRootNode)).String(), Content: block01BranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock01LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock01LeafNode)).String(), Content: bankAccountAtBlock01LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock01LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock01LeafNode)).String(), Content: contractAccountAtBlock01LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block01StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block01StorageBranchRootNode)).String(), Content: block01StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot00StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot00StorageLeafNode)).String(), Content: slot00StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), Content: slot1StorageLeafNode, }, }, @@ -2136,33 +1780,25 @@ func TestBuilderWithMovedAccount(t *testing.T) { BlockNumber: block2.Number(), BlockHash: block2.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block2.Number(), BlockHash: block2.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock02, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock02LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock02LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: true, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: nil, LeafKey: contractLeafKey, CID: shared.RemovedNodeStateCID}, - StorageDiff: []types2.StorageLeafNode{ + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: true, LeafKey: slot0StorageKey.Bytes(), @@ -2178,9 +1814,9 @@ func TestBuilderWithMovedAccount(t *testing.T) { }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock02LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock02LeafNode)).String(), Content: bankAccountAtBlock02LeafNode, }, }, @@ -2188,42 +1824,10 @@ func TestBuilderWithMovedAccount(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block1.Root().Bytes(), crypto.Keccak256(block01BranchRootNode)) { - t.Errorf("block01 expected root %x does not match actual root %x", block1.Root().Bytes(), crypto.Keccak256(block01BranchRootNode)) - } - if !bytes.Equal(block2.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock02LeafNode)) { - t.Errorf("block02 expected root %x does not match actual root %x", block2.Root().Bytes(), crypto.Keccak256(bankAccountAtBlock02LeafNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block1: block01BranchRootNode, + block2: bankAccountAtBlock02LeafNode, + }) } /* @@ -2268,7 +1872,7 @@ var ( } bankAccountAtBlock1bRLP, _ = rlp.EncodeToBytes(bankAccountAtBlock1b) bankAccountAtBlock1bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock1bRLP, }) @@ -2280,7 +1884,7 @@ var ( } account1AtBlock1bRLP, _ = rlp.EncodeToBytes(account1AtBlock1b) account1AtBlock1bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock1bRLP, }) @@ -2293,7 +1897,7 @@ var ( } account1AtBlock2bRLP, _ = rlp.EncodeToBytes(account1AtBlock2b) account1AtBlock2bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), + utils.Hex2Bytes("3926db69aaced518e9b9f0f434a473e7174109c943548bb8f23be41ca76d9ad2"), account1AtBlock2bRLP, }) @@ -2305,7 +1909,7 @@ var ( } minerAccountAtBlock2bRLP, _ = rlp.EncodeToBytes(minerAccountAtBlock2b) minerAccountAtBlock2bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), + utils.Hex2Bytes("3380c7b7ae81a58eb98d9c78de4a1fd7fd9535fc953ed2be602daaa41767312a"), minerAccountAtBlock2bRLP, }) @@ -2317,7 +1921,7 @@ var ( } contractAccountAtBlock2bRLP, _ = rlp.EncodeToBytes(contractAccountAtBlock2b) contractAccountAtBlock2bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3d7e14f1723fa19b5d6d9f8b86b49acefbc9c400bf4ed686c10d6b6467fc5b3a"), + utils.Hex2Bytes("3d7e14f1723fa19b5d6d9f8b86b49acefbc9c400bf4ed686c10d6b6467fc5b3a"), contractAccountAtBlock2bRLP, }) @@ -2330,7 +1934,7 @@ var ( } bankAccountAtBlock3bRLP, _ = rlp.EncodeToBytes(bankAccountAtBlock3b) bankAccountAtBlock3bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), + utils.Hex2Bytes("30bf49f440a1cd0527e4d06e2765654c0f56452257516d793a9b8d604dcfdf2a"), bankAccountAtBlock3bRLP, }) @@ -2342,25 +1946,25 @@ var ( } contractAccountAtBlock3bRLP, _ = rlp.EncodeToBytes(contractAccountAtBlock3b) contractAccountAtBlock3bLeafNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("3d7e14f1723fa19b5d6d9f8b86b49acefbc9c400bf4ed686c10d6b6467fc5b3a"), + utils.Hex2Bytes("3d7e14f1723fa19b5d6d9f8b86b49acefbc9c400bf4ed686c10d6b6467fc5b3a"), contractAccountAtBlock3bRLP, }) - slot40364 = common.BigToHash(big.NewInt(40364)) - slot105566 = common.BigToHash(big.NewInt(105566)) + slot40364 = common.BytesToHash(big.NewInt(40364).Bytes()) + slot105566 = common.BytesToHash(big.NewInt(105566).Bytes()) - slot40364StorageValue = common.Hex2Bytes("01") - slot105566StorageValue = common.Hex2Bytes("02") + slot40364StorageValue = utils.Hex2Bytes("01") + slot105566StorageValue = utils.Hex2Bytes("02") slot40364StorageKey = crypto.Keccak256Hash(slot40364[:]) slot105566StorageKey = crypto.Keccak256Hash(slot105566[:]) slot40364StorageInternalLeafNode = []interface{}{ - common.Hex2Bytes("3077bbc951a04529defc15da8c06e427cde0d7a1499c50975bbe8aab"), + utils.Hex2Bytes("3077bbc951a04529defc15da8c06e427cde0d7a1499c50975bbe8aab"), slot40364StorageValue, } slot105566StorageInternalLeafNode = []interface{}{ - common.Hex2Bytes("3c62586c18bf1ecfda161ced374b7a894630e2db426814c24e5d42af"), + utils.Hex2Bytes("3c62586c18bf1ecfda161ced374b7a894630e2db426814c24e5d42af"), slot105566StorageValue, } @@ -2385,7 +1989,7 @@ var ( }) block3bStorageExtensionNode, _ = rlp.EncodeToBytes(&[]interface{}{ - common.Hex2Bytes("1291631c"), + utils.Hex2Bytes("1291631c"), crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves), }) @@ -2479,13 +2083,8 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { block2 = blocks[1] block3 = blocks[2] params := statediff.Params{} - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testEmptyDiff", statediff.Args{ @@ -2494,7 +2093,7 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), Nodes: emptyDiffs, @@ -2509,26 +2108,22 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock0, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock0LeafNode)).String(), Content: bankAccountAtBlock0LeafNode, }, }, @@ -2543,62 +2138,50 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { BlockNumber: block1.Number(), BlockHash: block1.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block1.Number(), BlockHash: block1.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock1b, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1bLeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1bLeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: minerAccountAtBlock1, LeafKey: minerLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock1b, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1bLeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1bLeafNode)).String()}, StorageDiff: emptyStorage, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1bBranchRootNode)).String(), Content: block1bBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock1bLeafNode)).String(), Content: bankAccountAtBlock1bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock1LeafNode)).String(), Content: minerAccountAtBlock1LeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock1bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock1bLeafNode)).String(), Content: account1AtBlock1bLeafNode, }, }, @@ -2615,91 +2198,79 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { BlockNumber: block2.Number(), BlockHash: block2.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block2.Number(), BlockHash: block2.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: minerAccountAtBlock2b, LeafKey: minerLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2bLeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2bLeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: account1AtBlock2b, LeafKey: test_helpers.Account1LeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2bLeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2bLeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock2b, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot0StorageValue, LeafKey: slot0StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), }, { Removed: false, Value: slot1StorageValue, LeafKey: slot1StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, test_helpers.CodeHashForInternalizedLeafNode.Bytes()).String(), + CID: ipld.Keccak256ToCid(ipld.RawBinary, test_helpers.CodeHashForInternalizedLeafNode.Bytes()).String(), Content: test_helpers.ByteCodeAfterDeploymentForInternalLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2bBranchRootNode)).String(), Content: block2bBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(minerAccountAtBlock2bLeafNode)).String(), Content: minerAccountAtBlock2bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(account1AtBlock2bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(account1AtBlock2bLeafNode)).String(), Content: account1AtBlock2bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String(), Content: contractAccountAtBlock2bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), Content: block2StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), Content: slot0StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), Content: slot1StorageLeafNode, }, }, @@ -2715,71 +2286,63 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { BlockNumber: block3.Number(), BlockHash: block3.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block3.Number(), BlockHash: block3.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: bankAccountAtBlock3b, LeafKey: test_helpers.BankLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3bLeafNode)).String()}, + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3bLeafNode)).String()}, StorageDiff: emptyStorage, }, { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock3b, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot105566StorageValue, LeafKey: slot105566StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), }, { Removed: false, Value: slot40364StorageValue, LeafKey: slot40364StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3bBranchRootNode)).String(), Content: block3bBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(bankAccountAtBlock3bLeafNode)).String(), Content: bankAccountAtBlock3bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String(), Content: contractAccountAtBlock3bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchRootNode)).String(), Content: block3bStorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageExtensionNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageExtensionNode)).String(), Content: block3bStorageExtensionNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), Content: block3bStorageBranchNodeWithInternalLeaves, }, }, @@ -2787,44 +2350,11 @@ func TestBuilderWithInternalizedLeafNode(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block1.Root().Bytes(), crypto.Keccak256(block1bBranchRootNode)) { - t.Errorf("block1 expected root %x does not match actual root %x", block1.Root().Bytes(), crypto.Keccak256(block1bBranchRootNode)) - } - if !bytes.Equal(block2.Root().Bytes(), crypto.Keccak256(block2bBranchRootNode)) { - t.Errorf("block2 expected root %x does not match actual root %x", block2.Root().Bytes(), crypto.Keccak256(block2bBranchRootNode)) - } - if !bytes.Equal(block3.Root().Bytes(), crypto.Keccak256(block3bBranchRootNode)) { - t.Errorf("block3 expected root %x does not match actual root %x", block3.Root().Bytes(), crypto.Keccak256(block3bBranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block1: block1bBranchRootNode, + block2: block2bBranchRootNode, + block3: block3bBranchRootNode, + }) } func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { @@ -2841,13 +2371,8 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { }, } params.ComputeWatchedAddressesLeafPaths() - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *types2.StateObject - }{ + var tests = []test_helpers.TestCase{ { "testEmptyDiff", statediff.Args{ @@ -2856,7 +2381,7 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), Nodes: emptyDiffs, @@ -2871,11 +2396,11 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { BlockNumber: block0.Number(), BlockHash: block0.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block0.Number(), BlockHash: block0.Hash(), - Nodes: []types2.StateLeafNode{}, - IPLDs: []types2.IPLD{}, // there's some kind of weird behavior where if our root node is a leaf node + Nodes: []sdtypes.StateLeafNode{}, + IPLDs: []sdtypes.IPLD{}, // there's some kind of weird behavior where if our root node is a leaf node // even though it is along the path to the watched leaf (necessarily, as it is the root) it doesn't get included // unconsequential, but kinda odd. }, @@ -2889,13 +2414,13 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { BlockNumber: block1.Number(), BlockHash: block1.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block1.Number(), BlockHash: block1.Hash(), - Nodes: []types2.StateLeafNode{}, - IPLDs: []types2.IPLD{ + Nodes: []sdtypes.StateLeafNode{}, + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1bBranchRootNode)).String(), Content: block1bBranchRootNode, }, }, @@ -2912,59 +2437,55 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { BlockNumber: block2.Number(), BlockHash: block2.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block2.Number(), BlockHash: block2.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock2b, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot0StorageValue, LeafKey: slot0StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), }, { Removed: false, Value: slot1StorageValue, LeafKey: slot1StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.RawBinary, test_helpers.CodeHashForInternalizedLeafNode.Bytes()).String(), + CID: ipld.Keccak256ToCid(ipld.RawBinary, test_helpers.CodeHashForInternalizedLeafNode.Bytes()).String(), Content: test_helpers.ByteCodeAfterDeploymentForInternalLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2bBranchRootNode)).String(), Content: block2bBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock2bLeafNode)).String(), Content: contractAccountAtBlock2bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block2StorageBranchRootNode)).String(), Content: block2StorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot0StorageLeafNode)).String(), Content: slot0StorageLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(slot1StorageLeafNode)).String(), Content: slot1StorageLeafNode, }, }, @@ -2980,55 +2501,51 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { BlockNumber: block3.Number(), BlockHash: block3.Hash(), }, - &types2.StateObject{ + &sdtypes.StateObject{ BlockNumber: block3.Number(), BlockHash: block3.Hash(), - Nodes: []types2.StateLeafNode{ + Nodes: []sdtypes.StateLeafNode{ { Removed: false, - AccountWrapper: struct { - Account *types.StateAccount - LeafKey []byte - CID string - }{ + AccountWrapper: sdtypes.AccountWrapper{ Account: contractAccountAtBlock3b, LeafKey: contractLeafKey, - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String()}, - StorageDiff: []types2.StorageLeafNode{ + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String()}, + StorageDiff: []sdtypes.StorageLeafNode{ { Removed: false, Value: slot105566StorageValue, LeafKey: slot105566StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), }, { Removed: false, Value: slot40364StorageValue, LeafKey: slot40364StorageKey.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), }, }, }, }, - IPLDs: []types2.IPLD{ + IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3bBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3bBranchRootNode)).String(), Content: block3bBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(contractAccountAtBlock3bLeafNode)).String(), Content: contractAccountAtBlock3bLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchRootNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchRootNode)).String(), Content: block3bStorageBranchRootNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageExtensionNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageExtensionNode)).String(), Content: block3bStorageExtensionNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(block3bStorageBranchNodeWithInternalLeaves)).String(), Content: block3bStorageBranchNodeWithInternalLeaves, }, }, @@ -3036,44 +2553,11 @@ func TestBuilderWithInternalizedLeafNodeAndWatchedAddress(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - // Let's also confirm that our root state nodes form the state root hash in the headers - if !bytes.Equal(block1.Root().Bytes(), crypto.Keccak256(block1bBranchRootNode)) { - t.Errorf("block1 expected root %x does not match actual root %x", block1.Root().Bytes(), crypto.Keccak256(block1bBranchRootNode)) - } - if !bytes.Equal(block2.Root().Bytes(), crypto.Keccak256(block2bBranchRootNode)) { - t.Errorf("block2 expected root %x does not match actual root %x", block2.Root().Bytes(), crypto.Keccak256(block2bBranchRootNode)) - } - if !bytes.Equal(block3.Root().Bytes(), crypto.Keccak256(block3bBranchRootNode)) { - t.Errorf("block3 expected root %x does not match actual root %x", block3.Root().Bytes(), crypto.Keccak256(block3bBranchRootNode)) - } + test_helpers.RunBuilderTests(t, statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), tests, params, test_helpers.CheckedRoots{ + block1: block1bBranchRootNode, + block2: block2bBranchRootNode, + block3: block3bBranchRootNode, + }) } /* diff --git a/config.go b/config.go index b036f76..625b71b 100644 --- a/config.go +++ b/config.go @@ -23,7 +23,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" + + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/utils" ) // Config contains instantiation parameters for the state diffing service @@ -40,7 +42,7 @@ type Config struct { NumWorkers uint // Should the statediff service wait until geth has synced to the head of the blockchain? WaitForSync bool - // Context + // Context used during DB initialization Context context.Context } @@ -58,7 +60,7 @@ type Params struct { func (p *Params) ComputeWatchedAddressesLeafPaths() { p.watchedAddressesLeafPaths = make([][]byte, len(p.WatchedAddresses)) for i, address := range p.WatchedAddresses { - p.watchedAddressesLeafPaths[i] = keybytesToHex(crypto.Keccak256(address.Bytes())) + p.watchedAddressesLeafPaths[i] = utils.KeybytesToHex(crypto.Keccak256(address[:])) } } @@ -73,15 +75,3 @@ type Args struct { OldStateRoot, NewStateRoot, BlockHash common.Hash BlockNumber *big.Int } - -// https://github.com/ethereum/go-ethereum/blob/master/trie/encoding.go#L97 -func keybytesToHex(str []byte) []byte { - l := len(str)*2 + 1 - var nibbles = make([]byte, l) - for i, b := range str { - nibbles[i*2] = b / 16 - nibbles[i*2+1] = b % 16 - } - nibbles[l-1] = 16 - return nibbles -} diff --git a/docs/KnownGaps.md b/docs/KnownGaps.md deleted file mode 100644 index 72e712f..0000000 --- a/docs/KnownGaps.md +++ /dev/null @@ -1,17 +0,0 @@ -# Overview - -This document will provide some insight into the `known_gaps` table, their use cases, and implementation. Please refer to the [following PR](https://github.com/vulcanize/go-ethereum/pull/217) and the [following epic](https://github.com/vulcanize/ops/issues/143) to grasp their inception. - -![known gaps](diagrams/KnownGapsProcess.png) - -# Use Cases - -The known gaps table is updated when the following events occur: - -1. At start up we check the latest block from the `eth.headers_cid` table. We compare the first block that we are processing with the latest block from the DB. If they are not one unit of expectedDifference away from each other, add the gap between the two blocks. -2. If there is any error in processing a block (db connection, deadlock, etc), add that block to the knownErrorBlocks slice, when the next block is successfully written, write this slice into the DB. - -# Glossary - -1. `expectedDifference (number)` - This number indicates what the difference between two blocks should be. If we are capturing all events on a geth node then this number would be `1`. But once we scale nodes, the `expectedDifference` might be `2` or greater. -2. `processingKey (number)` - This number can be used to keep track of different geth nodes and their specific `expectedDifference`. diff --git a/docs/README.md b/docs/README.md deleted file mode 100644 index 51b63e2..0000000 --- a/docs/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Overview - -This folder keeps tracks of random documents as they relate to the `statediff` service. diff --git a/docs/database.md b/docs/database.md deleted file mode 100644 index 847bc8f..0000000 --- a/docs/database.md +++ /dev/null @@ -1,21 +0,0 @@ -# Overview - -This document will go through some notes on the database component of the statediff service. - -# Components - -- Indexer: The indexer creates IPLD and DB models to insert to the Postgres DB. It performs the insert utilizing and atomic function. -- Builder: The builder constructs the statediff object that needs to be inserted. -- Known Gaps: Captures any gaps that might have occured and either writes them to the DB, local sql file, to prometeus, or a local error. - -# Making Code Changes - -## Adding a New Function to the Indexer - -If you want to implement a new feature for adding data to the database. Keep the following in mind: - -1. You need to handle `sql`, `file`, and `dump`. - 1. `sql` - Contains the code needed to write directly to the `sql` db. - 2. `file` - Contains all the code required to write the SQL statements to a file. - 3. `dump` - Contains all the code for outputting events to the console. -2. You will have to add it to the `interfaces.StateDiffIndexer` interface. diff --git a/docs/diagrams/KnownGapsProcess.png b/docs/diagrams/KnownGapsProcess.png deleted file mode 100644 index 40ebaa80aad2fb03b6ff80ca364273e23039a7b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33340 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 diff --git a/docs/indexer.md b/docs/indexer.md new file mode 100644 index 0000000..65af173 --- /dev/null +++ b/docs/indexer.md @@ -0,0 +1,13 @@ +# Statediff database indexing + +To process data in real time as Geth syncs updates to the Ethereum execution layer, the statediff +service is able to directly transform and load data into a Postgres database. The `indexer` package +contains abstractions for handling this ingestion. + +## Interface + +A `StateDiffIndexer` object is responsible for inserting statediff data into a database, as well as managing watched address lists for a given database. +Three implementations are currently maintained: + * `sql` for direct insertion to Postgres + * `file` which writes to CSV for SQL files for insertion in a separate step + * `dump` which simply dumps to stdout diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3f9d326 --- /dev/null +++ b/go.mod @@ -0,0 +1,129 @@ +module github.com/cerc-io/plugeth-statediff + +go 1.19 + +require ( + github.com/ethereum/go-ethereum v1.11.6 + github.com/georgysavva/scany v0.2.9 + github.com/golang/mock v1.6.0 + github.com/inconshreveable/log15 v2.16.0+incompatible + github.com/ipfs/go-cid v0.2.0 + github.com/jackc/pgconn v1.10.0 + github.com/jackc/pgtype v1.8.1 + github.com/jackc/pgx/v4 v4.13.0 + github.com/jmoiron/sqlx v1.2.0 + github.com/lib/pq v1.10.6 + github.com/multiformats/go-multihash v0.1.0 + github.com/openrelayxyz/plugeth-utils v1.2.0 + github.com/pganalyze/pg_query_go/v4 v4.2.1 + github.com/shopspring/decimal v1.2.0 + github.com/stretchr/testify v1.8.1 + github.com/thoas/go-funk v0.9.2 +) + +require ( + github.com/DataDog/zstd v1.5.2 // indirect + github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // 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/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/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/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/jackc/chunkreader/v2 v2.0.1 // 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/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/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.1 // 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-varint v0.0.6 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/opentracing/opentracing-go v1.1.0 // indirect + github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.14.0 // 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.4-0.20210419000835-c7a38de76ee5+incompatible // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/status-im/keycard-go v0.2.0 // indirect + github.com/stretchr/objx v0.5.0 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/tklauser/go-sysconf v0.3.5 // indirect + github.com/tklauser/numcpus v0.2.2 // 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 + golang.org/x/crypto v0.1.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/term 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/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 + gopkg.in/yaml.v3 v3.0.1 // indirect + lukechampine.com/blake3 v1.1.6 // indirect +) + +replace ( + // github.com/ethereum/go-ethereum => ../plugeth + // github.com/openrelayxyz/plugeth-utils => ../plugeth-utils + github.com/ethereum/go-ethereum => git.vdb.to/cerc-io/plugeth v0.0.0-20230622162124-0ed9eba1decb + github.com/openrelayxyz/plugeth-utils => git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230622072028-1d3da8ce80ee +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..f2df82c --- /dev/null +++ b/go.sum @@ -0,0 +1,762 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +git.vdb.to/cerc-io/plugeth v0.0.0-20230622162124-0ed9eba1decb h1:p3R953gnt/kxmJPbRRH09l3UDGwarFADxjJx4Y9SQrY= +git.vdb.to/cerc-io/plugeth v0.0.0-20230622162124-0ed9eba1decb/go.mod h1:odpOaIpK01aVThIoAuw9YryLBJeHYOsDn9Mxm4LhB5s= +git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230622072028-1d3da8ce80ee h1:DJ1bR/2k7PopUtchEoTw5QHV1DHb9p0ubcb3yKJc10I= +git.vdb.to/cerc-io/plugeth-utils v0.0.0-20230622072028-1d3da8ce80ee/go.mod h1:p5Jc8deG2yxXI8DzmrH3kHNEwlQqcOQS0pmGulsqg+M= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= +github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= +github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o= +github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8= +github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= +github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= +github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= +github.com/cockroachdb/cockroach-go/v2 v2.0.3 h1:ZA346ACHIZctef6trOTwBAEvPVm1k0uLm/bb2Atc+S8= +github.com/cockroachdb/cockroach-go/v2 v2.0.3/go.mod h1:hAuDgiVgDVkfirP9JnhXEfcXEPRKBpYdGz+l7mvYSzw= +github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= +github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= +github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk= +github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lgvnQ2+oGlE/EyZy4+2/CxRh9KfvCXnag1vtpxVM= +github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= +github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= +github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= +github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= +github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= +github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= +github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/docker/docker v1.6.2 h1:HlFGsy+9/xrgMmhmN+NGhCc5SHGJ7I+kHosRR1xc/aI= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= +github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= +github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= +github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= +github.com/georgysavva/scany v0.2.9 h1:Xt6rjYpHnMClTm/g+oZTnoSxUwiln5GqMNU+QeLNHQU= +github.com/georgysavva/scany v0.2.9/go.mod h1:yeOeC1BdIdl6hOwy8uefL2WNSlseFzbhlG/frrh65SA= +github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= +github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0= +github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= +github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= +github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= +github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= +github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= +github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= +github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= +github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= +github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= +github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8= +github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ= +github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= +github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/inconshreveable/log15 v2.16.0+incompatible h1:6nvMKxtGcpgm7q0KiGs+Vc+xDvUXaBqsPKHWKsinccw= +github.com/inconshreveable/log15 v2.16.0+incompatible/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k= +github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= +github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSHzRbhzK8RdXOsAdfDgO49TtqC1oZ+acxPrkfTxcCs= +github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM= +github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= +github.com/ipfs/go-cid v0.2.0 h1:01JTiihFq9en9Vz0lc0VDWvZe/uBonGpzo4THP0vcQ0= +github.com/ipfs/go-cid v0.2.0/go.mod h1:P+HXFDF4CVhaVayiEb4wkAy7zBHxBwsJyt0Y5U6MLro= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= +github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= +github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= +github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= +github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= +github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA= +github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE= +github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s= +github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk= +github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI= +github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78= +github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA= +github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o= +github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY= +github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgconn v1.10.0 h1:4EYhlDVEMsJ30nNj0mmgwIUXoq7e9sMJrVC2ED6QlCU= +github.com/jackc/pgconn v1.10.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI= +github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= +github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= +github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc= +github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= +github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= +github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM= +github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgproto3/v2 v2.1.1 h1:7PQ/4gLoqnl87ZxL7xjO0DR5gYuviDCZxQJsUlFW1eI= +github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= +github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= +github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= +github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc= +github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw= +github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0= +github.com/jackc/pgtype v1.3.0/go.mod h1:b0JqxHvPmljG+HQ5IsvQ0yqeSi4nGcDTVjFoiLDb0Ik= +github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po= +github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ= +github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig= +github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= +github.com/jackc/pgtype v1.8.1 h1:9k0IXtdJXHJbyAWQgbWr1lU+MEhPXZz6RIXxfR5oxXs= +github.com/jackc/pgtype v1.8.1/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= +github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= +github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= +github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= +github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA= +github.com/jackc/pgx/v4 v4.6.0/go.mod h1:vPh43ZzxijXUVJ+t/EmXBtFmbFVO72cuneCT9oAlxAg= +github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o= +github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg= +github.com/jackc/pgx/v4 v4.8.1/go.mod h1:4HOLxrl8wToZJReD04/yB20GDwf4KBYETvlHciCnwW0= +github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.13.0 h1:JCjhT5vmhMAf/YwBHLvrBn4OGdIQBiFG6ym8Zmdx570= +github.com/jackc/pgx/v4 v4.13.0/go.mod h1:9P4X524sErlaxj0XSGZk7s+LD0eOyu1ZDUrrpznYDF0= +github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.1.3 h1:JnPg/5Q9xVJGfjsO5CPUOjnJps1JaRUm8I9FXVCFK94= +github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= +github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= +github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= +github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= +github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= +github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= +github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= +github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= +github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= +github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw= +github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= +github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= +github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g= +github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ= +github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= +github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= +github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= +github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= +github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= +github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= +github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= +github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= +github.com/multiformats/go-multibase v0.0.3 h1:l/B6bJDQjvQ5G52jw4QGSYeOTZoAwIO77RblWplfIqk= +github.com/multiformats/go-multibase v0.0.3/go.mod h1:5+1R4eQrT3PkYZ24C3W2Ue2tPwIdYQD509ZjSb5y9Oc= +github.com/multiformats/go-multihash v0.1.0 h1:CgAgwqk3//SVEw3T+6DqI4mWMyRuDwZtOWcJT0q9+EA= +github.com/multiformats/go-multihash v0.1.0/go.mod h1:RJlXsxt6vHGaia+S8We0ErjhojtKzPP2AH4+kYM7k84= +github.com/multiformats/go-varint v0.0.6 h1:gk85QWKxh3TazbLxED/NlDVv8+q+ReFJk7Y2W/KhfNY= +github.com/multiformats/go-varint v0.0.6/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM= +github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= +github.com/pganalyze/pg_query_go/v4 v4.2.1 h1:id/vuyIQccb9f6Yx3pzH5l4QYrxE3v6/m8RPlgMrprc= +github.com/pganalyze/pg_query_go/v4 v4.2.1/go.mod h1:aEkDNOXNM5j0YGzaAapwJ7LB3dLNj+bvbWcLv1hOVqA= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI= +github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= +github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= +github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= +github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= +github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v0.0.0-20200419222939-1884f454f8ea/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= +github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA= +github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= +github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= +github.com/thoas/go-funk v0.9.2 h1:oKlNYv0AY5nyf9g+/GhMgS/UO2ces0QRdPKwkhY3VCk= +github.com/thoas/go-funk v0.9.2/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q= +github.com/tklauser/go-sysconf v0.3.5 h1:uu3Xl4nkLzQfXNsWn15rPc/HQCJKObbt1dKJeWp3vU4= +github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= +github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= +github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= +github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= +github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q= +github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= +go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= +golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y= +golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= +gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c= +lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= diff --git a/indexer/constructor.go b/indexer/constructor.go index 0f07e74..c44ab64 100644 --- a/indexer/constructor.go +++ b/indexer/constructor.go @@ -20,15 +20,16 @@ import ( "context" "fmt" - "github.com/ethereum/go-ethereum/log" + "github.com/cerc-io/plugeth-statediff/utils/log" "github.com/ethereum/go-ethereum/params" - "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" - "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" + + "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" + "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" ) // NewStateDiffIndexer creates and returns an implementation of the StateDiffIndexer interface. @@ -41,7 +42,7 @@ func NewStateDiffIndexer(ctx context.Context, chainConfig *params.ChainConfig, n return nil, nil, fmt.Errorf("file config is not the correct type: got %T, expected %T", config, file.Config{}) } fc.NodeInfo = nodeInfo - ind, err := file.NewStateDiffIndexer(ctx, chainConfig, fc) + ind, err := file.NewStateDiffIndexer(chainConfig, fc) return nil, ind, err case shared.POSTGRES: log.Info("Starting statediff service in Postgres writing mode") diff --git a/indexer/database/dump/batch_tx.go b/indexer/database/dump/batch_tx.go index 464c2c7..1923622 100644 --- a/indexer/database/dump/batch_tx.go +++ b/indexer/database/dump/batch_tx.go @@ -20,9 +20,9 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/models" ) // BatchTx wraps a void with the state necessary for building the tx concurrently during trie difference iteration diff --git a/indexer/database/dump/config.go b/indexer/database/dump/config.go index 6fb1f0a..219e1fd 100644 --- a/indexer/database/dump/config.go +++ b/indexer/database/dump/config.go @@ -21,9 +21,14 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/indexer/shared" ) +// Config for data dump +type Config struct { + Dump io.WriteCloser +} + // DumpType to explicitly type the dump destination type DumpType string @@ -31,9 +36,14 @@ const ( STDOUT = "Stdout" STDERR = "Stderr" DISCARD = "Discard" - UNKNOWN = "Unknown" + INVALID = "Invalid" ) +// Type satisfies interfaces.Config +func (c Config) Type() shared.DBType { + return shared.DUMP +} + // ResolveDumpType resolves the dump type for the provided string func ResolveDumpType(str string) (DumpType, error) { switch strings.ToLower(str) { @@ -44,36 +54,27 @@ func ResolveDumpType(str string) (DumpType, error) { case "discard", "void", "devnull", "dev null": return DISCARD, nil default: - return UNKNOWN, fmt.Errorf("unrecognized dump type: %s", str) + return INVALID, fmt.Errorf("unrecognized dump type: %s", str) } } -// Config for data dump -type Config struct { - Dump io.WriteCloser +// Set satisfies flag.Value +func (d *DumpType) Set(v string) (err error) { + *d, err = ResolveDumpType(v) + return } -// Type satisfies interfaces.Config -func (c Config) Type() shared.DBType { - return shared.DUMP -} - -// NewDiscardWriterCloser returns a discardWrapper wrapping io.Discard -func NewDiscardWriterCloser() io.WriteCloser { - return discardWrapper{blackhole: io.Discard} +// String satisfies flag.Value +func (d *DumpType) String() string { + return strings.ToLower(string(*d)) } // discardWrapper wraps io.Discard with io.Closer -type discardWrapper struct { - blackhole io.Writer -} +type discardWrapper struct{ io.Writer } -// Write satisfies io.Writer -func (dw discardWrapper) Write(b []byte) (int, error) { - return dw.blackhole.Write(b) -} +var Discard = discardWrapper{io.Discard} // Close satisfies io.Closer -func (dw discardWrapper) Close() error { +func (discardWrapper) Close() error { return nil } diff --git a/indexer/database/dump/indexer.go b/indexer/database/dump/indexer.go index 0e0db91..a65966a 100644 --- a/indexer/database/dump/indexer.go +++ b/indexer/database/dump/indexer.go @@ -17,7 +17,7 @@ package dump import ( - "bytes" + "encoding/hex" "fmt" "io" "math/big" @@ -28,15 +28,16 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) var _ interfaces.StateDiffIndexer = &StateDiffIndexer{} @@ -199,8 +200,8 @@ func (sdi *StateDiffIndexer) processUncles(tx *BatchTx, headerID string, blockNu return err } preparedHash := crypto.Keccak256Hash(uncleEncoding) - if !bytes.Equal(preparedHash.Bytes(), unclesHash.Bytes()) { - return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.Hex(), unclesHash.Hex()) + if preparedHash != unclesHash { + return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.String(), unclesHash.String()) } unclesCID, err := ipld.RawdataToCid(ipld.MEthHeaderList, uncleEncoding, multihash.KECCAK_256) if err != nil { @@ -294,7 +295,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs if len(receipt.PostState) == 0 { rctModel.PostStatus = receipt.Status } else { - rctModel.PostState = common.Bytes2Hex(receipt.PostState) + rctModel.PostState = hex.EncodeToString(receipt.PostState) } if _, err := fmt.Fprintf(sdi.dump, "%+v\r\n", rctModel); err != nil { @@ -305,7 +306,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs for idx, l := range receipt.Logs { topicSet := make([]string, 4) for ti, topic := range l.Topics { - topicSet[ti] = topic.Hex() + topicSet[ti] = topic.String() } logDataSet[idx] = &models.LogsModel{ diff --git a/indexer/database/file/config.go b/indexer/database/file/config.go index a3623e0..fc8fd8c 100644 --- a/indexer/database/file/config.go +++ b/indexer/database/file/config.go @@ -20,17 +20,26 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/shared" ) +// Config holds params for writing out CSV or SQL files +type Config struct { + Mode FileMode + OutputDir string + FilePath string + WatchedAddressesFilePath string + NodeInfo node.Info +} + // FileMode to explicitly type the mode of file writer we are using type FileMode string const ( CSV FileMode = "CSV" SQL FileMode = "SQL" - Unknown FileMode = "Unknown" + Invalid FileMode = "Invalid" ) // ResolveFileMode resolves a FileMode from a provided string @@ -41,17 +50,19 @@ func ResolveFileMode(str string) (FileMode, error) { case "sql": return SQL, nil default: - return Unknown, fmt.Errorf("unrecognized file type string: %s", str) + return Invalid, fmt.Errorf("unrecognized file type string: %s", str) } } -// Config holds params for writing out CSV or SQL files -type Config struct { - Mode FileMode - OutputDir string - FilePath string - WatchedAddressesFilePath string - NodeInfo node.Info +// Set satisfies flag.Value +func (f *FileMode) Set(v string) (err error) { + *f, err = ResolveFileMode(v) + return +} + +// Set satisfies flag.Value +func (f *FileMode) String() string { + return strings.ToLower(string(*f)) } // Type satisfies interfaces.Config diff --git a/indexer/database/file/csv_indexer_legacy_test.go b/indexer/database/file/csv_indexer_legacy_test.go index f16926d..c117f75 100644 --- a/indexer/database/file/csv_indexer_legacy_test.go +++ b/indexer/database/file/csv_indexer_legacy_test.go @@ -27,11 +27,11 @@ import ( "github.com/stretchr/testify/require" - "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/shared/schema" - "github.com/ethereum/go-ethereum/statediff/indexer/test" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" + "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/shared/schema" + "github.com/cerc-io/plugeth-statediff/indexer/test" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" ) const dbDirectory = "/file_indexer" @@ -43,7 +43,7 @@ func setupLegacyCSVIndexer(t *testing.T) { require.NoError(t, err) } - ind, err = file.NewStateDiffIndexer(context.Background(), test.LegacyConfig, file.CSVTestConfig) + ind, err = file.NewStateDiffIndexer(test.LegacyConfig, file.CSVTestConfig) require.NoError(t, err) db, err = postgres.SetupSQLXDB() diff --git a/indexer/database/file/csv_indexer_test.go b/indexer/database/file/csv_indexer_test.go index 81f425a..a0fed25 100644 --- a/indexer/database/file/csv_indexer_test.go +++ b/indexer/database/file/csv_indexer_test.go @@ -17,7 +17,6 @@ package file_test import ( - "context" "errors" "math/big" "os" @@ -25,15 +24,13 @@ import ( "github.com/stretchr/testify/require" - "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/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "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/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupCSVIndexer(t *testing.T) { - file.CSVTestConfig.OutputDir = "./statediffing_test" - if _, err := os.Stat(file.CSVTestConfig.OutputDir); !errors.Is(err, os.ErrNotExist) { err := os.RemoveAll(file.CSVTestConfig.OutputDir) require.NoError(t, err) @@ -44,7 +41,7 @@ func setupCSVIndexer(t *testing.T) { require.NoError(t, err) } - ind, err = file.NewStateDiffIndexer(context.Background(), mocks.TestConfig, file.CSVTestConfig) + ind, err = file.NewStateDiffIndexer(mocks.TestConfig, file.CSVTestConfig) require.NoError(t, err) db, err = postgres.SetupSQLXDB() @@ -69,7 +66,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexHeaderIPLDs(t, db) + test.DoTestPublishAndIndexHeaderIPLDs(t, db) }) t.Run("Publish and index transaction IPLDs in a single tx", func(t *testing.T) { @@ -77,7 +74,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexTransactionIPLDs(t, db) + test.DoTestPublishAndIndexTransactionIPLDs(t, db) }) t.Run("Publish and index log IPLDs for multiple receipt of a specific block", func(t *testing.T) { @@ -85,7 +82,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexLogIPLDs(t, db) + test.DoTestPublishAndIndexLogIPLDs(t, db) }) t.Run("Publish and index receipt IPLDs in a single tx", func(t *testing.T) { @@ -93,7 +90,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexReceiptIPLDs(t, db) + test.DoTestPublishAndIndexReceiptIPLDs(t, db) }) t.Run("Publish and index state IPLDs in a single tx", func(t *testing.T) { @@ -101,7 +98,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexStateIPLDs(t, db) + test.DoTestPublishAndIndexStateIPLDs(t, db) }) t.Run("Publish and index storage IPLDs in a single tx", func(t *testing.T) { @@ -109,7 +106,7 @@ func TestCSVFileIndexer(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexStorageIPLDs(t, db) + test.DoTestPublishAndIndexStorageIPLDs(t, db) }) } @@ -127,7 +124,7 @@ func TestCSVFileIndexerNonCanonical(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexTransactionsNonCanonical(t, db) + test.DoTestPublishAndIndexTransactionsNonCanonical(t, db) }) t.Run("Publish and index receipts", func(t *testing.T) { @@ -135,7 +132,7 @@ func TestCSVFileIndexerNonCanonical(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexReceiptsNonCanonical(t, db) + test.DoTestPublishAndIndexReceiptsNonCanonical(t, db) }) t.Run("Publish and index logs", func(t *testing.T) { @@ -143,7 +140,7 @@ func TestCSVFileIndexerNonCanonical(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexLogsNonCanonical(t, db) + test.DoTestPublishAndIndexLogsNonCanonical(t, db) }) t.Run("Publish and index state nodes", func(t *testing.T) { @@ -151,7 +148,7 @@ func TestCSVFileIndexerNonCanonical(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexStateNonCanonical(t, db) + test.DoTestPublishAndIndexStateNonCanonical(t, db) }) t.Run("Publish and index storage nodes", func(t *testing.T) { @@ -159,7 +156,7 @@ func TestCSVFileIndexerNonCanonical(t *testing.T) { dumpCSVFileData(t) defer tearDownCSV(t) - test.TestPublishAndIndexStorageNonCanonical(t, db) + test.DoTestPublishAndIndexStorageNonCanonical(t, db) }) } diff --git a/indexer/database/file/csv_writer.go b/indexer/database/file/csv_writer.go index 23e9229..efcc55c 100644 --- a/indexer/database/file/csv_writer.go +++ b/indexer/database/file/csv_writer.go @@ -25,15 +25,15 @@ import ( "path/filepath" "strconv" + "github.com/ethereum/go-ethereum/common" "github.com/thoas/go-funk" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - nodeinfo "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/indexer/shared/schema" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + nodeinfo "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/shared/schema" + sdtypes "github.com/cerc-io/plugeth-statediff/types" ) var ( @@ -92,9 +92,6 @@ func newFileWriter(path string) (ret fileWriter, err error) { } func makeFileWriters(dir string, tables []*schema.Table) (fileWriters, error) { - if err := os.MkdirAll(dir, 0755); err != nil { - return nil, err - } writers := fileWriters{} for _, tbl := range tables { w, err := newFileWriter(TableFilePath(dir, tbl.Name)) diff --git a/indexer/database/file/indexer.go b/indexer/database/file/indexer.go index d4f6a8f..15cbcb6 100644 --- a/indexer/database/file/indexer.go +++ b/indexer/database/file/indexer.go @@ -17,8 +17,6 @@ package file import ( - "bytes" - "context" "errors" "fmt" "math/big" @@ -27,21 +25,21 @@ import ( "sync/atomic" "time" - "github.com/lib/pq" - "github.com/multiformats/go-multihash" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + "github.com/lib/pq" + "github.com/multiformats/go-multihash" + + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) const defaultCSVOutputDir = "./statediff_output" @@ -63,7 +61,7 @@ type StateDiffIndexer struct { } // NewStateDiffIndexer creates a void implementation of interfaces.StateDiffIndexer -func NewStateDiffIndexer(ctx context.Context, chainConfig *params.ChainConfig, config Config) (*StateDiffIndexer, error) { +func NewStateDiffIndexer(chainConfig *params.ChainConfig, config Config) (*StateDiffIndexer, error) { var err error var writer FileWriter @@ -176,7 +174,7 @@ func (sdi *StateDiffIndexer) PushBlock(block *types.Block, receipts types.Receip metrics.IndexerMetrics.PostgresCommitTimer.Update(tDiff) traceMsg += fmt.Sprintf("postgres transaction commit duration: %s\r\n", tDiff.String()) traceMsg += fmt.Sprintf(" TOTAL PROCESSING DURATION: %s\r\n", time.Since(start).String()) - log.Debug(traceMsg) + log.Trace(traceMsg) return err }, } @@ -258,8 +256,8 @@ func (sdi *StateDiffIndexer) processUncles(headerID string, blockNumber *big.Int return err } preparedHash := crypto.Keccak256Hash(uncleEncoding) - if !bytes.Equal(preparedHash.Bytes(), unclesHash.Bytes()) { - return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.Hex(), unclesHash.Hex()) + if preparedHash != unclesHash { + return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.String(), unclesHash.String()) } unclesCID, err := ipld.RawdataToCid(ipld.MEthHeaderList, uncleEncoding, multihash.KECCAK_256) if err != nil { @@ -358,7 +356,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(args processArgs) error { sdi.fileWriter.upsertIPLDNode(args.blockNumber.String(), args.logNodes[i][idx]) topicSet := make([]string, 4) for ti, topic := range l.Topics { - topicSet[ti] = topic.Hex() + topicSet[ti] = topic.String() } logDataSet[idx] = &models.LogsModel{ diff --git a/indexer/database/file/interfaces.go b/indexer/database/file/interfaces.go index c2bfdf7..ba38954 100644 --- a/indexer/database/file/interfaces.go +++ b/indexer/database/file/interfaces.go @@ -19,12 +19,12 @@ package file import ( "math/big" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - nodeinfo "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/types" + + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + nodeinfo "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/types" ) // Writer interface required by the file indexer diff --git a/indexer/database/file/mainnet_tests/indexer_test.go b/indexer/database/file/mainnet_tests/indexer_test.go index 392fb2e..3fe53a0 100644 --- a/indexer/database/file/mainnet_tests/indexer_test.go +++ b/indexer/database/file/mainnet_tests/indexer_test.go @@ -24,16 +24,16 @@ import ( "os" "testing" - "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "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/test" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" + "github.com/stretchr/testify/require" + + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "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/test" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" ) var ( @@ -44,10 +44,6 @@ var ( ) func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } if os.Getenv("STATEDIFF_DB") != "file" { fmt.Println("Skipping statediff .sql file writing mode test") os.Exit(0) @@ -87,7 +83,7 @@ func setupMainnetIndexer(t *testing.T) { require.NoError(t, err) } - ind, err = file.NewStateDiffIndexer(context.Background(), chainConf, file.CSVTestConfig) + ind, err = file.NewStateDiffIndexer(chainConf, file.CSVTestConfig) require.NoError(t, err) db, err = postgres.SetupSQLXDB() diff --git a/indexer/database/file/sql_indexer_legacy_test.go b/indexer/database/file/sql_indexer_legacy_test.go index 02ced17..b46348a 100644 --- a/indexer/database/file/sql_indexer_legacy_test.go +++ b/indexer/database/file/sql_indexer_legacy_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "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/test" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "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/test" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" ) var ( @@ -44,7 +44,7 @@ func setupLegacySQLIndexer(t *testing.T) { require.NoError(t, err) } - ind, err = file.NewStateDiffIndexer(context.Background(), test.LegacyConfig, file.SQLTestConfig) + ind, err = file.NewStateDiffIndexer(test.LegacyConfig, file.SQLTestConfig) require.NoError(t, err) db, err = postgres.SetupSQLXDB() diff --git a/indexer/database/file/sql_indexer_test.go b/indexer/database/file/sql_indexer_test.go index 0a73a8c..a3c190d 100644 --- a/indexer/database/file/sql_indexer_test.go +++ b/indexer/database/file/sql_indexer_test.go @@ -17,7 +17,6 @@ package file_test import ( - "context" "errors" "math/big" "os" @@ -25,10 +24,10 @@ import ( "github.com/stretchr/testify/require" - "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/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "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/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupIndexer(t *testing.T) { @@ -42,7 +41,7 @@ func setupIndexer(t *testing.T) { require.NoError(t, err) } - ind, err = file.NewStateDiffIndexer(context.Background(), mocks.TestConfig, file.SQLTestConfig) + ind, err = file.NewStateDiffIndexer(mocks.TestConfig, file.SQLTestConfig) require.NoError(t, err) db, err = postgres.SetupSQLXDB() @@ -67,7 +66,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexHeaderIPLDs(t, db) + test.DoTestPublishAndIndexHeaderIPLDs(t, db) }) t.Run("Publish and index transaction IPLDs in a single tx", func(t *testing.T) { @@ -75,7 +74,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexTransactionIPLDs(t, db) + test.DoTestPublishAndIndexTransactionIPLDs(t, db) }) t.Run("Publish and index log IPLDs for multiple receipt of a specific block", func(t *testing.T) { @@ -83,7 +82,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexLogIPLDs(t, db) + test.DoTestPublishAndIndexLogIPLDs(t, db) }) t.Run("Publish and index receipt IPLDs in a single tx", func(t *testing.T) { @@ -91,7 +90,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexReceiptIPLDs(t, db) + test.DoTestPublishAndIndexReceiptIPLDs(t, db) }) t.Run("Publish and index state IPLDs in a single tx", func(t *testing.T) { @@ -99,7 +98,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexStateIPLDs(t, db) + test.DoTestPublishAndIndexStateIPLDs(t, db) }) t.Run("Publish and index storage IPLDs in a single tx", func(t *testing.T) { @@ -107,7 +106,7 @@ func TestSQLFileIndexer(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexStorageIPLDs(t, db) + test.DoTestPublishAndIndexStorageIPLDs(t, db) }) } @@ -125,7 +124,7 @@ func TestSQLFileIndexerNonCanonical(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexTransactionsNonCanonical(t, db) + test.DoTestPublishAndIndexTransactionsNonCanonical(t, db) }) t.Run("Publish and index receipts", func(t *testing.T) { @@ -133,7 +132,7 @@ func TestSQLFileIndexerNonCanonical(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexReceiptsNonCanonical(t, db) + test.DoTestPublishAndIndexReceiptsNonCanonical(t, db) }) t.Run("Publish and index logs", func(t *testing.T) { @@ -141,7 +140,7 @@ func TestSQLFileIndexerNonCanonical(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexLogsNonCanonical(t, db) + test.DoTestPublishAndIndexLogsNonCanonical(t, db) }) t.Run("Publish and index state nodes", func(t *testing.T) { @@ -149,7 +148,7 @@ func TestSQLFileIndexerNonCanonical(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexStateNonCanonical(t, db) + test.DoTestPublishAndIndexStateNonCanonical(t, db) }) t.Run("Publish and index storage nodes", func(t *testing.T) { @@ -157,7 +156,7 @@ func TestSQLFileIndexerNonCanonical(t *testing.T) { dumpFileData(t) defer tearDown(t) - test.TestPublishAndIndexStorageNonCanonical(t, db) + test.DoTestPublishAndIndexStorageNonCanonical(t, db) }) } diff --git a/indexer/database/file/sql_writer.go b/indexer/database/file/sql_writer.go index 1e0acb2..849319a 100644 --- a/indexer/database/file/sql_writer.go +++ b/indexer/database/file/sql_writer.go @@ -24,15 +24,15 @@ import ( "math/big" "os" - pg_query "github.com/pganalyze/pg_query_go/v2" + "github.com/ethereum/go-ethereum/common" + pg_query "github.com/pganalyze/pg_query_go/v4" "github.com/thoas/go-funk" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - nodeinfo "github.com/ethereum/go-ethereum/statediff/indexer/node" - "github.com/ethereum/go-ethereum/statediff/types" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + nodeinfo "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/types" ) var ( @@ -382,10 +382,7 @@ func parseWatchedAddressStatement(stmt string) (string, error) { addressString := parseResult.Stmts[0].Stmt.GetInsertStmt(). SelectStmt.GetSelectStmt(). ValuesLists[0].GetList(). - Items[0].GetAConst(). - GetVal(). - GetString_(). - Str + Items[0].GetAConst().GetSval().Sval return addressString, nil } diff --git a/indexer/database/metrics/metrics.go b/indexer/database/metrics/metrics.go index 6174e20..f905d89 100644 --- a/indexer/database/metrics/metrics.go +++ b/indexer/database/metrics/metrics.go @@ -17,13 +17,12 @@ package metrics import ( - "fmt" "strings" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + + "github.com/cerc-io/plugeth-statediff/utils/log" ) const ( @@ -73,73 +72,65 @@ type IndexerMetricsHandles struct { StateStoreCodeProcessingTimer metrics.Timer // Fine-grained code timers - BuildStateDiffWithIntermediateStateNodesTimer metrics.Timer - BuildStateDiffWithoutIntermediateStateNodesTimer metrics.Timer - CreatedAndUpdatedStateWithIntermediateNodesTimer metrics.Timer - DeletedOrUpdatedStateTimer metrics.Timer - BuildAccountUpdatesTimer metrics.Timer - BuildAccountCreationsTimer metrics.Timer - ResolveNodeTimer metrics.Timer - SortKeysTimer metrics.Timer - FindIntersectionTimer metrics.Timer - OutputTimer metrics.Timer - IPLDOutputTimer metrics.Timer - DifferenceIteratorNextTimer metrics.Timer - DifferenceIteratorCounter metrics.Counter - DeletedOrUpdatedStorageTimer metrics.Timer - CreatedAndUpdatedStorageTimer metrics.Timer - BuildStorageNodesIncrementalTimer metrics.Timer - BuildStateTrieObjectTimer metrics.Timer - BuildStateTrieTimer metrics.Timer - BuildStateDiffObjectTimer metrics.Timer - WriteStateDiffObjectTimer metrics.Timer - CreatedAndUpdatedStateTimer metrics.Timer - BuildStorageNodesEventualTimer metrics.Timer - BuildStorageNodesFromTrieTimer metrics.Timer - BuildRemovedAccountStorageNodesTimer metrics.Timer - BuildRemovedStorageNodesFromTrieTimer metrics.Timer - IsWatchedAddressTimer metrics.Timer + BuildStateDiffTimer metrics.Timer + CreatedAndUpdatedStateTimer metrics.Timer + DeletedOrUpdatedStateTimer metrics.Timer + BuildAccountUpdatesTimer metrics.Timer + BuildAccountCreationsTimer metrics.Timer + ResolveNodeTimer metrics.Timer + SortKeysTimer metrics.Timer + FindIntersectionTimer metrics.Timer + OutputTimer metrics.Timer + IPLDOutputTimer metrics.Timer + DifferenceIteratorNextTimer metrics.Timer + DifferenceIteratorCounter metrics.Counter + DeletedOrUpdatedStorageTimer metrics.Timer + CreatedAndUpdatedStorageTimer metrics.Timer + BuildStorageNodesIncrementalTimer metrics.Timer + BuildStateDiffObjectTimer metrics.Timer + WriteStateDiffObjectTimer metrics.Timer + BuildStorageNodesEventualTimer metrics.Timer + BuildStorageNodesFromTrieTimer metrics.Timer + BuildRemovedAccountStorageNodesTimer metrics.Timer + BuildRemovedStorageNodesFromTrieTimer metrics.Timer + IsWatchedAddressTimer metrics.Timer } func RegisterIndexerMetrics(reg metrics.Registry) IndexerMetricsHandles { ctx := IndexerMetricsHandles{ - BlocksCounter: metrics.NewCounter(), - TransactionsCounter: metrics.NewCounter(), - ReceiptsCounter: metrics.NewCounter(), - LogsCounter: metrics.NewCounter(), - AccessListEntriesCounter: metrics.NewCounter(), - FreePostgresTimer: metrics.NewTimer(), - PostgresCommitTimer: metrics.NewTimer(), - HeaderProcessingTimer: metrics.NewTimer(), - UncleProcessingTimer: metrics.NewTimer(), - TxAndRecProcessingTimer: metrics.NewTimer(), - StateStoreCodeProcessingTimer: metrics.NewTimer(), - BuildStateDiffWithIntermediateStateNodesTimer: metrics.NewTimer(), - BuildStateDiffWithoutIntermediateStateNodesTimer: metrics.NewTimer(), - CreatedAndUpdatedStateWithIntermediateNodesTimer: metrics.NewTimer(), - DeletedOrUpdatedStateTimer: metrics.NewTimer(), - BuildAccountUpdatesTimer: metrics.NewTimer(), - BuildAccountCreationsTimer: metrics.NewTimer(), - ResolveNodeTimer: metrics.NewTimer(), - SortKeysTimer: metrics.NewTimer(), - FindIntersectionTimer: metrics.NewTimer(), - OutputTimer: metrics.NewTimer(), - IPLDOutputTimer: metrics.NewTimer(), - DifferenceIteratorNextTimer: metrics.NewTimer(), - DifferenceIteratorCounter: metrics.NewCounter(), - DeletedOrUpdatedStorageTimer: metrics.NewTimer(), - CreatedAndUpdatedStorageTimer: metrics.NewTimer(), - BuildStorageNodesIncrementalTimer: metrics.NewTimer(), - BuildStateTrieObjectTimer: metrics.NewTimer(), - BuildStateTrieTimer: metrics.NewTimer(), - BuildStateDiffObjectTimer: metrics.NewTimer(), - WriteStateDiffObjectTimer: metrics.NewTimer(), - CreatedAndUpdatedStateTimer: metrics.NewTimer(), - BuildStorageNodesEventualTimer: metrics.NewTimer(), - BuildStorageNodesFromTrieTimer: metrics.NewTimer(), - BuildRemovedAccountStorageNodesTimer: metrics.NewTimer(), - BuildRemovedStorageNodesFromTrieTimer: metrics.NewTimer(), - IsWatchedAddressTimer: metrics.NewTimer(), + BlocksCounter: metrics.NewCounter(), + TransactionsCounter: metrics.NewCounter(), + ReceiptsCounter: metrics.NewCounter(), + LogsCounter: metrics.NewCounter(), + AccessListEntriesCounter: metrics.NewCounter(), + FreePostgresTimer: metrics.NewTimer(), + PostgresCommitTimer: metrics.NewTimer(), + HeaderProcessingTimer: metrics.NewTimer(), + UncleProcessingTimer: metrics.NewTimer(), + TxAndRecProcessingTimer: metrics.NewTimer(), + StateStoreCodeProcessingTimer: metrics.NewTimer(), + BuildStateDiffTimer: metrics.NewTimer(), + CreatedAndUpdatedStateTimer: metrics.NewTimer(), + DeletedOrUpdatedStateTimer: metrics.NewTimer(), + BuildAccountUpdatesTimer: metrics.NewTimer(), + BuildAccountCreationsTimer: metrics.NewTimer(), + ResolveNodeTimer: metrics.NewTimer(), + SortKeysTimer: metrics.NewTimer(), + FindIntersectionTimer: metrics.NewTimer(), + OutputTimer: metrics.NewTimer(), + IPLDOutputTimer: metrics.NewTimer(), + DifferenceIteratorNextTimer: metrics.NewTimer(), + DifferenceIteratorCounter: metrics.NewCounter(), + DeletedOrUpdatedStorageTimer: metrics.NewTimer(), + CreatedAndUpdatedStorageTimer: metrics.NewTimer(), + BuildStorageNodesIncrementalTimer: metrics.NewTimer(), + BuildStateDiffObjectTimer: metrics.NewTimer(), + WriteStateDiffObjectTimer: metrics.NewTimer(), + BuildStorageNodesEventualTimer: metrics.NewTimer(), + BuildStorageNodesFromTrieTimer: metrics.NewTimer(), + BuildRemovedAccountStorageNodesTimer: metrics.NewTimer(), + BuildRemovedStorageNodesFromTrieTimer: metrics.NewTimer(), + IsWatchedAddressTimer: metrics.NewTimer(), } subsys := "indexer" reg.Register(metricName(subsys, "blocks"), ctx.BlocksCounter) @@ -153,9 +144,8 @@ func RegisterIndexerMetrics(reg metrics.Registry) IndexerMetricsHandles { reg.Register(metricName(subsys, "t_uncle_processing"), ctx.UncleProcessingTimer) reg.Register(metricName(subsys, "t_tx_receipt_processing"), ctx.TxAndRecProcessingTimer) reg.Register(metricName(subsys, "t_state_store_code_processing"), ctx.StateStoreCodeProcessingTimer) - reg.Register(metricName(subsys, "t_build_statediff_with_intermediate_state_nodes"), ctx.BuildStateDiffWithIntermediateStateNodesTimer) - reg.Register(metricName(subsys, "t_build_statediff_without_intermediate_state_nodes"), ctx.BuildStateDiffWithoutIntermediateStateNodesTimer) - reg.Register(metricName(subsys, "t_created_and_update_state_with_intermediate_nodes"), ctx.CreatedAndUpdatedStateWithIntermediateNodesTimer) + reg.Register(metricName(subsys, "t_build_statediff"), ctx.BuildStateDiffTimer) + reg.Register(metricName(subsys, "t_created_and_update_state"), ctx.CreatedAndUpdatedStateTimer) reg.Register(metricName(subsys, "t_deleted_or_updated_state"), ctx.DeletedOrUpdatedStateTimer) reg.Register(metricName(subsys, "t_build_account_updates"), ctx.BuildAccountUpdatesTimer) reg.Register(metricName(subsys, "t_build_account_creations"), ctx.BuildAccountCreationsTimer) @@ -169,8 +159,6 @@ func RegisterIndexerMetrics(reg metrics.Registry) IndexerMetricsHandles { reg.Register(metricName(subsys, "t_created_and_updated_storage"), ctx.CreatedAndUpdatedStorageTimer) reg.Register(metricName(subsys, "t_deleted_or_updated_storage"), ctx.DeletedOrUpdatedStorageTimer) reg.Register(metricName(subsys, "t_build_storage_nodes_incremental"), ctx.BuildStorageNodesIncrementalTimer) - reg.Register(metricName(subsys, "t_build_state_trie_object"), ctx.BuildStateTrieObjectTimer) - reg.Register(metricName(subsys, "t_build_state_trie"), ctx.BuildStateTrieTimer) reg.Register(metricName(subsys, "t_build_statediff_object"), ctx.BuildStateDiffObjectTimer) reg.Register(metricName(subsys, "t_write_statediff_object"), ctx.WriteStateDiffObjectTimer) reg.Register(metricName(subsys, "t_created_and_updated_state"), ctx.CreatedAndUpdatedStateTimer) @@ -253,7 +241,8 @@ func (met *dbMetricsHandles) Update(stats DbStats) { func ReportAndUpdateDuration(msg string, start time.Time, logger log.Logger, timer metrics.Timer) { since := UpdateDuration(start, timer) - logger.Trace(fmt.Sprintf("%s duration=%dms", msg, since.Milliseconds())) + // This is very noisy so we log at Trace. + logger.Trace(msg, "duration", since) } func UpdateDuration(start time.Time, timer metrics.Timer) time.Duration { diff --git a/indexer/database/sql/batch_tx.go b/indexer/database/sql/batch_tx.go index 16a3644..5c35e88 100644 --- a/indexer/database/sql/batch_tx.go +++ b/indexer/database/sql/batch_tx.go @@ -23,9 +23,9 @@ import ( "github.com/lib/pq" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/utils/log" ) const startingCacheCapacity = 1024 * 24 @@ -36,7 +36,7 @@ type BatchTx struct { ctx context.Context dbtx Tx stm string - quit chan struct{} + quit chan (chan<- struct{}) iplds chan models.IPLDModel ipldCache models.IPLDBatch removedCacheFlag *uint32 @@ -81,8 +81,9 @@ func (tx *BatchTx) cache() { tx.ipldCache.Keys = append(tx.ipldCache.Keys, i.Key) tx.ipldCache.Values = append(tx.ipldCache.Values, i.Data) tx.cacheWg.Done() - case <-tx.quit: + case confirm := <-tx.quit: tx.ipldCache = models.IPLDBatch{} + confirm <- struct{}{} return } } @@ -121,6 +122,6 @@ func (tx *BatchTx) cacheRemoved(key string, value []byte) { // rollback sql transaction and log any error func rollback(ctx context.Context, tx Tx) { if err := tx.Rollback(ctx); err != nil { - log.Error(err.Error()) + log.Error("error during rollback", "error", err) } } diff --git a/indexer/database/sql/indexer.go b/indexer/database/sql/indexer.go index 8a6228f..7e03367 100644 --- a/indexer/database/sql/indexer.go +++ b/indexer/database/sql/indexer.go @@ -20,27 +20,26 @@ package sql import ( - "bytes" "context" "fmt" "math/big" "time" - "github.com/multiformats/go-multihash" - - "github.com/ethereum/go-ethereum/common" + core "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - metrics2 "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + "github.com/multiformats/go-multihash" + + metrics2 "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) var _ interfaces.StateDiffIndexer = &StateDiffIndexer{} @@ -130,7 +129,7 @@ func (sdi *StateDiffIndexer) PushBlock(block *types.Block, receipts types.Receip BlockNumber: block.Number().String(), stm: sdi.dbWriter.db.InsertIPLDsStm(), iplds: make(chan models.IPLDModel), - quit: make(chan struct{}), + quit: make(chan (chan<- struct{})), ipldCache: models.IPLDBatch{ BlockNumbers: make([]string, 0, startingCacheCapacity), Keys: make([]string, 0, startingCacheCapacity), @@ -140,7 +139,10 @@ func (sdi *StateDiffIndexer) PushBlock(block *types.Block, receipts types.Receip // handle transaction commit or rollback for any return case submit: func(self *BatchTx, err error) error { defer func() { + confirm := make(chan struct{}) + self.quit <- confirm close(self.quit) + <-confirm close(self.iplds) }() if p := recover(); p != nil { @@ -249,15 +251,15 @@ func (sdi *StateDiffIndexer) processHeader(tx *BatchTx, header *types.Header, he } // processUncles publishes and indexes uncle IPLDs in Postgres -func (sdi *StateDiffIndexer) processUncles(tx *BatchTx, headerID string, blockNumber *big.Int, unclesHash common.Hash, uncles []*types.Header) error { +func (sdi *StateDiffIndexer) processUncles(tx *BatchTx, headerID string, blockNumber *big.Int, unclesHash core.Hash, uncles []*types.Header) error { // publish and index uncles uncleEncoding, err := rlp.EncodeToBytes(uncles) if err != nil { return err } preparedHash := crypto.Keccak256Hash(uncleEncoding) - if !bytes.Equal(preparedHash.Bytes(), unclesHash.Bytes()) { - return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.Hex(), unclesHash.Hex()) + if preparedHash != unclesHash { + return fmt.Errorf("derived uncles hash (%s) does not match the hash in the header (%s)", preparedHash.String(), unclesHash.String()) } unclesCID, err := ipld.RawdataToCid(ipld.MEthHeaderList, uncleEncoding, multihash.KECCAK_256) if err != nil { @@ -350,7 +352,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs if len(receipt.PostState) == 0 { rctModel.PostStatus = receipt.Status } else { - rctModel.PostState = common.BytesToHash(receipt.PostState).String() + rctModel.PostState = core.BytesToHash(receipt.PostState).String() } if err := sdi.dbWriter.upsertReceiptCID(tx.dbtx, rctModel); err != nil { @@ -363,7 +365,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs tx.cacheIPLD(args.logNodes[i][idx]) topicSet := make([]string, 4) for ti, topic := range l.Topics { - topicSet[ti] = topic.Hex() + topicSet[ti] = topic.String() } logDataSet[idx] = &models.LogsModel{ @@ -401,7 +403,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt stateModel = models.StateNodeModel{ BlockNumber: tx.BlockNumber, HeaderID: headerID, - StateKey: common.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), + StateKey: core.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), CID: shared.RemovedNodeStateCID, Removed: true, } @@ -409,12 +411,12 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt stateModel = models.StateNodeModel{ BlockNumber: tx.BlockNumber, HeaderID: headerID, - StateKey: common.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), + StateKey: core.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), CID: stateNode.AccountWrapper.CID, Removed: false, Balance: stateNode.AccountWrapper.Account.Balance.String(), Nonce: stateNode.AccountWrapper.Account.Nonce, - CodeHash: common.BytesToHash(stateNode.AccountWrapper.Account.CodeHash).String(), + CodeHash: core.BytesToHash(stateNode.AccountWrapper.Account.CodeHash).String(), StorageRoot: stateNode.AccountWrapper.Account.Root.String(), } } @@ -431,8 +433,8 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt storageModel := models.StorageNodeModel{ BlockNumber: tx.BlockNumber, HeaderID: headerID, - StateKey: common.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), - StorageKey: common.BytesToHash(storageNode.LeafKey).String(), + StateKey: core.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), + StorageKey: core.BytesToHash(storageNode.LeafKey).String(), CID: shared.RemovedNodeStorageCID, Removed: true, Value: []byte{}, @@ -445,8 +447,8 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt storageModel := models.StorageNodeModel{ BlockNumber: tx.BlockNumber, HeaderID: headerID, - StateKey: common.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), - StorageKey: common.BytesToHash(storageNode.LeafKey).String(), + StateKey: core.BytesToHash(stateNode.AccountWrapper.LeafKey).String(), + StorageKey: core.BytesToHash(storageNode.LeafKey).String(), CID: storageNode.CID, Removed: false, Value: storageNode.Value, @@ -477,7 +479,7 @@ func (sdi *StateDiffIndexer) Close() error { // Update the known gaps table with the gap information. // LoadWatchedAddresses reads watched addresses from the database -func (sdi *StateDiffIndexer) LoadWatchedAddresses() ([]common.Address, error) { +func (sdi *StateDiffIndexer) LoadWatchedAddresses() ([]core.Address, error) { addressStrings := make([]string, 0) pgStr := "SELECT address FROM eth_meta.watched_addresses" err := sdi.dbWriter.db.Select(sdi.ctx, &addressStrings, pgStr) @@ -485,9 +487,9 @@ func (sdi *StateDiffIndexer) LoadWatchedAddresses() ([]common.Address, error) { return nil, fmt.Errorf("error loading watched addresses: %v", err) } - watchedAddresses := []common.Address{} + watchedAddresses := []core.Address{} for _, addressString := range addressStrings { - watchedAddresses = append(watchedAddresses, common.HexToAddress(addressString)) + watchedAddresses = append(watchedAddresses, core.HexToAddress(addressString)) } return watchedAddresses, nil diff --git a/indexer/database/sql/indexer_shared_test.go b/indexer/database/sql/indexer_shared_test.go index 13fd0c0..7d63de0 100644 --- a/indexer/database/sql/indexer_shared_test.go +++ b/indexer/database/sql/indexer_shared_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" ) var ( diff --git a/indexer/database/sql/interfaces.go b/indexer/database/sql/interfaces.go index f964a2a..47e63c0 100644 --- a/indexer/database/sql/interfaces.go +++ b/indexer/database/sql/interfaces.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" ) // Database interfaces required by the sql indexer diff --git a/indexer/database/sql/lazy_tx.go b/indexer/database/sql/lazy_tx.go index b2445e0..6b67921 100644 --- a/indexer/database/sql/lazy_tx.go +++ b/indexer/database/sql/lazy_tx.go @@ -4,7 +4,7 @@ import ( "context" "reflect" - "github.com/ethereum/go-ethereum/log" + "github.com/cerc-io/plugeth-statediff/utils/log" ) // Changing this to 1 would make sure only sequential COPYs were combined. @@ -86,7 +86,7 @@ func (tx *DelayedTx) Commit(ctx context.Context) error { case *copyFrom: _, err := base.CopyFrom(ctx, item.tableName, item.columnNames, item.rows) if err != nil { - log.Error("COPY error", "table", item.tableName, "err", err) + log.Error("COPY error", "table", item.tableName, "error", err) return err } case cachedStmt: diff --git a/indexer/database/sql/mainnet_tests/indexer_test.go b/indexer/database/sql/mainnet_tests/indexer_test.go index ce57a74..22bc6e6 100644 --- a/indexer/database/sql/mainnet_tests/indexer_test.go +++ b/indexer/database/sql/mainnet_tests/indexer_test.go @@ -18,20 +18,18 @@ package mainnet_tests import ( "context" - "fmt" "math/big" - "os" "testing" "github.com/stretchr/testify/require" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "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/test" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "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/test" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" ) var ( @@ -41,13 +39,6 @@ var ( chainConf = params.MainnetChainConfig ) -func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } -} - func TestMainnetIndexer(t *testing.T) { conf := test_helpers.GetTestConfig() diff --git a/indexer/database/sql/pgx_indexer_legacy_test.go b/indexer/database/sql/pgx_indexer_legacy_test.go index b079877..af2e542 100644 --- a/indexer/database/sql/pgx_indexer_legacy_test.go +++ b/indexer/database/sql/pgx_indexer_legacy_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupLegacyPGXIndexer(t *testing.T) { diff --git a/indexer/database/sql/pgx_indexer_test.go b/indexer/database/sql/pgx_indexer_test.go index 27e9f20..55fd272 100644 --- a/indexer/database/sql/pgx_indexer_test.go +++ b/indexer/database/sql/pgx_indexer_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupPGXIndexer(t *testing.T, config postgres.Config) { @@ -59,7 +59,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexHeaderIPLDs(t, db) + test.DoTestPublishAndIndexHeaderIPLDs(t, db) }) t.Run("Publish and index transaction IPLDs in a single tx", func(t *testing.T) { @@ -67,7 +67,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexTransactionIPLDs(t, db) + test.DoTestPublishAndIndexTransactionIPLDs(t, db) }) t.Run("Publish and index log IPLDs for multiple receipt of a specific block", func(t *testing.T) { @@ -75,7 +75,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexLogIPLDs(t, db) + test.DoTestPublishAndIndexLogIPLDs(t, db) }) t.Run("Publish and index receipt IPLDs in a single tx", func(t *testing.T) { @@ -83,7 +83,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexReceiptIPLDs(t, db) + test.DoTestPublishAndIndexReceiptIPLDs(t, db) }) t.Run("Publish and index state IPLDs in a single tx", func(t *testing.T) { @@ -91,7 +91,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexStateIPLDs(t, db) + test.DoTestPublishAndIndexStateIPLDs(t, db) }) t.Run("Publish and index storage IPLDs in a single tx", func(t *testing.T) { @@ -99,7 +99,7 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexStorageIPLDs(t, db) + test.DoTestPublishAndIndexStorageIPLDs(t, db) }) t.Run("Publish and index with CopyFrom enabled.", func(t *testing.T) { @@ -110,10 +110,10 @@ func TestPGXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexStateIPLDs(t, db) - test.TestPublishAndIndexStorageIPLDs(t, db) - test.TestPublishAndIndexReceiptIPLDs(t, db) - test.TestPublishAndIndexLogIPLDs(t, db) + test.DoTestPublishAndIndexStateIPLDs(t, db) + test.DoTestPublishAndIndexStorageIPLDs(t, db) + test.DoTestPublishAndIndexReceiptIPLDs(t, db) + test.DoTestPublishAndIndexLogIPLDs(t, db) }) } @@ -132,7 +132,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexTransactionsNonCanonical(t, db) + test.DoTestPublishAndIndexTransactionsNonCanonical(t, db) }) t.Run("Publish and index receipts", func(t *testing.T) { @@ -140,7 +140,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexReceiptsNonCanonical(t, db) + test.DoTestPublishAndIndexReceiptsNonCanonical(t, db) }) t.Run("Publish and index logs", func(t *testing.T) { @@ -148,7 +148,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexLogsNonCanonical(t, db) + test.DoTestPublishAndIndexLogsNonCanonical(t, db) }) t.Run("Publish and index state nodes", func(t *testing.T) { @@ -156,7 +156,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexStateNonCanonical(t, db) + test.DoTestPublishAndIndexStateNonCanonical(t, db) }) t.Run("Publish and index storage nodes", func(t *testing.T) { @@ -164,7 +164,7 @@ func TestPGXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 1, 0, 1) - test.TestPublishAndIndexStorageNonCanonical(t, db) + test.DoTestPublishAndIndexStorageNonCanonical(t, db) }) } diff --git a/indexer/database/sql/postgres/config.go b/indexer/database/sql/postgres/config.go index 28c5aaa..a2c63b4 100644 --- a/indexer/database/sql/postgres/config.go +++ b/indexer/database/sql/postgres/config.go @@ -23,49 +23,9 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/indexer/shared" ) -// DriverType to explicitly type the kind of sql driver we are using -type DriverType string - -const ( - PGX DriverType = "PGX" - SQLX DriverType = "SQLX" - Unknown DriverType = "Unknown" -) - -// Env variables -const ( - DATABASE_NAME = "DATABASE_NAME" - DATABASE_HOSTNAME = "DATABASE_HOSTNAME" - DATABASE_PORT = "DATABASE_PORT" - DATABASE_USER = "DATABASE_USER" - DATABASE_PASSWORD = "DATABASE_PASSWORD" -) - -// ResolveDriverType resolves a DriverType from a provided string -func ResolveDriverType(str string) (DriverType, error) { - switch strings.ToLower(str) { - case "pgx", "pgxpool": - return PGX, nil - case "sqlx": - return SQLX, nil - default: - return Unknown, fmt.Errorf("unrecognized driver type string: %s", str) - } -} - -// TestConfig specifies default parameters for connecting to a testing DB -var TestConfig = Config{ - Hostname: "localhost", - Port: 8077, - DatabaseName: "cerc_testing", - Username: "vdbm", - Password: "password", - Driver: SQLX, -} - // Config holds params for a Postgres db type Config struct { // conn string params @@ -98,6 +58,34 @@ type Config struct { CopyFrom bool } +// DriverType to explicitly type the kind of sql driver we are using +type DriverType string + +const ( + PGX DriverType = "PGX" + SQLX DriverType = "SQLX" + Invalid DriverType = "Invalid" +) + +// Env variables +const ( + DATABASE_NAME = "DATABASE_NAME" + DATABASE_HOSTNAME = "DATABASE_HOSTNAME" + DATABASE_PORT = "DATABASE_PORT" + DATABASE_USER = "DATABASE_USER" + DATABASE_PASSWORD = "DATABASE_PASSWORD" +) + +// TestConfig specifies default parameters for connecting to a testing DB +var TestConfig = Config{ + Hostname: "localhost", + Port: 8077, + DatabaseName: "cerc_testing", + Username: "vdbm", + Password: "password", + Driver: SQLX, +} + // Type satisfies interfaces.Config func (c Config) Type() shared.DBType { return shared.POSTGRES @@ -116,6 +104,7 @@ func (c Config) DbConnectionString() string { return fmt.Sprintf("postgresql://%s:%d/%s?sslmode=disable", c.Hostname, c.Port, c.DatabaseName) } +// WithEnv overrides the config with env variables, returning a new instance func (c Config) WithEnv() (Config, error) { if val := os.Getenv(DATABASE_NAME); val != "" { c.DatabaseName = val @@ -138,3 +127,26 @@ func (c Config) WithEnv() (Config, error) { } return c, nil } + +// ResolveDriverType resolves a DriverType from a provided string +func ResolveDriverType(str string) (DriverType, error) { + switch strings.ToLower(str) { + case "pgx", "pgxpool": + return PGX, nil + case "sqlx": + return SQLX, nil + default: + return Invalid, fmt.Errorf("unrecognized driver type string: %s", str) + } +} + +// Set satisfies flag.Value +func (d *DriverType) Set(v string) (err error) { + *d, err = ResolveDriverType(v) + return +} + +// String satisfies flag.Value +func (d *DriverType) String() string { + return strings.ToLower(string(*d)) +} diff --git a/indexer/database/sql/postgres/database.go b/indexer/database/sql/postgres/database.go index b371a83..3d122dc 100644 --- a/indexer/database/sql/postgres/database.go +++ b/indexer/database/sql/postgres/database.go @@ -17,8 +17,8 @@ package postgres import ( - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/shared/schema" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/shared/schema" ) var _ sql.Database = &DB{} diff --git a/indexer/database/sql/postgres/log_adapter.go b/indexer/database/sql/postgres/log_adapter.go index c3ceead..4a8bdcc 100644 --- a/indexer/database/sql/postgres/log_adapter.go +++ b/indexer/database/sql/postgres/log_adapter.go @@ -18,8 +18,9 @@ package postgres import ( "context" - "github.com/ethereum/go-ethereum/log" "github.com/jackc/pgx/v4" + + "github.com/cerc-io/plugeth-statediff/utils/log" ) type LogAdapter struct { @@ -31,31 +32,26 @@ func NewLogAdapter(l log.Logger) *LogAdapter { } func (l *LogAdapter) Log(ctx context.Context, level pgx.LogLevel, msg string, data map[string]interface{}) { - var logger log.Logger - if data != nil { - var args = make([]interface{}, 0) - for key, value := range data { - if value != nil { - args = append(args, key, value) - } + args := make([]interface{}, 0) + for key, value := range data { + if value != nil { + args = append(args, key, value) } - logger = l.l.New(args...) - } else { - logger = l.l } + logger := l.l switch level { case pgx.LogLevelTrace: - logger.Trace(msg) + logger.Trace(msg, args...) case pgx.LogLevelDebug: - logger.Debug(msg) + logger.Debug(msg, args...) case pgx.LogLevelInfo: - logger.Info(msg) + logger.Info(msg, args...) case pgx.LogLevelWarn: - logger.Warn(msg) + logger.Warn(msg, args...) case pgx.LogLevelError: - logger.Error(msg) + logger.Error(msg, args...) default: - logger.New("INVALID_PGX_LOG_LEVEL", level).Error(msg) + logger.Error(msg, "INVALID_PGX_LOG_LEVEL", level) } } diff --git a/indexer/database/sql/postgres/pgx.go b/indexer/database/sql/postgres/pgx.go index 7825e34..928e776 100644 --- a/indexer/database/sql/postgres/pgx.go +++ b/indexer/database/sql/postgres/pgx.go @@ -20,16 +20,16 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/cerc-io/plugeth-statediff/utils/log" "github.com/georgysavva/scany/pgxscan" "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" "github.com/jackc/pgx/v4/pgxpool" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/node" ) // PGXDriver driver, implements sql.Driver @@ -96,7 +96,7 @@ func MakeConfig(config Config) (*pgxpool.Config, error) { } if config.LogStatements { - conf.ConnConfig.Logger = NewLogAdapter(log.New()) + conf.ConnConfig.Logger = NewLogAdapter(log.DefaultLogger) } return conf, nil @@ -106,8 +106,10 @@ func (pgx *PGXDriver) createNode() error { _, err := pgx.pool.Exec( pgx.ctx, createNodeStm, - pgx.nodeInfo.GenesisBlock, pgx.nodeInfo.NetworkID, - pgx.nodeInfo.ID, pgx.nodeInfo.ClientName, + pgx.nodeInfo.GenesisBlock, + pgx.nodeInfo.NetworkID, + pgx.nodeInfo.ID, + pgx.nodeInfo.ClientName, pgx.nodeInfo.ChainID) if err != nil { return ErrUnableToSetNode(err) diff --git a/indexer/database/sql/postgres/pgx_test.go b/indexer/database/sql/postgres/pgx_test.go index 86d082a..4a2fd3f 100644 --- a/indexer/database/sql/postgres/pgx_test.go +++ b/indexer/database/sql/postgres/pgx_test.go @@ -26,8 +26,8 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/node" ) var ( diff --git a/indexer/database/sql/postgres/postgres_suite_test.go b/indexer/database/sql/postgres/postgres_suite_test.go deleted file mode 100644 index a020e08..0000000 --- a/indexer/database/sql/postgres/postgres_suite_test.go +++ /dev/null @@ -1,33 +0,0 @@ -// VulcanizeDB -// Copyright © 2019 Vulcanize - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. - -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -package postgres_test - -import ( - "fmt" - "os" - - "github.com/ethereum/go-ethereum/log" -) - -func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } - - log.Root().SetHandler(log.DiscardHandler()) -} diff --git a/indexer/database/sql/postgres/sqlx.go b/indexer/database/sql/postgres/sqlx.go index 452b498..0c7ea37 100644 --- a/indexer/database/sql/postgres/sqlx.go +++ b/indexer/database/sql/postgres/sqlx.go @@ -24,9 +24,9 @@ import ( "github.com/jmoiron/sqlx" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/node" ) // SQLXDriver driver, implements sql.Driver diff --git a/indexer/database/sql/postgres/sqlx_test.go b/indexer/database/sql/postgres/sqlx_test.go index 903f871..441fc3f 100644 --- a/indexer/database/sql/postgres/sqlx_test.go +++ b/indexer/database/sql/postgres/sqlx_test.go @@ -26,8 +26,8 @@ import ( _ "github.com/lib/pq" "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/node" ) func TestPostgresSQLX(t *testing.T) { diff --git a/indexer/database/sql/postgres/test_helpers.go b/indexer/database/sql/postgres/test_helpers.go index 75c50e3..62a5a4e 100644 --- a/indexer/database/sql/postgres/test_helpers.go +++ b/indexer/database/sql/postgres/test_helpers.go @@ -19,8 +19,8 @@ package postgres import ( "context" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/node" ) // SetupSQLXDB is used to setup a sqlx db for tests diff --git a/indexer/database/sql/sqlx_indexer_legacy_test.go b/indexer/database/sql/sqlx_indexer_legacy_test.go index 4a07b8a..af96940 100644 --- a/indexer/database/sql/sqlx_indexer_legacy_test.go +++ b/indexer/database/sql/sqlx_indexer_legacy_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupLegacySQLXIndexer(t *testing.T) { diff --git a/indexer/database/sql/sqlx_indexer_test.go b/indexer/database/sql/sqlx_indexer_test.go index fa88446..8568e79 100644 --- a/indexer/database/sql/sqlx_indexer_test.go +++ b/indexer/database/sql/sqlx_indexer_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/test" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql/postgres" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/test" ) func setupSQLXIndexer(t *testing.T) { @@ -55,7 +55,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexHeaderIPLDs(t, db) + test.DoTestPublishAndIndexHeaderIPLDs(t, db) }) t.Run("Publish and index transaction IPLDs in a single tx", func(t *testing.T) { @@ -63,7 +63,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexTransactionIPLDs(t, db) + test.DoTestPublishAndIndexTransactionIPLDs(t, db) }) t.Run("Publish and index log IPLDs for multiple receipt of a specific block", func(t *testing.T) { @@ -71,7 +71,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexLogIPLDs(t, db) + test.DoTestPublishAndIndexLogIPLDs(t, db) }) t.Run("Publish and index receipt IPLDs in a single tx", func(t *testing.T) { @@ -79,7 +79,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexReceiptIPLDs(t, db) + test.DoTestPublishAndIndexReceiptIPLDs(t, db) }) t.Run("Publish and index state IPLDs in a single tx", func(t *testing.T) { @@ -87,7 +87,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexStateIPLDs(t, db) + test.DoTestPublishAndIndexStateIPLDs(t, db) }) t.Run("Publish and index storage IPLDs in a single tx", func(t *testing.T) { @@ -95,7 +95,7 @@ func TestSQLXIndexer(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexStorageIPLDs(t, db) + test.DoTestPublishAndIndexStorageIPLDs(t, db) }) } @@ -114,7 +114,7 @@ func TestSQLXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexTransactionsNonCanonical(t, db) + test.DoTestPublishAndIndexTransactionsNonCanonical(t, db) }) t.Run("Publish and index receipts", func(t *testing.T) { @@ -122,7 +122,7 @@ func TestSQLXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexReceiptsNonCanonical(t, db) + test.DoTestPublishAndIndexReceiptsNonCanonical(t, db) }) t.Run("Publish and index logs", func(t *testing.T) { @@ -130,7 +130,7 @@ func TestSQLXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexLogsNonCanonical(t, db) + test.DoTestPublishAndIndexLogsNonCanonical(t, db) }) t.Run("Publish and index state nodes", func(t *testing.T) { @@ -138,7 +138,7 @@ func TestSQLXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexStateNonCanonical(t, db) + test.DoTestPublishAndIndexStateNonCanonical(t, db) }) t.Run("Publish and index storage nodes", func(t *testing.T) { @@ -146,7 +146,7 @@ func TestSQLXIndexerNonCanonical(t *testing.T) { defer tearDown(t) defer checkTxClosure(t, 0, 0, 0) - test.TestPublishAndIndexStorageNonCanonical(t, db) + test.DoTestPublishAndIndexStorageNonCanonical(t, db) }) } diff --git a/indexer/database/sql/writer.go b/indexer/database/sql/writer.go index 9ff85d1..5a3b4e9 100644 --- a/indexer/database/sql/writer.go +++ b/indexer/database/sql/writer.go @@ -25,8 +25,8 @@ import ( "github.com/lib/pq" "github.com/shopspring/decimal" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/models" ) // Writer handles processing and writing of indexed IPLD objects to Postgres diff --git a/indexer/interfaces/interfaces.go b/indexer/interfaces/interfaces.go index 9836d6a..596b330 100644 --- a/indexer/interfaces/interfaces.go +++ b/indexer/interfaces/interfaces.go @@ -17,14 +17,13 @@ package interfaces import ( - "io" "math/big" "time" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + 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/statediff/indexer/shared" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" ) // StateDiffIndexer interface required to index statediff data @@ -41,7 +40,7 @@ type StateDiffIndexer interface { SetWatchedAddresses(args []sdtypes.WatchAddressArg, currentBlockNumber *big.Int) error ClearWatchedAddresses() error - io.Closer + Close() error } // Batch required for indexing data atomically diff --git a/indexer/ipld/eth_log.go b/indexer/ipld/eth_log.go index f427625..71db98a 100644 --- a/indexer/ipld/eth_log.go +++ b/indexer/ipld/eth_log.go @@ -1,11 +1,10 @@ package ipld import ( - "github.com/ipfs/go-cid" - mh "github.com/multiformats/go-multihash" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" + "github.com/ipfs/go-cid" + mh "github.com/multiformats/go-multihash" ) // EthLog (eth-log, codec 0x9a), represents an ethereum block header diff --git a/indexer/ipld/eth_parser.go b/indexer/ipld/eth_parser.go index 9ce7155..7c9adf4 100644 --- a/indexer/ipld/eth_parser.go +++ b/indexer/ipld/eth_parser.go @@ -58,7 +58,7 @@ func processTransactions(txs []*types.Transaction) ([]*EthTx, error) { // processReceiptsAndLogs will take in receipts // to return IPLD node slices for eth-rct and eth-log -func processReceiptsAndLogs(rcts []*types.Receipt) ([]*EthReceipt, [][]*EthLog, error) { +func processReceiptsAndLogs(rcts types.Receipts) ([]*EthReceipt, [][]*EthLog, error) { // Pre allocating memory. ethRctNodes := make([]*EthReceipt, len(rcts)) ethLogNodes := make([][]*EthLog, len(rcts)) @@ -81,6 +81,31 @@ func processReceiptsAndLogs(rcts []*types.Receipt) ([]*EthReceipt, [][]*EthLog, return ethRctNodes, ethLogNodes, nil } +// // processReceiptsAndLogs will take in receipts +// // to return IPLD node slices for eth-rct and eth-log +// func processReceiptsAndLogs(rcts []*types.Receipt) ([]*EthReceipt, [][]*EthLog, error) { +// // Pre allocating memory. +// ethRctNodes := make([]*EthReceipt, len(rcts)) +// ethLogNodes := make([][]*EthLog, len(rcts)) + +// for idx, rct := range rcts { +// logNodes, err := processLogs(rct.Logs) +// if err != nil { +// return nil, nil, err +// } + +// ethRct, err := NewReceipt(rct) +// if err != nil { +// return nil, nil, err +// } + +// ethRctNodes[idx] = ethRct +// ethLogNodes[idx] = logNodes +// } + +// return ethRctNodes, ethLogNodes, nil +// } + func processLogs(logs []*types.Log) ([]*EthLog, error) { logNodes := make([]*EthLog, len(logs)) for idx, log := range logs { diff --git a/indexer/mocks/test_data.go b/indexer/mocks/test_data.go index f217cd4..f725f97 100644 --- a/indexer/mocks/test_data.go +++ b/indexer/mocks/test_data.go @@ -22,18 +22,18 @@ import ( "crypto/rand" "math/big" - ipld2 "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/statediff/test_helpers" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" "github.com/ethereum/go-ethereum/trie" + + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/test_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) // Test variables @@ -150,7 +150,7 @@ var ( StoragePartialPath, StorageValue, }) - StorageLeafNodeCID = ipld2.Keccak256ToCid(ipld2.MEthStorageTrie, crypto.Keccak256(StorageLeafNode)).String() + StorageLeafNodeCID = ipld.Keccak256ToCid(ipld.MEthStorageTrie, crypto.Keccak256(StorageLeafNode)).String() nonce1 = uint64(1) ContractRoot = "0x821e2556a290c86405f8160a2d662042a431ba456b9db265c79bb837c04be5f0" @@ -169,7 +169,7 @@ var ( ContractPartialPath, ContractAccount, }) - ContractLeafNodeCID = ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(ContractLeafNode)).String() + ContractLeafNodeCID = ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(ContractLeafNode)).String() Contract2LeafKey = test_helpers.AddressToLeafKey(ContractAddress2) storage2Location = common.HexToHash("2") @@ -195,7 +195,7 @@ var ( AccountPartialPath, Account, }) - AccountLeafNodeCID = ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(AccountLeafNode)).String() + AccountLeafNodeCID = ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(AccountLeafNode)).String() StateDiffs = []sdtypes.StateLeafNode{ { diff --git a/indexer/shared/db_kind.go b/indexer/shared/db_kind.go index 7e7997f..5c75531 100644 --- a/indexer/shared/db_kind.go +++ b/indexer/shared/db_kind.go @@ -28,7 +28,7 @@ const ( POSTGRES DBType = "Postgres" DUMP DBType = "Dump" FILE DBType = "File" - UNKNOWN DBType = "Unknown" + INVALID DBType = "Invalid" ) // ResolveDBType resolves a DBType from a provided string @@ -41,6 +41,17 @@ func ResolveDBType(str string) (DBType, error) { case "file", "f", "fs": return FILE, nil default: - return UNKNOWN, fmt.Errorf("unrecognized db type string: %s", str) + return INVALID, fmt.Errorf("unrecognized db type string: %s", str) } } + +// Set satisfies flag.Value +func (dbt *DBType) Set(v string) (err error) { + *dbt, err = ResolveDBType(v) + return +} + +// String satisfies flag.Value +func (dbt *DBType) String() string { + return strings.ToLower(string(*dbt)) +} diff --git a/indexer/shared/functions.go b/indexer/shared/functions.go index 23a25b2..58306bd 100644 --- a/indexer/shared/functions.go +++ b/indexer/shared/functions.go @@ -25,13 +25,13 @@ func HandleZeroAddrPointer(to *common.Address) string { if to == nil { return "" } - return to.Hex() + return to.String() } // HandleZeroAddr will return an empty string for a 0 value address func HandleZeroAddr(to common.Address) string { - if to.Hex() == "0x0000000000000000000000000000000000000000" { + if to == (common.Address{}) { return "" } - return to.Hex() + return to.String() } diff --git a/indexer/shared/schema/table_test.go b/indexer/shared/schema/table_test.go index 579e29e..692a839 100644 --- a/indexer/shared/schema/table_test.go +++ b/indexer/shared/schema/table_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - . "github.com/ethereum/go-ethereum/statediff/indexer/shared/schema" + . "github.com/cerc-io/plugeth-statediff/indexer/shared/schema" ) var testHeaderTable = Table{ diff --git a/indexer/test/test.go b/indexer/test/test.go index d7d25dc..ad43529 100644 --- a/indexer/test/test.go +++ b/indexer/test/test.go @@ -21,21 +21,20 @@ import ( "sort" "testing" - "github.com/stretchr/testify/assert" - - "github.com/ipfs/go-cid" - "github.com/stretchr/testify/require" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" - "github.com/ethereum/go-ethereum/statediff/indexer/test_helpers" + "github.com/ipfs/go-cid" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/shared" + "github.com/cerc-io/plugeth-statediff/indexer/test_helpers" ) // SetupTestData indexes a single mock block along with it's state nodes @@ -69,7 +68,7 @@ func SetupTestData(t *testing.T, ind interfaces.StateDiffIndexer) { } } -func TestPublishAndIndexHeaderIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexHeaderIPLDs(t *testing.T, db sql.Database) { pgStr := `SELECT cid, cast(td AS TEXT), cast(reward AS TEXT), block_hash, coinbase FROM eth.header_cids WHERE block_number = $1` @@ -107,7 +106,7 @@ func TestPublishAndIndexHeaderIPLDs(t *testing.T, db sql.Database) { require.Equal(t, mocks.MockHeaderRlp, data) } -func TestPublishAndIndexTransactionIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexTransactionIPLDs(t *testing.T, db sql.Database) { // check that txs were properly indexed and published trxs := make([]string, 0) pgStr := `SELECT transaction_cids.cid FROM eth.transaction_cids INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash) @@ -209,7 +208,7 @@ func TestPublishAndIndexTransactionIPLDs(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexLogIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexLogIPLDs(t *testing.T, db sql.Database) { rcts := make([]string, 0) rctsPgStr := `SELECT receipt_cids.cid FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids WHERE receipt_cids.tx_id = transaction_cids.tx_hash @@ -251,7 +250,7 @@ func TestPublishAndIndexLogIPLDs(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexReceiptIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexReceiptIPLDs(t *testing.T, db sql.Database) { // check receipts were properly indexed and published rcts := make([]string, 0) pgStr := `SELECT receipt_cids.cid FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids @@ -341,7 +340,7 @@ func TestPublishAndIndexReceiptIPLDs(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexStateIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexStateIPLDs(t *testing.T, db sql.Database) { // check that state nodes were properly indexed and published stateNodes := make([]models.StateNodeModel, 0) pgStr := `SELECT state_cids.cid, CAST(state_cids.block_number as TEXT), state_cids.state_leaf_key, state_cids.removed, @@ -366,7 +365,7 @@ func TestPublishAndIndexStateIPLDs(t *testing.T, db sql.Database) { } if stateNode.CID == state1CID.String() { require.Equal(t, false, stateNode.Removed) - require.Equal(t, common.BytesToHash(mocks.ContractLeafKey).Hex(), stateNode.StateKey) + require.Equal(t, common.BytesToHash(mocks.ContractLeafKey).String(), stateNode.StateKey) require.Equal(t, mocks.ContractLeafNode, data) require.Equal(t, mocks.BlockNumber.String(), stateNode.BlockNumber) require.Equal(t, "0", stateNode.Balance) @@ -377,7 +376,7 @@ func TestPublishAndIndexStateIPLDs(t *testing.T, db sql.Database) { } if stateNode.CID == state2CID.String() { require.Equal(t, false, stateNode.Removed) - require.Equal(t, common.BytesToHash(mocks.AccountLeafKey).Hex(), stateNode.StateKey) + require.Equal(t, common.BytesToHash(mocks.AccountLeafKey).String(), stateNode.StateKey) require.Equal(t, mocks.AccountLeafNode, data) require.Equal(t, mocks.BlockNumber.String(), stateNode.BlockNumber) require.Equal(t, mocks.Balance.String(), stateNode.Balance) @@ -412,11 +411,11 @@ func TestPublishAndIndexStateIPLDs(t *testing.T, db sql.Database) { t.Fatal(err) } - if common.BytesToHash(mocks.RemovedLeafKey).Hex() == stateNode.StateKey { + if common.BytesToHash(mocks.RemovedLeafKey).String() == stateNode.StateKey { require.Equal(t, shared.RemovedNodeStateCID, stateNode.CID) require.Equal(t, true, stateNode.Removed) require.Equal(t, []byte{}, data) - } else if common.BytesToHash(mocks.Contract2LeafKey).Hex() == stateNode.StateKey { + } else if common.BytesToHash(mocks.Contract2LeafKey).String() == stateNode.StateKey { require.Equal(t, shared.RemovedNodeStateCID, stateNode.CID) require.Equal(t, true, stateNode.Removed) require.Equal(t, []byte{}, data) @@ -439,7 +438,7 @@ type StorageNodeModel struct { } */ -func TestPublishAndIndexStorageIPLDs(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexStorageIPLDs(t *testing.T, db sql.Database) { // check that storage nodes were properly indexed storageNodes := make([]models.StorageNodeModel, 0) pgStr := `SELECT cast(storage_cids.block_number AS TEXT), storage_cids.header_id, storage_cids.cid, @@ -455,11 +454,11 @@ func TestPublishAndIndexStorageIPLDs(t *testing.T, db sql.Database) { require.Equal(t, 1, len(storageNodes)) require.Equal(t, models.StorageNodeModel{ BlockNumber: mocks.BlockNumber.String(), - HeaderID: mockBlock.Header().Hash().Hex(), + HeaderID: mockBlock.Header().Hash().String(), CID: storageCID.String(), Removed: false, - StorageKey: common.BytesToHash(mocks.StorageLeafKey).Hex(), - StateKey: common.BytesToHash(mocks.ContractLeafKey).Hex(), + StorageKey: common.BytesToHash(mocks.StorageLeafKey).String(), + StateKey: common.BytesToHash(mocks.ContractLeafKey).String(), Value: mocks.StorageValue, }, storageNodes[0]) var data []byte @@ -489,29 +488,29 @@ func TestPublishAndIndexStorageIPLDs(t *testing.T, db sql.Database) { expectedStorageNodes := []models.StorageNodeModel{ // TODO: ordering is non-deterministic { BlockNumber: mocks.BlockNumber.String(), - HeaderID: mockBlock.Header().Hash().Hex(), + HeaderID: mockBlock.Header().Hash().String(), CID: shared.RemovedNodeStorageCID, Removed: true, - StorageKey: common.BytesToHash(mocks.Storage2LeafKey).Hex(), - StateKey: common.BytesToHash(mocks.Contract2LeafKey).Hex(), + StorageKey: common.BytesToHash(mocks.Storage2LeafKey).String(), + StateKey: common.BytesToHash(mocks.Contract2LeafKey).String(), Value: []byte{}, }, { BlockNumber: mocks.BlockNumber.String(), - HeaderID: mockBlock.Header().Hash().Hex(), + HeaderID: mockBlock.Header().Hash().String(), CID: shared.RemovedNodeStorageCID, Removed: true, - StorageKey: common.BytesToHash(mocks.Storage3LeafKey).Hex(), - StateKey: common.BytesToHash(mocks.Contract2LeafKey).Hex(), + StorageKey: common.BytesToHash(mocks.Storage3LeafKey).String(), + StateKey: common.BytesToHash(mocks.Contract2LeafKey).String(), Value: []byte{}, }, { BlockNumber: mocks.BlockNumber.String(), - HeaderID: mockBlock.Header().Hash().Hex(), + HeaderID: mockBlock.Header().Hash().String(), CID: shared.RemovedNodeStorageCID, Removed: true, - StorageKey: common.BytesToHash(mocks.RemovedLeafKey).Hex(), - StateKey: common.BytesToHash(mocks.ContractLeafKey).Hex(), + StorageKey: common.BytesToHash(mocks.RemovedLeafKey).String(), + StateKey: common.BytesToHash(mocks.ContractLeafKey).String(), Value: []byte{}, }, } @@ -690,7 +689,7 @@ func TestPublishAndIndexHeaderNonCanonical(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexTransactionsNonCanonical(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexTransactionsNonCanonical(t *testing.T, db sql.Database) { // check indexed transactions pgStr := `SELECT CAST(block_number as TEXT), header_id, tx_hash, cid, dst, src, index, tx_type, CAST(value as TEXT) @@ -855,7 +854,7 @@ func TestPublishAndIndexTransactionsNonCanonical(t *testing.T, db sql.Database) } } -func TestPublishAndIndexReceiptsNonCanonical(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexReceiptsNonCanonical(t *testing.T, db sql.Database) { // check indexed receipts pgStr := `SELECT CAST(block_number as TEXT), header_id, tx_id, cid, post_status, post_state, contract FROM eth.receipt_cids @@ -947,7 +946,7 @@ func TestPublishAndIndexReceiptsNonCanonical(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexLogsNonCanonical(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexLogsNonCanonical(t *testing.T, db sql.Database) { // check indexed logs pgStr := `SELECT address, topic0, topic1, topic2, topic3, data FROM eth.log_cids @@ -1002,7 +1001,7 @@ func TestPublishAndIndexLogsNonCanonical(t *testing.T, db sql.Database) { for i, log := range mockRct.rct.Logs { topicSet := make([]string, 4) for ti, topic := range log.Topics { - topicSet[ti] = topic.Hex() + topicSet[ti] = topic.String() } expectedLog := models.LogsModel{ @@ -1021,7 +1020,7 @@ func TestPublishAndIndexLogsNonCanonical(t *testing.T, db sql.Database) { } } -func TestPublishAndIndexStateNonCanonical(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexStateNonCanonical(t *testing.T, db sql.Database) { // check indexed state nodes pgStr := `SELECT state_leaf_key, removed, cid, diff FROM eth.state_cids @@ -1035,7 +1034,7 @@ func TestPublishAndIndexStateNonCanonical(t *testing.T, db sql.Database) { expectedStateNodes := make([]models.StateNodeModel, 0) for i, stateDiff := range mocks.StateDiffs { expectedStateNodes = append(expectedStateNodes, models.StateNodeModel{ - StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).Hex(), + StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).String(), Removed: stateDiff.Removed, CID: stateNodeCIDs[i].String(), Diff: true, @@ -1046,7 +1045,7 @@ func TestPublishAndIndexStateNonCanonical(t *testing.T, db sql.Database) { expectedNonCanonicalBlock2StateNodes := make([]models.StateNodeModel, 0) for i, stateDiff := range mocks.StateDiffs[:2] { expectedNonCanonicalBlock2StateNodes = append(expectedNonCanonicalBlock2StateNodes, models.StateNodeModel{ - StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).Hex(), + StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).String(), Removed: stateDiff.Removed, CID: stateNodeCIDs[i].String(), Diff: true, @@ -1082,7 +1081,7 @@ func TestPublishAndIndexStateNonCanonical(t *testing.T, db sql.Database) { assert.ElementsMatch(t, expectedNonCanonicalBlock2StateNodes, stateNodes) } -func TestPublishAndIndexStorageNonCanonical(t *testing.T, db sql.Database) { +func DoTestPublishAndIndexStorageNonCanonical(t *testing.T, db sql.Database) { // check indexed storage nodes pgStr := `SELECT storage_leaf_key, state_leaf_key, removed, cid, diff, val FROM eth.storage_cids @@ -1098,8 +1097,8 @@ func TestPublishAndIndexStorageNonCanonical(t *testing.T, db sql.Database) { for _, stateDiff := range mocks.StateDiffs { for _, storageNode := range stateDiff.StorageDiff { expectedStorageNodes = append(expectedStorageNodes, models.StorageNodeModel{ - StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).Hex(), - StorageKey: common.BytesToHash(storageNode.LeafKey).Hex(), + StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).String(), + StorageKey: common.BytesToHash(storageNode.LeafKey).String(), Removed: storageNode.Removed, CID: storageNodeCIDs[storageNodeIndex].String(), Diff: true, @@ -1115,8 +1114,8 @@ func TestPublishAndIndexStorageNonCanonical(t *testing.T, db sql.Database) { for _, stateDiff := range mocks.StateDiffs[:2] { for _, storageNode := range stateDiff.StorageDiff { expectedNonCanonicalBlock2StorageNodes = append(expectedNonCanonicalBlock2StorageNodes, models.StorageNodeModel{ - StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).Hex(), - StorageKey: common.BytesToHash(storageNode.LeafKey).Hex(), + StateKey: common.BytesToHash(stateDiff.AccountWrapper.LeafKey).String(), + StorageKey: common.BytesToHash(storageNode.LeafKey).String(), Removed: storageNode.Removed, CID: storageNodeCIDs[storageNodeIndex].String(), Diff: true, diff --git a/indexer/test/test_init.go b/indexer/test/test_init.go index f7f8f76..1a8b70f 100644 --- a/indexer/test/test_init.go +++ b/indexer/test/test_init.go @@ -18,18 +18,17 @@ package test import ( "bytes" - "fmt" - "os" "testing" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" - "github.com/ethereum/go-ethereum/statediff/indexer/models" - "github.com/ethereum/go-ethereum/statediff/indexer/shared" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" + + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" + "github.com/cerc-io/plugeth-statediff/indexer/models" + "github.com/cerc-io/plugeth-statediff/indexer/shared" ) var ( @@ -51,11 +50,6 @@ var ( ) func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } - // canonical block at LondonBlock height mockBlock = mocks.MockBlock txs, rcts := mocks.MockBlock.Transactions(), mocks.MockReceipts diff --git a/indexer/test/test_legacy.go b/indexer/test/test_legacy.go index 5838fea..6b93f79 100644 --- a/indexer/test/test_legacy.go +++ b/indexer/test/test_legacy.go @@ -20,13 +20,13 @@ import ( "context" "testing" + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" "github.com/ipfs/go-cid" "github.com/multiformats/go-multihash" "github.com/stretchr/testify/require" diff --git a/indexer/test/test_mainnet.go b/indexer/test/test_mainnet.go index 24f74eb..01289ab 100644 --- a/indexer/test/test_mainnet.go +++ b/indexer/test/test_mainnet.go @@ -19,11 +19,11 @@ package test import ( "testing" + "github.com/cerc-io/plugeth-statediff/indexer/database/file" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/statediff/indexer/database/file" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" "github.com/stretchr/testify/require" ) diff --git a/indexer/test/test_watched_addresses.go b/indexer/test/test_watched_addresses.go index 02949e9..8b436ee 100644 --- a/indexer/test/test_watched_addresses.go +++ b/indexer/test/test_watched_addresses.go @@ -21,10 +21,11 @@ import ( "testing" "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - "github.com/ethereum/go-ethereum/statediff/indexer/mocks" "github.com/stretchr/testify/require" + + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/mocks" ) type res struct { diff --git a/indexer/test_helpers/test_helpers.go b/indexer/test_helpers/test_helpers.go index c4f1efa..1cb7b26 100644 --- a/indexer/test_helpers/test_helpers.go +++ b/indexer/test_helpers/test_helpers.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/statediff/indexer/database/sql" + "github.com/cerc-io/plugeth-statediff/indexer/database/sql" ) // ListContainsString used to check if a list of strings contains a particular string @@ -76,48 +76,24 @@ func TearDownDB(t *testing.T, db sql.Database) { t.Fatal(err) } - _, err = tx.Exec(ctx, `DELETE FROM eth.header_cids`) - if err != nil { - t.Fatal(err) + statements := []string{ + `TRUNCATE nodes`, + `TRUNCATE ipld.blocks`, + `TRUNCATE eth.header_cids`, + `TRUNCATE eth.uncle_cids`, + `TRUNCATE eth.transaction_cids`, + `TRUNCATE eth.receipt_cids`, + `TRUNCATE eth.state_cids`, + `TRUNCATE eth.storage_cids`, + `TRUNCATE eth.log_cids`, + `TRUNCATE eth_meta.watched_addresses`, } - _, err = tx.Exec(ctx, `DELETE FROM eth.uncle_cids`) - if err != nil { - t.Fatal(err) + for _, stm := range statements { + if _, err = tx.Exec(ctx, stm); err != nil { + t.Fatal(err) + } } - _, err = tx.Exec(ctx, `DELETE FROM eth.transaction_cids`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM eth.receipt_cids`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM eth.state_cids`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM eth.storage_cids`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM eth.log_cids`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM ipld.blocks`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM nodes`) - if err != nil { - t.Fatal(err) - } - _, err = tx.Exec(ctx, `DELETE FROM eth_meta.watched_addresses`) - if err != nil { - t.Fatal(err) - } - err = tx.Commit(ctx) - if err != nil { + if err = tx.Commit(ctx); err != nil { t.Fatal(err) } } diff --git a/main/flags.go b/main/flags.go new file mode 100644 index 0000000..791e062 --- /dev/null +++ b/main/flags.go @@ -0,0 +1,182 @@ +package main + +import ( + "context" + "flag" + "os" + + "github.com/cerc-io/plugeth-statediff" + "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/shared" + "github.com/cerc-io/plugeth-statediff/utils" +) + +var ( + Flags = *flag.NewFlagSet("statediff", flag.PanicOnError) + + enableStatediff bool + config = statediff.Config{ + Context: context.Background(), + } + dbType = shared.POSTGRES + dbDumpDst = dump.STDOUT + dbConfig = postgres.Config{Driver: postgres.PGX} + fileConfig = file.Config{Mode: file.CSV} +) + +func init() { + Flags.BoolVar(&enableStatediff, + "statediff", false, + "Enables the processing of state diffs between each block", + ) + Flags.BoolVar(&config.EnableWriteLoop, + "statediff.writing", false, + "Activates progressive writing of state diffs to database as new blocks are synced", + ) + Flags.StringVar(&config.ID, + "statediff.db.nodeid", "", + "Node ID to use when writing state diffs to database", + ) + Flags.StringVar(&config.ClientName, + "statediff.db.clientname", "go-ethereum", + "Client name to use when writing state diffs to database", + ) + Flags.UintVar(&config.NumWorkers, + "statediff.workers", 1, + "Number of concurrent workers to use during statediff processing (default 1)", + ) + Flags.BoolVar(&config.WaitForSync, + "statediff.waitforsync", false, + "Should the statediff service wait for geth to catch up to the head of the chain?", + ) + + Flags.Var(&dbType, + "statediff.db.type", + "Statediff database type (current options: postgres, file, dump)", + ) + Flags.StringVar(&dbDumpDst, + "statediff.dump.dst", "stdout", + "Statediff database dump destination (default is stdout)", + ) + + Flags.Var(&dbConfig.Driver, + "statediff.db.driver", + "Statediff database driver type", + ) + Flags.StringVar(&dbConfig.Hostname, + "statediff.db.host", "localhost", + "Statediff database hostname/ip", + ) + Flags.IntVar(&dbConfig.Port, + "statediff.db.port", 5432, + "Statediff database port", + ) + Flags.StringVar(&dbConfig.DatabaseName, + "statediff.db.name", "", + "Statediff database name", + ) + Flags.StringVar(&dbConfig.Password, + "statediff.db.password", "", + "Statediff database password", + ) + Flags.StringVar(&dbConfig.Username, + "statediff.db.user", "postgres", + "Statediff database username", + ) + Flags.DurationVar(&dbConfig.MaxConnLifetime, + "statediff.db.maxconnlifetime", 0, + "Statediff database maximum connection lifetime (in seconds)", + ) + Flags.DurationVar(&dbConfig.MaxConnIdleTime, + "statediff.db.maxconnidletime", 0, + "Statediff database maximum connection idle time (in seconds)", + ) + Flags.IntVar(&dbConfig.MaxConns, + "statediff.db.maxconns", 0, + "Statediff database maximum connections", + ) + Flags.IntVar(&dbConfig.MinConns, + "statediff.db.minconns", 0, + "Statediff database minimum connections", + ) + Flags.IntVar(&dbConfig.MaxIdle, + "statediff.db.maxidleconns", 0, + "Statediff database maximum idle connections", + ) + Flags.DurationVar(&dbConfig.ConnTimeout, + "statediff.db.conntimeout", 0, + "Statediff database connection timeout (in seconds)", + ) + Flags.BoolVar(&dbConfig.Upsert, + "statediff.db.upsert", false, + "Should the statediff service overwrite data existing in the database?", + ) + Flags.BoolVar(&dbConfig.CopyFrom, + "statediff.db.copyfrom", false, + "Should the statediff service use COPY FROM for multiple inserts? (Note: pgx only)", + ) + Flags.BoolVar(&dbConfig.LogStatements, + "statediff.db.logstatements", false, + "Should the statediff service log all database statements? (Note: pgx only)", + ) + + Flags.Var(&fileConfig.Mode, + "statediff.file.mode", + "Statediff file writing mode (current options: csv, sql)", + ) + Flags.StringVar(&fileConfig.OutputDir, + "statediff.file.csvdir", "", + "Full path of output directory to write statediff data out to when operating in csv file mode", + ) + Flags.StringVar(&fileConfig.FilePath, + "statediff.file.path", "", + "Full path (including filename) to write statediff data out to when operating in sql file mode", + ) + Flags.StringVar(&fileConfig.WatchedAddressesFilePath, + "statediff.file.wapath", "", + "Full path (including filename) to write statediff watched addresses out to when operating in file mode", + ) +} + +func GetConfig() statediff.Config { + initConfig() + return config +} + +func initConfig() { + if !enableStatediff { + config = statediff.Config{} + return + } + + if config.ID == "" { + utils.Fatalf("Must specify node ID for statediff DB output") + } + + var indexerConfig interfaces.Config + switch dbType { + case shared.FILE: + indexerConfig = fileConfig + case shared.POSTGRES: + dbConfig.ID = config.ID + dbConfig.ClientName = config.ClientName + indexerConfig = dbConfig + case shared.DUMP: + switch dbDumpDst { + case dump.STDERR: + indexerConfig = dump.Config{Dump: os.Stdout} + case dump.STDOUT: + indexerConfig = dump.Config{Dump: os.Stderr} + case dump.DISCARD: + indexerConfig = dump.Config{Dump: dump.Discard} + default: + utils.Fatalf("unrecognized dump destination: %s", dbDumpDst) + } + default: + utils.Fatalf("unrecognized database type: %s", dbType) + } + config.IndexerConfig = indexerConfig +} diff --git a/main/main.go b/main/main.go new file mode 100644 index 0000000..f96ba81 --- /dev/null +++ b/main/main.go @@ -0,0 +1,107 @@ +package main + +import ( + "strconv" + + geth_flags "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/openrelayxyz/plugeth-utils/core" + "github.com/openrelayxyz/plugeth-utils/restricted" + + statediff "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/adapt" + ind "github.com/cerc-io/plugeth-statediff/indexer" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + "github.com/cerc-io/plugeth-statediff/indexer/node" + "github.com/cerc-io/plugeth-statediff/utils/log" +) + +var ( + pluginLoader core.PluginLoader + gethContext core.Context + service *statediff.Service + blockchain statediff.BlockChain +) + +func Initialize(ctx core.Context, pl core.PluginLoader, logger core.Logger) { + log.SetDefaultLogger(logger) + + // lvl, err := strconv.ParseInt(ctx.String("verbosity"), 10, 8) + // if err != nil { + // log.Error("cannot parse verbosity", "error", err) + // } + // log.TestLogger.SetLevel(int(lvl)) + // log.SetDefaultLogger(log.TestLogger) + + pluginLoader = pl + gethContext = ctx + + log.Debug("Initialized statediff plugin") +} + +func InitializeNode(stack core.Node, b core.Backend) { + backend := b.(restricted.Backend) + + networkid, err := strconv.ParseUint(gethContext.String(geth_flags.NetworkIdFlag.Name), 10, 64) + if err != nil { + log.Error("cannot parse network ID", "error", err) + return + } + serviceConfig := GetConfig() + blockchain = statediff.NewPluginBlockChain(backend) + + var indexer interfaces.StateDiffIndexer + if serviceConfig.IndexerConfig != nil { + info := node.Info{ + GenesisBlock: blockchain.GetBlockByNumber(0).Hash().String(), + NetworkID: strconv.FormatUint(networkid, 10), + ChainID: backend.ChainConfig().ChainID.Uint64(), + ID: serviceConfig.ID, + ClientName: serviceConfig.ClientName, + } + var err error + _, indexer, err = ind.NewStateDiffIndexer(serviceConfig.Context, + adapt.ChainConfig(backend.ChainConfig()), info, serviceConfig.IndexerConfig) + if err != nil { + log.Error("failed to construct indexer", "error", err) + } + } + service, err := statediff.NewService(serviceConfig, blockchain, backend, indexer) + if err != nil { + log.Error("failed to construct service", "error", err) + } + if err = service.Start(); err != nil { + log.Error("failed to start service", "error", err) + return + } +} + +func GetAPIs(stack core.Node, backend core.Backend) []core.API { + return []core.API{ + { + Namespace: statediff.APIName, + Version: statediff.APIVersion, + Service: statediff.NewPublicAPI(service), + Public: true, + }, + } +} + +// StateUpdate gives us updates about state changes made in each block. +// We extract contract code here, since it's not exposed by plugeth's state interfaces. +func StateUpdate( + blockRoot core.Hash, + parentRoot core.Hash, + destructs map[core.Hash]struct{}, + accounts map[core.Hash][]byte, + storage map[core.Hash]map[core.Hash][]byte, + codeUpdates map[core.Hash][]byte) { + if blockchain == nil { + log.Warn("StateUpdate called before InitializeNode", "root", blockRoot) + return + } + + // for hash, code := range codeUpdates { + // log.Debug("UPDATING CODE", "hash", hash) + // codeStore.Set(hash, code) + // } +} diff --git a/mainnet_tests/builder_test.go b/mainnet_tests/builder_test.go index 14c255d..8e25aed 100644 --- a/mainnet_tests/builder_test.go +++ b/mainnet_tests/builder_test.go @@ -18,13 +18,10 @@ package statediff_test import ( "bytes" - "encoding/json" - "fmt" "io" "log" "math/big" "os" - "sort" "testing" "github.com/ethereum/go-ethereum/common" @@ -36,10 +33,12 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/statediff" - ipld2 "github.com/ethereum/go-ethereum/statediff/indexer/ipld" - "github.com/ethereum/go-ethereum/statediff/test_helpers" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + + statediff "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/adapt" + "github.com/cerc-io/plugeth-statediff/indexer/ipld" + "github.com/cerc-io/plugeth-statediff/test_helpers" + sdtypes "github.com/cerc-io/plugeth-statediff/types" ) var ( @@ -421,10 +420,6 @@ var ( ) func init() { - if os.Getenv("MODE") != "statediff" { - fmt.Println("Skipping statediff test") - os.Exit(0) - } db = rawdb.NewMemoryDatabase() genesisBlock = core.DefaultGenesisBlock().MustCommit(db) genBy, err := rlp.EncodeToBytes(genesisBlock) @@ -480,13 +475,8 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { t.Error(err) } params := statediff.Params{} - builder = statediff.NewBuilder(chain.StateCache()) - var tests = []struct { - name string - startingArguments statediff.Args - expected *sdtypes.StateObject - }{ + var tests = []test_helpers.TestCase{ // note that block0 (genesis) has over 1000 nodes due to the pre-allocation for the crowd-sale // it is not feasible to write a unit test of that size at this time { @@ -507,26 +497,26 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { AccountWrapper: sdtypes.AccountWrapper{ Account: block1CoinbaseAccount, LeafKey: block1CoinbaseHash.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1CoinbaseLeafNode)).String(), }, StorageDiff: emptyStorage, }, }, IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1RootBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1RootBranchNode)).String(), Content: block1RootBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1x04BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1x04BranchNode)).String(), Content: block1x04BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1x040bBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1x040bBranchNode)).String(), Content: block1x040bBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block1CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block1CoinbaseLeafNode)).String(), Content: block1CoinbaseLeafNode, }, }, @@ -552,34 +542,34 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { AccountWrapper: sdtypes.AccountWrapper{ Account: block2CoinbaseAccount, LeafKey: block2CoinbaseHash.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2CoinbaseLeafNode)).String(), }, StorageDiff: emptyStorage, }, }, IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2RootBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2RootBranchNode)).String(), Content: block2RootBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2x00BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2x00BranchNode)).String(), Content: block2x00BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2x0008BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2x0008BranchNode)).String(), Content: block2x0008BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2x00080dBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2x00080dBranchNode)).String(), Content: block2x00080dBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2MovedPremineLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2MovedPremineLeafNode)).String(), Content: block2MovedPremineLeafNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block2CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block2CoinbaseLeafNode)).String(), Content: block2CoinbaseLeafNode, }, }, @@ -604,7 +594,7 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { AccountWrapper: sdtypes.AccountWrapper{ Account: block3MovedPremineAccount1, LeafKey: common.HexToHash("ce573ced93917e658d10e2d9009470dad72b63c898d173721194a12f2ae5e190").Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode1)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode1)).String(), }, StorageDiff: emptyStorage, }, @@ -613,50 +603,50 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { AccountWrapper: sdtypes.AccountWrapper{ Account: block3CoinbaseAccount, LeafKey: block3CoinbaseHash.Bytes(), - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3CoinbaseLeafNode)).String(), }, StorageDiff: emptyStorage, }, }, IPLDs: []sdtypes.IPLD{ { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3RootBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3RootBranchNode)).String(), Content: block3RootBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x06BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x06BranchNode)).String(), Content: block3x06BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x060eBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x060eBranchNode)).String(), Content: block3x060eBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x0cBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x0cBranchNode)).String(), Content: block3x0cBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x0c0eBranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x0c0eBranchNode)).String(), Content: block3x0c0eBranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x0c0e05BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x0c0e05BranchNode)).String(), Content: block3x0c0e05BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3x0c0e0507BranchNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3x0c0e0507BranchNode)).String(), Content: block3x0c0e0507BranchNode, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode1)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode1)).String(), Content: block3MovedPremineLeafNode1, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode2)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3MovedPremineLeafNode2)).String(), Content: block3MovedPremineLeafNode2, }, { - CID: ipld2.Keccak256ToCid(ipld2.MEthStateTrie, crypto.Keccak256(block3CoinbaseLeafNode)).String(), + CID: ipld.Keccak256ToCid(ipld.MEthStateTrie, crypto.Keccak256(block3CoinbaseLeafNode)).String(), Content: block3CoinbaseLeafNode, }, }, @@ -664,41 +654,11 @@ func TestBuilderOnMainnetBlocks(t *testing.T) { }, } - for _, test := range tests { - diff, err := builder.BuildStateDiffObject(test.startingArguments, params) - if err != nil { - t.Error(err) - } - receivedStateDiffRlp, err := rlp.EncodeToBytes(diff) - if err != nil { - t.Error(err) - } - expectedStateDiffRlp, err := rlp.EncodeToBytes(&test.expected) - if err != nil { - t.Error(err) - } - sort.Slice(receivedStateDiffRlp, func(i, j int) bool { return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] }) - sort.Slice(expectedStateDiffRlp, func(i, j int) bool { return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] }) - if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { - actual, err := json.Marshal(diff) - if err != nil { - t.Error(err) - } - expected, err := json.Marshal(test.expected) - if err != nil { - t.Error(err) - } - t.Logf("Test failed: %s", test.name) - t.Errorf("actual state diff: %s\r\n\r\n\r\nexpected state diff: %s", actual, expected) - } - } - if !bytes.Equal(crypto.Keccak256(block1RootBranchNode), block1.Root().Bytes()) { - t.Errorf("actual state root: %s\r\nexpected state root: %s", crypto.Keccak256(block1RootBranchNode), block1.Root().Bytes()) - } - if !bytes.Equal(crypto.Keccak256(block2RootBranchNode), block2.Root().Bytes()) { - t.Errorf("actual state root: %s\r\nexpected state root: %s", crypto.Keccak256(block2RootBranchNode), block2.Root().Bytes()) - } - if !bytes.Equal(crypto.Keccak256(block3RootBranchNode), block3.Root().Bytes()) { - t.Errorf("actual state root: %s\r\nexpected state root: %s", crypto.Keccak256(block3RootBranchNode), block3.Root().Bytes()) - } + test_helpers.RunBuilderTests(t, + statediff.NewBuilder(adapt.GethStateView(chain.StateCache())), + tests, params, test_helpers.CheckedRoots{ + block1: block1RootBranchNode, + block2: block2RootBranchNode, + block3: block3RootBranchNode, + }) } diff --git a/metrics_helpers.go b/metrics_helpers.go index 2bebfe2..54e5440 100644 --- a/metrics_helpers.go +++ b/metrics_helpers.go @@ -17,24 +17,23 @@ package statediff import ( - "fmt" "time" + "github.com/cerc-io/plugeth-statediff/utils/log" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" ) func countStateDiffBegin(block *types.Block) (time.Time, log.Logger) { start := time.Now() - logger := log.New("hash", block.Hash().Hex(), "number", block.NumberU64()) + logger := log.New("hash", block.Hash().String(), "number", block.NumberU64()) defaultStatediffMetrics.underway.Inc(1) - logger.Debug(fmt.Sprintf("writeStateDiff BEGIN [underway=%d, succeeded=%d, failed=%d, total_time=%dms]", - defaultStatediffMetrics.underway.Count(), - defaultStatediffMetrics.succeeded.Count(), - defaultStatediffMetrics.failed.Count(), - defaultStatediffMetrics.totalProcessingTime.Value(), - )) + logger.Debug("writeStateDiff BEGIN", + "underway", defaultStatediffMetrics.underway.Count(), + "succeeded", defaultStatediffMetrics.succeeded.Count(), + "failed", defaultStatediffMetrics.failed.Count(), + "total_time", defaultStatediffMetrics.totalProcessingTime.Value(), + ) return start, logger } @@ -49,13 +48,14 @@ func countStateDiffEnd(start time.Time, logger log.Logger, err error) time.Durat } defaultStatediffMetrics.totalProcessingTime.Inc(duration.Milliseconds()) - logger.Debug(fmt.Sprintf("writeStateDiff END (duration=%dms, err=%t) [underway=%d, succeeded=%d, failed=%d, total_time=%dms]", - duration.Milliseconds(), nil != err, - defaultStatediffMetrics.underway.Count(), - defaultStatediffMetrics.succeeded.Count(), - defaultStatediffMetrics.failed.Count(), - defaultStatediffMetrics.totalProcessingTime.Value(), - )) + logger.Debug("writeStateDiff END", + "duration", duration, + "error", err != nil, + "underway", defaultStatediffMetrics.underway.Count(), + "succeeded", defaultStatediffMetrics.succeeded.Count(), + "failed", defaultStatediffMetrics.failed.Count(), + "total_time", defaultStatediffMetrics.totalProcessingTime.Value(), + ) return duration } @@ -67,10 +67,10 @@ func countApiRequestBegin(methodName string, blockHashOrNumber interface{}) (tim defaultStatediffMetrics.apiRequests.Inc(1) defaultStatediffMetrics.apiRequestsUnderway.Inc(1) - logger.Debug(fmt.Sprintf("statediff API BEGIN [underway=%d, requests=%d])", - defaultStatediffMetrics.apiRequestsUnderway.Count(), - defaultStatediffMetrics.apiRequests.Count(), - )) + logger.Debug("statediff API BEGIN", + "underway", defaultStatediffMetrics.apiRequestsUnderway.Count(), + "requests", defaultStatediffMetrics.apiRequests.Count(), + ) return start, logger } @@ -79,11 +79,12 @@ func countApiRequestEnd(start time.Time, logger log.Logger, err error) time.Dura duration := time.Since(start) defaultStatediffMetrics.apiRequestsUnderway.Dec(1) - logger.Debug(fmt.Sprintf("statediff API END (duration=%dms, err=%t) [underway=%d, requests=%d]", - duration.Milliseconds(), nil != err, - defaultStatediffMetrics.apiRequestsUnderway.Count(), - defaultStatediffMetrics.apiRequests.Count(), - )) + logger.Debug("statediff API END", + "duration", duration, + "error", err != nil, + "underway", defaultStatediffMetrics.apiRequestsUnderway.Count(), + "requests", defaultStatediffMetrics.apiRequests.Count(), + ) return duration } diff --git a/service.go b/service.go index 7387233..4c6a4fd 100644 --- a/service.go +++ b/service.go @@ -18,9 +18,9 @@ package statediff import ( "bytes" + "errors" "fmt" "math/big" - "strconv" "strings" "sync" "sync/atomic" @@ -28,129 +28,91 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - ind "github.com/ethereum/go-ethereum/statediff/indexer" - "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - nodeinfo "github.com/ethereum/go-ethereum/statediff/indexer/node" - types2 "github.com/ethereum/go-ethereum/statediff/types" "github.com/ethereum/go-ethereum/trie" + plugeth "github.com/openrelayxyz/plugeth-utils/core" "github.com/thoas/go-funk" + + "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + types2 "github.com/cerc-io/plugeth-statediff/types" + "github.com/cerc-io/plugeth-statediff/utils/log" ) const ( - chainEventChanSize = 20000 - genesisBlockNumber = 0 - defaultRetryLimit = 3 // default retry limit once deadlock is detected. - deadlockDetected = "deadlock detected" // 40P01 https://www.postgresql.org/docs/current/errcodes-appendix.html - typeAssertionFailed = "type assertion failed" - unexpectedOperation = "unexpected operation" + chainEventChanSize = 20000 + genesisBlockNumber = 0 + defaultRetryLimit = 3 // default retry limit once deadlock is detected. + pgDeadlockDetected = "deadlock detected" // 40P01 https://www.postgresql.org/docs/current/errcodes-appendix.html ) -var writeLoopParams = ParamsWithMutex{ - Params: Params{ - IncludeBlock: true, - IncludeReceipts: true, - IncludeTD: true, - IncludeCode: true, - }, -} +var ( + errTypeAssertionFailed = errors.New("type assertion failed") + errUnexpectedOperation = errors.New("unexpected operation") +) -type blockChain interface { - SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription - CurrentBlock() *types.Header - GetBlockByHash(hash common.Hash) *types.Block - GetBlockByNumber(number uint64) *types.Block - GetReceiptsByHash(hash common.Hash) types.Receipts - GetTd(hash common.Hash, number uint64) *big.Int - UnlockTrie(root common.Hash) - StateCache() state.Database -} - -// IService is the state-diffing service interface -type IService interface { - // Lifecycle Start() and Stop() methods - node.Lifecycle - // APIs method for getting API(s) for this service - APIs() []rpc.API - // Loop is the main event loop for processing state diffs - Loop(chainEventCh chan core.ChainEvent) - // Subscribe method to subscribe to receive state diff processing output - Subscribe(id rpc.ID, sub chan<- Payload, quitChan chan<- bool, params Params) - // Unsubscribe method to unsubscribe from state diff processing - Unsubscribe(id rpc.ID) error - // StateDiffAt method to get state diff object at specific block - StateDiffAt(blockNumber uint64, params Params) (*Payload, error) - // StateDiffFor method to get state diff object at specific block - StateDiffFor(blockHash common.Hash, params Params) (*Payload, error) - // WriteStateDiffAt method to write state diff object directly to DB - WriteStateDiffAt(blockNumber uint64, params Params) JobID - // WriteStateDiffFor method to write state diff object directly to DB - WriteStateDiffFor(blockHash common.Hash, params Params) error - // WriteLoop event loop for progressively processing and writing diffs directly to DB - WriteLoop(chainEventCh chan core.ChainEvent) - // WatchAddress method to change the addresses being watched in write loop params - WatchAddress(operation types2.OperationType, args []types2.WatchAddressArg) error - // StreamCodeAndCodeHash method to export all the codehash => code mappings at a block height - StreamCodeAndCodeHash(blockNumber uint64, outChan chan<- types2.CodeAndCodeHash, quitChan chan<- bool) - - // SubscribeWriteStatus method to subscribe to receive state diff processing output - SubscribeWriteStatus(id rpc.ID, sub chan<- JobStatus, quitChan chan<- bool) - // UnsubscribeWriteStatus method to unsubscribe from state diff processing - UnsubscribeWriteStatus(id rpc.ID) error +var defaultWriteLoopParams = Params{ + IncludeBlock: true, + IncludeReceipts: true, + IncludeTD: true, + IncludeCode: true, } // Service is the underlying struct for the state diffing service type Service struct { - // Used to sync access to the Subscriptions - sync.Mutex // Used to build the state diff objects Builder Builder // Used to subscribe to chain events (blocks) - BlockChain blockChain - // Used to signal shutdown of the service - QuitChan chan bool - // A mapping of rpc.IDs to their subscription channels, mapped to their subscription type (hash of the Params rlp) - Subscriptions map[common.Hash]map[rpc.ID]Subscription - // A mapping of subscription params rlp hash to the corresponding subscription params - SubscriptionTypes map[common.Hash]Params + BlockChain BlockChain // Cache the last block so that we can avoid having to lookup the next block's parent BlockCache BlockCache // The publicBackendAPI which provides useful information about the current state - BackendAPI ethapi.Backend - // Should the statediff service wait for geth to sync to head? - WaitForSync bool - // Whether we have any subscribers - subscribers int32 + BackendAPI plugeth.Backend + // Used to signal shutdown of the service + QuitChan chan bool // Interface for publishing statediffs as PG-IPLD objects indexer interfaces.StateDiffIndexer + + // Should the statediff service wait for geth to sync to head? + ShouldWaitForSync bool // Whether to enable writing state diffs directly to track blockchain head. enableWriteLoop bool + // Parameters to use in the service write loop, if enabled + writeLoopParams ParamsWithMutex // Size of the worker pool numWorkers uint // Number of retry for aborted transactions due to deadlock. maxRetry uint + + // Sequential ID for RPC subscriptions + lastSubID uint64 + + // A mapping of RpcIDs to their subscription channels, mapped to their subscription type (hash + // of the Params RLP) + Subscriptions map[common.Hash]map[SubID]Subscription + // A mapping of subscription params rlp hash to the corresponding subscription params + SubscriptionTypes map[common.Hash]Params + // Number of current subscribers + subscribers int32 + // Used to sync access to the Subscriptions + subscriptionsMutex sync.Mutex + // Write job status subscriptions - jobStatusSubs map[rpc.ID]statusSubscription - // Job ID ticker + jobStatusSubs map[SubID]jobStatusSubscription + jobStatusSubsMutex sync.RWMutex + // Sequential ID for write jobs lastJobID uint64 - // In flight jobs (for WriteStateDiffAt) + // Map of block number to in-flight jobs (for WriteStateDiffAt) currentJobs map[uint64]JobID currentJobsMutex sync.Mutex } -// IDs used for tracking in-progress jobs (0 for invalid) +// ID for identifying client subscriptions +type SubID uint64 + +// ID used for tracking in-progress jobs (0 for invalid) type JobID uint64 // JobStatus represents the status of a completed job @@ -159,7 +121,7 @@ type JobStatus struct { Err error } -type statusSubscription struct { +type jobStatusSubscription struct { statusChan chan<- JobStatus quitChan chan<- bool } @@ -171,6 +133,12 @@ type BlockCache struct { maxSize uint } +type workerParams struct { + chainEventCh <-chan core.ChainEvent + wg *sync.WaitGroup + id uint +} + func NewBlockCache(max uint) BlockCache { return BlockCache{ blocks: make(map[common.Hash]*types.Block), @@ -178,67 +146,8 @@ func NewBlockCache(max uint) BlockCache { } } -// New creates a new statediff.Service -// func New(stack *node.Node, ethServ *eth.Ethereum, dbParams *DBParams, enableWriteLoop bool) error { -// func New(stack *node.Node, blockChain *core.BlockChain, networkID uint64, params Config, backend ethapi.Backend) error { -func New(stack *node.Node, ethServ *eth.Ethereum, cfg *ethconfig.Config, params Config, backend ethapi.Backend) error { - blockChain := ethServ.BlockChain() - var indexer interfaces.StateDiffIndexer - var err error - quitCh := make(chan bool) - indexerConfigAvailable := params.IndexerConfig != nil - if indexerConfigAvailable { - info := nodeinfo.Info{ - GenesisBlock: blockChain.Genesis().Hash().Hex(), - NetworkID: strconv.FormatUint(cfg.NetworkId, 10), - ChainID: blockChain.Config().ChainID.Uint64(), - ID: params.ID, - ClientName: params.ClientName, - } - var err error - _, indexer, err = ind.NewStateDiffIndexer(params.Context, blockChain.Config(), info, params.IndexerConfig) - if err != nil { - return err - } - indexer.ReportDBMetrics(10*time.Second, quitCh) - } - - workers := params.NumWorkers - if workers == 0 { - workers = 1 - } - - sds := &Service{ - Mutex: sync.Mutex{}, - BlockChain: blockChain, - Builder: NewBuilder(blockChain.StateCache()), - QuitChan: quitCh, - Subscriptions: make(map[common.Hash]map[rpc.ID]Subscription), - SubscriptionTypes: make(map[common.Hash]Params), - BlockCache: NewBlockCache(workers), - BackendAPI: backend, - WaitForSync: params.WaitForSync, - indexer: indexer, - enableWriteLoop: params.EnableWriteLoop, - numWorkers: workers, - maxRetry: defaultRetryLimit, - jobStatusSubs: map[rpc.ID]statusSubscription{}, - currentJobs: map[uint64]JobID{}, - } - stack.RegisterLifecycle(sds) - stack.RegisterAPIs(sds.APIs()) - - if indexerConfigAvailable { - err = loadWatchedAddresses(indexer) - if err != nil { - return err - } - } - - return nil -} - -func NewService(blockChain blockChain, cfg Config, backend ethapi.Backend, indexer interfaces.StateDiffIndexer) *Service { +// NewService creates a new state diffing service with the given config and backend +func NewService(cfg Config, blockChain BlockChain, backend plugeth.Backend, indexer interfaces.StateDiffIndexer) (*Service, error) { workers := cfg.NumWorkers if workers == 0 { workers = 1 @@ -246,49 +155,36 @@ func NewService(blockChain blockChain, cfg Config, backend ethapi.Backend, index quitCh := make(chan bool) sds := &Service{ - Mutex: sync.Mutex{}, BlockChain: blockChain, Builder: NewBuilder(blockChain.StateCache()), QuitChan: quitCh, - Subscriptions: make(map[common.Hash]map[rpc.ID]Subscription), + Subscriptions: make(map[common.Hash]map[SubID]Subscription), SubscriptionTypes: make(map[common.Hash]Params), BlockCache: NewBlockCache(workers), BackendAPI: backend, - WaitForSync: cfg.WaitForSync, + ShouldWaitForSync: cfg.WaitForSync, indexer: indexer, enableWriteLoop: cfg.EnableWriteLoop, numWorkers: workers, maxRetry: defaultRetryLimit, - jobStatusSubs: map[rpc.ID]statusSubscription{}, + jobStatusSubs: map[SubID]jobStatusSubscription{}, currentJobs: map[uint64]JobID{}, + writeLoopParams: ParamsWithMutex{Params: defaultWriteLoopParams}, } if indexer != nil { + err := loadWatchedAddresses(indexer, &sds.writeLoopParams) + if err != nil { + return nil, err + } indexer.ReportDBMetrics(10*time.Second, quitCh) } - return sds -} - -// Protocols exports the services p2p protocols, this service has none -func (sds *Service) Protocols() []p2p.Protocol { - return []p2p.Protocol{} -} - -// APIs returns the RPC descriptors the statediff.Service offers -func (sds *Service) APIs() []rpc.API { - return []rpc.API{ - { - Namespace: APIName, - Version: APIVersion, - Service: NewPublicStateDiffAPI(sds), - Public: true, - }, - } + return sds, nil } // Return the parent block of currentBlock, using the cached block if available; // and cache the passed block -func (lbc *BlockCache) getParentBlock(currentBlock *types.Block, bc blockChain) *types.Block { +func (lbc *BlockCache) getParentBlock(currentBlock *types.Block, bc BlockChain) *types.Block { lbc.Lock() parentHash := currentBlock.ParentHash() var parentBlock *types.Block @@ -305,46 +201,44 @@ func (lbc *BlockCache) getParentBlock(currentBlock *types.Block, bc blockChain) return parentBlock } -type workerParams struct { - chainEventCh <-chan core.ChainEvent - wg *sync.WaitGroup - id uint -} - +// WriteLoop event loop for progressively processing and writing diffs directly to DB func (sds *Service) WriteLoop(chainEventCh chan core.ChainEvent) { - chainEventSub := sds.BlockChain.SubscribeChainEvent(chainEventCh) - defer chainEventSub.Unsubscribe() - errCh := chainEventSub.Err() + log.Info("Starting statediff write loop") + log := log.New("context", "statediff writing") + sub := sds.BlockChain.SubscribeChainEvent(chainEventCh) + defer sub.Unsubscribe() + var wg sync.WaitGroup - // Process metrics for chain events, then forward to workers chainEventFwd := make(chan core.ChainEvent, chainEventChanSize) + defer func() { + log.Info("Quitting") + close(chainEventFwd) + }() + wg.Add(1) go func() { defer wg.Done() for { select { - case chainEvent := <-chainEventCh: + case event := <-chainEventCh: + // First process metrics for chain events, then forward to workers lastHeight := defaultStatediffMetrics.lastEventHeight.Value() - nextHeight := int64(chainEvent.Block.Number().Uint64()) + block := event.Block + log.Debug("Chain event received", "number", block.Number(), "hash", event.Hash) + nextHeight := int64(block.Number().Uint64()) if nextHeight-lastHeight != 1 { - log.Warn("Statediffing service received block out-of-order", "next height", nextHeight, "last height", lastHeight) + log.Warn("Received block out-of-order", "next", nextHeight, "last", lastHeight) } defaultStatediffMetrics.lastEventHeight.Update(nextHeight) defaultStatediffMetrics.writeLoopChannelLen.Update(int64(len(chainEventCh))) - chainEventFwd <- chainEvent - case err := <-errCh: - log.Error("Error from chain event subscription", "error", err) - close(sds.QuitChan) - log.Info("Quitting the statediffing writing loop") - if err := sds.indexer.Close(); err != nil { - log.Error("Error closing indexer", "err", err) + chainEventFwd <- event + case err := <-sub.Err(): + if err != nil { + log.Error("Error from subscription", "error", err) } + close(sds.QuitChan) return case <-sds.QuitChan: - log.Info("Quitting the statediffing writing loop") - if err := sds.indexer.Close(); err != nil { - log.Error("Error closing indexer", "err", err) - } return } } @@ -357,179 +251,178 @@ func (sds *Service) WriteLoop(chainEventCh chan core.ChainEvent) { wg.Wait() } -func (sds *Service) writeGenesisStateDiff(currBlock *types.Block, workerId uint) { +func (sds *Service) writeGenesisStateDiff(currBlock *types.Block, logger log.Logger) { // For genesis block we need to return the entire state trie hence we diff it with an empty trie. - log.Info("Writing state diff", "block height", genesisBlockNumber, "worker", workerId) - writeLoopParams.RLock() - err := sds.writeStateDiffWithRetry(currBlock, common.Hash{}, writeLoopParams.Params) - writeLoopParams.RUnlock() + log.Info("Writing genesis state diff", "number", genesisBlockNumber) + sds.writeLoopParams.RLock() + defer sds.writeLoopParams.RUnlock() + + err := sds.writeStateDiffWithRetry(currBlock, common.Hash{}, sds.writeLoopParams.Params) if err != nil { - log.Error("statediff.Service.WriteLoop: processing error", "block height", - genesisBlockNumber, "error", err.Error(), "worker", workerId) + log.Error("failed to write state diff", "number", + genesisBlockNumber, "error", err) return } defaultStatediffMetrics.lastStatediffHeight.Update(genesisBlockNumber) } func (sds *Service) writeLoopWorker(params workerParams) { + log := log.New("context", "statediff writing", "worker", params.id) defer params.wg.Done() for { select { - //Notify chain event channel of events - case chainEvent := <-params.chainEventCh: - log.Debug("WriteLoop(): chain event received", "event", chainEvent) - currentBlock := chainEvent.Block - parentBlock := sds.BlockCache.getParentBlock(currentBlock, sds.BlockChain) - if parentBlock == nil { - log.Error("Parent block is nil, skipping this block", "block height", currentBlock.Number()) + case event := <-params.chainEventCh: + block := event.Block + parent := sds.BlockCache.getParentBlock(block, sds.BlockChain) + if parent == nil { + log.Error("Parent block is nil, skipping this block", "number", block.Number()) continue } // chainEvent streams block from block 1, but we also need to include data from the genesis block. - if parentBlock.Number().Uint64() == genesisBlockNumber { - sds.writeGenesisStateDiff(parentBlock, params.id) + if parent.Number().Uint64() == genesisBlockNumber { + sds.writeGenesisStateDiff(parent, log) } - log.Info("Writing state diff", "block height", currentBlock.Number().Uint64(), "worker", params.id) - writeLoopParams.RLock() - err := sds.writeStateDiffWithRetry(currentBlock, parentBlock.Root(), writeLoopParams.Params) - writeLoopParams.RUnlock() + log.Info("Writing state diff", "number", block.Number()) + sds.writeLoopParams.RLock() + err := sds.writeStateDiffWithRetry(block, parent.Root(), sds.writeLoopParams.Params) + sds.writeLoopParams.RUnlock() if err != nil { - log.Error("statediff.Service.WriteLoop: processing error", - "block height", currentBlock.Number().Uint64(), - "block hash", currentBlock.Hash().Hex(), - "error", err.Error(), - "worker", params.id) + log.Error("failed to write state diff", + "number", block.Number(), + "hash", block.Hash(), + "error", err) continue } - // TODO: how to handle with concurrent workers - defaultStatediffMetrics.lastStatediffHeight.Update(int64(currentBlock.Number().Uint64())) + // FIXME: reported height will be non-monotonic with concurrent workers + defaultStatediffMetrics.lastStatediffHeight.Update(int64(block.Number().Uint64())) case <-sds.QuitChan: - log.Info("Quitting the statediff writing process", "worker", params.id) + log.Info("Quitting") return } } } -// Loop is the main processing method -func (sds *Service) Loop(chainEventCh chan core.ChainEvent) { - log.Info("Starting statediff listening loop") - chainEventSub := sds.BlockChain.SubscribeChainEvent(chainEventCh) - defer chainEventSub.Unsubscribe() - errCh := chainEventSub.Err() +// PublishLoop processes and publishes statediff payloads to subscribed clients +func (sds *Service) PublishLoop(chainEventCh chan core.ChainEvent) { + log.Info("Starting statediff publish loop") + log := log.New("context", "statediff publishing") + + sub := sds.BlockChain.SubscribeChainEvent(chainEventCh) + defer func() { + log.Info("Quitting") + sds.close() + sub.Unsubscribe() + }() + for { select { //Notify chain event channel of events - case chainEvent := <-chainEventCh: + case event := <-chainEventCh: defaultStatediffMetrics.serviceLoopChannelLen.Update(int64(len(chainEventCh))) - log.Debug("Loop(): chain event received", "event", chainEvent) + block := event.Block + log.Debug("Chain event received", "number", block.Number(), "hash", event.Hash) // if we don't have any subscribers, do not process a statediff if atomic.LoadInt32(&sds.subscribers) == 0 { - log.Debug("Currently no subscribers to the statediffing service; processing is halted") + log.Debug("Currently no subscribers, skipping block") continue } - currentBlock := chainEvent.Block - parentBlock := sds.BlockCache.getParentBlock(currentBlock, sds.BlockChain) - if parentBlock == nil { - log.Error("Parent block is nil, skipping this block", "block height", currentBlock.Number()) + parent := sds.BlockCache.getParentBlock(block, sds.BlockChain) + if parent == nil { + log.Error("Parent block is nil, skipping block", "number", block.Number()) continue } // chainEvent streams block from block 1, but we also need to include data from the genesis block. - if parentBlock.Number().Uint64() == genesisBlockNumber { + if parent.Number().Uint64() == genesisBlockNumber { // For genesis block we need to return the entire state trie hence we diff it with an empty trie. - sds.streamStateDiff(parentBlock, common.Hash{}) + sds.streamStateDiff(parent, common.Hash{}) + } + sds.streamStateDiff(block, parent.Root()) + case err := <-sub.Err(): + if err != nil { + log.Error("error from subscription", "error", err) } - - sds.streamStateDiff(currentBlock, parentBlock.Root()) - case err := <-errCh: - log.Error("Error from chain event subscription", "error", err) close(sds.QuitChan) - log.Info("Quitting the statediffing listening loop") - sds.close() return case <-sds.QuitChan: - log.Info("Quitting the statediffing listening loop") - sds.close() return } } } -// streamStateDiff method builds the state diff payload for each subscription according to their subscription type and sends them the result +// streamStateDiff builds and delivers diff payloads for each subscription according to their +// subscription type func (sds *Service) streamStateDiff(currentBlock *types.Block, parentRoot common.Hash) { - sds.Lock() + sds.subscriptionsMutex.Lock() for ty, subs := range sds.Subscriptions { params, ok := sds.SubscriptionTypes[ty] if !ok { - log.Error("no parameter set associated with this subscription", "subscription type", ty.Hex()) + log.Error("no parameter set associated with this subscription", "sub.type", ty.String()) sds.closeType(ty) continue } // create payload for this subscription type payload, err := sds.processStateDiff(currentBlock, parentRoot, params) if err != nil { - log.Error("statediff processing error", "block height", currentBlock.Number().Uint64(), "parameters", params, "error", err.Error()) + log.Error("statediff processing error", + "number", currentBlock.Number(), "parameters", params, "error", err) continue } for id, sub := range subs { select { case sub.PayloadChan <- *payload: - log.Debug("sending statediff payload at head", "height", currentBlock.Number(), "subscription id", id) + log.Debug("sending statediff payload at head", "number", currentBlock.Number(), "sub.id", id) default: - log.Info("unable to send statediff payload; channel has no receiver", "subscription id", id) + log.Info("unable to send statediff payload; channel has no receiver", "sub.id", id) } } } - sds.Unlock() + sds.subscriptionsMutex.Unlock() } // StateDiffAt returns a state diff object payload at the specific blockheight -// This operation cannot be performed back past the point of db pruning; it requires an archival node for historical data +// This operation cannot be performed back past the point of db pruning; it requires an archival +// node for historical data func (sds *Service) StateDiffAt(blockNumber uint64, params Params) (*Payload, error) { + log.Info("Sending state diff", "number", blockNumber) + currentBlock := sds.BlockChain.GetBlockByNumber(blockNumber) - log.Info("sending state diff", "block height", blockNumber) - - // use watched addresses from statediffing write loop if not provided - if params.WatchedAddresses == nil && writeLoopParams.WatchedAddresses != nil { - writeLoopParams.RLock() - params.WatchedAddresses = make([]common.Address, len(writeLoopParams.WatchedAddresses)) - copy(params.WatchedAddresses, writeLoopParams.WatchedAddresses) - writeLoopParams.RUnlock() + parentRoot := common.Hash{} + if blockNumber != 0 { + parentRoot = sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()).Root() } - // compute leaf paths of watched addresses in the params - params.ComputeWatchedAddressesLeafPaths() - - if blockNumber == 0 { - return sds.processStateDiff(currentBlock, common.Hash{}, params) - } - parentBlock := sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()) - return sds.processStateDiff(currentBlock, parentBlock.Root(), params) + return sds.processStateDiff(currentBlock, parentRoot, sds.maybeReplaceWatchedAddresses(params)) } // StateDiffFor returns a state diff object payload for the specific blockhash -// This operation cannot be performed back past the point of db pruning; it requires an archival node for historical data +// This operation cannot be performed back past the point of db pruning; it requires an archival +// node for historical data func (sds *Service) StateDiffFor(blockHash common.Hash, params Params) (*Payload, error) { + log.Info("Sending state diff", "hash", blockHash) + currentBlock := sds.BlockChain.GetBlockByHash(blockHash) - log.Info("sending state diff", "block hash", blockHash) - - // use watched addresses from statediffing write loop if not provided - if params.WatchedAddresses == nil && writeLoopParams.WatchedAddresses != nil { - writeLoopParams.RLock() - params.WatchedAddresses = make([]common.Address, len(writeLoopParams.WatchedAddresses)) - copy(params.WatchedAddresses, writeLoopParams.WatchedAddresses) - writeLoopParams.RUnlock() + parentRoot := common.Hash{} + if currentBlock.NumberU64() != 0 { + parentRoot = sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()).Root() + } + return sds.processStateDiff(currentBlock, parentRoot, sds.maybeReplaceWatchedAddresses(params)) +} + +// use watched addresses from statediffing write loop if not provided +// compute leaf paths of watched addresses in the params +func (sds *Service) maybeReplaceWatchedAddresses(params Params) Params { + if params.WatchedAddresses == nil && sds.writeLoopParams.WatchedAddresses != nil { + sds.writeLoopParams.RLock() + params.WatchedAddresses = make([]common.Address, len(sds.writeLoopParams.WatchedAddresses)) + copy(params.WatchedAddresses, sds.writeLoopParams.WatchedAddresses) + sds.writeLoopParams.RUnlock() } - // compute leaf paths of watched addresses in the params params.ComputeWatchedAddressesLeafPaths() - - if currentBlock.NumberU64() == 0 { - return sds.processStateDiff(currentBlock, common.Hash{}, params) - } - parentBlock := sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()) - return sds.processStateDiff(currentBlock, parentBlock.Root(), params) + return params } // processStateDiff method builds the state diff payload from the current block, parent state root, and provided params @@ -541,15 +434,16 @@ func (sds *Service) processStateDiff(currentBlock *types.Block, parentRoot commo BlockNumber: currentBlock.Number(), }, params) // allow dereferencing of parent, keep current locked as it should be the next parent - sds.BlockChain.UnlockTrie(parentRoot) - if err != nil { - return nil, err - } + // sds.BlockChain.UnlockTrie(parentRoot) + // if err != nil { + // return nil, err + // } stateDiffRlp, err := rlp.EncodeToBytes(&stateDiff) if err != nil { return nil, err } - log.Info("state diff size", "at block height", currentBlock.Number().Uint64(), "rlp byte size", len(stateDiffRlp)) + log.Debug("statediff RLP payload for block", + "number", currentBlock.Number(), "byte size", len(stateDiffRlp)) return sds.newPayload(stateDiffRlp, currentBlock, params) } @@ -579,7 +473,7 @@ func (sds *Service) newPayload(stateObject []byte, block *types.Block, params Pa } // Subscribe is used by the API to subscribe to the service loop -func (sds *Service) Subscribe(id rpc.ID, sub chan<- Payload, quitChan chan<- bool, params Params) { +func (sds *Service) Subscribe(sub chan<- Payload, quitChan chan<- bool, params Params) SubID { log.Info("Subscribing to the statediff service") if atomic.CompareAndSwapInt32(&sds.subscribers, 0, 1) { log.Info("State diffing subscription received; beginning statediff processing") @@ -592,26 +486,28 @@ func (sds *Service) Subscribe(id rpc.ID, sub chan<- Payload, quitChan chan<- boo by, err := rlp.EncodeToBytes(¶ms) if err != nil { log.Error("State diffing params need to be rlp-serializable") - return + return 0 } subscriptionType := crypto.Keccak256Hash(by) + id := SubID(atomic.AddUint64(&sds.lastSubID, 1)) // Add subscriber - sds.Lock() + sds.subscriptionsMutex.Lock() if sds.Subscriptions[subscriptionType] == nil { - sds.Subscriptions[subscriptionType] = make(map[rpc.ID]Subscription) + sds.Subscriptions[subscriptionType] = make(map[SubID]Subscription) } sds.Subscriptions[subscriptionType][id] = Subscription{ PayloadChan: sub, QuitChan: quitChan, } sds.SubscriptionTypes[subscriptionType] = params - sds.Unlock() + sds.subscriptionsMutex.Unlock() + return id } // Unsubscribe is used to unsubscribe from the service loop -func (sds *Service) Unsubscribe(id rpc.ID) error { - log.Info("Unsubscribing from the statediff service", "subscription id", id) - sds.Lock() +func (sds *Service) Unsubscribe(id SubID) error { + log.Info("Unsubscribing from the statediff service", "sub.id", id) + sds.subscriptionsMutex.Lock() for ty := range sds.Subscriptions { delete(sds.Subscriptions[ty], id) if len(sds.Subscriptions[ty]) == 0 { @@ -625,70 +521,46 @@ func (sds *Service) Unsubscribe(id rpc.ID) error { log.Info("No more subscriptions; halting statediff processing") } } - sds.Unlock() + sds.subscriptionsMutex.Unlock() return nil } -// GetSyncStatus will check the status of geth syncing. -// It will return false if geth has finished syncing. -// It will return a true Geth is still syncing. -func (sds *Service) GetSyncStatus(pubEthAPI *ethapi.EthereumAPI) (bool, error) { - syncStatus, err := pubEthAPI.Syncing() - if err != nil { - return true, err - } - - if syncStatus != false { - return true, err - } - return false, err +// IsSyncing returns true if geth is still syncing, and false if it has caught up to head. +func (sds *Service) IsSyncing() bool { + progress := sds.BackendAPI.Downloader().Progress() + return progress.CurrentBlock() < progress.HighestBlock() } -// WaitingForSync calls GetSyncStatus to check if we have caught up to head. -// It will keep looking and checking if we have caught up to head. -// It will only complete if we catch up to head, otherwise it will keep looping forever. -func (sds *Service) WaitingForSync() error { - log.Info("We are going to wait for geth to sync to head!") - - // Has the geth node synced to head? - Synced := false - pubEthAPI := ethapi.NewEthereumAPI(sds.BackendAPI) - for !Synced { - syncStatus, err := sds.GetSyncStatus(pubEthAPI) - if err != nil { - return err - } - if !syncStatus { - log.Info("Geth has caught up to the head of the chain") - Synced = true +// WaitForSync continuously checks the status of geth syncing, only returning once it has caught +// up to head. +func (sds *Service) WaitForSync() { + synced := false + for !synced { + if !sds.IsSyncing() { + log.Debug("Geth has completed syncing") + synced = true } else { time.Sleep(1 * time.Second) } } - return nil } // Start is used to begin the service func (sds *Service) Start() error { log.Info("Starting statediff service") - if sds.WaitForSync { - log.Info("Statediff service will wait until geth has caught up to the head of the chain.") - err := sds.WaitingForSync() - if err != nil { - return err - } - log.Info("Continuing with startdiff start process") + if sds.ShouldWaitForSync { + log.Info("Statediff service waiting until geth has caught up to the head of the chain") + sds.WaitForSync() } chainEventCh := make(chan core.ChainEvent, chainEventChanSize) - go sds.Loop(chainEventCh) + go sds.PublishLoop(chainEventCh) if sds.enableWriteLoop { - log.Info("Starting statediff DB write loop", "params", writeLoopParams.Params) + log.Debug("Starting statediff DB write loop", "params", sds.writeLoopParams.Params) chainEventCh := make(chan core.ChainEvent, chainEventChanSize) go sds.WriteLoop(chainEventCh) } - return nil } @@ -696,30 +568,36 @@ func (sds *Service) Start() error { func (sds *Service) Stop() error { log.Info("Stopping statediff service") close(sds.QuitChan) - return nil + var err error + if sds.indexer != nil { + if err = sds.indexer.Close(); err != nil { + log.Error("Error closing indexer", "error", err) + } + } + return err } // close is used to close all listening subscriptions func (sds *Service) close() { - sds.Lock() + sds.subscriptionsMutex.Lock() for ty, subs := range sds.Subscriptions { for id, sub := range subs { select { case sub.QuitChan <- true: - log.Info("closing subscription", "id", id) + log.Info("closing subscription", "sub.id", id) default: - log.Info("unable to close subscription; channel has no receiver", "subscription id", id) + log.Info("unable to close subscription; channel has no receiver", "sub.id", id) } delete(sds.Subscriptions[ty], id) } delete(sds.Subscriptions, ty) delete(sds.SubscriptionTypes, ty) } - sds.Unlock() + sds.subscriptionsMutex.Unlock() } // closeType is used to close all subscriptions of given type -// closeType needs to be called with subscription access locked +// NOTE: this needs to be called with subscription access locked func (sds *Service) closeType(subType common.Hash) { subs := sds.Subscriptions[subType] for id, sub := range subs { @@ -729,12 +607,12 @@ func (sds *Service) closeType(subType common.Hash) { delete(sds.SubscriptionTypes, subType) } -func sendNonBlockingQuit(id rpc.ID, sub Subscription) { +func sendNonBlockingQuit(id SubID, sub Subscription) { select { case sub.QuitChan <- true: - log.Info("closing subscription", "id", id) + log.Info("closing subscription", "sub.id", id) default: - log.Info("unable to close subscription; channel has no receiver", "subscription id", id) + log.Info("unable to close subscription; channel has no receiver", "sub.id", id) } } @@ -747,13 +625,21 @@ func (sds *Service) WriteStateDiffAt(blockNumber uint64, params Params) JobID { if id, has := sds.currentJobs[blockNumber]; has { return id } - id := JobID(atomic.AddUint64(&sds.lastJobID, 1)) + sds.lastJobID++ + id := JobID(sds.lastJobID) sds.currentJobs[blockNumber] = id + go func() { err := sds.writeStateDiffAt(blockNumber, params) + if err != nil { + log.Error("failed to write state diff", "error", err) + } sds.currentJobsMutex.Lock() delete(sds.currentJobs, blockNumber) sds.currentJobsMutex.Unlock() + + sds.jobStatusSubsMutex.RLock() + defer sds.jobStatusSubsMutex.RUnlock() for _, sub := range sds.jobStatusSubs { sub.statusChan <- JobStatus{id, err} } @@ -762,17 +648,7 @@ func (sds *Service) WriteStateDiffAt(blockNumber uint64, params Params) JobID { } func (sds *Service) writeStateDiffAt(blockNumber uint64, params Params) error { - log.Info("writing state diff at", "block height", blockNumber) - - // use watched addresses from statediffing write loop if not provided - if params.WatchedAddresses == nil && writeLoopParams.WatchedAddresses != nil { - writeLoopParams.RLock() - params.WatchedAddresses = make([]common.Address, len(writeLoopParams.WatchedAddresses)) - copy(params.WatchedAddresses, writeLoopParams.WatchedAddresses) - writeLoopParams.RUnlock() - } - // compute leaf paths of watched addresses in the params - params.ComputeWatchedAddressesLeafPaths() + log.Info("Writing state diff at", "number", blockNumber) currentBlock := sds.BlockChain.GetBlockByNumber(blockNumber) parentRoot := common.Hash{} @@ -780,24 +656,14 @@ func (sds *Service) writeStateDiffAt(blockNumber uint64, params Params) error { parentBlock := sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()) parentRoot = parentBlock.Root() } - return sds.writeStateDiffWithRetry(currentBlock, parentRoot, params) + return sds.writeStateDiffWithRetry(currentBlock, parentRoot, sds.maybeReplaceWatchedAddresses(params)) } // WriteStateDiffFor writes a state diff for the specific blockhash directly to the database // This operation cannot be performed back past the point of db pruning; it requires an archival node // for historical data func (sds *Service) WriteStateDiffFor(blockHash common.Hash, params Params) error { - log.Info("writing state diff for", "block hash", blockHash) - - // use watched addresses from statediffing write loop if not provided - if params.WatchedAddresses == nil && writeLoopParams.WatchedAddresses != nil { - writeLoopParams.RLock() - params.WatchedAddresses = make([]common.Address, len(writeLoopParams.WatchedAddresses)) - copy(params.WatchedAddresses, writeLoopParams.WatchedAddresses) - writeLoopParams.RUnlock() - } - // compute leaf paths of watched addresses in the params - params.ComputeWatchedAddressesLeafPaths() + log.Info("Writing state diff for", "hash", blockHash) currentBlock := sds.BlockChain.GetBlockByHash(blockHash) parentRoot := common.Hash{} @@ -805,17 +671,21 @@ func (sds *Service) WriteStateDiffFor(blockHash common.Hash, params Params) erro parentBlock := sds.BlockChain.GetBlockByHash(currentBlock.ParentHash()) parentRoot = parentBlock.Root() } - return sds.writeStateDiffWithRetry(currentBlock, parentRoot, params) + return sds.writeStateDiffWithRetry(currentBlock, parentRoot, sds.maybeReplaceWatchedAddresses(params)) } // Writes a state diff from the current block, parent state root, and provided params func (sds *Service) writeStateDiff(block *types.Block, parentRoot common.Hash, params Params) error { - var totalDifficulty *big.Int + var totalDifficulty = big.NewInt(0) var receipts types.Receipts var err error var tx interfaces.Batch start, logger := countStateDiffBegin(block) defer countStateDiffEnd(start, logger, err) + if sds.indexer == nil { + return fmt.Errorf("indexer is not set; cannot write indexed diffs") + } + if params.IncludeTD { totalDifficulty = sds.BlockChain.GetTd(block.Hash(), block.NumberU64()) } @@ -828,15 +698,13 @@ func (sds *Service) writeStateDiff(block *types.Block, parentRoot common.Hash, p } output := func(node types2.StateLeafNode) error { - defer func() { - // This is very noisy so we log at Trace. - since := metrics.UpdateDuration(time.Now(), metrics.IndexerMetrics.OutputTimer) - logger.Trace(fmt.Sprintf("statediff output duration=%dms", since.Milliseconds())) - }() + defer metrics.ReportAndUpdateDuration("statediff output", time.Now(), logger, + metrics.IndexerMetrics.OutputTimer) return sds.indexer.PushStateNode(tx, node, block.Hash().String()) } ipldOutput := func(c types2.IPLD) error { - defer metrics.ReportAndUpdateDuration("statediff ipldOutput", time.Now(), logger, metrics.IndexerMetrics.IPLDOutputTimer) + defer metrics.ReportAndUpdateDuration("statediff ipldOutput", time.Now(), logger, + metrics.IndexerMetrics.IPLDOutputTimer) return sds.indexer.PushIPLD(tx, c) } @@ -846,13 +714,15 @@ func (sds *Service) writeStateDiff(block *types.Block, parentRoot common.Hash, p BlockHash: block.Hash(), BlockNumber: block.Number(), }, params, output, ipldOutput) + // TODO this anti-pattern needs to be sorted out eventually if err := tx.Submit(err); err != nil { return fmt.Errorf("batch transaction submission failed: %w", err) } // allow dereferencing of parent, keep current locked as it should be the next parent - sds.BlockChain.UnlockTrie(parentRoot) + // TODO never locked + // sds.BlockChain.UnlockTrie(parentRoot) return nil } @@ -861,10 +731,10 @@ func (sds *Service) writeStateDiffWithRetry(block *types.Block, parentRoot commo var err error for i := uint(0); i < sds.maxRetry; i++ { err = sds.writeStateDiff(block, parentRoot, params) - if err != nil && strings.Contains(err.Error(), deadlockDetected) { + if err != nil && strings.Contains(err.Error(), pgDeadlockDetected) { // Retry only when the deadlock is detected. if i+1 < sds.maxRetry { - log.Warn("dead lock detected while writing statediff", "err", err, "retry number", i) + log.Warn("deadlock detected while writing statediff", "error", err, "retry number", i) } continue } @@ -874,38 +744,36 @@ func (sds *Service) writeStateDiffWithRetry(block *types.Block, parentRoot commo } // SubscribeWriteStatus is used by the API to subscribe to the job status updates -func (sds *Service) SubscribeWriteStatus(id rpc.ID, sub chan<- JobStatus, quitChan chan<- bool) { - log.Info("Subscribing to job status updates", "subscription id", id) - sds.Lock() - sds.jobStatusSubs[id] = statusSubscription{ +func (sds *Service) SubscribeWriteStatus(sub chan<- JobStatus) SubID { + id := SubID(atomic.AddUint64(&sds.lastSubID, 1)) + log.Info("Subscribing to job status updates", "sub.id", id) + sds.jobStatusSubsMutex.Lock() + sds.jobStatusSubs[id] = jobStatusSubscription{ statusChan: sub, - quitChan: quitChan, } - sds.Unlock() + sds.jobStatusSubsMutex.Unlock() + return id } // UnsubscribeWriteStatus is used to unsubscribe from job status updates -func (sds *Service) UnsubscribeWriteStatus(id rpc.ID) error { - log.Info("Unsubscribing from job status updates", "subscription id", id) - sds.Lock() - close(sds.jobStatusSubs[id].quitChan) +func (sds *Service) UnsubscribeWriteStatus(id SubID) { + log.Info("Unsubscribing from job status updates", "sub.id", id) + sds.jobStatusSubsMutex.Lock() delete(sds.jobStatusSubs, id) - sds.Unlock() - return nil + sds.jobStatusSubsMutex.Unlock() } // StreamCodeAndCodeHash subscription method for extracting all the codehash=>code mappings that exist in the trie at the provided height func (sds *Service) StreamCodeAndCodeHash(blockNumber uint64, outChan chan<- types2.CodeAndCodeHash, quitChan chan<- bool) { current := sds.BlockChain.GetBlockByNumber(blockNumber) - log.Info("sending code and codehash", "block height", blockNumber) + log.Info("sending code and codehash", "number", blockNumber) currentTrie, err := sds.BlockChain.StateCache().OpenTrie(current.Root()) if err != nil { - log.Error("error creating trie for block", "block height", current.Number(), "err", err) + log.Error("error getting trie for block", "number", current.Number(), "error", err) close(quitChan) return } - it := currentTrie.NodeIterator([]byte{}) - leafIt := trie.NewIterator(it) + leafIt := trie.NewIterator(currentTrie.NodeIterator(nil)) go func() { defer close(quitChan) for leafIt.Next() { @@ -916,13 +784,13 @@ func (sds *Service) StreamCodeAndCodeHash(blockNumber uint64, outChan chan<- typ } account := new(types.StateAccount) if err := rlp.DecodeBytes(leafIt.Value, account); err != nil { - log.Error("error decoding state account", "err", err) + log.Error("error decoding state account", "error", err) return } codeHash := common.BytesToHash(account.CodeHash) - code, err := sds.BlockChain.StateCache().ContractCode(common.Hash{}, codeHash) + code, err := sds.BlockChain.StateCache().ContractCode(codeHash) if err != nil { - log.Error("error collecting contract code", "err", err) + log.Error("error collecting contract code", "error", err) return } outChan <- types2.CodeAndCodeHash{ @@ -933,12 +801,12 @@ func (sds *Service) StreamCodeAndCodeHash(blockNumber uint64, outChan chan<- typ }() } -// WatchAddress performs one of following operations on the watched addresses in writeLoopParams and the db: +// WatchAddress performs one of following operations on the watched addresses in sds.writeLoopParams and the db: // add | remove | set | clear func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.WatchAddressArg) error { - // lock writeLoopParams for a write - writeLoopParams.Lock() - defer writeLoopParams.Unlock() + sds.writeLoopParams.Lock() + log.Debug("WatchAddress: locked sds.writeLoopParams") + defer sds.writeLoopParams.Unlock() // get the current block number currentBlockNumber := sds.BlockChain.CurrentBlock().Number @@ -947,20 +815,20 @@ func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.W case types2.Add: // filter out args having an already watched address with a warning filteredArgs, ok := funk.Filter(args, func(arg types2.WatchAddressArg) bool { - if funk.Contains(writeLoopParams.WatchedAddresses, common.HexToAddress(arg.Address)) { + if funk.Contains(sds.writeLoopParams.WatchedAddresses, plugeth.HexToAddress(arg.Address)) { log.Warn("Address already being watched", "address", arg.Address) return false } return true }).([]types2.WatchAddressArg) if !ok { - return fmt.Errorf("add: filtered args %s", typeAssertionFailed) + return fmt.Errorf("add: filtered args %w", errTypeAssertionFailed) } // get addresses from the filtered args filteredAddresses, err := MapWatchAddressArgsToAddresses(filteredArgs) if err != nil { - return fmt.Errorf("add: filtered addresses %s", err.Error()) + return fmt.Errorf("add: filtered addresses %w", err) } // update the db @@ -972,19 +840,19 @@ func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.W } // update in-memory params - writeLoopParams.WatchedAddresses = append(writeLoopParams.WatchedAddresses, filteredAddresses...) - writeLoopParams.ComputeWatchedAddressesLeafPaths() + sds.writeLoopParams.WatchedAddresses = append(sds.writeLoopParams.WatchedAddresses, filteredAddresses...) + sds.writeLoopParams.ComputeWatchedAddressesLeafPaths() case types2.Remove: // get addresses from args argAddresses, err := MapWatchAddressArgsToAddresses(args) if err != nil { - return fmt.Errorf("remove: mapped addresses %s", err.Error()) + return fmt.Errorf("remove: mapped addresses %w", err) } // remove the provided addresses from currently watched addresses - addresses, ok := funk.Subtract(writeLoopParams.WatchedAddresses, argAddresses).([]common.Address) + addresses, ok := funk.Subtract(sds.writeLoopParams.WatchedAddresses, argAddresses).([]common.Address) if !ok { - return fmt.Errorf("remove: filtered addresses %s", typeAssertionFailed) + return fmt.Errorf("remove: filtered addresses %w", errTypeAssertionFailed) } // update the db @@ -996,13 +864,13 @@ func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.W } // update in-memory params - writeLoopParams.WatchedAddresses = addresses - writeLoopParams.ComputeWatchedAddressesLeafPaths() + sds.writeLoopParams.WatchedAddresses = addresses + sds.writeLoopParams.ComputeWatchedAddressesLeafPaths() case types2.Set: // get addresses from args argAddresses, err := MapWatchAddressArgsToAddresses(args) if err != nil { - return fmt.Errorf("set: mapped addresses %s", err.Error()) + return fmt.Errorf("set: mapped addresses %w", err) } // update the db @@ -1014,8 +882,8 @@ func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.W } // update in-memory params - writeLoopParams.WatchedAddresses = argAddresses - writeLoopParams.ComputeWatchedAddressesLeafPaths() + sds.writeLoopParams.WatchedAddresses = argAddresses + sds.writeLoopParams.ComputeWatchedAddressesLeafPaths() case types2.Clear: // update the db if sds.indexer != nil { @@ -1026,39 +894,37 @@ func (sds *Service) WatchAddress(operation types2.OperationType, args []types2.W } // update in-memory params - writeLoopParams.WatchedAddresses = []common.Address{} - writeLoopParams.ComputeWatchedAddressesLeafPaths() + sds.writeLoopParams.WatchedAddresses = []common.Address{} + sds.writeLoopParams.ComputeWatchedAddressesLeafPaths() default: - return fmt.Errorf("%s %s", unexpectedOperation, operation) + return fmt.Errorf("%w: %v", errUnexpectedOperation, operation) } return nil } -// loadWatchedAddresses loads watched addresses to in-memory write loop params -func loadWatchedAddresses(indexer interfaces.StateDiffIndexer) error { +// loadWatchedAddresses loads watched addresses from an indexer to params +func loadWatchedAddresses(indexer interfaces.StateDiffIndexer, params *ParamsWithMutex) error { watchedAddresses, err := indexer.LoadWatchedAddresses() if err != nil { return err } + params.Lock() + defer params.Unlock() - writeLoopParams.Lock() - defer writeLoopParams.Unlock() - - writeLoopParams.WatchedAddresses = watchedAddresses - writeLoopParams.ComputeWatchedAddressesLeafPaths() - + params.WatchedAddresses = watchedAddresses + params.ComputeWatchedAddressesLeafPaths() return nil } -// MapWatchAddressArgsToAddresses maps []WatchAddressArg to corresponding []common.Address +// MapWatchAddressArgsToAddresses maps []WatchAddressArg to corresponding []core.Address func MapWatchAddressArgsToAddresses(args []types2.WatchAddressArg) ([]common.Address, error) { addresses, ok := funk.Map(args, func(arg types2.WatchAddressArg) common.Address { return common.HexToAddress(arg.Address) }).([]common.Address) if !ok { - return nil, fmt.Errorf(typeAssertionFailed) + return nil, errTypeAssertionFailed } return addresses, nil diff --git a/service_test.go b/service_test.go index 6e6ad20..62bc4f8 100644 --- a/service_test.go +++ b/service_test.go @@ -17,33 +17,39 @@ package statediff_test import ( - "bytes" "context" "errors" "math/big" "math/rand" - "reflect" "sync" "testing" "time" "github.com/stretchr/testify/require" + "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" + geth_log "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - statediff "github.com/ethereum/go-ethereum/statediff" - "github.com/ethereum/go-ethereum/statediff/test_helpers/mocks" - types2 "github.com/ethereum/go-ethereum/statediff/types" "github.com/ethereum/go-ethereum/trie" + + statediff "github.com/cerc-io/plugeth-statediff" + "github.com/cerc-io/plugeth-statediff/test_helpers/mocks" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + // "github.com/cerc-io/plugeth-statediff/utils/log" ) +func init() { + // The geth sync logs are noisy, silence them + geth_log.Root().SetHandler(geth_log.DiscardHandler()) + // log.TestLogger.SetLevel(2) +} + func TestServiceLoop(t *testing.T) { - testErrorInChainEventLoop(t) - testErrorInBlockLoop(t) + t.Run("error in chain event loop", testErrorInChainEventLoop) + t.Run("error in block loop", testErrorInBlockLoop) } var ( @@ -99,17 +105,17 @@ func testErrorInChainEventLoop(t *testing.T) { blockChain := mocks.BlockChain{} serviceQuit := make(chan bool) service := statediff.Service{ - Mutex: sync.Mutex{}, Builder: &builder, BlockChain: &blockChain, QuitChan: serviceQuit, - Subscriptions: make(map[common.Hash]map[rpc.ID]statediff.Subscription), + Subscriptions: make(map[common.Hash]map[statediff.SubID]statediff.Subscription), SubscriptionTypes: make(map[common.Hash]statediff.Params), BlockCache: statediff.NewBlockCache(1), } payloadChan := make(chan statediff.Payload, 2) quitChan := make(chan bool) - service.Subscribe(rpc.NewID(), payloadChan, quitChan, defaultParams) + service.Subscribe(payloadChan, quitChan, defaultParams) + // FIXME why is this here? testRoot2 = common.HexToHash("0xTestRoot2") blockMapping := make(map[common.Hash]*types.Block) blockMapping[parentBlock1.Hash()] = parentBlock1 @@ -132,12 +138,9 @@ func testErrorInChainEventLoop(t *testing.T) { } wg.Done() }() - service.Loop(eventsChannel) + service.PublishLoop(eventsChannel) wg.Wait() - if len(payloads) != 2 { - t.Error("Test failure:", t.Name()) - t.Logf("Actual number of payloads does not equal expected.\nactual: %+v\nexpected: 3", len(payloads)) - } + require.Equal(t, 2, len(payloads), "number of payloads") testReceipts1Rlp, err := rlp.EncodeToBytes(&testReceipts1) if err != nil { @@ -149,34 +152,16 @@ func testErrorInChainEventLoop(t *testing.T) { } expectedReceiptsRlp := [][]byte{testReceipts1Rlp, testReceipts2Rlp, nil} for i, payload := range payloads { - if !bytes.Equal(payload.ReceiptsRlp, expectedReceiptsRlp[i]) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual receipt rlp for payload %d does not equal expected.\nactual: %+v\nexpected: %+v", i, payload.ReceiptsRlp, expectedReceiptsRlp[i]) - } + require.Equal(t, expectedReceiptsRlp[i], payload.ReceiptsRlp, "payload %d", i) } - if !reflect.DeepEqual(builder.Params, defaultParams) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual params does not equal expected.\nactual:%+v\nexpected: %+v", builder.Params, defaultParams) - } - if !bytes.Equal(builder.Args.BlockHash.Bytes(), testBlock2.Hash().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual blockhash does not equal expected.\nactual:%x\nexpected: %x", builder.Args.BlockHash.Bytes(), testBlock2.Hash().Bytes()) - } - if !bytes.Equal(builder.Args.OldStateRoot.Bytes(), parentBlock2.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual root does not equal expected.\nactual:%x\nexpected: %x", builder.Args.OldStateRoot.Bytes(), parentBlock2.Root().Bytes()) - } - if !bytes.Equal(builder.Args.NewStateRoot.Bytes(), testBlock2.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual root does not equal expected.\nactual:%x\nexpected: %x", builder.Args.NewStateRoot.Bytes(), testBlock2.Root().Bytes()) - } + require.Equal(t, builder.Params, defaultParams) + require.Equal(t, testBlock2.Hash(), builder.Args.BlockHash) + require.Equal(t, parentBlock2.Root(), builder.Args.OldStateRoot) + require.Equal(t, testBlock2.Root(), builder.Args.NewStateRoot) //look up the parent block from its hash expectedHashes := []common.Hash{testBlock1.ParentHash(), testBlock2.ParentHash()} - if !reflect.DeepEqual(blockChain.HashesLookedUp, expectedHashes) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual looked up parent hashes does not equal expected.\nactual:%+v\nexpected: %+v", blockChain.HashesLookedUp, expectedHashes) - } + require.Equal(t, expectedHashes, blockChain.HashesLookedUp) } func testErrorInBlockLoop(t *testing.T) { @@ -187,13 +172,13 @@ func testErrorInBlockLoop(t *testing.T) { Builder: &builder, BlockChain: &blockChain, QuitChan: make(chan bool), - Subscriptions: make(map[common.Hash]map[rpc.ID]statediff.Subscription), + Subscriptions: make(map[common.Hash]map[statediff.SubID]statediff.Subscription), SubscriptionTypes: make(map[common.Hash]statediff.Params), BlockCache: statediff.NewBlockCache(1), } payloadChan := make(chan statediff.Payload) quitChan := make(chan bool) - service.Subscribe(rpc.NewID(), payloadChan, quitChan, defaultParams) + service.Subscribe(payloadChan, quitChan, defaultParams) blockMapping := make(map[common.Hash]*types.Block) blockMapping[parentBlock1.Hash()] = parentBlock1 blockChain.SetBlocksForHashes(blockMapping) @@ -205,28 +190,16 @@ func testErrorInBlockLoop(t *testing.T) { case <-quitChan: } }() - service.Loop(eventsChannel) + service.PublishLoop(eventsChannel) - if !reflect.DeepEqual(builder.Params, defaultParams) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual params does not equal expected.\nactual:%+v\nexpected: %+v", builder.Params, defaultParams) - } - if !bytes.Equal(builder.Args.BlockHash.Bytes(), testBlock1.Hash().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual blockhash does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.BlockHash.Bytes(), testBlock1.Hash().Bytes()) - } - if !bytes.Equal(builder.Args.OldStateRoot.Bytes(), parentBlock1.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual old state root does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.OldStateRoot.Bytes(), parentBlock1.Root().Bytes()) - } - if !bytes.Equal(builder.Args.NewStateRoot.Bytes(), testBlock1.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual new state root does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.NewStateRoot.Bytes(), testBlock1.Root().Bytes()) - } + require.Equal(t, defaultParams, builder.Params) + require.Equal(t, testBlock1.Hash(), builder.Args.BlockHash) + require.Equal(t, parentBlock1.Root(), builder.Args.OldStateRoot) + require.Equal(t, testBlock1.Root(), builder.Args.NewStateRoot) } func TestGetStateDiffAt(t *testing.T) { - mockStateDiff := types2.StateObject{ + mockStateDiff := sdtypes.StateObject{ BlockNumber: testBlock1.Number(), BlockHash: testBlock1.Hash(), } @@ -260,11 +233,10 @@ func TestGetStateDiffAt(t *testing.T) { blockChain.SetBlockForNumber(testBlock1, testBlock1.NumberU64()) blockChain.SetReceiptsForHash(testBlock1.Hash(), testReceipts1) service := statediff.Service{ - Mutex: sync.Mutex{}, Builder: &builder, BlockChain: &blockChain, QuitChan: make(chan bool), - Subscriptions: make(map[common.Hash]map[rpc.ID]statediff.Subscription), + Subscriptions: make(map[common.Hash]map[statediff.SubID]statediff.Subscription), SubscriptionTypes: make(map[common.Hash]statediff.Params), BlockCache: statediff.NewBlockCache(1), } @@ -277,63 +249,37 @@ func TestGetStateDiffAt(t *testing.T) { t.Error(err) } - if !reflect.DeepEqual(builder.Params, defaultParams) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual params does not equal expected.\nactual:%+v\nexpected: %+v", builder.Params, defaultParams) - } - if !bytes.Equal(builder.Args.BlockHash.Bytes(), testBlock1.Hash().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual blockhash does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.BlockHash.Bytes(), testBlock1.Hash().Bytes()) - } - if !bytes.Equal(builder.Args.OldStateRoot.Bytes(), parentBlock1.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual old state root does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.OldStateRoot.Bytes(), parentBlock1.Root().Bytes()) - } - if !bytes.Equal(builder.Args.NewStateRoot.Bytes(), testBlock1.Root().Bytes()) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual new state root does not equal expected.\nactual:%+v\nexpected: %x", builder.Args.NewStateRoot.Bytes(), testBlock1.Root().Bytes()) - } - if !bytes.Equal(expectedStateDiffPayloadRlp, stateDiffPayloadRlp) { - t.Error("Test failure:", t.Name()) - t.Logf("Actual state diff payload does not equal expected.\nactual:%+v\nexpected: %+v", expectedStateDiffPayload, stateDiffPayload) - } + require.Equal(t, defaultParams, builder.Params) + require.Equal(t, testBlock1.Hash(), builder.Args.BlockHash) + require.Equal(t, parentBlock1.Root(), builder.Args.OldStateRoot) + require.Equal(t, testBlock1.Root(), builder.Args.NewStateRoot) + require.Equal(t, stateDiffPayloadRlp, expectedStateDiffPayloadRlp) } type writeSub struct { - sub *rpc.ClientSubscription - statusChan <-chan statediff.JobStatus + ch <-chan statediff.JobStatus + unsubscribe func() } -func makeClient(svc *statediff.Service) *rpc.Client { - server := rpc.NewServer() - api := statediff.NewPublicStateDiffAPI(svc) - err := server.RegisterName("statediff", api) - if err != nil { - panic(err) - } - return rpc.DialInProc(server) +func subscribeWritesService(t *testing.T, api *statediff.PublicAPI) writeSub { + ctx, cancel := context.WithCancel(context.Background()) + sub, err := api.StreamWrites(ctx) + require.NoError(t, err) + return writeSub{sub, cancel} } -// awaitStatus awaits status update for writeStateDiffAt job -func subscribeWrites(client *rpc.Client) (writeSub, error) { - statusChan := make(chan statediff.JobStatus) - sub, err := client.Subscribe(context.Background(), "statediff", statusChan, "streamWrites") - return writeSub{sub, statusChan}, err -} - -func (ws writeSub) await(job statediff.JobID, timeout time.Duration) (bool, error) { +func (ws writeSub) awaitStatus(job statediff.JobID, timeout time.Duration) (bool, error) { + deadline := time.After(timeout) for { select { - case err := <-ws.sub.Err(): - return false, err - case status := <-ws.statusChan: + case status := <-ws.ch: if status.Err != nil { return false, status.Err } if status.ID == job { return true, nil } - case <-time.After(timeout): + case <-deadline: return false, errors.New("timeout") } } @@ -349,21 +295,20 @@ func TestWriteStateDiffAt(t *testing.T) { blockChain.SetBlockForNumber(testBlock1, testBlock1.NumberU64()) blockChain.SetReceiptsForHash(testBlock1.Hash(), testReceipts1) - service := statediff.NewService(&blockChain, statediff.Config{}, &mocks.Backend{}, &indexer) - service.Builder = &builder - - // delay to avoid subscription request being sent after statediff is written, - // and timeout to prevent hanging just in case it still happens - writeDelay := 100 * time.Millisecond - jobTimeout := 200 * time.Millisecond - client := makeClient(service) - defer client.Close() - - ws, err := subscribeWrites(client) + service, err := statediff.NewService(statediff.Config{}, &blockChain, &mocks.Backend{}, &indexer) require.NoError(t, err) + service.Builder = &builder + api := statediff.NewPublicAPI(service) + + // delay to avoid subscription request being sent after statediff is written + writeDelay := 200 * time.Millisecond + // timeout to prevent hanging just in case it still happens + jobTimeout := 2 * time.Second + + ws := subscribeWritesService(t, api) time.Sleep(writeDelay) job := service.WriteStateDiffAt(testBlock1.NumberU64(), defaultParams) - ok, err := ws.await(job, jobTimeout) + ok, err := ws.awaitStatus(job, jobTimeout) require.NoError(t, err) require.True(t, ok) @@ -372,40 +317,28 @@ func TestWriteStateDiffAt(t *testing.T) { require.Equal(t, parentBlock1.Root(), builder.Args.OldStateRoot) require.Equal(t, testBlock1.Root(), builder.Args.NewStateRoot) - // unsubscribe and verify we get nothing - // TODO - StreamWrites receives EOF error after unsubscribing. Doesn't seem to impact - // anything but would be good to know why. - ws.sub.Unsubscribe() - time.Sleep(writeDelay) + // verify we get nothing after unsubscribing + ws.unsubscribe() job = service.WriteStateDiffAt(testBlock1.NumberU64(), defaultParams) - ok, _ = ws.await(job, jobTimeout) + ok, _ = ws.awaitStatus(job, jobTimeout) require.False(t, ok) - client.Close() - client = makeClient(service) - // re-subscribe and test again - ws, err = subscribeWrites(client) - require.NoError(t, err) + ws = subscribeWritesService(t, api) time.Sleep(writeDelay) job = service.WriteStateDiffAt(testBlock1.NumberU64(), defaultParams) - ok, err = ws.await(job, jobTimeout) + ok, err = ws.awaitStatus(job, jobTimeout) require.NoError(t, err) require.True(t, ok) } -func TestWaitForSync(t *testing.T) { - testWaitForSync(t) - testGetSyncStatus(t) -} - // This function will create a backend and service object which includes a generic Backend -func createServiceWithMockBackend(curBlock uint64, highestBlock uint64) (*mocks.Backend, *statediff.Service) { +func createServiceWithMockBackend(t *testing.T, curBlock uint64, highestBlock uint64) (*mocks.Backend, *statediff.Service) { builder := mocks.Builder{} blockChain := mocks.BlockChain{} - backend := mocks.Backend{ + backend := mocks.NewBackend(t, ethereum.SyncProgress{ StartingBlock: 1, - CurrBlock: curBlock, + CurrentBlock: curBlock, HighestBlock: highestBlock, SyncedAccounts: 5, SyncedAccountBytes: 5, @@ -419,117 +352,54 @@ func createServiceWithMockBackend(curBlock uint64, highestBlock uint64) (*mocks. HealedBytecodeBytes: 5, HealingTrienodes: 5, HealingBytecode: 5, - } + }) service := &statediff.Service{ - Mutex: sync.Mutex{}, Builder: &builder, BlockChain: &blockChain, QuitChan: make(chan bool), - Subscriptions: make(map[common.Hash]map[rpc.ID]statediff.Subscription), + Subscriptions: make(map[common.Hash]map[statediff.SubID]statediff.Subscription), SubscriptionTypes: make(map[common.Hash]statediff.Params), BlockCache: statediff.NewBlockCache(1), - BackendAPI: &backend, - WaitForSync: true, + BackendAPI: backend, + ShouldWaitForSync: true, } - return &backend, service + return backend, service } -// This function will test to make sure that the state diff waits -// until the blockchain has caught up to head! -func testWaitForSync(t *testing.T) { - t.Log("Starting Sync") - _, service := createServiceWithMockBackend(10, 10) - err := service.WaitingForSync() - if err != nil { - t.Fatal("Sync Failed") - } - t.Log("Sync Complete") -} +// TestWaitForSync ensures that the service waits until the blockchain has caught up to head +func TestWaitForSync(t *testing.T) { + // Trivial case + _, service := createServiceWithMockBackend(t, 10, 10) + service.WaitForSync() -// This test will run the WaitForSync() at the start of the execusion -// It will then incrementally increase the currentBlock to match the highestBlock -// At each interval it will run the GetSyncStatus to ensure that the return value is not false. -// It will also check to make sure that the WaitForSync() function has not completed! -func testGetSyncStatus(t *testing.T) { - t.Log("Starting Get Sync Status Test") + // Catching-up case var highestBlock uint64 = 5 - // Create a backend and a service - // the backend is lagging behind the sync. - backend, service := createServiceWithMockBackend(0, highestBlock) - - checkSyncComplete := make(chan int, 1) + // Create a service and a backend that is lagging behind the sync. + backend, service := createServiceWithMockBackend(t, 0, highestBlock) + syncComplete := make(chan int, 1) go func() { - // Start the sync function which will wait for the sync - // Once the sync is complete add a value to the checkSyncComplet channel - t.Log("Starting Sync") - err := service.WaitingForSync() - if err != nil { - t.Error("Sync Failed") - checkSyncComplete <- 1 - } - t.Log("We have finally synced!") - checkSyncComplete <- 0 + service.WaitForSync() + syncComplete <- 0 }() - tables := []struct { - currentBlock uint64 - highestBlock uint64 - }{ - {1, highestBlock}, - {2, highestBlock}, - {3, highestBlock}, - {4, highestBlock}, - {5, highestBlock}, + // Iterate blocks, updating the current synced block + for currentBlock := uint64(0); currentBlock <= highestBlock; currentBlock++ { + backend.SetCurrentBlock(currentBlock) + if currentBlock < highestBlock { + // Ensure we are still waiting if we haven't actually reached head + require.Equal(t, len(syncComplete), 0) + } } - time.Sleep(2 * time.Second) - for _, table := range tables { - // Iterate over each block - // Once the highest block reaches the current block the sync should complete - - // Update the backend current block value - t.Log("Updating Current Block to: ", table.currentBlock) - backend.CurrBlock = table.currentBlock - pubEthAPI := ethapi.NewEthereumAPI(service.BackendAPI) - syncStatus, err := service.GetSyncStatus(pubEthAPI) - - if err != nil { - t.Fatal("Sync Failed") - } - - time.Sleep(2 * time.Second) - - // Make sure if syncStatus is false that WaitForSync has completed! - if !syncStatus && len(checkSyncComplete) == 0 { - t.Error("Sync is complete but WaitForSync is not") - } - - if syncStatus && len(checkSyncComplete) == 1 { - t.Error("Sync is not complete but WaitForSync is") - } - - // Make sure sync hasn't completed and that the checkSyncComplete channel is empty - if syncStatus && len(checkSyncComplete) == 0 { - continue - } - - // This code will only be run if the sync is complete and the WaitForSync function is complete - - // If syncstatus is complete, make sure that the blocks match - if !syncStatus && table.currentBlock != table.highestBlock { - t.Errorf("syncStatus indicated sync was complete even when current block, %d, and highest block %d aren't equal", - table.currentBlock, table.highestBlock) - } - - // Make sure that WaitForSync completed once the current block caught up to head! - checkSyncCompleteVal := <-checkSyncComplete - if checkSyncCompleteVal != 0 { - t.Errorf("syncStatus indicated sync was complete but the checkSyncComplete has a value of %d", - checkSyncCompleteVal) - } else { - t.Log("Test Passed!") + timeout := time.After(time.Second) + for { + select { + case <-syncComplete: + return + case <-timeout: + t.Fatal("timed out waiting for sync to complete") } } } diff --git a/test/compose.yml b/test/compose.yml new file mode 100644 index 0000000..ec4a5dc --- /dev/null +++ b/test/compose.yml @@ -0,0 +1,27 @@ +version: "3.2" + +services: + migrations: + restart: on-failure + depends_on: + - ipld-eth-db + image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.2-alpha + environment: + DATABASE_USER: "vdbm" + DATABASE_NAME: "cerc_testing" + DATABASE_PASSWORD: "password" + DATABASE_HOSTNAME: "ipld-eth-db" + DATABASE_PORT: 5432 + + ipld-eth-db: + image: timescale/timescaledb:latest-pg14 + restart: always + command: ["postgres", "-c", "log_statement=all"] + environment: + POSTGRES_USER: "vdbm" + POSTGRES_DB: "cerc_testing" + POSTGRES_PASSWORD: "password" + ports: + - "127.0.0.1:8077:5432" + volumes: + - ../indexer/database/file:/file_indexer diff --git a/test_helpers/builder.go b/test_helpers/builder.go new file mode 100644 index 0000000..66a11d4 --- /dev/null +++ b/test_helpers/builder.go @@ -0,0 +1,71 @@ +package test_helpers + +import ( + "bytes" + "encoding/json" + "sort" + "testing" + + "github.com/cerc-io/plugeth-statediff" + sdtypes "github.com/cerc-io/plugeth-statediff/types" + "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" + "github.com/ethereum/go-ethereum/rlp" + "github.com/stretchr/testify/require" +) + +type TestCase struct { + Name string + Args statediff.Args + Expected *sdtypes.StateObject +} + +type CheckedRoots = map[*types.Block][]byte + +func RunBuilderTests( + t *testing.T, + builder statediff.Builder, + tests []TestCase, + params statediff.Params, + roots CheckedRoots, +) { + for _, test := range tests { + diff, err := builder.BuildStateDiffObject(test.Args, params) + if err != nil { + t.Error(err) + } + receivedStateDiffRlp, err := rlp.EncodeToBytes(&diff) + if err != nil { + t.Error(err) + } + expectedStateDiffRlp, err := rlp.EncodeToBytes(test.Expected) + if err != nil { + t.Error(err) + } + sort.Slice(receivedStateDiffRlp, func(i, j int) bool { + return receivedStateDiffRlp[i] < receivedStateDiffRlp[j] + }) + sort.Slice(expectedStateDiffRlp, func(i, j int) bool { + return expectedStateDiffRlp[i] < expectedStateDiffRlp[j] + }) + if !bytes.Equal(receivedStateDiffRlp, expectedStateDiffRlp) { + actualb, err := json.Marshal(diff) + require.NoError(t, err) + expectedb, err := json.Marshal(test.Expected) + require.NoError(t, err) + + var expected, actual interface{} + err = json.Unmarshal(expectedb, &expected) + require.NoError(t, err) + err = json.Unmarshal(actualb, &actual) + require.NoError(t, err) + + require.Equal(t, expected, actual, test.Name) + } + } + // Let's also confirm that our root state nodes form the state root hash in the headers + for block, node := range roots { + require.Equal(t, block.Root(), crypto.Keccak256Hash(node), + "expected root does not match actual root", block.Number()) + } +} diff --git a/test_helpers/helpers.go b/test_helpers/helpers.go index e5ec0c1..24f9439 100644 --- a/test_helpers/helpers.go +++ b/test_helpers/helpers.go @@ -27,6 +27,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/params" + + "github.com/cerc-io/plugeth-statediff/utils" ) func GenesisBlockForTesting(db ethdb.Database, addr common.Address, balance, baseFee *big.Int, initialGasLimit uint64) *types.Block { @@ -65,7 +67,7 @@ func TestSelfDestructChainGen(i int, block *core.BlockGen) { // Block 2 is mined by TestBankAddress // TestBankAddress self-destructs the contract block.SetCoinbase(TestBankAddress) - data := common.Hex2Bytes("43D726D6") + data := utils.Hex2Bytes("43D726D6") tx, _ := types.SignTx(types.NewTransaction(1, ContractAddr, big.NewInt(0), 100000, big.NewInt(params.GWei), data), signer, TestBankKey) block.AddTx(tx) } @@ -97,7 +99,7 @@ func TestChainGen(i int, block *core.BlockGen) { block.SetCoinbase(Account2Addr) //put function: c16431b9 //close function: 43d726d6 - data := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003") + data := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003") tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), ContractAddr, big.NewInt(0), params.TxGasContractCreation, big.NewInt(params.GWei), data), signer, TestBankKey) block.AddTx(tx) case 3: @@ -105,9 +107,9 @@ func TestChainGen(i int, block *core.BlockGen) { // Two set the two original slot positions to 0 and one sets another position to a new value // Block 4 is mined by Account2Addr block.SetCoinbase(Account2Addr) - data1 := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") - data2 := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000") - data3 := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000009") + data1 := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") + data2 := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000") + data3 := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000009") nonce := block.TxNonce(TestBankAddress) tx1, _ := types.SignTx(types.NewTransaction(nonce, ContractAddr, big.NewInt(0), 100000, big.NewInt(params.InitialBaseFee), data1), signer, TestBankKey) @@ -123,8 +125,8 @@ func TestChainGen(i int, block *core.BlockGen) { // It sets the one storage value to zero and the other to new value. // Block 5 is mined by Account1Addr block.SetCoinbase(Account1Addr) - data1 := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000") - data2 := common.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003") + data1 := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000") + data2 := utils.Hex2Bytes("C16431B900000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003") nonce := block.TxNonce(TestBankAddress) tx1, _ := types.SignTx(types.NewTransaction(nonce, ContractAddr, big.NewInt(0), 100000, big.NewInt(params.InitialBaseFee), data1), signer, TestBankKey) nonce++ @@ -135,7 +137,7 @@ func TestChainGen(i int, block *core.BlockGen) { // Block 6 has a tx from Account1Key which self-destructs the contract, it transfers no value // Block 6 is mined by Account2Addr block.SetCoinbase(Account2Addr) - data := common.Hex2Bytes("43D726D6") + data := utils.Hex2Bytes("43D726D6") tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(Account1Addr), ContractAddr, big.NewInt(0), 100000, big.NewInt(params.InitialBaseFee), data), signer, Account1Key) block.AddTx(tx) } @@ -158,8 +160,8 @@ func TestChainGenWithInternalLeafNode(i int, block *core.BlockGen) { // Block 3 has two transactions which set slots 223 and 648 with small values // The goal here is to induce a branch node with an internalized leaf node block.SetCoinbase(TestBankAddress) - data1 := common.Hex2Bytes("C16431B90000000000000000000000000000000000000000000000000000000000009dab0000000000000000000000000000000000000000000000000000000000000001") - data2 := common.Hex2Bytes("C16431B90000000000000000000000000000000000000000000000000000000000019c5d0000000000000000000000000000000000000000000000000000000000000002") + data1 := utils.Hex2Bytes("C16431B90000000000000000000000000000000000000000000000000000000000009dab0000000000000000000000000000000000000000000000000000000000000001") + data2 := utils.Hex2Bytes("C16431B90000000000000000000000000000000000000000000000000000000000019c5d0000000000000000000000000000000000000000000000000000000000000002") nonce := block.TxNonce(TestBankAddress) tx1, _ := types.SignTx(types.NewTransaction(nonce, ContractAddr, big.NewInt(0), 100000, big.NewInt(params.InitialBaseFee), data1), signer, TestBankKey) diff --git a/test_helpers/mocks/backend.go b/test_helpers/mocks/backend.go index 67c56d3..e750ae4 100644 --- a/test_helpers/mocks/backend.go +++ b/test_helpers/mocks/backend.go @@ -1,265 +1,74 @@ -// Copyright 2019 The go-ethereum Authors -// This file is part of the go-ethereum library. -// -// The go-ethereum library is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The go-ethereum library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with the go-ethereum library. If not, see . - package mocks import ( - "context" - "math/big" - "time" - - "github.com/ethereum/go-ethereum/internal/ethapi" + "testing" "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/golang/mock/gomock" + + plugeth "github.com/openrelayxyz/plugeth-utils/core" ) -var _ ethapi.Backend = &Backend{} - -// Builder is a mock state diff builder type Backend struct { - StartingBlock uint64 - CurrBlock uint64 - HighestBlock uint64 - SyncedAccounts uint64 - SyncedAccountBytes uint64 - SyncedBytecodes uint64 - SyncedBytecodeBytes uint64 - SyncedStorage uint64 - SyncedStorageBytes uint64 - HealedTrienodes uint64 - HealedTrienodeBytes uint64 - HealedBytecodes uint64 - HealedBytecodeBytes uint64 - HealingTrienodes uint64 - HealingBytecode uint64 + *MockBackend + downloader Downloader } -// General Ethereum API -func (backend *Backend) SyncProgress() ethereum.SyncProgress { - l := ethereum.SyncProgress{ - StartingBlock: backend.StartingBlock, - CurrentBlock: backend.CurrBlock, - HighestBlock: backend.HighestBlock, - SyncedAccounts: backend.SyncedAccounts, - SyncedAccountBytes: backend.SyncedAccountBytes, - SyncedBytecodes: backend.SyncedBytecodes, - SyncedBytecodeBytes: backend.SyncedBytecodeBytes, - SyncedStorage: backend.SyncedStorage, - SyncedStorageBytes: backend.SyncedStorageBytes, - HealedTrienodes: backend.HealedTrienodes, - HealedTrienodeBytes: backend.HealedTrienodeBytes, - HealedBytecodes: backend.HealedBytecodes, - HealedBytecodeBytes: backend.HealedBytecodeBytes, - HealingTrienodes: backend.HealingTrienodes, - HealingBytecode: backend.HealingBytecode, +type Downloader struct { + ethereum.SyncProgress +} + +var _ plugeth.Backend = &Backend{} +var _ plugeth.Downloader = &Downloader{} + +func NewBackend(t *testing.T, progress ethereum.SyncProgress) *Backend { + ctl := gomock.NewController(t) + dler := Downloader{progress} + ret := &Backend{ + MockBackend: NewMockBackend(ctl), + downloader: dler, } - return l + ret.EXPECT().Downloader().Return(&ret.downloader).AnyTimes() + return ret } -func (backend *Backend) SuggestGasTipCap(ctx context.Context) (*big.Int, error) { - panic("not implemented") // TODO: Implement +func (b *Backend) SetCurrentBlock(block uint64) { + b.downloader.SyncProgress.CurrentBlock = block } -func (backend *Backend) FeeHistory(ctx context.Context, blockCount uint64, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*big.Int, [][]*big.Int, []*big.Int, []float64, error) { - panic("implement me") +func (d Downloader) Progress() plugeth.Progress { + return d } -func (backend *Backend) ChainDb() ethdb.Database { - panic("not implemented") // TODO: Implement -} +func (d Downloader) StartingBlock() uint64 { return d.SyncProgress.StartingBlock } +func (d Downloader) CurrentBlock() uint64 { return d.SyncProgress.CurrentBlock } +func (d Downloader) HighestBlock() uint64 { return d.SyncProgress.HighestBlock } +func (d Downloader) PulledStates() uint64 { return d.SyncProgress.PulledStates } +func (d Downloader) KnownStates() uint64 { return d.SyncProgress.KnownStates } +func (d Downloader) SyncedAccounts() uint64 { return d.SyncProgress.SyncedAccounts } +func (d Downloader) SyncedAccountBytes() uint64 { return d.SyncProgress.SyncedAccountBytes } +func (d Downloader) SyncedBytecodes() uint64 { return d.SyncProgress.SyncedBytecodes } +func (d Downloader) SyncedBytecodeBytes() uint64 { return d.SyncProgress.SyncedBytecodeBytes } +func (d Downloader) SyncedStorage() uint64 { return d.SyncProgress.SyncedStorage } +func (d Downloader) SyncedStorageBytes() uint64 { return d.SyncProgress.SyncedStorageBytes } +func (d Downloader) HealedTrienodes() uint64 { return d.SyncProgress.HealedTrienodes } +func (d Downloader) HealedTrienodeBytes() uint64 { return d.SyncProgress.HealedTrienodeBytes } +func (d Downloader) HealedBytecodes() uint64 { return d.SyncProgress.HealedBytecodes } +func (d Downloader) HealedBytecodeBytes() uint64 { return d.SyncProgress.HealedBytecodeBytes } +func (d Downloader) HealingTrienodes() uint64 { return d.SyncProgress.HealingTrienodes } +func (d Downloader) HealingBytecode() uint64 { return d.SyncProgress.HealingBytecode } -func (backend *Backend) AccountManager() *accounts.Manager { - panic("not implemented") // TODO: Implement -} +func TestBackend(t *testing.T) { + b := NewBackend(t, ethereum.SyncProgress{StartingBlock: 42}) -func (backend *Backend) ExtRPCEnabled() bool { - panic("not implemented") // TODO: Implement -} + block := b.Downloader().Progress().StartingBlock() + if 42 != block { + t.Fatalf("wrong StartingBlock; expected %d, got %d", 42, block) + } -func (backend *Backend) RPCGasCap() uint64 { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) RPCEVMTimeout() time.Duration { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) RPCTxFeeCap() float64 { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) UnprotectedAllowed() bool { - panic("not implemented") // TODO: Implement -} - -// Blockchain API -func (backend *Backend) SetHead(number uint64) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) HeaderByHash(ctx context.Context, hash common.Hash) (*types.Header, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) HeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*types.Header, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) CurrentHeader() *types.Header { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) CurrentBlock() *types.Header { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Block, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) BlockByHash(ctx context.Context, hash common.Hash) (*types.Block, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) BlockByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*types.Block, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) StateAndHeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (*state.StateDB, *types.Header, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetReceipts(ctx context.Context, hash common.Hash) (types.Receipts, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetBody(ctx context.Context, hash common.Hash, number rpc.BlockNumber) (*types.Body, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetTd(ctx context.Context, hash common.Hash) *big.Int { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetEVM(ctx context.Context, msg *core.Message, state *state.StateDB, header *types.Header, vmConfig *vm.Config) (*vm.EVM, func() error, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event.Subscription { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeChainSideEvent(ch chan<- core.ChainSideEvent) event.Subscription { - panic("not implemented") // TODO: Implement -} - -// Transaction pool API -func (backend *Backend) SendTx(ctx context.Context, signedTx *types.Transaction) error { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetTransaction(ctx context.Context, txHash common.Hash) (*types.Transaction, common.Hash, uint64, uint64, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetPoolTransactions() (types.Transactions, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetPoolTransaction(txHash common.Hash) *types.Transaction { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetPoolNonce(ctx context.Context, addr common.Address) (uint64, error) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) Stats() (pending int, queued int) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) TxPoolContent() (map[common.Address]types.Transactions, map[common.Address]types.Transactions) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) TxPoolContentFrom(addr common.Address) (types.Transactions, types.Transactions) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeNewTxsEvent(_ chan<- core.NewTxsEvent) event.Subscription { - panic("not implemented") // TODO: Implement -} - -// Filter API -func (backend *Backend) BloomStatus() (uint64, uint64) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) GetLogs(ctx context.Context, blockHash common.Hash, number uint64) ([][]*types.Log, error) { - panic("not implemented") -} - -func (backend *Backend) ServiceFilter(ctx context.Context, session *bloombits.MatcherSession) { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeLogsEvent(ch chan<- []*types.Log) event.Subscription { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribePendingLogsEvent(ch chan<- []*types.Log) event.Subscription { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent) event.Subscription { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) ChainConfig() *params.ChainConfig { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) Engine() consensus.Engine { - panic("not implemented") // TODO: Implement -} - -func (backend *Backend) PendingBlockAndReceipts() (*types.Block, types.Receipts) { - return nil, nil + b.SetCurrentBlock(420) + block = b.Downloader().Progress().CurrentBlock() + if 420 != block { + t.Fatalf("wrong CurrentBlock; expected %d, got %d", 420, block) + } } diff --git a/test_helpers/mocks/backend_test.go b/test_helpers/mocks/backend_test.go new file mode 100644 index 0000000..3f323e0 --- /dev/null +++ b/test_helpers/mocks/backend_test.go @@ -0,0 +1,17 @@ +package mocks_test + +import ( + "testing" + + "github.com/cerc-io/plugeth-statediff/test_helpers/mocks" + "github.com/ethereum/go-ethereum" +) + +func TestBackend(t *testing.T) { + startingblock := uint64(42) + b := mocks.NewBackend(t, ethereum.SyncProgress{StartingBlock: startingblock}) + block := b.Downloader().Progress().StartingBlock() + if startingblock != block { + t.Fatalf("wrong StartingBlock; expected %d, got %d", startingblock, block) + } +} diff --git a/test_helpers/mocks/blockchain.go b/test_helpers/mocks/blockchain.go index 5e62c5a..c864403 100644 --- a/test_helpers/mocks/blockchain.go +++ b/test_helpers/mocks/blockchain.go @@ -21,8 +21,7 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/core/state" - + "github.com/cerc-io/plugeth-statediff/adapt" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" @@ -68,7 +67,7 @@ func (bc *BlockChain) SetChainEvents(chainEvents []core.ChainEvent) { // SubscribeChainEvent mock method func (bc *BlockChain) SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription { - subErr := errors.New("subscription error") + subErr := errors.New("mock subscription error") var eventCounter int subscription := event.NewSubscription(func(quit <-chan struct{}) error { @@ -150,8 +149,9 @@ func (bc *BlockChain) SetTd(hash common.Hash, blockNum uint64, td *big.Int) { bc.TDByNum[blockNum] = td } -func (bc *BlockChain) UnlockTrie(root common.Hash) {} +// func (bc *BlockChain) UnlockTrie(root core.Hash) {} -func (bc *BlockChain) StateCache() state.Database { +// TODO +func (bc *BlockChain) StateCache() adapt.StateView { return nil } diff --git a/test_helpers/mocks/builder.go b/test_helpers/mocks/builder.go index f50c4e9..c446a29 100644 --- a/test_helpers/mocks/builder.go +++ b/test_helpers/mocks/builder.go @@ -17,9 +17,8 @@ package mocks import ( - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/statediff" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + statediff "github.com/cerc-io/plugeth-statediff" + sdtypes "github.com/cerc-io/plugeth-statediff/types" ) var _ statediff.Builder = &Builder{} @@ -29,8 +28,6 @@ type Builder struct { Args statediff.Args Params statediff.Params stateDiff sdtypes.StateObject - block *types.Block - stateTrie sdtypes.StateObject builderError error } @@ -50,19 +47,12 @@ func (builder *Builder) WriteStateDiffObject(args statediff.Args, params statedi return builder.builderError } -// BuildStateTrieObject mock method -func (builder *Builder) BuildStateTrieObject(block *types.Block) (sdtypes.StateObject, error) { - builder.block = block - - return builder.stateTrie, builder.builderError -} - // SetStateDiffToBuild mock method func (builder *Builder) SetStateDiffToBuild(stateDiff sdtypes.StateObject) { builder.stateDiff = stateDiff } // SetBuilderError mock method -func (builder *Builder) SetBuilderError(err error) { +func (builder *Builder) SetError(err error) { builder.builderError = err } diff --git a/test_helpers/mocks/indexer.go b/test_helpers/mocks/indexer.go index 0524fbc..1ad5baa 100644 --- a/test_helpers/mocks/indexer.go +++ b/test_helpers/mocks/indexer.go @@ -22,8 +22,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/statediff/indexer/interfaces" - sdtypes "github.com/ethereum/go-ethereum/statediff/types" + + "github.com/cerc-io/plugeth-statediff/indexer/interfaces" + sdtypes "github.com/cerc-io/plugeth-statediff/types" ) var _ interfaces.StateDiffIndexer = &StateDiffIndexer{} @@ -48,9 +49,7 @@ func (sdi *StateDiffIndexer) PushIPLD(txi interfaces.Batch, ipld sdtypes.IPLD) e func (sdi *StateDiffIndexer) ReportDBMetrics(delay time.Duration, quit <-chan bool) {} -func (sdi *StateDiffIndexer) LoadWatchedAddresses() ([]common.Address, error) { - return nil, nil -} +func (sdi *StateDiffIndexer) LoadWatchedAddresses() ([]common.Address, error) { return nil, nil } func (sdi *StateDiffIndexer) InsertWatchedAddresses(addresses []sdtypes.WatchAddressArg, currentBlock *big.Int) error { return nil diff --git a/test_helpers/test_data.go b/test_helpers/test_data.go index 4389177..5147e58 100644 --- a/test_helpers/test_data.go +++ b/test_helpers/test_data.go @@ -25,6 +25,8 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/rlp" + + "github.com/cerc-io/plugeth-statediff/utils" ) // AddressToLeafKey hashes an returns an address @@ -47,7 +49,7 @@ var ( NullCodeHash = crypto.Keccak256Hash([]byte{}) StoragePath = common.HexToHash("0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470").Bytes() StorageKey = common.HexToHash("0000000000000000000000000000000000000000000000000000000000000001").Bytes() - StorageValue = common.Hex2Bytes("0x03") + StorageValue = utils.Hex2Bytes("0x03") NullHash = common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000") Testdb = rawdb.NewMemoryDatabase() @@ -64,11 +66,11 @@ var ( Account2Addr = crypto.PubkeyToAddress(Account2Key.PublicKey) //0x0D3ab14BBaD3D99F4203bd7a11aCB94882050E7e Account1LeafKey = AddressToLeafKey(Account1Addr) Account2LeafKey = AddressToLeafKey(Account2Addr) - ContractCode = common.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040518060200160405280600160ff16815250600190600161007492919061007a565b506100e4565b82606481019282156100ae579160200282015b828111156100ad578251829060ff1690559160200191906001019061008d565b5b5090506100bb91906100bf565b5090565b6100e191905b808211156100dd5760008160009055506001016100c5565b5090565b90565b6101ca806100f36000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101746022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b806001836064811061016a57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a72305820e3747183708fb6bff3f6f7a80fb57dcc1c19f83f9cb25457a3ed5c0424bde66864736f6c634300050a0032") - ByteCodeAfterDeployment = common.Hex2Bytes("608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101746022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b806001836064811061016a57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a72305820e3747183708fb6bff3f6f7a80fb57dcc1c19f83f9cb25457a3ed5c0424bde66864736f6c634300050a0032") + ContractCode = utils.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040518060200160405280600160ff16815250600190600161007492919061007a565b506100e4565b82606481019282156100ae579160200282015b828111156100ad578251829060ff1690559160200191906001019061008d565b5b5090506100bb91906100bf565b5090565b6100e191905b808211156100dd5760008160009055506001016100c5565b5090565b90565b6101ca806100f36000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101746022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b806001836064811061016a57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a72305820e3747183708fb6bff3f6f7a80fb57dcc1c19f83f9cb25457a3ed5c0424bde66864736f6c634300050a0032") + ByteCodeAfterDeployment = utils.Hex2Bytes("608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101746022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b806001836064811061016a57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a72305820e3747183708fb6bff3f6f7a80fb57dcc1c19f83f9cb25457a3ed5c0424bde66864736f6c634300050a0032") CodeHash = common.HexToHash("0xaaea5efba4fd7b45d7ec03918ac5d8b31aa93b48986af0e6b591f0f087c80127") - ContractCodeForInternalLeafNode = common.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040518060200160405280600160ff16815250600190600161007492919061007a565b506100e6565b8262019c5e81019282156100b0579160200282015b828111156100af578251829060ff1690559160200191906001019061008f565b5b5090506100bd91906100c1565b5090565b6100e391905b808211156100df5760008160009055506001016100c7565b5090565b90565b6101cc806100f56000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101766022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018362019c5e811061016c57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582007250e2c86ac8989891c4aa9c4737119491578200b9104c574143607ed71642b64736f6c63430005110032") - ByteCodeAfterDeploymentForInternalLeafNode = common.Hex2Bytes("608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101766022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018362019c5e811061016c57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582007250e2c86ac8989891c4aa9c4737119491578200b9104c574143607ed71642b64736f6c63430005110032") + ContractCodeForInternalLeafNode = utils.Hex2Bytes("608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506040518060200160405280600160ff16815250600190600161007492919061007a565b506100e6565b8262019c5e81019282156100b0579160200282015b828111156100af578251829060ff1690559160200191906001019061008f565b5b5090506100bd91906100c1565b5090565b6100e391905b808211156100df5760008160009055506001016100c7565b5090565b90565b6101cc806100f56000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101766022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018362019c5e811061016c57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582007250e2c86ac8989891c4aa9c4737119491578200b9104c574143607ed71642b64736f6c63430005110032") + ByteCodeAfterDeploymentForInternalLeafNode = utils.Hex2Bytes("608060405234801561001057600080fd5b50600436106100365760003560e01c806343d726d61461003b578063c16431b914610045575b600080fd5b61004361007d565b005b61007b6004803603604081101561005b57600080fd5b81019080803590602001909291908035906020019092919050505061015c565b005b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610122576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260228152602001806101766022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018362019c5e811061016c57fe5b0181905550505056fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a7231582007250e2c86ac8989891c4aa9c4737119491578200b9104c574143607ed71642b64736f6c63430005110032") CodeHashForInternalizedLeafNode = common.HexToHash("8327d45b7e6ffe26fc9728db4cd3c1c8177f7af2de0d31dfe5435e83101db04f") ContractAddr common.Address diff --git a/trie_helpers/helpers.go b/trie_helpers/helpers.go index d6c024e..13199bb 100644 --- a/trie_helpers/helpers.go +++ b/trie_helpers/helpers.go @@ -24,9 +24,9 @@ import ( "strings" "time" - metrics2 "github.com/ethereum/go-ethereum/statediff/indexer/database/metrics" + metrics2 "github.com/cerc-io/plugeth-statediff/indexer/database/metrics" - "github.com/ethereum/go-ethereum/statediff/types" + "github.com/cerc-io/plugeth-statediff/types" ) // SortKeys sorts the keys in the account map diff --git a/utils/bytes.go b/utils/bytes.go new file mode 100644 index 0000000..d328cdb --- /dev/null +++ b/utils/bytes.go @@ -0,0 +1,26 @@ +package utils + +import "encoding/hex" + +// FromHex returns the bytes represented by the hexadecimal string s. +// s may be prefixed with "0x". +func FromHex(s string) []byte { + if has0xPrefix(s) { + s = s[2:] + } + if len(s)%2 == 1 { + s = "0" + s + } + return Hex2Bytes(s) +} + +// has0xPrefix validates str begins with '0x' or '0X'. +func has0xPrefix(str string) bool { + return len(str) >= 2 && str[0] == '0' && (str[1] == 'x' || str[1] == 'X') +} + +// Hex2Bytes returns the bytes represented by the hexadecimal string str. +func Hex2Bytes(str string) []byte { + h, _ := hex.DecodeString(str) + return h +} diff --git a/utils/encoding.go b/utils/encoding.go new file mode 100644 index 0000000..f6b70ce --- /dev/null +++ b/utils/encoding.go @@ -0,0 +1,64 @@ +package utils + +// HexToCompact converts a hex path to the compact encoded format +func HexToCompact(hex []byte) []byte { + return hexToCompact(hex) +} + +func hexToCompact(hex []byte) []byte { + terminator := byte(0) + if hasTerm(hex) { + terminator = 1 + hex = hex[:len(hex)-1] + } + buf := make([]byte, len(hex)/2+1) + buf[0] = terminator << 5 // the flag byte + if len(hex)&1 == 1 { + buf[0] |= 1 << 4 // odd flag + buf[0] |= hex[0] // first nibble is contained in the first byte + hex = hex[1:] + } + decodeNibbles(hex, buf[1:]) + return buf +} + +// CompactToHex converts a compact encoded path to hex format +func CompactToHex(compact []byte) []byte { + return compactToHex(compact) +} + +func compactToHex(compact []byte) []byte { + if len(compact) == 0 { + return compact + } + base := KeybytesToHex(compact) + // delete terminator flag + if base[0] < 2 { + base = base[:len(base)-1] + } + // apply odd flag + chop := 2 - base[0]&1 + return base[chop:] +} + +func KeybytesToHex(str []byte) []byte { + l := len(str)*2 + 1 + var nibbles = make([]byte, l) + for i, b := range str { + nibbles[i*2] = b / 16 + nibbles[i*2+1] = b % 16 + } + nibbles[l-1] = 16 + return nibbles +} + +func decodeNibbles(nibbles []byte, bytes []byte) { + for bi, ni := 0, 0; ni < len(nibbles); bi, ni = bi+1, ni+2 { + bytes[bi] = nibbles[ni]<<4 | nibbles[ni+1] + } +} + +// hasTerm returns whether a hex key has the terminator flag. +func hasTerm(s []byte) bool { + return len(s) > 0 && s[len(s)-1] == 16 +} diff --git a/utils/iterator.go b/utils/iterator.go new file mode 100644 index 0000000..d4b585b --- /dev/null +++ b/utils/iterator.go @@ -0,0 +1 @@ +package utils diff --git a/utils/log/log.go b/utils/log/log.go new file mode 100644 index 0000000..e113bbf --- /dev/null +++ b/utils/log/log.go @@ -0,0 +1,73 @@ +package log + +import ( + // geth_log "github.com/ethereum/go-ethereum/log" + "github.com/inconshreveable/log15" + "github.com/openrelayxyz/plugeth-utils/core" +) + +type Logger = core.Logger + +var ( + DefaultLogger core.Logger + + TestLogger = Log15Logger() +) + +func init() { + // The plugeth logger is only initialized with the geth runtime, + // but tests expect to have a logger available, so default to this. + DefaultLogger = TestLogger +} + +func Trace(m string, a ...interface{}) { DefaultLogger.Trace(m, a...) } +func Debug(m string, a ...interface{}) { DefaultLogger.Debug(m, a...) } +func Info(m string, a ...interface{}) { DefaultLogger.Info(m, a...) } +func Warn(m string, a ...interface{}) { DefaultLogger.Warn(m, a...) } +func Crit(m string, a ...interface{}) { DefaultLogger.Crit(m, a...) } +func Error(m string, a ...interface{}) { DefaultLogger.Error(m, a...) } + +func SetDefaultLogger(l core.Logger) { + // gethlogger, ok := l.(geth_log.Logger) + // if !ok { + // panic("not a geth Logger") + // } + DefaultLogger = l +} + +// Log15Logger returns a logger satisfying the same interface as geth's +func Log15Logger(ctx ...interface{}) wrapLog15 { + return wrapLog15{log15.New(ctx...)} +} + +type wrapLog15 struct{ log15.Logger } + +func (l wrapLog15) New(ctx ...interface{}) Logger { + return wrapLog15{l.Logger.New(ctx...)} +} + +func (l wrapLog15) Trace(m string, a ...interface{}) { + l.Logger.Debug(m, a...) +} + +func (l wrapLog15) SetLevel(lvl int) { + l.SetHandler(log15.LvlFilterHandler(log15.Lvl(lvl), l.GetHandler())) +} + +// New returns a Logger that includes the contextual args in all output +// (workaround for missing method in plugeth) +func New(ctx ...interface{}) Logger { + return ctxLogger{DefaultLogger, ctx} +} + +type ctxLogger struct { + base Logger + ctx []interface{} +} + +func (l ctxLogger) Trace(m string, a ...interface{}) { l.base.Trace(m, append(l.ctx, a...)...) } +func (l ctxLogger) Debug(m string, a ...interface{}) { l.base.Debug(m, append(l.ctx, a...)...) } +func (l ctxLogger) Info(m string, a ...interface{}) { l.base.Info(m, append(l.ctx, a...)...) } +func (l ctxLogger) Warn(m string, a ...interface{}) { l.base.Warn(m, append(l.ctx, a...)...) } +func (l ctxLogger) Crit(m string, a ...interface{}) { l.base.Crit(m, append(l.ctx, a...)...) } +func (l ctxLogger) Error(m string, a ...interface{}) { l.base.Error(m, append(l.ctx, a...)...) } diff --git a/utils/trie.go b/utils/trie.go new file mode 100644 index 0000000..8c0e399 --- /dev/null +++ b/utils/trie.go @@ -0,0 +1,28 @@ +package utils + +import ( + "github.com/openrelayxyz/plugeth-utils/core" + plugeth_types "github.com/openrelayxyz/plugeth-utils/restricted/types" + + "github.com/ethereum/go-ethereum/core/types" +) + +type adaptTrieHasher struct { + types.TrieHasher +} + +func AdaptTrieHasher(th types.TrieHasher) plugeth_types.TrieHasher { + return &adaptTrieHasher{th} +} + +// TrieHasher is the tool used to calculate the hash of derivable list. +// This is internal, do not use. +type TrieHasher interface { + Reset() + Update([]byte, []byte) error + Hash() core.Hash +} + +func (ath *adaptTrieHasher) Hash() core.Hash { + return core.Hash(ath.TrieHasher.Hash()) +} diff --git a/utils/utils.go b/utils/utils.go new file mode 100644 index 0000000..5d22034 --- /dev/null +++ b/utils/utils.go @@ -0,0 +1,23 @@ +package utils + +import ( + "fmt" + "os" + + "github.com/ethereum/go-ethereum/rlp" +) + +// Fatalf formats a message to standard error and exits the program. +func Fatalf(format string, args ...interface{}) { + fmt.Fprintf(os.Stderr, "Fatal: "+format+"\n", args...) + os.Exit(1) +} + +func MustDecode[T any](buf []byte) *T { + var ret T + err := rlp.DecodeBytes(buf, &ret) + if err != nil { + panic(fmt.Errorf("error decoding RLP %T: %w", ret, err)) + } + return &ret +}