Upgrade to v5 schema (#32)

* refactor vulcanize => cerc
* update geth and cerc dependencies
* update packages, ginkgo
* refactor chain generation
* update integration tests, contract, makefile
* go embed contract code
* rm old readme
* move unit tests into package
* rm ginkgo where not needed
* use tx in ref integrity functions

.github/workflows/on-pr.yml

@@ -1,6 +1,6 @@
-name: Run all tests
+name: Run tests for PR
 on: [pull_request]
 
 jobs:
   run-tests:
-    uses: ./.github/workflows/tests.yml
+    uses: ./.github/workflows/test.yml

.github/workflows/test.yml

@@ -0,0 +1,57 @@
+name: Unit and integration tests
+on:
+  workflow_call:
+
+jobs:
+  unit-tests:
+    name: "Run unit tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+      - name: "Run DB container"
+        run: |
+          docker compose -f test/compose-db.yml up --wait --quiet-pull
+      - name: "Run tests"
+        run: |
+          go test -v ./pkg/...
+
+  integration-tests:
+    name: "Run integration tests"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
+          check-latest: true
+      - name: "Install stack-orchestrator"
+        uses: actions/checkout@v3
+        with:
+          repository: cerc-io/stack-orchestrator
+          ref: v1.1.0-ff616db-202305310811 # first tag with merged changes for this stack
+          path: ./stack-orchestrator
+      - run: pip install ./stack-orchestrator
+      - name: "Run testnet stack"
+        run: ./scripts/integration-setup.sh
+      - name: "Run contract deployer"
+        run: |
+          docker compose -f test/compose-deployer.yml up --wait --quiet-pull
+      - name: "Build package and wait for testnet"
+        run: |
+          go build ./... &
+          # Start validator at current head, but not before Merge (block 1 on test chain)
+          echo "Waiting for chain head to progress..."
+          while
+              height=$(./scripts/get-block-number.sh $ETH_HTTP_PATH)
+              [[ "$height" < 2 ]];
+          do sleep 5; done
+          echo "Chain has reached block $height"
+          echo VALIDATE_FROM_BLOCK=$height >> "$GITHUB_ENV"
+          wait $!
+      - name: "Run tests"
+        run: |
+          go test -v ./integration/...

.github/workflows/tests.yml

@@ -1,89 +0,0 @@
-name: Test the stack.
-on:
-  workflow_call:
-
-env:
-  STACK_ORCHESTRATOR_REF: "e62830c982d4dfc5f3c1c2b12c1754a7e9b538f1"
-  GO_ETHEREUM_REF: "v1.11.5-statediff-4.3.9-alpha" # Use the tag, we are going to download the bin not build it.
-  IPLD_ETH_DB_REF: "6c00c38cc4e1db6f7c4cecbb62fdfd540fba50d6"
-
-jobs:
-  integrationtest:
-    name: Run integration tests
-    env:
-      GOPATH: /tmp/go
-      DB_WRITE: true
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create GOPATH
-        run: mkdir -p /tmp/go
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.19.0"
-          check-latest: true
-
-      - uses: actions/checkout@v2
-        with:
-          path: "./ipld-eth-db-validator"
-
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.STACK_ORCHESTRATOR_REF }}
-          path: "./stack-orchestrator/"
-          repository: cerc-io/mshaw_stack_hack
-
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.IPLD_ETH_DB_REF }}
-          repository: cerc-io/ipld-eth-db
-          path: "./ipld-eth-db/"
-
-      - name: Create config file
-        run: |
-          echo vulcanize_test_contract=$GITHUB_WORKSPACE/ipld-eth-db-validator/test/contract >> ./config.sh
-          echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ >> ./config.sh
-          echo genesis_file_path=start-up-files/go-ethereum/genesis.json >> ./config.sh
-          echo db_write=$DB_WRITE >> ./config.sh
-          cat ./config.sh
-
-      - name: Download Geth
-        run: |
-          cd $GITHUB_WORKSPACE/stack-orchestrator/helper-scripts
-          wget https://git.vdb.to/api/packages/cerc-io/generic/go-ethereum/${{env.GO_ETHEREUM_REF}}/geth-linux-amd64
-
-      - name: Run docker compose
-        run: |
-          docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-contract.yml" \
-          --env-file "$GITHUB_WORKSPACE/config.sh" \
-          up -d --build
-
-      - name: Run integration test.
-        run: |
-          cd $GITHUB_WORKSPACE/ipld-eth-db-validator
-          ./scripts/run_integration_test.sh
-
-  unittest:
-    name: Run unit tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Create GOPATH
-        run: mkdir -p /tmp/go
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.19.0"
-          check-latest: true
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Spin up database
-        run: |
-          docker-compose up -d
-      - name: Run unit tests
-        run: |
-          sleep 30
-          PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8077 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing make test

Makefile

@@ -1,21 +1,19 @@
-BIN = $(GOPATH)/bin
-BASE = $(GOPATH)/src/$(PACKAGE)
-PKGS = go list ./... | grep -v "^vendor/"
+CONTRACTS_DIR := ./test/contract/contracts
+CONTRACTS_OUTPUT_DIR := ./internal/testdata/build
 
-# Tools
+GINKGO := go run github.com/onsi/ginkgo/v2/ginkgo
 
-.PHONY: integrationtest
-integrationtest: | $(GOOSE)
-	go vet ./...
-	go fmt ./...
-	go run github.com/onsi/ginkgo/ginkgo -r test/ -v
+contracts: $(CONTRACTS_OUTPUT_DIR)/Test.bin $(CONTRACTS_OUTPUT_DIR)/Test.abi
+.PHONY: contracts
 
+# Solidity 0.8.20 defaults to the Shanghai fork which includes the PUSH0 opcode
+# which our testnet doesn't yet support, so use Paris.
+$(CONTRACTS_OUTPUT_DIR)/%.bin $(CONTRACTS_OUTPUT_DIR)/%.abi: $(CONTRACTS_DIR)/%.sol
+	solc $< --abi --bin -o $(CONTRACTS_OUTPUT_DIR) --overwrite --evm-version=paris
+
+test: contracts
+	$(GINKGO) -v -r ./validator_test
 .PHONY: test
-test: | $(GOOSE)
-	go vet ./...
-	go fmt ./...
-	go run github.com/onsi/ginkgo/ginkgo -r validator_test/ -v
 
-build:
-	go fmt ./...
-	GO111MODULE=on go build
+clean:
+	rm $(CONTRACTS_OUTPUT_DIR)/*.bin $(CONTRACTS_OUTPUT_DIR)/*.abi

README.md

@@ -19,19 +19,19 @@ An example config file:
 ```toml
 [database]
   # db credentials
-  name     = "vulcanize_public" # DATABASE_NAME
-  hostname = "localhost"        # DATABASE_HOSTNAME
-  port     = 5432               # DATABASE_PORT
-  user     = "vdbm"             # DATABASE_USER
-  password = "..."              # DATABASE_PASSWORD
+  name     = "cerc_public" # DATABASE_NAME
+  hostname = "localhost"   # DATABASE_HOSTNAME
+  port     = 5432          # DATABASE_PORT
+  user     = "vdbm"        # DATABASE_USER
+  password = "..."         # DATABASE_PASSWORD
 
 [validate]
   # block height to initiate database validation at
-  blockHeight = 1      # VALIDATE_BLOCK_HEIGHT  (default: 1)
+  fromBlock = 1      # VALIDATE_FROM_BLOCK  (default: 1)
   # number of blocks to trail behind the head
-  trail  = 16         # VALIDATE_TRAIL  (default: 16)
-  # sleep interval after validator has caught up to (head-trail) height (in sec)
-  sleepInterval = 10  # VALIDATE_SLEEP_INTERVAL (default: 10)
+  trail = 64         # VALIDATE_TRAIL  (default: 64)
+  # retry interval after validator has caught up to (head-trail) height (in sec)
+  retryInterval = 10  # VALIDATE_RETRY_INTERVAL (default: 10)
 
   # whether to perform a statediffing call on a missing block
   stateDiffMissingBlock = true # (default: false)
@@ -65,7 +65,7 @@ An example config file:
 
 * The validation process trails behind the latest block number in the database by config parameter `validate.trail`.
 
-* If the validator has caught up to (head-trail) height, it waits for a configured time interval (`validate.sleepInterval`) before again querying the database.
+* If the validator has caught up to (head-trail) height, it waits for a configured time interval (`validate.retryInterval`) before again querying the database.
 
 * If the validator encounters a missing block (gap) in the database, it makes a `writeStateDiffAt` call to the configured statediffing endpoint (`ethereum.httpPath`) if `validate.stateDiffMissingBlock` is set to `true`. Here it is assumed that the statediffing node pointed to is writing out to the database.
 

cmd/env.go

@@ -44,9 +44,9 @@ const (
 	ETH_CHAIN_ID     = "ETH_CHAIN_ID"
 	ETH_HTTP_PATH    = "ETH_HTTP_PATH"
 
-	VALIDATE_BLOCK_HEIGHT            = "VALIDATE_BLOCK_HEIGHT"
+	VALIDATE_FROM_BLOCK              = "VALIDATE_FROM_BLOCK"
 	VALIDATE_TRAIL                   = "VALIDATE_TRAIL"
-	VALIDATE_SLEEP_INTERVAL          = "VALIDATE_SLEEP_INTERVAL"
+	VALIDATE_RETRY_INTERVAL          = "VALIDATE_RETRY_INTERVAL"
 	VALIDATE_STATEDIFF_MISSING_BLOCK = "VALIDATE_STATEDIFF_MISSING_BLOCK"
 	VALIDATE_STATEDIFF_TIMEOUT       = "VALIDATE_STATEDIFF_TIMEOUT"
 )
@@ -76,9 +76,9 @@ func init() {
 	viper.BindEnv("ethereum.chainID", ETH_CHAIN_ID)
 	viper.BindEnv("ethereum.httpPath", ETH_HTTP_PATH)
 
-	viper.BindEnv("validate.blockHeight", VALIDATE_BLOCK_HEIGHT)
+	viper.BindEnv("validate.fromBlock", VALIDATE_FROM_BLOCK)
 	viper.BindEnv("validate.trail", VALIDATE_TRAIL)
-	viper.BindEnv("validate.sleepInterval", VALIDATE_SLEEP_INTERVAL)
+	viper.BindEnv("validate.retryInterval", VALIDATE_RETRY_INTERVAL)
 	viper.BindEnv("validate.stateDiffMissingBlock", VALIDATE_STATEDIFF_MISSING_BLOCK)
 	viper.BindEnv("validate.stateDiffTimeout", VALIDATE_STATEDIFF_TIMEOUT)
 }

cmd/root.go

@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/prom"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/prom"
 )
 
 var (
@@ -50,24 +50,7 @@ func Execute() {
 }
 
 func initFunc(cmd *cobra.Command, args []string) {
-	logfile := viper.GetString("log.file")
-	if logfile != "" {
-		file, err := os.OpenFile(logfile,
-			os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-		if err == nil {
-			log.Infof("Directing output to %s", logfile)
-			log.SetOutput(file)
-		} else {
-			log.SetOutput(os.Stdout)
-			log.Info("Failed to log to file, using default stdout")
-		}
-	} else {
-		log.SetOutput(os.Stdout)
-	}
-
-	if err := logLevel(); err != nil {
-		log.Fatal("Could not set log level: ", err)
-	}
+	ParseLogFlags()
 
 	if viper.GetBool("prom.metrics") {
 		log.Info("initializing prometheus metrics")
@@ -91,7 +74,7 @@ func init() {
 	viper.AutomaticEnv()
 
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file location")
-	rootCmd.PersistentFlags().String("database-name", "vulcanize_public", "database name")
+	rootCmd.PersistentFlags().String("database-name", "cerc_public", "database name")
 	rootCmd.PersistentFlags().Int("database-port", 5432, "database port")
 	rootCmd.PersistentFlags().String("database-hostname", "localhost", "database hostname")
 	rootCmd.PersistentFlags().String("database-user", "", "database user")
@@ -119,16 +102,3 @@ func init() {
 	_ = viper.BindPFlag("prom.httpPort", rootCmd.PersistentFlags().Lookup("prom-httpPort"))
 	_ = viper.BindPFlag("prom.dbStats", rootCmd.PersistentFlags().Lookup("prom-dbStats"))
 }
-
-func logLevel() error {
-	lvl, err := log.ParseLevel(viper.GetString("log.level"))
-	if err != nil {
-		return err
-	}
-	log.SetLevel(lvl)
-	if lvl > log.InfoLevel {
-		log.SetReportCaller(true)
-	}
-	log.Info("Log level set to ", lvl.String())
-	return nil
-}

cmd/state_validator.go

@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/validator"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
 )
 
 // stateValidatorCmd represents the stateValidator command
@@ -49,7 +49,10 @@ func stateValidator() {
 		logWithCommand.Fatal(err)
 	}
 
-	service := validator.NewService(cfg, nil)
+	service, err := validator.NewService(cfg, nil)
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
 
 	wg := new(sync.WaitGroup)
 	wg.Add(1)
@@ -65,19 +68,19 @@ func stateValidator() {
 func init() {
 	rootCmd.AddCommand(stateValidatorCmd)
 
-	stateValidatorCmd.PersistentFlags().String("block-height", "1", "block height to initiate state validation")
-	stateValidatorCmd.PersistentFlags().String("trail", "16", "trail of block height to validate")
-	stateValidatorCmd.PersistentFlags().String("sleep-interval", "10", "sleep interval in seconds after validator has caught up to (head-trail) height")
+	stateValidatorCmd.PersistentFlags().String("from-block", "1", "block height to initiate state validation")
+	stateValidatorCmd.PersistentFlags().String("trail", "64", "trail of block height to validate")
+	stateValidatorCmd.PersistentFlags().String("retry-interval", "10s", "retry interval in seconds after validator has caught up to (head-trail) height")
 	stateValidatorCmd.PersistentFlags().Bool("statediff-missing-block", false, "whether to perform a statediffing call on a missing block")
-	stateValidatorCmd.PersistentFlags().Uint("statediff-timeout", 240, "statediffing call timeout period (in sec)")
+	stateValidatorCmd.PersistentFlags().String("statediff-timeout", "240s", "statediffing call timeout period (in sec)")
 
 	stateValidatorCmd.PersistentFlags().String("eth-chain-config", "", "path to json chain config")
 	stateValidatorCmd.PersistentFlags().String("eth-chain-id", "1", "eth chain id")
 	stateValidatorCmd.PersistentFlags().String("eth-http-path", "", "http url for a statediffing node")
 
-	_ = viper.BindPFlag("validate.blockHeight", stateValidatorCmd.PersistentFlags().Lookup("block-height"))
+	_ = viper.BindPFlag("validate.fromBlock", stateValidatorCmd.PersistentFlags().Lookup("from-block"))
 	_ = viper.BindPFlag("validate.trail", stateValidatorCmd.PersistentFlags().Lookup("trail"))
-	_ = viper.BindPFlag("validate.sleepInterval", stateValidatorCmd.PersistentFlags().Lookup("sleep-interval"))
+	_ = viper.BindPFlag("validate.retryInterval", stateValidatorCmd.PersistentFlags().Lookup("retry-interval"))
 	_ = viper.BindPFlag("validate.stateDiffMissingBlock", stateValidatorCmd.PersistentFlags().Lookup("statediff-missing-block"))
 	_ = viper.BindPFlag("validate.stateDiffTimeout", stateValidatorCmd.PersistentFlags().Lookup("statediff-timeout"))
 

cmd/util.go

@@ -0,0 +1,35 @@
+package cmd
+
+import (
+	"os"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+)
+
+func ParseLogFlags() {
+	logfile := viper.GetString("log.file")
+	if logfile != "" {
+		file, err := os.OpenFile(logfile,
+			os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+		if err == nil {
+			log.Infof("Directing output to %s", logfile)
+			log.SetOutput(file)
+		} else {
+			log.SetOutput(os.Stdout)
+			log.Info("Failed to log to file, using default stdout")
+		}
+	} else {
+		log.SetOutput(os.Stdout)
+	}
+
+	lvl, err := log.ParseLevel(viper.GetString("log.level"))
+	if err != nil {
+		log.Fatal("Could not parse log level: ", err)
+	}
+	log.SetLevel(lvl)
+	if lvl > log.InfoLevel {
+		log.SetReportCaller(true)
+	}
+	log.Info("Log level set to ", lvl)
+}

environments/example.toml

@@ -1,21 +1,22 @@
 [database]
-    name     = "vulcanize_public"
+    name     = "cerc_public"
     hostname = "localhost"
     port     = 5432
     password = "password"
     user     = "vdbm"
 
 [validate]
-    blockHeight = 1
-    trail  = 16
-    sleepInterval = 10
+    fromBlock = 1
+    trail = 64
+    retryInterval = "10s"
     stateDiffMissingBlock = true
-    stateDiffTimeout = 240
+    stateDiffTimeout = "240s"
 
 [ethereum]
     chainConfig = ""
     chainID = "1"
     httpPath = "localhost:8545"
+    wsPath = "localhost:8546"
 
 [prom]
     metrics = true

go.mod

@@ -1,14 +1,15 @@
-module github.com/cerc-io/ipld-eth-db-validator
+module github.com/cerc-io/ipld-eth-db-validator/v5
 
 go 1.19
 
 require (
-	github.com/cerc-io/ipfs-ethdb/v4 v4.0.13-alpha
-	github.com/cerc-io/ipld-eth-server/v4 v4.2.8-alpha
+	github.com/cerc-io/ipfs-ethdb/v5 v5.0.1-alpha
+	github.com/cerc-io/ipld-eth-server/v5 v5.0.0-alpha
+	github.com/cerc-io/ipld-eth-statedb v0.0.5-alpha
 	github.com/ethereum/go-ethereum v1.11.5
 	github.com/jmoiron/sqlx v1.3.5
-	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.24.0
+	github.com/onsi/ginkgo/v2 v2.9.2
+	github.com/onsi/gomega v1.27.4
 	github.com/prometheus/client_golang v1.14.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.4.0
@@ -24,9 +25,10 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
-	github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.15-alpha // indirect
+	github.com/cerc-io/eth-ipfs-state-validator/v5 v5.0.0-alpha // 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
@@ -53,22 +55,22 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
 	github.com/georgysavva/scany v1.2.1 // indirect
-	github.com/getsentry/sentry-go v0.17.0 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/getsentry/sentry-go v0.18.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // 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/mock v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
-	github.com/google/pprof v0.0.0-20221203041831-ce31453925ec // indirect
+	github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
@@ -79,7 +81,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
@@ -131,14 +133,14 @@ require (
 	github.com/ipld/go-codec-dagpb v1.5.0 // indirect
 	github.com/ipld/go-ipld-prime v0.19.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.12.1 // indirect
+	github.com/jackc/pgconn v1.14.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.11.0 // indirect
-	github.com/jackc/pgx/v4 v4.16.1 // indirect
-	github.com/jackc/puddle v1.2.1 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/pgx/v4 v4.18.1 // indirect
+	github.com/jackc/puddle v1.3.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
 	github.com/jbenet/goprocess v0.1.4 // indirect
@@ -202,9 +204,7 @@ require (
 	github.com/multiformats/go-multihash v0.2.1 // indirect
 	github.com/multiformats/go-multistream v0.3.3 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/onsi/ginkgo/v2 v2.5.1 // indirect
 	github.com/opencontainers/runtime-spec v1.0.2 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
@@ -214,7 +214,7 @@ require (
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.1 // indirect
+	github.com/prometheus/common v0.39.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/raulk/go-watchdog v1.3.0 // indirect
 	github.com/rogpeppe/go-internal v1.9.0 // indirect
@@ -223,6 +223,7 @@ require (
 	github.com/samber/lo v1.36.0 // indirect
 	github.com/segmentio/fasthash v1.0.3 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/shopspring/decimal v1.2.0 // indirect
 	github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
@@ -255,18 +256,17 @@ require (
 	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
 	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.6.0 // indirect
+	golang.org/x/mod v0.10.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
-	golang.org/x/tools v0.3.0 // indirect
+	golang.org/x/tools v0.8.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/driver/postgres v1.3.7 // indirect
@@ -274,4 +274,4 @@ require (
 	lukechampine.com/blake3 v1.1.7 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.11.5 => github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha
+replace github.com/ethereum/go-ethereum => github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha

go.sum

@@ -112,7 +112,8 @@ github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13P
 github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94=
 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/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
@@ -132,19 +133,20 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8
 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/ceramicnetwork/go-dag-jose v0.1.0 h1:yJ/HVlfKpnD3LdYP03AHyTvbm3BpPiz2oZiOeReJRdU=
-github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.15-alpha h1:8jW+gtgbezgl0KxouCUXLNGPgsLLFYLqZVkXUNOw/1I=
-github.com/cerc-io/eth-ipfs-state-validator/v4 v4.0.15-alpha/go.mod h1:iscV/XtO2CqnxNSj6mazN5Cxq0RNvupO4+gCKnZTV4U=
-github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha h1:nzy/bUmzq8ImRIxchClNoO7Bytom8ETDuOFHzuHFBXs=
-github.com/cerc-io/go-ethereum v1.11.5-statediff-4.3.9-alpha/go.mod h1:Q4LXiMcJCctVW1uoIuF59VRCW1W+zrc5GkewoARwAmk=
-github.com/cerc-io/ipfs-ethdb/v4 v4.0.13-alpha h1:9UBH+8rOmXTgO9w4qxqc8dHxBi5/z1wjz9tOxzrMDyY=
-github.com/cerc-io/ipfs-ethdb/v4 v4.0.13-alpha/go.mod h1:HKzAT0Rvayc7XxKdTHubT40toKsCrqRyF9+F4fECcTc=
-github.com/cerc-io/ipld-eth-server/v4 v4.2.8-alpha h1:oaOpNW+9enmdRDNoKyTmq5CxmuSWcmocdQTFYOPZS4U=
-github.com/cerc-io/ipld-eth-server/v4 v4.2.8-alpha/go.mod h1:E5PGcFYqec9SV8o/OiiAjjeeA5yA4O2xV2xHnE4yDbs=
+github.com/cerc-io/eth-ipfs-state-validator/v5 v5.0.0-alpha h1:TGCr/v0CrDsz1Mjr4000omuEGw7RNdn+OYqIivlF3+Q=
+github.com/cerc-io/eth-ipfs-state-validator/v5 v5.0.0-alpha/go.mod h1:t+1UYws60dkLRecMN2NXl4LlKxQBLjhDh34swi6Jcvc=
+github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha h1:Rj/5+dDbYWa5k58g7h1jNytbWa0NY8IEKExFWaI8bcA=
+github.com/cerc-io/go-ethereum v1.11.5-statediff-5.0.5-alpha/go.mod h1:DIk2wFexjyzvyjuzSOtBEIAPRNZTnLXNbIHEyq1Igek=
+github.com/cerc-io/ipfs-ethdb/v5 v5.0.1-alpha h1:Q+GgPclJeuArafBSJofHmkVOVKkkyxu5qu5gORYAv1E=
+github.com/cerc-io/ipfs-ethdb/v5 v5.0.1-alpha/go.mod h1:EGAdV/YewEADFDDVF1k9GNwy8vNWR29Xb87sRHgMIng=
+github.com/cerc-io/ipld-eth-server/v5 v5.0.0-alpha h1:4BcZZd9NsXNQyffD53RhNkbeC2OqXwMFGpFhtNqMCWU=
+github.com/cerc-io/ipld-eth-server/v5 v5.0.0-alpha/go.mod h1:bNZ/mgRWVHc3zP2zRIDJqqH7D6HRan7GZXhzZgT99j8=
+github.com/cerc-io/ipld-eth-statedb v0.0.5-alpha h1:olsE5OCvfTrQGLE5T2Z4VYOfx8n5ONgciKdEW5I0x3I=
+github.com/cerc-io/ipld-eth-statedb v0.0.5-alpha/go.mod h1:6XprlGrhm65KkHesgcLwgIHWD0TvbkQ3T9ZsfBXKvsk=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/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/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
@@ -279,8 +281,8 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x
 github.com/georgysavva/scany v1.2.1 h1:91PAMBpwBtDjvn46TaLQmuVhxpAG6p6sjQaU4zPHPSM=
 github.com/georgysavva/scany v1.2.1/go.mod h1:vGBpL5XRLOocMFFa55pj0P04DrL3I7qKVRL49K6Eu5o=
 github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c=
-github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak=
-github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM=
+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=
@@ -295,14 +297,13 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
@@ -310,13 +311,14 @@ 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-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 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/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 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=
@@ -376,12 +378,14 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/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/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 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/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -419,8 +423,8 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20221203041831-ce31453925ec h1:fR20TYVVwhK4O7r7y+McjRYyaTH6/vjwJOajE+XhlzM=
-github.com/google/pprof v0.0.0-20221203041831-ce31453925ec/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
+github.com/google/pprof v0.0.0-20230406165453-00490a63f317 h1:hFhpt7CTmR3DX+b4R19ydQFtofxT0Sv3QsKNMVQYTMQ=
+github.com/google/pprof v0.0.0-20230406165453-00490a63f317/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -434,8 +438,8 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c h1:7lF+Vz0LqiRidnzC1Oq86fpX1q/iEv2KJdrCtttYjT4=
 github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f h1:KMlcu9X58lhTA/KrfX8Bi1LQSO4pzoVjTiL3h4Jk+Zk=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
@@ -451,6 +455,7 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0=
 github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfmKFJ6tItnhQ67kU=
@@ -490,8 +495,8 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 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.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
-github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
+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/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
@@ -717,8 +722,9 @@ github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpT
 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.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8=
 github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono=
+github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q=
+github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
 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=
@@ -735,11 +741,13 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:
 github.com/jackc/pgproto3/v2 v2.0.1/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/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=
 github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=
+github.com/jackc/pgproto3/v2 v2.3.2/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/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 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=
@@ -748,8 +756,9 @@ github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkAL
 github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
 github.com/jackc/pgtype v1.6.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs=
 github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
+github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 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=
@@ -758,15 +767,17 @@ github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6
 github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
 github.com/jackc/pgx/v4 v4.10.1/go.mod h1:QlrWebbs3kqEZPHCTGyxecvzG6tvIsYu+A5b1raylkA=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
 github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
+github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
+github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
 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.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.2.1 h1:gI8os0wpRXFd4FiAY2dWiqRK037tjj3t7rKFeO4X5iw=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
+github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/go-nat-pmp v1.0.1/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
@@ -802,8 +813,6 @@ github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -1128,8 +1137,8 @@ github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnU
 github.com/mattn/go-runewidth v0.0.2/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.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
@@ -1177,7 +1186,6 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
 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/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 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.1.1/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8=
@@ -1278,8 +1286,8 @@ github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vv
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.5.1 h1:auzK7OI497k6x4OvWq+TKAcpcSAlod0doAH72oIN0Jw=
-github.com/onsi/ginkgo/v2 v2.5.1/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc=
+github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
+github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1288,8 +1296,8 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.24.0 h1:+0glovB9Jd6z3VR+ScSwQqXVTIfJcGA9UBM8yzQxhqg=
-github.com/onsi/gomega v1.24.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
+github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E=
+github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -1345,8 +1353,6 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.10.0/go.mod h1:WJM3cc3yu7XKBKa/I8WeZm+V3eltZnBwfENSU7mdogU=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
 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-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
@@ -1363,10 +1369,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.37.1 h1:pYY6b5sGXqEB0WwcRGAoVGKbxVthy9qF17R4gbHZVe0=
-github.com/prometheus/common v0.37.1/go.mod h1:jEuMeTn4pKGSAxwr7rXtOD70GeY0ERpt0d9FkKf9sK4=
+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.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
@@ -1374,7 +1378,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 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/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
@@ -1444,8 +1447,8 @@ github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
+github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
 github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
-github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
 github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU=
 github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
@@ -1724,8 +1727,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 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=
@@ -1783,16 +1786,14 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
-golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1804,8 +1805,6 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
 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=
@@ -1905,14 +1904,12 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/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-20210603081109-ebe580a85c40/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-20210823070655-63515b42dcdf/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-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/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-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -1922,13 +1919,13 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 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.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.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.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1938,9 +1935,9 @@ 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.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2018,8 +2015,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
+golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
+golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 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=

integration/deploy_helpers.go

@@ -0,0 +1,64 @@
+package integration
+
+import (
+	"encoding/json"
+	"fmt"
+	"math/big"
+	"net/http"
+)
+
+type ContractDeployed struct {
+	Address         string `json:"address"`
+	TransactionHash string `json:"txHash"`
+	BlockNumber     uint64 `json:"blockNumber"`
+	BlockHash       string `json:"blockHash"`
+}
+
+type ContractDestroyed struct {
+	BlockNumber uint64 `json:"blockNumber"`
+}
+
+type PutResult struct {
+	BlockNumber uint64 `json:"blockNumber"`
+}
+
+type Tx struct {
+	From            string   `json:"from"`
+	To              string   `json:"to"`
+	Value           *big.Int `json:"value"`
+	TransactionHash string   `json:"txHash"`
+	BlockNumber     uint64   `json:"blockNumber"`
+	BlockHash       string   `json:"blockHash"`
+}
+
+const ContractServerUrl = "http://localhost:3000"
+
+// Factory to generate endpoint functions
+func MakeGetAndDecodeFunc[R any](format string) func(...interface{}) (*R, error) {
+	return func(params ...interface{}) (*R, error) {
+		params = append([]interface{}{ContractServerUrl}, params...)
+		url := fmt.Sprintf(format, params...)
+		res, err := http.Get(url)
+		if err != nil {
+			return nil, err
+		}
+		defer res.Body.Close()
+
+		if res.StatusCode != http.StatusOK {
+			return nil, fmt.Errorf("%s: %s", url, res.Status)
+		}
+
+		var data R
+		decoder := json.NewDecoder(res.Body)
+		return &data, decoder.Decode(&data)
+	}
+}
+
+var (
+	SendEth             = MakeGetAndDecodeFunc[Tx]("%s/v1/sendEth?to=%s&value=%s")
+	DeployContract      = MakeGetAndDecodeFunc[ContractDeployed]("%s/v1/deployContract")
+	DestroyContract     = MakeGetAndDecodeFunc[ContractDestroyed]("%s/v1/destroyContract?addr=%s")
+	DeployTestContract  = MakeGetAndDecodeFunc[ContractDeployed]("%s/v1/deployTestContract")
+	DestroyTestContract = MakeGetAndDecodeFunc[ContractDestroyed]("%s/v1/destroyTestContract?addr=%s")
+	PutTestValue        = MakeGetAndDecodeFunc[PutResult]("%s/v1/putTestValue?addr=%s&value=%d")
+)

integration/integration_test.go

@@ -0,0 +1,140 @@
+package integration_test
+
+import (
+	"context"
+	"sync"
+	"testing"
+	"time"
+
+	"github.com/onsi/gomega"
+	. "github.com/onsi/gomega"
+
+	"github.com/cerc-io/ipld-eth-db-validator/v5/cmd" // this registers env vars with viper
+	"github.com/cerc-io/ipld-eth-db-validator/v5/integration"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/helpers"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
+)
+
+const (
+	timeout            = 10 * time.Minute
+	pollInterval       = time.Second
+	progressBufferSize = 200
+)
+
+var (
+	testAddresses = []string{
+		"0x1111111111111111111111111111111111111112",
+		"0x1ca7c995f8eF0A2989BbcE08D5B7Efe50A584aa1",
+		"0x9a4b666af23a2cdb4e5538e1d222a445aeb82134",
+		"0xF7C7AEaECD2349b129d5d15790241c32eeE4607B",
+		"0x992b6E9BFCA1F7b0797Cee10b0170E536EAd3532",
+	}
+
+	// Track the blocks validated on this chain
+	lastValidated uint64
+	validated     = newBlockSet()
+
+	ctx = context.Background()
+	wg  sync.WaitGroup
+)
+
+func init() {
+	cmd.ParseLogFlags()
+	gomega.SetDefaultEventuallyTimeout(timeout)
+	gomega.SetDefaultEventuallyPollingInterval(pollInterval)
+}
+
+func setup(t *testing.T, progressChan chan uint64) {
+	cfg, err := validator.NewConfig()
+	if err != nil {
+		t.Fatal(err)
+	}
+	// set the default DB config to the testing defaults
+	cfg.DBConfig, _ = helpers.TestDBConfig.WithEnv()
+	// update the start block if we have already validated past it
+	if lastValidated > cfg.FromBlock {
+		cfg.FromBlock = lastValidated
+	}
+	// default trail is unnecessarily long
+	cfg.Trail = 16
+
+	service, err := validator.NewService(cfg, progressChan)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	go func() {
+		for block := range progressChan {
+			validated.add(block)
+			lastValidated = block
+		}
+	}()
+
+	wg.Add(1)
+	go service.Start(ctx, &wg)
+
+	t.Cleanup(func() {
+		service.Stop()
+		wg.Wait()
+
+		g := gomega.NewWithT(t)
+		g.Expect(progressChan).To(BeClosed())
+	})
+}
+
+func TestValidateContracts(t *testing.T) {
+	progressChan := make(chan uint64, progressBufferSize)
+	setup(t, progressChan)
+
+	contract, err := integration.DeployTestContract()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("contract deployment", func(t *testing.T) {
+		g := gomega.NewWithT(t)
+		t.Logf("Deployed contract at block %d", contract.BlockNumber)
+
+		g.Expect(progressChan).ToNot(BeClosed())
+		g.Eventually(validated.contains, timeout).WithArguments(contract.BlockNumber).Should(BeTrue())
+	})
+
+	t.Run("contract method calls", func(t *testing.T) {
+		g := gomega.NewWithT(t)
+
+		var blocks []uint64
+		for i := 0; i < 5; i++ {
+			res, err := integration.PutTestValue(contract.Address, i)
+			if err != nil {
+				t.Fatal(err)
+			}
+			t.Logf("Put() called at block %d", res.BlockNumber)
+			blocks = append(blocks, res.BlockNumber)
+		}
+
+		g.Expect(progressChan).ToNot(BeClosed())
+		g.Eventually(validated.containsAll, timeout).WithArguments(blocks).Should(BeTrue())
+	})
+}
+
+func TestValidateTransactions(t *testing.T) {
+	progressChan := make(chan uint64, progressBufferSize)
+	setup(t, progressChan)
+
+	t.Run("ETH transfer transactions", func(t *testing.T) {
+		g := gomega.NewWithT(t)
+
+		var blocks []uint64
+		for _, address := range testAddresses {
+			tx, err := integration.SendEth(address, "0.01")
+			if err != nil {
+				t.Fatal(err)
+			}
+			t.Logf("Sent tx at block %d", tx.BlockNumber)
+			blocks = append(blocks, tx.BlockNumber)
+		}
+
+		g.Expect(progressChan).ToNot(BeClosed())
+		g.Eventually(validated.containsAll, timeout).WithArguments(blocks).Should(BeTrue())
+	})
+}

integration/util_test.go

@@ -0,0 +1,40 @@
+package integration_test
+
+import (
+	"sync"
+)
+
+type atomicBlockSet struct {
+	blocks map[uint64]struct{}
+	sync.Mutex
+}
+
+func newBlockSet() *atomicBlockSet {
+	return &atomicBlockSet{blocks: make(map[uint64]struct{})}
+}
+
+func (set *atomicBlockSet) contains(block uint64) bool {
+	set.Lock()
+	defer set.Unlock()
+	for done := range set.blocks {
+		if done == block {
+			return true
+		}
+	}
+	return false
+}
+
+func (set *atomicBlockSet) containsAll(blocks []uint64) bool {
+	for _, block := range blocks {
+		if !set.contains(block) {
+			return false
+		}
+	}
+	return true
+}
+
+func (set *atomicBlockSet) add(block uint64) {
+	set.Lock()
+	defer set.Unlock()
+	set.blocks[block] = struct{}{}
+}

internal/chaingen/contract.go

@@ -0,0 +1,22 @@
+package chaingen
+
+import (
+	"strings"
+
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type ContractSpec struct {
+	DeploymentCode []byte
+	ABI            abi.ABI
+}
+
+func ParseContract(abiStr, binStr string) (*ContractSpec, error) {
+	parsedABI, err := abi.JSON(strings.NewReader(abiStr))
+	if err != nil {
+		return nil, err
+	}
+	data := common.Hex2Bytes(binStr)
+	return &ContractSpec{data, parsedABI}, nil
+}

internal/chaingen/gen.go

@@ -0,0 +1,162 @@
+package chaingen
+
+import (
+	"crypto/ecdsa"
+	"errors"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/consensus/ethash"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/params"
+)
+
+type GenContext struct {
+	ChainConfig *params.ChainConfig
+	GenFuncs    []func(int, *core.BlockGen)
+	DB          ethdb.Database
+
+	Keys      map[common.Address]*ecdsa.PrivateKey
+	Contracts map[string]*ContractSpec
+	Genesis   *types.Block
+
+	block    *core.BlockGen // cache the current block for my methods' use
+	deployed map[common.Address]string
+}
+
+func NewGenContext(chainConfig *params.ChainConfig, db ethdb.Database) *GenContext {
+	return &GenContext{
+		ChainConfig: chainConfig,
+		DB:          db,
+		Keys:        make(map[common.Address]*ecdsa.PrivateKey),
+		Contracts:   make(map[string]*ContractSpec),
+
+		deployed: make(map[common.Address]string),
+	}
+}
+
+func (gen *GenContext) AddFunction(fn func(int, *core.BlockGen)) {
+	gen.GenFuncs = append(gen.GenFuncs, fn)
+}
+
+func (gen *GenContext) AddOwnedAccount(key *ecdsa.PrivateKey) common.Address {
+	addr := crypto.PubkeyToAddress(key.PublicKey)
+	gen.Keys[addr] = key
+	return addr
+}
+
+func (gen *GenContext) AddContract(name string, spec *ContractSpec) {
+	gen.Contracts[name] = spec
+}
+
+func (gen *GenContext) generate(i int, block *core.BlockGen) {
+	gen.block = block
+	for _, fn := range gen.GenFuncs {
+		fn(i, block)
+	}
+}
+
+// MakeChain creates a chain of n blocks starting at and including the genesis block.
+// the returned hash chain is ordered head->parent.
+func (gen *GenContext) MakeChain(n int) ([]*types.Block, []types.Receipts, *core.BlockChain) {
+	blocks, receipts := core.GenerateChain(
+		gen.ChainConfig, gen.Genesis, ethash.NewFaker(), gen.DB, n, gen.generate,
+	)
+	chain, err := core.NewBlockChain(gen.DB, nil, nil, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
+	if err != nil {
+		panic(err)
+	}
+	return append([]*types.Block{gen.Genesis}, blocks...), receipts, chain
+}
+
+func (gen *GenContext) CreateSendTx(from common.Address, to common.Address, amount *big.Int) (*types.Transaction, error) {
+	return gen.createTx(from, &to, amount, params.TxGas, nil)
+}
+
+func (gen *GenContext) CreateContractTx(from common.Address, contractName string) (*types.Transaction, error) {
+	contract := gen.Contracts[contractName]
+	if contract == nil {
+		return nil, errors.New("No contract with name " + contractName)
+	}
+	return gen.createTx(from, nil, big.NewInt(0), 1000000, contract.DeploymentCode)
+}
+
+func (gen *GenContext) CreateCallTx(from common.Address, to common.Address, methodName string, args ...interface{}) (*types.Transaction, error) {
+	contractName, ok := gen.deployed[to]
+	if !ok {
+		return nil, errors.New("No contract deployed at address " + to.String())
+	}
+	contract := gen.Contracts[contractName]
+	if contract == nil {
+		return nil, errors.New("No contract with name " + contractName)
+	}
+
+	packed, err := contract.ABI.Pack(methodName, args...)
+	if err != nil {
+		panic(err)
+	}
+	return gen.createTx(from, &to, big.NewInt(0), 100000, packed)
+}
+
+func (gen *GenContext) DeployContract(from common.Address, contractName string) (common.Address, error) {
+	tx, err := gen.CreateContractTx(from, contractName)
+	if err != nil {
+		return common.Address{}, err
+	}
+	addr := crypto.CreateAddress(from, gen.block.TxNonce(from))
+	gen.deployed[addr] = contractName
+	gen.block.AddTx(tx)
+	return addr, nil
+}
+
+func (gen *GenContext) createTx(from common.Address, to *common.Address, amount *big.Int, gasLimit uint64, data []byte) (*types.Transaction, error) {
+	signer := types.MakeSigner(gen.ChainConfig, gen.block.Number())
+	nonce := gen.block.TxNonce(from)
+	priv, ok := gen.Keys[from]
+	if !ok {
+		return nil, errors.New("No private key for sender address" + from.String())
+	}
+
+	var tx *types.Transaction
+	if gen.ChainConfig.IsLondon(gen.block.Number()) {
+		tx = types.NewTx(&types.DynamicFeeTx{
+			ChainID:   gen.ChainConfig.ChainID,
+			Nonce:     nonce,
+			To:        to,
+			Gas:       gasLimit,
+			GasTipCap: big.NewInt(50),
+			GasFeeCap: big.NewInt(1000000000),
+			Value:     amount,
+			Data:      data,
+		})
+	} else {
+		tx = types.NewTx(&types.LegacyTx{
+			Nonce: nonce,
+			To:    to,
+			Value: amount,
+			Gas:   gasLimit,
+			Data:  data,
+		})
+	}
+	return types.SignTx(tx, signer, priv)
+}
+
+func (gen *GenContext) CreateLondonTx(block *core.BlockGen, addr *common.Address, key *ecdsa.PrivateKey) (*types.Transaction, error) {
+	londonTrx := types.NewTx(&types.DynamicFeeTx{
+		ChainID:   gen.ChainConfig.ChainID,
+		Nonce:     block.TxNonce(*addr),
+		GasTipCap: big.NewInt(50),
+		GasFeeCap: big.NewInt(1000000000),
+		Gas:       21000,
+		To:        addr,
+		Value:     big.NewInt(1000),
+		Data:      []byte{},
+	})
+
+	transactionSigner := types.MakeSigner(gen.ChainConfig, block.Number())
+	return types.SignTx(londonTrx, transactionSigner, key)
+}

internal/chaingen/makers.go

@@ -0,0 +1,99 @@
+package chaingen
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/statediff/test_helpers"
+
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/testdata"
+)
+
+var (
+	bank, acct1, acct2 common.Address
+	contractAddr       common.Address
+	contractDataRoot   string
+	defaultContract    *ContractSpec
+)
+
+func init() {
+	var err error
+	defaultContract, err = ParseContract(testdata.TestContractABI, testdata.TestContractCode)
+	if err != nil {
+		panic(err)
+	}
+}
+
+// A GenContext which exactly replicates the chain generator used in existing tests
+func DefaultGenContext(chainConfig *params.ChainConfig, db ethdb.Database) *GenContext {
+	gen := NewGenContext(chainConfig, db)
+	bank = gen.AddOwnedAccount(test_helpers.TestBankKey)
+	acct1 = gen.AddOwnedAccount(test_helpers.Account1Key)
+	acct2 = gen.AddOwnedAccount(test_helpers.Account2Key)
+	gen.AddContract("Test", defaultContract)
+
+	gen.AddFunction(func(i int, block *core.BlockGen) {
+		if err := defaultChainGen(gen, i, block); err != nil {
+			panic(err)
+		}
+	})
+	gen.Genesis = test_helpers.GenesisBlockForTesting(
+		db, bank, test_helpers.TestBankFunds, big.NewInt(params.InitialBaseFee), params.MaxGasLimit,
+	)
+	return gen
+}
+
+func defaultChainGen(gen *GenContext, i int, block *core.BlockGen) error {
+	switch i {
+	case 0:
+		// In block 1, the test bank sends account #1 some ether.
+		tx, err := gen.CreateSendTx(bank, acct1, big.NewInt(10000))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx)
+	case 1:
+		// In block 2, the test bank sends some more ether to account #1.
+		// acct1 passes it on to account #2.
+		// acct1 creates a test contract.
+		tx1, err := gen.CreateSendTx(bank, acct1, big.NewInt(1000))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx1)
+		tx2, err := gen.CreateSendTx(acct1, acct2, big.NewInt(1000))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx2)
+		contractAddr, err = gen.DeployContract(acct1, "Test")
+		if err != nil {
+			panic(err)
+		}
+	case 2:
+		block.SetCoinbase(acct2)
+		tx, err := gen.CreateCallTx(bank, contractAddr, "Put", big.NewInt(3))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx)
+	case 3:
+		block.SetCoinbase(acct2)
+		tx, err := gen.CreateCallTx(bank, contractAddr, "Put", big.NewInt(9))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx)
+	case 4:
+		block.SetCoinbase(acct1)
+		tx, err := gen.CreateCallTx(bank, contractAddr, "Put", big.NewInt(0))
+		if err != nil {
+			panic(err)
+		}
+		block.AddTx(tx)
+	}
+	return nil
+}

internal/helpers/db.go

@@ -0,0 +1,46 @@
+package helpers
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres"
+	"github.com/jmoiron/sqlx"
+)
+
+var TestDBConfig, _ = postgres.TestConfig.WithEnv()
+
+// SetupDB is use to setup a db for watcher tests
+func SetupDB() *sqlx.DB {
+	db, err := postgres.ConnectSQLX(context.Background(), TestDBConfig)
+	if err != nil {
+		panic(err)
+	}
+	return db
+}
+
+// TearDownDB is used to tear down the watcher dbs after tests
+func TearDownDB(db *sqlx.DB) error {
+	tx, err := db.Beginx()
+	if err != nil {
+		return 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`,
+	}
+	for _, stm := range statements {
+		if _, err = tx.Exec(stm); err != nil {
+			return fmt.Errorf("error executing `%s`: %w", stm, err)
+		}
+	}
+	return tx.Commit()
+}

internal/helpers/indexing.go

@@ -0,0 +1,93 @@
+package helpers
+
+import (
+	"context"
+	"math/big"
+
+	"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/params"
+	"github.com/ethereum/go-ethereum/statediff"
+	"github.com/ethereum/go-ethereum/statediff/indexer"
+	"github.com/ethereum/go-ethereum/statediff/indexer/interfaces"
+	"github.com/ethereum/go-ethereum/statediff/indexer/node"
+)
+
+func TestStateDiffIndexer(ctx context.Context, chainConfig *params.ChainConfig, genHash common.Hash) (interfaces.StateDiffIndexer, error) {
+	testInfo := node.Info{
+		GenesisBlock: genHash.String(),
+		NetworkID:    "1",
+		ID:           "1",
+		ClientName:   "geth",
+		ChainID:      chainConfig.ChainID.Uint64(),
+	}
+	_, indexer, err := indexer.NewStateDiffIndexer(ctx, chainConfig, testInfo, TestDBConfig)
+	return indexer, err
+}
+
+type IndexChainParams struct {
+	Blocks     []*types.Block
+	Receipts   []types.Receipts
+	StateCache state.Database
+
+	StateDiffParams statediff.Params
+	TotalDifficulty *big.Int
+	// Whether to skip indexing state nodes (state_cids, storage_cids)
+	SkipStateNodes bool
+	// Whether to skip indexing IPLD blocks
+	SkipIPLDs bool
+}
+
+func IndexChain(indexer interfaces.StateDiffIndexer, params IndexChainParams) error {
+	builder := statediff.NewBuilder(params.StateCache)
+	// iterate over the blocks, generating statediff payloads, and transforming the data into Postgres
+	for i, block := range params.Blocks {
+		var args statediff.Args
+		var rcts types.Receipts
+		if i == 0 {
+			args = statediff.Args{
+				OldStateRoot: common.Hash{},
+				NewStateRoot: block.Root(),
+				BlockNumber:  block.Number(),
+				BlockHash:    block.Hash(),
+			}
+		} else {
+			args = statediff.Args{
+				OldStateRoot: params.Blocks[i-1].Root(),
+				NewStateRoot: block.Root(),
+				BlockNumber:  block.Number(),
+				BlockHash:    block.Hash(),
+			}
+			rcts = params.Receipts[i-1]
+		}
+
+		diff, err := builder.BuildStateDiffObject(args, params.StateDiffParams)
+		if err != nil {
+			return err
+		}
+		tx, err := indexer.PushBlock(block, rcts, params.TotalDifficulty)
+		if err != nil {
+			return err
+		}
+
+		if !params.SkipStateNodes {
+			for _, node := range diff.Nodes {
+				if err = indexer.PushStateNode(tx, node, block.Hash().String()); err != nil {
+					return err
+				}
+			}
+		}
+		if !params.SkipIPLDs {
+			for _, ipld := range diff.IPLDs {
+				if err := indexer.PushIPLD(tx, ipld); err != nil {
+					return err
+				}
+			}
+		}
+		if err = tx.Submit(err); err != nil {
+			return err
+		}
+	}
+	return nil
+}

internal/testdata/build/Test.abi

@@ -0,0 +1 @@
+[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"","type":"address"},{"indexed":false,"internalType":"uint256","name":"","type":"uint256"}],"name":"logPut","type":"event"},{"inputs":[{"internalType":"uint256","name":"value","type":"uint256"}],"name":"Put","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"close","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"data","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]

internal/testdata/build/Test.bin

@@ -0,0 +1 @@
+608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550610459806100606000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a14610050578063b90d3d0c1461006c575b600080fd5b61004e61009c565b005b61006a60048036038101906100659190610266565b610193565b005b610086600480360381019061008191906102f1565b610213565b604051610093919061032d565b60405180910390f35b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461012a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610121906103cb565b60405180910390fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc479081150290604051600060405180830381858888f19350505050158015610190573d6000803e3d6000fd5b50565b7f370acc53a76362ca0f71a1b2e0c8b8ffbbc1ba9ff3166a1e2fa8445b4848626c33826040516101c49291906103fa565b60405180910390a180600160003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050565b60016020528060005260406000206000915090505481565b600080fd5b6000819050919050565b61024381610230565b811461024e57600080fd5b50565b6000813590506102608161023a565b92915050565b60006020828403121561027c5761027b61022b565b5b600061028a84828501610251565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102be82610293565b9050919050565b6102ce816102b3565b81146102d957600080fd5b50565b6000813590506102eb816102c5565b92915050565b6000602082840312156103075761030661022b565b5b6000610315848285016102dc565b91505092915050565b61032781610230565b82525050565b6000602082019050610342600083018461031e565b92915050565b600082825260208201905092915050565b7f4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f60008201527f6e2e000000000000000000000000000000000000000000000000000000000000602082015250565b60006103b5602283610348565b91506103c082610359565b604082019050919050565b600060208201905081810360008301526103e4816103a8565b9050919050565b6103f4816102b3565b82525050565b600060408201905061040f60008301856103eb565b61041c602083018461031e565b939250505056fea26469706673582212205c59738e694ff2e1f03f21fa2e7d943137128c0f43ae0e8175a589b32fa81a9a64736f6c63430008140033

internal/testdata/contract.go

@@ -0,0 +1,10 @@
+package testdata
+
+import _ "embed"
+
+var (
+	//go:embed build/Test.abi
+	TestContractABI string
+	//go:embed build/Test.bin
+	TestContractCode string
+)

main.go

@@ -16,7 +16,7 @@
 
 package main
 
-import "github.com/cerc-io/ipld-eth-db-validator/cmd"
+import "github.com/cerc-io/ipld-eth-db-validator/v5/cmd"
 
 func main() {
 	cmd.Execute()

pkg/validator/config.go

@@ -18,63 +18,27 @@ package validator
 
 import (
 	"fmt"
-	"math/big"
 	"time"
 
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/prom"
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/shared"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/statediff"
-	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres"
-	"github.com/jmoiron/sqlx"
 	"github.com/spf13/viper"
+
+	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres"
 )
 
-var IntegrationTestChainConfig = &params.ChainConfig{
-	ChainID:             big.NewInt(99),
-	HomesteadBlock:      big.NewInt(0),
-	EIP150Block:         big.NewInt(0),
-	EIP155Block:         big.NewInt(0),
-	EIP158Block:         big.NewInt(0),
-	ByzantiumBlock:      big.NewInt(0),
-	ConstantinopleBlock: big.NewInt(0),
-	PetersburgBlock:     big.NewInt(0),
-	IstanbulBlock:       big.NewInt(0),
-	Clique: &params.CliqueConfig{
-		Period: 0,
-		Epoch:  30000,
-	},
-}
-
-var TestChainConfig = &params.ChainConfig{
-	ChainID:             big.NewInt(1),
-	HomesteadBlock:      big.NewInt(0),
-	EIP150Block:         big.NewInt(0),
-	EIP155Block:         big.NewInt(0),
-	EIP158Block:         big.NewInt(0),
-	ByzantiumBlock:      big.NewInt(0),
-	ConstantinopleBlock: big.NewInt(0),
-	PetersburgBlock:     big.NewInt(0),
-	IstanbulBlock:       big.NewInt(0),
-	MuirGlacierBlock:    big.NewInt(0),
-	BerlinBlock:         big.NewInt(0),
-	LondonBlock:         big.NewInt(6),
-	ArrowGlacierBlock:   big.NewInt(0),
-	Ethash:              new(params.EthashConfig),
-}
-
 type Config struct {
-	dbConfig postgres.Config
-	DB       *sqlx.DB
+	DBConfig postgres.Config
+	DBStats  bool
 
-	ChainCfg              *params.ChainConfig
+	ChainConfig *params.ChainConfig
+	// Used to trigger writing state diffs for gaps in the index
 	Client                *rpc.Client
+	FromBlock, Trail      uint64
+	RetryInterval         time.Duration
 	StateDiffMissingBlock bool
-	StateDiffTimeout      uint
-
-	BlockNum, Trail uint64
-	SleepInterval   uint
+	StateDiffTimeout      time.Duration
 }
 
 func NewConfig() (*Config, error) {
@@ -99,27 +63,17 @@ func NewConfig() (*Config, error) {
 
 func (c *Config) setupDB() error {
 	// DB Config
-	c.dbConfig.DatabaseName = viper.GetString("database.name")
-	c.dbConfig.Hostname = viper.GetString("database.hostname")
-	c.dbConfig.Port = viper.GetInt("database.port")
-	c.dbConfig.Username = viper.GetString("database.user")
-	c.dbConfig.Password = viper.GetString("database.password")
+	c.DBConfig.DatabaseName = viper.GetString("database.name")
+	c.DBConfig.Hostname = viper.GetString("database.hostname")
+	c.DBConfig.Port = viper.GetInt("database.port")
+	c.DBConfig.Username = viper.GetString("database.user")
+	c.DBConfig.Password = viper.GetString("database.password")
 
-	c.dbConfig.MaxIdle = viper.GetInt("database.maxIdle")
-	c.dbConfig.MaxConns = viper.GetInt("database.maxOpen")
-	c.dbConfig.MaxConnLifetime = time.Duration(viper.GetInt("database.maxLifetime"))
+	c.DBConfig.MaxIdle = viper.GetInt("database.maxIdle")
+	c.DBConfig.MaxConns = viper.GetInt("database.maxOpen")
+	c.DBConfig.MaxConnLifetime = viper.GetDuration("database.maxLifetime")
 
-	// Create DB
-	db, err := shared.NewDB(c.dbConfig.DbConnectionString(), c.dbConfig)
-	if err != nil {
-		return fmt.Errorf("failed to create config: %w", err)
-	}
-	c.DB = db
-
-	// Enable DB stats
-	if viper.GetBool("prom.dbStats") {
-		prom.RegisterDBCollector(c.dbConfig.DatabaseName, c.DB)
-	}
+	c.DBStats = viper.GetBool("prom.dbStats")
 
 	return nil
 }
@@ -128,11 +82,11 @@ func (c *Config) setupEth() error {
 	var err error
 	chainConfigPath := viper.GetString("ethereum.chainConfig")
 	if chainConfigPath != "" {
-		c.ChainCfg, err = statediff.LoadConfig(chainConfigPath)
+		c.ChainConfig, err = statediff.LoadConfig(chainConfigPath)
 	} else {
 		// read chainID if chain config path not provided
 		chainID := viper.GetUint64("ethereum.chainID")
-		c.ChainCfg, err = statediff.ChainConfig(chainID)
+		c.ChainConfig, err = statediff.ChainConfig(chainID)
 	}
 	if err != nil {
 		return err
@@ -150,16 +104,16 @@ func (c *Config) setupEth() error {
 
 func (c *Config) setupValidator() error {
 	var err error
-	c.BlockNum = viper.GetUint64("validate.blockHeight")
-	if c.BlockNum < 1 {
-		return fmt.Errorf("block height cannot be less the 1")
+	c.FromBlock = viper.GetUint64("validate.fromBlock")
+	if c.FromBlock < 1 {
+		return fmt.Errorf("starting block height cannot be less than 1")
 	}
 
 	c.Trail = viper.GetUint64("validate.trail")
-	c.SleepInterval = viper.GetUint("validate.sleepInterval")
+	c.RetryInterval = viper.GetDuration("validate.retryInterval")
 	c.StateDiffMissingBlock = viper.GetBool("validate.stateDiffMissingBlock")
 	if c.StateDiffMissingBlock {
-		c.StateDiffTimeout = viper.GetUint("validate.stateDiffTimeout")
+		c.StateDiffTimeout = viper.GetDuration("validate.stateDiffTimeout")
 	}
 
 	return err

pkg/validator/config_test.go

@@ -0,0 +1,25 @@
+package validator_test
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/params"
+)
+
+var TestChainConfig = &params.ChainConfig{
+	ChainID:             big.NewInt(1),
+	HomesteadBlock:      big.NewInt(0),
+	EIP150Block:         big.NewInt(0),
+	EIP155Block:         big.NewInt(0),
+	EIP158Block:         big.NewInt(0),
+	ByzantiumBlock:      big.NewInt(0),
+	ConstantinopleBlock: big.NewInt(0),
+	PetersburgBlock:     big.NewInt(0),
+	IstanbulBlock:       big.NewInt(0),
+	MuirGlacierBlock:    big.NewInt(0),
+	BerlinBlock:         big.NewInt(0),
+	LondonBlock:         big.NewInt(6),
+	ArrowGlacierBlock:   big.NewInt(0),
+	GrayGlacierBlock:    big.NewInt(0),
+	Ethash:              new(params.EthashConfig),
+}

pkg/validator/errors.go

@@ -0,0 +1,13 @@
+package validator
+
+import (
+	"fmt"
+)
+
+type ChainNotSyncedError struct {
+	Head uint64
+}
+
+func (e *ChainNotSyncedError) Error() string {
+	return fmt.Sprintf("chain not synced (current head: %d)", e.Head)
+}

pkg/validator/ref_integrity.go

@@ -22,49 +22,44 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+var (
+	ReferentialIntegrityErr = "referential integrity check failed at block %d, entry for %s not found"
+	EntryNotFoundErr        = "entry for %s not found"
+)
+
 // ValidateReferentialIntegrity validates referential integrity at the given height
-func ValidateReferentialIntegrity(db *sqlx.DB, blockNumber uint64) error {
-	err := ValidateHeaderCIDsRef(db, blockNumber)
+func ValidateReferentialIntegrity(tx *sqlx.Tx, blockNumber uint64) error {
+	err := ValidateHeaderCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateUncleCIDsRef(db, blockNumber)
+	err = ValidateUncleCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateTransactionCIDsRef(db, blockNumber)
+	err = ValidateTransactionCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateReceiptCIDsRef(db, blockNumber)
+	err = ValidateReceiptCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateStateCIDsRef(db, blockNumber)
+	err = ValidateStateCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateStorageCIDsRef(db, blockNumber)
+	err = ValidateStorageCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
 
-	err = ValidateStateAccountsRef(db, blockNumber)
-	if err != nil {
-		return err
-	}
-
-	err = ValidateAccessListElementsRef(db, blockNumber)
-	if err != nil {
-		return err
-	}
-
-	err = ValidateLogCIDsRef(db, blockNumber)
+	err = ValidateLogCIDsRef(tx, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -73,8 +68,8 @@ func ValidateReferentialIntegrity(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateHeaderCIDsRef does a reference integrity check on references in eth.header_cids table
-func ValidateHeaderCIDsRef(db *sqlx.DB, blockNumber uint64) error {
-	err := ValidateIPFSBlocks(db, blockNumber, "eth.header_cids", "mh_key")
+func ValidateHeaderCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
+	err := ValidateIPFSBlocks(tx, blockNumber, "eth.header_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -83,9 +78,9 @@ func ValidateHeaderCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateUncleCIDsRef does a reference integrity check on references in eth.uncle_cids table
-func ValidateUncleCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateUncleCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, UncleCIDsRefHeaderCIDs, blockNumber)
+	err := tx.Get(&exists, UncleCIDsRefHeaderCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -93,7 +88,7 @@ func ValidateUncleCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.header_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.uncle_cids", "mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.uncle_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -102,9 +97,9 @@ func ValidateUncleCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateTransactionCIDsRef does a reference integrity check on references in eth.header_cids table
-func ValidateTransactionCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateTransactionCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, TransactionCIDsRefHeaderCIDs, blockNumber)
+	err := tx.Get(&exists, TransactionCIDsRefHeaderCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -112,7 +107,7 @@ func ValidateTransactionCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.header_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.transaction_cids", "mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.transaction_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -121,9 +116,9 @@ func ValidateTransactionCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateReceiptCIDsRef does a reference integrity check on references in eth.receipt_cids table
-func ValidateReceiptCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateReceiptCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, ReceiptCIDsRefTransactionCIDs, blockNumber)
+	err := tx.Get(&exists, ReceiptCIDsRefTransactionCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -131,7 +126,7 @@ func ValidateReceiptCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.transaction_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.receipt_cids", "leaf_mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.receipt_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -140,9 +135,9 @@ func ValidateReceiptCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateStateCIDsRef does a reference integrity check on references in eth.state_cids table
-func ValidateStateCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateStateCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, StateCIDsRefHeaderCIDs, blockNumber)
+	err := tx.Get(&exists, StateCIDsRefHeaderCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -150,7 +145,7 @@ func ValidateStateCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.header_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.state_cids", "mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.state_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -159,9 +154,9 @@ func ValidateStateCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateStorageCIDsRef does a reference integrity check on references in eth.storage_cids table
-func ValidateStorageCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateStorageCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, StorageCIDsRefStateCIDs, blockNumber)
+	err := tx.Get(&exists, StorageCIDsRefStateCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -169,7 +164,7 @@ func ValidateStorageCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.state_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.storage_cids", "mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.storage_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -177,38 +172,10 @@ func ValidateStorageCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 	return nil
 }
 
-// ValidateStateAccountsRef does a reference integrity check on references in eth.state_accounts table
-func ValidateStateAccountsRef(db *sqlx.DB, blockNumber uint64) error {
-	var exists bool
-	err := db.Get(&exists, StateAccountsRefStateCIDs, blockNumber)
-	if err != nil {
-		return err
-	}
-	if exists {
-		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.state_cids")
-	}
-
-	return nil
-}
-
-// ValidateAccessListElementsRef does a reference integrity check on references in eth.access_list_elements table
-func ValidateAccessListElementsRef(db *sqlx.DB, blockNumber uint64) error {
-	var exists bool
-	err := db.Get(&exists, AccessListElementsRefTransactionCIDs, blockNumber)
-	if err != nil {
-		return err
-	}
-	if exists {
-		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.transaction_cids")
-	}
-
-	return nil
-}
-
 // ValidateLogCIDsRef does a reference integrity check on references in eth.log_cids table
-func ValidateLogCIDsRef(db *sqlx.DB, blockNumber uint64) error {
+func ValidateLogCIDsRef(tx *sqlx.Tx, blockNumber uint64) error {
 	var exists bool
-	err := db.Get(&exists, LogCIDsRefReceiptCIDs, blockNumber)
+	err := tx.Get(&exists, LogCIDsRefReceiptCIDs, blockNumber)
 	if err != nil {
 		return err
 	}
@@ -216,7 +183,7 @@ func ValidateLogCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "eth.receipt_cids")
 	}
 
-	err = ValidateIPFSBlocks(db, blockNumber, "eth.log_cids", "leaf_mh_key")
+	err = ValidateIPFSBlocks(tx, blockNumber, "eth.log_cids", "cid")
 	if err != nil {
 		return err
 	}
@@ -225,14 +192,14 @@ func ValidateLogCIDsRef(db *sqlx.DB, blockNumber uint64) error {
 }
 
 // ValidateIPFSBlocks does a reference integrity check between the given CID table and IPFS blocks table on MHKey and block number
-func ValidateIPFSBlocks(db *sqlx.DB, blockNumber uint64, CIDTable string, mhKeyField string) error {
+func ValidateIPFSBlocks(tx *sqlx.Tx, blockNumber uint64, CIDTable string, CIDField string) error {
 	var exists bool
-	err := db.Get(&exists, fmt.Sprintf(CIDsRefIPLDBlocks, CIDTable, mhKeyField), blockNumber)
+	err := tx.Get(&exists, fmt.Sprintf(CIDsRefIPLDBlocks, CIDTable, CIDField), blockNumber)
 	if err != nil {
 		return err
 	}
 	if exists {
-		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "public.blocks")
+		return fmt.Errorf(ReferentialIntegrityErr, blockNumber, "ipld.blocks")
 	}
 
 	return nil

pkg/validator/ref_integrity_queries.go

@@ -26,7 +26,7 @@ const (
 	CIDsRefIPLDBlocks = `SELECT EXISTS (
 						SELECT *
 						FROM %[1]s
-						LEFT JOIN public.blocks ON (
+						LEFT JOIN ipld.blocks ON (
 							%[1]s.%[2]s = blocks.key
 							AND %[1]s.block_number = blocks.block_number
 						)
@@ -88,38 +88,13 @@ const (
 						SELECT *
 						FROM eth.storage_cids
 						LEFT JOIN eth.state_cids ON (
-							storage_cids.state_path = state_cids.state_path
+							storage_cids.state_leaf_key = state_cids.state_leaf_key
 							AND storage_cids.header_id = state_cids.header_id
 							AND storage_cids.block_number = state_cids.block_number
 						)
 						WHERE
 							storage_cids.block_number = $1
-							AND state_cids.state_path IS NULL
-					)`
-
-	StateAccountsRefStateCIDs = `SELECT EXISTS (
-						SELECT *
-						FROM eth.state_accounts
-						LEFT JOIN eth.state_cids ON (
-							state_accounts.state_path = state_cids.state_path
-							AND state_accounts.header_id = state_cids.header_id
-							AND state_accounts.block_number = state_cids.block_number
-						)
-						WHERE
-							state_accounts.block_number = $1
-							AND state_cids.state_path IS NULL
-					)`
-
-	AccessListElementsRefTransactionCIDs = `SELECT EXISTS (
-						SELECT *
-						FROM eth.access_list_elements
-						LEFT JOIN eth.transaction_cids ON (
-							access_list_elements.tx_id = transaction_cids.tx_hash
-							AND access_list_elements.block_number = transaction_cids.block_number
-						)
-						WHERE
-							access_list_elements.block_number = $1
-							AND transaction_cids.tx_hash IS NULL
+							AND state_cids.state_leaf_key IS NULL
 					)`
 
 	LogCIDsRefReceiptCIDs = `SELECT EXISTS (

pkg/validator/ref_integrity_test.go

@@ -0,0 +1,249 @@
+package validator_test
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/jmoiron/sqlx"
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/helpers"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
+)
+
+func TestRefIntegrity(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "ETH IPLD validator ref integrity suite test")
+}
+
+var _ = Describe("referential integrity", func() {
+	var (
+		db           *sqlx.DB
+		tx           *sqlx.Tx
+		checkedBlock *types.Block // Generated block of interest
+	)
+	BeforeEach(func() {
+		var (
+			blocks      []*types.Block
+			receipts    []types.Receipts
+			chain       *core.BlockChain
+			chainConfig = TestChainConfig
+			mockTD      = big.NewInt(1337)
+			testdb      = rawdb.NewMemoryDatabase()
+		)
+
+		gen := chaingen.DefaultGenContext(chainConfig, testdb)
+		gen.AddFunction(func(i int, block *core.BlockGen) {
+			if i >= 2 {
+				uncle := &types.Header{
+					Number:      big.NewInt(int64(i - 1)),
+					Root:        common.HexToHash("0x1"),
+					TxHash:      common.HexToHash("0x1"),
+					ReceiptHash: common.HexToHash("0x1"),
+					ParentHash:  block.PrevBlock(i - 1).Hash(),
+				}
+				block.AddUncle(uncle)
+			}
+		})
+		blocks, receipts, chain = gen.MakeChain(5)
+
+		indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash())
+		Expect(err).ToNot(HaveOccurred())
+		helpers.IndexChain(indexer, helpers.IndexChainParams{
+			StateCache:      chain.StateCache(),
+			Blocks:          blocks,
+			Receipts:        receipts,
+			TotalDifficulty: mockTD,
+		})
+		checkedBlock = blocks[5]
+
+		db = helpers.SetupDB()
+		tx = db.MustBegin()
+	})
+
+	AfterEach(func() {
+		tx.Rollback()
+		helpers.TearDownDB(db)
+	})
+
+	Describe("ValidateHeaderCIDsRef", func() {
+		It("Validates referential integrity of header_cids table", func() {
+			err := validator.ValidateHeaderCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding header IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateHeaderCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateUncleCIDsRef", func() {
+		It("Validates referential integrity of uncle_cids table", func() {
+			err := validator.ValidateUncleCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding header_cid entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.header_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateUncleCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
+		})
+
+		It("Throws an error if corresponding uncle IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateUncleCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateTransactionCIDsRef", func() {
+		It("Validates referential integrity of transaction_cids table", func() {
+			err := validator.ValidateTransactionCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding header_cid entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.header_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateTransactionCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
+		})
+
+		It("Throws an error if corresponding transaction IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateTransactionCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateReceiptCIDsRef", func() {
+		It("Validates referential integrity of receipt_cids table", func() {
+			err := validator.ValidateReceiptCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding transaction_cids entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.transaction_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateReceiptCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.transaction_cids"))
+		})
+
+		It("Throws an error if corresponding receipt IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateReceiptCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateStateCIDsRef", func() {
+		It("Validates referential integrity of state_cids table", func() {
+			err := validator.ValidateStateCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding header_cids entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.header_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateStateCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
+		})
+
+		It("Throws an error if corresponding state IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateStateCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateStorageCIDsRef", func() {
+		It("Validates referential integrity of storage_cids table", func() {
+			err := validator.ValidateStorageCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding state_cids entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.state_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateStorageCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.state_cids"))
+		})
+
+		It("Throws an error if corresponding storage IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateStorageCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+	Describe("ValidateLogCIDsRef", func() {
+		It("Validates referential integrity of log_cids table", func() {
+			err := validator.ValidateLogCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).ToNot(HaveOccurred())
+		})
+
+		It("Throws an error if corresponding receipt_cids entry not found", func() {
+			err := deleteEntriesFrom(tx, "eth.receipt_cids")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateLogCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.receipt_cids"))
+		})
+
+		It("Throws an error if corresponding log IPFS block entry not found", func() {
+			err := deleteEntriesFrom(tx, "ipld.blocks")
+			Expect(err).ToNot(HaveOccurred())
+
+			err = validator.ValidateLogCIDsRef(tx, checkedBlock.NumberU64())
+			Expect(err).To(HaveOccurred())
+			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "ipld.blocks"))
+		})
+	})
+
+})
+
+func deleteEntriesFrom(tx *sqlx.Tx, tableName string) error {
+	pgStr := "TRUNCATE %s"
+	_, err := tx.Exec(fmt.Sprintf(pgStr, tableName))
+	return err
+}

pkg/validator/validator.go

@@ -30,227 +30,181 @@ import (
 	"github.com/ethereum/go-ethereum/consensus/clique"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"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/core/vm"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/statediff"
+	"github.com/ethereum/go-ethereum/statediff/indexer/database/sql/postgres"
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
 
-	ipfsethdb "github.com/cerc-io/ipfs-ethdb/v4/postgres"
-	ipldEth "github.com/cerc-io/ipld-eth-server/v4/pkg/eth"
-	ethServerShared "github.com/cerc-io/ipld-eth-server/v4/pkg/shared"
+	ipfsethdb "github.com/cerc-io/ipfs-ethdb/v5/postgres/v0"
+	ipldeth "github.com/cerc-io/ipld-eth-server/v5/pkg/eth"
+	"github.com/cerc-io/ipld-eth-server/v5/pkg/shared"
+	ipldstate "github.com/cerc-io/ipld-eth-statedb/trie_by_cid/state"
 
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/prom"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/prom"
 )
 
 var (
 	big8  = big.NewInt(8)
 	big32 = big.NewInt(32)
-
-	ReferentialIntegrityErr = "referential integrity check failed at block %d, entry for %s not found"
-	EntryNotFoundErr        = "entry for %s not found"
 )
 
-type service struct {
-	db              *sqlx.DB
-	blockNum, trail uint64
-	sleepInterval   uint
-	chainCfg        *params.ChainConfig
+type Service struct {
+	db *sqlx.DB
 
-	stateDiffMissingBlock bool
-	stateDiffTimeout      uint
+	chainConfig           *params.ChainConfig
 	ethClient             *rpc.Client
+	blockNum, trail       uint64
+	retryInterval         time.Duration
+	stateDiffMissingBlock bool
+	stateDiffTimeout      time.Duration
 
 	quitChan     chan bool
-	progressChan chan uint64
+	progressChan chan<- uint64
 }
 
-func NewService(cfg *Config, progressChan chan uint64) *service {
-	return &service{
-		db:                    cfg.DB,
-		blockNum:              cfg.BlockNum,
+func NewService(cfg *Config, progressChan chan<- uint64) (*Service, error) {
+	db, err := postgres.ConnectSQLX(context.Background(), cfg.DBConfig)
+	if err != nil {
+		return nil, err
+	}
+	// Enable DB stats
+	if cfg.DBStats {
+		prom.RegisterDBCollector(cfg.DBConfig.DatabaseName, db)
+	}
+
+	return &Service{
+		db:                    db,
+		chainConfig:           cfg.ChainConfig,
+		ethClient:             cfg.Client,
+		blockNum:              cfg.FromBlock,
 		trail:                 cfg.Trail,
-		sleepInterval:         cfg.SleepInterval,
-		chainCfg:              cfg.ChainCfg,
+		retryInterval:         cfg.RetryInterval,
 		stateDiffMissingBlock: cfg.StateDiffMissingBlock,
 		stateDiffTimeout:      cfg.StateDiffTimeout,
-		ethClient:             cfg.Client,
 		quitChan:              make(chan bool),
 		progressChan:          progressChan,
-	}
-}
-
-func NewEthBackend(db *sqlx.DB, c *ipldEth.Config) (*ipldEth.Backend, error) {
-	gcc := c.GroupCacheConfig
-
-	groupName := gcc.StateDB.Name
-	if groupName == "" {
-		groupName = ipldEth.StateDBGroupCacheName
-	}
-
-	r := ipldEth.NewCIDRetriever(db)
-	ethDB := ipfsethdb.NewDatabase(db, ipfsethdb.CacheConfig{
-		Name:           groupName,
-		Size:           gcc.StateDB.CacheSizeInMB * 1024 * 1024,
-		ExpiryDuration: time.Minute * time.Duration(gcc.StateDB.CacheExpiryInMins),
-	})
-
-	// Read only wrapper around ipfs-ethdb eth.Database implementation
-	customEthDB := newDatabase(ethDB)
-
-	return &ipldEth.Backend{
-		DB:            db,
-		Retriever:     r,
-		Fetcher:       ipldEth.NewIPLDFetcher(db),
-		IPLDRetriever: ipldEth.NewIPLDRetriever(db),
-		EthDB:         customEthDB,
-		StateDatabase: state.NewDatabase(customEthDB),
-		Config:        c,
 	}, nil
 }
 
 // Start is used to begin the service
-func (s *service) Start(ctx context.Context, wg *sync.WaitGroup) {
+func (s *Service) Start(ctx context.Context, wg *sync.WaitGroup) {
 	defer wg.Done()
 
-	api, err := EthAPI(ctx, s.db, s.chainCfg)
+	api, err := EthAPI(ctx, s.db, s.chainConfig)
 	if err != nil {
 		log.Fatal(err)
 		return
 	}
 
-	idxBlockNum := s.blockNum
-
+	nextBlockNum := s.blockNum
+	var delay time.Duration
 	for {
 		select {
 		case <-s.quitChan:
-			log.Infof("last validated block %v", idxBlockNum-1)
+			log.Info("stopping ipld-eth-db-validator process")
 			if s.progressChan != nil {
 				close(s.progressChan)
 			}
+			if err := api.B.Close(); err != nil {
+				log.Errorf("error closing backend: %s", err)
+			}
 			return
-		default:
-			idxBlockNum, err = s.Validate(ctx, api, idxBlockNum)
+		case <-time.After(delay):
+			err := s.Validate(ctx, api, nextBlockNum)
+			// If chain is not synced, wait for trail to catch up before trying again
+			if notsynced, ok := err.(*ChainNotSyncedError); ok {
+				delay = s.retryInterval
+				log.Infof("waiting %v for chain to advance to block %d (head is at %d)",
+					delay, nextBlockNum+s.trail, notsynced.Head)
+				continue
+			}
 			if err != nil {
-				log.Infof("last validated block %v", idxBlockNum-1)
 				log.Fatal(err)
 				return
 			}
-
-			prom.SetLastValidatedBlock(float64(idxBlockNum))
+			prom.SetLastValidatedBlock(float64(nextBlockNum))
+			nextBlockNum++
+			delay = 0
 		}
 	}
 }
 
 // Stop is used to gracefully stop the service
-func (s *service) Stop() {
-	log.Info("stopping ipld-eth-db-validator process")
+func (s *Service) Stop() {
 	close(s.quitChan)
 }
 
-func (s *service) Validate(ctx context.Context, api *ipldEth.PublicEthAPI, idxBlockNum uint64) (uint64, error) {
+func (s *Service) Validate(ctx context.Context, api *ipldeth.PublicEthAPI, idxBlockNum uint64) error {
+	log.Debugf("validating block %d", idxBlockNum)
 	headBlockNum, err := fetchHeadBlockNumber(ctx, api)
 	if err != nil {
-		return idxBlockNum, err
-	}
-
-	// Check if it block at height idxBlockNum can be validated
-	if idxBlockNum <= headBlockNum-s.trail {
-		blockToBeValidated, err := api.B.BlockByNumber(ctx, rpc.BlockNumber(idxBlockNum))
-		if err != nil {
-			log.Errorf("failed to fetch block at height %d", idxBlockNum)
-			return idxBlockNum, err
-		}
-
-		// Make a writeStateDiffAt call if block not found in the db
-		if blockToBeValidated == nil {
-			err = s.writeStateDiffAt(idxBlockNum)
-			return idxBlockNum, err
-		}
-
-		err = ValidateBlock(blockToBeValidated, api.B, idxBlockNum)
-		if err != nil {
-			log.Errorf("failed to verify state root at block %d", idxBlockNum)
-			return idxBlockNum, err
-		}
-
-		log.Infof("state root verified for block %d", idxBlockNum)
-
-		err = ValidateReferentialIntegrity(s.db, idxBlockNum)
-		if err != nil {
-			log.Errorf("failed to verify referential integrity at block %d", idxBlockNum)
-			return idxBlockNum, err
-		}
-		log.Infof("referential integrity verified for block %d", idxBlockNum)
-
-		if s.progressChan != nil {
-			s.progressChan <- idxBlockNum
-		}
-
-		idxBlockNum++
-	} else {
-		// Sleep / wait for head to move ahead
-		time.Sleep(time.Second * time.Duration(s.sleepInterval))
-	}
-
-	return idxBlockNum, nil
-}
-
-// writeStateDiffAt calls out to a statediffing geth client to fill in a gap in the index
-func (s *service) writeStateDiffAt(height uint64) error {
-	if !s.stateDiffMissingBlock {
-		return nil
-	}
-
-	var data json.RawMessage
-	params := statediff.Params{
-		IntermediateStateNodes:   true,
-		IntermediateStorageNodes: true,
-		IncludeBlock:             true,
-		IncludeReceipts:          true,
-		IncludeTD:                true,
-		IncludeCode:              true,
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(s.stateDiffTimeout*uint(time.Second)))
-	defer cancel()
-
-	log.Warnf("making writeStateDiffAt call at height %d", height)
-	if err := s.ethClient.CallContext(ctx, &data, "statediff_writeStateDiffAt", height, params); err != nil {
-		log.Errorf("writeStateDiffAt %d faild with err %s", height, err.Error())
 		return err
 	}
 
+	// Check if block at requested height can be validated
+	if idxBlockNum+s.trail > headBlockNum {
+		return &ChainNotSyncedError{headBlockNum}
+	}
+
+	blockToBeValidated, err := api.B.BlockByNumber(ctx, rpc.BlockNumber(idxBlockNum))
+	if err != nil {
+		log.Errorf("failed to fetch block at height %d", idxBlockNum)
+		return err
+	}
+
+	// Make a writeStateDiffAt call if block not found in the db
+	if blockToBeValidated == nil {
+		return s.writeStateDiffAt(idxBlockNum)
+	}
+
+	err = ValidateBlock(blockToBeValidated, api.B, idxBlockNum)
+	if err != nil {
+		log.Errorf("failed to verify state root at block %d", idxBlockNum)
+		return err
+	}
+	log.Infof("state root verified for block %d", idxBlockNum)
+
+	tx := s.db.MustBegin()
+	defer tx.Rollback()
+	err = ValidateReferentialIntegrity(tx, idxBlockNum)
+	if err != nil {
+		log.Errorf("failed to verify referential integrity at block %d", idxBlockNum)
+		return err
+	}
+	log.Infof("referential integrity verified for block %d", idxBlockNum)
+
+	if s.progressChan != nil {
+		s.progressChan <- idxBlockNum
+	}
 	return nil
 }
 
 // ValidateBlock validates block at the given height
-func ValidateBlock(blockToBeValidated *types.Block, b *ipldEth.Backend, blockNumber uint64) error {
-	stateDB, err := applyTransaction(blockToBeValidated, b)
+func ValidateBlock(blockToBeValidated *types.Block, b *ipldeth.Backend, blockNumber uint64) error {
+	state, err := applyTransactions(blockToBeValidated, b)
 	if err != nil {
 		return err
 	}
 
-	blockStateRoot := blockToBeValidated.Header().Root.String()
-
-	dbStateRoot := stateDB.IntermediateRoot(true).String()
+	blockStateRoot := blockToBeValidated.Header().Root
+	dbStateRoot := state.IntermediateRoot(true)
 	if blockStateRoot != dbStateRoot {
 		return fmt.Errorf("state roots do not match at block %d", blockNumber)
 	}
-
 	return nil
 }
 
-func EthAPI(ctx context.Context, db *sqlx.DB, chainCfg *params.ChainConfig) (*ipldEth.PublicEthAPI, error) {
+func EthAPI(ctx context.Context, db *sqlx.DB, chainCfg *params.ChainConfig) (*ipldeth.PublicEthAPI, error) {
 	// TODO: decide network for custom chainConfig.
-	backend, err := NewEthBackend(db, &ipldEth.Config{
+	backend, err := ethBackend(db, &ipldeth.Config{
 		ChainConfig: chainCfg,
-		GroupCacheConfig: &ethServerShared.GroupCacheConfig{
-			StateDB: ethServerShared.GroupConfig{
-				Name: "vulcanize_validator",
+		GroupCacheConfig: &shared.GroupCacheConfig{
+			StateDB: shared.GroupConfig{
+				Name: "cerc_validator",
 			},
 		},
 	})
@@ -267,18 +221,44 @@ func EthAPI(ctx context.Context, db *sqlx.DB, chainCfg *params.ChainConfig) (*ip
 		}
 		backend.Config.ChainConfig = setChainConfig(genesisBlock.Hash())
 	}
-	conf := ipldEth.APIConfig{
+	config := ipldeth.APIConfig{
 		SupportsStateDiff:   false,
 		ForwardEthCalls:     false,
 		ForwardGetStorageAt: false,
 		ProxyOnError:        false,
 		StateDiffTimeout:    0,
 	}
-	return ipldEth.NewPublicEthAPI(backend, nil, conf)
+	return ipldeth.NewPublicEthAPI(backend, nil, config)
+}
+
+func ethBackend(db *sqlx.DB, c *ipldeth.Config) (*ipldeth.Backend, error) {
+	gcc := c.GroupCacheConfig
+
+	groupName := gcc.StateDB.Name
+	if groupName == "" {
+		groupName = ipldeth.StateDBGroupCacheName
+	}
+
+	r := ipldeth.NewRetriever(db)
+	ethDB := ipfsethdb.NewDatabase(db, ipfsethdb.CacheConfig{
+		Name:           groupName,
+		Size:           gcc.StateDB.CacheSizeInMB * 1024 * 1024,
+		ExpiryDuration: time.Minute * time.Duration(gcc.StateDB.CacheExpiryInMins),
+	})
+	// Read only wrapper around ipfs-ethdb eth.Database implementation
+	customEthDB := newDatabase(ethDB)
+
+	return &ipldeth.Backend{
+		DB:                    db,
+		Retriever:             r,
+		EthDB:                 customEthDB,
+		IpldTrieStateDatabase: ipldstate.NewDatabase(customEthDB),
+		Config:                c,
+	}, nil
 }
 
 // fetchHeadBlockNumber gets the latest block number from the db
-func fetchHeadBlockNumber(ctx context.Context, api *ipldEth.PublicEthAPI) (uint64, error) {
+func fetchHeadBlockNumber(ctx context.Context, api *ipldeth.PublicEthAPI) (uint64, error) {
 	headBlock, err := api.B.BlockByNumber(ctx, rpc.LatestBlockNumber)
 	if err != nil {
 		return 0, err
@@ -287,58 +267,82 @@ func fetchHeadBlockNumber(ctx context.Context, api *ipldEth.PublicEthAPI) (uint6
 	return headBlock.NumberU64(), nil
 }
 
-// applyTransaction attempts to apply a transaction to the given state database
-// and uses the input parameters for its environment. It returns the stateDB of parent with applied transa
-func applyTransaction(block *types.Block, backend *ipldEth.Backend) (*state.StateDB, error) {
+// writeStateDiffAt calls out to a statediffing geth client to fill in a gap in the index
+func (s *Service) writeStateDiffAt(height uint64) error {
+	if !s.stateDiffMissingBlock {
+		return nil
+	}
+
+	var data json.RawMessage
+	params := statediff.Params{
+		IncludeBlock:    true,
+		IncludeReceipts: true,
+		IncludeTD:       true,
+		IncludeCode:     true,
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), s.stateDiffTimeout)
+	defer cancel()
+
+	log.Warnf("calling writeStateDiffAt at block %d", height)
+	if err := s.ethClient.CallContext(ctx, &data, "statediff_writeStateDiffAt", height, params); err != nil {
+		log.Errorf("writeStateDiffAt %d failed with err %s", height, err)
+		return err
+	}
+	return nil
+}
+
+// applyTransaction attempts to apply block transactions to the given state database
+// and uses the input parameters for its environment. It returns the stateDB of parent with applied txs.
+func applyTransactions(block *types.Block, backend *ipldeth.Backend) (*ipldstate.StateDB, error) {
 	if block.NumberU64() == 0 {
 		return nil, errors.New("no transaction in genesis")
 	}
 
 	// Create the parent state database
 	parentHash := block.ParentHash()
-	parentRPCBlockHash := rpc.BlockNumberOrHash{
-		BlockHash:        &parentHash,
-		RequireCanonical: false,
-	}
-
-	parent, _ := backend.BlockByNumberOrHash(context.Background(), parentRPCBlockHash)
-	if parent == nil {
-		return nil, fmt.Errorf("parent %#x not found", block.ParentHash())
-	}
-
-	stateDB, _, err := backend.StateAndHeaderByNumberOrHash(context.Background(), parentRPCBlockHash)
+	nrOrHash := rpc.BlockNumberOrHash{BlockHash: &parentHash}
+	statedb, _, err := backend.IPLDTrieStateDBAndHeaderByNumberOrHash(context.Background(), nrOrHash)
 	if err != nil {
 		return nil, err
 	}
 
+	var gp core.GasPool
+	gp.AddGas(block.GasLimit())
+
 	signer := types.MakeSigner(backend.Config.ChainConfig, block.Number())
+	blockContext := core.NewEVMBlockContext(block.Header(), backend, getAuthor(backend, block.Header()))
+	evm := vm.NewEVM(blockContext, vm.TxContext{}, statedb, backend.Config.ChainConfig, vm.Config{})
+	rules := backend.Config.ChainConfig.Rules(block.Number(), true, block.Time())
 
-	for _, tx := range block.Transactions() {
-		// Assemble the transaction call message and return if the requested offset
-		msg, _ := core.TransactionToMessage(tx, signer, block.BaseFee())
-		txContext := core.NewEVMTxContext(msg)
-		ctx := core.NewEVMBlockContext(block.Header(), backend, getAuthor(backend, block.Header()))
+	// Iterate over and process the individual transactions
+	for i, tx := range block.Transactions() {
+		msg, err := core.TransactionToMessage(tx, signer, block.BaseFee())
+		if err != nil {
+			return nil, err
+		}
+		statedb.SetTxContext(tx.Hash(), i)
+		statedb.Prepare(rules, msg.From, block.Coinbase(), msg.To, nil, nil)
 
-		// Not yet the searched for transaction, execute on top of the current state
-		newEVM := vm.NewEVM(ctx, txContext, stateDB, backend.Config.ChainConfig, vm.Config{})
-		rules := backend.Config.ChainConfig.Rules(block.Number(), true, block.Time())
-		stateDB.Prepare(rules, msg.From, block.Coinbase(), msg.To, nil, nil)
-		if _, err := core.ApplyMessage(newEVM, msg, new(core.GasPool).AddGas(block.GasLimit())); err != nil {
+		// Create a new context to be used in the EVM environment.
+		evm.Reset(core.NewEVMTxContext(msg), statedb)
+		// Apply the transaction to the current state (included in the env).
+		if _, err := core.ApplyMessage(evm, msg, &gp); err != nil {
 			return nil, fmt.Errorf("transaction %#x failed: %w", tx.Hash(), err)
 		}
 	}
 
 	if backend.Config.ChainConfig.Ethash != nil {
-		accumulateRewards(backend.Config.ChainConfig, stateDB, block.Header(), block.Uncles())
+		accumulateRewards(backend.Config.ChainConfig, statedb, block.Header(), block.Uncles())
 	}
 
-	return stateDB, nil
+	return statedb, nil
 }
 
 // accumulateRewards credits the coinbase of the given block with the mining
 // reward. The total reward consists of the static block reward and rewards for
 // included uncles. The coinbase of each uncle block is also rewarded.
-func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header *types.Header, uncles []*types.Header) {
+func accumulateRewards(config *params.ChainConfig, state *ipldstate.StateDB, header *types.Header, uncles []*types.Header) {
 	// Select the correct block reward based on chain progression
 	blockReward := ethash.FrontierBlockReward
 	if config.IsByzantium(header.Number) {
@@ -381,7 +385,7 @@ func setChainConfig(ghash common.Hash) *params.ChainConfig {
 	}
 }
 
-func getAuthor(b *ipldEth.Backend, header *types.Header) *common.Address {
+func getAuthor(b *ipldeth.Backend, header *types.Header) *common.Address {
 	author, err := getEngine(b).Author(header)
 	if err != nil {
 		return nil
@@ -390,7 +394,7 @@ func getAuthor(b *ipldEth.Backend, header *types.Header) *common.Address {
 	return &author
 }
 
-func getEngine(b *ipldEth.Backend) consensus.Engine {
+func getEngine(b *ipldeth.Backend) consensus.Engine {
 	// TODO: add logic for other engines
 	if b.Config.ChainConfig.Clique != nil {
 		engine := clique.New(b.Config.ChainConfig.Clique, nil)

pkg/validator/validator_test.go

@@ -0,0 +1,131 @@
+package validator_test
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"github.com/jmoiron/sqlx"
+
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/ethereum/go-ethereum/statediff/indexer/ipld"
+	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
+
+	// import server helpers for non-canonical chain data
+	server_mocks "github.com/cerc-io/ipld-eth-server/v5/pkg/eth/test_helpers"
+
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/chaingen"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/internal/helpers"
+	"github.com/cerc-io/ipld-eth-db-validator/v5/pkg/validator"
+)
+
+const (
+	chainLength = 10
+	startBlock  = 1
+)
+
+var (
+	chainConfig = TestChainConfig
+	mockTD      = big.NewInt(1337)
+	testDB      = rawdb.NewMemoryDatabase()
+)
+
+func init() {
+	// The geth sync logs are noisy, silence them
+	log.Root().SetHandler(log.DiscardHandler())
+}
+
+func setup(t *testing.T) *sqlx.DB {
+	// Make the test blockchain and state
+	gen := chaingen.DefaultGenContext(chainConfig, testDB)
+	blocks, receipts, chain := gen.MakeChain(chainLength)
+
+	t.Cleanup(func() {
+		chain.Stop()
+	})
+
+	indexer, err := helpers.TestStateDiffIndexer(context.Background(), chainConfig, gen.Genesis.Hash())
+	if err != nil {
+		t.Fatal(err)
+	}
+	helpers.IndexChain(indexer, helpers.IndexChainParams{
+		StateCache:      chain.StateCache(),
+		Blocks:          blocks,
+		Receipts:        receipts,
+		TotalDifficulty: mockTD,
+	})
+
+	// Insert some non-canonical data into the database so that we test our ability to discern canonicity
+	tx, err := indexer.PushBlock(server_mocks.MockBlock, server_mocks.MockReceipts,
+		server_mocks.MockBlock.Difficulty())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = tx.Submit(err)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// The non-canonical header has a child
+	tx, err = indexer.PushBlock(server_mocks.MockChild, server_mocks.MockReceipts, server_mocks.MockChild.Difficulty())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ipld := sdtypes.IPLD{
+		CID:     ipld.Keccak256ToCid(ipld.RawBinary, server_mocks.CodeHash.Bytes()).String(),
+		Content: server_mocks.ContractCode,
+	}
+	err = indexer.PushIPLD(tx, ipld)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	err = tx.Submit(err)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	db := helpers.SetupDB()
+
+	t.Cleanup(func() {
+		helpers.TearDownDB(db)
+	})
+	return db
+}
+
+func TestStateValidation(t *testing.T) {
+	db := setup(t)
+
+	t.Run("Validator", func(t *testing.T) {
+		api, err := validator.EthAPI(context.Background(), db, chainConfig)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		for i := uint64(startBlock); i <= chainLength; i++ {
+			blockToBeValidated, err := api.B.BlockByNumber(context.Background(), rpc.BlockNumber(i))
+			if err != nil {
+				t.Fatal(err)
+			}
+			if blockToBeValidated == nil {
+				t.Fatal("blockToBeValidated is nil")
+			}
+
+			err = validator.ValidateBlock(blockToBeValidated, api.B, i)
+			if err != nil {
+				t.Fatal(err)
+			}
+
+			tx := db.MustBegin()
+			defer tx.Rollback()
+			err = validator.ValidateReferentialIntegrity(tx, i)
+			if err != nil {
+				t.Fatal(err)
+			}
+		}
+	})
+}

scripts/get-block-number.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eu
+
+geth_endpoint="$1"
+
+latest_block_hex=$(curl -s $geth_endpoint -X POST -H "Content-Type: application/json" \
+    --data '{"jsonrpc":"2.0","method":"eth_blockNumber","params":[],"id":42}' | \
+    jq -r .result)
+
+printf "%d" $latest_block_hex

scripts/integration-setup.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -ex
+
+CONFIG_DIR=$(readlink -f "${CONFIG_DIR:-$(mktemp -d)}")
+
+# By default assume we are running in the project root
+export CERC_REPO_BASE_DIR="${CERC_REPO_BASE_DIR:-..}"
+# v5 migrations only go up to version 18
+echo CERC_STATEDIFF_DB_GOOSE_MIN_VER=18 >> $CONFIG_DIR/stack.env
+
+laconic_so="${LACONIC_SO:-laconic-so} --stack fixturenet-eth-loaded --quiet"
+
+set -x
+
+# Build and deploy a cluster with only what we need from the stack
+$laconic_so setup-repositories \
+    --exclude github.com/cerc-io/ipld-eth-server,github.com/cerc-io/tx-spammer \
+    --branches-file ./test/stack-refs.txt
+
+$laconic_so build-containers \
+    --exclude cerc/ipld-eth-server,cerc/keycloak,cerc/tx-spammer
+
+$laconic_so deploy \
+    --include fixturenet-eth,ipld-eth-db \
+    --env-file $CONFIG_DIR/stack.env \
+    --cluster test up
+
+set +x
+
+bootnode_endpoint=localhost:$(docker port test-fixturenet-eth-bootnode-geth-1 9898 | head -1 | cut -d':' -f2)
+geth_endpoint=localhost:$(docker port test-fixturenet-eth-geth-1-1 8545 | head -1 | cut -d':' -f2)
+
+# Extract the chain config and ID from genesis file
+curl -s $bootnode_endpoint/geth.json | jq '.config' > "$CONFIG_DIR/chain.json"
+
+# Output vars if we are running on Github
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo ETH_CHAIN_ID="$(jq '.chainId' $CONFIG_DIR/chain.json)" >> "$GITHUB_ENV"
+    echo ETH_CHAIN_CONFIG="$CONFIG_DIR/chain.json" >> "$GITHUB_ENV"
+    echo ETH_HTTP_PATH=$geth_endpoint >> "$GITHUB_ENV"
+    # Read a private key so we can send from a funded account
+    echo DEPLOYER_PRIVATE_KEY="$(curl -s $bootnode_endpoint/accounts.csv | head -1 | cut -d',' -f3)" >> "$GITHUB_ENV"
+fi
+
+export PGPASSWORD=password
+query_blocks_exist='SELECT exists(SELECT block_number FROM ipld.blocks LIMIT 1);'
+
+echo "Waiting until we have some data written..."
+until [[ "$(psql -qtA cerc_testing -h localhost -U vdbm -p 8077 -c "$query_blocks_exist")" = 't' ]]; do
+    sleep 2
+done

scripts/run_integration_test.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-set -o xtrace
-
-export PGPASSWORD=password
-export DATABASE_USER=vdbm
-export DATABASE_PORT=8077
-export DATABASE_PASSWORD=password
-export DATABASE_HOSTNAME=127.0.0.1
-export DATABASE_NAME=vulcanize_testing
-
-# Wait for containers to be up and execute the integration test.
-while [ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8545)" != "200" ]; do echo "waiting for geth-statediff..." && sleep 5; done && \
-        make integrationtest

scripts/run_unit_test.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Clear up existing docker images and volume.
-docker-compose down --remove-orphans --volumes
-
-# Spin up TimescaleDB
-docker-compose -f docker-compose.yml up -d migrations ipld-eth-db
-sleep 45
-
-# Run unit tests
-go clean -testcache
-PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8077 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing make test
-
-# Clean up
-docker-compose down --remove-orphans --volumes

test/README.md

@@ -1,91 +0,0 @@
-# Test Instructions
-
-## Setup
-
-- For running integration tests:
-
-  - Clone [stack-orchestrator](https://github.com/vulcanize/stack-orchestrator), [go-ethereum](https://github.com/vulcanize/go-ethereum) and [ipld-eth-db](https://github.com/vulcanize/ipld-eth-db) repositories.
-
-  - Checkout [v4 release](https://github.com/vulcanize/ipld-eth-db/releases/tag/v4.2.1-alpha) in ipld-eth-db repo.
-
-    ```bash
-    # In ipld-eth-db repo.
-    git checkout v4.2.1-alpha
-    ```
-
-  - Checkout [v4 release](https://github.com/vulcanize/go-ethereum/releases/tag/v1.10.21-statediff-4.1.2-alpha) in go-ethereum repo.
-
-    ```bash
-    # In go-ethereum repo.
-    git checkout v1.10.21-statediff-4.1.2-alpha
-    ```
-
-  - Checkout working commit in stack-orchestrator repo.
-
-    ```bash
-    # In stack-orchestrator repo.
-    git checkout f2fd766f5400fcb9eb47b50675d2e3b1f2753702
-    ```
-
-## Run
-
-- Run unit tests:
-
-  ```bash
-  # In ipld-eth-db-validator root directory.
-  ./scripts/run_unit_test.sh
-  ```
-
-- Run integration tests:
-
-  - In stack-orchestrator repo:
-
-    - Create config file:
-
-      ```bash
-      cd helper-scripts
-
-      ./create-config.sh
-      ```
-
-      A `config.sh` will be created in the root directory.
-
-    - Update/Edit the config file `config.sh`:
-
-      ```bash
-      #!/bin/bash
-
-      # Path to ipld-eth-server repo.
-      vulcanize_ipld_eth_db=~/ipld-eth-db/
-
-      # Path to go-ethereum repo.
-      vulcanize_go_ethereum=~/go-ethereum
-
-      # Path to contract folder.
-      vulcanize_test_contract=~/ipld-eth-db-validator/test/contract
-
-      genesis_file_path='start-up-files/go-ethereum/genesis.json'
-      db_write=true
-      ```
-
-    - Run stack-orchestrator:
-
-      ```bash
-      # In stack-orchestrator root directory.
-      cd helper-scripts
-
-      ./wrapper.sh \
-      -e docker \
-      -d ../docker/local/docker-compose-db-sharding.yml \
-      -d ../docker/local/docker-compose-go-ethereum.yml \
-      -d ../docker/local/docker-compose-contract.yml \
-      -v remove \
-      -p ../config.sh
-      ```
-
-  - Run tests:
-
-    ```bash
-    # In ipld-eth-db-validator root directory.
-    ./scripts/run_integration_test.sh
-    ```

test/compose-db.yml

@@ -1,30 +1,26 @@
-version: '3.2'
+# Containers to run backing DB for unit testing
 
 services:
   migrations:
     restart: on-failure
     depends_on:
       - ipld-eth-db
-    image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v4.2.3-alpha
+    image: git.vdb.to/cerc-io/ipld-eth-db/ipld-eth-db:v5.0.2-alpha
     environment:
       DATABASE_USER: "vdbm"
-      DATABASE_NAME: "vulcanize_testing"
+      DATABASE_NAME: "cerc_testing"
       DATABASE_PASSWORD: "password"
       DATABASE_HOSTNAME: "ipld-eth-db"
       DATABASE_PORT: 5432
 
   ipld-eth-db:
+    container_name: test-ipld-eth-db
     image: timescale/timescaledb:latest-pg14
     restart: always
     command: ["postgres", "-c", "log_statement=all"]
     environment:
       POSTGRES_USER: "vdbm"
-      POSTGRES_DB: "vulcanize_testing"
+      POSTGRES_DB: "cerc_testing"
       POSTGRES_PASSWORD: "password"
     ports:
       - "127.0.0.1:8077:5432"
-    volumes:
-      - vdb_db_eth_validator:/var/lib/postgresql/data
-
-volumes:
-  vdb_db_eth_validator:

test/compose-deployer.yml

@@ -0,0 +1,19 @@
+# Runs the test contract deployment server
+
+services:
+  contract-deployer:
+    restart: on-failure
+    image: cerc/ipld-eth-db-validator/contract-deployer
+    build: ./contract
+    networks:
+      - test_default
+    environment:
+      ETH_ADDR: "http://fixturenet-eth-geth-1:8545"
+      ETH_CHAIN_ID: $ETH_CHAIN_ID
+      DEPLOYER_PRIVATE_KEY: $DEPLOYER_PRIVATE_KEY
+    ports:
+      - 127.0.0.1:3000:3000
+
+networks:
+  test_default:
+    external: true

test/contract/Dockerfile

@@ -1,4 +1,5 @@
-FROM node:14
+# Downgrade from 18.16, see https://github.com/NomicFoundation/hardhat/issues/3877
+FROM node:18.15-slim
 
 ARG ETH_ADDR
 ENV ETH_ADDR $ETH_ADDR
@@ -11,4 +12,4 @@ RUN npm run compile && ls -lah
 
 EXPOSE 3000
 
-ENTRYPOINT ["npm", "start"]
+ENTRYPOINT ["node", "src/index.js"]

test/contract/contracts/GLDToken.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
 contract GLDToken is ERC20 {
     constructor() ERC20("Gold", "GLD") {
         _mint(msg.sender, 1000000000000000000000);

test/contract/contracts/Test.sol

@@ -2,28 +2,27 @@
 pragma solidity ^0.8.0;
 
 contract Test {
-  address payable owner;
+    event logPut (address, uint256);
 
-  modifier onlyOwner {
-    require(
-      msg.sender == owner,
-      "Only owner can call this function."
-    );
-    _;
-  }
+    address payable owner;
+    mapping(address => uint256) public data;
 
-  uint256[100] data;
+    modifier onlyOwner {
+        require(msg.sender == owner, "Only owner can call this function.");
+        _;
+    }
 
-  constructor() {
-    owner = payable(msg.sender);
-    data = [1];
-  }
+    constructor() {
+        owner = payable(msg.sender);
+    }
 
-  function Put(uint256 addr, uint256 value) public {
-    data[addr] = value;
-  }
+    function Put(uint256 value) public {
+        emit logPut(msg.sender, value);
 
-  function close() public onlyOwner {
-    selfdestruct(owner);
-  }
+        data[msg.sender] = value;
+    }
+
+    function close() public onlyOwner {
+        owner.transfer(address(this).balance);
+    }
 }

test/contract/hardhat.config.js

@@ -16,17 +16,32 @@ task("accounts", "Prints the list of accounts", async () => {
 /**
  * @type import('hardhat/config').HardhatUserConfig
  */
-module.exports = {
-  solidity: "0.8.0",
-  networks: {
-    local: {
-      url: 'http://127.0.0.1:8545',
-      chainId: 99
-    },
-    docker: {
-      url: process.env.ETH_ADDR,
-      chainId: 99
-    }
-  }
+
+const localNetwork = {
+  url: process.env.ETH_ADDR || "http://127.0.0.1:8545",
+  chainId: Number(process.env.ETH_CHAIN_ID) || 99,
 };
 
+if (process.env.DEPLOYER_PRIVATE_KEY) {
+  localNetwork["accounts"] = [process.env.DEPLOYER_PRIVATE_KEY];
+}
+
+module.exports = {
+  solidity: {
+    version: '0.8.20',
+    settings: {
+      evmVersion: 'paris',      // see Makefile
+      outputSelection: {
+        '*': {
+          '*': [
+            'abi', 'storageLayout',
+          ]
+        }
+      }
+    }
+  },
+  networks: {
+    local: localNetwork
+  },
+  defaultNetwork: "local"
+};

test/contract/package.json

@@ -4,22 +4,20 @@
   "main": "index.js",
   "scripts": {
     "compile": "npx hardhat compile",
-    "start": "HARDHAT_NETWORK=docker node src/index.js",
-    "start:local": "ETH_ADDR=http://127.0.0.1:8545 npm run start",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "start": "node src/index.js"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
-  "description": "",
+  "description": "Solidity contract deployment server for integration testing",
   "dependencies": {
     "@openzeppelin/contracts": "^4.0.0",
-    "fastify": "^3.14.2",
-    "hardhat": "^2.2.0"
+    "fastify": "^4.0.0",
+    "hardhat": "^2.14.0"
   },
   "devDependencies": {
-    "@nomiclabs/hardhat-ethers": "^2.0.2",
-    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@nomiclabs/hardhat-ethers": "^2.2.3",
+    "@nomiclabs/hardhat-waffle": "^2.0.4",
     "chai": "^4.3.4",
     "ethereum-waffle": "^3.3.0",
     "ethers": "^5.1.0"

test/contract/scripts/deploy.js

@@ -1,18 +0,0 @@
-const hre = require("hardhat");
-
-async function main() {
-    // await hre.run('compile');
-    // We get the contract to deploy
-    const GLDToken = await hre.ethers.getContractFactory("GLDToken");
-    const token = await GLDToken.deploy();
-    await token.deployed();
-    console.log("GLDToken deployed to:", token.address, token.deployTransaction.hash);
-}
-// We recommend this pattern to be able to use async/await everywhere
-// and properly handle errors.
-main()
-    .then(() => process.exit(0))
-    .catch(error => {
-        console.error(error);
-        process.exit(1);
-    });

test/contract/scripts/sample-script.js

@@ -1,36 +0,0 @@
-// We require the Hardhat Runtime Environment explicitly here. This is optional 
-// but useful for running the script in a standalone fashion through `node <script>`.
-//
-// When running the script with `hardhat run <script>` you'll find the Hardhat
-// Runtime Environment's members available in the global scope.
-const hre = require("hardhat");
-
-async function main() {
-  // Hardhat always runs the compile task when running scripts with its command
-  // line interface.
-  //
-  // If this script is run directly using `node` you may want to call compile 
-  // manually to make sure everything is compiled
-  // await hre.run('compile');
-
-  // We get the contract to deploy
-  const Greeter = await hre.ethers.getContractFactory("Greeter");
-  const greeter = await Greeter.deploy("Hello, Hardhat!");
-
-  await greeter.deployed();
-
-  console.log("Greeter deployed to:", greeter.address, "; tx hash: ", greeter.deployTransaction.hash);
-
-  const result = await greeter.setGreeting("Hello 123!");
-
-  console.log("Greeter updated", "; tx hash: ", result.hash, "; block hash: ", result.blockHash);
-}
-
-// We recommend this pattern to be able to use async/await everywhere
-// and properly handle errors.
-main()
-  .then(() => process.exit(0))
-  .catch(error => {
-    console.error(error);
-    process.exit(1);
-  });

test/contract/src/index.js

@@ -1,118 +1,87 @@
 const fastify = require('fastify')({ logger: true });
 const hre = require("hardhat");
 
-
 // readiness check
 fastify.get('/v1/healthz', async (req, reply) => {
-    reply
-        .code(200)
-        .header('Content-Type', 'application/json; charset=utf-8')
-        .send({ success: true })
+  reply
+    .code(200)
+    .header('Content-Type', 'application/json; charset=utf-8')
+    .send({ success: true })
 });
 
-fastify.get('/v1/deployContract', async (req, reply) => {
-    const GLDToken = await hre.ethers.getContractFactory("GLDToken");
-    const token = await GLDToken.deploy();
-    await token.deployed();
-
-    return {
-        address: token.address,
-        txHash: token.deployTransaction.hash,
-        blockNumber: token.deployTransaction.blockNumber,
-        blockHash: token.deployTransaction.blockHash,
-    }
-});
-
-fastify.get('/v1/destroyContract', async (req, reply) => {
-    const addr = req.query.addr;
-
-    const Token = await hre.ethers.getContractFactory("GLDToken");
-    const token = await Token.attach(addr);
-
-    await token.destroy();
-    const blockNum = await hre.ethers.provider.getBlockNumber()
-
-    return {
-        blockNumber: blockNum,
-    }
-})
-
 fastify.get('/v1/sendEth', async (req, reply) => {
-    const to = req.query.to;
-    const value = req.query.value;
+  const to = req.query.to;
+  const value = hre.ethers.utils.parseEther(req.query.value);
 
-    const [owner] = await hre.ethers.getSigners();
-    const tx = await owner.sendTransaction({
-        to,
-        value: hre.ethers.utils.parseEther(value)
-    });
-    await tx.wait(1)
+  const owner = await hre.ethers.getSigner();
+  const tx = await owner.sendTransaction({to, value}).then(tx => tx.wait());
 
-    // console.log(tx);
-    // const coinbaseBalance = await hre.ethers.provider.getBalance(owner.address);
-    // const receiverBalance = await hre.ethers.provider.getBalance(to);
-    // console.log(coinbaseBalance.toString(), receiverBalance.toString());
-
-    return {
-        from: tx.from,
-        to: tx.to,
-        //value: tx.value.toString(),
-        txHash: tx.hash,
-        blockNumber: tx.blockNumber,
-        blockHash: tx.blockHash,
-    }
+  return {
+    from: tx.from,
+    to: tx.to,
+    txHash: tx.hash,
+    blockNumber: tx.blockNumber,
+    blockHash: tx.blockHash,
+  }
 });
 
-fastify.get('/v1/deployTestContract', async (req, reply) => {
-    const testContract = await hre.ethers.getContractFactory("Test");
-    const test = await testContract.deploy();
-    await test.deployed();
+function contractCreator(name) {
+  return async (req, reply) => {
+    const contract = await hre.ethers.getContractFactory(name);
+    const instance = await contract.deploy();
+    const rct = await instance.deployTransaction.wait();
 
     return {
-        address: test.address,
-        txHash: test.deployTransaction.hash,
-        blockNumber: test.deployTransaction.blockNumber,
-        blockHash: test.deployTransaction.blockHash,
-    }
-});
-
-fastify.get('/v1/putTestValue', async (req, reply) => {
-    const addr = req.query.addr;
-    const index = req.query.index;
-    const value = req.query.value;
-
-    const testContract = await hre.ethers.getContractFactory("Test");
-    const test = await testContract.attach(addr);
-
-    const tx = await test.Put(index, value);
-    const receipt = await tx.wait();
-
-    return {
-        blockNumber: receipt.blockNumber,
-    }
-});
-
-fastify.get('/v1/destroyTestContract', async (req, reply) => {
-    const addr = req.query.addr;
-
-    const testContract = await hre.ethers.getContractFactory("Test");
-    const test = await testContract.attach(addr);
-
-    await test.destroy();
-    const blockNum = await hre.ethers.provider.getBlockNumber()
-
-    return {
-        blockNumber: blockNum,
-    }
-})
-
-async function main() {
-    try {
-        await fastify.listen(3000, '0.0.0.0');
-    } catch (err) {
-        fastify.log.error(err);
-        process.exit(1);
+      address: instance.address,
+      txHash: rct.transactionHash,
+      blockNumber: rct.blockNumber,
+      blockHash: rct.blockHash,
     }
+  }
 }
 
+function contractDestroyer(name) {
+  return async (req, reply) => {
+    const addr = req.query.addr;
+    const contract = await hre.ethers.getContractFactory(name);
+    const instance = contract.attach(addr);
+    const rct = await instance.destroy().then(tx => tx.wait());
+
+    return {
+      blockNumber: rct.blockNumber,
+    }
+  }
+}
+
+fastify.get('/v1/deployContract', contractCreator("GLDToken"));
+fastify.get('/v1/destroyContract', contractDestroyer("GLDToken"));
+
+fastify.get('/v1/deployTestContract', contractCreator("Test"));
+fastify.get('/v1/destroyTestContract', contractDestroyer("Test"));
+
+fastify.get('/v1/putTestValue', async (req, reply) => {
+  const addr = req.query.addr;
+  const value = req.query.value;
+
+  const testContract = await hre.ethers.getContractFactory("Test");
+  const test = await testContract.attach(addr);
+
+  const rct = await test.Put(value).then(tx => tx.wait());
+
+  return {
+    blockNumber: rct.blockNumber,
+  }
+});
+
+async function main() {
+  try {
+    await fastify.listen({ port: 3000, host: '0.0.0.0' });
+  } catch (err) {
+    fastify.log.error(err);
+    process.exit(1);
+  }
+}
+
+process.on('SIGINT', () => fastify.close().then(() => process.exit(1)));
+
 main();

test/contract/test/basic-test.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+
+describe("GLDToken", function() {
+  it("Should return the owner's balance", async function() {
+    const Token = await ethers.getContractFactory("GLDToken");
+    const token = await Token.deploy();
+    await token.deployed();
+    
+    const [owner] = await ethers.getSigners();
+    const balance = await token.balanceOf(owner.address);
+    expect(balance).to.equal('1000000000000000000000');
+    expect(await token.totalSupply()).to.equal(balance);  });
+});

test/contract/test/sample-test.js

@@ -1,14 +0,0 @@
-const { expect } = require("chai");
-
-describe("Greeter", function() {
-  it("Should return the new greeting once it's changed", async function() {
-    const Greeter = await ethers.getContractFactory("Greeter");
-    const greeter = await Greeter.deploy("Hello, world!");
-    
-    await greeter.deployed();
-    expect(await greeter.greet()).to.equal("Hello, world!");
-
-    await greeter.setGreeting("Hola, mundo!");
-    expect(await greeter.greet()).to.equal("Hola, mundo!");
-  });
-});

test/helper.go

@@ -1,54 +0,0 @@
-package integration
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	ethServerIntegration "github.com/cerc-io/ipld-eth-server/v4/test"
-)
-
-type PutResult struct {
-	BlockNumber int64 `json:"blockNumber"`
-}
-
-const srvUrl = "http://localhost:3000"
-
-func DeployTestContract() (*ethServerIntegration.ContractDeployed, error) {
-	ethServerIntegration.DeployContract()
-	res, err := http.Get(fmt.Sprintf("%s/v1/deployTestContract", srvUrl))
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	var contract ethServerIntegration.ContractDeployed
-	decoder := json.NewDecoder(res.Body)
-
-	return &contract, decoder.Decode(&contract)
-}
-
-func PutTestValue(addr string, index, value int) (*PutResult, error) {
-	res, err := http.Get(fmt.Sprintf("%s/v1/putTestValue?addr=%s&index=%d&value=%d", srvUrl, addr, index, value))
-	if err != nil {
-		return nil, err
-	}
-
-	var blockNumber PutResult
-	decoder := json.NewDecoder(res.Body)
-
-	return &blockNumber, decoder.Decode(&blockNumber)
-}
-
-func DestroyTestContract(addr string) (*ethServerIntegration.ContractDestroyed, error) {
-	res, err := http.Get(fmt.Sprintf("%s/v1/destroyTestContract?addr=%s", srvUrl, addr))
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-
-	var data ethServerIntegration.ContractDestroyed
-	decoder := json.NewDecoder(res.Body)
-
-	return &data, decoder.Decode(&data)
-}

test/integration_suite_test.go

@@ -1,19 +0,0 @@
-package integration_test
-
-import (
-	"io/ioutil"
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/sirupsen/logrus"
-)
-
-func TestIntegration(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "integration test suite")
-}
-
-var _ = BeforeSuite(func() {
-	logrus.SetOutput(ioutil.Discard)
-})

test/integration_test.go

@@ -1,108 +0,0 @@
-package integration_test
-
-import (
-	"context"
-	"sync"
-	"time"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/validator"
-	integration "github.com/cerc-io/ipld-eth-db-validator/test"
-
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/shared"
-	ethServerIntegration "github.com/cerc-io/ipld-eth-server/v4/test"
-)
-
-const (
-	blockNum               = 1
-	trail                  = 0
-	validatorSleepInterval = uint(5)
-)
-
-var (
-	testAddresses = []string{
-		"0x1111111111111111111111111111111111111112",
-		"0x1ca7c995f8eF0A2989BbcE08D5B7Efe50A584aa1",
-		"0x9a4b666af23a2cdb4e5538e1d222a445aeb82134",
-		"0xF7C7AEaECD2349b129d5d15790241c32eeE4607B",
-		"0x992b6E9BFCA1F7b0797Cee10b0170E536EAd3532",
-		"0x29ed93a7454Bc17a8D4A24D0627009eE0849B990",
-		"0x66E3dCA826b04B5d4988F7a37c91c9b1041e579D",
-		"0x96288939Ac7048c27E0E087b02bDaad3cd61b37b",
-		"0xD354280BCd771541c935b15bc04342c26086FE9B",
-		"0x7f887e25688c274E77b8DeB3286A55129B55AF14",
-	}
-)
-
-var _ = Describe("Integration test", func() {
-	ctx := context.Background()
-
-	var contract *ethServerIntegration.ContractDeployed
-	var err error
-	sleepInterval := 2 * time.Second
-	timeout := 4 * time.Second
-
-	db := shared.SetupDB()
-	cfg := validator.Config{
-		DB:            db,
-		BlockNum:      blockNum,
-		Trail:         trail,
-		SleepInterval: validatorSleepInterval,
-		ChainCfg:      validator.IntegrationTestChainConfig,
-	}
-	validationProgressChan := make(chan uint64)
-	service := validator.NewService(&cfg, validationProgressChan)
-
-	wg := new(sync.WaitGroup)
-
-	It("test init", func() {
-		wg.Add(1)
-		go service.Start(ctx, wg)
-
-		// Deploy a dummy contract as the first contract might get deployed at block number 0
-		_, _ = ethServerIntegration.DeployContract()
-		time.Sleep(sleepInterval)
-	})
-
-	defer It("test teardown", func() {
-		service.Stop()
-		wg.Wait()
-
-		Expect(validationProgressChan).To(BeClosed())
-	})
-
-	Describe("Validate state", func() {
-		It("performs validation on contract deployment", func() {
-			contract, err = integration.DeployTestContract()
-			Expect(err).ToNot(HaveOccurred())
-			time.Sleep(sleepInterval)
-
-			Expect(validationProgressChan).ToNot(BeClosed())
-			Eventually(validationProgressChan, timeout).Should(Receive(Equal(uint64(contract.BlockNumber))))
-		})
-
-		It("performs validation on contract transactions", func() {
-			for i := 0; i < 10; i++ {
-				res, txErr := integration.PutTestValue(contract.Address, i, i)
-				Expect(txErr).ToNot(HaveOccurred())
-				time.Sleep(sleepInterval)
-
-				Expect(validationProgressChan).ToNot(BeClosed())
-				Eventually(validationProgressChan, timeout).Should(Receive(Equal(uint64(res.BlockNumber))))
-			}
-		})
-
-		It("performs validation on eth transfer transactions", func() {
-			for _, address := range testAddresses {
-				tx, txErr := ethServerIntegration.SendEth(address, "0.01")
-				Expect(txErr).ToNot(HaveOccurred())
-				time.Sleep(sleepInterval)
-
-				Expect(validationProgressChan).ToNot(BeClosed())
-				Eventually(validationProgressChan, timeout).Should(Receive(Equal(uint64(tx.BlockNumber))))
-			}
-		})
-	})
-})

test/stack-refs.txt

@@ -0,0 +1,2 @@
+github.com/cerc-io/go-ethereum v1.11.6-statediff-5.0.5-alpha
+github.com/cerc-io/ipld-eth-db v5.0.2-alpha

validator_test/chain_maker.go

@@ -1,119 +0,0 @@
-package validator_test
-
-import (
-	"crypto/ecdsa"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/statediff/test_helpers"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/consensus/ethash"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/params"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/validator"
-)
-
-// Test variables
-var (
-	Testdb          = rawdb.NewMemoryDatabase()
-	TestBankKey, _  = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
-	TestBankAddress = crypto.PubkeyToAddress(TestBankKey.PublicKey) //0x71562b71999873DB5b286dF957af199Ec94617F7
-	TestBankFunds   = big.NewInt(100000000)
-	Genesis         = test_helpers.GenesisBlockForTesting(Testdb, TestBankAddress, TestBankFunds)
-
-	Account1Key, _       = crypto.HexToECDSA("8a1f9a8f95be41cd7ccb6168179afb4504aefe388d1e14474d32c45c72ce7b7a")
-	Account2Key, _       = crypto.HexToECDSA("49a7b37aa6f6645917e7b807e9d1c00d4fa71f18343b0d4122a4d2df64dd6fee")
-	Account1Addr         = crypto.PubkeyToAddress(Account1Key.PublicKey) //0x703c4b2bD70c169f5717101CaeE543299Fc946C7
-	Account2Addr         = crypto.PubkeyToAddress(Account2Key.PublicKey) //0x0D3ab14BBaD3D99F4203bd7a11aCB94882050E7e
-	DeploymentTxData     = common.Hex2Bytes("0x608060405234801561001057600080fd5b50336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550600180819055506101e2806100676000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a1461005057806373d4a13a1461007e575b600080fd5b61004e61009c565b005b61007c6004803603602081101561006657600080fd5b810190808035906020019092919050505061017b565b005b610086610185565b6040518082815260200191505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610141576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602281526020018061018c6022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018190555050565b6001548156fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158205ba91466129f45285f53176d805117208c231ec6343d7896790e6fc4165b802b64736f6c63430005110032")
-	ContractCode         = common.Hex2Bytes("0x608060405234801561001057600080fd5b50600436106100415760003560e01c806343d726d61461004657806365f3c31a1461005057806373d4a13a1461007e575b600080fd5b61004e61009c565b005b61007c6004803603602081101561006657600080fd5b810190808035906020019092919050505061017b565b005b610086610185565b6040518082815260200191505060405180910390f35b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610141576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252602281526020018061018c6022913960400191505060405180910390fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16ff5b8060018190555050565b6001548156fe4f6e6c79206f776e65722063616e2063616c6c20746869732066756e6374696f6e2ea265627a7a723158205ba91466129f45285f53176d805117208c231ec6343d7896790e6fc4165b802b64736f6c63430005110032")
-	CodeHash             = crypto.Keccak256Hash(ContractCode)
-	ContractAddr         common.Address
-	IndexZero            = "0000000000000000000000000000000000000000000000000000000000000000"
-	IndexOne             = "0000000000000000000000000000000000000000000000000000000000000001"
-	ContractSlotPosition = common.FromHex(IndexOne)
-	ContractSlotKeyHash  = crypto.Keccak256Hash(ContractSlotPosition)
-	MiningReward         = big.NewInt(2000000000000000000)
-)
-
-/* test function signatures
-put function sig: 65f3c31a
-close function sig: 43d726d6
-data function sig: 73d4a13a
-*/
-func createLondonTransaction(block *core.BlockGen, addr *common.Address, key *ecdsa.PrivateKey) *types.Transaction {
-	londonTrx := types.NewTx(&types.DynamicFeeTx{
-		ChainID:   validator.TestChainConfig.ChainID,
-		Nonce:     block.TxNonce(*addr),
-		GasTipCap: big.NewInt(50),
-		GasFeeCap: big.NewInt(1000000000),
-		Gas:       21000,
-		To:        addr,
-		Value:     big.NewInt(1000),
-		Data:      []byte{},
-	})
-
-	transactionSigner := types.MakeSigner(validator.TestChainConfig, block.Number())
-	signedTrx1, err := types.SignTx(londonTrx, transactionSigner, key)
-	if err != nil {
-		log.Fatal(err.Error())
-	}
-	return signedTrx1
-}
-
-// MakeChain creates a chain of n blocks starting at and including parent.
-// the returned hash chain is ordered head->parent.
-func MakeChain(n int, parent *types.Block, chainGen func(int, *core.BlockGen)) ([]*types.Block, []types.Receipts, *core.BlockChain) {
-	config := validator.TestChainConfig
-	blocks, receipts := core.GenerateChain(config, parent, ethash.NewFaker(), Testdb, n, chainGen)
-	chain, _ := core.NewBlockChain(Testdb, nil, nil, nil, ethash.NewFaker(), vm.Config{}, nil, nil)
-	return append([]*types.Block{parent}, blocks...), receipts, chain
-}
-
-func TestChainGen(i int, block *core.BlockGen) {
-	signer := types.HomesteadSigner{}
-	switch i {
-	case 0:
-		// In block 1, the test bank sends account #1 some ether.
-		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), Account1Addr, big.NewInt(10000), params.TxGas, nil, nil), signer, TestBankKey)
-		block.AddTx(tx)
-	case 1:
-		// In block 2, the test bank sends some more ether to account #1.
-		// Account1Addr passes it on to account #2.
-		// Account1Addr creates a test contract.
-		tx1, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), Account1Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, TestBankKey)
-		nonce := block.TxNonce(Account1Addr)
-		tx2, _ := types.SignTx(types.NewTransaction(nonce, Account2Addr, big.NewInt(1000), params.TxGas, nil, nil), signer, Account1Key)
-		nonce++
-		tx3, _ := types.SignTx(types.NewContractCreation(nonce, big.NewInt(0), 1000000, big.NewInt(0), DeploymentTxData), signer, Account1Key)
-		ContractAddr = crypto.CreateAddress(Account1Addr, nonce)
-		block.AddTx(tx1)
-		block.AddTx(tx2)
-		block.AddTx(tx3)
-	case 2:
-		block.SetCoinbase(Account2Addr)
-		data := common.Hex2Bytes("65F3C31A0000000000000000000000000000000000000000000000000000000000000003")
-		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), ContractAddr, big.NewInt(0), 100000, nil, data), signer, TestBankKey)
-		block.AddTx(tx)
-	case 3:
-		block.SetCoinbase(Account2Addr)
-		data := common.Hex2Bytes("65F3C31A0000000000000000000000000000000000000000000000000000000000000009")
-		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), ContractAddr, big.NewInt(0), 100000, nil, data), signer, TestBankKey)
-		block.AddTx(tx)
-	case 4:
-		block.SetCoinbase(Account1Addr)
-		data := common.Hex2Bytes("65F3C31A0000000000000000000000000000000000000000000000000000000000000000")
-		tx, _ := types.SignTx(types.NewTransaction(block.TxNonce(TestBankAddress), ContractAddr, big.NewInt(0), 100000, nil, data), signer, TestBankKey)
-		block.AddTx(tx)
-	case 5:
-		block.AddTx(createLondonTransaction(block, &Account1Addr, Account1Key))
-	case 6:
-		block.AddTx(createLondonTransaction(block, &Account2Addr, Account2Key))
-	}
-}

validator_test/ref_integrity_test.go

@@ -1,334 +0,0 @@
-package validator_test
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/params"
-	"github.com/ethereum/go-ethereum/statediff/indexer/interfaces"
-	"github.com/ethereum/go-ethereum/statediff/indexer/mocks"
-	"github.com/jmoiron/sqlx"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/validator"
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers"
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/shared"
-)
-
-var _ = Describe("RefIntegrity", func() {
-	var (
-		ctx = context.Background()
-
-		db          *sqlx.DB
-		diffIndexer interfaces.StateDiffIndexer
-	)
-
-	BeforeEach(func() {
-		db = shared.SetupDB()
-		diffIndexer = shared.SetupTestStateDiffIndexer(ctx, params.TestChainConfig, test_helpers.Genesis.Hash())
-	})
-
-	AfterEach(func() {
-		shared.TearDownDB(db)
-	})
-
-	Describe("ValidateHeaderCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of header_cids table", func() {
-			err := validator.ValidateHeaderCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding header IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateHeaderCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateUncleCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of uncle_cids table", func() {
-			err := validator.ValidateUncleCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding header_cid entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.header_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateUncleCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
-		})
-
-		It("Throws an error if corresponding uncle IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateUncleCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateTransactionCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of transaction_cids table", func() {
-			err := validator.ValidateTransactionCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding header_cid entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.header_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateTransactionCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
-		})
-
-		It("Throws an error if corresponding transaction IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateTransactionCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateReceiptCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of receipt_cids table", func() {
-			err := validator.ValidateReceiptCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding transaction_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.transaction_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateReceiptCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.transaction_cids"))
-		})
-
-		It("Throws an error if corresponding receipt IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateReceiptCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateStateCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, node := range test_helpers.MockStateNodes {
-				err = diffIndexer.PushStateNode(tx, node, test_helpers.MockBlock.Hash().String())
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of state_cids table", func() {
-			err := validator.ValidateStateCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding header_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.header_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateStateCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.header_cids"))
-		})
-
-		It("Throws an error if corresponding state IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateStateCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateStorageCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, node := range test_helpers.MockStateNodes {
-				err = diffIndexer.PushStateNode(tx, node, test_helpers.MockBlock.Hash().String())
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of storage_cids table", func() {
-			err := validator.ValidateStorageCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding state_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.state_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateStorageCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.state_cids"))
-		})
-
-		It("Throws an error if corresponding storage IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateStorageCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-	Describe("ValidateStateAccountsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, node := range test_helpers.MockStateNodes {
-				err = diffIndexer.PushStateNode(tx, node, test_helpers.MockBlock.Hash().String())
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of state_accounts table", func() {
-			err := validator.ValidateStateAccountsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding state_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.state_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateStateAccountsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.state_cids"))
-		})
-	})
-
-	Describe("ValidateAccessListElementsRef", func() {
-		BeforeEach(func() {
-			indexAndPublisher := shared.SetupTestStateDiffIndexer(ctx, mocks.TestConfig, test_helpers.Genesis.Hash())
-
-			tx, err := indexAndPublisher.PushBlock(mocks.MockBlock, mocks.MockReceipts, mocks.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of access_list_elements table", func() {
-			err := validator.ValidateAccessListElementsRef(db, mocks.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding transaction_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.transaction_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateAccessListElementsRef(db, mocks.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.transaction_cids"))
-		})
-	})
-
-	Describe("ValidateLogCIDsRef", func() {
-		BeforeEach(func() {
-			tx, err := diffIndexer.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, node := range test_helpers.MockStateNodes {
-				err = diffIndexer.PushStateNode(tx, node, test_helpers.MockBlock.Hash().String())
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Validates referential integrity of log_cids table", func() {
-			err := validator.ValidateLogCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).ToNot(HaveOccurred())
-		})
-
-		It("Throws an error if corresponding receipt_cids entry not found", func() {
-			err := deleteEntriesFrom(db, "eth.receipt_cids")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateLogCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "eth.receipt_cids"))
-		})
-
-		It("Throws an error if corresponding log IPFS block entry not found", func() {
-			err := deleteEntriesFrom(db, "public.blocks")
-			Expect(err).ToNot(HaveOccurred())
-
-			err = validator.ValidateLogCIDsRef(db, test_helpers.MockBlock.NumberU64())
-			Expect(err).To(HaveOccurred())
-			Expect(err.Error()).To(ContainSubstring(validator.EntryNotFoundErr, "public.blocks"))
-		})
-	})
-
-})
-
-func deleteEntriesFrom(db *sqlx.DB, tableName string) error {
-	pgStr := "DELETE FROM %s"
-	_, err := db.Exec(fmt.Sprintf(pgStr, tableName))
-	return err
-}

validator_test/validator_suite_test.go

@@ -1,19 +0,0 @@
-package validator_test
-
-import (
-	"io/ioutil"
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/sirupsen/logrus"
-)
-
-func TestETHSuite(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "eth ipld validator eth suite test")
-}
-
-var _ = BeforeSuite(func() {
-	logrus.SetOutput(ioutil.Discard)
-})

validator_test/validator_test.go

@@ -1,134 +0,0 @@
-package validator_test_test
-
-import (
-	"context"
-	"math/big"
-
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/eth/test_helpers"
-	"github.com/cerc-io/ipld-eth-server/v4/pkg/shared"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/rpc"
-	"github.com/ethereum/go-ethereum/statediff"
-	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
-	"github.com/jmoiron/sqlx"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/cerc-io/ipld-eth-db-validator/pkg/validator"
-	"github.com/cerc-io/ipld-eth-db-validator/validator_test"
-)
-
-const (
-	chainLength = 20
-	blockHeight = 1
-	trail       = 2
-)
-
-var _ = Describe("eth state reading tests", func() {
-	var (
-		blocks      []*types.Block
-		receipts    []types.Receipts
-		chain       *core.BlockChain
-		db          *sqlx.DB
-		chainConfig = validator.TestChainConfig
-		mockTD      = big.NewInt(1337)
-	)
-
-	It("test init", func() {
-		db = shared.SetupDB()
-		transformer := shared.SetupTestStateDiffIndexer(context.Background(), chainConfig, validator_test.Genesis.Hash())
-
-		// make the test blockchain (and state)
-		blocks, receipts, chain = validator_test.MakeChain(chainLength, validator_test.Genesis, validator_test.TestChainGen)
-		params := statediff.Params{
-			IntermediateStateNodes:   true,
-			IntermediateStorageNodes: true,
-		}
-
-		// iterate over the blocks, generating statediff payloads, and transforming the data into Postgres
-		builder := statediff.NewBuilder(chain.StateCache())
-		for i, block := range blocks {
-			var args statediff.Args
-			var rcts types.Receipts
-			if i == 0 {
-				args = statediff.Args{
-					OldStateRoot: common.Hash{},
-					NewStateRoot: block.Root(),
-					BlockNumber:  block.Number(),
-					BlockHash:    block.Hash(),
-				}
-			} else {
-				args = statediff.Args{
-					OldStateRoot: blocks[i-1].Root(),
-					NewStateRoot: block.Root(),
-					BlockNumber:  block.Number(),
-					BlockHash:    block.Hash(),
-				}
-				rcts = receipts[i-1]
-			}
-
-			diff, err := builder.BuildStateDiffObject(args, params)
-			Expect(err).ToNot(HaveOccurred())
-			tx, err := transformer.PushBlock(block, rcts, mockTD)
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, node := range diff.Nodes {
-				err := transformer.PushStateNode(tx, node, block.Hash().String())
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			err = tx.Submit(err)
-			Expect(err).ToNot(HaveOccurred())
-		}
-
-		// Insert some non-canonical data into the database so that we test our ability to discern canonicity
-		indexAndPublisher := shared.SetupTestStateDiffIndexer(context.Background(), chainConfig, validator_test.Genesis.Hash())
-
-		tx, err := indexAndPublisher.PushBlock(test_helpers.MockBlock, test_helpers.MockReceipts, test_helpers.MockBlock.Difficulty())
-		Expect(err).ToNot(HaveOccurred())
-
-		err = tx.Submit(err)
-		Expect(err).ToNot(HaveOccurred())
-
-		// The non-canonical header has a child
-		tx, err = indexAndPublisher.PushBlock(test_helpers.MockChild, test_helpers.MockReceipts, test_helpers.MockChild.Difficulty())
-		Expect(err).ToNot(HaveOccurred())
-
-		hash := sdtypes.CodeAndCodeHash{
-			Hash: test_helpers.CodeHash,
-			Code: test_helpers.ContractCode,
-		}
-
-		err = indexAndPublisher.PushCodeAndCodeHash(tx, hash)
-		Expect(err).ToNot(HaveOccurred())
-
-		err = tx.Submit(err)
-		Expect(err).ToNot(HaveOccurred())
-	})
-
-	defer It("test teardown", func() {
-		shared.TearDownDB(db)
-		chain.Stop()
-	})
-
-	Describe("state_validation", func() {
-		It("Validator", func() {
-			api, err := validator.EthAPI(context.Background(), db, validator.TestChainConfig)
-			Expect(err).ToNot(HaveOccurred())
-
-			for i := uint64(blockHeight); i <= chainLength-trail; i++ {
-				blockToBeValidated, err := api.B.BlockByNumber(context.Background(), rpc.BlockNumber(i))
-				Expect(err).ToNot(HaveOccurred())
-				Expect(blockToBeValidated).ToNot(BeNil())
-
-				err = validator.ValidateBlock(blockToBeValidated, api.B, i)
-				Expect(err).ToNot(HaveOccurred())
-
-				err = validator.ValidateReferentialIntegrity(db, i)
-				Expect(err).ToNot(HaveOccurred())
-			}
-		})
-	})
-})