Update github variable to work with tags (#164)

* Update github variable to work with tags

* Update tests.yaml

* Use conditional for reference

.github/workflows/run_unit_test.sh

@@ -8,30 +8,22 @@ temp_dir=$(mktemp -d)
 cd $temp_dir
 git clone -b $(cat /tmp/git_head_ref) "https://github.com/$(cat /tmp/git_repository).git"
 cd ipld-eth-server
-mkdir -p out
 
 ## Remove the branch and github related info. This way future runs wont be confused.
 rm -f /tmp/git_head_ref /tmp/git_repository
 
-# Remove existing docker-tsdb directory
+# Spin up DB
-rm -rf out/docker-tsdb/
+docker-compose -f docker-compose.yml up -d ipld-eth-db
-
+trap "docker-compose down --remove-orphans; cd $start_dir ; rm -r $temp_dir" SIGINT SIGTERM ERR
-# Copy over files to setup TimescaleDB
+sleep 10
-ID=$(docker create vulcanize/ipld-eth-db:v4.1.1-alpha)
-docker cp $ID:/app/docker-tsdb out/docker-tsdb/
-docker rm -v $ID
-
-# Spin up TimescaleDB
-docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml up ipld-eth-db
-trap "docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml down --remove-orphans --volumes; cd $start_dir ; rm -r $temp_dir" SIGINT SIGTERM ERR
-sleep 45
 
 # Remove old logs so there's no confusion, then run test
 rm -f /tmp/test.log /tmp/return_test.txt
-PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8066 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing_v4 make test >  /tmp/test.log
+PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8077 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing make test >  /tmp/test.log
 echo $? > /tmp/return_test.txt
 
 # Clean up
-docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml down --remove-orphans --volumes
+docker-compose -f docker-compose.yml down -v --remove-orphans
 cd $start_dir
 rm -fr $temp_dir
+

.github/workflows/tests.yaml

@@ -43,6 +43,7 @@ jobs:
           chmod 400 /tmp/key
           cat  /tmp/git_repository
           cat  /tmp/git_head_ref
+          echo
 
       - name: Raw SCP
         run: |
@@ -68,9 +69,8 @@ jobs:
   integrationtest:
     name: Run integration tests
     env:
-      STACK_ORCHESTRATOR_REF: 418957a1f745c921b21286c13bb033f922a91ae9
+      STACK_ORCHESTRATOR_REF: fcbc74451c5494664fe21f765e89c9c6565c07cb
-      GO_ETHEREUM_REF: "v1.10.18-statediff-4.0.2-alpha"
+      GO_ETHEREUM_REF: 498101102c891c4f8c3cab5649158c642ee1fd6b
-      IPLD_ETH_DB_REF: 91d30b9ea1acecd0a7f4307390a98bf3e289b8d7
       GOPATH: /tmp/go
       DB_WRITE: true
       ETH_FORWARD_ETH_CALLS: false
@@ -97,26 +97,14 @@ jobs:
           ref: ${{ env.GO_ETHEREUM_REF }}
           repository: vulcanize/go-ethereum
           path: "./go-ethereum/"
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.IPLD_ETH_DB_REF }}
-          repository: vulcanize/ipld-eth-db
-          path: "./ipld-eth-db/"
       - name: Create config file
         run: |
           echo vulcanize_go_ethereum=$GITHUB_WORKSPACE/go-ethereum/ > ./config.sh
-          echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ >> ./config.sh
           echo vulcanize_ipld_eth_server=$GITHUB_WORKSPACE/ipld-eth-server/ >> ./config.sh
-          echo vulcanize_test_contract=$GITHUB_WORKSPACE/ipld-eth-server/test/contract >> ./config.sh
           echo db_write=$DB_WRITE >> ./config.sh
           echo eth_forward_eth_calls=$ETH_FORWARD_ETH_CALLS >> ./config.sh
           echo eth_proxy_on_error=$ETH_PROXY_ON_ERROR >> ./config.sh
           echo eth_http_path=$ETH_HTTP_PATH >> ./config.sh
-          echo ipld_eth_server_db_dependency=access-node >> ./config.sh
-          echo go_ethereum_db_dependency=access-node >> ./config.sh
-          echo connecting_db_name=vulcanize_testing_v4 >> ./config.sh
-          echo watched_address_gap_filler_enabled=false >> ./config.sh
-          echo watched_address_gap_filler_interval=5 >> ./config.sh
           cat ./config.sh
       - name: Build geth
         run: |
@@ -127,11 +115,9 @@ jobs:
       - name: Run docker compose
         run: |
           docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
+          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-db.yml" \
           -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
           -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-ipld-eth-server.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-contract.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
           --env-file "$GITHUB_WORKSPACE/config.sh" \
           up -d --build
       - name: Test
@@ -144,9 +130,8 @@ jobs:
   integrationtest_forwardethcalls:
     name: Run integration tests for direct proxy fall-through of eth_calls
     env:
-      STACK_ORCHESTRATOR_REF: 418957a1f745c921b21286c13bb033f922a91ae9
+      STACK_ORCHESTRATOR_REF: fcbc74451c5494664fe21f765e89c9c6565c07cb
-      GO_ETHEREUM_REF: "v1.10.18-statediff-4.0.2-alpha"
+      GO_ETHEREUM_REF: 498101102c891c4f8c3cab5649158c642ee1fd6b
-      IPLD_ETH_DB_REF: 91d30b9ea1acecd0a7f4307390a98bf3e289b8d7
       GOPATH: /tmp/go
       DB_WRITE: false
       ETH_FORWARD_ETH_CALLS: true
@@ -173,26 +158,14 @@ jobs:
           ref: ${{ env.GO_ETHEREUM_REF }}
           repository: vulcanize/go-ethereum
           path: "./go-ethereum/"
-      - uses: actions/checkout@v2
-        with:
-          ref: ${{ env.IPLD_ETH_DB_REF }}
-          repository: vulcanize/ipld-eth-db
-          path: "./ipld-eth-db/"
       - name: Create config file
         run: |
           echo vulcanize_go_ethereum=$GITHUB_WORKSPACE/go-ethereum/ > ./config.sh
-          echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ >> ./config.sh
           echo vulcanize_ipld_eth_server=$GITHUB_WORKSPACE/ipld-eth-server/ >> ./config.sh
-          echo vulcanize_test_contract=$GITHUB_WORKSPACE/ipld-eth-server/test/contract >>./config.sh
           echo db_write=$DB_WRITE >> ./config.sh
           echo eth_forward_eth_calls=$ETH_FORWARD_ETH_CALLS >> ./config.sh
           echo eth_proxy_on_error=$ETH_PROXY_ON_ERROR >> ./config.sh
           echo eth_http_path=$ETH_HTTP_PATH >> ./config.sh
-          echo ipld_eth_server_db_dependency=access-node >> ./config.sh
-          echo go_ethereum_db_dependency=access-node >> ./config.sh
-          echo connecting_db_name=vulcanize_testing_v4 >> ./config.sh
-          echo watched_address_gap_filler_enabled=false >> ./config.sh
-          echo watched_address_gap_filler_interval=5 >> ./config.sh
           cat ./config.sh
       - name: Build geth
         run: |
@@ -203,11 +176,9 @@ jobs:
       - name: Run docker compose
         run: |
           docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
+          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-db.yml" \
           -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
           -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-ipld-eth-server.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-contract.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
           --env-file "$GITHUB_WORKSPACE/config.sh" \
           up -d --build
       - name: Test

README.md

@@ -33,9 +33,9 @@ External dependency
 ## Install
 Start by downloading ipld-eth-server and moving into the repo:
 
-`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server/v4`
+`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server/v3`
 
-`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server/v4@v4.x.x`
+`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server/v3@v3.x.x`
 
 Then, build the binary:
 

cmd/root.go

@@ -27,7 +27,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/prom"
 )
 
 var (

cmd/serve.go

@@ -32,11 +32,11 @@ import (
 	"github.com/spf13/viper"
 	"github.com/vulcanize/gap-filler/pkg/mux"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/graphql"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/graphql"
-	srpc "github.com/vulcanize/ipld-eth-server/v4/pkg/rpc"
+	srpc "github.com/vulcanize/ipld-eth-server/v3/pkg/rpc"
-	s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
+	s "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
-	v "github.com/vulcanize/ipld-eth-server/v4/version"
+	v "github.com/vulcanize/ipld-eth-server/v3/version"
 )
 
 var ErrNoRpcEndpoints = errors.New("no rpc endpoints is available")

cmd/subscribe.go

@@ -27,9 +27,9 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/client"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/client"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	w "github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
+	w "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
 )
 
 // subscribeCmd represents the subscribe command

cmd/validate.go

@@ -22,10 +22,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	validator "github.com/vulcanize/eth-ipfs-state-validator/v4/pkg"
+	validator "github.com/vulcanize/eth-ipfs-state-validator/v3/pkg"
-	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres"
+	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v3/postgres"
 
-	s "github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
+	s "github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
 )
 
 const GroupName = "statedb-validate"

cmd/version.go

@@ -19,7 +19,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	v "github.com/vulcanize/ipld-eth-server/v4/version"
+	v "github.com/vulcanize/ipld-eth-server/v3/version"
 )
 
 // versionCmd represents the version command

docker-compose.yml

@@ -2,16 +2,17 @@ version: '3.2'
 
 services:
   ipld-eth-db:
-    restart: on-failure
+    restart: always
-    depends_on:
+    image: vulcanize/ipld-eth-db:v3.2.0
-      - access-node
-    image: vulcanize/ipld-eth-db:v4.1.1-alpha
     environment:
-      DATABASE_USER: "vdbm"
+      POSTGRES_USER: "vdbm"
-      DATABASE_NAME: "vulcanize_testing_v4"
+      POSTGRES_DB: "vulcanize_testing"
-      DATABASE_PASSWORD: "password"
+      POSTGRES_PASSWORD: "password"
-      DATABASE_HOSTNAME: "access-node"
+    volumes:
-      DATABASE_PORT: 5432
+     - vdb_db_eth_server:/var/lib/postgresql/data
+    ports:
+     - "127.0.0.1:8077:5432"
+    command: ["postgres", "-c", "log_statement=all"]
 
   eth-server:
     restart: unless-stopped

documentation/apis.md

@@ -40,9 +40,9 @@ An example of how to subscribe to a real-time Ethereum data feed from ipld-eth-s
     	"github.com/ethereum/go-ethereum/rpc"
     	"github.com/spf13/viper"
 
-        "github.com/vulcanize/ipld-eth-server/v4/pkg/client"
+        "github.com/vulcanize/ipld-eth-server/v3/pkg/client"
-        "github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+        "github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-        "github.com/vulcanize/ipld-eth-server/v4/pkg/watch"
+        "github.com/vulcanize/ipld-eth-server/v3/pkg/watch"
     )
 
     config, _ := eth.NewEthSubscriptionConfig()
@@ -160,9 +160,9 @@ An example of how to subscribe to a real-time Bitcoin data feed from ipld-eth-se
     	"github.com/ethereum/go-ethereum/rpc"
     	"github.com/spf13/viper"
 
-    	"github.com/vulcanize/ipld-eth-server/v4/pkg/btc"
+    	"github.com/vulcanize/ipld-eth-server/v3/pkg/btc"
-    	"github.com/vulcanize/ipld-eth-server/v4/pkg/client"
+    	"github.com/vulcanize/ipld-eth-server/v3/pkg/client"
-    	"github.com/vulcanize/ipld-eth-server/v4/pkg/watch"
+    	"github.com/vulcanize/ipld-eth-server/v3/pkg/watch"
     )
 
     config, _ := btc.NewBtcSubscriptionConfig()

go.mod

@@ -1,4 +1,4 @@
-module github.com/vulcanize/ipld-eth-server/v4
+module github.com/vulcanize/ipld-eth-server/v3
 
 go 1.18
 
@@ -9,6 +9,7 @@ require (
 	github.com/ipfs/go-cid v0.0.7
 	github.com/ipfs/go-ipfs-blockstore v1.0.1
 	github.com/ipfs/go-ipfs-ds-help v1.0.0
+	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/joho/godotenv v1.4.0
 	github.com/lib/pq v1.10.5
@@ -21,9 +22,9 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.11.0
-	github.com/vulcanize/eth-ipfs-state-validator/v4 v4.0.1-alpha
+	github.com/vulcanize/eth-ipfs-state-validator/v3 v3.0.2
 	github.com/vulcanize/gap-filler v0.3.1
-	github.com/vulcanize/ipfs-ethdb/v4 v4.0.1-alpha
+	github.com/vulcanize/ipfs-ethdb/v3 v3.0.3
 )
 
 require (
@@ -105,7 +106,6 @@ require (
 	github.com/ipfs/go-ipfs-routing v0.1.0 // indirect
 	github.com/ipfs/go-ipfs-util v0.0.2 // indirect
 	github.com/ipfs/go-ipld-cbor v0.0.5 // indirect
-	github.com/ipfs/go-ipld-format v0.2.0 // indirect
 	github.com/ipfs/go-ipld-legacy v0.1.0 // indirect
 	github.com/ipfs/go-ipns v0.1.2 // indirect
 	github.com/ipfs/go-log v1.0.5 // indirect
@@ -284,4 +284,4 @@ require (
 	lukechampine.com/blake3 v1.1.6 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.10.18 => github.com/vulcanize/go-ethereum v1.10.18-statediff-4.0.2-alpha
+replace github.com/ethereum/go-ethereum v1.10.18 => github.com/vulcanize/go-ethereum v1.10.18-statediff-3.2.2

go.sum

@@ -1765,14 +1765,14 @@ github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPU
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
 github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
-github.com/vulcanize/eth-ipfs-state-validator/v4 v4.0.1-alpha h1:3q3siR+ZzbpJ7b0LsMsVyHj7/PJYNf+0XM48LinLUTw=
+github.com/vulcanize/eth-ipfs-state-validator/v3 v3.0.2 h1:YZ24WFrrnTC3of2EFfMIQsGUCk1hkDu++l0TIw6RrFw=
-github.com/vulcanize/eth-ipfs-state-validator/v4 v4.0.1-alpha/go.mod h1:L+0oYQrOUXO7vly1WNT9CUi1ydk5+JEW70q6EqLS4SI=
+github.com/vulcanize/eth-ipfs-state-validator/v3 v3.0.2/go.mod h1:PrVSnKWJhnbCYUAIHESAwnXITN5df3IBckmkmQIBv7o=
 github.com/vulcanize/gap-filler v0.3.1 h1:N5d+jCJo/VTWFvBSbTD7biRhK/OqDZzi1tgA85SIBKs=
 github.com/vulcanize/gap-filler v0.3.1/go.mod h1:qowG1cgshVpBqMokiWro/1xhh0uypw7oAu8FQ42JMy4=
-github.com/vulcanize/go-ethereum v1.10.18-statediff-4.0.2-alpha h1:gTcfBHoaRpsRbP1/dnurg5LFUaqsQMTNqs4R4S2wm9U=
+github.com/vulcanize/go-ethereum v1.10.18-statediff-3.2.2 h1:hAZFOtnfdHtVgiwtcNFZDxCEN01c4W5Xsw+1K/IlHBA=
-github.com/vulcanize/go-ethereum v1.10.18-statediff-4.0.2-alpha/go.mod h1:HelXH7UT1uWdb+St6UAj4pPf93GOggjIV7pVbrWIZ3o=
+github.com/vulcanize/go-ethereum v1.10.18-statediff-3.2.2/go.mod h1:HelXH7UT1uWdb+St6UAj4pPf93GOggjIV7pVbrWIZ3o=
-github.com/vulcanize/ipfs-ethdb/v4 v4.0.1-alpha h1:VxZONVJMxAC6vLhmlQsC3zhmY0D2A3DUoGAn8az6pXY=
+github.com/vulcanize/ipfs-ethdb/v3 v3.0.3 h1:KyNMtSKZk2ZuU+mwAv/SdNEeigFkCxvsTDqxHDpwUL8=
-github.com/vulcanize/ipfs-ethdb/v4 v4.0.1-alpha/go.mod h1:K2ayGLsvsHcm+4A9oD3mwMLElNjw7yn70h+KXo6JdrU=
+github.com/vulcanize/ipfs-ethdb/v3 v3.0.3/go.mod h1:hi3c5YadpoJc0A6Du9OzEAhGxtk0S1pTSAY/rApvuA0=
 github.com/wangjia184/sortedset v0.0.0-20160527075905-f5d03557ba30/go.mod h1:YkocrP2K2tcw938x9gCOmT5G5eCD6jsTz0SZuyAqwIE=
 github.com/warpfork/go-testmark v0.3.0 h1:Q81c4u7hT+BR5kNfNQhEF0VT2pmL7+Kk0wD+ORYl7iA=
 github.com/warpfork/go-testmark v0.3.0/go.mod h1:jhEf8FVxd+F17juRubpmut64NEG6I2rgkUhlcqqXwE0=

main.go

@@ -18,7 +18,7 @@ package main
 import (
 	"github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/cmd"
+	"github.com/vulcanize/ipld-eth-server/v3/cmd"
 )
 
 func main() {

pkg/client/client.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/serve"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/serve"
 )
 
 // Client is used to subscribe to the ipld-eth-server ipld data stream

pkg/eth/api.go

@@ -42,7 +42,7 @@ import (
 	"github.com/ethereum/go-ethereum/statediff"
 	"github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 // APIName is the namespace for the watcher's eth api

pkg/eth/api_test.go

@@ -36,10 +36,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var (

pkg/eth/backend.go

@@ -43,12 +43,12 @@ import (
 	"github.com/ethereum/go-ethereum/trie"
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
-	validator "github.com/vulcanize/eth-ipfs-state-validator/v4/pkg"
+	validator "github.com/vulcanize/eth-ipfs-state-validator/v3/pkg"
-	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v4/postgres"
+	ipfsethdb "github.com/vulcanize/ipfs-ethdb/v3/postgres"
 
 	ethServerShared "github.com/ethereum/go-ethereum/statediff/indexer/shared"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var (
@@ -59,42 +59,31 @@ var (
 
 	// errMissingSignature is returned if a block's extra-data section doesn't seem
 	// to contain a 65 byte secp256k1 signature.
+	errMissingSignature = errors.New("extra-data 65 byte signature suffix missing")
 )
 
 const (
 	RetrieveCanonicalBlockHashByNumber = `SELECT block_hash FROM eth.header_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key)
-										header_cids.mh_key = blocks.key
-										AND header_cids.block_number = blocks.block_number
-									)
 									WHERE block_hash = (SELECT canonical_header_hash($1))`
 	RetrieveCanonicalHeaderByNumber = `SELECT cid, data FROM eth.header_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key)
-										header_cids.mh_key = blocks.key
-										AND header_cids.block_number = blocks.block_number
-									)
 									WHERE block_hash = (SELECT canonical_header_hash($1))`
 	RetrieveTD = `SELECT CAST(td as Text) FROM eth.header_cids
 			WHERE header_cids.block_hash = $1`
-	RetrieveRPCTransaction = `SELECT blocks.data, block_hash, transaction_cids.block_number, index
+	RetrieveRPCTransaction = `SELECT blocks.data, block_hash, block_number, index FROM public.blocks, eth.transaction_cids, eth.header_cids
-			FROM public.blocks, eth.transaction_cids, eth.header_cids
 			WHERE blocks.key = transaction_cids.mh_key
-			AND blocks.block_number = transaction_cids.block_number
 			AND transaction_cids.header_id = header_cids.block_hash
-			AND transaction_cids.block_number = header_cids.block_number
 			AND transaction_cids.tx_hash = $1`
 	RetrieveCodeHashByLeafKeyAndBlockHash = `SELECT code_hash FROM eth.state_accounts, eth.state_cids, eth.header_cids
-											WHERE state_accounts.header_id = state_cids.header_id
+											WHERE state_accounts.header_id = state_cids.header_id AND state_accounts.state_path = state_cids.state_path
-											AND state_accounts.state_path = state_cids.state_path
-											AND state_accounts.block_number = state_cids.block_number
 											AND state_cids.header_id = header_cids.block_hash
-											AND state_cids.block_number = header_cids.block_number
 											AND state_leaf_key = $1
-											AND header_cids.block_number <= (SELECT block_number
+											AND block_number <= (SELECT block_number
 																FROM eth.header_cids
 																WHERE block_hash = $2)
-											AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number))
+											AND header_cids.block_hash = (SELECT canonical_header_hash(block_number))
-											ORDER BY header_cids.block_number DESC
+											ORDER BY block_number DESC
 											LIMIT 1`
 	RetrieveCodeByMhKey = `SELECT data FROM public.blocks WHERE key = $1`
 )

pkg/eth/cid_retriever.go

@@ -19,7 +19,6 @@ package eth
 import (
 	"fmt"
 	"math/big"
-	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -28,7 +27,7 @@ import (
 	"github.com/lib/pq"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 // Retriever interface for substituting mocks in tests
@@ -60,7 +59,7 @@ func (ecr *CIDRetriever) RetrieveFirstBlockNumber() (int64, error) {
 // RetrieveLastBlockNumber is used to retrieve the latest block number in the db
 func (ecr *CIDRetriever) RetrieveLastBlockNumber() (int64, error) {
 	var blockNumber int64
-	err := ecr.db.Get(&blockNumber, "SELECT block_number FROM eth.header_cids ORDER BY block_number DESC LIMIT 1")
+	err := ecr.db.Get(&blockNumber, "SELECT block_number FROM eth.header_cids ORDER BY block_number DESC LIMIT 1 ")
 	return blockNumber, err
 }
 
@@ -168,9 +167,9 @@ func (ecr *CIDRetriever) Retrieve(filter SubscriptionSettings, blockNumber int64
 func (ecr *CIDRetriever) RetrieveHeaderCIDs(tx *sqlx.Tx, blockNumber int64) ([]models.HeaderModel, error) {
 	log.Debug("retrieving header cids for block ", blockNumber)
 	headers := make([]models.HeaderModel, 0)
-	pgStr := `SELECT CAST(block_number as Text), block_hash, parent_hash, cid, mh_key, CAST(td as Text), node_id,
+	pgStr := `SELECT CAST(block_number as Text), block_hash,parent_hash,cid,mh_key,CAST(td as Text),node_id,
-				CAST(reward as Text), state_root, uncle_root,tx_root, receipt_root,bloom, timestamp, times_validated, coinbase
+				CAST(reward as Text), state_root,uncle_root,tx_root,receipt_root,bloom,timestamp,times_validated,
-				FROM eth.header_cids
+				coinbase FROM eth.header_cids
 				WHERE block_number = $1`
 	return headers, tx.Select(&headers, pgStr, blockNumber)
 }
@@ -179,8 +178,7 @@ func (ecr *CIDRetriever) RetrieveHeaderCIDs(tx *sqlx.Tx, blockNumber int64) ([]m
 func (ecr *CIDRetriever) RetrieveUncleCIDsByHeaderID(tx *sqlx.Tx, headerID string) ([]models.UncleModel, error) {
 	log.Debug("retrieving uncle cids for block id ", headerID)
 	headers := make([]models.UncleModel, 0)
-	pgStr := `SELECT CAST(block_number as Text), header_id, block_hash, parent_hash, cid, mh_key, CAST(reward as text)
+	pgStr := `SELECT header_id,block_hash,parent_hash,cid,mh_key, CAST(reward as text) FROM eth.uncle_cids
-				FROM eth.uncle_cids
 				WHERE header_id = $1`
 	return headers, tx.Select(&headers, pgStr, headerID)
 }
@@ -192,15 +190,10 @@ func (ecr *CIDRetriever) RetrieveTxCIDs(tx *sqlx.Tx, txFilter TxFilter, headerID
 	args := make([]interface{}, 0, 3)
 	results := make([]models.TxModel, 0)
 	id := 1
-	pgStr := fmt.Sprintf(`SELECT CAST(transaction_cids.block_number as Text), transaction_cids.tx_hash,
+	pgStr := fmt.Sprintf(`SELECT transaction_cids.tx_hash, transaction_cids.header_id,transaction_cids.cid, transaction_cids.mh_key,
-				transaction_cids.header_id,transaction_cids.cid, transaction_cids.mh_key, transaction_cids.dst,
+				transaction_cids.dst, transaction_cids.src, transaction_cids.index, transaction_cids.tx_data
-				transaction_cids.src, transaction_cids.index, transaction_cids.tx_data
+				FROM eth.transaction_cids INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash)
-				FROM eth.transaction_cids
+			WHERE header_cids.block_hash = $%d`, id)
-				INNER JOIN eth.header_cids ON (
-						transaction_cids.header_id = header_cids.block_hash
-						AND transaction_cids.block_number = header_cids.block_number
-					)
-				WHERE header_cids.block_hash = $%d`, id)
 	args = append(args, headerID)
 	id++
 	if len(txFilter.Dst) > 0 {
@@ -299,13 +292,11 @@ func receiptFilterConditions(id *int, pgStr string, args []interface{}, rctFilte
 func (ecr *CIDRetriever) RetrieveRctCIDsByHeaderID(tx *sqlx.Tx, rctFilter ReceiptFilter, headerID string, trxHashes []string) ([]models.ReceiptModel, error) {
 	log.Debug("retrieving receipt cids for header id ", headerID)
 	args := make([]interface{}, 0, 4)
-	pgStr := `SELECT CAST(receipt_cids.block_number as Text), receipt_cids.tx_id, receipt_cids.leaf_cid,
+	pgStr := `SELECT receipt_cids.tx_id, receipt_cids.leaf_cid, receipt_cids.leaf_mh_key,
-			receipt_cids.leaf_mh_key, receipt_cids.contract, receipt_cids.contract_hash
+ 			receipt_cids.contract, receipt_cids.contract_hash
  			FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids
 			WHERE receipt_cids.tx_id = transaction_cids.tx_hash
-			AND receipt_cids.block_number = transaction_cids.block_number
 			AND transaction_cids.header_id = header_cids.block_hash
-			AND transaction_cids.block_number = header_cids.block_number
 			AND header_cids.block_hash = $1`
 	id := 2
 	args = append(args, headerID)
@@ -317,25 +308,20 @@ func (ecr *CIDRetriever) RetrieveRctCIDsByHeaderID(tx *sqlx.Tx, rctFilter Receip
 	return receiptCids, tx.Select(&receiptCids, pgStr, args...)
 }
 
-// RetrieveFilteredGQLLogs retrieves and returns all the log CIDs provided blockHash that conform to the provided
+// RetrieveFilteredGQLLogs retrieves and returns all the log cIDs provided blockHash that conform to the provided
 // filter parameters.
 func (ecr *CIDRetriever) RetrieveFilteredGQLLogs(tx *sqlx.Tx, rctFilter ReceiptFilter, blockHash *common.Hash) ([]LogResult, error) {
 	log.Debug("retrieving log cids for receipt ids")
 	args := make([]interface{}, 0, 4)
 	id := 1
-	pgStr := `SELECT CAST(eth.log_cids.block_number as Text), eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id,
+	pgStr := `SELECT eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id,
        			eth.log_cids.address, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3,
        			eth.log_cids.log_data, eth.transaction_cids.tx_hash, data, eth.receipt_cids.leaf_cid as cid, eth.receipt_cids.post_status
 				FROM eth.log_cids, eth.receipt_cids, eth.transaction_cids, eth.header_cids, public.blocks
 				WHERE eth.log_cids.rct_id = receipt_cids.tx_id
-				AND eth.log_cids.block_number = eth.receipt_cids.block_number
 				AND receipt_cids.tx_id = transaction_cids.tx_hash
-				AND receipt_cids.block_number = transaction_cids.block_number
+ 				AND transaction_cids.header_id = header_cids.block_hash
-				AND transaction_cids.header_id = header_cids.block_hash
+ 				AND log_cids.leaf_mh_key = blocks.key AND header_cids.block_hash = $1`
-				AND transaction_cids.block_number = header_cids.block_number
- 				AND log_cids.leaf_mh_key = blocks.key
-				AND log_cids.block_number = blocks.block_number
-				AND header_cids.block_hash = $1`
 
 	args = append(args, blockHash.String())
 	id++
@@ -357,17 +343,14 @@ func (ecr *CIDRetriever) RetrieveFilteredGQLLogs(tx *sqlx.Tx, rctFilter ReceiptF
 func (ecr *CIDRetriever) RetrieveFilteredLog(tx *sqlx.Tx, rctFilter ReceiptFilter, blockNumber int64, blockHash *common.Hash) ([]LogResult, error) {
 	log.Debug("retrieving log cids for receipt ids")
 	args := make([]interface{}, 0, 4)
-	pgStr := `SELECT CAST(eth.log_cids.block_number as Text), eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id,
+	pgStr := `SELECT eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id,
        			eth.log_cids.address, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3,
        			eth.log_cids.log_data, eth.transaction_cids.tx_hash, eth.transaction_cids.index as txn_index,
        			header_cids.block_hash, CAST(header_cids.block_number as Text)
 							FROM eth.log_cids, eth.receipt_cids, eth.transaction_cids, eth.header_cids
 							WHERE eth.log_cids.rct_id = receipt_cids.tx_id
-							AND eth.log_cids.block_number = eth.receipt_cids.block_number
 							AND receipt_cids.tx_id = transaction_cids.tx_hash
-							AND receipt_cids.block_number = transaction_cids.block_number
+							AND transaction_cids.header_id = header_cids.block_hash`
-							AND transaction_cids.header_id = header_cids.block_hash
-							AND transaction_cids.block_number = header_cids.block_number`
 	id := 1
 	if blockNumber > 0 {
 		pgStr += fmt.Sprintf(` AND header_cids.block_number = $%d`, id)
@@ -397,13 +380,10 @@ func (ecr *CIDRetriever) RetrieveFilteredLog(tx *sqlx.Tx, rctFilter ReceiptFilte
 func (ecr *CIDRetriever) RetrieveRctCIDs(tx *sqlx.Tx, rctFilter ReceiptFilter, blockNumber int64, blockHash *common.Hash, txHashes []string) ([]models.ReceiptModel, error) {
 	log.Debug("retrieving receipt cids for block ", blockNumber)
 	args := make([]interface{}, 0, 5)
-	pgStr := `SELECT CAST(receipt_cids.block_number as Text), receipt_cids.tx_id, receipt_cids.leaf_cid,
+	pgStr := `SELECT receipt_cids.tx_id, receipt_cids.leaf_cid, receipt_cids.leaf_mh_key, receipt_cids.tx_id
-			receipt_cids.leaf_mh_key,
  			FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids
 			WHERE receipt_cids.tx_id = transaction_cids.tx_hash
-			AND receipt_cids.block_number = transaction_cids.block_number
+			AND transaction_cids.header_id = header_cids.block_hash`
-			AND transaction_cids.header_id = header_cids.block_hash
-			AND transaction_cids.block_number = header_cids.block_number`
 	id := 1
 	if blockNumber > 0 {
 		pgStr += fmt.Sprintf(` AND header_cids.block_number = $%d`, id)
@@ -436,13 +416,9 @@ func hasTopics(topics [][]string) bool {
 func (ecr *CIDRetriever) RetrieveStateCIDs(tx *sqlx.Tx, stateFilter StateFilter, headerID string) ([]models.StateNodeModel, error) {
 	log.Debug("retrieving state cids for header id ", headerID)
 	args := make([]interface{}, 0, 2)
-	pgStr := `SELECT CAST(state_cids.block_number as Text), state_cids.header_id,
+	pgStr := `SELECT state_cids.header_id,
 			state_cids.state_leaf_key, state_cids.node_type, state_cids.cid, state_cids.mh_key, state_cids.state_path
-			FROM eth.state_cids
+			FROM eth.state_cids INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
-			INNER JOIN eth.header_cids ON (
-				state_cids.header_id = header_cids.block_hash
-				AND state_cids.block_number = header_cids.block_number
-			)
 			WHERE header_cids.block_hash = $1`
 	args = append(args, headerID)
 	addrLen := len(stateFilter.Addresses)
@@ -465,15 +441,11 @@ func (ecr *CIDRetriever) RetrieveStateCIDs(tx *sqlx.Tx, stateFilter StateFilter,
 func (ecr *CIDRetriever) RetrieveStorageCIDs(tx *sqlx.Tx, storageFilter StorageFilter, headerID string) ([]models.StorageNodeWithStateKeyModel, error) {
 	log.Debug("retrieving storage cids for header id ", headerID)
 	args := make([]interface{}, 0, 3)
-	pgStr := `SELECT CAST(storage_cids.block_number as Text), storage_cids.header_id, storage_cids.storage_leaf_key,
+	pgStr := `SELECT storage_cids.header_id, storage_cids.storage_leaf_key, storage_cids.node_type,
-			storage_cids.node_type, storage_cids.cid, storage_cids.mh_key, storage_cids.storage_path, storage_cids.state_path,
+ 			storage_cids.cid, storage_cids.mh_key, storage_cids.storage_path, storage_cids.state_path, state_cids.state_leaf_key
-			state_cids.state_leaf_key
  			FROM eth.storage_cids, eth.state_cids, eth.header_cids
-			WHERE storage_cids.header_id = state_cids.header_id
+			WHERE storage_cids.header_id = state_cids.header_id AND storage_cids.state_path = state_cids.state_path
-			AND storage_cids.state_path = state_cids.state_path
-			AND storage_cids.block_number = state_cids.block_number
 			AND state_cids.header_id = header_cids.block_hash
-			AND state_cids.block_number = header_cids.block_number
 			AND header_cids.block_hash = $1`
 	args = append(args, headerID)
 	id := 2
@@ -524,10 +496,6 @@ func (ecr *CIDRetriever) RetrieveBlockByHash(blockHash common.Hash) (models.Head
 		log.Error("header cid retrieval error")
 		return models.HeaderModel{}, nil, nil, nil, err
 	}
-	blockNumber, err := strconv.ParseInt(headerCID.BlockNumber, 10, 64)
-	if err != nil {
-		return models.HeaderModel{}, nil, nil, nil, err
-	}
 	var uncleCIDs []models.UncleModel
 	uncleCIDs, err = ecr.RetrieveUncleCIDsByHeaderID(tx, headerCID.BlockHash)
 	if err != nil {
@@ -535,7 +503,7 @@ func (ecr *CIDRetriever) RetrieveBlockByHash(blockHash common.Hash) (models.Head
 		return models.HeaderModel{}, nil, nil, nil, err
 	}
 	var txCIDs []models.TxModel
-	txCIDs, err = ecr.RetrieveTxCIDsByHeaderID(tx, headerCID.BlockHash, blockNumber)
+	txCIDs, err = ecr.RetrieveTxCIDsByHeaderID(tx, headerCID.BlockHash)
 	if err != nil {
 		log.Error("tx cid retrieval error")
 		return models.HeaderModel{}, nil, nil, nil, err
@@ -588,7 +556,7 @@ func (ecr *CIDRetriever) RetrieveBlockByNumber(blockNumber int64) (models.Header
 		return models.HeaderModel{}, nil, nil, nil, err
 	}
 	var txCIDs []models.TxModel
-	txCIDs, err = ecr.RetrieveTxCIDsByHeaderID(tx, headerCID[0].BlockHash, blockNumber)
+	txCIDs, err = ecr.RetrieveTxCIDsByHeaderID(tx, headerCID[0].BlockHash)
 	if err != nil {
 		log.Error("tx cid retrieval error")
 		return models.HeaderModel{}, nil, nil, nil, err
@@ -608,33 +576,30 @@ func (ecr *CIDRetriever) RetrieveBlockByNumber(blockNumber int64) (models.Header
 // RetrieveHeaderCIDByHash returns the header for the given block hash
 func (ecr *CIDRetriever) RetrieveHeaderCIDByHash(tx *sqlx.Tx, blockHash common.Hash) (models.HeaderModel, error) {
 	log.Debug("retrieving header cids for block hash ", blockHash.String())
-	pgStr := `SELECT block_hash, CAST(block_number as Text), cid, mh_key FROM eth.header_cids
+	pgStr := `SELECT block_hash,cid,mh_key FROM eth.header_cids
 			WHERE block_hash = $1`
 	var headerCID models.HeaderModel
 	return headerCID, tx.Get(&headerCID, pgStr, blockHash.String())
 }
 
 // RetrieveTxCIDsByHeaderID retrieves all tx CIDs for the given header id
-func (ecr *CIDRetriever) RetrieveTxCIDsByHeaderID(tx *sqlx.Tx, headerID string, blockNumber int64) ([]models.TxModel, error) {
+func (ecr *CIDRetriever) RetrieveTxCIDsByHeaderID(tx *sqlx.Tx, headerID string) ([]models.TxModel, error) {
 	log.Debug("retrieving tx cids for block id ", headerID)
-	pgStr := `SELECT CAST(block_number as Text), header_id, index, tx_hash, cid, mh_key,
+	pgStr := `SELECT * FROM eth.transaction_cids
-			dst, src, tx_data, tx_type, value
+			WHERE header_id = $1
-			FROM eth.transaction_cids
-			WHERE header_id = $1 AND block_number = $2
 			ORDER BY index`
 	var txCIDs []models.TxModel
-	return txCIDs, tx.Select(&txCIDs, pgStr, headerID, blockNumber)
+	return txCIDs, tx.Select(&txCIDs, pgStr, headerID)
 }
 
 // RetrieveReceiptCIDsByTxIDs retrieves receipt CIDs by their associated tx IDs
 func (ecr *CIDRetriever) RetrieveReceiptCIDsByTxIDs(tx *sqlx.Tx, txHashes []string) ([]models.ReceiptModel, error) {
 	log.Debugf("retrieving receipt cids for tx hashes %v", txHashes)
-	pgStr := `SELECT CAST(receipt_cids.block_number as Text), receipt_cids.tx_id, receipt_cids.leaf_cid, receipt_cids.leaf_mh_key,
+	pgStr := `SELECT receipt_cids.tx_id, receipt_cids.leaf_cid, receipt_cids.leaf_mh_key,
  			receipt_cids.contract, receipt_cids.contract_hash
 			FROM eth.receipt_cids, eth.transaction_cids
 			WHERE tx_id = ANY($1)
 			AND receipt_cids.tx_id = transaction_cids.tx_hash
-			AND receipt_cids.block_number = transaction_cids.block_number
 			ORDER BY transaction_cids.index`
 	var rctCIDs []models.ReceiptModel
 	return rctCIDs, tx.Select(&rctCIDs, pgStr, pq.Array(txHashes))

pkg/eth/cid_retriever_test.go

@@ -29,9 +29,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var (
@@ -249,7 +249,6 @@ var _ = Describe("Retriever", func() {
 				AND header_cids.block_number = $1
 				ORDER BY transaction_cids.index`
 			err := db.Select(&expectedRctCIDsAndLeafNodes, pgStr, test_helpers.BlockNumber.Uint64())
-			Expect(err).ToNot(HaveOccurred())
 			cids, empty, err := retriever.Retrieve(openFilter, 1)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(empty).ToNot(BeTrue())
@@ -413,13 +412,12 @@ var _ = Describe("Retriever", func() {
 			Expect(len(cids7[0].StorageNodes)).To(Equal(0))
 			Expect(len(cids7[0].StateNodes)).To(Equal(1))
 			Expect(cids7[0].StateNodes[0]).To(Equal(models.StateNodeModel{
-				BlockNumber: "1",
+				HeaderID: cids7[0].StateNodes[0].HeaderID,
-				HeaderID:    cids7[0].StateNodes[0].HeaderID,
+				NodeType: 2,
-				NodeType:    2,
+				StateKey: common.BytesToHash(test_helpers.AccountLeafKey).Hex(),
-				StateKey:    common.BytesToHash(test_helpers.AccountLeafKey).Hex(),
+				CID:      test_helpers.State2CID.String(),
-				CID:         test_helpers.State2CID.String(),
+				MhKey:    test_helpers.State2MhKey,
-				MhKey:       test_helpers.State2MhKey,
+				Path:     []byte{'\x0c'},
-				Path:        []byte{'\x0c'},
 			}))
 
 			_, empty, err = retriever.Retrieve(rctTopicsAndAddressFilterFail, 1)

pkg/eth/eth_state_test.go

@@ -37,10 +37,10 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var (

pkg/eth/filterer.go

@@ -82,9 +82,8 @@ func (s *ResponseFilterer) filterHeaders(headerFilter HeaderFilter, response *IP
 			return err
 		}
 		response.Header = models.IPLDModel{
-			BlockNumber: payload.Block.Number().String(),
+			Data: headerRLP,
-			Data:        headerRLP,
+			Key:  cid.String(),
-			Key:         cid.String(),
 		}
 		if headerFilter.Uncles {
 			response.Uncles = make([]models.IPLDModel, len(payload.Block.Body().Uncles))
@@ -98,9 +97,8 @@ func (s *ResponseFilterer) filterHeaders(headerFilter HeaderFilter, response *IP
 					return err
 				}
 				response.Uncles[i] = models.IPLDModel{
-					BlockNumber: uncle.Number.String(),
+					Data: uncleRlp,
-					Data:        uncleRlp,
+					Key:  cid.String(),
-					Key:         cid.String(),
 				}
 			}
 		}
@@ -185,9 +183,8 @@ func (s *ResponseFilterer) filerReceipts(receiptFilter ReceiptFilter, response *
 			// TODO: Verify this filter logic.
 			if checkReceipts(receipt, receiptFilter.Topics, topics, receiptFilter.LogAddresses, contracts, trxHashes) {
 				response.Receipts = append(response.Receipts, models.IPLDModel{
-					BlockNumber: payload.Block.Number().String(),
+					Data: rctIPLDData[idx],
-					Data:        rctIPLDData[idx],
+					Key:  rctLeafCID[idx].String(),
-					Key:         rctLeafCID[idx].String(),
 				})
 			}
 		}
@@ -285,9 +282,8 @@ func (s *ResponseFilterer) filterStateAndStorage(stateFilter StateFilter, storag
 					StateLeafKey: common.BytesToHash(stateNode.LeafKey),
 					Path:         stateNode.Path,
 					IPLD: models.IPLDModel{
-						BlockNumber: payload.Block.Number().String(),
+						Data: stateNode.NodeValue,
-						Data:        stateNode.NodeValue,
+						Key:  cid.String(),
-						Key:         cid.String(),
 					},
 					Type: stateNode.NodeType,
 				})
@@ -304,9 +300,8 @@ func (s *ResponseFilterer) filterStateAndStorage(stateFilter StateFilter, storag
 						StateLeafKey:   common.BytesToHash(stateNode.LeafKey),
 						StorageLeafKey: common.BytesToHash(storageNode.LeafKey),
 						IPLD: models.IPLDModel{
-							BlockNumber: payload.Block.Number().String(),
+							Data: storageNode.NodeValue,
-							Data:        storageNode.NodeValue,
+							Key:  cid.String(),
-							Key:         cid.String(),
 						},
 						Type: storageNode.NodeType,
 						Path: storageNode.Path,

pkg/eth/filterer_test.go

@@ -25,9 +25,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var (
@@ -61,16 +61,14 @@ var _ = Describe("Filterer", func() {
 				Expect(stateNode.Type).To(Equal(sdtypes.Leaf))
 				if bytes.Equal(stateNode.StateLeafKey.Bytes(), test_helpers.AccountLeafKey) {
 					Expect(stateNode.IPLD).To(Equal(models.IPLDModel{
-						BlockNumber: test_helpers.BlockNumber.String(),
+						Data: test_helpers.State2IPLD.RawData(),
-						Data:        test_helpers.State2IPLD.RawData(),
+						Key:  test_helpers.State2IPLD.Cid().String(),
-						Key:         test_helpers.State2IPLD.Cid().String(),
 					}))
 				}
 				if bytes.Equal(stateNode.StateLeafKey.Bytes(), test_helpers.ContractLeafKey) {
 					Expect(stateNode.IPLD).To(Equal(models.IPLDModel{
-						BlockNumber: test_helpers.BlockNumber.String(),
+						Data: test_helpers.State1IPLD.RawData(),
-						Data:        test_helpers.State1IPLD.RawData(),
+						Key:  test_helpers.State1IPLD.Cid().String(),
-						Key:         test_helpers.State1IPLD.Cid().String(),
 					}))
 				}
 			}
@@ -89,9 +87,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds1.StateNodes)).To(Equal(0))
 			Expect(len(iplds1.Receipts)).To(Equal(1))
 			Expect(iplds1.Receipts[0]).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.Rct1IPLD,
-				Data:        test_helpers.Rct1IPLD,
+				Key:  test_helpers.Rct1CID.String(),
-				Key:         test_helpers.Rct1CID.String(),
 			}))
 
 			iplds2, err := filterer.Filter(rctTopicsFilter, test_helpers.MockConvertedPayload)
@@ -105,9 +102,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds2.StateNodes)).To(Equal(0))
 			Expect(len(iplds2.Receipts)).To(Equal(1))
 			Expect(iplds2.Receipts[0]).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.Rct1IPLD,
-				Data:        test_helpers.Rct1IPLD,
+				Key:  test_helpers.Rct1CID.String(),
-				Key:         test_helpers.Rct1CID.String(),
 			}))
 
 			iplds3, err := filterer.Filter(rctTopicsAndAddressFilter, test_helpers.MockConvertedPayload)
@@ -121,9 +117,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds3.StateNodes)).To(Equal(0))
 			Expect(len(iplds3.Receipts)).To(Equal(1))
 			Expect(iplds3.Receipts[0]).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.Rct1IPLD,
-				Data:        test_helpers.Rct1IPLD,
+				Key:  test_helpers.Rct1CID.String(),
-				Key:         test_helpers.Rct1CID.String(),
 			}))
 
 			iplds4, err := filterer.Filter(rctAddressesAndTopicFilter, test_helpers.MockConvertedPayload)
@@ -137,9 +132,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds4.StateNodes)).To(Equal(0))
 			Expect(len(iplds4.Receipts)).To(Equal(1))
 			Expect(iplds4.Receipts[0]).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.Rct2IPLD,
-				Data:        test_helpers.Rct2IPLD,
+				Key:  test_helpers.Rct2CID.String(),
-				Key:         test_helpers.Rct2CID.String(),
 			}))
 
 			iplds5, err := filterer.Filter(rctsForAllCollectedTrxs, test_helpers.MockConvertedPayload)
@@ -171,9 +165,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds6.StateNodes)).To(Equal(0))
 			Expect(len(iplds6.Receipts)).To(Equal(1))
 			Expect(iplds4.Receipts[0]).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.Rct2IPLD,
-				Data:        test_helpers.Rct2IPLD,
+				Key:  test_helpers.Rct2CID.String(),
-				Key:         test_helpers.Rct2CID.String(),
 			}))
 
 			iplds7, err := filterer.Filter(stateFilter, test_helpers.MockConvertedPayload)
@@ -188,9 +181,8 @@ var _ = Describe("Filterer", func() {
 			Expect(len(iplds7.StateNodes)).To(Equal(1))
 			Expect(iplds7.StateNodes[0].StateLeafKey.Bytes()).To(Equal(test_helpers.AccountLeafKey))
 			Expect(iplds7.StateNodes[0].IPLD).To(Equal(models.IPLDModel{
-				BlockNumber: test_helpers.BlockNumber.String(),
+				Data: test_helpers.State2IPLD.RawData(),
-				Data:        test_helpers.State2IPLD.RawData(),
+				Key:  test_helpers.State2IPLD.Cid().String(),
-				Key:         test_helpers.State2IPLD.Cid().String(),
 			}))
 
 			iplds8, err := filterer.Filter(rctTopicsAndAddressFilterFail, test_helpers.MockConvertedPayload)

pkg/eth/ipld_fetcher.go

@@ -20,13 +20,12 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"strconv"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/statediff/indexer/models"
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 // Fetcher interface for substituting mocks in tests
@@ -103,19 +102,13 @@ func (f *IPLDFetcher) Fetch(cids CIDWrapper) (*IPLDs, error) {
 // FetchHeaders fetches headers
 func (f *IPLDFetcher) FetchHeader(tx *sqlx.Tx, c models.HeaderModel) (models.IPLDModel, error) {
 	log.Debug("fetching header ipld")
-	blockNumber, err := strconv.ParseUint(c.BlockNumber, 10, 64)
+	headerBytes, err := shared.FetchIPLDByMhKey(tx, c.MhKey)
-	if err != nil {
-		return models.IPLDModel{}, err
-	}
-
-	headerBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, c.MhKey, blockNumber)
 	if err != nil {
 		return models.IPLDModel{}, err
 	}
 	return models.IPLDModel{
-		BlockNumber: c.BlockNumber,
+		Data: headerBytes,
-		Data:        headerBytes,
+		Key:  c.CID,
-		Key:         c.CID,
 	}, nil
 }
 
@@ -124,18 +117,13 @@ func (f *IPLDFetcher) FetchUncles(tx *sqlx.Tx, cids []models.UncleModel) ([]mode
 	log.Debug("fetching uncle iplds")
 	uncleIPLDs := make([]models.IPLDModel, len(cids))
 	for i, c := range cids {
-		blockNumber, err := strconv.ParseUint(c.BlockNumber, 10, 64)
+		uncleBytes, err := shared.FetchIPLDByMhKey(tx, c.MhKey)
-		if err != nil {
-			return nil, err
-		}
-		uncleBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, c.MhKey, blockNumber)
 		if err != nil {
 			return nil, err
 		}
 		uncleIPLDs[i] = models.IPLDModel{
-			BlockNumber: c.BlockNumber,
+			Data: uncleBytes,
-			Data:        uncleBytes,
+			Key:  c.CID,
-			Key:         c.CID,
 		}
 	}
 	return uncleIPLDs, nil
@@ -146,18 +134,13 @@ func (f *IPLDFetcher) FetchTrxs(tx *sqlx.Tx, cids []models.TxModel) ([]models.IP
 	log.Debug("fetching transaction iplds")
 	trxIPLDs := make([]models.IPLDModel, len(cids))
 	for i, c := range cids {
-		blockNumber, err := strconv.ParseUint(c.BlockNumber, 10, 64)
+		txBytes, err := shared.FetchIPLDByMhKey(tx, c.MhKey)
-		if err != nil {
-			return nil, err
-		}
-		txBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, c.MhKey, blockNumber)
 		if err != nil {
 			return nil, err
 		}
 		trxIPLDs[i] = models.IPLDModel{
-			BlockNumber: c.BlockNumber,
+			Data: txBytes,
-			Data:        txBytes,
+			Key:  c.CID,
-			Key:         c.CID,
 		}
 	}
 	return trxIPLDs, nil
@@ -168,19 +151,14 @@ func (f *IPLDFetcher) FetchRcts(tx *sqlx.Tx, cids []models.ReceiptModel) ([]mode
 	log.Debug("fetching receipt iplds")
 	rctIPLDs := make([]models.IPLDModel, len(cids))
 	for i, c := range cids {
-		blockNumber, err := strconv.ParseUint(c.BlockNumber, 10, 64)
+		rctBytes, err := shared.FetchIPLDByMhKey(tx, c.LeafMhKey)
-		if err != nil {
-			return nil, err
-		}
-		rctBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, c.LeafMhKey, blockNumber)
 		if err != nil {
 			return nil, err
 		}
 		//nodeVal, err := DecodeLeafNode(rctBytes)
 		rctIPLDs[i] = models.IPLDModel{
-			BlockNumber: c.BlockNumber,
+			Data: rctBytes,
-			Data:        rctBytes,
+			Key:  c.LeafCID,
-			Key:         c.LeafCID,
 		}
 	}
 	return rctIPLDs, nil
@@ -194,19 +172,14 @@ func (f *IPLDFetcher) FetchState(tx *sqlx.Tx, cids []models.StateNodeModel) ([]S
 		if stateNode.CID == "" {
 			continue
 		}
-		blockNumber, err := strconv.ParseUint(stateNode.BlockNumber, 10, 64)
+		stateBytes, err := shared.FetchIPLDByMhKey(tx, stateNode.MhKey)
-		if err != nil {
-			return nil, err
-		}
-		stateBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, stateNode.MhKey, blockNumber)
 		if err != nil {
 			return nil, err
 		}
 		stateNodes = append(stateNodes, StateNode{
 			IPLD: models.IPLDModel{
-				BlockNumber: stateNode.BlockNumber,
+				Data: stateBytes,
-				Data:        stateBytes,
+				Key:  stateNode.CID,
-				Key:         stateNode.CID,
 			},
 			StateLeafKey: common.HexToHash(stateNode.StateKey),
 			Type:         ResolveToNodeType(stateNode.NodeType),
@@ -224,19 +197,14 @@ func (f *IPLDFetcher) FetchStorage(tx *sqlx.Tx, cids []models.StorageNodeWithSta
 		if storageNode.CID == "" || storageNode.StateKey == "" {
 			continue
 		}
-		blockNumber, err := strconv.ParseUint(storageNode.BlockNumber, 10, 64)
+		storageBytes, err := shared.FetchIPLDByMhKey(tx, storageNode.MhKey)
-		if err != nil {
-			return nil, err
-		}
-		storageBytes, err := shared.FetchIPLDByMhKeyAndBlockNumber(tx, storageNode.MhKey, blockNumber)
 		if err != nil {
 			return nil, err
 		}
 		storageNodes = append(storageNodes, StorageNode{
 			IPLD: models.IPLDModel{
-				BlockNumber: storageNode.BlockNumber,
+				Data: storageBytes,
-				Data:        storageBytes,
+				Key:  storageNode.CID,
-				Key:         storageNode.CID,
 			},
 			StateLeafKey:   common.HexToHash(storageNode.StateKey),
 			StorageLeafKey: common.HexToHash(storageNode.StorageKey),

pkg/eth/ipld_fetcher_test.go

@@ -23,9 +23,9 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var _ = Describe("IPLDFetcher", func() {

pkg/eth/ipld_retriever.go

@@ -36,180 +36,93 @@ const (
 
 	RetrieveHeadersByHashesPgStr = `SELECT cid, data
 								FROM eth.header_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key)
-										header_cids.mh_key = blocks.key
-										AND header_cids.block_number = blocks.block_number
-									)
 								WHERE block_hash = ANY($1::VARCHAR(66)[])`
 	RetrieveHeadersByBlockNumberPgStr = `SELECT cid, data
 								FROM eth.header_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key)
-										header_cids.mh_key = blocks.key
-										AND header_cids.block_number = blocks.block_number
-									)
 								WHERE block_number = $1`
 	RetrieveHeaderByHashPgStr = `SELECT cid, data
 								FROM eth.header_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (header_cids.mh_key = blocks.key)
-										header_cids.mh_key = blocks.key
-										AND header_cids.block_number = blocks.block_number
-									)
 								WHERE block_hash = $1`
 	RetrieveUnclesByHashesPgStr = `SELECT cid, data
 								FROM eth.uncle_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (uncle_cids.mh_key = blocks.key)
-										uncle_cids.mh_key = blocks.key
-										AND uncle_cids.block_number = blocks.block_number
-									)
 								WHERE block_hash = ANY($1::VARCHAR(66)[])`
 	RetrieveUnclesByBlockHashPgStr = `SELECT uncle_cids.cid, data
 										FROM eth.uncle_cids
-											INNER JOIN eth.header_cids ON (
+											INNER JOIN eth.header_cids ON (uncle_cids.header_id = header_cids.block_hash)
-												uncle_cids.header_id = header_cids.block_hash
+											INNER JOIN public.blocks ON (uncle_cids.mh_key = blocks.key)
-												AND uncle_cids.block_number = header_cids.block_number
-											)
-											INNER JOIN public.blocks ON (
-												uncle_cids.mh_key = blocks.key
-												AND uncle_cids.block_number = blocks.block_number
-											)
 										WHERE block_hash = $1`
 	RetrieveUnclesByBlockNumberPgStr = `SELECT uncle_cids.cid, data
 										FROM eth.uncle_cids
-											INNER JOIN eth.header_cids ON (
+											INNER JOIN eth.header_cids ON (uncle_cids.header_id = header_cids.block_hash)
-												uncle_cids.header_id = header_cids.block_hash
+											INNER JOIN public.blocks ON (uncle_cids.mh_key = blocks.key)
-												AND uncle_cids.block_number = header_cids.block_number
-											)
-											INNER JOIN public.blocks ON (
-												uncle_cids.mh_key = blocks.key
-												AND uncle_cids.block_number = blocks.block_number
-											)
 										WHERE block_number = $1`
 	RetrieveUncleByHashPgStr = `SELECT cid, data
 								FROM eth.uncle_cids
-									INNER JOIN public.blocks ON (
+									INNER JOIN public.blocks ON (uncle_cids.mh_key = blocks.key)
-										uncle_cids.mh_key = blocks.key
-										AND uncle_cids.block_number = blocks.block_number
-									)
 								WHERE block_hash = $1`
 	RetrieveTransactionsByHashesPgStr = `SELECT cid, data
 									FROM eth.transaction_cids
-										INNER JOIN public.blocks ON (
+										INNER JOIN public.blocks ON (transaction_cids.mh_key = blocks.key)
-											transaction_cids.mh_key = blocks.key
-											AND transaction_cids.block_number = blocks.block_number
-										)
 									WHERE tx_hash = ANY($1::VARCHAR(66)[])`
 	RetrieveTransactionsByBlockHashPgStr = `SELECT transaction_cids.cid, data
 											FROM eth.transaction_cids
-												INNER JOIN eth.header_cids ON (
+												INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash)
-													transaction_cids.header_id = header_cids.block_hash
+												INNER JOIN public.blocks ON (transaction_cids.mh_key = blocks.key)
-													AND transaction_cids.block_number = header_cids.block_number
-												)
-												INNER JOIN public.blocks ON (
-													transaction_cids.mh_key = blocks.key
-													AND transaction_cids.block_number = blocks.block_number
-												)
 											WHERE block_hash = $1
 											ORDER BY eth.transaction_cids.index ASC`
 	RetrieveTransactionsByBlockNumberPgStr = `SELECT transaction_cids.cid, data
 											FROM eth.transaction_cids
-												INNER JOIN eth.header_cids ON (
+												INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash)
-													transaction_cids.header_id = header_cids.block_hash
+												INNER JOIN public.blocks ON (transaction_cids.mh_key = blocks.key)
-													AND transaction_cids.block_number = header_cids.block_number
-												)
-												INNER JOIN public.blocks ON (
-													transaction_cids.mh_key = blocks.key
-													AND transaction_cids.block_number = blocks.block_number
-												)
 											WHERE block_number = $1
 											ORDER BY eth.transaction_cids.index ASC`
 	RetrieveTransactionByHashPgStr = `SELECT cid, data
 									FROM eth.transaction_cids
-										INNER JOIN public.blocks ON (
+										INNER JOIN public.blocks ON (transaction_cids.mh_key = blocks.key)
-											transaction_cids.mh_key = blocks.key
-											AND transaction_cids.block_number = blocks.block_number
-										)
 									WHERE tx_hash = $1`
 	RetrieveReceiptsByTxHashesPgStr = `SELECT receipt_cids.leaf_cid, data
 									FROM eth.receipt_cids
-										INNER JOIN eth.transaction_cids ON (
+										INNER JOIN eth.transaction_cids ON (receipt_cids.tx_id = transaction_cids.tx_hash)
-											receipt_cids.tx_id = transaction_cids.tx_hash
+										INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = blocks.key)
-											AND receipt_cids.block_number = transaction_cids.block_number
-										)
-										INNER JOIN public.blocks ON (
-											receipt_cids.leaf_mh_key = blocks.key
-											AND receipt_cids.block_number = blocks.block_number
-										)
 									WHERE tx_hash = ANY($1::VARCHAR(66)[])`
 	RetrieveReceiptsByBlockHashPgStr = `SELECT receipt_cids.leaf_cid, data, eth.transaction_cids.tx_hash
 										FROM eth.receipt_cids
-											INNER JOIN eth.transaction_cids ON (
+											INNER JOIN eth.transaction_cids ON (receipt_cids.tx_id = transaction_cids.tx_hash)
-												receipt_cids.tx_id = transaction_cids.tx_hash
+											INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash)
-												AND receipt_cids.block_number = transaction_cids.block_number
+											INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = blocks.key)
-											)
-											INNER JOIN eth.header_cids ON (
-												transaction_cids.header_id = header_cids.block_hash
-												AND transaction_cids.block_number = header_cids.block_number
-											)
-											INNER JOIN public.blocks ON (
-												receipt_cids.leaf_mh_key = blocks.key
-												AND receipt_cids.block_number = blocks.block_number
-											)
 										WHERE block_hash = $1
 										ORDER BY eth.transaction_cids.index ASC`
 	RetrieveReceiptsByBlockNumberPgStr = `SELECT receipt_cids.leaf_cid, data
 										FROM eth.receipt_cids
-											INNER JOIN eth.transaction_cids ON (
+											INNER JOIN eth.transaction_cids ON (receipt_cids.tx_id = transaction_cids.tx_hash)
-												receipt_cids.tx_id = transaction_cids.tx_hash
+											INNER JOIN eth.header_cids ON (transaction_cids.header_id = header_cids.block_hash)
-												AND receipt_cids.block_number = transaction_cids.block_number
+											INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = blocks.key)
-											)
-											INNER JOIN eth.header_cids ON (
-												transaction_cids.header_id = header_cids.block_hash
-												AND transaction_cids.block_number = header_cids.block_number
-											)
-											INNER JOIN public.blocks ON (
-												receipt_cids.leaf_mh_key = blocks.key
-												AND receipt_cids.block_number = blocks.block_number
-											)
 										WHERE block_number = $1
 										ORDER BY eth.transaction_cids.index ASC`
 	RetrieveReceiptByTxHashPgStr = `SELECT receipt_cids.leaf_cid, data
 									FROM eth.receipt_cids
-										INNER JOIN eth.transaction_cids ON (
+										INNER JOIN eth.transaction_cids ON (receipt_cids.tx_id = transaction_cids.tx_hash)
-											receipt_cids.tx_id = transaction_cids.tx_hash
+										INNER JOIN public.blocks ON (receipt_cids.leaf_mh_key = blocks.key)
-											AND receipt_cids.block_number = transaction_cids.block_number
-										)
-										INNER JOIN public.blocks ON (
-											receipt_cids.leaf_mh_key = blocks.key
-											AND receipt_cids.block_number = blocks.block_number
-										)
 									WHERE tx_hash = $1`
 	RetrieveAccountByLeafKeyAndBlockHashPgStr = `SELECT state_cids.cid, data, state_cids.node_type
 												FROM eth.state_cids
-													INNER JOIN eth.header_cids ON (
+													INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
-														state_cids.header_id = header_cids.block_hash
+													INNER JOIN public.blocks ON (state_cids.mh_key = blocks.key)
-														AND state_cids.block_number = header_cids.block_number
-													)
-													INNER JOIN public.blocks ON (
-														state_cids.mh_key = blocks.key
-														AND state_cids.block_number = blocks.block_number
-													)
 												WHERE state_leaf_key = $1
-												AND header_cids.block_number <= (SELECT block_number
+												AND block_number <= (SELECT block_number
 																	FROM eth.header_cids
 																	WHERE block_hash = $2)
-												AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number))
+												AND header_cids.block_hash = (SELECT canonical_header_hash(block_number))
-												ORDER BY header_cids.block_number DESC
+												ORDER BY block_number DESC
 												LIMIT 1`
 	RetrieveAccountByLeafKeyAndBlockNumberPgStr = `SELECT state_cids.cid, data, state_cids.node_type
 													FROM eth.state_cids
-														INNER JOIN eth.header_cids ON (
+														INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
-															state_cids.header_id = header_cids.block_hash
+														INNER JOIN public.blocks ON (state_cids.mh_key = blocks.key)
-															AND state_cids.block_number = header_cids.block_number
-														)
-														INNER JOIN public.blocks ON (
-															state_cids.mh_key = blocks.key
-															AND state_cids.block_number = blocks.block_number
-														)
 													WHERE state_leaf_key = $1
 													AND block_number <= $2
 													ORDER BY block_number DESC
@@ -219,16 +132,9 @@ const (
 																		INNER JOIN eth.state_cids ON (
 																			storage_cids.header_id = state_cids.header_id
 																			AND storage_cids.state_path = state_cids.state_path
-																			AND storage_cids.block_number = state_cids.block_number
-																		)
-																		INNER JOIN eth.header_cids ON (
-																			state_cids.header_id = header_cids.block_hash
-																			AND state_cids.block_number = header_cids.block_number
-																		)
-																		INNER JOIN public.blocks ON (
-																			storage_cids.mh_key = blocks.key
-																			AND storage_cids.block_number = blocks.block_number
 																		)
+																		INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
+																		INNER JOIN public.blocks ON (storage_cids.mh_key = blocks.key)
 																	WHERE state_leaf_key = $1
 																	AND storage_leaf_key = $2
 																	AND block_number <= $3
@@ -239,23 +145,16 @@ const (
 																		INNER JOIN eth.state_cids ON (
 																			storage_cids.header_id = state_cids.header_id
 																			AND storage_cids.state_path = state_cids.state_path
-																			AND storage_cids.block_number = state_cids.block_number
-																		)
-																		INNER JOIN eth.header_cids ON (
-																			state_cids.header_id = header_cids.block_hash
-																			AND state_cids.block_number = header_cids.block_number
-																		)
-																		INNER JOIN public.blocks ON (
-																			storage_cids.mh_key = blocks.key
-																			AND storage_cids.block_number = blocks.block_number
 																		)
+																		INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
+																		INNER JOIN public.blocks ON (storage_cids.mh_key = blocks.key)
 																	WHERE state_leaf_key = $1
 																	AND storage_leaf_key = $2
-																	AND header_cids.block_number <= (SELECT block_number
+																	AND block_number <= (SELECT block_number
 																						FROM eth.header_cids
 																						WHERE block_hash = $3)
-																	AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number))
+																	AND header_cids.block_hash = (SELECT canonical_header_hash(block_number))
-																	ORDER BY header_cids.block_number DESC
+																	ORDER BY block_number DESC
 																	LIMIT 1`
 )
 

pkg/eth/test_helpers/test_data.go

@@ -38,7 +38,7 @@ import (
 	"github.com/multiformats/go-multihash"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
 )
 
 // Test variables
@@ -231,44 +231,40 @@ var (
 	}
 	MockTrxMetaPostPublsh = []models.TxModel{
 		{
-			BlockNumber: "1",
+			CID:    Trx1CID.String(), // This is empty until we go to publish to ipfs
-			CID:         Trx1CID.String(), // This is empty until we go to publish to ipfs
+			MhKey:  Trx1MhKey,
-			MhKey:       Trx1MhKey,
+			Src:    SenderAddr.Hex(),
-			Src:         SenderAddr.Hex(),
+			Dst:    Address.String(),
-			Dst:         Address.String(),
+			Index:  0,
-			Index:       0,
+			TxHash: MockTransactions[0].Hash().String(),
-			TxHash:      MockTransactions[0].Hash().String(),
+			Data:   []byte{},
-			Data:        []byte{},
 		},
 		{
-			BlockNumber: "1",
+			CID:    Trx2CID.String(),
-			CID:         Trx2CID.String(),
+			MhKey:  Trx2MhKey,
-			MhKey:       Trx2MhKey,
+			Src:    SenderAddr.Hex(),
-			Src:         SenderAddr.Hex(),
+			Dst:    AnotherAddress.String(),
-			Dst:         AnotherAddress.String(),
+			Index:  1,
-			Index:       1,
+			TxHash: MockTransactions[1].Hash().String(),
-			TxHash:      MockTransactions[1].Hash().String(),
+			Data:   []byte{},
-			Data:        []byte{},
 		},
 		{
-			BlockNumber: "1",
+			CID:    Trx3CID.String(),
-			CID:         Trx3CID.String(),
+			MhKey:  Trx3MhKey,
-			MhKey:       Trx3MhKey,
+			Src:    SenderAddr.Hex(),
-			Src:         SenderAddr.Hex(),
+			Dst:    "",
-			Dst:         "",
+			Index:  2,
-			Index:       2,
+			TxHash: MockTransactions[2].Hash().String(),
-			TxHash:      MockTransactions[2].Hash().String(),
+			Data:   MockContractByteCode,
-			Data:        MockContractByteCode,
 		},
 		{
-			BlockNumber: "1",
+			CID:    Trx4CID.String(),
-			CID:         Trx4CID.String(),
+			MhKey:  Trx4MhKey,
-			MhKey:       Trx4MhKey,
+			Src:    SenderAddr.Hex(),
-			Src:         SenderAddr.Hex(),
+			Dst:    AnotherAddress1.String(),
-			Dst:         AnotherAddress1.String(),
+			Index:  3,
-			Index:       3,
+			TxHash: MockTransactions[3].Hash().String(),
-			TxHash:      MockTransactions[3].Hash().String(),
+			Data:   []byte{},
-			Data:        []byte{},
 		},
 	}
 	MockRctMeta = []models.ReceiptModel{
@@ -300,28 +296,24 @@ var (
 
 	MockRctMetaPostPublish = []models.ReceiptModel{
 		{
-			BlockNumber:  "1",
 			LeafCID:      Rct1CID.String(),
 			LeafMhKey:    Rct1MhKey,
 			Contract:     "",
 			ContractHash: "",
 		},
 		{
-			BlockNumber:  "1",
 			LeafCID:      Rct2CID.String(),
 			LeafMhKey:    Rct2MhKey,
 			Contract:     "",
 			ContractHash: "",
 		},
 		{
-			BlockNumber:  "1",
 			LeafCID:      Rct3CID.String(),
 			LeafMhKey:    Rct3MhKey,
 			Contract:     ContractAddress.String(),
 			ContractHash: ContractHash,
 		},
 		{
-			BlockNumber:  "1",
 			LeafCID:      Rct4CID.String(),
 			LeafMhKey:    Rct4MhKey,
 			Contract:     "",
@@ -399,20 +391,18 @@ var (
 	}
 	MockStateMetaPostPublish = []models.StateNodeModel{
 		{
-			BlockNumber: "1",
+			CID:      State1CID.String(),
-			CID:         State1CID.String(),
+			MhKey:    State1MhKey,
-			MhKey:       State1MhKey,
+			Path:     []byte{'\x06'},
-			Path:        []byte{'\x06'},
+			NodeType: 2,
-			NodeType:    2,
+			StateKey: common.BytesToHash(ContractLeafKey).Hex(),
-			StateKey:    common.BytesToHash(ContractLeafKey).Hex(),
 		},
 		{
-			BlockNumber: "1",
+			CID:      State2CID.String(),
-			CID:         State2CID.String(),
+			MhKey:    State2MhKey,
-			MhKey:       State2MhKey,
+			Path:     []byte{'\x0c'},
-			Path:        []byte{'\x0c'},
+			NodeType: 2,
-			NodeType:    2,
+			StateKey: common.BytesToHash(AccountLeafKey).Hex(),
-			StateKey:    common.BytesToHash(AccountLeafKey).Hex(),
 		},
 	}
 	MockStorageNodes = map[string][]sdtypes.StorageNode{
@@ -471,13 +461,12 @@ var (
 		StateNodes:   MockStateMetaPostPublish,
 		StorageNodes: []models.StorageNodeWithStateKeyModel{
 			{
-				BlockNumber: "1",
+				Path:       []byte{},
-				Path:        []byte{},
+				CID:        StorageCID.String(),
-				CID:         StorageCID.String(),
+				MhKey:      StorageMhKey,
-				MhKey:       StorageMhKey,
+				NodeType:   2,
-				NodeType:    2,
+				StateKey:   common.BytesToHash(ContractLeafKey).Hex(),
-				StateKey:    common.BytesToHash(ContractLeafKey).Hex(),
+				StorageKey: common.BytesToHash(StorageLeafKey).Hex(),
-				StorageKey:  common.BytesToHash(StorageLeafKey).Hex(),
 			},
 		},
 	}
@@ -494,52 +483,43 @@ var (
 	MockIPLDs = eth.IPLDs{
 		BlockNumber: new(big.Int).Set(BlockNumber),
 		Header: models.IPLDModel{
-			BlockNumber: BlockNumber.String(),
+			Data: HeaderIPLD.RawData(),
-			Data:        HeaderIPLD.RawData(),
+			Key:  HeaderIPLD.Cid().String(),
-			Key:         HeaderIPLD.Cid().String(),
 		},
 		Transactions: []models.IPLDModel{
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Trx1IPLD.RawData(),
-				Data:        Trx1IPLD.RawData(),
+				Key:  Trx1IPLD.Cid().String(),
-				Key:         Trx1IPLD.Cid().String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Trx2IPLD.RawData(),
-				Data:        Trx2IPLD.RawData(),
+				Key:  Trx2IPLD.Cid().String(),
-				Key:         Trx2IPLD.Cid().String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Trx3IPLD.RawData(),
-				Data:        Trx3IPLD.RawData(),
+				Key:  Trx3IPLD.Cid().String(),
-				Key:         Trx3IPLD.Cid().String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Trx4IPLD.RawData(),
-				Data:        Trx4IPLD.RawData(),
+				Key:  Trx4IPLD.Cid().String(),
-				Key:         Trx4IPLD.Cid().String(),
 			},
 		},
 		Receipts: []models.IPLDModel{
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Rct1IPLD,
-				Data:        Rct1IPLD,
+				Key:  Rct1CID.String(),
-				Key:         Rct1CID.String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Rct2IPLD,
-				Data:        Rct2IPLD,
+				Key:  Rct2CID.String(),
-				Key:         Rct2CID.String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Rct3IPLD,
-				Data:        Rct3IPLD,
+				Key:  Rct3CID.String(),
-				Key:         Rct3CID.String(),
 			},
 			{
-				BlockNumber: BlockNumber.String(),
+				Data: Rct4IPLD,
-				Data:        Rct4IPLD,
+				Key:  Rct4CID.String(),
-				Key:         Rct4CID.String(),
 			},
 		},
 		StateNodes: []eth.StateNode{
@@ -547,9 +527,8 @@ var (
 				StateLeafKey: common.BytesToHash(ContractLeafKey),
 				Type:         sdtypes.Leaf,
 				IPLD: models.IPLDModel{
-					BlockNumber: BlockNumber.String(),
+					Data: State1IPLD.RawData(),
-					Data:        State1IPLD.RawData(),
+					Key:  State1IPLD.Cid().String(),
-					Key:         State1IPLD.Cid().String(),
 				},
 				Path: []byte{'\x06'},
 			},
@@ -557,9 +536,8 @@ var (
 				StateLeafKey: common.BytesToHash(AccountLeafKey),
 				Type:         sdtypes.Leaf,
 				IPLD: models.IPLDModel{
-					BlockNumber: BlockNumber.String(),
+					Data: State2IPLD.RawData(),
-					Data:        State2IPLD.RawData(),
+					Key:  State2IPLD.Cid().String(),
-					Key:         State2IPLD.Cid().String(),
 				},
 				Path: []byte{'\x0c'},
 			},
@@ -570,9 +548,8 @@ var (
 				StorageLeafKey: common.BytesToHash(StorageLeafKey),
 				Type:           sdtypes.Leaf,
 				IPLD: models.IPLDModel{
-					BlockNumber: BlockNumber.String(),
+					Data: StorageIPLD.RawData(),
-					Data:        StorageIPLD.RawData(),
+					Key:  StorageIPLD.Cid().String(),
-					Key:         StorageIPLD.Cid().String(),
 				},
 				Path: []byte{},
 			},

pkg/graphql/graphql.go

@@ -33,7 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
 )
 
 var (

pkg/graphql/graphql_test.go

@@ -35,11 +35,11 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth/test_helpers"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth/test_helpers"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/graphql"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/graphql"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 var _ = Describe("GraphQL", func() {

pkg/graphql/service.go

@@ -29,7 +29,7 @@ import (
 	"github.com/graph-gophers/graphql-go/relay"
 	"github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
 )
 
 // Service encapsulates a GraphQL service.

pkg/net/api_test.go

@@ -20,7 +20,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/net"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/net"
 )
 
 var _ = Describe("API", func() {

pkg/rpc/ipc.go

@@ -25,7 +25,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/netutil"
 	"github.com/ethereum/go-ethereum/rpc"
 	log "github.com/sirupsen/logrus"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/prom"
 )
 
 var (

pkg/rpc/ws.go

@@ -24,7 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/node"
 	"github.com/ethereum/go-ethereum/rpc"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/prom"
 )
 
 // StartWSEndpoint starts a websocket endpoint.

pkg/serve/api.go

@@ -23,7 +23,7 @@ import (
 	"github.com/ethereum/go-ethereum/statediff/types"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
 )
 
 // APIName is the namespace used for the state diffing service API

pkg/serve/config.go

@@ -32,8 +32,8 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/spf13/viper"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/prom"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/prom"
-	ethServerShared "github.com/vulcanize/ipld-eth-server/v4/pkg/shared"
+	ethServerShared "github.com/vulcanize/ipld-eth-server/v3/pkg/shared"
 )
 
 // Env variables

pkg/serve/service.go

@@ -31,8 +31,8 @@ import (
 	"github.com/jmoiron/sqlx"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/net"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/net"
 )
 
 const (

pkg/shared/functions.go

@@ -18,9 +18,11 @@ package shared
 
 import (
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/statediff/indexer/ipld"
 	"github.com/ipfs/go-cid"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	dshelp "github.com/ipfs/go-ipfs-ds-help"
+	node "github.com/ipfs/go-ipld-format"
 	"github.com/jmoiron/sqlx"
 	"github.com/sirupsen/logrus"
 )
@@ -48,11 +50,31 @@ func Rollback(tx *sqlx.Tx) {
 	}
 }
 
-// FetchIPLDByMhKeyAndBlockNumber is used to retrieve an ipld from Postgres blockstore with the provided tx, mhkey string and blockNumber
+// PublishIPLD is used to insert an ipld into Postgres blockstore with the provided tx
-func FetchIPLDByMhKeyAndBlockNumber(tx *sqlx.Tx, mhKey string, blockNumber uint64) ([]byte, error) {
+func PublishIPLD(tx *sqlx.Tx, i node.Node) error {
-	pgStr := `SELECT data FROM public.blocks WHERE key = $1 AND block_number = $2`
+	dbKey := dshelp.MultihashToDsKey(i.Cid().Hash())
+	prefixedKey := blockstore.BlockPrefix.String() + dbKey.String()
+	raw := i.RawData()
+	_, err := tx.Exec(`INSERT INTO public.blocks (key, data) VALUES ($1, $2) ON CONFLICT (key) DO NOTHING`, prefixedKey, raw)
+	return err
+}
+
+// FetchIPLD is used to retrieve an ipld from Postgres blockstore with the provided tx and cid string
+func FetchIPLD(tx *sqlx.Tx, cid string) ([]byte, error) {
+	mhKey, err := MultihashKeyFromCIDString(cid)
+	if err != nil {
+		return nil, err
+	}
+	pgStr := `SELECT data FROM public.blocks WHERE key = $1`
 	var block []byte
-	return block, tx.Get(&block, pgStr, mhKey, blockNumber)
+	return block, tx.Get(&block, pgStr, mhKey)
+}
+
+// FetchIPLDByMhKey is used to retrieve an ipld from Postgres blockstore with the provided tx and mhkey string
+func FetchIPLDByMhKey(tx *sqlx.Tx, mhKey string) ([]byte, error) {
+	pgStr := `SELECT data FROM public.blocks WHERE key = $1`
+	var block []byte
+	return block, tx.Get(&block, pgStr, mhKey)
 }
 
 // MultihashKeyFromCID converts a cid into a blockstore-prefixed multihash db key string
@@ -70,3 +92,15 @@ func MultihashKeyFromCIDString(c string) (string, error) {
 	dbKey := dshelp.MultihashToDsKey(dc.Hash())
 	return blockstore.BlockPrefix.String() + dbKey.String(), nil
 }
+
+// PublishRaw derives a cid from raw bytes and provided codec and multihash type, and writes it to the db tx
+func PublishRaw(tx *sqlx.Tx, codec, mh uint64, raw []byte) (string, error) {
+	c, err := ipld.RawdataToCid(codec, raw, mh)
+	if err != nil {
+		return "", err
+	}
+	dbKey := dshelp.MultihashToDsKey(c.Hash())
+	prefixedKey := blockstore.BlockPrefix.String() + dbKey.String()
+	_, err = tx.Exec(`INSERT INTO public.blocks (key, data) VALUES ($1, $2) ON CONFLICT (key) DO NOTHING`, prefixedKey, raw)
+	return c.String(), err
+}

pkg/shared/test_helpers.go

@@ -58,12 +58,8 @@ func SetupDB() *sqlx.DB {
 func TearDownDB(db *sqlx.DB) {
 	tx, err := db.Beginx()
 	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM nodes`)
-	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM eth.header_cids`)
 	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM eth.uncle_cids`)
-	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM eth.transaction_cids`)
 	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM eth.receipt_cids`)
@@ -72,10 +68,6 @@ func TearDownDB(db *sqlx.DB) {
 	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM eth.storage_cids`)
 	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM eth.state_accounts`)
-	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM eth.access_list_elements`)
-	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM blocks`)
 	Expect(err).NotTo(HaveOccurred())
 	_, err = tx.Exec(`DELETE FROM eth.log_cids`)

scripts/run_unit_test.sh

@@ -1,26 +1,8 @@
-#!/bin/bash
+# Clear up existing docker images and volume.
+docker-compose down --remove-orphans --volumes
 
-set -e
+docker-compose -f docker-compose.yml up -d ipld-eth-db
+sleep 10
+PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8077 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing make test
 
-mkdir -p out
+docker-compose down --remove-orphans --volumes
-
-# Remove existing docker-tsdb directory
-rm -rf out/docker-tsdb/
-
-# Copy over files to setup TimescaleDB
-ID=$(docker create vulcanize/ipld-eth-db:v4.1.1-alpha)
-docker cp $ID:/app/docker-tsdb out/docker-tsdb/
-docker rm -v $ID
-
-# Spin up TimescaleDB
-docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml up ipld-eth-db
-trap "docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml down --remove-orphans --volumes; rm -rf out/" SIGINT SIGTERM ERR
-sleep 45
-
-# Run unit tests
-go clean -testcache
-PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8066 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 DATABASE_NAME=vulcanize_testing_v4 make test
-
-# Clean up
-docker-compose -f out/docker-tsdb/docker-compose.test.yml -f docker-compose.yml down --remove-orphans --volumes
-rm -rf out/

test/README.md

@@ -2,24 +2,18 @@
 
 ## Setup
 
-- Clone [stack-orchestrator](https://github.com/vulcanize/stack-orchestrator), [ipld-eth-db](https://github.com/vulcanize/ipld-eth-db) [go-ethereum](https://github.com/vulcanize/go-ethereum) repositories.
+- Clone [stack-orchestrator](https://github.com/vulcanize/stack-orchestrator) and [go-ethereum](https://github.com/vulcanize/go-ethereum) repositories.
 
-- Checkout [v4 release](https://github.com/vulcanize/ipld-eth-db/releases/tag/v4.1.1-alpha) in ipld-eth-db repo.
+- Checkout [v3 release](https://github.com/vulcanize/go-ethereum/releases/tag/v1.10.17-statediff-3.2.1) in go-ethereum repo.
-  ```bash
-  # In ipld-eth-db repo.
-  git checkout v4.1.1-alpha
-  ```
-
-- Checkout [v4 release](https://github.com/vulcanize/go-ethereum/releases/tag/v1.10.18-statediff-4.0.2-alpha) in go-ethereum repo.
   ```bash
   # In go-ethereum repo.
-  git checkout v1.10.18-statediff-4.0.2-alpha
+  git checkout v1.10.17-statediff-3.2.1
   ```
 
 - Checkout working commit in stack-orchestrator repo.
   ```bash
   # In stack-orchestrator repo.
-  git checkout 418957a1f745c921b21286c13bb033f922a91ae9
+  git checkout fcbc74451c5494664fe21f765e89c9c6565c07cb
   ```
 
 ## Run
@@ -33,68 +27,43 @@
 
 - Run integration tests:
 
-  - In stack-orchestrator repo, create config file:
+  - Update (Replace existing content) config file [config.sh](https://github.com/vulcanize/stack-orchestrator/blob/main/config.sh) in stack-orchestrator repo:
-
-    ```bash
-    cd helper-scripts
-
-    ./create-config.sh
-    ```
-
-    A `config.sh` will be created in the root directory.
-
-  - Update/Edit the generated config file with:
-
     ```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 ipld-eth-server repo.
     vulcanize_ipld_eth_server=~/ipld-eth-server/
 
-    # Path to test contract.
-    vulcanize_test_contract=~/ipld-eth-server/test/contract
-
     db_write=true
     eth_forward_eth_calls=false
     eth_proxy_on_error=false
     eth_http_path="go-ethereum:8545"
-    ipld_eth_server_db_dependency=access-node
-    go_ethereum_db_dependency=access-node
-    connecting_db_name=vulcanize_testing_v4
     ```
 
   - Run stack-orchestrator:
-
     ```bash
     # In stack-orchestrator root directory.
     cd helper-scripts
 
     ./wrapper.sh \
     -e docker \
-    -d ../docker/latest/docker-compose-timescale-db.yml \
+    -d ../docker/latest/docker-compose-db.yml \
-    -d ../docker/local/docker-compose-db-migration.yml \
     -d ../docker/local/docker-compose-go-ethereum.yml \
     -d ../docker/local/docker-compose-ipld-eth-server.yml \
-    -d ../docker/local/docker-compose-contract.yml \
     -v remove \
     -p ../config.sh
     ```
 
   - Run test:
-
     ```bash
     # In ipld-eth-server root directory.
     ./scripts/run_integration_test.sh
     ```
 
-  - Update stack-orchestrator `config.sh` file:
+  - Update `config.sh` file:
-
     ```bash
     #!/bin/bash
 
@@ -104,16 +73,10 @@
     # Path to ipld-eth-server repo.
     vulcanize_ipld_eth_server=~/ipld-eth-server/
 
-    # Path to test contract.
-    vulcanize_test_contract=~/ipld-eth-server/test/contract
-
     db_write=false
     eth_forward_eth_calls=true
     eth_proxy_on_error=false
     eth_http_path="go-ethereum:8545"
-    ipld_eth_server_db_dependency=access-node
-    go_ethereum_db_dependency=access-node
-    connecting_db_name=vulcanize_testing_v4
     ```
 
   - Stop the stack-orchestrator and start again using the same command

test/direct_proxy_integration_test.go

@@ -13,8 +13,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	integration "github.com/vulcanize/ipld-eth-server/v4/test"
+	integration "github.com/vulcanize/ipld-eth-server/v3/test"
 )
 
 var _ = Describe("Integration test", func() {

test/integration_test.go

@@ -16,8 +16,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"github.com/vulcanize/ipld-eth-server/v4/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/v3/pkg/eth"
-	integration "github.com/vulcanize/ipld-eth-server/v4/test"
+	integration "github.com/vulcanize/ipld-eth-server/v3/test"
 )
 
 const nonExistingBlockHash = "0x111111111111111111111111111111111111111111111111111111111111111"

test/watch_address_integration_test.go

@@ -10,10 +10,11 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/rpc"
+	"github.com/ethereum/go-ethereum/statediff/types"
 	sdtypes "github.com/ethereum/go-ethereum/statediff/types"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	integration "github.com/vulcanize/ipld-eth-server/v4/test"
+	integration "github.com/vulcanize/ipld-eth-server/v3/test"
 )
 
 var (
@@ -225,8 +226,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("one contract being watched", func() {
 		It("indexes state only for the watched contract", func() {
-			operation := sdtypes.Add
+			operation := types.Add
-			args := []sdtypes.WatchAddressArg{
+			args := []types.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -307,8 +308,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("contract added to a non-empty watch-list", func() {
 		It("indexes state only for the watched contracts", func() {
-			operation := sdtypes.Add
+			operation := types.Add
-			args := []sdtypes.WatchAddressArg{
+			args := []types.WatchAddressArg{
 				{
 					Address:   contract2.Address,
 					CreatedAt: uint64(contract2.BlockNumber),
@@ -391,8 +392,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("contract removed from the watch-list", func() {
 		It("indexes state only for the watched contract", func() {
-			operation := sdtypes.Remove
+			operation := types.Remove
-			args := []sdtypes.WatchAddressArg{
+			args := []types.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -473,8 +474,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("list of watched addresses set", func() {
 		It("indexes state only for the watched contracts", func() {
-			operation := sdtypes.Set
+			operation := types.Set
-			args := []sdtypes.WatchAddressArg{
+			args := []types.WatchAddressArg{
 				{
 					Address:   contract1.Address,
 					CreatedAt: uint64(contract1.BlockNumber),
@@ -561,8 +562,8 @@ var _ = Describe("WatchAddress integration test", func() {
 
 	Context("list of watched addresses cleared", func() {
 		It("indexes state for all the contracts", func() {
-			operation := sdtypes.Clear
+			operation := types.Clear
-			args := []sdtypes.WatchAddressArg{}
+			args := []types.WatchAddressArg{}
 			ipldErr := ipldRPCClient.Call(nil, ipldMethod, operation, args)
 			Expect(ipldErr).ToNot(HaveOccurred())
 
@@ -655,7 +656,7 @@ var _ = Describe("WatchAddress integration test", func() {
 		})
 
 		It("returns an error on args of invalid type", func() {
-			operation := sdtypes.Add
+			operation := types.Add
 			args := []string{"WrongArg"}
 
 			gethErr := gethRPCClient.Call(nil, gethMethod, operation, args)