Merge pull request #7 from vulcanize/vhost

add * to vhost to allow connecting to server in docker-compose
2020-09-11 14:34:33 +03:00 · 2020-09-11 14:21:43 +03:00 · 2020-09-09 23:12:36 +03:00 · 2020-09-09 23:06:43 +03:00 · 2020-09-09 23:04:15 +03:00 · 2020-09-07 16:31:18 +03:00
203 changed files with 1796 additions and 17755 deletions
@@ -0,0 +1,25 @@
+name: Docker Compose Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Run docker build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Get the version
+        id: vars
+        run: echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7})
+      - name: Run docker build
+        run: make docker-build
+      - name: Tag docker image
+        run: docker tag vulcanize/ipld-eth-server docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}}
+      - name: Docker Login
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+      - name: Docker Push
+        run: docker push docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}}
+
@@ -0,0 +1,12 @@
+name: Docker Build
+
+on: [pull_request]
+
+jobs:
+  build:
+    name: Run docker build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run docker build
+        run: make docker-build
@@ -0,0 +1,25 @@
+name: Publish Docker image
+on:
+  release:
+    types: [published]
+jobs:
+  push_to_registries:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get the version
+        id: vars
+        run: |
+          echo ::set-output name=sha::$(echo ${GITHUB_SHA:0:7})
+          echo ::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/})
+      - name: Docker Login to Github Registry
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u vulcanize --password-stdin
+      - name: Docker Pull
+        run: docker pull docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}}
+      - name: Docker Login to Docker Registry
+        run: echo ${{ secrets.VULCANIZEJENKINS_PAT }} | docker login -u vulcanizejenkins --password-stdin
+      - name: Tag docker image
+        run: docker tag docker.pkg.github.com/vulcanize/ipld-eth-server/ipld-eth-server:${{steps.vars.outputs.sha}} vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}}
+      - name: Docker Push to Docker Hub
+        run: docker push vulcanize/ipld-eth-server:${{steps.vars.outputs.tag}}
+
@@ -7,7 +7,7 @@ Vagrantfile
 vagrant*.sh
 .vagrant
 test_scripts/
-ipfs-blockchain-watcher
+ipld-eth-server
 postgraphile/build/
 postgraphile/node_modules/
 postgraphile/package-lock.json
@@ -1,27 +0,0 @@
-dist: trusty
-language: go
-go:
- 1.12
-services:
- postgresql
-addons:
-  ssh_known_hosts: arch1.vdb.to
-  postgresql: '11.2'
-go_import_path: github.com/vulcanize/ipfs-blockchain-watcher
-before_install:
- openssl aes-256-cbc -K $encrypted_e1db309e8776_key -iv $encrypted_e1db309e8776_iv
-  -in temp_rsa.enc -out temp_rsa -d
- eval "$(ssh-agent -s)"
- chmod 600 temp_rsa
- ssh-add temp_rsa
- ssh -4 -fNL 8545:localhost:8545 geth@arch1.vdb.to
- make installtools
- bash ./scripts/install-postgres-11.sh
- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
- sudo apt-get update && sudo apt-get install yarn
-script:
- env GO111MODULE=on make test
- env GO111MODULE=on make integrationtest
-notifications:
-  email: false
@@ -1,24 +1,41 @@
-FROM golang:alpine as builder
-RUN apk --update --no-cache add make git g++
+FROM golang:1.13-alpine as builder

-# Build statically linked vDB binary (wonky path because of Dep)
-RUN mkdir -p /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' .
+RUN apk --update --no-cache add make git g++ linux-headers
+# DEBUG
+RUN apk add busybox-extras

-# Build migration tool
-RUN go get -u -d github.com/pressly/goose/cmd/goose
-WORKDIR /go/src/github.com/pressly/goose/cmd/goose
-RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose
+# Build ipld-eth-server
+WORKDIR /go/src/github.com/vulcanize/ipld-eth-server
+ADD . .
+RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o ipld-eth-server .

-# Second stage
+# Copy migration tool
+WORKDIR /
+ARG GOOSE_VER="v2.6.0"
+ADD https://github.com/pressly/goose/releases/download/${GOOSE_VER}/goose-linux64 ./goose
+RUN chmod +x ./goose
+
+# app container
 FROM alpine
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/vulcanizedb /app/vulcanizedb
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environments/staging.toml /app/environments/
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/startup_script.sh /app/
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations/* /app/
-COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose /app/goose

+ARG USER="vdm"
+ARG CONFIG_FILE="./environments/example.toml"
+
+RUN adduser -Du 5000 $USER
 WORKDIR /app
-CMD ["./startup_script.sh"]
+RUN chown $USER /app
+USER $USER
+
+# chown first so dir is writable
+# note: using $USER is merged, but not in the stable release yet
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipld-eth-server/$CONFIG_FILE config.toml
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipld-eth-server/entrypoint.sh .
+
+
+# keep binaries immutable
+COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-server/ipld-eth-server ipld-eth-server
+COPY --from=builder /goose goose
+COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-server/db/migrations migrations/vulcanizedb
+COPY --from=builder /go/src/github.com/vulcanize/ipld-eth-server/environments environments
+
+ENTRYPOINT ["/app/entrypoint.sh"]
@@ -76,7 +76,7 @@ integrationtest: | $(GINKGO) $(LINT)

 build:
 	go fmt ./...
-	go build
+	GO111MODULE=on go build

 # Parameter checks
 ## Check that DB variables are provided
@@ -105,7 +105,7 @@ rollback: $(GOOSE) checkdbvars
 	pg_dump -O -s $(CONNECT_STRING) > db/schema.sql


-## Rollbackt to a select migration (id/timestamp)
+## Rollback to a select migration (id/timestamp)
 .PHONY: rollback_to
 rollback_to: $(GOOSE) checkmigration checkdbvars
 	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" down-to "$(MIGRATION)"
@@ -138,25 +138,7 @@ import:
 	test -n "$(NAME)" # $$NAME
 	psql $(NAME) < db/schema.sql

-
-# Docker actions
-## Rinkeby docker environment
-RINKEBY_COMPOSE_FILE=dockerfiles/rinkeby/docker-compose.yml
-
-.PHONY: rinkeby_env_up
-rinkeby_env_up:
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) up -d geth
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) up --build migrations
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) up -d --build vulcanizedb
-
-.PHONY: rinkeby_env_deploy
-rinkeby_env_deploy:
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) up -d --build vulcanizedb
-
-.PHONY: dev_env_migrate
-rinkeby_env_migrate:
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) up --build migrations
-
-.PHONY: rinkeby_env_down
-rinkeby_env_down:
-	docker-compose -f $(RINKEBY_COMPOSE_FILE) down
+## Build docker image
+.PHONY: docker-build
+docker-build:
+	docker build -t vulcanize/ipld-eth-server .
@@ -1,170 +1,41 @@
-# ipfs-blockchain-watcher
+# ipld-eth-server

-[![Go Report Card](https://goreportcard.com/badge/github.com/vulcanize/ipfs-blockchain-watcher)](https://goreportcard.com/report/github.com/vulcanize/ipfs-blockchain-watcher)
+[![Go Report Card](https://goreportcard.com/badge/github.com/vulcanize/ipld-eth-server)](https://goreportcard.com/report/github.com/vulcanize/ipld-eth-server)

-> Tool for extracting and indexing blockchain data on PG-IPFS
+>  ipld-eth-server is the server backend for indexed ETH IPLD objects

 ## Table of Contents
 1. [Background](#background)
-1. [Architecture](#architecture)
 1. [Install](#install)
 1. [Usage](#usage)
 1. [Contributing](#contributing)
 1. [License](#license)

 ## Background
-ipfs-blockchain-watcher is a collection of interfaces that are used to extract, process, and store in Postgres-IPFS
-all chain data. The raw data indexed by ipfs-blockchain-watcher serves as the basis for more specific watchers and applications.
+NOTE: WIP

-Currently the service supports complete processing of all Bitcoin and Ethereum data.
+ipld-eth-server is used to service queries against the indexed Ethereum IPLD objects indexed by [ipld-eth-indexer](https://github.com/vulcanize/ipld-eth-indexer).

-## Architecture
-More details on the design of ipfs-blockchain-watcher can be found in [here](./documentation/architecture.md)
+It exposes standard Ethereum JSON RPC endpoints on top of the database, in some cases these endpoints can leverage the unique indexes to improve query performance.
+Additional, unique endpoints are exposed which utilize the new indexes and state diff data objects.
+
+
+## Dependencies
+Minimal build dependencies
+* Go (1.13)
+* Git
+* GCC compiler
+* This repository
+
+External dependency
+* Postgres database populated by [ipld-eth-indexer](https://github.com/vulcanize/ipld-eth-indexer)

 ## Install
-1. [Postgres](#postgres)
-1. [Goose](#goose)
-1. [IPFS](#ipfs)
-1. [Blockchain](#blockchain)
-1. [Watcher](#watcher)
+Start by downloading ipld-eth-server and moving into the repo:

-### Postgres
-1. [Install Postgres](https://wiki.postgresql.org/wiki/Detailed_installation_guides)
-1. Create a superuser for yourself and make sure `psql --list` works without prompting for a password.
-1. `createdb vulcanize_public`
-1. `cd $GOPATH/src/github.com/vulcanize/ipfs-blockchain-watcher`
-1.  Run the migrations: `make migrate HOST_NAME=localhost NAME=vulcanize_public PORT=5432`
-    - There are optional vars `USER=username` and `PASS=password` if the database user is not the default user `postgres` and/or a password is present
-    - To rollback a single step: `make rollback NAME=vulcanize_public`
-    - To rollback to a certain migration: `make rollback_to MIGRATION=n NAME=vulcanize_public`
-    - To see status of migrations: `make migration_status NAME=vulcanize_public`
+`GO111MODULE=off go get -d github.com/vulcanize/ipld-eth-server`

-    * See below for configuring additional environments
-    
-In some cases (such as recent Ubuntu systems), it may be necessary to overcome failures of password authentication from
-localhost. To allow access on Ubuntu, set localhost connections via hostname, ipv4, and ipv6 from peer/md5 to trust in: /etc/postgresql/<version>/pg_hba.conf
-
-(It should be noted that trusted auth should only be enabled on systems without sensitive data in them: development and local test databases)
-
-### Goose
-We use [goose](https://github.com/pressly/goose) as our migration management tool. While it is not necessary to use `goose` for manual setup, it
-is required for running the automated tests.
-
-### IPFS
-We use IPFS to store IPLD objects for each type of data we extract from on chain.
-
-To start, download and install [IPFS](https://github.com/vulcanize/go-ipfs):
-
-`go get github.com/ipfs/go-ipfs`
-
-`cd $GOPATH/src/github.com/ipfs/go-ipfs`
-
-`make install`
-
-If we want to use Postgres as our backing datastore, we need to use the vulcanize fork of go-ipfs.
-
-Start by adding the fork and switching over to it:
-
-`git remote add vulcanize https://github.com/vulcanize/go-ipfs.git`
-
-`git fetch vulcanize`
-
-`git checkout -b postgres_update vulcanize/postgres_update`
-
-Now install this fork of ipfs, first be sure to remove any previous installation:
-
-`make install`
-
-Check that is installed properly by running:
-
-`ipfs`
-
-You should see the CLI info/help output.
-
-And now we initialize with the `postgresds` profile.
-If ipfs was previously initialized we will need to remove the old profile first.
-We also need to provide env variables for the postgres connection:
-
-We can either set these manually, e.g.
-```bash
-export IPFS_PGHOST=
-export IPFS_PGUSER=
-export IPFS_PGDATABASE=
-export IPFS_PGPORT=
-export IPFS_PGPASSWORD=
-```
-
-And then run the ipfs command:
-
-`ipfs init --profile=postgresds`
-
-Or we can use the pre-made script at `GOPATH/src/github.com/ipfs/go-ipfs/misc/utility/ipfs_postgres.sh`
-which has usage:
-
-`./ipfs_postgres.sh <IPFS_PGHOST> <IPFS_PGPORT> <IPFS_PGUSER> <IPFS_PGDATABASE>"`
-
-and will ask us to enter the password, avoiding storing it to an ENV variable.
-
-Once we have initialized ipfs, that is all we need to do with it- we do not need to run a daemon during the subsequent processes.
-
-### Blockchain
-This section describes how to setup an Ethereum or Bitcoin node to serve as a data source for ipfs-blockchain-watcher
-
-#### Ethereum
-For Ethereum, we currently *require* [a special fork of go-ethereum](https://github.com/vulcanize/go-ethereum/tree/statediff_at_anyblock-1.9.11). This can be setup as follows.
-Skip this steps if you already have access to a node that displays the statediffing endpoints.
-
-Begin by downloading geth and switching to the vulcanize/rpc_statediffing branch:
-
-`go get github.com/ethereum/go-ethereum`
-
-`cd $GOPATH/src/github.com/ethereum/go-ethereum`
-
-`git remote add vulcanize https://github.com/vulcanize/go-ethereum.git`
-
-`git fetch vulcanize`
-
-`git checkout -b statediffing vulcanize/statediff_at_anyblock-1.9.11`
-
-Now, install this fork of geth (make sure any old versions have been uninstalled/binaries removed first):
-
-`make geth`
-
-And run the output binary with statediffing turned on:
-
-`cd $GOPATH/src/github.com/ethereum/go-ethereum/build/bin`
-
-`./geth --statediff --statediff.streamblock --ws --syncmode=full`
-
-Note: if you wish to access historical data (perform `backFill`) then the node will need to operate as an archival node (`--gcmode=archive`)
-
-Note: other CLI options- statediff specific ones included- can be explored with `./geth help`
-
-The output from geth should mention that it is `Starting statediff service` and block synchronization should begin shortly thereafter.
-Note that until it receives a subscriber, the statediffing process does nothing but wait for one. Once a subscription is received, this
-will be indicated in the output and node will begin processing and sending statediffs.
-
-Also in the output will be the endpoints that we will use to interface with the node.
-The default ws url is "127.0.0.1:8546" and the default http url is "127.0.0.1:8545".
-These values will be used as the `ethereum.wsPath` and `ethereum.httpPath` in the config, respectively.
-
-#### Bitcoin
-For Bitcoin, ipfs-blockchain-watcher is able to operate entirely through the universally exposed JSON-RPC interfaces.
-This means we can use any of the standard full nodes (e.g. bitcoind, btcd) as our data source.
-
-Point at a remote node or set one up locally using the instructions for [bitcoind](https://github.com/bitcoin/bitcoin) and [btcd](https://github.com/btcsuite/btcd).
-
-The default http url is "127.0.0.1:8332". We will use the http endpoint as both the `bitcoin.wsPath` and `bitcoin.httpPath`
-(bitcoind does not support websocket endpoints, we are currently using a "subscription" wrapper around the http endpoints)
-
-### Watcher
-Finally, we can setup the watcher process itself.
-
-Start by downloading vulcanizedb and moving into the repo:
-
-`go get github.com/vulcanize/ipfs-blockchain-watcher`
-
-`cd $GOPATH/src/github.com/vulcanize/ipfs-blockchain-watcher`
+`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server`

 Then, build the binary:

@@ -173,74 +44,53 @@ Then, build the binary:
 ## Usage
 After building the binary, run as

-`./ipfs-blockchain-watcher watch --config=<config_file.toml`
+`./ipld-eth-server serve --config=<the name of your config file.toml>`

 ### Configuration

-Below is the set of universal config parameters for the ipfs-blockchain-watcher command, in .toml form, with the respective environmental variables commented to the side.
-This set of parameters needs to be set no matter the chain type.
+Below is the set of parameters for the ipld-eth-server command, in .toml form, with the respective environmental variables commented to the side.
+The corresponding CLI flags can be found with the `./ipld-eth-server serve --help` command.

 ```toml
 [database]
    name     = "vulcanize_public" # $DATABASE_NAME
    hostname = "localhost" # $DATABASE_HOSTNAME
    port     = 5432 # $DATABASE_PORT
-    user     = "vdbm" # $DATABASE_USER
+    user     = "postgres" # $DATABASE_USER
    password = "" # $DATABASE_PASSWORD

-[ipfs]
-    path = "~/.ipfs" # $IPFS_PATH
-    mode = "postgres" # $IPFS_MODE
+[log]
+    level = "info" # $LOGRUS_LEVEL

-[superNode]
-    chain = "bitcoin" # $SUPERNODE_CHAIN
-    server = true # $SUPERNODE_SERVER
-    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SUPERNODE_IPC_PATH
-    wsPath = "127.0.0.1:8082" # $SUPERNODE_WS_PATH
-    httpPath = "127.0.0.1:8083" # $SUPERNODE_HTTP_PATH
-    sync = true # $SUPERNODE_SYNC
-    workers = 1 # $SUPERNODE_WORKERS
-    backFill = true # $SUPERNODE_BACKFILL
-    frequency = 45 # $SUPERNODE_FREQUENCY
-    batchSize = 1 # $SUPERNODE_BATCH_SIZE
-    batchNumber = 50 # $SUPERNODE_BATCH_NUMBER
-    timeout = 300 # $HTTP_TIMEOUT
-    validationLevel = 1 # $SUPERNODE_VALIDATION_LEVEL
+[server]
+    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SERVER_IPC_PATH
+    wsPath = "127.0.0.1:8081" # $SERVER_WS_PATH
+    httpPath = "127.0.0.1:8082" # $SERVER_HTTP_PATH
 ```

-Additional parameters need to be set depending on the specific chain.
+The `database` fields are for connecting to a Postgres database that has been/is being populated by [ipld-eth-indexer](https://github.com/vulcanize/ipld-eth-indexer).
+The `server` fields set the paths for exposing the ipld-eth-server endpoints

-For Bitcoin:

-```toml
-[bitcoin]
-    wsPath  = "127.0.0.1:8332" # $BTC_WS_PATH
-    httpPath = "127.0.0.1:8332" # $BTC_HTTP_PATH
-    pass = "password" # $BTC_NODE_PASSWORD
-    user = "username" # $BTC_NODE_USER
-    nodeID = "ocd0" # $BTC_NODE_ID
-    clientName = "Omnicore" # $BTC_CLIENT_NAME
-    genesisBlock = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" # $BTC_GENESIS_BLOCK
-    networkID = "0xD9B4BEF9" # $BTC_NETWORK_ID
-```
+### Endpoints
+#### IPLD subscription
+TODO: Port the IPLD RPC subscription endpoints after the decoupling

-For Ethereum:
+#### Ethereum JSON-RPC
+ipld-eth-server currently recapitulates portions of the Ethereum JSON-RPC api standard.

-```toml
-[ethereum]
-    wsPath  = "127.0.0.1:8546" # $ETH_WS_PATH
-    httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
-    nodeID = "arch1" # $ETH_NODE_ID
-    clientName = "Geth" # $ETH_CLIENT_NAME
-    genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
-    networkID = "1" # $ETH_NETWORK_ID
-```
+The currently supported standard endpoints are:  
+`eth_blockNumber`  
+`eth_getLogs`  
+`eth_getHeaderByNumber`  
+`eth_getBlockByNumber`  
+`eth_getBlockByHash`  
+`eth_getTransactionByHash`  

-### Exposing the data
-We can expose a number of different APIs for remote access to ipfs-blockchain-watcher data, these are dicussed in more detail [here](./documentation/apis.md)
+TODO: Add the rest of the standard endpoints add unique endpoints (e.g. getSlice)

 ### Testing
-`make test` will run the unit tests
+`make test` will run the unit tests  
 `make test` setups a clean `vulcanize_testing` db

 ## Contributing
@@ -249,4 +99,4 @@ Contributions are welcome!
 VulcanizeDB follows the [Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct).

 ## License
-[AGPL-3.0](LICENSE) © Vulcanize Inc
+[AGPL-3.0](LICENSE) © Vulcanize Inc
@@ -1,122 +0,0 @@
-// Copyright © 2020 Vulcanize, Inc
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/resync"
-	v "github.com/vulcanize/ipfs-blockchain-watcher/version"
-)
-
-// resyncCmd represents the resync command
-var resyncCmd = &cobra.Command{
-	Use:   "resync",
-	Short: "Resync historical data",
-	Long:  `Use this command to fill in sections of missing data in the super node`,
-	Run: func(cmd *cobra.Command, args []string) {
-		subCommand = cmd.CalledAs()
-		logWithCommand = *log.WithField("SubCommand", subCommand)
-		rsyncCmdCommand()
-	},
-}
-
-func rsyncCmdCommand() {
-	logWithCommand.Infof("running vdb version: %s", v.VersionWithMeta)
-	logWithCommand.Debug("loading super node configuration variables")
-	rConfig, err := resync.NewReSyncConfig()
-	if err != nil {
-		logWithCommand.Fatal(err)
-	}
-	logWithCommand.Infof("resync config: %+v", rConfig)
-	if rConfig.IPFSMode == shared.LocalInterface {
-		if err := ipfs.InitIPFSPlugins(); err != nil {
-			logWithCommand.Fatal(err)
-		}
-	}
-	logWithCommand.Debug("initializing new resync service")
-	rService, err := resync.NewResyncService(rConfig)
-	if err != nil {
-		logWithCommand.Fatal(err)
-	}
-	logWithCommand.Info("starting up resync process")
-	if err := rService.Resync(); err != nil {
-		logWithCommand.Fatal(err)
-	}
-	logWithCommand.Infof("%s %s resync finished", rConfig.Chain.String(), rConfig.ResyncType.String())
-}
-
-func init() {
-	rootCmd.AddCommand(resyncCmd)
-
-	// flags
-	resyncCmd.PersistentFlags().String("ipfs-path", "", "ipfs repository path")
-
-	resyncCmd.PersistentFlags().String("resync-chain", "", "which chain to support, options are currently Ethereum or Bitcoin.")
-	resyncCmd.PersistentFlags().String("resync-type", "", "which type of data to resync")
-	resyncCmd.PersistentFlags().Int("resync-start", 0, "block height to start resync")
-	resyncCmd.PersistentFlags().Int("resync-stop", 0, "block height to stop resync")
-	resyncCmd.PersistentFlags().Int("resync-batch-size", 0, "data fetching batch size")
-	resyncCmd.PersistentFlags().Int("resync-batch-number", 0, "how many goroutines to fetch data concurrently")
-	resyncCmd.PersistentFlags().Bool("resync-clear-old-cache", false, "if true, clear out old data of the provided type within the resync range before resyncing")
-	resyncCmd.PersistentFlags().Bool("resync-reset-validation", false, "if true, reset times_validated to 0")
-	resyncCmd.PersistentFlags().Int("resync-timeout", 15, "timeout used for resync http requests")
-
-	resyncCmd.PersistentFlags().String("btc-http-path", "", "http url for bitcoin node")
-	resyncCmd.PersistentFlags().String("btc-password", "", "password for btc node")
-	resyncCmd.PersistentFlags().String("btc-username", "", "username for btc node")
-	resyncCmd.PersistentFlags().String("btc-node-id", "", "btc node id")
-	resyncCmd.PersistentFlags().String("btc-client-name", "", "btc client name")
-	resyncCmd.PersistentFlags().String("btc-genesis-block", "", "btc genesis block hash")
-	resyncCmd.PersistentFlags().String("btc-network-id", "", "btc network id")
-
-	resyncCmd.PersistentFlags().String("eth-http-path", "", "http url for ethereum node")
-	resyncCmd.PersistentFlags().String("eth-node-id", "", "eth node id")
-	resyncCmd.PersistentFlags().String("eth-client-name", "", "eth client name")
-	resyncCmd.PersistentFlags().String("eth-genesis-block", "", "eth genesis block hash")
-	resyncCmd.PersistentFlags().String("eth-network-id", "", "eth network id")
-
-	// and their bindings
-	viper.BindPFlag("ipfs.path", resyncCmd.PersistentFlags().Lookup("ipfs-path"))
-
-	viper.BindPFlag("resync.chain", resyncCmd.PersistentFlags().Lookup("resync-chain"))
-	viper.BindPFlag("resync.type", resyncCmd.PersistentFlags().Lookup("resync-type"))
-	viper.BindPFlag("resync.start", resyncCmd.PersistentFlags().Lookup("resync-start"))
-	viper.BindPFlag("resync.stop", resyncCmd.PersistentFlags().Lookup("resync-stop"))
-	viper.BindPFlag("resync.batchSize", resyncCmd.PersistentFlags().Lookup("resync-batch-size"))
-	viper.BindPFlag("resync.batchNumber", resyncCmd.PersistentFlags().Lookup("resync-batch-number"))
-	viper.BindPFlag("resync.clearOldCache", resyncCmd.PersistentFlags().Lookup("resync-clear-old-cache"))
-	viper.BindPFlag("resync.resetValidation", resyncCmd.PersistentFlags().Lookup("resync-reset-validation"))
-	viper.BindPFlag("resync.timeout", resyncCmd.PersistentFlags().Lookup("resync-timeout"))
-
-	viper.BindPFlag("bitcoin.httpPath", resyncCmd.PersistentFlags().Lookup("btc-http-path"))
-	viper.BindPFlag("bitcoin.pass", resyncCmd.PersistentFlags().Lookup("btc-password"))
-	viper.BindPFlag("bitcoin.user", resyncCmd.PersistentFlags().Lookup("btc-username"))
-	viper.BindPFlag("bitcoin.nodeID", resyncCmd.PersistentFlags().Lookup("btc-node-id"))
-	viper.BindPFlag("bitcoin.clientName", resyncCmd.PersistentFlags().Lookup("btc-client-name"))
-	viper.BindPFlag("bitcoin.genesisBlock", resyncCmd.PersistentFlags().Lookup("btc-genesis-block"))
-	viper.BindPFlag("bitcoin.networkID", resyncCmd.PersistentFlags().Lookup("btc-network-id"))
-
-	viper.BindPFlag("ethereum.httpPath", resyncCmd.PersistentFlags().Lookup("eth-http-path"))
-	viper.BindPFlag("ethereum.nodeID", resyncCmd.PersistentFlags().Lookup("eth-node-id"))
-	viper.BindPFlag("ethereum.clientName", resyncCmd.PersistentFlags().Lookup("eth-client-name"))
-	viper.BindPFlag("ethereum.genesisBlock", resyncCmd.PersistentFlags().Lookup("eth-genesis-block"))
-	viper.BindPFlag("ethereum.networkID", resyncCmd.PersistentFlags().Lookup("eth-network-id"))
-}
@@ -20,42 +20,31 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"

 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/config"
 )

 var (
 	cfgFile        string
-	databaseConfig config.Database
-	ipc            string
 	subCommand     string
 	logWithCommand log.Entry
 )

-const (
-	pollingInterval  = 7 * time.Second
-	validationWindow = 15
-)
-
 var rootCmd = &cobra.Command{
-	Use:              "vulcanizedb",
+	Use:              "ipld-eth-server",
 	PersistentPreRun: initFuncs,
 }

 func Execute() {
-	log.Info("----- Starting vDB -----")
+	log.Info("----- Starting IPFS blockchain watcher -----")
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatal(err)
 	}
 }

 func initFuncs(cmd *cobra.Command, args []string) {
-	setViperConfigs()
 	logfile := viper.GetString("logfile")
 	if logfile != "" {
 		file, err := os.OpenFile(logfile,
@@ -75,19 +64,8 @@ func initFuncs(cmd *cobra.Command, args []string) {
 	}
 }

-func setViperConfigs() {
-	ipc = viper.GetString("client.ipcpath")
-	databaseConfig = config.Database{
-		Name:     viper.GetString("database.name"),
-		Hostname: viper.GetString("database.hostname"),
-		Port:     viper.GetInt("database.port"),
-		User:     viper.GetString("database.user"),
-		Password: viper.GetString("database.password"),
-	}
-	viper.Set("database.config", databaseConfig)
-}
-
 func logLevel() error {
+	viper.BindEnv("log.level", "LOGRUS_LEVEL")
 	lvl, err := log.ParseLevel(viper.GetString("log.level"))
 	if err != nil {
 		return err
@@ -102,7 +80,6 @@ func logLevel() error {

 func init() {
 	cobra.OnInitialize(initConfig)
-	// When searching for env variables, replace dots in config keys with underscores
 	viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))
 	viper.AutomaticEnv()

@@ -122,7 +99,6 @@ func init() {
 	viper.BindPFlag("database.hostname", rootCmd.PersistentFlags().Lookup("database-hostname"))
 	viper.BindPFlag("database.user", rootCmd.PersistentFlags().Lookup("database-user"))
 	viper.BindPFlag("database.password", rootCmd.PersistentFlags().Lookup("database-password"))
-	viper.BindPFlag("client.ipcPath", rootCmd.PersistentFlags().Lookup("client-ipcPath"))
 	viper.BindPFlag("log.level", rootCmd.PersistentFlags().Lookup("log-level"))
 }

@@ -0,0 +1,121 @@
+// Copyright © 2020 Vulcanize, Inc
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"os"
+	"os/signal"
+	"sync"
+
+	"github.com/ethereum/go-ethereum/rpc"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/vulcanize/ipld-eth-indexer/pkg/eth"
+
+	s "github.com/vulcanize/ipld-eth-server/pkg/serve"
+	v "github.com/vulcanize/ipld-eth-server/version"
+)
+
+// serveCmd represents the serve command
+var serveCmd = &cobra.Command{
+	Use:   "serve",
+	Short: "serve chain data from PG-IPFS",
+	Long: `This command configures a VulcanizeDB ipld-eth-server.
+
+`,
+	Run: func(cmd *cobra.Command, args []string) {
+		subCommand = cmd.CalledAs()
+		logWithCommand = *log.WithField("SubCommand", subCommand)
+		serve()
+	},
+}
+
+func serve() {
+	logWithCommand.Infof("running ipld-eth-server version: %s", v.VersionWithMeta)
+
+	var forwardPayloadChan chan eth.ConvertedPayload
+	wg := new(sync.WaitGroup)
+	logWithCommand.Debug("loading server configuration variables")
+	serverConfig, err := s.NewConfig()
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
+	logWithCommand.Infof("server config: %+v", serverConfig)
+	logWithCommand.Debug("initializing new server service")
+	server, err := s.NewServer(serverConfig)
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
+
+	logWithCommand.Info("starting up server servers")
+	forwardPayloadChan = make(chan eth.ConvertedPayload, s.PayloadChanBufferSize)
+	server.Serve(wg, forwardPayloadChan)
+	if err := startServers(server, serverConfig); err != nil {
+		logWithCommand.Fatal(err)
+	}
+
+	shutdown := make(chan os.Signal)
+	signal.Notify(shutdown, os.Interrupt)
+	<-shutdown
+	server.Stop()
+	wg.Wait()
+}
+
+func startServers(server s.Server, settings *s.Config) error {
+	logWithCommand.Info("starting up IPC server")
+	_, _, err := rpc.StartIPCEndpoint(settings.IPCEndpoint, server.APIs())
+	if err != nil {
+		return err
+	}
+	logWithCommand.Info("starting up WS server")
+	_, _, err = rpc.StartWSEndpoint(settings.WSEndpoint, server.APIs(), []string{"vdb"}, nil, true)
+	if err != nil {
+		return err
+	}
+	logWithCommand.Info("starting up HTTP server")
+	_, _, err = rpc.StartHTTPEndpoint(settings.HTTPEndpoint, server.APIs(), []string{"eth"}, nil, []string{"*"}, rpc.HTTPTimeouts{})
+	return err
+}
+
+func init() {
+	rootCmd.AddCommand(serveCmd)
+
+	// flags for all config variables
+	serveCmd.PersistentFlags().String("server-ws-path", "", "vdb server ws path")
+	serveCmd.PersistentFlags().String("server-http-path", "", "vdb server http path")
+	serveCmd.PersistentFlags().String("server-ipc-path", "", "vdb server ipc path")
+
+	serveCmd.PersistentFlags().String("eth-ws-path", "", "ws url for ethereum node")
+	serveCmd.PersistentFlags().String("eth-http-path", "", "http url for ethereum node")
+	serveCmd.PersistentFlags().String("eth-node-id", "", "eth node id")
+	serveCmd.PersistentFlags().String("eth-client-name", "", "eth client name")
+	serveCmd.PersistentFlags().String("eth-genesis-block", "", "eth genesis block hash")
+	serveCmd.PersistentFlags().String("eth-network-id", "", "eth network id")
+
+	// and their bindings
+	viper.BindPFlag("server.wsPath", serveCmd.PersistentFlags().Lookup("server-ws-path"))
+	viper.BindPFlag("server.httpPath", serveCmd.PersistentFlags().Lookup("server-http-path"))
+	viper.BindPFlag("server.ipcPath", serveCmd.PersistentFlags().Lookup("server-ipc-path"))
+
+	viper.BindPFlag("ethereum.wsPath", serveCmd.PersistentFlags().Lookup("eth-ws-path"))
+	viper.BindPFlag("ethereum.httpPath", serveCmd.PersistentFlags().Lookup("eth-http-path"))
+	viper.BindPFlag("ethereum.nodeID", serveCmd.PersistentFlags().Lookup("eth-node-id"))
+	viper.BindPFlag("ethereum.clientName", serveCmd.PersistentFlags().Lookup("eth-client-name"))
+	viper.BindPFlag("ethereum.genesisBlock", serveCmd.PersistentFlags().Lookup("eth-genesis-block"))
+	viper.BindPFlag("ethereum.networkID", serveCmd.PersistentFlags().Lookup("eth-network-id"))
+}
@@ -28,31 +28,31 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+	eth2 "github.com/vulcanize/ipld-eth-indexer/pkg/eth"
+
+	"github.com/vulcanize/ipld-eth-server/pkg/client"
+	"github.com/vulcanize/ipld-eth-server/pkg/eth"
+	w "github.com/vulcanize/ipld-eth-server/pkg/serve"
 )

-// streamEthSubscriptionCmd represents the streamEthSubscription command
-var streamEthSubscriptionCmd = &cobra.Command{
-	Use:   "streamEthSubscription",
-	Short: "This command is used to subscribe to the super node eth stream with the provided filters",
-	Long: `This command is for demo and testing purposes and is used to subscribe to the super node with the provided subscription configuration parameters.
-It does not do anything with the data streamed from the super node other than unpack it and print it out for demonstration purposes.`,
+// subscribeCmd represents the subscribe command
+var subscribeCmd = &cobra.Command{
+	Use:   "subscribe",
+	Short: "This command is used to subscribe to the eth ipfs watcher data stream with the provided filters",
+	Long: `This command is for demo and testing purposes and is used to subscribe to the watcher with the provided subscription configuration parameters.
+It does not do anything with the data streamed from the watcher other than unpack it and print it out for demonstration purposes.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		subCommand = cmd.CalledAs()
 		logWithCommand = *log.WithField("SubCommand", subCommand)
-		streamEthSubscription()
+		subscribe()
 	},
 }

 func init() {
-	rootCmd.AddCommand(streamEthSubscriptionCmd)
+	rootCmd.AddCommand(subscribeCmd)
 }

-func streamEthSubscription() {
+func subscribe() {
 	// Prep the subscription config/filters to be sent to the server
 	ethSubConfig, err := eth.NewEthSubscriptionConfig()
 	if err != nil {
@@ -60,18 +60,17 @@ func streamEthSubscription() {
 	}

 	// Create a new rpc client and a subscription streamer with that client
-	rpcClient := getRPCClient()
-	str := streamer.NewSuperNodeStreamer(rpcClient)
-
-	// Buffered channel for reading subscription payloads
-	payloadChan := make(chan watcher.SubscriptionPayload, 20000)
-
-	// Subscribe to the super node service with the given config/filter parameters
-	rlpParams, err := rlp.EncodeToBytes(ethSubConfig)
+	rpcClient, err := getRPCClient()
 	if err != nil {
 		logWithCommand.Fatal(err)
 	}
-	sub, err := str.Stream(payloadChan, rlpParams)
+	subClient := client.NewClient(rpcClient)
+
+	// Buffered channel for reading subscription payloads
+	payloadChan := make(chan w.SubscriptionPayload, 20000)
+
+	// Subscribe to the watcher service with the given config/filter parameters
+	sub, err := subClient.Stream(payloadChan, *ethSubConfig)
 	if err != nil {
 		logWithCommand.Fatal(err)
 	}
@@ -84,7 +83,7 @@ func streamEthSubscription() {
 				logWithCommand.Error(payload.Err)
 				continue
 			}
-			var ethData eth.IPLDs
+			var ethData eth2.IPLDs
 			if err := rlp.DecodeBytes(payload.Data, &ethData); err != nil {
 				logWithCommand.Error(err)
 				continue
@@ -167,14 +166,10 @@ func streamEthSubscription() {
 	}
 }

-func getRPCClient() core.RPCClient {
-	vulcPath := viper.GetString("superNode.ethSubscription.wsPath")
+func getRPCClient() (*rpc.Client, error) {
+	vulcPath := viper.GetString("watcher.ethSubscription.wsPath")
 	if vulcPath == "" {
 		vulcPath = "ws://127.0.0.1:8080" // default to and try the default ws url if no path is provided
 	}
-	rawRPCClient, err := rpc.Dial(vulcPath)
-	if err != nil {
-		logWithCommand.Fatal(err)
-	}
-	return client.NewRPCClient(rawRPCClient, vulcPath)
+	return rpc.Dial(vulcPath)
 }
@@ -19,20 +19,20 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

-	v "github.com/vulcanize/ipfs-blockchain-watcher/version"
+	v "github.com/vulcanize/ipld-eth-server/version"
 )

 // versionCmd represents the version command
 var versionCmd = &cobra.Command{
 	Use:   "version",
-	Short: "Prints the version of ipfs-blockchain-watcher",
-	Long: `Use this command to fetch the version of ipfs-blockchain-watcher
+	Short: "Prints the version of ipld-eth-server",
+	Long: `Use this command to fetch the version of ipld-eth-server

-Usage: ./ipfs-blockchain-watcher version`,
+Usage: ./ipld-eth-server version`,
 	Run: func(cmd *cobra.Command, args []string) {
 		subCommand = cmd.CalledAs()
 		logWithCommand = *log.WithField("SubCommand", subCommand)
-		logWithCommand.Infof("ipfs-blockchain-watcher version: %s", v.VersionWithMeta)
+		logWithCommand.Infof("ipld-eth-server version: %s", v.VersionWithMeta)
 	},
 }

@@ -1,194 +0,0 @@
-// Copyright © 2020 Vulcanize, Inc
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-package cmd
-
-import (
-	"os"
-	"os/signal"
-	"sync"
-
-	"github.com/ethereum/go-ethereum/rpc"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
-	v "github.com/vulcanize/ipfs-blockchain-watcher/version"
-)
-
-// superNodeCmd represents the superNode command
-var superNodeCmd = &cobra.Command{
-	Use:   "superNode",
-	Short: "sync chain data into PG-IPFS",
-	Long: `This command configures a VulcanizeDB ipfs-blockchain-watcher.
-
-The Sync process streams all chain data from the appropriate chain, processes this data into IPLD objects
-and publishes them to IPFS. It then indexes the CIDs against useful data fields/metadata in Postgres. 
-
-The Serve process creates and exposes a rpc subscription server over ws and ipc. Transformers can subscribe to
-these endpoints to stream
-
-The BackFill process spins up a background process which periodically probes the Postgres database to identify
-and fill in gaps in the data
-`,
-	Run: func(cmd *cobra.Command, args []string) {
-		subCommand = cmd.CalledAs()
-		logWithCommand = *log.WithField("SubCommand", subCommand)
-		superNode()
-	},
-}
-
-func superNode() {
-	logWithCommand.Infof("running vdb version: %s", v.VersionWithMeta)
-	logWithCommand.Debug("loading super node configuration variables")
-	superNodeConfig, err := watcher.NewSuperNodeConfig()
-	if err != nil {
-		logWithCommand.Fatal(err)
-	}
-	logWithCommand.Infof("super node config: %+v", superNodeConfig)
-	if superNodeConfig.IPFSMode == shared.LocalInterface {
-		if err := ipfs.InitIPFSPlugins(); err != nil {
-			logWithCommand.Fatal(err)
-		}
-	}
-	wg := &sync.WaitGroup{}
-	logWithCommand.Debug("initializing new super node service")
-	superNode, err := watcher.NewSuperNode(superNodeConfig)
-	if err != nil {
-		logWithCommand.Fatal(err)
-	}
-	var forwardPayloadChan chan shared.ConvertedData
-	if superNodeConfig.Serve {
-		logWithCommand.Info("starting up super node servers")
-		forwardPayloadChan = make(chan shared.ConvertedData, watcher.PayloadChanBufferSize)
-		superNode.Serve(wg, forwardPayloadChan)
-		if err := startServers(superNode, superNodeConfig); err != nil {
-			logWithCommand.Fatal(err)
-		}
-	}
-	if superNodeConfig.Sync {
-		logWithCommand.Info("starting up super node sync process")
-		if err := superNode.Sync(wg, forwardPayloadChan); err != nil {
-			logWithCommand.Fatal(err)
-		}
-	}
-	var backFiller watcher.BackFillInterface
-	if superNodeConfig.BackFill {
-		logWithCommand.Debug("initializing new super node backfill service")
-		backFiller, err = watcher.NewBackFillService(superNodeConfig, forwardPayloadChan)
-		if err != nil {
-			logWithCommand.Fatal(err)
-		}
-		logWithCommand.Info("starting up super node backfill process")
-		backFiller.BackFill(wg)
-	}
-	shutdown := make(chan os.Signal)
-	signal.Notify(shutdown, os.Interrupt)
-	<-shutdown
-	if superNodeConfig.BackFill {
-		backFiller.Stop()
-	}
-	superNode.Stop()
-	wg.Wait()
-}
-
-func startServers(superNode watcher.SuperNode, settings *watcher.Config) error {
-	logWithCommand.Debug("starting up IPC server")
-	_, _, err := rpc.StartIPCEndpoint(settings.IPCEndpoint, superNode.APIs())
-	if err != nil {
-		return err
-	}
-	logWithCommand.Debug("starting up WS server")
-	_, _, err = rpc.StartWSEndpoint(settings.WSEndpoint, superNode.APIs(), []string{"vdb"}, nil, true)
-	if err != nil {
-		return err
-	}
-	logWithCommand.Debug("starting up HTTP server")
-	_, _, err = rpc.StartHTTPEndpoint(settings.HTTPEndpoint, superNode.APIs(), []string{settings.Chain.API()}, nil, nil, rpc.HTTPTimeouts{})
-	return err
-}
-
-func init() {
-	rootCmd.AddCommand(superNodeCmd)
-
-	// flags for all config variables
-	superNodeCmd.PersistentFlags().String("ipfs-path", "", "ipfs repository path")
-
-	superNodeCmd.PersistentFlags().String("supernode-chain", "", "which chain to support, options are currently Ethereum or Bitcoin.")
-	superNodeCmd.PersistentFlags().Bool("supernode-server", false, "turn vdb server on or off")
-	superNodeCmd.PersistentFlags().String("supernode-ws-path", "", "vdb server ws path")
-	superNodeCmd.PersistentFlags().String("supernode-http-path", "", "vdb server http path")
-	superNodeCmd.PersistentFlags().String("supernode-ipc-path", "", "vdb server ipc path")
-	superNodeCmd.PersistentFlags().Bool("supernode-sync", false, "turn vdb sync on or off")
-	superNodeCmd.PersistentFlags().Int("supernode-workers", 0, "how many worker goroutines to publish and index data")
-	superNodeCmd.PersistentFlags().Bool("supernode-back-fill", false, "turn vdb backfill on or off")
-	superNodeCmd.PersistentFlags().Int("supernode-frequency", 0, "how often (in seconds) the backfill process checks for gaps")
-	superNodeCmd.PersistentFlags().Int("supernode-batch-size", 0, "data fetching batch size")
-	superNodeCmd.PersistentFlags().Int("supernode-batch-number", 0, "how many goroutines to fetch data concurrently")
-	superNodeCmd.PersistentFlags().Int("supernode-validation-level", 0, "backfill will resync any data below this level")
-	superNodeCmd.PersistentFlags().Int("supernode-timeout", 0, "timeout used for backfill http requests")
-
-	superNodeCmd.PersistentFlags().String("btc-ws-path", "", "ws url for bitcoin node")
-	superNodeCmd.PersistentFlags().String("btc-http-path", "", "http url for bitcoin node")
-	superNodeCmd.PersistentFlags().String("btc-password", "", "password for btc node")
-	superNodeCmd.PersistentFlags().String("btc-username", "", "username for btc node")
-	superNodeCmd.PersistentFlags().String("btc-node-id", "", "btc node id")
-	superNodeCmd.PersistentFlags().String("btc-client-name", "", "btc client name")
-	superNodeCmd.PersistentFlags().String("btc-genesis-block", "", "btc genesis block hash")
-	superNodeCmd.PersistentFlags().String("btc-network-id", "", "btc network id")
-
-	superNodeCmd.PersistentFlags().String("eth-ws-path", "", "ws url for ethereum node")
-	superNodeCmd.PersistentFlags().String("eth-http-path", "", "http url for ethereum node")
-	superNodeCmd.PersistentFlags().String("eth-node-id", "", "eth node id")
-	superNodeCmd.PersistentFlags().String("eth-client-name", "", "eth client name")
-	superNodeCmd.PersistentFlags().String("eth-genesis-block", "", "eth genesis block hash")
-	superNodeCmd.PersistentFlags().String("eth-network-id", "", "eth network id")
-
-	// and their bindings
-	viper.BindPFlag("ipfs.path", superNodeCmd.PersistentFlags().Lookup("ipfs-path"))
-
-	viper.BindPFlag("superNode.chain", superNodeCmd.PersistentFlags().Lookup("supernode-chain"))
-	viper.BindPFlag("superNode.server", superNodeCmd.PersistentFlags().Lookup("supernode-server"))
-	viper.BindPFlag("superNode.wsPath", superNodeCmd.PersistentFlags().Lookup("supernode-ws-path"))
-	viper.BindPFlag("superNode.httpPath", superNodeCmd.PersistentFlags().Lookup("supernode-http-path"))
-	viper.BindPFlag("superNode.ipcPath", superNodeCmd.PersistentFlags().Lookup("supernode-ipc-path"))
-	viper.BindPFlag("superNode.sync", superNodeCmd.PersistentFlags().Lookup("supernode-sync"))
-	viper.BindPFlag("superNode.workers", superNodeCmd.PersistentFlags().Lookup("supernode-workers"))
-	viper.BindPFlag("superNode.backFill", superNodeCmd.PersistentFlags().Lookup("supernode-back-fill"))
-	viper.BindPFlag("superNode.frequency", superNodeCmd.PersistentFlags().Lookup("supernode-frequency"))
-	viper.BindPFlag("superNode.batchSize", superNodeCmd.PersistentFlags().Lookup("supernode-batch-size"))
-	viper.BindPFlag("superNode.batchNumber", superNodeCmd.PersistentFlags().Lookup("supernode-batch-number"))
-	viper.BindPFlag("superNode.validationLevel", superNodeCmd.PersistentFlags().Lookup("supernode-validation-level"))
-	viper.BindPFlag("superNode.timeout", superNodeCmd.PersistentFlags().Lookup("supernode-timeout"))
-
-	viper.BindPFlag("bitcoin.wsPath", superNodeCmd.PersistentFlags().Lookup("btc-ws-path"))
-	viper.BindPFlag("bitcoin.httpPath", superNodeCmd.PersistentFlags().Lookup("btc-http-path"))
-	viper.BindPFlag("bitcoin.pass", superNodeCmd.PersistentFlags().Lookup("btc-password"))
-	viper.BindPFlag("bitcoin.user", superNodeCmd.PersistentFlags().Lookup("btc-username"))
-	viper.BindPFlag("bitcoin.nodeID", superNodeCmd.PersistentFlags().Lookup("btc-node-id"))
-	viper.BindPFlag("bitcoin.clientName", superNodeCmd.PersistentFlags().Lookup("btc-client-name"))
-	viper.BindPFlag("bitcoin.genesisBlock", superNodeCmd.PersistentFlags().Lookup("btc-genesis-block"))
-	viper.BindPFlag("bitcoin.networkID", superNodeCmd.PersistentFlags().Lookup("btc-network-id"))
-
-	viper.BindPFlag("ethereum.wsPath", superNodeCmd.PersistentFlags().Lookup("eth-ws-path"))
-	viper.BindPFlag("ethereum.httpPath", superNodeCmd.PersistentFlags().Lookup("eth-http-path"))
-	viper.BindPFlag("ethereum.nodeID", superNodeCmd.PersistentFlags().Lookup("eth-node-id"))
-	viper.BindPFlag("ethereum.clientName", superNodeCmd.PersistentFlags().Lookup("eth-client-name"))
-	viper.BindPFlag("ethereum.genesisBlock", superNodeCmd.PersistentFlags().Lookup("eth-genesis-block"))
-	viper.BindPFlag("ethereum.networkID", superNodeCmd.PersistentFlags().Lookup("eth-network-id"))
-}
@@ -5,9 +5,17 @@ CREATE TABLE eth.header_cids (
  block_hash            VARCHAR(66) NOT NULL,
  parent_hash           VARCHAR(66) NOT NULL,
  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  td                    NUMERIC NOT NULL,
  node_id               INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE,
  reward                NUMERIC NOT NULL,
+  state_root            VARCHAR(66) NOT NULL,
+  tx_root               VARCHAR(66) NOT NULL,
+  receipt_root          VARCHAR(66) NOT NULL,
+  uncle_root            VARCHAR(66) NOT NULL,
+  bloom                 BYTEA NOT NULL,
+  timestamp             NUMERIC NOT NULL,
+  times_validated       INTEGER NOT NULL DEFAULT 1,
  UNIQUE (block_number, block_hash)
 );

@@ -5,6 +5,7 @@ CREATE TABLE eth.uncle_cids (
  block_hash            VARCHAR(66) NOT NULL,
  parent_hash           VARCHAR(66) NOT NULL,
  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  reward                NUMERIC NOT NULL,
  UNIQUE (header_id, block_hash)
 );
@@ -5,8 +5,11 @@ CREATE TABLE eth.transaction_cids (
  tx_hash               VARCHAR(66) NOT NULL,
  index                 INTEGER NOT NULL,
  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  dst                   VARCHAR(66) NOT NULL,
  src                   VARCHAR(66) NOT NULL,
+  deployment            BOOL NOT NULL,
+  tx_data               BYTEA,
  UNIQUE (header_id, tx_hash)
 );

@@ -3,11 +3,15 @@ CREATE TABLE eth.receipt_cids (
  id                    SERIAL PRIMARY KEY,
  tx_id                 INTEGER NOT NULL REFERENCES eth.transaction_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  contract              VARCHAR(66),
+  contract_hash         VARCHAR(66),
  topic0s               VARCHAR(66)[],
  topic1s               VARCHAR(66)[],
  topic2s               VARCHAR(66)[],
-  topic3s               VARCHAR(66)[]
+  topic3s               VARCHAR(66)[],
+  log_contracts         VARCHAR(66)[],
+  UNIQUE (tx_id)
 );

 -- +goose Down
@@ -1,12 +0,0 @@
-- +goose Up
-CREATE TABLE eth.state_cids (
-  id                    SERIAL PRIMARY KEY,
-  header_id             INTEGER NOT NULL REFERENCES eth.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  state_key             VARCHAR(66) NOT NULL,
-  leaf                  BOOLEAN NOT NULL,
-  cid                   TEXT NOT NULL,
-  UNIQUE (header_id, state_key)
-);
-
-- +goose Down
-DROP TABLE eth.state_cids;
@@ -0,0 +1,15 @@
+-- +goose Up
+CREATE TABLE eth.state_cids (
+  id                    SERIAL PRIMARY KEY,
+  header_id             INTEGER NOT NULL REFERENCES eth.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  state_leaf_key        VARCHAR(66),
+  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  state_path            BYTEA,
+  node_type             INTEGER NOT NULL,
+  diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+  UNIQUE (header_id, state_path)
+);
+
+-- +goose Down
+DROP TABLE eth.state_cids;
@@ -1,12 +0,0 @@
-- +goose Up
-CREATE TABLE eth.storage_cids (
-  id                    SERIAL PRIMARY KEY,
-  state_id              INTEGER NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  storage_key           VARCHAR(66) NOT NULL,
-  leaf                  BOOLEAN NOT NULL,
-  cid                   TEXT NOT NULL,
-  UNIQUE (state_id, storage_key)
-);
-
-- +goose Down
-DROP TABLE eth.storage_cids;
@@ -0,0 +1,15 @@
+-- +goose Up
+CREATE TABLE eth.storage_cids (
+  id                    SERIAL PRIMARY KEY,
+  state_id              INTEGER NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  storage_leaf_key      VARCHAR(66),
+  cid                   TEXT NOT NULL,
+  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  storage_path          BYTEA,
+  node_type             INTEGER NOT NULL,
+  diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+  UNIQUE (state_id, storage_path)
+);
+
+-- +goose Down
+DROP TABLE eth.storage_cids;
@@ -1,5 +0,0 @@
-- +goose Up
-CREATE SCHEMA btc;
-
-- +goose Down
-DROP SCHEMA btc;
@@ -1,7 +1,7 @@
 -- +goose Up
 CREATE TABLE eth.state_accounts (
  id                    SERIAL PRIMARY KEY,
-  state_id              INTEGER NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE,
+  state_id              INTEGER NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
  balance               NUMERIC NOT NULL,
  nonce                 INTEGER NOT NULL,
  code_hash             BYTEA NOT NULL,
@@ -1,15 +0,0 @@
-- +goose Up
-CREATE TABLE btc.header_cids (
-	id           SERIAL  PRIMARY KEY,
-	block_number BIGINT NOT NULL,
-	block_hash   VARCHAR(66) NOT NULL,
-	parent_hash  VARCHAR(66) NOT NULL,
-	cid          TEXT NOT NULL,
-	timestamp    NUMERIC NOT NULL,
-	bits         BIGINT NOT NULL,
-	node_id      INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE,
-	UNIQUE (block_number, block_hash)
-);
-
-- +goose Down
-DROP TABLE btc.header_cids;
@@ -1,11 +1,6 @@
 -- +goose Up
 COMMENT ON TABLE public.nodes IS E'@name NodeInfo';
-COMMENT ON TABLE btc.header_cids IS E'@name BtcHeaderCids';
-COMMENT ON TABLE btc.transaction_cids IS E'@name BtcTransactionCids';
-COMMENT ON TABLE btc.queue_data IS E'@name BtcQueueData';
 COMMENT ON TABLE eth.transaction_cids IS E'@name EthTransactionCids';
 COMMENT ON TABLE eth.header_cids IS E'@name EthHeaderCids';
-COMMENT ON TABLE eth.queue_data IS E'@name EthQueueData';
 COMMENT ON COLUMN public.nodes.node_id IS E'@name ChainNodeID';
 COMMENT ON COLUMN eth.header_cids.node_id IS E'@name EthNodeID';
-COMMENT ON COLUMN btc.header_cids.node_id IS E'@name BtcNodeID';
@@ -1,13 +0,0 @@
-- +goose Up
-CREATE TABLE btc.transaction_cids (
-  id           SERIAL PRIMARY KEY,
-	header_id    INTEGER NOT NULL REFERENCES btc.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-	index        INTEGER NOT NULL,
-	tx_hash      VARCHAR(66) NOT NULL UNIQUE,
-	cid          TEXT NOT NULL,
-	segwit       BOOL NOT NULL,
-	witness_hash VARCHAR(66)
-);
-
-- +goose Down
-DROP TABLE btc.transaction_cids;
@@ -1,15 +0,0 @@
-- +goose Up
-CREATE TABLE btc.tx_outputs (
-  id            SERIAL PRIMARY KEY,
-	tx_id         INTEGER NOT NULL REFERENCES btc.transaction_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-	index         INTEGER NOT NULL,
-	value         BIGINT NOT NULL,
-	pk_script     BYTEA NOT NULL,
-	script_class  INTEGER NOT NULL,
-	addresses     VARCHAR(66)[],
-	required_sigs INTEGER NOT NULL,
-	UNIQUE (tx_id, index)
-);
-
-- +goose Down
-DROP TABLE btc.tx_outputs;
@@ -1,14 +0,0 @@
-- +goose Up
-CREATE TABLE btc.tx_inputs (
-  id               SERIAL PRIMARY KEY,
-	tx_id            INTEGER NOT NULL REFERENCES btc.transaction_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-	index            INTEGER NOT NULL,
-	witness          VARCHAR[],
-	sig_script       BYTEA NOT NULL,
-	outpoint_tx_hash VARCHAR(66) NOT NULL,
-	outpoint_index   NUMERIC NOT NULL,
-	UNIQUE (tx_id, index)
-);
-
-- +goose Down
-DROP TABLE btc.tx_inputs;
@@ -1,9 +0,0 @@
-- +goose Up
-CREATE TABLE eth.queue_data (
-  id SERIAL PRIMARY KEY,
-  data BYTEA NOT NULL,
-  height BIGINT UNIQUE NOT NULL
-);
-
-- +goose Down
-DROP TABLE eth.queue_data;
@@ -1,9 +0,0 @@
-- +goose Up
-CREATE TABLE btc.queue_data (
-  id SERIAL PRIMARY KEY,
-  data BYTEA NOT NULL,
-  height BIGINT UNIQUE NOT NULL
-);
-
-- +goose Down
-DROP TABLE btc.queue_data;
@@ -1,37 +0,0 @@
-- +goose Up
-ALTER TABLE eth.state_cids
-ADD COLUMN state_path BYTEA;
-
-ALTER TABLE eth.state_cids
-DROP COLUMN leaf;
-
-ALTER TABLE eth.state_cids
-ADD COLUMN node_type INTEGER;
-
-ALTER TABLE eth.state_cids
-ALTER COLUMN state_key DROP NOT NULL;
-
-ALTER TABLE eth.state_cids
-DROP CONSTRAINT state_cids_header_id_state_key_key;
-
-ALTER TABLE eth.state_cids
-ADD CONSTRAINT state_cids_header_id_state_path_key UNIQUE (header_id, state_path);
-
-- +goose Down
-ALTER TABLE eth.state_cids
-ADD CONSTRAINT state_cids_header_id_state_key_key UNIQUE (header_id, state_key);
-
-ALTER TABLE eth.state_cids
-DROP CONSTRAINT state_cids_header_id_state_path_key;
-
-ALTER TABLE eth.state_cids
-ALTER COLUMN state_key SET NOT NULL;
-
-ALTER TABLE eth.state_cids
-DROP COLUMN node_type;
-
-ALTER TABLE eth.state_cids
-ADD COLUMN leaf BOOLEAN NOT NULL;
-
-ALTER TABLE eth.state_cids
-DROP COLUMN state_path;
@@ -1,37 +0,0 @@
-- +goose Up
-ALTER TABLE eth.storage_cids
-ADD COLUMN storage_path BYTEA;
-
-ALTER TABLE eth.storage_cids
-DROP COLUMN leaf;
-
-ALTER TABLE eth.storage_cids
-ADD COLUMN node_type INTEGER;
-
-ALTER TABLE eth.storage_cids
-ALTER COLUMN storage_key DROP NOT NULL;
-
-ALTER TABLE eth.storage_cids
-DROP CONSTRAINT storage_cids_state_id_storage_key_key;
-
-ALTER TABLE eth.storage_cids
-ADD CONSTRAINT storage_cids_state_id_storage_path_key UNIQUE (state_id, storage_path);
-
-- +goose Down
-ALTER TABLE eth.storage_cids
-DROP CONSTRAINT storage_cids_state_id_storage_path_key;
-
-ALTER TABLE eth.storage_cids
-ADD CONSTRAINT storage_cids_state_id_storage_key_key UNIQUE (state_id, storage_key);
-
-ALTER TABLE eth.storage_cids
-ALTER COLUMN storage_key SET NOT NULL;
-
-ALTER TABLE eth.storage_cids
-DROP COLUMN node_type;
-
-ALTER TABLE eth.storage_cids
-ADD COLUMN leaf BOOLEAN NOT NULL;
-
-ALTER TABLE eth.storage_cids
-DROP COLUMN storage_path;
@@ -1,37 +0,0 @@
-- +goose Up
-ALTER TABLE eth.header_cids
-ADD COLUMN state_root VARCHAR(66);
-
-ALTER TABLE eth.header_cids
-ADD COLUMN tx_root VARCHAR(66);
-
-ALTER TABLE eth.header_cids
-ADD COLUMN receipt_root VARCHAR(66);
-
-ALTER TABLE eth.header_cids
-ADD COLUMN uncle_root VARCHAR(66);
-
-ALTER TABLE eth.header_cids
-ADD COLUMN bloom BYTEA;
-
-ALTER TABLE eth.header_cids
-ADD COLUMN timestamp NUMERIC;
-
-- +goose Down
-ALTER TABLE eth.header_cids
-DROP COLUMN timestamp;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN bloom;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN uncle_root;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN receipt_root;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN tx_root;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN state_root;
@@ -1,13 +0,0 @@
-- +goose Up
-ALTER TABLE eth.state_cids
-RENAME COLUMN state_key TO state_leaf_key;
-
-ALTER TABLE eth.storage_cids
-RENAME COLUMN storage_key TO storage_leaf_key;
-
-- +goose Down
-ALTER TABLE eth.storage_cids
-RENAME COLUMN storage_leaf_key TO storage_key;
-
-ALTER TABLE eth.state_cids
-RENAME COLUMN state_leaf_key TO state_key;
@@ -1,22 +0,0 @@
-- +goose Up
-ALTER TABLE eth.receipt_cids
-ADD COLUMN log_contracts VARCHAR(66)[];
-
-ALTER TABLE eth.receipt_cids
-ADD COLUMN contract_hash VARCHAR(66);
-
-WITH uniques AS (SELECT DISTINCT ON (tx_id) * FROM eth.receipt_cids)
-DELETE FROM eth.receipt_cids WHERE receipt_cids.id NOT IN (SELECT id FROM uniques);
-
-ALTER TABLE eth.receipt_cids
-ADD CONSTRAINT receipt_cids_tx_id_key UNIQUE (tx_id);
-
-- +goose Down
-ALTER TABLE eth.receipt_cids
-DROP CONSTRAINT receipt_cids_tx_id_key;
-
-ALTER TABLE eth.receipt_cids
-DROP COLUMN contract_hash;
-
-ALTER TABLE eth.receipt_cids
-DROP COLUMN log_contracts;
@@ -1,13 +0,0 @@
-- +goose Up
-ALTER TABLE eth.header_cids
-ADD COLUMN times_validated INTEGER NOT NULL DEFAULT 1;
-
-ALTER TABLE btc.header_cids
-ADD COLUMN times_validated INTEGER NOT NULL DEFAULT 1;
-
-- +goose Down
-ALTER TABLE btc.header_cids
-DROP COLUMN times_validated;
-
-ALTER TABLE eth.header_cids
-DROP COLUMN times_validated;
@@ -16,13 +16,6 @@ SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;

--
-- Name: btc; Type: SCHEMA; Schema: -; Owner: -
--
-
-CREATE SCHEMA btc;
-
-
 --
 -- Name: eth; Type: SCHEMA; Schema: -; Owner: -
 --
@@ -34,208 +27,6 @@ SET default_tablespace = '';

 SET default_table_access_method = heap;

--
-- Name: header_cids; Type: TABLE; Schema: btc; Owner: -
--
-
-CREATE TABLE btc.header_cids (
-    id integer NOT NULL,
-    block_number bigint NOT NULL,
-    block_hash character varying(66) NOT NULL,
-    parent_hash character varying(66) NOT NULL,
-    cid text NOT NULL,
-    "timestamp" numeric NOT NULL,
-    bits bigint NOT NULL,
-    node_id integer NOT NULL,
-    times_validated integer DEFAULT 1 NOT NULL
-);
-
-
--
-- Name: TABLE header_cids; Type: COMMENT; Schema: btc; Owner: -
--
-
-COMMENT ON TABLE btc.header_cids IS '@name BtcHeaderCids';
-
-
--
-- Name: COLUMN header_cids.node_id; Type: COMMENT; Schema: btc; Owner: -
--
-
-COMMENT ON COLUMN btc.header_cids.node_id IS '@name BtcNodeID';
-
-
--
-- Name: header_cids_id_seq; Type: SEQUENCE; Schema: btc; Owner: -
--
-
-CREATE SEQUENCE btc.header_cids_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: header_cids_id_seq; Type: SEQUENCE OWNED BY; Schema: btc; Owner: -
--
-
-ALTER SEQUENCE btc.header_cids_id_seq OWNED BY btc.header_cids.id;
-
-
--
-- Name: queue_data; Type: TABLE; Schema: btc; Owner: -
--
-
-CREATE TABLE btc.queue_data (
-    id integer NOT NULL,
-    data bytea NOT NULL,
-    height bigint NOT NULL
-);
-
-
--
-- Name: TABLE queue_data; Type: COMMENT; Schema: btc; Owner: -
--
-
-COMMENT ON TABLE btc.queue_data IS '@name BtcQueueData';
-
-
--
-- Name: queue_data_id_seq; Type: SEQUENCE; Schema: btc; Owner: -
--
-
-CREATE SEQUENCE btc.queue_data_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: queue_data_id_seq; Type: SEQUENCE OWNED BY; Schema: btc; Owner: -
--
-
-ALTER SEQUENCE btc.queue_data_id_seq OWNED BY btc.queue_data.id;
-
-
--
-- Name: transaction_cids; Type: TABLE; Schema: btc; Owner: -
--
-
-CREATE TABLE btc.transaction_cids (
-    id integer NOT NULL,
-    header_id integer NOT NULL,
-    index integer NOT NULL,
-    tx_hash character varying(66) NOT NULL,
-    cid text NOT NULL,
-    segwit boolean NOT NULL,
-    witness_hash character varying(66)
-);
-
-
--
-- Name: TABLE transaction_cids; Type: COMMENT; Schema: btc; Owner: -
--
-
-COMMENT ON TABLE btc.transaction_cids IS '@name BtcTransactionCids';
-
-
--
-- Name: transaction_cids_id_seq; Type: SEQUENCE; Schema: btc; Owner: -
--
-
-CREATE SEQUENCE btc.transaction_cids_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: transaction_cids_id_seq; Type: SEQUENCE OWNED BY; Schema: btc; Owner: -
--
-
-ALTER SEQUENCE btc.transaction_cids_id_seq OWNED BY btc.transaction_cids.id;
-
-
--
-- Name: tx_inputs; Type: TABLE; Schema: btc; Owner: -
--
-
-CREATE TABLE btc.tx_inputs (
-    id integer NOT NULL,
-    tx_id integer NOT NULL,
-    index integer NOT NULL,
-    witness character varying[],
-    sig_script bytea NOT NULL,
-    outpoint_tx_hash character varying(66) NOT NULL,
-    outpoint_index numeric NOT NULL
-);
-
-
--
-- Name: tx_inputs_id_seq; Type: SEQUENCE; Schema: btc; Owner: -
--
-
-CREATE SEQUENCE btc.tx_inputs_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: tx_inputs_id_seq; Type: SEQUENCE OWNED BY; Schema: btc; Owner: -
--
-
-ALTER SEQUENCE btc.tx_inputs_id_seq OWNED BY btc.tx_inputs.id;
-
-
--
-- Name: tx_outputs; Type: TABLE; Schema: btc; Owner: -
--
-
-CREATE TABLE btc.tx_outputs (
-    id integer NOT NULL,
-    tx_id integer NOT NULL,
-    index integer NOT NULL,
-    value bigint NOT NULL,
-    pk_script bytea NOT NULL,
-    script_class integer NOT NULL,
-    addresses character varying(66)[],
-    required_sigs integer NOT NULL
-);
-
-
--
-- Name: tx_outputs_id_seq; Type: SEQUENCE; Schema: btc; Owner: -
--
-
-CREATE SEQUENCE btc.tx_outputs_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: tx_outputs_id_seq; Type: SEQUENCE OWNED BY; Schema: btc; Owner: -
--
-
-ALTER SEQUENCE btc.tx_outputs_id_seq OWNED BY btc.tx_outputs.id;
-
-
 --
 -- Name: header_cids; Type: TABLE; Schema: eth; Owner: -
 --
@@ -246,15 +37,16 @@ CREATE TABLE eth.header_cids (
    block_hash character varying(66) NOT NULL,
    parent_hash character varying(66) NOT NULL,
    cid text NOT NULL,
+    mh_key text NOT NULL,
    td numeric NOT NULL,
    node_id integer NOT NULL,
    reward numeric NOT NULL,
-    state_root character varying(66),
-    tx_root character varying(66),
-    receipt_root character varying(66),
-    uncle_root character varying(66),
-    bloom bytea,
-    "timestamp" numeric,
+    state_root character varying(66) NOT NULL,
+    tx_root character varying(66) NOT NULL,
+    receipt_root character varying(66) NOT NULL,
+    uncle_root character varying(66) NOT NULL,
+    bloom bytea NOT NULL,
+    "timestamp" numeric NOT NULL,
    times_validated integer DEFAULT 1 NOT NULL
 );

@@ -293,44 +85,6 @@ CREATE SEQUENCE eth.header_cids_id_seq
 ALTER SEQUENCE eth.header_cids_id_seq OWNED BY eth.header_cids.id;


--
-- Name: queue_data; Type: TABLE; Schema: eth; Owner: -
--
-
-CREATE TABLE eth.queue_data (
-    id integer NOT NULL,
-    data bytea NOT NULL,
-    height bigint NOT NULL
-);
-
-
--
-- Name: TABLE queue_data; Type: COMMENT; Schema: eth; Owner: -
--
-
-COMMENT ON TABLE eth.queue_data IS '@name EthQueueData';
-
-
--
-- Name: queue_data_id_seq; Type: SEQUENCE; Schema: eth; Owner: -
--
-
-CREATE SEQUENCE eth.queue_data_id_seq
-    AS integer
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1;
-
-
--
-- Name: queue_data_id_seq; Type: SEQUENCE OWNED BY; Schema: eth; Owner: -
--
-
-ALTER SEQUENCE eth.queue_data_id_seq OWNED BY eth.queue_data.id;
-
-
 --
 -- Name: receipt_cids; Type: TABLE; Schema: eth; Owner: -
 --
@@ -339,13 +93,14 @@ CREATE TABLE eth.receipt_cids (
    id integer NOT NULL,
    tx_id integer NOT NULL,
    cid text NOT NULL,
+    mh_key text NOT NULL,
    contract character varying(66),
+    contract_hash character varying(66),
    topic0s character varying(66)[],
    topic1s character varying(66)[],
    topic2s character varying(66)[],
    topic3s character varying(66)[],
-    log_contracts character varying(66)[],
-    contract_hash character varying(66)
+    log_contracts character varying(66)[]
 );


@@ -412,8 +167,10 @@ CREATE TABLE eth.state_cids (
    header_id integer NOT NULL,
    state_leaf_key character varying(66),
    cid text NOT NULL,
+    mh_key text NOT NULL,
    state_path bytea,
-    node_type integer
+    node_type integer NOT NULL,
+    diff boolean DEFAULT false NOT NULL
 );


@@ -446,8 +203,10 @@ CREATE TABLE eth.storage_cids (
    state_id integer NOT NULL,
    storage_leaf_key character varying(66),
    cid text NOT NULL,
+    mh_key text NOT NULL,
    storage_path bytea,
-    node_type integer
+    node_type integer NOT NULL,
+    diff boolean DEFAULT false NOT NULL
 );


@@ -481,8 +240,11 @@ CREATE TABLE eth.transaction_cids (
    tx_hash character varying(66) NOT NULL,
    index integer NOT NULL,
    cid text NOT NULL,
+    mh_key text NOT NULL,
    dst character varying(66) NOT NULL,
-    src character varying(66) NOT NULL
+    src character varying(66) NOT NULL,
+    deployment boolean NOT NULL,
+    tx_data bytea
 );


@@ -523,6 +285,7 @@ CREATE TABLE eth.uncle_cids (
    block_hash character varying(66) NOT NULL,
    parent_hash character varying(66) NOT NULL,
    cid text NOT NULL,
+    mh_key text NOT NULL,
    reward numeric NOT NULL
 );

@@ -636,41 +399,6 @@ CREATE SEQUENCE public.nodes_id_seq
 ALTER SEQUENCE public.nodes_id_seq OWNED BY public.nodes.id;


--
-- Name: header_cids id; Type: DEFAULT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.header_cids ALTER COLUMN id SET DEFAULT nextval('btc.header_cids_id_seq'::regclass);
-
-
--
-- Name: queue_data id; Type: DEFAULT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.queue_data ALTER COLUMN id SET DEFAULT nextval('btc.queue_data_id_seq'::regclass);
-
-
--
-- Name: transaction_cids id; Type: DEFAULT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.transaction_cids ALTER COLUMN id SET DEFAULT nextval('btc.transaction_cids_id_seq'::regclass);
-
-
--
-- Name: tx_inputs id; Type: DEFAULT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_inputs ALTER COLUMN id SET DEFAULT nextval('btc.tx_inputs_id_seq'::regclass);
-
-
--
-- Name: tx_outputs id; Type: DEFAULT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_outputs ALTER COLUMN id SET DEFAULT nextval('btc.tx_outputs_id_seq'::regclass);
-
-
 --
 -- Name: header_cids id; Type: DEFAULT; Schema: eth; Owner: -
 --
@@ -678,13 +406,6 @@ ALTER TABLE ONLY btc.tx_outputs ALTER COLUMN id SET DEFAULT nextval('btc.tx_outp
 ALTER TABLE ONLY eth.header_cids ALTER COLUMN id SET DEFAULT nextval('eth.header_cids_id_seq'::regclass);


--
-- Name: queue_data id; Type: DEFAULT; Schema: eth; Owner: -
--
-
-ALTER TABLE ONLY eth.queue_data ALTER COLUMN id SET DEFAULT nextval('eth.queue_data_id_seq'::regclass);
-
-
 --
 -- Name: receipt_cids id; Type: DEFAULT; Schema: eth; Owner: -
 --
@@ -741,86 +462,6 @@ ALTER TABLE ONLY public.goose_db_version ALTER COLUMN id SET DEFAULT nextval('pu
 ALTER TABLE ONLY public.nodes ALTER COLUMN id SET DEFAULT nextval('public.nodes_id_seq'::regclass);


--
-- Name: header_cids header_cids_block_number_block_hash_key; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.header_cids
-    ADD CONSTRAINT header_cids_block_number_block_hash_key UNIQUE (block_number, block_hash);
-
-
--
-- Name: header_cids header_cids_pkey; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.header_cids
-    ADD CONSTRAINT header_cids_pkey PRIMARY KEY (id);
-
-
--
-- Name: queue_data queue_data_height_key; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.queue_data
-    ADD CONSTRAINT queue_data_height_key UNIQUE (height);
-
-
--
-- Name: queue_data queue_data_pkey; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.queue_data
-    ADD CONSTRAINT queue_data_pkey PRIMARY KEY (id);
-
-
--
-- Name: transaction_cids transaction_cids_pkey; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.transaction_cids
-    ADD CONSTRAINT transaction_cids_pkey PRIMARY KEY (id);
-
-
--
-- Name: transaction_cids transaction_cids_tx_hash_key; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.transaction_cids
-    ADD CONSTRAINT transaction_cids_tx_hash_key UNIQUE (tx_hash);
-
-
--
-- Name: tx_inputs tx_inputs_pkey; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_inputs
-    ADD CONSTRAINT tx_inputs_pkey PRIMARY KEY (id);
-
-
--
-- Name: tx_inputs tx_inputs_tx_id_index_key; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_inputs
-    ADD CONSTRAINT tx_inputs_tx_id_index_key UNIQUE (tx_id, index);
-
-
--
-- Name: tx_outputs tx_outputs_pkey; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_outputs
-    ADD CONSTRAINT tx_outputs_pkey PRIMARY KEY (id);
-
-
--
-- Name: tx_outputs tx_outputs_tx_id_index_key; Type: CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_outputs
-    ADD CONSTRAINT tx_outputs_tx_id_index_key UNIQUE (tx_id, index);
-
-
 --
 -- Name: header_cids header_cids_block_number_block_hash_key; Type: CONSTRAINT; Schema: eth; Owner: -
 --
@@ -837,22 +478,6 @@ ALTER TABLE ONLY eth.header_cids
    ADD CONSTRAINT header_cids_pkey PRIMARY KEY (id);


--
-- Name: queue_data queue_data_height_key; Type: CONSTRAINT; Schema: eth; Owner: -
--
-
-ALTER TABLE ONLY eth.queue_data
-    ADD CONSTRAINT queue_data_height_key UNIQUE (height);
-
-
--
-- Name: queue_data queue_data_pkey; Type: CONSTRAINT; Schema: eth; Owner: -
--
-
-ALTER TABLE ONLY eth.queue_data
-    ADD CONSTRAINT queue_data_pkey PRIMARY KEY (id);
-
-
 --
 -- Name: receipt_cids receipt_cids_pkey; Type: CONSTRAINT; Schema: eth; Owner: -
 --
@@ -982,35 +607,11 @@ ALTER TABLE ONLY public.nodes


 --
-- Name: header_cids header_cids_node_id_fkey; Type: FK CONSTRAINT; Schema: btc; Owner: -
+-- Name: header_cids header_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --

-ALTER TABLE ONLY btc.header_cids
-    ADD CONSTRAINT header_cids_node_id_fkey FOREIGN KEY (node_id) REFERENCES public.nodes(id) ON DELETE CASCADE;
-
-
--
-- Name: transaction_cids transaction_cids_header_id_fkey; Type: FK CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.transaction_cids
-    ADD CONSTRAINT transaction_cids_header_id_fkey FOREIGN KEY (header_id) REFERENCES btc.header_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
-
-
--
-- Name: tx_inputs tx_inputs_tx_id_fkey; Type: FK CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_inputs
-    ADD CONSTRAINT tx_inputs_tx_id_fkey FOREIGN KEY (tx_id) REFERENCES btc.transaction_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
-
-
--
-- Name: tx_outputs tx_outputs_tx_id_fkey; Type: FK CONSTRAINT; Schema: btc; Owner: -
--
-
-ALTER TABLE ONLY btc.tx_outputs
-    ADD CONSTRAINT tx_outputs_tx_id_fkey FOREIGN KEY (tx_id) REFERENCES btc.transaction_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE ONLY eth.header_cids
+    ADD CONSTRAINT header_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;


 --
@@ -1021,6 +622,14 @@ ALTER TABLE ONLY eth.header_cids
    ADD CONSTRAINT header_cids_node_id_fkey FOREIGN KEY (node_id) REFERENCES public.nodes(id) ON DELETE CASCADE;


+--
+-- Name: receipt_cids receipt_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.receipt_cids
+    ADD CONSTRAINT receipt_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: receipt_cids receipt_cids_tx_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --
@@ -1034,7 +643,7 @@ ALTER TABLE ONLY eth.receipt_cids
 --

 ALTER TABLE ONLY eth.state_accounts
-    ADD CONSTRAINT state_accounts_state_id_fkey FOREIGN KEY (state_id) REFERENCES eth.state_cids(id) ON DELETE CASCADE;
+    ADD CONSTRAINT state_accounts_state_id_fkey FOREIGN KEY (state_id) REFERENCES eth.state_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;


 --
@@ -1045,6 +654,22 @@ ALTER TABLE ONLY eth.state_cids
    ADD CONSTRAINT state_cids_header_id_fkey FOREIGN KEY (header_id) REFERENCES eth.header_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;


+--
+-- Name: state_cids state_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.state_cids
+    ADD CONSTRAINT state_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: storage_cids storage_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.storage_cids
+    ADD CONSTRAINT storage_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: storage_cids storage_cids_state_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --
@@ -1061,6 +686,14 @@ ALTER TABLE ONLY eth.transaction_cids
    ADD CONSTRAINT transaction_cids_header_id_fkey FOREIGN KEY (header_id) REFERENCES eth.header_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;


+--
+-- Name: transaction_cids transaction_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.transaction_cids
+    ADD CONSTRAINT transaction_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: uncle_cids uncle_cids_header_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --
@@ -1069,6 +702,14 @@ ALTER TABLE ONLY eth.uncle_cids
    ADD CONSTRAINT uncle_cids_header_id_fkey FOREIGN KEY (header_id) REFERENCES eth.header_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;


+--
+-- Name: uncle_cids uncle_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.uncle_cids
+    ADD CONSTRAINT uncle_cids_mh_key_fkey FOREIGN KEY (mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- PostgreSQL database dump complete
 --
@@ -0,0 +1,78 @@
+version: '3.2'
+
+services:
+  dapptools:
+    restart: unless-stopped
+    image: vulcanize/dapptools:v0.29.0-statediff-0.0.2
+    ports:
+      - "127.0.0.1:8545:8545"
+      - "127.0.0.1:8546:8546"
+
+  db:
+    restart: always
+    image: postgres:10.12-alpine
+    environment:
+      POSTGRES_USER: "vdbm"
+      POSTGRES_DB: "vulcanize_public"
+      POSTGRES_PASSWORD: "password"
+    volumes:
+     - vdb_db_eth_server:/var/lib/postgresql/data
+    ports:
+     - "127.0.0.1:8077:5432"
+
+  eth-indexer:
+    restart: unless-stopped
+    depends_on:
+      - db
+      - dapptools
+    image: vulcanize/ipld-eth-indexer:v0.3.0-alpha
+    environment:
+      DATABASE_NAME: vulcanize_public
+      DATABASE_HOSTNAME: db
+      DATABASE_PORT: 5432
+      DATABASE_USER: vdbm
+      DATABASE_PASSWORD: password
+      ETH_WS_PATH: "dapptools:8546"
+      ETH_HTTP_PATH: "dapptools:8545"
+      ETH_CHAIN_ID: 4
+      ETH_NETWORK_ID: 4
+      VDB_COMMAND: sync
+
+  eth-server:
+    depends_on:
+      - db
+    build:
+      context: ./
+      cache_from:
+       - alpine:latest
+       - golang:1.13-alpine
+    environment:
+      VDB_COMMAND: "serve"
+      DATABASE_NAME: "vulcanize_public"
+      DATABASE_HOSTNAME: "db"
+      DATABASE_PORT: 5432
+      DATABASE_USER: "vdbm"
+      DATABASE_PASSWORD: "password"
+      SERVER_WS_PATH: "0.0.0.0:8081"
+      SERVER_HTTP_PATH: "0.0.0.0:8082"
+    ports:
+     - "127.0.0.1:8080:8080"
+     - "127.0.0.1:8081:8081"
+
+  graphql:
+    restart: unless-stopped
+    depends_on:
+      - db
+    image: vulcanize/postgraphile:v1.0.1
+    environment:
+      - PG_HOST=db
+      - PG_PORT=5432
+      - PG_DATABASE=vulcanize_public
+      - PG_USER=vdbm
+      - PG_PASSWORD=password
+      - SCHEMA=public,eth
+    ports:
+      - "127.0.0.1:5000:5000"
+
+volumes:
+  vdb_db_eth_server:
@@ -1,32 +0,0 @@
-S
-`Dockerfile` will build an alpine image containing:
- vDB as a binary with runtime deps statically linked: `/app/vulcanizedb`
- The migration tool goose: `/app/goose`
- Two services for running `headerSync` and `continuousLogSync`, started with the default configuration `environments/staging.toml`.
-
-By default, vDB is configured towards the Kovan deploy. The configuration values can be overridden using environment variables, using the same hierarchical naming pattern but in CAPS and using underscores. For example, the contract address for the `Pit` can be set with the variable `CONTRACT_ADDRESS_PIT="0x123..."`.
-
-## To use the container:
-1. Setup a postgres database with superuser `vulcanize`
-2. Set the env variables `DATABASE_NAME`, `DATABASE_HOSTNAME`,
-  `DATABASE_PORT`, `DATABASE_USER` & `DATABASE_PASSWORD`
-3. Run the DB migrations:
-  * `./goose postgres "postgresql://$(DATABASE_USER):$(DATABASE_PASSWORD)@$(DATABASE_HOSTNAME):$(DATABASE_PORT)/$(DATABASE_NAME)?sslmode=disable"
-e`
-4. Set `CLIENT_IPCPATH` to a node endpoint
-5. Set the contract variables:
-  * `CONTRACT_ADDRESS_[CONTRACT NAME]=0x123...`
-  * `CONTRACT_ABI_[CONTRACT NAME]="ABI STRING"`
-  * `CONTRACT_DEPLOYMENT-BLOCK_[CONTRACT NAME]=0` (doesn't really matter on a short chain, just avoids long unnecessary searching)
-6. Start the `headerSync` and `continuousLogSync` services:
-  * `./vulcanizedb headerSync --config environments/staging.toml`
-  * `./vulcanizedb continuousLogSync --config environments/staging.toml`
-
-### Automated
-The steps above have been rolled into a script: `/app/startup_script.sh`, which just assumes the DB env variables have been set, and defaults the rest to Kovan according to `environments/staging.toml`. This can be called with something like:
-
-`docker run -d -e DATABASE_NAME=vulcanize_public -e DATABASE_HOSTNAME=localhost -e DATABASE_PORT=5432 -e DATABASE_USER=vulcanize -e DATABASE_PASSWORD=vulcanize m0ar/images:vDB`
-
-### Logging
-When running, vDB services log to `/app/vulcanizedb.log`.
-
@@ -1,40 +0,0 @@
-FROM golang:alpine
-
-RUN apk --update --no-cache add make git g++ linux-headers
-# DEBUG
-RUN apk add busybox-extras
-
-# this is probably a noob move, but I want apk from alpine for the above but need to avoid Go 1.13 below as this error still occurs https://github.com/ipfs/go-ipfs/issues/6603
-FROM golang:1.12.4 as builder
-
-# Get and build vulcanizedb
-ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-
-# Build migration tool
-RUN go get -u -d github.com/pressly/goose/cmd/goose
-WORKDIR /go/src/github.com/pressly/goose/cmd/goose
-RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose .
-
-WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-
-# app container
-FROM alpine
-
-ARG USER
-
-RUN adduser -Du 5000 $USER
-WORKDIR /app
-RUN chown $USER /app
-USER $USER
-
-# chown first so dir is writable
-# note: using $USER is merged, but not in the stable release yet
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/migrations/startup_script.sh .
-
-
-# keep binaries immutable
-COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose goose
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations migrations/vulcanizedb
-# XXX dir is already writeable RUN touch vulcanizedb.log
-
-CMD ["./startup_script.sh"]
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Runs the db migrations and starts the super node services
-
-# Exit if the variable tests fail
-set -e
-set +x
-
-# Check the database variables are set
-test $DATABASE_HOSTNAME
-test $DATABASE_NAME
-test $DATABASE_PORT
-test $DATABASE_USER
-test $DATABASE_PASSWORD
-set +e
-
-# Construct the connection string for postgres
-VDB_PG_CONNECT=postgresql://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOSTNAME:$DATABASE_PORT/$DATABASE_NAME?sslmode=disable
-
-# Run the DB migrations
-echo "Connecting with: $VDB_PG_CONNECT"
-echo "Running database migrations"
-./goose -dir migrations/vulcanizedb postgres "$VDB_PG_CONNECT" up
-
-
-# If the db migrations ran without err
-if [[ $? -eq 0 ]]; then
-    echo "Migrations ran successfully"
-    exit 0
-else
-    echo "Could not run migrations. Are the database details correct?"
-    exit 1
-fi
@@ -1,8 +0,0 @@
-FROM node:alpine
-
-RUN npm install -g postgraphile
-RUN npm install -g postgraphile-plugin-connection-filter
-RUN npm install -g @graphile/pg-pubsub
-
-EXPOSE 5000
-ENTRYPOINT ["postgraphile"]
@@ -1,60 +0,0 @@
-version: '3.2'
-
-services:
-  db:
-    restart: always
-    image: postgres:10.12-alpine
-    environment:
-      POSTGRES_USER: "vdbm"
-      POSTGRES_DB: "vulcanize_public"
-      POSTGRES_PASSWORD: "password"
-    volumes:
-     - vulcanizedb_db_data:/var/lib/postgresql/data
-    expose:
-     - "5432"
-    ports:
-     - "127.0.0.1:8079:5432"
-
-  migrations:
-    restart: on-failure
-    depends_on:
-     - db
-    build:
-      context: ./../../
-      cache_from:
-        - alpine:latest
-      dockerfile: ./dockerfiles/migrations/Dockerfile
-      args:
-        USER: "vdbm"
-    environment:
-      DATABASE_NAME: "vulcanize_public"
-      DATABASE_HOSTNAME: "db"
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-
-  graphql:
-    restart: always
-    depends_on:
-     - db
-     - migrations
-    build:
-      context: ./../../
-      cache_from:
-       - node:alpine
-      dockerfile: ./dockerfiles/postgraphile/Dockerfile
-    expose:
-     - "5000"
-    ports:
-     - "127.0.0.1:5000:5000"
-    command: ["--plugins", "@graphile/pg-pubsub",
-              "--subscriptions",
-              "--simple-subscriptions",
-              "--connection", "postgres://vdbm:password@db:5432/vulcanize_public",
-              "--port", "5000",
-              "-n", "0.0.0.0",
-              "--schema", "public,btc,eth",
-              "--append-plugins", "postgraphile-plugin-connection-filter"]
-
-volumes:
-  vulcanizedb_db_data:
@@ -1,29 +0,0 @@
-#!/bin/sh
-# Runs the migrations and starts the headerSync and continuousLogSync services
-
-# Exit if the variable tests fail
-set -e
-
-# Check the database variables are set
-test $DATABASE_NAME
-test $DATABASE_HOSTNAME
-test $DATABASE_PORT
-test $DATABASE_USER
-test $DATABASE_PASSWORD
-
-# Construct the connection string for postgres
-CONNECT_STRING=postgresql://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOSTNAME:$DATABASE_PORT/$DATABASE_NAME?sslmode=disable
-echo "Connecting with: $CONNECT_STRING"
-
-set +e
-
-# Run the DB migrations
-./goose postgres "$CONNECT_STRING" up
-if [ $? -eq 0 ]; then
-  # Fire up the services
-  ./vulcanizedb headerSync --config environments/staging.toml &
-  ./vulcanizedb continuousLogSync --config environments/staging.toml &
-else
-  echo "Could not run migrations. Are the database details correct?"
-fi
-wait
@@ -1,48 +0,0 @@
-FROM golang:1.12-alpine as builder
-
-RUN apk --update --no-cache add make git g++ linux-headers
-# DEBUG
-RUN apk add busybox-extras
-
-# Get and build vulcanizedb
-ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o vulcanizedb .
-
-# Build migration tool
-RUN go get -u -d github.com/pressly/goose/cmd/goose
-WORKDIR /go/src/github.com/pressly/goose/cmd/goose
-RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose .
-
-WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-
-# app container
-FROM alpine
-
-ARG USER
-ARG CONFIG_FILE
-ARG EXPOSE_PORT_1
-ARG EXPOSE_PORT_2
-
-RUN adduser -Du 5000 $USER
-WORKDIR /app
-RUN chown $USER /app
-USER $USER
-
-# chown first so dir is writable
-# note: using $USER is merged, but not in the stable release yet
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/$CONFIG_FILE config.toml
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/super_node/startup_script.sh .
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/super_node/entrypoint.sh .
-
-
-# keep binaries immutable
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/vulcanizedb vulcanizedb
-COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose goose
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations migrations/vulcanizedb
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environments environments
-
-EXPOSE $EXPOSE_PORT_1
-EXPOSE $EXPOSE_PORT_2
-
-ENTRYPOINT ["/app/entrypoint.sh"]
@@ -1,87 +0,0 @@
-version: '3.2'
-
-services:
-  db:
-    restart: always
-    image: postgres:10.12-alpine
-    environment:
-      POSTGRES_USER: "vdbm"
-      POSTGRES_DB: "vulcanize_public"
-      POSTGRES_PASSWORD: "password"
-    volumes:
-     - vulcanizedb_db_data:/var/lib/postgresql/data
-    expose:
-     - "5432"
-    ports:
-     - "127.0.0.1:8079:5432"
-
-  btc:
-    depends_on:
-      - db
-    build:
-      context: ./../../
-      cache_from:
-       - alpine:latest
-       - golang:1.12.4
-      dockerfile: ./dockerfiles/super_node/Dockerfile
-      args:
-        USER: "vdbm"
-        CONFIG_FILE: ./environments/superNodeBTC.toml
-    environment:
-      VDB_COMMAND: "superNode"
-      DATABASE_NAME: "vulcanize_public"
-      DATABASE_HOSTNAME: "db"
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-    ports:
-     - "127.0.0.1:8082:8082"
-     - "127.0.0.1:8083:8083"
-
-  eth:
-    depends_on:
-      - db
-    build:
-      context: ./../../
-      cache_from:
-       - alpine:latest
-       - golang:1.12.4
-      dockerfile: ./dockerfiles/super_node/Dockerfile
-      args:
-        USER: "vdbm"
-        CONFIG_FILE: ./environments/superNodeETH.toml
-    environment:
-      VDB_COMMAND: "superNode"
-      DATABASE_NAME: "vulcanize_public"
-      DATABASE_HOSTNAME: "db"
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-    ports:
-     - "127.0.0.1:8080:8080"
-     - "127.0.0.1:8081:8081"
-
-  graphql:
-    restart: always
-    depends_on:
-      - db
-    build:
-      context: ./../../
-      cache_from:
-      - node:alpine
-      dockerfile: ./dockerfiles/postgraphile/Dockerfile
-    expose:
-      - "5000"
-    ports:
-      - "127.0.0.1:5000:5000"
-    command: ["--plugins", "@graphile/pg-pubsub",
-              "--subscriptions",
-              "--simple-subscriptions",
-              "--connection", "postgres://vdbm:password@db:5432/vulcanize_public",
-              "--port", "5000",
-              "-n", "0.0.0.0",
-              "--schema", "public,btc,eth",
-              "--append-plugins", "postgraphile-plugin-connection-filter"]
-
-volumes:
-  vulcanizedb_db_data:
@@ -1,60 +0,0 @@
-#!/bin/sh
-# Runs the db migrations and starts the super node services
-
-# Exit if the variable tests fail
-set -e
-set +x
-
-# Check the database variables are set
-# XXX set defaults, don't silently fail
-#test $DATABASE_HOSTNAME
-#test $DATABASE_NAME
-#test $DATABASE_PORT
-#test $DATABASE_USER
-#test $DATABASE_PASSWORD
-#test $IPFS_INIT
-#test $IPFS_PATH
-VDB_COMMAND=${VDB_COMMAND:-superNode}
-set +e
-
-# Construct the connection string for postgres
-VDB_PG_CONNECT=postgresql://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOSTNAME:$DATABASE_PORT/$DATABASE_NAME?sslmode=disable
-
-# Run the DB migrations
-echo "Connecting with: $VDB_PG_CONNECT"
-echo "Running database migrations"
-./goose -dir migrations/vulcanizedb postgres "$VDB_PG_CONNECT" up
-rv=$?
-
-if [ $rv != 0 ]; then
-  echo "Could not run migrations. Are the database details correct?"
-  exit 1
-fi
-
-
-echo "Beginning the vulcanizedb process"
-VDB_CONFIG_FILE=${VDB_CONFIG_FILE:-config.toml}
-DEFAULT_OPTIONS="--config=$VDB_CONFIG_FILE"
-VDB_FULL_CL=${VDB_FULL_CL:-$VDB_COMMAND $DEFAULT_OPTIONS}
-echo running: ./vulcanizedb $VDB_FULL_CL $@
-
-case "$1" in
-  "/bin/sh" )
-    echo dropping to shell
-    exec /bin/sh
-esac
-
-vdb_args="$@"
-# default is to use the config passed by the build arg
-if [[ -z "$vdb_args" ]]; then
-  vdb_args="--config=config.toml"
-fi
-
-echo running: ./vulcanizedb $vdb_args
-./vulcanizedb $vdb_args
-rv=$?
-
-if [ $rv != 0 ]; then
-  echo "VulcanizeDB startup failed"
-  exit 1
-fi
@@ -1,65 +0,0 @@
-#!/bin/sh
-# Runs the db migrations and starts the super node services
-
-# Exit if the variable tests fail
-set -e
-set +x
-
-# Check the database variables are set
-test $DATABASE_HOSTNAME
-test $DATABASE_NAME
-test $DATABASE_PORT
-test $DATABASE_USER
-test $DATABASE_PASSWORD
-test $IPFS_INIT
-test $IPFS_PATH
-test $VDB_COMMAND
-set +e
-
-# Export our database variables so that the IPFS Postgres plugin can use them
-export IPFS_PGHOST=$DATABASE_HOSTNAME
-export IPFS_PGUSER=$DATABASE_USER
-export IPFS_PGDATABASE=$DATABASE_NAME
-export IPFS_PGPORT=$DATABASE_PORT
-export IPFS_PGPASSWORD=$DATABASE_PASSWORD
-
-# Construct the connection string for postgres
-VDB_PG_CONNECT=postgresql://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOSTNAME:$DATABASE_PORT/$DATABASE_NAME?sslmode=disable
-
-# Run the DB migrations
-echo "Connecting with: $VDB_PG_CONNECT"
-echo "Running database migrations"
-./goose -dir migrations/vulcanizedb postgres "$VDB_PG_CONNECT" up
-
-
-# If the db migrations ran without err
-if [[ $? -eq 0 ]]; then
-    # and IPFS_INIT is true
-    if [[ "$IPFS_INIT" = true ]] ; then
-        # initialize PG-IPFS
-        echo "Initializing Postgres-IPFS profile"
-        ./ipfs init --profile=postgresds
-    else
-        echo "IPFS profile already initialized, skipping initialization"
-    fi
-else
-    echo "Could not run migrations. Are the database details correct?"
-    exit 1
-fi
-
-# If IPFS initialization was successful
-if [[ $? -eq 0 ]]; then
-    echo "Running the VulcanizeDB process"
-    ./vulcanizedb ${VDB_COMMAND} --config=config.toml
-else
-    echo "Could not initialize IPFS."
-    exit 1
-fi
-
-# If VulcanizeDB process was successful
-if [ $? -eq 0 ]; then
-    echo "VulcanizeDB process ran successfully"
-else
-    echo "Could not start VulcanizeDB process. Is the config file correct?"
-    exit 1
-fi
@@ -1,5 +1,5 @@
-## ipfs-blockchain-watcher APIs
-We can expose a number of different APIs for remote access to ipfs-blockchain-watcher data
+## ipld-eth-server APIs
+We can expose a number of different APIs for remote access to ipld-eth-server data


 ### Table of Contents
@@ -9,7 +9,7 @@ We can expose a number of different APIs for remote access to ipfs-blockchain-wa


 ### Postgraphile
-ipfs-blockchain-watcher stores all processed data in Postgres using PG-IPFS, this includes all of the IPLD objects.
+ipld-eth-server stores all processed data in Postgres using PG-IPFS, this includes all of the IPLD objects.
 [Postgraphile](https://www.graphile.org/postgraphile/) can be used to expose GraphQL endpoints for the Postgres tables.

 e.g. 
@@ -22,15 +22,15 @@ All of their data can then be queried with standard [GraphQL](https://graphql.or


 ### RPC Subscription Interface
-A direct, real-time subscription to the data being processed by ipfs-blockchain-watcher can be established over WS or IPC through the [Stream](../pkg/watcher/api.go#L53) RPC method.
+A direct, real-time subscription to the data being processed by ipld-eth-server can be established over WS or IPC through the [Stream](../pkg/serve/api.go#L53) RPC method.
 This method is not chain-specific and each chain-type supports it, it is accessed under the "vdb" namespace rather than a chain-specific namespace. An interface for
-subscribing to this endpoint is provided [here](../pkg/streamer/super_node_streamer.go).
+subscribing to this endpoint is provided [here](../pkg/client/client.go).

 When subscribing to this endpoint, the subscriber provides a set of RLP-encoded subscription parameters. These parameters will be chain-specific, and are used
-by ipfs-blockchain-watcher to filter and return a requested subset of chain data to the subscriber. (e.g. [BTC](../pkg/btc/subscription_config.go), [ETH](../../pkg/eth/subscription_config.go)).
+by ipld-eth-server to filter and return a requested subset of chain data to the subscriber. (e.g. [BTC](../pkg/btc/subscription_config.go), [ETH](../../pkg/eth/subscription_config.go)).

 #### Ethereum RPC Subscription
-An example of how to subscribe to a real-time Ethereum data feed from ipfs-blockchain-watcher using the `Stream` RPC method is provided below
+An example of how to subscribe to a real-time Ethereum data feed from ipld-eth-server using the `Stream` RPC method is provided below

 ```go
    package main 
@@ -40,20 +40,18 @@ An example of how to subscribe to a real-time Ethereum data feed from ipfs-block
    	"github.com/ethereum/go-ethereum/rpc"
    	"github.com/spf13/viper"
    	
-        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
-        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
-        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
-        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+        "github.com/vulcanize/ipld-eth-server/pkg/client"
+        "github.com/vulcanize/ipld-eth-server/pkg/eth"
+        "github.com/vulcanize/ipld-eth-server/pkg/watch"
    )

    config, _ := eth.NewEthSubscriptionConfig()
    rlpConfig, _ := rlp.EncodeToBytes(config)
-    vulcPath := viper.GetString("superNode.ethSubscription.path")
-    rawRPCClient, _ := rpc.Dial(vulcPath)
-    rpcClient := client.NewRPCClient(rawRPCClient, vulcPath)
-    stream := streamer.NewSuperNodeStreamer(rpcClient)
-    payloadChan := make(chan watcher.SubscriptionPayload, 20000)
-    subscription, _ := stream.Stream(payloadChan, rlpConfig)
+    vulcPath := viper.GetString("watcher.ethSubscription.path")
+    rpcClient, _ := rpc.Dial(vulcPath)
+    subClient := client.NewClient(rpcClient)
+    payloadChan := make(chan watch.SubscriptionPayload, 20000)
+    subscription, _ := subClient.Stream(payloadChan, rlpConfig)
    for {
        select {
        case payload := <- payloadChan:
@@ -67,32 +65,32 @@ An example of how to subscribe to a real-time Ethereum data feed from ipfs-block
 The .toml file being used to fill the Ethereum subscription config would look something like this:

 ```toml
-[superNode]
-    [superNode.ethSubscription]
+[watcher]
+    [watcher.ethSubscription]
        historicalData = false
        historicalDataOnly = false
        startingBlock = 0
        endingBlock = 0
        wsPath = "ws://127.0.0.1:8080"
-        [superNode.ethSubscription.headerFilter]
+        [watcher.ethSubscription.headerFilter]
            off = false
            uncles = false
-        [superNode.ethSubscription.txFilter]
+        [watcher.ethSubscription.txFilter]
            off = false
            src = []
            dst = []
-        [superNode.ethSubscription.receiptFilter]
+        [watcher.ethSubscription.receiptFilter]
            off = false
            contracts = []
            topic0s = []
            topic1s = []
            topic2s = []
            topic3s = []
-        [superNode.ethSubscription.stateFilter]
+        [watcher.ethSubscription.stateFilter]
            off = false
            addresses = []
           intermediateNodes = false
-        [superNode.ethSubscription.storageFilter]
+        [watcher.ethSubscription.storageFilter]
            off = true
            addresses = []
            storageKeys = []
@@ -101,58 +99,58 @@ The .toml file being used to fill the Ethereum subscription config would look so

 These configuration parameters are broken down as follows:

-`ethSubscription.wsPath` is used to define the SuperNode ws url OR ipc endpoint we subscribe to
+`ethSubscription.wsPath` is used to define the watcher ws url OR ipc endpoint to subscribe to

-`ethSubscription.historicalData` specifies whether or not ipfs-blockchain-watcher should look up historical data in its cache and
-send that to the subscriber, if this is set to `false` then we only streams newly synced/incoming data
+`ethSubscription.historicalData` specifies whether or not ipld-eth-server should look up historical data in its cache and
+send that to the subscriber, if this is set to `false` then only newly synced/incoming data is streamed

-`ethSubscription.historicalDataOnly` will tell ipfs-blockchain-watcher to only send historical data with the specified range and
+`ethSubscription.historicalDataOnly` will tell ipld-eth-server to only send historical data with the specified range and
 not stream forward syncing data

-`ethSubscription.startingBlock` is the starting block number for the range we want to receive data in
+`ethSubscription.startingBlock` is the starting block number for the range to receive data in

-`ethSubscription.endingBlock` is the ending block number for the range we want to receive data in;
-setting to 0 means there is no end/we will continue streaming indefinitely.
+`ethSubscription.endingBlock` is the ending block number for the range to receive data in;
+setting to 0 means the process will continue streaming indefinitely.

 `ethSubscription.headerFilter` has two sub-options: `off` and `uncles`. 

- Setting `off` to true tells ipfs-blockchain-watcher to not send any headers to the subscriber
- setting `uncles` to true tells ipfs-blockchain-watcher to send uncles in addition to normal headers.
+- Setting `off` to true tells ipld-eth-server to not send any headers to the subscriber
+- setting `uncles` to true tells ipld-eth-server to send uncles in addition to normal headers.

 `ethSubscription.txFilter` has three sub-options: `off`, `src`, and `dst`. 

- Setting `off` to true tells ipfs-blockchain-watcher to not send any transactions to the subscriber
- `src` and `dst` are string arrays which can be filled with ETH addresses we want to filter transactions for,
-if they have any addresses then ipfs-blockchain-watcher will only send transactions that were sent or received by the addresses contained
+- Setting `off` to true tells ipld-eth-server to not send any transactions to the subscriber
+- `src` and `dst` are string arrays which can be filled with ETH addresses to filter transactions for,
+if they have any addresses then ipld-eth-server will only send transactions that were sent or received by the addresses contained
 in `src` and `dst`, respectively.

 `ethSubscription.receiptFilter` has four sub-options: `off`, `topics`, `contracts` and `matchTxs`. 

- Setting `off` to true tells ipfs-blockchain-watcher to not send any receipts to the subscriber
- `topic0s` is a string array which can be filled with event topics we want to filter for,
-if it has any topics then ipfs-blockchain-watcher will only send receipts that contain logs which have that topic0.
- `contracts` is a string array which can be filled with contract addresses we want to filter for, if it contains any contract addresses the super node will
+- Setting `off` to true tells ipld-eth-server to not send any receipts to the subscriber
+- `topic0s` is a string array which can be filled with event topics to filter for,
+if it has any topics then ipld-eth-server will only send receipts that contain logs which have that topic0.
+- `contracts` is a string array which can be filled with contract addresses to filter for, if it contains any contract addresses the watcher will
 only send receipts that correspond to one of those contracts. 
- `matchTrxs` is a bool which when set to true any receipts that correspond to filtered for transactions will be sent by the super node, regardless of whether or not the receipt satisfies the `topics` or `contracts` filters.
+- `matchTrxs` is a bool which when set to true any receipts that correspond to filtered for transactions will be sent by the watcher, regardless of whether or not the receipt satisfies the `topics` or `contracts` filters.

 `ethSubscription.stateFilter` has three sub-options: `off`, `addresses`, and `intermediateNodes`. 

- Setting `off` to true tells ipfs-blockchain-watcher to not send any state data to the subscriber
- `addresses` is a string array which can be filled with ETH addresses we want to filter state for,
-if it has any addresses then ipfs-blockchain-watcher will only send state leafs (accounts) corresponding to those account addresses. 
- By default ipfs-blockchain-watcher only sends along state leafs, if we want to receive branch and extension nodes as well `intermediateNodes` can be set to `true`.
+- Setting `off` to true tells ipld-eth-server to not send any state data to the subscriber
+- `addresses` is a string array which can be filled with ETH addresses to filter state for,
+if it has any addresses then ipld-eth-server will only send state leafs (accounts) corresponding to those account addresses. 
+- By default ipld-eth-server only sends along state leafs, to receive branch and extension nodes as well `intermediateNodes` can be set to `true`.

 `ethSubscription.storageFilter` has four sub-options: `off`, `addresses`, `storageKeys`, and `intermediateNodes`. 

- Setting `off` to true tells ipfs-blockchain-watcher to not send any storage data to the subscriber
- `addresses` is a string array which can be filled with ETH addresses we want to filter storage for,
-if it has any addresses then ipfs-blockchain-watcher will only send storage nodes from the storage tries at those state addresses.
- `storageKeys` is another string array that can be filled with storage keys we want to filter storage data for. It is important to note that the storage keys need to be the actual keccak256 hashes, whereas
+- Setting `off` to true tells ipld-eth-server to not send any storage data to the subscriber
+- `addresses` is a string array which can be filled with ETH addresses to filter storage for,
+if it has any addresses then ipld-eth-server will only send storage nodes from the storage tries at those state addresses.
+- `storageKeys` is another string array that can be filled with storage keys to filter storage data for. It is important to note that the storage keys need to be the actual keccak256 hashes, whereas
 the addresses in the `addresses` fields are pre-hashed ETH addresses.
- By default ipfs-blockchain-watcher only sends along storage leafs, if we want to receive branch and extension nodes as well `intermediateNodes` can be set to `true`.
+- By default ipld-eth-server only sends along storage leafs, to receive branch and extension nodes as well `intermediateNodes` can be set to `true`.

 ### Bitcoin RPC Subscription:
-An example of how to subscribe to a real-time Bitcoin data feed from ipfs-blockchain-watcher using the `Stream` RPC method is provided below
+An example of how to subscribe to a real-time Bitcoin data feed from ipld-eth-server using the `Stream` RPC method is provided below

 ```go
    package main 
@@ -162,20 +160,18 @@ An example of how to subscribe to a real-time Bitcoin data feed from ipfs-blockc
    	"github.com/ethereum/go-ethereum/rpc"
    	"github.com/spf13/viper"
    	
-    	"github.com/vulcanize/ipfs-blockchain-watcher/libraries/shared/streamer"
-    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth/client"
-    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/super_node"
-    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/super_node/btc"
+    	"github.com/vulcanize/ipld-eth-server/pkg/btc"
+    	"github.com/vulcanize/ipld-eth-server/pkg/client"
+    	"github.com/vulcanize/ipld-eth-server/pkg/watch"
    )

    config, _ := btc.NewBtcSubscriptionConfig()
    rlpConfig, _ := rlp.EncodeToBytes(config)
-    vulcPath := viper.GetString("superNode.btcSubscription.path")
-    rawRPCClient, _ := rpc.Dial(vulcPath)
-    rpcClient := client.NewRPCClient(rawRPCClient, vulcPath)
-    stream := streamer.NewSuperNodeStreamer(rpcClient)
-    payloadChan := make(chan super_node.SubscriptionPayload, 20000)
-    subscription, _ := stream.Stream(payloadChan, rlpConfig)
+    vulcPath := viper.GetString("watcher.btcSubscription.path")
+    rpcClient, _ := rpc.Dial(vulcPath)
+    subClient := client.NewClient(rpcClient)
+    payloadChan := make(chan watch.SubscriptionPayload, 20000)
+    subscription, _ := subClient.Stream(payloadChan, rlpConfig)
    for {
        select {
        case payload := <- payloadChan:
@@ -189,16 +185,16 @@ An example of how to subscribe to a real-time Bitcoin data feed from ipfs-blockc
 The .toml file being used to fill the Bitcoin subscription config would look something like this:

 ```toml
-[superNode]
-    [superNode.btcSubscription]
+[watcher]
+    [watcher.btcSubscription]
        historicalData = false
        historicalDataOnly = false
        startingBlock = 0
        endingBlock = 0
        wsPath = "ws://127.0.0.1:8080"
-        [superNode.btcSubscription.headerFilter]
+        [watcher.btcSubscription.headerFilter]
            off = false
-        [superNode.btcSubscription.txFilter]
+        [watcher.btcSubscription.txFilter]
            off = false
            segwit = false
            witnessHashes = []
@@ -210,35 +206,35 @@ The .toml file being used to fill the Bitcoin subscription config would look som

 These configuration parameters are broken down as follows:

-`btcSubscription.wsPath` is used to define the SuperNode ws url OR ipc endpoint we subscribe to
+`btcSubscription.wsPath` is used to define the ipld-eth-server ws url OR ipc endpoint to subscribe to

-`btcSubscription.historicalData` specifies whether or not ipfs-blockchain-watcher should look up historical data in its cache and
-send that to the subscriber, if this is set to `false` then ipfs-blockchain-watcher only streams newly synced/incoming data
+`btcSubscription.historicalData` specifies whether or not ipld-eth-server should look up historical data in its cache and
+send that to the subscriber, if this is set to `false` then ipld-eth-server only streams newly synced/incoming data

-`btcSubscription.historicalDataOnly` will tell ipfs-blockchain-watcher to only send historical data with the specified range and
+`btcSubscription.historicalDataOnly` will tell ipld-eth-server to only send historical data with the specified range and
 not stream forward syncing data

-`btcSubscription.startingBlock` is the starting block number for the range we want to receive data in
+`btcSubscription.startingBlock` is the starting block number for the range to receive data in

-`btcSubscription.endingBlock` is the ending block number for the range we want to receive data in;
-setting to 0 means there is no end/we will continue streaming indefinitely.
+`btcSubscription.endingBlock` is the ending block number for the range to receive data in;
+setting to 0 means the process will continue streaming indefinitely.

 `btcSubscription.headerFilter` has one sub-option: `off`. 

- Setting `off` to true tells ipfs-blockchain-watcher to
+- Setting `off` to true tells ipld-eth-server to
 not send any headers to the subscriber.
 - Additional header-filtering options will be added in the future.

 `btcSubscription.txFilter` has seven sub-options: `off`, `segwit`, `witnessHashes`, `indexes`, `pkScriptClass`, `multiSig`, and `addresses`.

- Setting `off` to true tells ipfs-blockchain-watcher to not send any transactions to the subscriber.
- Setting `segwit` to true tells ipfs-blockchain-watcher to only send segwit transactions.
- `witnessHashes` is a string array that can be filled with witness hash string; if it contains any hashes ipfs-blockchain-watcher will only send transactions that contain one of those hashes.
- `indexes` is an int64 array that can be filled with tx index numbers; if it contains any integers ipfs-blockchain-watcher will only send transactions at those indexes (e.g. `[0]` will send only coinbase transactions)
- `pkScriptClass` is an uint8 array that can be filled with pk script class numbers; if it contains any integers ipfs-blockchain-watcher will only send transactions that have at least one tx output with one of the specified pkscript classes;
+- Setting `off` to true tells ipld-eth-server to not send any transactions to the subscriber.
+- Setting `segwit` to true tells ipld-eth-server to only send segwit transactions.
+- `witnessHashes` is a string array that can be filled with witness hash string; if it contains any hashes ipld-eth-server will only send transactions that contain one of those hashes.
+- `indexes` is an int64 array that can be filled with tx index numbers; if it contains any integers ipld-eth-server will only send transactions at those indexes (e.g. `[0]` will send only coinbase transactions)
+- `pkScriptClass` is an uint8 array that can be filled with pk script class numbers; if it contains any integers ipld-eth-server will only send transactions that have at least one tx output with one of the specified pkscript classes;
 possible class types are 0 through 8 as defined [here](https://github.com/btcsuite/btcd/blob/master/txscript/standard.go#L52).
- Setting `multisig` to true tells ipfs-blockchain-watcher to send only multi-sig transactions- to send only transaction that have at least one tx output that requires more than one signature to spend.
- `addresses` is a string array that can be filled with btc address strings; if it contains any addresses ipfs-blockchain-watcher will only send transactions that have at least one tx output with at least one of the provided addresses.
+- Setting `multisig` to true tells ipld-eth-server to send only multi-sig transactions- to send only transaction that have at least one tx output that requires more than one signature to spend.
+- `addresses` is a string array that can be filled with btc address strings; if it contains any addresses ipld-eth-server will only send transactions that have at least one tx output with at least one of the provided addresses.


 ### Native API Recapitulation:
@@ -246,7 +242,7 @@ In addition to providing novel Postgraphile and RPC-Subscription endpoints, we a
 standard chain APIs. This will allow direct compatibility with software that already makes use of the standard interfaces.

 #### Ethereum JSON-RPC API
-ipfs-blockchain-watcher currently faithfully recapitulates portions of the Ethereum JSON-RPC api standard.
+ipld-eth-server currently faithfully recapitulates portions of the Ethereum JSON-RPC api standard.

 The currently supported endpoints include:  
 `eth_blockNumber`  
@@ -1,136 +0,0 @@
-# ipfs-blockchain-watcher architecture
-1. [Processes](#processes)
-1. [Command](#command)
-1. [Configuration](#config)
-1. [Database](#database)
-1. [APIs](#apis)
-1. [Resync](#resync)
-1. [IPFS Considerations](#ipfs-considerations)
-
-## Processes
-ipfs-blockchain-watcher is a [service](../pkg/super_node/service.go#L61) comprised of the following interfaces:
-
-* [Payload Fetcher](../pkg/super_node/shared/interfaces.go#L29): Fetches raw chain data from a half-duplex endpoint (HTTP/IPC), used for historical data fetching. ([BTC](../../pkg/super_node/btc/payload_fetcher.go), [ETH](../../pkg/super_node/eth/payload_fetcher.go)).
-* [Payload Streamer](../pkg/super_node/shared/interfaces.go#L24): Streams raw chain data from a full-duplex endpoint (WebSocket/IPC), used for syncing data at the head of the chain in real-time. ([BTC](../../pkg/super_node/btc/http_streamer.go), [ETH](../../pkg/super_node/eth/streamer.go)).
-* [Payload Converter](../pkg/super_node/shared/interfaces.go#L34): Converters raw chain data to an intermediary form prepared for IPFS publishing. ([BTC](../../pkg/super_node/btc/converter.go), [ETH](../../pkg/super_node/eth/converter.go)).
-* [IPLD Publisher](../pkg/super_node/shared/interfaces.go#L39): Publishes the converted data to IPFS, returning their CIDs and associated metadata for indexing. ([BTC](../../pkg/super_node/btc/publisher.go), [ETH](../../pkg/super_node/eth/publisher.go)).
-* [CID Indexer](../pkg/super_node/shared/interfaces.go#L44): Indexes CIDs in Postgres with their associated metadata. This metadata is chain specific and selected based on utility. ([BTC](../../pkg/super_node/btc/indexer.go), [ETH](../../pkg/super_node/eth/indexer.go)).
-* [CID Retriever](../pkg/super_node/shared/interfaces.go#L54): Retrieves CIDs from Postgres by searching against their associated metadata, is used to lookup data to serve API requests/subscriptions. ([BTC](../../pkg/super_node/btc/retriever.go), [ETH](../../pkg/super_node/eth/retriever.go)).
-* [IPLD Fetcher](../pkg/super_node/shared/interfaces.go#L62): Fetches the IPLDs needed to service API requests/subscriptions from IPFS using retrieved CIDS; can route through a IPFS block-exchange to search for objects that are not directly available. ([BTC](../../pkg/super_node/btc/ipld_fetcher.go), [ETH](../../pkg/super_node/eth/ipld_fetcher.go))
-* [Response Filterer](../pkg/super_node/shared/interfaces.go#L49): Filters converted data payloads served to API subscriptions; filters according to the subscriber provided parameters. ([BTC](../../pkg/super_node/btc/filterer.go), [ETH](../../pkg/super_node/eth/filterer.go)).
-* [API](https://github.com/ethereum/go-ethereum/blob/master/rpc/types.go#L31): Expose RPC methods for clients to interface with the data. Chain-specific APIs should aim to recapitulate as much of the native API as possible. ([VDB](../../pkg/super_node/api.go), [ETH](../../pkg/super_node/eth/api.go)).
-
-
-Appropriating the service for a new chain is done by creating underlying types to satisfy these interfaces for
-the specifics of that chain.
-
-The service uses these interfaces to operate in any combination of three modes: `sync`, `serve`, and `backfill`.
-* Sync: Streams raw chain data at the head, converts and publishes it to IPFS, and indexes the resulting set of CIDs in Postgres with useful metadata.
-* BackFill: Automatically searches for and detects gaps in the DB; fetches, converts, publishes, and indexes the data to fill these gaps.
-* Serve: Opens up IPC, HTTP, and WebSocket servers on top of the ipfs-blockchain-watcher DB and any concurrent sync and/or backfill processes.
-
-
-These three modes are all operated through a single vulcanizeDB command: `watch`
-
-## Command
-
-Usage: `./ipfs-blockchain-watcher watch --config={config.toml}`
-
-Configuration can also be done through CLI options and/or environmental variables.
-CLI options can be found using `./ipfs-blockchain-watcher watch --help`.
-
-## Config
-
-Below is the set of universal config parameters for the ipfs-blockchain-watcher command, in .toml form, with the respective environmental variables commented to the side.
-This set of parameters needs to be set no matter the chain type.
-
-```toml
-[database]
-    name     = "vulcanize_public" # $DATABASE_NAME
-    hostname = "localhost" # $DATABASE_HOSTNAME
-    port     = 5432 # $DATABASE_PORT
-    user     = "vdbm" # $DATABASE_USER
-    password = "" # $DATABASE_PASSWORD
-
-[ipfs]
-    path = "~/.ipfs" # $IPFS_PATH
-    mode = "direct" # $IPFS_MODE
-
-[superNode]
-    chain = "bitcoin" # $SUPERNODE_CHAIN
-    server = true # $SUPERNODE_SERVER
-    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SUPERNODE_IPC_PATH
-    wsPath = "127.0.0.1:8082" # $SUPERNODE_WS_PATH
-    httpPath = "127.0.0.1:8083" # $SUPERNODE_HTTP_PATH
-    sync = true # $SUPERNODE_SYNC
-    workers = 1 # $SUPERNODE_WORKERS
-    backFill = true # $SUPERNODE_BACKFILL
-    frequency = 45 # $SUPERNODE_FREQUENCY
-    batchSize = 1 # $SUPERNODE_BATCH_SIZE
-    batchNumber = 50 # $SUPERNODE_BATCH_NUMBER
-    timeout = 300 # $HTTP_TIMEOUT
-    validationLevel = 1 # $SUPERNODE_VALIDATION_LEVEL
-```
-
-Additional parameters need to be set depending on the specific chain.
-
-For Bitcoin:
-
-```toml
-[bitcoin]
-    wsPath  = "127.0.0.1:8332" # $BTC_WS_PATH
-    httpPath = "127.0.0.1:8332" # $BTC_HTTP_PATH
-    pass = "password" # $BTC_NODE_PASSWORD
-    user = "username" # $BTC_NODE_USER
-    nodeID = "ocd0" # $BTC_NODE_ID
-    clientName = "Omnicore" # $BTC_CLIENT_NAME
-    genesisBlock = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" # $BTC_GENESIS_BLOCK
-    networkID = "0xD9B4BEF9" # $BTC_NETWORK_ID
-```
-
-For Ethereum:
-
-```toml
-[ethereum]
-    wsPath  = "127.0.0.1:8546" # $ETH_WS_PATH
-    httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
-    nodeID = "arch1" # $ETH_NODE_ID
-    clientName = "Geth" # $ETH_CLIENT_NAME
-    genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
-    networkID = "1" # $ETH_NETWORK_ID
-```
-
-## Database
-
-Currently, ipfs-blockchain-watcher persists all data to a single Postgres database. The migrations for this DB can be found [here](../../db/migrations).
-Chain-specific data is populated under a chain-specific schema (e.g. `eth` and `btc`) while shared data- such as the IPFS blocks table- is populated under the `public` schema.
-Subsequent watchers which act on the raw chain data should build and populate their own schemas or separate databases entirely.
-
-In the future, we will be moving to a foreign table based architecture wherein a single db is used for shared data while each watcher uses
-its own database and accesses and acts on the shared data through foreign tables. Isolating watchers to their own databases will prevent complications and
-conflicts between watcher db migrations.
-
-
-## APIs
-
-ipfs-blockchain-watcher provides mutliple types of APIs by which to interface with its data.
-More detailed information on the APIs can be found [here](apis.md).
-
-## Resync
-
-A separate command `resync` is available for directing the resyncing of data within specified ranges.
-This is useful if we want to re-validate a range of data using a new source or clean out bad/deprecated data.
-More detailed information on this command can be found [here](resync.md).
-
-## IPFS Considerations
-
-Currently the IPLD Publisher and Fetcher can either use internalized IPFS processes which interface with a local IPFS repository, or can interface
-directly with the backing Postgres database.
-Both these options circumvent the need to run a full IPFS daemon with a [go-ipld-eth](https://github.com/ipfs/go-ipld-eth) or [go-ipld-btc](https://github.com/ipld/go-ipld-btc) plugin.
-The former approach can lead to issues with lock-contention on the IPFS repo if another IPFS process is configured and running at the same $IPFS_PATH, it also necessitates the need for
-a locally configured IPFS repository. The later bypasses the need for a configured IPFS repository/$IPFS_PATH and allows all Postgres write operations at a given block height
-to occur in a single transaction, the only disadvantage is that by avoiding moving through an IPFS node intermediary we lose the direct ability to reach out to the block
-exchange for data we do not have locally.
-
-Once go-ipld-eth and go-ipld-btc have been updated to work with a modern version of PG-IPFS, an additional option will be provided to direct
-all publishing and fetching of IPLD objects through a remote IPFS daemon.
@@ -1,73 +0,0 @@
-## ipfs-blockchain-watcher resync
-The `resync` command is made available for directing the resyncing of ipfs-blockchain-watcherdata within specified ranges.
-It also contains a utility for cleaning out old data, and resetting the validation level of data.
-
-### Rational
-
-Manual resyncing of data is useful when we want to re-validate data within specific ranges using a new source.
-
-Cleaning out data is useful when we need to remove bad/deprecated data or prepare for breaking changes to the db schemas.
-
-Resetting the validation level of data is useful for designating ranges of data for resyncing by an ongoing ipfs-blockchain-watcher
-backfill process.
-
-### Command
-
-Usage: `./ipfs-blockchain-watcher resync --config={config.toml}`
-
-Configuration can also be done through CLI options and/or environmental variables.
-CLI options can be found using `./ipfs-blockchain-watcher resync --help`.
-
-### Config
-
-Below is the set of universal config parameters for the resync command, in .toml form, with the respective environmental variables commented to the side.
-This set of parameters needs to be set no matter the chain type.
-
-```toml
-[database]
-    name     = "vulcanize_public" # $DATABASE_NAME
-    hostname = "localhost" # $DATABASE_HOSTNAME
-    port     = 5432 # $DATABASE_PORT
-    user     = "vdbm" # $DATABASE_USER
-    password = "" # $DATABASE_PASSWORD
-
-[ipfs]
-    path = "~/.ipfs" # $IPFS_PATH
-    
-[resync]
-    chain = "ethereum" # $RESYNC_CHAIN
-    type = "state" # $RESYNC_TYPE
-    start = 0 # $RESYNC_START
-    stop = 1000 # $RESYNC_STOP
-    batchSize = 10 # $RESYNC_BATCH_SIZE
-    batchNumber = 100 # $RESYNC_BATCH_NUMBER
-    timeout = 300 # $HTTP_TIMEOUT
-    clearOldCache = true # $RESYNC_CLEAR_OLD_CACHE
-    resetValidation = true # $RESYNC_RESET_VALIDATION
-```
-
-Additional parameters need to be set depending on the specific chain.
-
-For Bitcoin: 
-
-```toml
-[bitcoin]
-    httpPath = "127.0.0.1:8332" # $BTC_HTTP_PATH
-    pass = "password" # $BTC_NODE_PASSWORD
-    user = "username" # $BTC_NODE_USER
-    nodeID = "ocd0" # $BTC_NODE_ID
-    clientName = "Omnicore" # $BTC_CLIENT_NAME
-    genesisBlock = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" # $BTC_GENESIS_BLOCK
-    networkID = "0xD9B4BEF9" # $BTC_NETWORK_ID
-```
-
-For Ethereum:
-
-```toml
-[ethereum]
-    httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
-    nodeID = "arch1" # $ETH_NODE_ID
-    clientName = "Geth" # $ETH_CLIENT_NAME
-    genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
-    networkID = "1" # $ETH_NETWORK_ID
-```
@@ -1,16 +0,0 @@
-These are the components of a VulcanizeDB Watcher:
-* Data Fetcher/Streamer sources:
-  * go-ethereum
-  * bitcoind
-  * btcd
-  * IPFS
-* Transformers contain:
-  * converter
-  * publisher
-  * indexer
-* Endpoints contain:
-  * api
-  * backend
-  * filterer
-  * retriever
-    * ipld_server
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Runs the db migrations and starts the watcher services
+
+# Construct the connection string for postgres
+VDB_PG_CONNECT=postgresql://$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOSTNAME:$DATABASE_PORT/$DATABASE_NAME?sslmode=disable
+
+# Run the DB migrations
+echo "Connecting with: $VDB_PG_CONNECT"
+echo "Running database migrations"
+./goose -dir migrations/vulcanizedb postgres "$VDB_PG_CONNECT" up
+rv=$?
+
+if [ $rv != 0 ]; then
+  echo "Could not run migrations. Are the database details correct?"
+  exit 1
+fi
+
+
+echo "Beginning the ipld-eth-server process"
+
+echo running: ./ipld-eth-server ${VDB_COMMAND} --config=config.toml
+./ipld-eth-server ${VDB_COMMAND} --config=config.toml
+rv=$?
+
+if [ $rv != 0 ]; then
+  echo "ipld-eth-server startup failed"
+  exit 1
+fi
@@ -0,0 +1,14 @@
+[database]
+    name     = "vulcanize_public" # $DATABASE_NAME
+    hostname = "localhost" # $DATABASE_HOSTNAME
+    port     = 5432 # $DATABASE_PORT
+    user     = "postgres" # $DATABASE_USER
+    password = "" # $DATABASE_PASSWORD
+
+[log]
+    level = "info" # $LOGRUS_LEVEL
+
+[server]
+    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SERVER_IPC_PATH
+    wsPath = "127.0.0.1:8081" # $SERVER_WS_PATH
+    httpPath = "127.0.0.1:8082" # $SERVER_HTTP_PATH
@@ -1,29 +1,29 @@
-[superNode]
-    [superNode.ethSubscription]
+[watcher]
+    [watcher.ethSubscription]
        historicalData = false
        historicalDataOnly = false
        startingBlock = 0
        endingBlock = 0
        wsPath = "ws://127.0.0.1:8080"
-        [superNode.ethSubscription.headerFilter]
+        [watcher.ethSubscription.headerFilter]
            off = false
            uncles = false
-        [superNode.ethSubscription.txFilter]
+        [watcher.ethSubscription.txFilter]
            off = false
            src = []
            dst = []
-        [superNode.ethSubscription.receiptFilter]
+        [watcher.ethSubscription.receiptFilter]
            off = false
            contracts = []
            topic0s = []
            topic1s = []
            topic2s = []
            topic3s = []
-        [superNode.ethSubscription.stateFilter]
+        [watcher.ethSubscription.stateFilter]
            off = false
            addresses = []
           intermediateNodes = false
-        [superNode.ethSubscription.storageFilter]
+        [watcher.ethSubscription.storageFilter]
            off = true
            addresses = []
            storageKeys = []
@@ -1,45 +0,0 @@
-[database]
-    name     = "vulcanize_public" # $DATABASE_NAME
-    hostname = "localhost" # $DATABASE_HOSTNAME
-    port     = 5432 # $DATABASE_PORT
-    user     = "vdbm" # $DATABASE_USER
-    password = "" # $DATABASE_PASSWORD
-
-    [database.sync]
-        maxIdle = 1
-    [database.backFill]
-        maxIdle = 5
-
-[resync]
-    chain = "bitcoin" # $RESYNC_CHAIN
-    type = "full" # $RESYNC_TYPE
-    start = 0 # $RESYNC_START
-    stop = 0 # $RESYNC_STOP
-    batchSize = 5 # $RESYNC_BATCH_SIZE
-    batchNumber = 5 # $RESYNC_BATCH_NUMBER
-    clearOldCache = false # $RESYNC_CLEAR_OLD_CACHE
-    resetValidation = true # $RESYNC_RESET_VALIDATION
-
-[superNode]
-    chain = "bitcoin" # $SUPERNODE_CHAIN
-    server = true # $SUPERNODE_SERVER
-    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SUPERNODE_IPC_PATH
-    wsPath = "127.0.0.1:8082" # $SUPERNODE_WS_PATH
-    httpPath = "127.0.0.1:8083" # $SUPERNODE_HTTP_PATH
-    sync = true # $SUPERNODE_SYNC
-    workers = 1 # $SUPERNODE_WORKERS
-    backFill = true # $SUPERNODE_BACKFILL
-    frequency = 45 # $SUPERNODE_FREQUENCY
-    batchSize = 5 # $SUPERNODE_BATCH_SIZE
-    batchNumber = 5 # $SUPERNODE_BATCH_NUMBER
-    validationLevel = 1 # $SUPERNODE_VALIDATION_LEVEL
-
-[bitcoin]
-    wsPath  = "127.0.0.1:8332" # $BTC_WS_PATH
-    httpPath = "127.0.0.1:8332" # $BTC_HTTP_PATH
-    pass = "password" # $BTC_NODE_PASSWORD
-    user = "username" # $BTC_NODE_USER
-    nodeID = "ocd0" # $BTC_NODE_ID
-    clientName = "Omnicore" # $BTC_CLIENT_NAME
-    genesisBlock = "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f" # $BTC_GENESIS_BLOCK
-    networkID = "0xD9B4BEF9" # $BTC_NETWORK_ID
@@ -1,45 +0,0 @@
-[database]
-    name     = "vulcanize_public" # $DATABASE_NAME
-    hostname = "localhost" # $DATABASE_HOSTNAME
-    port     = 5432 # $DATABASE_PORT
-    user     = "vdbm" # $DATABASE_USER
-    password = "" # $DATABASE_PASSWORD
-
-    [database.sync]
-        maxIdle = 1
-    [database.backFill]
-        maxIdle = 5
-
-[resync]
-    chain = "ethereum" # $RESYNC_CHAIN
-    type = "state" # $RESYNC_TYPE
-    start = 0 # $RESYNC_START
-    stop = 0 # $RESYNC_STOP
-    batchSize = 5 # $RESYNC_BATCH_SIZE
-    batchNumber = 5 # $RESYNC_BATCH_NUMBER
-    timeout = 300 # $HTTP_TIMEOUT
-    clearOldCache = true # $RESYNC_CLEAR_OLD_CACHE
-    resetValidation = true # $RESYNC_RESET_VALIDATION
-
-[superNode]
-    chain = "ethereum" # $SUPERNODE_CHAIN
-    server = true # $SUPERNODE_SERVER
-    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SUPERNODE_IPC_PATH
-    wsPath = "127.0.0.1:8081" # $SUPERNODE_WS_PATH
-    httpPath = "127.0.0.1:8082" # $SUPERNODE_HTTP_PATH
-    sync = true # $SUPERNODE_SYNC
-    workers = 1 # $SUPERNODE_WORKERS
-    backFill = true # $SUPERNODE_BACKFILL
-    frequency = 15 # $SUPERNODE_FREQUENCY
-    batchSize = 5 # $SUPERNODE_BATCH_SIZE
-    batchNumber = 5 # $SUPERNODE_BATCH_NUMBER
-    timeout = 300 # $HTTP_TIMEOUT
-    validationLevel = 1 # $SUPERNODE_VALIDATION_LEVEL
-
-[ethereum]
-    wsPath  = "127.0.0.1:8546" # $ETH_WS_PATH
-    httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
-    nodeID = "arch1" # $ETH_NODE_ID
-    clientName = "Geth" # $ETH_CLIENT_NAME
-    genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
-    networkID = "1" # $ETH_NETWORK_ID
@@ -1,19 +1,12 @@
-module github.com/vulcanize/ipfs-blockchain-watcher
+module github.com/vulcanize/ipld-eth-server

-go 1.12
+go 1.13

 require (
-	github.com/btcsuite/btcd v0.20.1-beta
-	github.com/btcsuite/btcutil v1.0.2
 	github.com/ethereum/go-ethereum v1.9.11
-	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-blockservice v0.1.3
 	github.com/ipfs/go-cid v0.0.5
-	github.com/ipfs/go-filestore v1.0.0 // indirect
-	github.com/ipfs/go-ipfs v0.5.1
 	github.com/ipfs/go-ipfs-blockstore v1.0.0
 	github.com/ipfs/go-ipfs-ds-help v1.0.0
-	github.com/ipfs/go-ipfs-exchange-interface v0.0.1
 	github.com/ipfs/go-ipld-format v0.2.0
 	github.com/jmoiron/sqlx v1.2.0
 	github.com/lib/pq v1.5.2
@@ -23,8 +16,8 @@ require (
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/cobra v1.0.0
 	github.com/spf13/viper v1.7.0
-	golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 // indirect
-	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a // indirect
+	github.com/vulcanize/ipld-eth-indexer v0.2.0-alpha
+	github.com/vulcanize/pg-ipfs-ethdb v0.0.1-alpha
 )

-replace github.com/ethereum/go-ethereum v1.9.11 => github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.2
+replace github.com/ethereum/go-ethereum v1.9.11 => github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.5
@@ -1,4 +1,3 @@
-bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc h1:utDghgcjE8u+EBjHOgYT+dJPcnDF05KqWMBcjuJy510=
 bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
@@ -22,7 +21,6 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
-github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
 github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
 github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
@@ -37,14 +35,15 @@ github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxB
 github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
 github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/Stebalien/go-bitfield v0.0.0-20180330043415-076a62f9ce6e/go.mod h1:3oM7gXIttpYDAJXpVNnSCiUMYBLIZ6cb1t+Ip982MRo=
-github.com/Stebalien/go-bitfield v0.0.1 h1:X3kbSSPUaJK60wV2hjOPZwmpljr6VGCqdq4cBLhbQBo=
 github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s=
 github.com/VictoriaMetrics/fastcache v1.5.3 h1:2odJnXLbFZcoV9KYtQ+7TH1UOq3dn3AssMgieaezkR4=
 github.com/VictoriaMetrics/fastcache v1.5.3/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE=
@@ -55,6 +54,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alexbrainman/goissue34681 v0.0.0-20191006012335-3fc7a47baff5/go.mod h1:Y2QMoi1vgtOIfc+6DhrMOGkLoGzqSV2rKp4Sm+opsyA=
+github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847 h1:rtI0fD4oG/8eVokGVPYJEW1F88p1ZNgXiEIs9thEE4A=
@@ -71,7 +71,6 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
-github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d h1:QgeLLoPD3kRVmeu/1al9iIpIANMi9O1zXFm8BnYGCJg=
 github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d/go.mod h1:Jbj8eKecMNwf0KFI75skSUZqMB4UCRcndUScVBTWyUI=
 github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ=
 github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8=
@@ -81,29 +80,24 @@ github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8/go.mod h1:3J08xEfcug
 github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
-github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
 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=
-github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
 github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
-github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
 github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
 github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
-github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
+github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 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.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U=
@@ -113,7 +107,6 @@ github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.2.1-0.20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -122,24 +115,19 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 h1:HVTnpeuvF6Owjd5mniCL8DEXo7uYXdQEmOP4FJbV5tg=
 github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3/go.mod h1:p1d6YEZWvFzEh4KLyvBcVSnrfNDDvK2zfK/4x2v/4pE=
-github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
 github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018 h1:6xT9KW8zLC5IlbaIF5Q7JNieBoACT7iW0YTxQHR0in0=
 github.com/davidlazar/go-crypto v0.0.0-20170701192655-dcfb0a7ac018/go.mod h1:rQYf4tfk5sSwFsnDg3qYaBxSjsD9S8+59vW0dKUgme4=
 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0=
 github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
 github.com/dgraph-io/badger v1.5.5-0.20190226225317-8115aed38f8f/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
 github.com/dgraph-io/badger v1.6.0-rc1/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
-github.com/dgraph-io/badger v1.6.1 h1:w9pSFNSdq/JPM1N12Fz/F/bzo993Is1W+Q7HjPzi7yg=
 github.com/dgraph-io/badger v1.6.1/go.mod h1:FRmFw3uxvcpa8zG3Rxs0th+hCLIuaQg8HlNV5bjgnuU=
-github.com/dgraph-io/ristretto v0.0.2 h1:a5WaUrDa0qm0YrAAS1tUykT5El3kt62KNZZeMxQn3po=
 github.com/dgraph-io/ristretto v0.0.2/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
@@ -148,14 +136,12 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
 github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/dop251/goja v0.0.0-20200106141417-aaec0e7bde29/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c h1:JHHhtb9XWJrGNMcrVP6vyzO4dusgi/HnceHTgxSejUM=
 github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa h1:XKAhUk/dtp+CV0VO6mhG2V7jA9vbcGcnYF/Ay9NjZrY=
 github.com/elastic/gosigar v0.8.1-0.20180330100440-37f05ff46ffa/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs=
 github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302/go.mod h1:qBlWZqWeVx9BjvqBsnC/8RUlAYpIFmPvgROcw0n1scE=
-github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5 h1:BBso6MBKW8ncyZLv37o+KNyy0HrrHgfnOaGQC2qvN+A=
 github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5/go.mod h1:JpoxHjuQauoxiFMl1ie8Xc/7TfLuMZ5eOCONd1sUBHg=
 github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -164,7 +150,6 @@ github.com/fd/go-nat v1.0.0/go.mod h1:BTBu/CKvMmOMUPkKVef1pngt2WFH/lg7E6yQnulfp6
 github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc h1:jtW8jbpkO4YirRSyepBOH8E+2HEw6/hKkBvFPwhUN8c=
 github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
 github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
@@ -178,11 +163,15 @@ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclK
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.1 h1:2lOsA72HgjxAuMlKpFiCbHTvu44PIVkZ5hqm3RSdI/E=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx+opk=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -220,11 +209,11 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
 github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -237,6 +226,7 @@ github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE0
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 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/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
@@ -254,13 +244,11 @@ github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmv
 github.com/gxed/pubsub v0.0.0-20180201040156-26ebdf44f824/go.mod h1:OiEWyHgK+CWrmOlVquHaIK1vhpUJydC9m0Je6mhaiNE=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
@@ -286,6 +274,7 @@ github.com/huin/goupnp v0.0.0-20180415215157-1395d1447324/go.mod h1:MZ2ZmwcBpvOo
 github.com/huin/goupnp v1.0.0 h1:wg75sLpL6DZqwHQN6E1Cfk6mtfzS45z8OV+ic+DtHRo=
 github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=
 github.com/ipfs/bbloom v0.0.1/go.mod h1:oqo8CVWsJFMOZqTglBG4wydCE4IQA/G2/SEofB0rjUI=
@@ -297,7 +286,6 @@ github.com/ipfs/go-bitswap v0.1.0/go.mod h1:FFJEf18E9izuCqUtHxbWEvq+reg7o4CW5wSA
 github.com/ipfs/go-bitswap v0.1.2/go.mod h1:qxSWS4NXGs7jQ6zQvoPY3+NmOfHHG47mhkiLzBpJQIs=
 github.com/ipfs/go-bitswap v0.1.3/go.mod h1:YEQlFy0kkxops5Vy+OxWdRSEZIoS7I7KDIwoa5Chkps=
 github.com/ipfs/go-bitswap v0.1.8/go.mod h1:TOWoxllhccevbWFUR2N7B1MTSVVge1s6XSMiCSA4MzM=
-github.com/ipfs/go-bitswap v0.2.13 h1:R8mUGpY0vwHljlnBeDE9PdR3DKKiPKevAMkq9qB8cyA=
 github.com/ipfs/go-bitswap v0.2.13/go.mod h1:SDXpLeKZagyVVc8/z7sGtmM/lz8lyAmSzrUx3Ge3GXw=
 github.com/ipfs/go-block-format v0.0.1/go.mod h1:DK/YYcsSUIVAFNwo/KZCdIIbpN0ROH/baNLgayt4pFc=
 github.com/ipfs/go-block-format v0.0.2 h1:qPDvcP19izTjU8rgo6p7gTXZlkMkF5bz5G3fqIsSCPE=
@@ -307,7 +295,6 @@ github.com/ipfs/go-blockservice v0.0.7/go.mod h1:EOfb9k/Y878ZTRY/CH0x5+ATtaipfbR
 github.com/ipfs/go-blockservice v0.1.0/go.mod h1:hzmMScl1kXHg3M2BjTymbVPjv627N7sYcvYaKbop39M=
 github.com/ipfs/go-blockservice v0.1.1/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
 github.com/ipfs/go-blockservice v0.1.2/go.mod h1:t+411r7psEUhLueM8C7aPA7cxCclv4O3VsUVxt9kz2I=
-github.com/ipfs/go-blockservice v0.1.3 h1:9XgsPMwwWJSC9uVr2pMDsW2qFTBSkxpGMhmna8mIjPM=
 github.com/ipfs/go-blockservice v0.1.3/go.mod h1:OTZhFpkgY48kNzbgyvcexW9cHrpjBYIjSR0KoDOFOLU=
 github.com/ipfs/go-cid v0.0.1/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
 github.com/ipfs/go-cid v0.0.2/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUPQvM=
@@ -315,7 +302,6 @@ github.com/ipfs/go-cid v0.0.3/go.mod h1:GHWU/WuQdMPmIosc4Yn1bcCT7dSeX4lBafM7iqUP
 github.com/ipfs/go-cid v0.0.4/go.mod h1:4LLaPOQwmk5z9LBgQnpkivrx8BJjUyGwTXCd5Xfj6+M=
 github.com/ipfs/go-cid v0.0.5 h1:o0Ix8e/ql7Zb5UVUJEUfjsWCIY8t48++9lR8qi6oiJU=
 github.com/ipfs/go-cid v0.0.5/go.mod h1:plgt+Y5MnOey4vO4UlUazGqdbEXuFYitED67FexhXog=
-github.com/ipfs/go-cidutil v0.0.2 h1:CNOboQf1t7Qp0nuNh8QMmhJs0+Q//bRL1axtCnIB1Yo=
 github.com/ipfs/go-cidutil v0.0.2/go.mod h1:ewllrvrxG6AMYStla3GD7Cqn+XYSLqjK0vc+086tB6s=
 github.com/ipfs/go-datastore v0.0.1/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
 github.com/ipfs/go-datastore v0.0.5/go.mod h1:d4KVXhMt913cLBEI/PXAy6ko+W7e9AhyAKBGh803qeE=
@@ -333,25 +319,17 @@ github.com/ipfs/go-ds-badger v0.0.5/go.mod h1:g5AuuCGmr7efyzQhLL8MzwqcauPojGPUaH
 github.com/ipfs/go-ds-badger v0.0.7/go.mod h1:qt0/fWzZDoPW6jpQeqUjR5kBfhDNB65jd9YlmAvpQBk=
 github.com/ipfs/go-ds-badger v0.2.1/go.mod h1:Tx7l3aTph3FMFrRS838dcSJh+jjA7cX9DrGVwx/NOwE=
 github.com/ipfs/go-ds-badger v0.2.3/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-badger v0.2.4 h1:UPGB0y7luFHk+mY/tUZrif/272M8o+hFsW+avLUeWrM=
 github.com/ipfs/go-ds-badger v0.2.4/go.mod h1:pEYw0rgg3FIrywKKnL+Snr+w/LjJZVMTBRn4FS6UHUk=
-github.com/ipfs/go-ds-flatfs v0.4.4 h1:DmGZ4qOYQLNgu8Mltuz1DtUHpm+BjWMcVN3F3H3VJzQ=
 github.com/ipfs/go-ds-flatfs v0.4.4/go.mod h1:e4TesLyZoA8k1gV/yCuBTnt2PJtypn4XUlB5n8KQMZY=
 github.com/ipfs/go-ds-leveldb v0.0.1/go.mod h1:feO8V3kubwsEF22n0YRQCffeb79OOYIykR4L04tMOYc=
 github.com/ipfs/go-ds-leveldb v0.1.0/go.mod h1:hqAW8y4bwX5LWcCtku2rFNX3vjDZCy5LZCg+cSZvYb8=
 github.com/ipfs/go-ds-leveldb v0.4.1/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ds-leveldb v0.4.2 h1:QmQoAJ9WkPMUfBLnu1sBVy0xWWlJPg0m4kRAiJL9iaw=
 github.com/ipfs/go-ds-leveldb v0.4.2/go.mod h1:jpbku/YqBSsBc1qgME8BkWS4AxzF2cEu1Ii2r79Hh9s=
-github.com/ipfs/go-ds-measure v0.1.0 h1:vE4TyY4aeLeVgnnPBC5QzKIjKrqzha0NCujTfgvVbVQ=
 github.com/ipfs/go-ds-measure v0.1.0/go.mod h1:1nDiFrhLlwArTME1Ees2XaBOl49OoCgd2A3f8EchMSY=
 github.com/ipfs/go-filestore v0.0.3/go.mod h1:dvXRykFzyyXN2CdNlRGzDAkXMDPyI+D7JE066SiKLSE=
-github.com/ipfs/go-filestore v1.0.0 h1:QR7ekKH+q2AGiWDc7W2Q0qHuYSRZGUJqUn0GsegEPb0=
 github.com/ipfs/go-filestore v1.0.0/go.mod h1:/XOCuNtIe2f1YPbiXdYvD0BKLA0JR1MgPiFOdcuu9SM=
-github.com/ipfs/go-fs-lock v0.0.4 h1:VhlO2E7awjMxkj6a4nCsrPScRFvEPZxhULtbYdJNZhQ=
 github.com/ipfs/go-fs-lock v0.0.4/go.mod h1:SUaaFT1boYZewW+QBw5FZjcDbxkZIWgNdYb1ab93zaY=
-github.com/ipfs/go-graphsync v0.0.5 h1:5U9iC58JgYfUSZI55oRXe22Cj6Ln0Xjd5VF4Eoo3foc=
 github.com/ipfs/go-graphsync v0.0.5/go.mod h1:SGKa4rVgCCz3KDNqe38wLEDYFa/PUF6w/ertGSQk33I=
-github.com/ipfs/go-ipfs v0.5.1 h1:Imx8or636fKipbTStGzPOl0reXQxMDncYVpaL/ptw8E=
 github.com/ipfs/go-ipfs v0.5.1/go.mod h1:RK9c4yJwQFRDUvcz8yRJJjKXK+yPwY3P9eM8eQvG468=
 github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08=
 github.com/ipfs/go-ipfs-blockstore v0.1.0/go.mod h1:5aD0AvHPi7mZc6Ci1WCAhiBQu2IsfTduLl+422H6Rqw=
@@ -360,54 +338,40 @@ github.com/ipfs/go-ipfs-blockstore v1.0.0 h1:pmFp5sFYsYVvMOp9X01AK3s85usVcLvkBTR
 github.com/ipfs/go-ipfs-blockstore v1.0.0/go.mod h1:knLVdhVU9L7CC4T+T4nvGdeUIPAXlnd9zmXfp+9MIjU=
 github.com/ipfs/go-ipfs-blocksutil v0.0.1/go.mod h1:Yq4M86uIOmxmGPUHv/uI7uKqZNtLb449gwKqXjIsnRk=
 github.com/ipfs/go-ipfs-chunker v0.0.1/go.mod h1:tWewYK0we3+rMbOh7pPFGDyypCtvGcBFymgY4rSDLAw=
-github.com/ipfs/go-ipfs-chunker v0.0.5 h1:ojCf7HV/m+uS2vhUGWcogIIxiO5ubl5O57Q7NapWLY8=
 github.com/ipfs/go-ipfs-chunker v0.0.5/go.mod h1:jhgdF8vxRHycr00k13FM8Y0E+6BoalYeobXmUyTreP8=
 github.com/ipfs/go-ipfs-cmds v0.2.2/go.mod h1:kqlUrp6m2ceoaJe40cXpADCi5aS6NKRn0NIeuLp5CeM=
-github.com/ipfs/go-ipfs-config v0.5.3 h1:3GpI/xR9FoJNTjU6YvCMRbYyEi0dBVY5UtlUTcNRlSA=
 github.com/ipfs/go-ipfs-config v0.5.3/go.mod h1:nSLCFtlaL+2rbl3F+9D4gQZQbT1LjRKx7TJg/IHz6oM=
 github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
-github.com/ipfs/go-ipfs-delay v0.0.1 h1:r/UXYyRcddO6thwOnhiznIAiSvxMECGgtv35Xs1IeRQ=
 github.com/ipfs/go-ipfs-delay v0.0.1/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
 github.com/ipfs/go-ipfs-ds-help v0.0.1/go.mod h1:gtP9xRaZXqIQRh1HRpp595KbBEdgqWFxefeVKOV8sxo=
 github.com/ipfs/go-ipfs-ds-help v0.1.1/go.mod h1:SbBafGJuGsPI/QL3j9Fc5YPLeAu+SzOkI0gFwAg+mOs=
 github.com/ipfs/go-ipfs-ds-help v1.0.0 h1:bEQ8hMGs80h0sR8O4tfDgV6B01aaF9qeTrujrTLYV3g=
 github.com/ipfs/go-ipfs-ds-help v1.0.0/go.mod h1:ujAbkeIgkKAWtxxNkoZHWLCyk5JpPoKnGyCcsoF6ueE=
-github.com/ipfs/go-ipfs-exchange-interface v0.0.1 h1:LJXIo9W7CAmugqI+uofioIpRb6rY30GUu7G6LUfpMvM=
 github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod h1:c8MwfHjtQjPoDyiy9cFquVtVHkO9b9Ob3FG91qJnWCM=
-github.com/ipfs/go-ipfs-exchange-offline v0.0.1 h1:P56jYKZF7lDDOLx5SotVh5KFxoY6C81I1NSHW1FxGew=
 github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAzpUws3x7UeEGkzQc3iNkM0=
 github.com/ipfs/go-ipfs-files v0.0.2/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
 github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
 github.com/ipfs/go-ipfs-files v0.0.4/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4=
-github.com/ipfs/go-ipfs-files v0.0.8 h1:8o0oFJkJ8UkO/ABl8T6ac6tKF3+NIpj67aAB6ZpusRg=
 github.com/ipfs/go-ipfs-files v0.0.8/go.mod h1:wiN/jSG8FKyk7N0WyctKSvq3ljIa2NNTiZB55kpTdOs=
 github.com/ipfs/go-ipfs-flags v0.0.1/go.mod h1:RnXBb9WV53GSfTrSDVK61NLTFKvWc60n+K9EgCDh+rA=
-github.com/ipfs/go-ipfs-pinner v0.0.4 h1:EmxhS3vDsCK/rZrsgxX0Le9m2drBcGlUd7ah/VyFYVE=
 github.com/ipfs/go-ipfs-pinner v0.0.4/go.mod h1:s4kFZWLWGDudN8Jyd/GTpt222A12C2snA2+OTdy/7p8=
-github.com/ipfs/go-ipfs-posinfo v0.0.1 h1:Esoxj+1JgSjX0+ylc0hUmJCOv6V2vFoZiETLR6OtpRs=
 github.com/ipfs/go-ipfs-posinfo v0.0.1/go.mod h1:SwyeVP+jCwiDu0C313l/8jg6ZxM0qqtlt2a0vILTc1A=
 github.com/ipfs/go-ipfs-pq v0.0.1/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
-github.com/ipfs/go-ipfs-pq v0.0.2 h1:e1vOOW6MuOwG2lqxcLA+wEn93i/9laCY8sXAw76jFOY=
 github.com/ipfs/go-ipfs-pq v0.0.2/go.mod h1:LWIqQpqfRG3fNc5XsnIhz/wQ2XXGyugQwls7BgUmUfY=
-github.com/ipfs/go-ipfs-provider v0.4.3 h1:k54OHXZcFBkhL6l3GnPS9PfpaLeLqZjVASG1bgfBdfQ=
 github.com/ipfs/go-ipfs-provider v0.4.3/go.mod h1:rcQBVqfblDQRk5LaCtf2uxuKxMJxvKmF5pLS0pO4au4=
 github.com/ipfs/go-ipfs-routing v0.0.1/go.mod h1:k76lf20iKFxQTjcJokbPM9iBXVXVZhcOwc360N4nuKs=
-github.com/ipfs/go-ipfs-routing v0.1.0 h1:gAJTT1cEeeLj6/DlLX6t+NxD9fQe2ymTO6qWRDI/HQQ=
 github.com/ipfs/go-ipfs-routing v0.1.0/go.mod h1:hYoUkJLyAUKhF58tysKpids8RNDPO42BVMgK5dNsoqY=
 github.com/ipfs/go-ipfs-util v0.0.1 h1:Wz9bL2wB2YBJqggkA4dD7oSmqB4cAnpNbGrlHJulv50=
 github.com/ipfs/go-ipfs-util v0.0.1/go.mod h1:spsl5z8KUnrve+73pOhSVZND1SIxPW5RyBCNzQxlJBc=
 github.com/ipfs/go-ipld-cbor v0.0.1/go.mod h1:RXHr8s4k0NE0TKhnrxqZC9M888QfsBN9rhS5NjfKzY8=
 github.com/ipfs/go-ipld-cbor v0.0.2/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
 github.com/ipfs/go-ipld-cbor v0.0.3/go.mod h1:wTBtrQZA3SoFKMVkp6cn6HMRteIB1VsmHA0AQFOn7Nc=
-github.com/ipfs/go-ipld-cbor v0.0.4 h1:Aw3KPOKXjvrm6VjwJvFf1F1ekR/BH3jdof3Bk7OTiSA=
 github.com/ipfs/go-ipld-cbor v0.0.4/go.mod h1:BkCduEx3XBCO6t2Sfo5BaHzuok7hbhdMm9Oh8B2Ftq4=
 github.com/ipfs/go-ipld-format v0.0.1/go.mod h1:kyJtbkDALmFHv3QR6et67i35QzO3S0dCDnkOJhcZkms=
 github.com/ipfs/go-ipld-format v0.0.2/go.mod h1:4B6+FM2u9OJ9zCV+kSbgFAZlOrv1Hqbf0INGQgiKf9k=
 github.com/ipfs/go-ipld-format v0.2.0 h1:xGlJKkArkmBvowr+GMCX0FEZtkro71K1AwiKnL37mwA=
 github.com/ipfs/go-ipld-format v0.2.0/go.mod h1:3l3C1uKoadTPbeNfrDi+xMInYKlx2Cvg1BuydPSdzQs=
-github.com/ipfs/go-ipld-git v0.0.3 h1:/YjkjCyo5KYRpW+suby8Xh9Cm/iH9dAgGV6qyZ1dGus=
 github.com/ipfs/go-ipld-git v0.0.3/go.mod h1:RuvMXa9qtJpDbqngyICCU/d+cmLFXxLsbIclmD0Lcr0=
-github.com/ipfs/go-ipns v0.0.2 h1:oq4ErrV4hNQ2Eim257RTYRgfOSV/s8BDaf9iIl4NwFs=
 github.com/ipfs/go-ipns v0.0.2/go.mod h1:WChil4e0/m9cIINWLxZe1Jtf77oz5L05rO2ei/uKJ5U=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.1/go.mod h1:HuWlQttfN6FWNHRhlY5yMk/lW7evQC0HHGOxEwMRR8I=
@@ -427,34 +391,25 @@ github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB
 github.com/ipfs/go-merkledag v0.2.4/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
 github.com/ipfs/go-merkledag v0.3.0/go.mod h1:4pymaZLhSLNVuiCITYrpViD6vmfZ/Ws4n/L9tfNv3S4=
 github.com/ipfs/go-merkledag v0.3.1/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
-github.com/ipfs/go-merkledag v0.3.2 h1:MRqj40QkrWkvPswXs4EfSslhZ4RVPRbxwX11js0t1xY=
 github.com/ipfs/go-merkledag v0.3.2/go.mod h1:fvkZNNZixVW6cKSZ/JfLlON5OlgTXNdRLz0p6QG/I2M=
 github.com/ipfs/go-metrics-interface v0.0.1 h1:j+cpbjYvu4R8zbleSs36gvB7jR+wsL2fGD6n0jO4kdg=
 github.com/ipfs/go-metrics-interface v0.0.1/go.mod h1:6s6euYU4zowdslK0GKHmqaIZ3j/b/tL7HTWtJ4VPgWY=
 github.com/ipfs/go-metrics-prometheus v0.0.2/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
-github.com/ipfs/go-mfs v0.1.1 h1:tjYEWFIl0W6vRFuM/EnySHaaYzPmDcQWwTjtYWMGQ1A=
 github.com/ipfs/go-mfs v0.1.1/go.mod h1:nk17h6kCOrfaNqXvx2VJ3SqkJ0VYUzJFAsc+BA0sqaw=
 github.com/ipfs/go-path v0.0.3/go.mod h1:zIRQUez3LuQIU25zFjC2hpBTHimWx7VK5bjZgRLbbdo=
-github.com/ipfs/go-path v0.0.7 h1:H06hKMquQ0aYtHiHryOMLpQC1qC3QwXwkahcEVD51Ho=
 github.com/ipfs/go-path v0.0.7/go.mod h1:6KTKmeRnBXgqrTvzFrPV3CamxcgvXX/4z79tfAd2Sno=
 github.com/ipfs/go-peertaskqueue v0.0.4/go.mod h1:03H8fhyeMfKNFWqzYEVyMbcPUeYrqP1MX6Kd+aN+rMQ=
 github.com/ipfs/go-peertaskqueue v0.1.0/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
 github.com/ipfs/go-peertaskqueue v0.1.1/go.mod h1:Jmk3IyCcfl1W3jTW3YpghSwSEC6IJ3Vzz/jUmWw8Z0U=
-github.com/ipfs/go-peertaskqueue v0.2.0 h1:2cSr7exUGKYyDeUyQ7P/nHPs9P7Ht/B+ROrpN1EJOjc=
 github.com/ipfs/go-peertaskqueue v0.2.0/go.mod h1:5/eNrBEbtSKWCG+kQK8K8fGNixoYUnr+P7jivavs9lY=
 github.com/ipfs/go-unixfs v0.0.4/go.mod h1:eIo/p9ADu/MFOuyxzwU+Th8D6xoxU//r590vUpWyfz8=
 github.com/ipfs/go-unixfs v0.1.0/go.mod h1:lysk5ELhOso8+Fed9U1QTGey2ocsfaZ18h0NCO2Fj9s=
 github.com/ipfs/go-unixfs v0.2.2-0.20190827150610-868af2e9e5cb/go.mod h1:IwAAgul1UQIcNZzKPYZWOCijryFBeCV79cNubPzol+k=
-github.com/ipfs/go-unixfs v0.2.4 h1:6NwppOXefWIyysZ4LR/qUBPvXd5//8J3jiMdvpbw6Lo=
 github.com/ipfs/go-unixfs v0.2.4/go.mod h1:SUdisfUjNoSDzzhGVxvCL9QO/nKdwXdr+gbMUdqcbYw=
-github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E=
 github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0=
-github.com/ipfs/interface-go-ipfs-core v0.2.7 h1:HCwVmU9Tmba6jdMGxMcPsfwKUBY4y+6bLHp8T+t9hTU=
 github.com/ipfs/interface-go-ipfs-core v0.2.7/go.mod h1:Tihp8zxGpUeE3Tokr94L6zWZZdkRQvG5TL6i9MuNE+s=
 github.com/ipld/go-car v0.1.0/go.mod h1:RCWzaUh2i4mOEkB3W45Vc+9jnS/M6Qay5ooytiBHl3g=
-github.com/ipld/go-ipld-prime v0.0.2-0.20191108012745-28a82f04c785 h1:fASnkvtR+SmB2y453RxmDD3Uvd4LonVUgFGk9JoDaZs=
 github.com/ipld/go-ipld-prime v0.0.2-0.20191108012745-28a82f04c785/go.mod h1:bDDSvVz7vaK12FNvMeRYnpRFkSUPNQOiCYQezMD/P3w=
-github.com/ipld/go-ipld-prime-proto v0.0.0-20191113031812-e32bd156a1e5 h1:lSip43rAdyGA+yRQuy6ju0ucZkWpYc1F2CTQtZTVW/4=
 github.com/ipld/go-ipld-prime-proto v0.0.0-20191113031812-e32bd156a1e5/go.mod h1:gcvzoEDBjwycpXt3LBE061wT9f46szXGHAmj9uoP6fU=
 github.com/jackpal/gateway v1.0.4/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
 github.com/jackpal/gateway v1.0.5/go.mod h1:lTpwd4ACLXmpyiCTRtfiNyVnUmqT9RivzCDQetPfnjA=
@@ -464,11 +419,9 @@ github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7Bd
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jbenet/go-cienv v0.0.0-20150120210510-1bb1476777ec/go.mod h1:rGaEvXB4uRSZMmzKNLoXvTu1sfx+1kv/DojUlPrSZGs=
 github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
-github.com/jbenet/go-is-domain v1.0.3 h1:FuRBJ0h79p00eseyaLckJT5KnE8RyqI+HLopvNSyNE0=
 github.com/jbenet/go-is-domain v1.0.3/go.mod h1:xbRLRb0S7FgzDBTJlguhDVwLYM/5yNtvktxj2Ttfy7Q=
 github.com/jbenet/go-random v0.0.0-20190219211222-123a90aedc0c/go.mod h1:sdx1xVM9UuLw1tXnhJWN3piypTUO3vCIHYmG15KE/dU=
 github.com/jbenet/go-temp-err-catcher v0.0.0-20150120210811-aac704a3f4f2/go.mod h1:8GXXJV31xl8whumTzdZsTt3RnUIiPqzkyf7mxToRCMs=
-github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
 github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
 github.com/jbenet/goprocess v0.0.0-20160826012719-b497e2f366b8/go.mod h1:Ly/wlsjFq/qrU3Rar62tu1gASgGw6chQbSh/XgIIXCY=
 github.com/jbenet/goprocess v0.1.3/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
@@ -486,6 +439,7 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.1.1-0.20170430222011-975b5c4c7c21/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
@@ -497,38 +451,36 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
-github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d h1:68u9r4wEvL3gYg2jvAOgROwZ3H+Y3hIDk4tbbmIjcYQ=
 github.com/koron/go-ssdp v0.0.0-20191105050749-2e1c40ed0b5d/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw=
 github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/libp2p/go-addr-util v0.0.1 h1:TpTQm9cXVRVSKsYbgQ7GKc3KbbHVTnbostgGaDEP+88=
 github.com/libp2p/go-addr-util v0.0.1/go.mod h1:4ac6O7n9rIAKB1dnd+s8IbbMXkt+oBpzX4/+RACcnlQ=
 github.com/libp2p/go-buffer-pool v0.0.1/go.mod h1:xtyIz9PMobb13WaxR6Zo1Pd1zXJKYg0a8KiIvDp3TzQ=
-github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs=
 github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM=
 github.com/libp2p/go-conn-security v0.0.1/go.mod h1:bGmu51N0KU9IEjX7kl2PQjgZa40JQWnayTvNMgD/vyk=
 github.com/libp2p/go-conn-security-multistream v0.0.1/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
 github.com/libp2p/go-conn-security-multistream v0.0.2/go.mod h1:nc9vud7inQ+d6SO0I/6dSWrdMnHnzZNHeyUQqrAJulE=
 github.com/libp2p/go-conn-security-multistream v0.1.0/go.mod h1:aw6eD7LOsHEX7+2hJkDxw1MteijaVcI+/eP2/x3J1xc=
-github.com/libp2p/go-conn-security-multistream v0.2.0 h1:uNiDjS58vrvJTg9jO6bySd1rMKejieG7v45ekqHbZ1M=
 github.com/libp2p/go-conn-security-multistream v0.2.0/go.mod h1:hZN4MjlNetKD3Rq5Jb/P5ohUnFLNzEAR4DLSzpn2QLU=
 github.com/libp2p/go-eventbus v0.0.2/go.mod h1:Hr/yGlwxA/stuLnpMiu82lpNKpvRy3EaJxPu40XYOwk=
 github.com/libp2p/go-eventbus v0.0.3/go.mod h1:Hr/yGlwxA/stuLnpMiu82lpNKpvRy3EaJxPu40XYOwk=
-github.com/libp2p/go-eventbus v0.1.0 h1:mlawomSAjjkk97QnYiEmHsLu7E136+2oCWSHRUvMfzQ=
 github.com/libp2p/go-eventbus v0.1.0/go.mod h1:vROgu5cs5T7cv7POWlWxBaVLxfSegC5UGQf8A2eEmx4=
 github.com/libp2p/go-flow-metrics v0.0.1/go.mod h1:Iv1GH0sG8DtYN3SVJ2eG221wMiNpZxBdp967ls1g+k8=
 github.com/libp2p/go-flow-metrics v0.0.2/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
-github.com/libp2p/go-flow-metrics v0.0.3 h1:8tAs/hSdNvUiLgtlSy3mxwxWP4I9y/jlkPFT7epKdeM=
 github.com/libp2p/go-flow-metrics v0.0.3/go.mod h1:HeoSNUrOJVK1jEpDqVEiUOIXqhbnS27omG0uWU5slZs=
 github.com/libp2p/go-libp2p v0.0.2/go.mod h1:Qu8bWqFXiocPloabFGUcVG4kk94fLvfC8mWTDdFC9wE=
 github.com/libp2p/go-libp2p v0.0.30/go.mod h1:XWT8FGHlhptAv1+3V/+J5mEpzyui/5bvFsNuWYs611A=
@@ -540,7 +492,6 @@ github.com/libp2p/go-libp2p v0.6.1/go.mod h1:CTFnWXogryAHjXAKEbOf1OWY+VeAP3lDMZk
 github.com/libp2p/go-libp2p v0.7.0/go.mod h1:hZJf8txWeCduQRDC/WSqBGMxaTHCOYHt2xSU1ivxn0k=
 github.com/libp2p/go-libp2p v0.7.4/go.mod h1:oXsBlTLF1q7pxr+9w6lqzS1ILpyHsaBPniVO7zIHGMw=
 github.com/libp2p/go-libp2p v0.8.2/go.mod h1:NQDA/F/qArMHGe0J7sDScaKjW8Jh4y/ozQqBbYJ+BnA=
-github.com/libp2p/go-libp2p v0.8.3 h1:IFWeNzxkBaNO1N8stN9ayFGdC6RmVuSsKd5bou7qpK0=
 github.com/libp2p/go-libp2p v0.8.3/go.mod h1:EsH1A+8yoWK+L4iKcbPYu6MPluZ+CHWI9El8cTaefiM=
 github.com/libp2p/go-libp2p-autonat v0.0.2/go.mod h1:fs71q5Xk+pdnKU014o2iq1RhMs9/PMaG5zXRFNnIIT4=
 github.com/libp2p/go-libp2p-autonat v0.0.6/go.mod h1:uZneLdOkZHro35xIhpbtTzLlgYturpu4J5+0cZK3MqE=
@@ -548,21 +499,17 @@ github.com/libp2p/go-libp2p-autonat v0.1.0/go.mod h1:1tLf2yXxiE/oKGtDwPYWTSYG3Pt
 github.com/libp2p/go-libp2p-autonat v0.1.1/go.mod h1:OXqkeGOY2xJVWKAGV2inNF5aKN/djNA3fdpCWloIudE=
 github.com/libp2p/go-libp2p-autonat v0.2.0/go.mod h1:DX+9teU4pEEoZUqR1PiMlqliONQdNbfzE1C718tcViI=
 github.com/libp2p/go-libp2p-autonat v0.2.1/go.mod h1:MWtAhV5Ko1l6QBsHQNSuM6b1sRkXrpk0/LqCr+vCVxI=
-github.com/libp2p/go-libp2p-autonat v0.2.2 h1:4dlgcEEugTFWSvdG2UIFxhnOMpX76QaZSRAtXmYB8n4=
 github.com/libp2p/go-libp2p-autonat v0.2.2/go.mod h1:HsM62HkqZmHR2k1xgX34WuWDzk/nBwNHoeyyT4IWV6A=
 github.com/libp2p/go-libp2p-blankhost v0.0.1/go.mod h1:Ibpbw/7cPPYwFb7PACIWdvxxv0t0XCCI10t7czjAjTc=
 github.com/libp2p/go-libp2p-blankhost v0.1.1/go.mod h1:pf2fvdLJPsC1FsVrNP3DUUvMzUts2dsLLBEpo1vW1ro=
 github.com/libp2p/go-libp2p-blankhost v0.1.3/go.mod h1:KML1//wiKR8vuuJO0y3LUd1uLv+tlkGTAr3jC0S5cLg=
-github.com/libp2p/go-libp2p-blankhost v0.1.4 h1:I96SWjR4rK9irDHcHq3XHN6hawCRTPUADzkJacgZLvk=
 github.com/libp2p/go-libp2p-blankhost v0.1.4/go.mod h1:oJF0saYsAXQCSfDq254GMNmLNz6ZTHTOvtF4ZydUvwU=
 github.com/libp2p/go-libp2p-circuit v0.0.1/go.mod h1:Dqm0s/BiV63j8EEAs8hr1H5HudqvCAeXxDyic59lCwE=
 github.com/libp2p/go-libp2p-circuit v0.0.9/go.mod h1:uU+IBvEQzCu953/ps7bYzC/D/R0Ho2A9LfKVVCatlqU=
 github.com/libp2p/go-libp2p-circuit v0.1.0/go.mod h1:Ahq4cY3V9VJcHcn1SBXjr78AbFkZeIRmfunbA7pmFh8=
 github.com/libp2p/go-libp2p-circuit v0.1.4/go.mod h1:CY67BrEjKNDhdTk8UgBX1Y/H5c3xkAcs3gnksxY7osU=
 github.com/libp2p/go-libp2p-circuit v0.2.1/go.mod h1:BXPwYDN5A8z4OEY9sOfr2DUQMLQvKt/6oku45YUmjIo=
-github.com/libp2p/go-libp2p-circuit v0.2.2 h1:87RLabJ9lrhoiSDDZyCJ80ZlI5TLJMwfyoGAaWXzWqA=
 github.com/libp2p/go-libp2p-circuit v0.2.2/go.mod h1:nkG3iE01tR3FoQ2nMm06IUrCpCyJp1Eo4A1xYdpjfs4=
-github.com/libp2p/go-libp2p-connmgr v0.2.1 h1:1ed0HFhCb39sIMK7QYgRBW0vibBBqFQMs4xt9a9AalY=
 github.com/libp2p/go-libp2p-connmgr v0.2.1/go.mod h1:JReKEFcgzSHKT9lL3rhYcUtXBs9uMIiMKJGM1tl3xJE=
 github.com/libp2p/go-libp2p-core v0.0.1/go.mod h1:g/VxnTZ/1ygHxH3dKok7Vno1VfpvGcGip57wjTU4fco=
 github.com/libp2p/go-libp2p-core v0.0.2/go.mod h1:9dAcntw/n46XycV4RnlBq3BpgrmyUi9LuoTNdPrbUco=
@@ -580,18 +527,15 @@ github.com/libp2p/go-libp2p-core v0.4.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZas
 github.com/libp2p/go-libp2p-core v0.5.0/go.mod h1:49XGI+kc38oGVwqSBhDEwytaAxgZasHhFfQKibzTls0=
 github.com/libp2p/go-libp2p-core v0.5.1/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-core v0.5.2/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
-github.com/libp2p/go-libp2p-core v0.5.3 h1:b9W3w7AZR2n/YJhG8d0qPFGhGhCWKIvPuJgp4hhc4MM=
 github.com/libp2p/go-libp2p-core v0.5.3/go.mod h1:uN7L2D4EvPCvzSH5SrhR72UWbnSGpt5/a35Sm4upn4Y=
 github.com/libp2p/go-libp2p-crypto v0.0.1/go.mod h1:yJkNyDmO341d5wwXxDUGO0LykUVT72ImHNUqh5D/dBE=
 github.com/libp2p/go-libp2p-crypto v0.0.2/go.mod h1:eETI5OUfBnvARGOHrJz2eWNyTUxEGZnBxMcbUjfIj4I=
-github.com/libp2p/go-libp2p-crypto v0.1.0 h1:k9MFy+o2zGDNGsaoZl0MA3iZ75qXxr9OOoAZF+sD5OQ=
 github.com/libp2p/go-libp2p-crypto v0.1.0/go.mod h1:sPUokVISZiy+nNuTTH/TY+leRSxnFj/2GLjtOTW90hI=
 github.com/libp2p/go-libp2p-discovery v0.0.1/go.mod h1:ZkkF9xIFRLA1xCc7bstYFkd80gBGK8Fc1JqGoU2i+zI=
 github.com/libp2p/go-libp2p-discovery v0.0.5/go.mod h1:YtF20GUxjgoKZ4zmXj8j3Nb2TUSBHFlOCetzYdbZL5I=
 github.com/libp2p/go-libp2p-discovery v0.1.0/go.mod h1:4F/x+aldVHjHDHuX85x1zWoFTGElt8HnoDzwkFZm29g=
 github.com/libp2p/go-libp2p-discovery v0.2.0/go.mod h1:s4VGaxYMbw4+4+tsoQTqh7wfxg97AEdo4GYBt6BadWg=
 github.com/libp2p/go-libp2p-discovery v0.3.0/go.mod h1:o03drFnz9BVAZdzC/QUQ+NeQOu38Fu7LJGEOK2gQltw=
-github.com/libp2p/go-libp2p-discovery v0.4.0 h1:dK78UhopBk48mlHtRCzbdLm3q/81g77FahEBTjcqQT8=
 github.com/libp2p/go-libp2p-discovery v0.4.0/go.mod h1:bZ0aJSrFc/eX2llP0ryhb1kpgkPyTo23SJ5b7UQCMh4=
 github.com/libp2p/go-libp2p-gostream v0.2.1/go.mod h1:1Mjp3LDmkqICe5tH9yLVNCqFaRTy6OwBvuJV6j1b9Nk=
 github.com/libp2p/go-libp2p-host v0.0.1/go.mod h1:qWd+H1yuU0m5CwzAkvbSjqKairayEHdR5MMl7Cwa7Go=
@@ -601,24 +545,19 @@ github.com/libp2p/go-libp2p-interface-connmgr v0.0.1/go.mod h1:GarlRLH0LdeWcLnYM
 github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
 github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
 github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
-github.com/libp2p/go-libp2p-kad-dht v0.7.11 h1:MP0DEuxO/Blg1AklIVV1P4R5xtYX+ZyXBCtEN7f60yQ=
 github.com/libp2p/go-libp2p-kad-dht v0.7.11/go.mod h1:1ht6+bG3Or+fNNERWPYmLacs6TN0CxBkFB5IKIWWwOI=
-github.com/libp2p/go-libp2p-kbucket v0.4.1 h1:6FyzbQuGLPzbMv3HiD232zqscIz5iB8ppJwb380+OGI=
 github.com/libp2p/go-libp2p-kbucket v0.4.1/go.mod h1:7sCeZx2GkNK1S6lQnGUW5JYZCFPnXzAZCCBBS70lytY=
 github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
-github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
 github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
 github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod h1:jQJ95SXXA/K1VZi13h52WZMa9ja78zjyy5rspMsC/08=
 github.com/libp2p/go-libp2p-mplex v0.1.1/go.mod h1:KUQWpGkCzfV7UIpi8SKsAVxyBgz1c9R5EvxgnwLsb/I=
 github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
 github.com/libp2p/go-libp2p-mplex v0.2.1/go.mod h1:SC99Rxs8Vuzrf/6WhmH41kNn13TiYdAWNYHrwImKLnE=
 github.com/libp2p/go-libp2p-mplex v0.2.2/go.mod h1:74S9eum0tVQdAfFiKxAyKzNdSuLqw5oadDq7+L/FELo=
-github.com/libp2p/go-libp2p-mplex v0.2.3 h1:2zijwaJvpdesST2MXpI5w9wWFRgYtMcpRX7rrw0jmOo=
 github.com/libp2p/go-libp2p-mplex v0.2.3/go.mod h1:CK3p2+9qH9x+7ER/gWWDYJ3QW5ZxWDkm+dVvjfuG3ek=
 github.com/libp2p/go-libp2p-nat v0.0.2/go.mod h1:QrjXQSD5Dj4IJOdEcjHRkWTSomyxRo6HnUkf/TfQpLQ=
 github.com/libp2p/go-libp2p-nat v0.0.4/go.mod h1:N9Js/zVtAXqaeT99cXgTV9e75KpnWCvVOiGzlcHmBbY=
 github.com/libp2p/go-libp2p-nat v0.0.5/go.mod h1:1qubaE5bTZMJE+E/uu2URroMbzdubFz1ChgiN79yKPE=
-github.com/libp2p/go-libp2p-nat v0.0.6 h1:wMWis3kYynCbHoyKLPBEMu4YRLltbm8Mk08HGSfvTkU=
 github.com/libp2p/go-libp2p-nat v0.0.6/go.mod h1:iV59LVhB3IkFvS6S6sauVTSOrNEANnINbI/fkaLimiw=
 github.com/libp2p/go-libp2p-net v0.0.1/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
 github.com/libp2p/go-libp2p-net v0.0.2/go.mod h1:Yt3zgmlsHOgUWSXmt5V/Jpz9upuJBE8EgNU9DrCcR8c=
@@ -626,7 +565,6 @@ github.com/libp2p/go-libp2p-netutil v0.0.1/go.mod h1:GdusFvujWZI9Vt0X5BKqwWWmZFx
 github.com/libp2p/go-libp2p-netutil v0.1.0/go.mod h1:3Qv/aDqtMLTUyQeundkKsA+YCThNdbQD54k3TqjpbFU=
 github.com/libp2p/go-libp2p-peer v0.0.1/go.mod h1:nXQvOBbwVqoP+T5Y5nCjeH4sP9IX/J0AMzcDUVruVoo=
 github.com/libp2p/go-libp2p-peer v0.1.1/go.mod h1:jkF12jGB4Gk/IOo+yomm+7oLWxF278F7UnrYUQ1Q8es=
-github.com/libp2p/go-libp2p-peer v0.2.0 h1:EQ8kMjaCUwt/Y5uLgjT8iY2qg0mGUT0N1zUjer50DsY=
 github.com/libp2p/go-libp2p-peer v0.2.0/go.mod h1:RCffaCvUyW2CJmG2gAWVqwePwW7JMgxjsHm7+J5kjWY=
 github.com/libp2p/go-libp2p-peerstore v0.0.1/go.mod h1:RabLyPVJLuNQ+GFyoEkfi8H4Ti6k/HtZJ7YKgtSq+20=
 github.com/libp2p/go-libp2p-peerstore v0.0.6/go.mod h1:RabLyPVJLuNQ+GFyoEkfi8H4Ti6k/HtZJ7YKgtSq+20=
@@ -637,25 +575,18 @@ github.com/libp2p/go-libp2p-peerstore v0.1.4/go.mod h1:+4BDbDiiKf4PzpANZDAT+knVd
 github.com/libp2p/go-libp2p-peerstore v0.2.0/go.mod h1:N2l3eVIeAitSg3Pi2ipSrJYnqhVnMNQZo9nkSCuAbnQ=
 github.com/libp2p/go-libp2p-peerstore v0.2.1/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
 github.com/libp2p/go-libp2p-peerstore v0.2.2/go.mod h1:NQxhNjWxf1d4w6PihR8btWIRjwRLBr4TYKfNgrUkOPA=
-github.com/libp2p/go-libp2p-peerstore v0.2.3 h1:MofRq2l3c15vQpEygTetV+zRRrncz+ktiXW7H2EKoEQ=
 github.com/libp2p/go-libp2p-peerstore v0.2.3/go.mod h1:K8ljLdFn590GMttg/luh4caB/3g0vKuY01psze0upRw=
-github.com/libp2p/go-libp2p-pnet v0.2.0 h1:J6htxttBipJujEjz1y0a5+eYoiPcFHhSYHH6na5f0/k=
 github.com/libp2p/go-libp2p-pnet v0.2.0/go.mod h1:Qqvq6JH/oMZGwqs3N1Fqhv8NVhrdYcO0BW4wssv21LA=
 github.com/libp2p/go-libp2p-protocol v0.0.1/go.mod h1:Af9n4PiruirSDjHycM1QuiMi/1VZNHYcK8cLgFJLZ4s=
 github.com/libp2p/go-libp2p-protocol v0.1.0/go.mod h1:KQPHpAabB57XQxGrXCNvbL6UEXfQqUgC/1adR2Xtflk=
 github.com/libp2p/go-libp2p-pubsub v0.2.5/go.mod h1:9Q2RRq8ofXkoewORcyVlgUFDKLKw7BuYSlJVWRcVk3Y=
-github.com/libp2p/go-libp2p-pubsub v0.2.7 h1:PBuK5+NfWsoaoEaAUZ7YQPETQh8UqBi8CbMJ1CZ5sNI=
 github.com/libp2p/go-libp2p-pubsub v0.2.7/go.mod h1:R4R0kH/6p2vu8O9xsue0HNSjEuXMEPBgg4h3nVDI15o=
-github.com/libp2p/go-libp2p-pubsub-router v0.2.1 h1:F5JYaHQuuMKVbSgLsH2POQwT1rloWpc7fUCOq6PBjyE=
 github.com/libp2p/go-libp2p-pubsub-router v0.2.1/go.mod h1:cl46APmxgKgzgpCGFb8Ns7++cqnJ29CxESXCQATp55k=
-github.com/libp2p/go-libp2p-quic-transport v0.3.7 h1:F9hxonkJvMipNim8swrvRk2uL9s8pqzHz0M6eMf8L58=
 github.com/libp2p/go-libp2p-quic-transport v0.3.7/go.mod h1:Kr4aDtnfHHNeENn5J+sZIVc+t8HpQn9W6BOxhVGHbgI=
 github.com/libp2p/go-libp2p-record v0.0.1/go.mod h1:grzqg263Rug/sRex85QrDOLntdFAymLDLm7lxMgU79Q=
 github.com/libp2p/go-libp2p-record v0.1.0/go.mod h1:ujNc8iuE5dlKWVy6wuL6dd58t0n7xI4hAIl8pE6wu5Q=
-github.com/libp2p/go-libp2p-record v0.1.2 h1:M50VKzWnmUrk/M5/Dz99qO9Xh4vs8ijsK+7HkJvRP+0=
 github.com/libp2p/go-libp2p-record v0.1.2/go.mod h1:pal0eNcT5nqZaTV7UGhqeGqxFgGdsU/9W//C8dqjQDk=
 github.com/libp2p/go-libp2p-routing v0.0.1/go.mod h1:N51q3yTr4Zdr7V8Jt2JIktVU+3xBBylx1MZeVA6t1Ys=
-github.com/libp2p/go-libp2p-routing-helpers v0.2.3 h1:xY61alxJ6PurSi+MXbywZpelvuU4U4p/gPTxjqCqTzY=
 github.com/libp2p/go-libp2p-routing-helpers v0.2.3/go.mod h1:795bh+9YeoFl99rMASoiVgHdi5bjack0N1+AFAdbvBw=
 github.com/libp2p/go-libp2p-secio v0.0.1/go.mod h1:IdG6iQybdcYmbTzxp4J5dwtUEDTOvZrT0opIDVNPrJs=
 github.com/libp2p/go-libp2p-secio v0.0.3/go.mod h1:hS7HQ00MgLhRO/Wyu1bTX6ctJKhVpm+j2/S2A5UqYb0=
@@ -663,14 +594,12 @@ github.com/libp2p/go-libp2p-secio v0.1.0/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBg
 github.com/libp2p/go-libp2p-secio v0.1.1/go.mod h1:tMJo2w7h3+wN4pgU2LSYeiKPrfqBgkOsdiKK77hE7c8=
 github.com/libp2p/go-libp2p-secio v0.2.0/go.mod h1:2JdZepB8J5V9mBp79BmwsaPQhRPNN2NrnB2lKQcdy6g=
 github.com/libp2p/go-libp2p-secio v0.2.1/go.mod h1:cWtZpILJqkqrSkiYcDBh5lA3wbT2Q+hz3rJQq3iftD8=
-github.com/libp2p/go-libp2p-secio v0.2.2 h1:rLLPvShPQAcY6eNurKNZq3eZjPWfU9kXF2eI9jIYdrg=
 github.com/libp2p/go-libp2p-secio v0.2.2/go.mod h1:wP3bS+m5AUnFA+OFO7Er03uO1mncHG0uVwGrwvjYlNY=
 github.com/libp2p/go-libp2p-swarm v0.0.1/go.mod h1:mh+KZxkbd3lQnveQ3j2q60BM1Cw2mX36XXQqwfPOShs=
 github.com/libp2p/go-libp2p-swarm v0.0.6/go.mod h1:s5GZvzg9xXe8sbeESuFpjt8CJPTCa8mhEusweJqyFy8=
 github.com/libp2p/go-libp2p-swarm v0.1.0/go.mod h1:wQVsCdjsuZoc730CgOvh5ox6K8evllckjebkdiY5ta4=
 github.com/libp2p/go-libp2p-swarm v0.1.1/go.mod h1:4NVJaLwq/dr5kEq79Jo6pMin7ZFwLx73ln1FTefR91Q=
 github.com/libp2p/go-libp2p-swarm v0.2.2/go.mod h1:fvmtQ0T1nErXym1/aa1uJEyN7JzaTNyBcHImCxRpPKU=
-github.com/libp2p/go-libp2p-swarm v0.2.3 h1:uVkCb8Blfg7HQ/f30TyHn1g/uCwXsAET7pU0U59gx/A=
 github.com/libp2p/go-libp2p-swarm v0.2.3/go.mod h1:P2VO/EpxRyDxtChXz/VPVXyTnszHvokHKRhfkEgFKNM=
 github.com/libp2p/go-libp2p-testing v0.0.1/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
 github.com/libp2p/go-libp2p-testing v0.0.2/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
@@ -678,7 +607,6 @@ github.com/libp2p/go-libp2p-testing v0.0.3/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MB
 github.com/libp2p/go-libp2p-testing v0.0.4/go.mod h1:gvchhf3FQOtBdr+eFUABet5a4MBLK8jM3V4Zghvmi+E=
 github.com/libp2p/go-libp2p-testing v0.1.0/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
 github.com/libp2p/go-libp2p-testing v0.1.1/go.mod h1:xaZWMJrPUM5GlDBxCeGUi7kI4eqnjVyavGroI2nxEM0=
-github.com/libp2p/go-libp2p-tls v0.1.3 h1:twKMhMu44jQO+HgQK9X8NHO5HkeJu2QbhLzLJpa8oNM=
 github.com/libp2p/go-libp2p-tls v0.1.3/go.mod h1:wZfuewxOndz5RTnCAxFliGjvYSDA40sKitV4c50uI1M=
 github.com/libp2p/go-libp2p-transport v0.0.1/go.mod h1:UzbUs9X+PHOSw7S3ZmeOxfnwaQY5vGDzZmKPod3N3tk=
 github.com/libp2p/go-libp2p-transport v0.0.4/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwqKXWUMWU7Rfcsubee/A=
@@ -686,7 +614,6 @@ github.com/libp2p/go-libp2p-transport v0.0.5/go.mod h1:StoY3sx6IqsP6XKoabsPnHCwq
 github.com/libp2p/go-libp2p-transport-upgrader v0.0.1/go.mod h1:NJpUAgQab/8K6K0m+JmZCe5RUXG10UMEx4kWe9Ipj5c=
 github.com/libp2p/go-libp2p-transport-upgrader v0.0.4/go.mod h1:RGq+tupk+oj7PzL2kn/m1w6YXxcIAYJYeI90h6BGgUc=
 github.com/libp2p/go-libp2p-transport-upgrader v0.1.1/go.mod h1:IEtA6or8JUbsV07qPW4r01GnTenLW4oi3lOPbUMGJJA=
-github.com/libp2p/go-libp2p-transport-upgrader v0.2.0 h1:5EhPgQhXZNyfL22ERZTUoVp9UVVbNowWNVtELQaKCHk=
 github.com/libp2p/go-libp2p-transport-upgrader v0.2.0/go.mod h1:mQcrHj4asu6ArfSoMuyojOdjx73Q47cYD7s5+gZOlns=
 github.com/libp2p/go-libp2p-yamux v0.1.2/go.mod h1:xUoV/RmYkg6BW/qGxA9XJyg+HzXFYkeXbnhjmnYzKp8=
 github.com/libp2p/go-libp2p-yamux v0.1.3/go.mod h1:VGSQVrqkh6y4nm0189qqxMtvyBft44MOYYPpYKXiVt4=
@@ -694,38 +621,30 @@ github.com/libp2p/go-libp2p-yamux v0.2.0/go.mod h1:Db2gU+XfLpm6E4rG5uGCFX6uXA8ME
 github.com/libp2p/go-libp2p-yamux v0.2.1/go.mod h1:1FBXiHDk1VyRM1C0aez2bCfHQ4vMZKkAQzZbkSQt5fI=
 github.com/libp2p/go-libp2p-yamux v0.2.2/go.mod h1:lIohaR0pT6mOt0AZ0L2dFze9hds9Req3OfS+B+dv4qw=
 github.com/libp2p/go-libp2p-yamux v0.2.5/go.mod h1:Zpgj6arbyQrmZ3wxSZxfBmbdnWtbZ48OpsfmQVTErwA=
-github.com/libp2p/go-libp2p-yamux v0.2.7 h1:vzKu0NVtxvEIDGCv6mjKRcK0gipSgaXmJZ6jFv0d/dk=
 github.com/libp2p/go-libp2p-yamux v0.2.7/go.mod h1:X28ENrBMU/nm4I3Nx4sZ4dgjZ6VhLEn0XhIoZ5viCwU=
 github.com/libp2p/go-maddr-filter v0.0.1/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
 github.com/libp2p/go-maddr-filter v0.0.4/go.mod h1:6eT12kSQMA9x2pvFQa+xesMKUBlj9VImZbj3B9FBH/Q=
-github.com/libp2p/go-maddr-filter v0.0.5 h1:CW3AgbMO6vUvT4kf87y4N+0P8KUl2aqLYhrGyDUbLSg=
 github.com/libp2p/go-maddr-filter v0.0.5/go.mod h1:Jk+36PMfIqCJhAnaASRH83bdAvfDRp/w6ENFaC9bG+M=
 github.com/libp2p/go-mplex v0.0.1/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
 github.com/libp2p/go-mplex v0.0.3/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
 github.com/libp2p/go-mplex v0.0.4/go.mod h1:pK5yMLmOoBR1pNCqDlA2GQrdAVTMkqFalaTWe7l4Yd0=
 github.com/libp2p/go-mplex v0.1.0/go.mod h1:SXgmdki2kwCUlCCbfGLEgHjC4pFqhTp0ZoV6aiKgxDU=
 github.com/libp2p/go-mplex v0.1.1/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
-github.com/libp2p/go-mplex v0.1.2 h1:qOg1s+WdGLlpkrczDqmhYzyk3vCfsQ8+RxRTQjOZWwI=
 github.com/libp2p/go-mplex v0.1.2/go.mod h1:Xgz2RDCi3co0LeZfgjm4OgUF15+sVR8SRcu3SFXI1lk=
 github.com/libp2p/go-msgio v0.0.1/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.2/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-msgio v0.0.3/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
-github.com/libp2p/go-msgio v0.0.4 h1:agEFehY3zWJFUHK6SEMR7UYmk2z6kC3oeCM7ybLhguA=
 github.com/libp2p/go-msgio v0.0.4/go.mod h1:63lBBgOTDKQL6EWazRMCwXsEeEeK9O2Cd+0+6OOuipQ=
 github.com/libp2p/go-nat v0.0.3/go.mod h1:88nUEt0k0JD45Bk93NIwDqjlhiOwOoV36GchpcVc1yI=
 github.com/libp2p/go-nat v0.0.4/go.mod h1:Nmw50VAvKuk38jUBcmNh6p9lUJLoODbJRvYAa/+KSDo=
-github.com/libp2p/go-nat v0.0.5 h1:qxnwkco8RLKqVh1NmjQ+tJ8p8khNLFxuElYG/TwqW4Q=
 github.com/libp2p/go-nat v0.0.5/go.mod h1:B7NxsVNPZmRLvMOwiEO1scOSyjA56zxYAGv1yQgRkEU=
-github.com/libp2p/go-netroute v0.1.2 h1:UHhB35chwgvcRI392znJA3RCBtZ3MpE3ahNCN5MR4Xg=
 github.com/libp2p/go-netroute v0.1.2/go.mod h1:jZLDV+1PE8y5XxBySEBgbuVAXbhtuHSdmLPL2n9MKbk=
 github.com/libp2p/go-openssl v0.0.2/go.mod h1:v8Zw2ijCSWBQi8Pq5GAixw6DbFfa9u6VIYDXnvOXkc0=
 github.com/libp2p/go-openssl v0.0.3/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
 github.com/libp2p/go-openssl v0.0.4/go.mod h1:unDrJpgy3oFr+rqXsarWifmJuNnJR4chtO1HmaZjggc=
-github.com/libp2p/go-reuseport v0.0.1 h1:7PhkfH73VXfPJYKQ6JwS5I/eVcoyYi9IMNGc6FWpFLw=
 github.com/libp2p/go-reuseport v0.0.1/go.mod h1:jn6RmB1ufnQwl0Q1f+YxAj8isJgDCQzaaxIFYDhcYEA=
 github.com/libp2p/go-reuseport-transport v0.0.1/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
 github.com/libp2p/go-reuseport-transport v0.0.2/go.mod h1:YkbSDrvjUVDL6b8XqriyA20obEtsW9BLkuOUyQAOCbs=
-github.com/libp2p/go-reuseport-transport v0.0.3 h1:zzOeXnTooCkRvoH+bSXEfXhn76+LAiwoneM0gnXjF2M=
 github.com/libp2p/go-reuseport-transport v0.0.3/go.mod h1:Spv+MPft1exxARzP2Sruj2Wb5JSyHNncjf1Oi2dEbzM=
 github.com/libp2p/go-sockaddr v0.0.2/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
 github.com/libp2p/go-sockaddr v0.1.0/go.mod h1:syPvOmNs24S3dFVGJA1/mrqdeijPxLV2Le3BRLKd68k=
@@ -734,13 +653,11 @@ github.com/libp2p/go-stream-muxer v0.0.1/go.mod h1:bAo8x7YkSpadMTbtTaxGVHWUQsR/l
 github.com/libp2p/go-stream-muxer v0.1.0/go.mod h1:8JAVsjeRBCWwPoZeH0W1imLOcriqXJyFvB0mR4A04sQ=
 github.com/libp2p/go-stream-muxer-multistream v0.1.1/go.mod h1:zmGdfkQ1AzOECIAcccoL8L//laqawOsO03zX8Sa+eGw=
 github.com/libp2p/go-stream-muxer-multistream v0.2.0/go.mod h1:j9eyPol/LLRqT+GPLSxvimPhNph4sfYfMoDPd7HkzIc=
-github.com/libp2p/go-stream-muxer-multistream v0.3.0 h1:TqnSHPJEIqDEO7h1wZZ0p3DXdvDSiLHQidKKUGZtiOY=
 github.com/libp2p/go-stream-muxer-multistream v0.3.0/go.mod h1:yDh8abSIzmZtqtOt64gFJUXEryejzNb0lisTt+fAMJA=
 github.com/libp2p/go-tcp-transport v0.0.1/go.mod h1:mnjg0o0O5TmXUaUIanYPUqkW4+u6mK0en8rlpA6BBTs=
 github.com/libp2p/go-tcp-transport v0.0.4/go.mod h1:+E8HvC8ezEVOxIo3V5vCK9l1y/19K427vCzQ+xHKH/o=
 github.com/libp2p/go-tcp-transport v0.1.0/go.mod h1:oJ8I5VXryj493DEJ7OsBieu8fcg2nHGctwtInJVpipc=
 github.com/libp2p/go-tcp-transport v0.1.1/go.mod h1:3HzGvLbx6etZjnFlERyakbaYPdfjg2pWP97dFZworkY=
-github.com/libp2p/go-tcp-transport v0.2.0 h1:YoThc549fzmNJIh7XjHVtMIFaEDRtIrtWciG5LyYAPo=
 github.com/libp2p/go-tcp-transport v0.2.0/go.mod h1:vX2U0CnWimU4h0SGSEsg++AzvBcroCGYw28kh94oLe0=
 github.com/libp2p/go-testutil v0.0.1/go.mod h1:iAcJc/DKJQanJ5ws2V+u5ywdL2n12X1WbbEG+Jjy69I=
 github.com/libp2p/go-testutil v0.1.0/go.mod h1:81b2n5HypcVyrCg/MJx4Wgfp/VHojytjVe/gLzZ2Ehc=
@@ -749,16 +666,13 @@ github.com/libp2p/go-ws-transport v0.0.5/go.mod h1:Qbl4BxPfXXhhd/o0wcrgoaItHqA9t
 github.com/libp2p/go-ws-transport v0.1.0/go.mod h1:rjw1MG1LU9YDC6gzmwObkPd/Sqwhw7yT74kj3raBFuo=
 github.com/libp2p/go-ws-transport v0.2.0/go.mod h1:9BHJz/4Q5A9ludYWKoGCFC5gUElzlHoKzu0yY9p/klM=
 github.com/libp2p/go-ws-transport v0.3.0/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
-github.com/libp2p/go-ws-transport v0.3.1 h1:ZX5rWB8nhRRJVaPO6tmkGI/Xx8XNboYX20PW5hXIscw=
 github.com/libp2p/go-ws-transport v0.3.1/go.mod h1:bpgTJmRZAvVHrgHybCVyqoBmyLQ1fiZuEaBYusP5zsk=
 github.com/libp2p/go-yamux v1.2.1/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
 github.com/libp2p/go-yamux v1.2.2/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
 github.com/libp2p/go-yamux v1.2.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
 github.com/libp2p/go-yamux v1.3.0/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
 github.com/libp2p/go-yamux v1.3.3/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/libp2p/go-yamux v1.3.5 h1:ibuz4naPAully0pN6J/kmUARiqLpnDQIzI/8GCOrljg=
 github.com/libp2p/go-yamux v1.3.5/go.mod h1:FGTiPvoV/3DVdgWpX+tM0OW3tsM+W5bSE3gZwqQTcow=
-github.com/lucas-clemente/quic-go v0.15.7 h1:Pu7To5/G9JoP1mwlrcIvfV8ByPBlCzif3MCl8+1W83I=
 github.com/lucas-clemente/quic-go v0.15.7/go.mod h1:Myi1OyS0FOjL3not4BxT7KN29bRkcMUV5JVVFLKtDp8=
 github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
@@ -767,7 +681,6 @@ github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI=
-github.com/marten-seemann/qtls v0.9.1 h1:O0YKQxNVPaiFgMng0suWEOY2Sb4LT2sRn9Qimq3Z1IQ=
 github.com/marten-seemann/qtls v0.9.1/go.mod h1:T1MmAdDPyISzxlK6kjRr0pcZFBVd1OZbBb/j3cvzHhk=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -788,6 +701,7 @@ github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
 github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -795,7 +709,6 @@ github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00v
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.4/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.12/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.28 h1:gQhy5bsJa8zTlVI8lywCTZp1lguor+xevFoYlzeCTQY=
 github.com/miekg/dns v1.1.28/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1 h1:lYpkrQH5ajf0OXOcUbGjvZxxijuBwbbmlSxLiuofa+g=
 github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
@@ -807,7 +720,6 @@ github.com/minio/sha256-simd v0.1.1 h1:5QHSlgo3nt5yKOJrC7W8w7X+NFl8cMPZm96iu8kKU
 github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
@@ -832,15 +744,12 @@ github.com/multiformats/go-multiaddr v0.0.4/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lg
 github.com/multiformats/go-multiaddr v0.1.0/go.mod h1:xKVEak1K9cS1VdmPZW3LSIb6lgmoS58qz/pzqmAxV44=
 github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
 github.com/multiformats/go-multiaddr v0.2.0/go.mod h1:0nO36NvPpyV4QzvTLi/lafl2y95ncPj0vFwVF6k6wJ4=
-github.com/multiformats/go-multiaddr v0.2.1 h1:SgG/cw5vqyB5QQe5FPe2TqggU9WtrA9X4nZw7LlVqOI=
 github.com/multiformats/go-multiaddr v0.2.1/go.mod h1:s/Apk6IyxfvMjDafnhJgJ3/46z7tZ04iMk5wP4QMGGE=
 github.com/multiformats/go-multiaddr-dns v0.0.1/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
 github.com/multiformats/go-multiaddr-dns v0.0.2/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
 github.com/multiformats/go-multiaddr-dns v0.0.3/go.mod h1:9kWcqw/Pj6FwxAwW38n/9403szc57zJPs45fmnznu3Q=
-github.com/multiformats/go-multiaddr-dns v0.2.0 h1:YWJoIDwLePniH7OU5hBnDZV6SWuvJqJ0YtN6pLeH9zA=
 github.com/multiformats/go-multiaddr-dns v0.2.0/go.mod h1:TJ5pr5bBO7Y1B18djPuRsVkduhQH2YqYSbxWJzYGdK0=
 github.com/multiformats/go-multiaddr-fmt v0.0.1/go.mod h1:aBYjqL4T/7j4Qx+R73XSv/8JsgnRFlf0w2KGLCmXl3Q=
-github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
 github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
 github.com/multiformats/go-multiaddr-net v0.0.1/go.mod h1:nw6HSxNmCIQH27XPGBuX+d1tnvM7ihcFwHMSstNAVUU=
 github.com/multiformats/go-multiaddr-net v0.1.0/go.mod h1:5JNbcfBOP4dnhoZOv10JJVkJO0pCCEf8mTnipAo2UZQ=
@@ -848,7 +757,6 @@ github.com/multiformats/go-multiaddr-net v0.1.1/go.mod h1:5JNbcfBOP4dnhoZOv10JJV
 github.com/multiformats/go-multiaddr-net v0.1.2/go.mod h1:QsWt3XK/3hwvNxZJp92iMQKME1qHfpYmyIjFVsSOY6Y=
 github.com/multiformats/go-multiaddr-net v0.1.3/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multiaddr-net v0.1.4/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
-github.com/multiformats/go-multiaddr-net v0.1.5 h1:QoRKvu0xHN1FCFJcMQLbG/yQE2z441L5urvG3+qyz7g=
 github.com/multiformats/go-multiaddr-net v0.1.5/go.mod h1:ilNnaM9HbmVFqsb/qcNysjCu4PVONlrBZpHIrw/qQuA=
 github.com/multiformats/go-multibase v0.0.1/go.mod h1:bja2MqRZ3ggyXtZSEDKpl0uO/gviWFaSteVbWT51qgs=
 github.com/multiformats/go-multibase v0.0.2 h1:2pAgScmS1g9XjH7EtAfNhTuyrWYEWcxy0G5Wo85hWDA=
@@ -865,7 +773,6 @@ github.com/multiformats/go-multihash v0.0.13/go.mod h1:VdAWLKTwram9oKAatUcLxBNUj
 github.com/multiformats/go-multistream v0.0.1/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
 github.com/multiformats/go-multistream v0.0.4/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
 github.com/multiformats/go-multistream v0.1.0/go.mod h1:fJTiDfXJVmItycydCnNx4+wSzZ5NwG2FEVAI30fiovg=
-github.com/multiformats/go-multistream v0.1.1 h1:JlAdpIFhBhGRLxe9W6Om0w++Gd6KMWoFPZL/dEnm9nI=
 github.com/multiformats/go-multistream v0.1.1/go.mod h1:KmHZ40hzVxiaiwlj3MEbYgK9JFk2/9UktWZAF54Du38=
 github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
 github.com/multiformats/go-varint v0.0.2/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
@@ -910,9 +817,9 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
-github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14 h1:2m16U/rLwVaRdz7ANkHtHTodP3zTP3N451MADg64x5k=
 github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
@@ -980,10 +887,12 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 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/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 v0.0.0-20190710185942-9d28bd7c0945/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
@@ -1022,6 +931,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
@@ -1039,18 +949,18 @@ github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljT
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 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/go-ethereum v1.9.11-statediff-0.0.2 h1:ebv2bWocCmNKGnpHtRjSWoTpkgyEbRBb028PanH43H8=
-github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.2/go.mod h1:7oC0Ni6dosMv5pxMigm6s0hN8g4haJMBnqmmo0D9YfQ=
+github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.5 h1:U+BqhjRLR22e9OEm8cgWC3Eq3bh8G6azjNpXeenfCG4=
+github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.5/go.mod h1:7oC0Ni6dosMv5pxMigm6s0hN8g4haJMBnqmmo0D9YfQ=
+github.com/vulcanize/ipld-eth-indexer v0.2.0-alpha h1:+XVaC7TsA0K278YWpfqdrNxwgC6hY6fBaN8w2/e1Lts=
+github.com/vulcanize/ipld-eth-indexer v0.2.0-alpha/go.mod h1:SuMBscFfcBHYlQuzDDd4by+R0S3gaAFjrOU+uQfAefE=
+github.com/vulcanize/pg-ipfs-ethdb v0.0.1-alpha h1:Y7j0Hw1jgVVOg+eUGUr7OgH+gOBID0DwbsfZV1KoL7I=
+github.com/vulcanize/pg-ipfs-ethdb v0.0.1-alpha/go.mod h1:OuqE4r2LGWAtDVx3s1yaAzDcwy+LEAqrWaE1L8UfrGY=
 github.com/wangjia184/sortedset v0.0.0-20160527075905-f5d03557ba30/go.mod h1:YkocrP2K2tcw938x9gCOmT5G5eCD6jsTz0SZuyAqwIE=
 github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
 github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=
-github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc h1:BCPnHtcboadS0DvysUuJXZ4lWVv5Bh5i7+tbIyi+ck4=
 github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM=
-github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158 h1:WXhVOwj2USAXB5oMDwRl3piOux2XMV9TANaYxXHdkoE=
 github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI=
-github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E=
 github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8=
-github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 h1:EKhdznlJHPMoKr0XTrX+IlJs1LH3lyx2nfr1dOlZ79k=
 github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1/go.mod h1:8UvriyWtv5Q5EOgjHaSseUEdkQfvwFv1I/In/O2M9gc=
 github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc/go.mod h1:bopw91TMyo8J3tvftk8xmU2kPmlrt4nScJQZU2hE5EM=
 github.com/whyrusleeping/go-logging v0.0.1/go.mod h1:lDPYj54zutzG1XYfHAhcc7oNXEburHQBn+Iqd4yS4vE=
@@ -1060,15 +970,11 @@ github.com/whyrusleeping/go-smux-multistream v2.0.2+incompatible/go.mod h1:dRWHH
 github.com/whyrusleeping/go-smux-yamux v2.0.8+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI=
 github.com/whyrusleeping/go-smux-yamux v2.0.9+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI=
 github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1/go.mod h1:tKH72zYNt/exx6/5IQO6L9LoQ0rEjd5SbbWaDTs9Zso=
-github.com/whyrusleeping/mafmt v1.2.8 h1:TCghSl5kkwEE0j+sU/gudyhVMRlpBin8fMBBHg59EbA=
 github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA=
 github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
-github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9 h1:Y1/FEOpaCpD21WxrmfeIYCFPuVPRCY2XZTWzTNHGw30=
 github.com/whyrusleeping/mdns v0.0.0-20190826153040-b9b60ed33aa9/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4=
-github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds=
 github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI=
 github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c/go.mod h1:xxcJeBb7SIUl/Wzkz1eVKJE/CB34YNrqX2TQI6jY9zs=
-github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee h1:lYbXeSvJi5zk5GLKVuid9TVjS9a0OmLIDKTfoZBL6Ow=
 github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee/go.mod h1:m2aV4LZI4Aez7dP5PMyVKEHhUyEJ/RjmPEDOpDvudHg=
 github.com/whyrusleeping/yamux v1.1.5/go.mod h1:E8LnQQ8HKx5KD29HZFUwM1PxCOdPRzGwur1mcYhXcD8=
 github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208 h1:1cngl9mPEoITZG8s8cVcUy5CeIBYhEESkOB7m6Gmkrk=
@@ -1082,15 +988,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/dig v1.9.0 h1:pJTDXKEhRqBI8W7rU7kwT5EgyRZuSMVSFcZolOvKK9U=
 go.uber.org/dig v1.9.0/go.mod h1:X34SnWGr8Fyla9zQNO2GSO2D+TIuqB14OS8JhYocIyw=
-go.uber.org/fx v1.12.0 h1:+1+3Cz9M0dFMPy9SW9XUIUHye8bnPUm7q7DroNGWYG4=
 go.uber.org/fx v1.12.0/go.mod h1:egT3Kyg1JFYQkvKLZ3EsykxkNrZxgXS+gKoKo7abERY=
 go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI=
 go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
@@ -1098,12 +1001,12 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
 go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
-go4.org v0.0.0-20200104003542-c7e774b10ea0 h1:M6XsnQeLwG+rHQ+/rrGh3puBI3WZEy9TBWmf2H+enQA=
 go4.org v0.0.0-20200104003542-c7e774b10ea0/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1144,6 +1047,7 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -1272,6 +1176,7 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191114200427-caa0b0f7d508/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216052735-49a3e744a425 h1:VvQyQJN0tSuecqgcIxMWnnfG5kSmgy9KZR9sW3W5QeA=
 golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1290,6 +1195,7 @@ google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -1321,6 +1227,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
@@ -1328,6 +1235,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/olebedev/go-duktape.v3 v3.0.0-20190213234257-ec84240a7772/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -1351,6 +1259,7 @@ honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
@@ -1,9 +1,24 @@
+// Copyright © 2020 Vulcanize, Inc
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
 package main

 import (
-	"github.com/vulcanize/ipfs-blockchain-watcher/cmd"
-
 	"github.com/sirupsen/logrus"
+
+	"github.com/vulcanize/ipld-eth-server/cmd"
 )

 func main() {
@@ -1,35 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	"io/ioutil"
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/sirupsen/logrus"
-)
-
-func TestBTCSuperNode(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Super Node BTC Suite Test")
-}
-
-var _ = BeforeSuite(func() {
-	logrus.SetOutput(ioutil.Discard)
-})
@@ -1,302 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"database/sql"
-	"fmt"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/jmoiron/sqlx"
-	"github.com/lib/pq"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-blockchain-watcher/utils"
-)
-
-// CIDRetriever satisfies the CIDRetriever interface for bitcoin
-type CIDRetriever struct {
-	db *postgres.DB
-}
-
-// NewCIDRetriever returns a pointer to a new CIDRetriever which supports the CIDRetriever interface
-func NewCIDRetriever(db *postgres.DB) *CIDRetriever {
-	return &CIDRetriever{
-		db: db,
-	}
-}
-
-// RetrieveFirstBlockNumber is used to retrieve the first block number in the db
-func (bcr *CIDRetriever) RetrieveFirstBlockNumber() (int64, error) {
-	var blockNumber int64
-	err := bcr.db.Get(&blockNumber, "SELECT block_number FROM btc.header_cids ORDER BY block_number ASC LIMIT 1")
-	return blockNumber, err
-}
-
-// RetrieveLastBlockNumber is used to retrieve the latest block number in the db
-func (bcr *CIDRetriever) RetrieveLastBlockNumber() (int64, error) {
-	var blockNumber int64
-	err := bcr.db.Get(&blockNumber, "SELECT block_number FROM btc.header_cids ORDER BY block_number DESC LIMIT 1 ")
-	return blockNumber, err
-}
-
-// Retrieve is used to retrieve all of the CIDs which conform to the passed StreamFilters
-func (bcr *CIDRetriever) Retrieve(filter shared.SubscriptionSettings, blockNumber int64) ([]shared.CIDsForFetching, bool, error) {
-	streamFilter, ok := filter.(*SubscriptionSettings)
-	if !ok {
-		return nil, true, fmt.Errorf("btc retriever expected filter type %T got %T", &SubscriptionSettings{}, filter)
-	}
-	log.Debug("retrieving cids")
-
-	// Begin new db tx
-	tx, err := bcr.db.Beginx()
-	if err != nil {
-		return nil, true, err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	// Retrieve cached header CIDs
-	headers, err := bcr.RetrieveHeaderCIDs(tx, blockNumber)
-	if err != nil {
-		log.Error("header cid retrieval error")
-		return nil, true, err
-	}
-	cws := make([]shared.CIDsForFetching, len(headers))
-	empty := true
-	for i, header := range headers {
-		cw := new(CIDWrapper)
-		cw.BlockNumber = big.NewInt(blockNumber)
-		if !streamFilter.HeaderFilter.Off {
-			cw.Header = header
-			empty = false
-		}
-		// Retrieve cached trx CIDs
-		if !streamFilter.TxFilter.Off {
-			cw.Transactions, err = bcr.RetrieveTxCIDs(tx, streamFilter.TxFilter, header.ID)
-			if err != nil {
-				log.Error("transaction cid retrieval error")
-				return nil, true, err
-			}
-			if len(cw.Transactions) > 0 {
-				empty = false
-			}
-		}
-		cws[i] = cw
-	}
-
-	return cws, empty, err
-}
-
-// RetrieveHeaderCIDs retrieves and returns all of the header cids at the provided blockheight
-func (bcr *CIDRetriever) RetrieveHeaderCIDs(tx *sqlx.Tx, blockNumber int64) ([]HeaderModel, error) {
-	log.Debug("retrieving header cids for block ", blockNumber)
-	headers := make([]HeaderModel, 0)
-	pgStr := `SELECT * FROM btc.header_cids
-				WHERE block_number = $1`
-	return headers, tx.Select(&headers, pgStr, blockNumber)
-}
-
-// RetrieveTxCIDs retrieves and returns all of the trx cids at the provided blockheight that conform to the provided filter parameters
-// also returns the ids for the returned transaction cids
-func (bcr *CIDRetriever) RetrieveTxCIDs(tx *sqlx.Tx, txFilter TxFilter, headerID int64) ([]TxModel, error) {
-	log.Debug("retrieving transaction cids for header id ", headerID)
-	args := make([]interface{}, 0, 3)
-	results := make([]TxModel, 0)
-	id := 1
-	pgStr := fmt.Sprintf(`SELECT transaction_cids.id, transaction_cids.header_id,
- 			transaction_cids.tx_hash, transaction_cids.cid,
- 			transaction_cids.segwit, transaction_cids.witness_hash, transaction_cids.index
- 			FROM btc.transaction_cids, btc.header_cids, btc.tx_inputs, btc.tx_outputs
-			WHERE transaction_cids.header_id = header_cids.id
-			AND tx_inputs.tx_id = transaction_cids.id
-			AND tx_outputs.tx_id = transaction_cids.id
-			AND header_cids.id = $%d`, id)
-	args = append(args, headerID)
-	id++
-	if txFilter.Segwit {
-		pgStr += ` AND transaction_cids.segwit = true`
-	}
-	if txFilter.MultiSig {
-		pgStr += ` AND tx_outputs.required_sigs > 1`
-	}
-	if len(txFilter.WitnessHashes) > 0 {
-		pgStr += fmt.Sprintf(` AND transaction_cids.witness_hash = ANY($%d::VARCHAR(66)[])`, id)
-		args = append(args, pq.Array(txFilter.WitnessHashes))
-		id++
-	}
-	if len(txFilter.Addresses) > 0 {
-		pgStr += fmt.Sprintf(` AND tx_outputs.addresses && $%d::VARCHAR(66)[]`, id)
-		args = append(args, pq.Array(txFilter.Addresses))
-		id++
-	}
-	if len(txFilter.Indexes) > 0 {
-		pgStr += fmt.Sprintf(` AND transaction_cids.index = ANY($%d::INTEGER[])`, id)
-		args = append(args, pq.Array(txFilter.Indexes))
-		id++
-	}
-	if len(txFilter.PkScriptClasses) > 0 {
-		pgStr += fmt.Sprintf(` AND tx_outputs.script_class = ANY($%d::INTEGER[])`, id)
-		args = append(args, pq.Array(txFilter.PkScriptClasses))
-	}
-	return results, tx.Select(&results, pgStr, args...)
-}
-
-// RetrieveGapsInData is used to find the the block numbers at which we are missing data in the db
-func (bcr *CIDRetriever) RetrieveGapsInData(validationLevel int) ([]shared.Gap, error) {
-	log.Info("searching for gaps in the btc super node database")
-	startingBlock, err := bcr.RetrieveFirstBlockNumber()
-	if err != nil {
-		return nil, fmt.Errorf("btc CIDRetriever RetrieveFirstBlockNumber error: %v", err)
-	}
-	var initialGap []shared.Gap
-	if startingBlock != 0 {
-		stop := uint64(startingBlock - 1)
-		log.Infof("found gap at the beginning of the btc sync from 0 to %d", stop)
-		initialGap = []shared.Gap{{
-			Start: 0,
-			Stop:  stop,
-		}}
-	}
-
-	pgStr := `SELECT header_cids.block_number + 1 AS start, min(fr.block_number) - 1 AS stop FROM btc.header_cids
-				LEFT JOIN btc.header_cids r on btc.header_cids.block_number = r.block_number - 1
-				LEFT JOIN btc.header_cids fr on btc.header_cids.block_number < fr.block_number
-				WHERE r.block_number is NULL and fr.block_number IS NOT NULL
-				GROUP BY header_cids.block_number, r.block_number`
-	results := make([]struct {
-		Start uint64 `db:"start"`
-		Stop  uint64 `db:"stop"`
-	}, 0)
-	if err := bcr.db.Select(&results, pgStr); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	emptyGaps := make([]shared.Gap, len(results))
-	for i, res := range results {
-		emptyGaps[i] = shared.Gap{
-			Start: res.Start,
-			Stop:  res.Stop,
-		}
-	}
-
-	// Find sections of blocks where we are below the validation level
-	// There will be no overlap between these "gaps" and the ones above
-	pgStr = `SELECT block_number FROM btc.header_cids
-			WHERE times_validated < $1
-			ORDER BY block_number`
-	var heights []uint64
-	if err := bcr.db.Select(&heights, pgStr, validationLevel); err != nil && err != sql.ErrNoRows {
-		return nil, err
-	}
-	return append(append(initialGap, emptyGaps...), utils.MissingHeightsToGaps(heights)...), nil
-}
-
-// RetrieveBlockByHash returns all of the CIDs needed to compose an entire block, for a given block hash
-func (bcr *CIDRetriever) RetrieveBlockByHash(blockHash common.Hash) (HeaderModel, []TxModel, error) {
-	log.Debug("retrieving block cids for block hash ", blockHash.String())
-
-	// Begin new db tx
-	tx, err := bcr.db.Beginx()
-	if err != nil {
-		return HeaderModel{}, nil, err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	headerCID, err := bcr.RetrieveHeaderCIDByHash(tx, blockHash)
-	if err != nil {
-		log.Error("header cid retrieval error")
-		return HeaderModel{}, nil, err
-	}
-	txCIDs, err := bcr.RetrieveTxCIDsByHeaderID(tx, headerCID.ID)
-	if err != nil {
-		log.Error("tx cid retrieval error")
-	}
-	return headerCID, txCIDs, err
-}
-
-// RetrieveBlockByNumber returns all of the CIDs needed to compose an entire block, for a given block number
-func (bcr *CIDRetriever) RetrieveBlockByNumber(blockNumber int64) (HeaderModel, []TxModel, error) {
-	log.Debug("retrieving block cids for block number ", blockNumber)
-
-	// Begin new db tx
-	tx, err := bcr.db.Beginx()
-	if err != nil {
-		return HeaderModel{}, nil, err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	headerCID, err := bcr.RetrieveHeaderCIDs(tx, blockNumber)
-	if err != nil {
-		log.Error("header cid retrieval error")
-		return HeaderModel{}, nil, err
-	}
-	if len(headerCID) < 1 {
-		return HeaderModel{}, nil, fmt.Errorf("header cid retrieval error, no header CIDs found at block %d", blockNumber)
-	}
-	txCIDs, err := bcr.RetrieveTxCIDsByHeaderID(tx, headerCID[0].ID)
-	if err != nil {
-		log.Error("tx cid retrieval error")
-	}
-	return headerCID[0], txCIDs, err
-}
-
-// RetrieveHeaderCIDByHash returns the header for the given block hash
-func (bcr *CIDRetriever) RetrieveHeaderCIDByHash(tx *sqlx.Tx, blockHash common.Hash) (HeaderModel, error) {
-	log.Debug("retrieving header cids for block hash ", blockHash.String())
-	pgStr := `SELECT * FROM btc.header_cids
-			WHERE block_hash = $1`
-	var headerCID HeaderModel
-	return headerCID, tx.Get(&headerCID, pgStr, blockHash.String())
-}
-
-// RetrieveTxCIDsByHeaderID retrieves all tx CIDs for the given header id
-func (bcr *CIDRetriever) RetrieveTxCIDsByHeaderID(tx *sqlx.Tx, headerID int64) ([]TxModel, error) {
-	log.Debug("retrieving tx cids for block id ", headerID)
-	pgStr := `SELECT * FROM btc.transaction_cids
-			WHERE header_id = $1`
-	var txCIDs []TxModel
-	return txCIDs, tx.Select(&txCIDs, pgStr, headerID)
-}
@@ -1,193 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// Cleaner satisfies the shared.Cleaner interface fo bitcoin
-type Cleaner struct {
-	db *postgres.DB
-}
-
-// NewCleaner returns a new Cleaner struct that satisfies the shared.Cleaner interface
-func NewCleaner(db *postgres.DB) *Cleaner {
-	return &Cleaner{
-		db: db,
-	}
-}
-
-// ResetValidation resets the validation level to 0 to enable revalidation
-func (c *Cleaner) ResetValidation(rngs [][2]uint64) error {
-	tx, err := c.db.Beginx()
-	if err != nil {
-		return err
-	}
-	for _, rng := range rngs {
-		logrus.Infof("btc db cleaner resetting validation level to 0 for block range %d to %d", rng[0], rng[1])
-		pgStr := `UPDATE btc.header_cids
-				SET times_validated = 0
-				WHERE block_number BETWEEN $1 AND $2`
-		if _, err := tx.Exec(pgStr, rng[0], rng[1]); err != nil {
-			shared.Rollback(tx)
-			return err
-		}
-	}
-	return tx.Commit()
-}
-
-// Clean removes the specified data from the db within the provided block range
-func (c *Cleaner) Clean(rngs [][2]uint64, t shared.DataType) error {
-	tx, err := c.db.Beginx()
-	if err != nil {
-		return err
-	}
-	for _, rng := range rngs {
-		logrus.Infof("btc db cleaner cleaning up block range %d to %d", rng[0], rng[1])
-		if err := c.clean(tx, rng, t); err != nil {
-			shared.Rollback(tx)
-			return err
-		}
-	}
-	if err := tx.Commit(); err != nil {
-		return err
-	}
-	logrus.Infof("btc db cleaner vacuum analyzing cleaned tables to free up space from deleted rows")
-	return c.vacuumAnalyze(t)
-}
-
-func (c *Cleaner) clean(tx *sqlx.Tx, rng [2]uint64, t shared.DataType) error {
-	switch t {
-	case shared.Full, shared.Headers:
-		return c.cleanFull(tx, rng)
-	case shared.Transactions:
-		if err := c.cleanTransactionIPLDs(tx, rng); err != nil {
-			return err
-		}
-		return c.cleanTransactionMetaData(tx, rng)
-	default:
-		return fmt.Errorf("btc cleaner unrecognized type: %s", t.String())
-	}
-}
-
-func (c *Cleaner) vacuumAnalyze(t shared.DataType) error {
-	switch t {
-	case shared.Full, shared.Headers:
-		if err := c.vacuumHeaders(); err != nil {
-			return err
-		}
-		if err := c.vacuumTxs(); err != nil {
-			return err
-		}
-		if err := c.vacuumTxInputs(); err != nil {
-			return err
-		}
-		if err := c.vacuumTxOutputs(); err != nil {
-			return err
-		}
-	case shared.Transactions:
-		if err := c.vacuumTxs(); err != nil {
-			return err
-		}
-		if err := c.vacuumTxInputs(); err != nil {
-			return err
-		}
-		if err := c.vacuumTxOutputs(); err != nil {
-			return err
-		}
-	default:
-		return fmt.Errorf("btc cleaner unrecognized type: %s", t.String())
-	}
-	return c.vacuumIPLDs()
-}
-
-func (c *Cleaner) vacuumHeaders() error {
-	_, err := c.db.Exec(`VACUUM ANALYZE btc.header_cids`)
-	return err
-}
-
-func (c *Cleaner) vacuumTxs() error {
-	_, err := c.db.Exec(`VACUUM ANALYZE btc.transaction_cids`)
-	return err
-}
-
-func (c *Cleaner) vacuumTxInputs() error {
-	_, err := c.db.Exec(`VACUUM ANALYZE btc.tx_inputs`)
-	return err
-}
-
-func (c *Cleaner) vacuumTxOutputs() error {
-	_, err := c.db.Exec(`VACUUM ANALYZE btc.tx_outputs`)
-	return err
-}
-
-func (c *Cleaner) vacuumIPLDs() error {
-	_, err := c.db.Exec(`VACUUM ANALYZE public.blocks`)
-	return err
-}
-
-func (c *Cleaner) cleanFull(tx *sqlx.Tx, rng [2]uint64) error {
-	if err := c.cleanTransactionIPLDs(tx, rng); err != nil {
-		return err
-	}
-	if err := c.cleanHeaderIPLDs(tx, rng); err != nil {
-		return err
-	}
-	return c.cleanHeaderMetaData(tx, rng)
-}
-
-func (c *Cleaner) cleanTransactionIPLDs(tx *sqlx.Tx, rng [2]uint64) error {
-	pgStr := `DELETE FROM public.blocks A
-			USING btc.transaction_cids B, btc.header_cids C
-			WHERE A.key = B.cid
-			AND B.header_id = C.id
-			AND C.block_number BETWEEN $1 AND $2`
-	_, err := tx.Exec(pgStr, rng[0], rng[1])
-	return err
-}
-
-func (c *Cleaner) cleanTransactionMetaData(tx *sqlx.Tx, rng [2]uint64) error {
-	pgStr := `DELETE FROM btc.transaction_cids A
-			USING btc.header_cids B
-			WHERE A.header_id = B.id
-			AND B.block_number BETWEEN $1 AND $2`
-	_, err := tx.Exec(pgStr, rng[0], rng[1])
-	return err
-}
-
-func (c *Cleaner) cleanHeaderIPLDs(tx *sqlx.Tx, rng [2]uint64) error {
-	pgStr := `DELETE FROM public.blocks A
-			USING btc.header_cids B
-			WHERE A.key = B.cid
-			AND B.block_number BETWEEN $1 AND $2`
-	_, err := tx.Exec(pgStr, rng[0], rng[1])
-	return err
-}
-
-func (c *Cleaner) cleanHeaderMetaData(tx *sqlx.Tx, rng [2]uint64) error {
-	pgStr := `DELETE FROM btc.header_cids
-			WHERE block_number BETWEEN $1 AND $2`
-	_, err := tx.Exec(pgStr, rng[0], rng[1])
-	return err
-}
@@ -1,340 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/crypto"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-var (
-	// Block 0
-	// header variables
-	blockHash1   = crypto.Keccak256Hash([]byte{00, 02})
-	blocKNumber1 = big.NewInt(0)
-	headerCid1   = "mockHeader1CID"
-	parentHash   = crypto.Keccak256Hash([]byte{00, 01})
-	headerModel1 = btc.HeaderModel{
-		BlockHash:   blockHash1.String(),
-		BlockNumber: blocKNumber1.String(),
-		ParentHash:  parentHash.String(),
-		CID:         headerCid1,
-	}
-
-	// tx variables
-	tx1CID    = "mockTx1CID"
-	tx2CID    = "mockTx2CID"
-	tx1Hash   = crypto.Keccak256Hash([]byte{01, 01})
-	tx2Hash   = crypto.Keccak256Hash([]byte{01, 02})
-	opHash    = crypto.Keccak256Hash([]byte{02, 01})
-	txModels1 = []btc.TxModelWithInsAndOuts{
-		{
-			Index:  0,
-			CID:    tx1CID,
-			TxHash: tx1Hash.String(),
-			SegWit: true,
-			TxInputs: []btc.TxInput{
-				{
-					Index:                 0,
-					TxWitness:             []string{"mockWitness"},
-					SignatureScript:       []byte{01},
-					PreviousOutPointIndex: 0,
-					PreviousOutPointHash:  opHash.String(),
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Index:        0,
-					Value:        50000000,
-					PkScript:     []byte{02},
-					ScriptClass:  0,
-					RequiredSigs: 1,
-				},
-			},
-		},
-		{
-			Index:  1,
-			CID:    tx2CID,
-			TxHash: tx2Hash.String(),
-			SegWit: true,
-		},
-	}
-	mockCIDPayload1 = &btc.CIDPayload{
-		HeaderCID:       headerModel1,
-		TransactionCIDs: txModels1,
-	}
-
-	// Block 1
-	// header variables
-	blockHash2   = crypto.Keccak256Hash([]byte{00, 03})
-	blocKNumber2 = big.NewInt(1)
-	headerCid2   = "mockHeaderCID2"
-	headerModel2 = btc.HeaderModel{
-		BlockNumber: blocKNumber2.String(),
-		BlockHash:   blockHash2.String(),
-		ParentHash:  blockHash1.String(),
-		CID:         headerCid2,
-	}
-
-	// tx variables
-	tx3CID    = "mockTx3CID"
-	tx3Hash   = crypto.Keccak256Hash([]byte{01, 03})
-	txModels2 = []btc.TxModelWithInsAndOuts{
-		{
-			Index:  0,
-			CID:    tx3CID,
-			TxHash: tx3Hash.String(),
-			SegWit: true,
-		},
-	}
-	mockCIDPayload2 = &btc.CIDPayload{
-		HeaderCID:       headerModel2,
-		TransactionCIDs: txModels2,
-	}
-	rngs = [][2]uint64{{0, 1}}
-	cids = []string{
-		headerCid1,
-		headerCid2,
-		tx1CID,
-		tx2CID,
-		tx3CID,
-	}
-	mockData = []byte{'\x01'}
-)
-
-var _ = Describe("Cleaner", func() {
-	var (
-		db      *postgres.DB
-		repo    *btc.CIDIndexer
-		cleaner *btc.Cleaner
-	)
-	BeforeEach(func() {
-		var err error
-		db, err = shared.SetupDB()
-		Expect(err).ToNot(HaveOccurred())
-		repo = btc.NewCIDIndexer(db)
-		cleaner = btc.NewCleaner(db)
-	})
-
-	Describe("Clean", func() {
-		BeforeEach(func() {
-			err := repo.Index(mockCIDPayload1)
-			Expect(err).ToNot(HaveOccurred())
-			err = repo.Index(mockCIDPayload2)
-			Expect(err).ToNot(HaveOccurred())
-
-			for _, cid := range cids {
-				_, err = db.Exec(`INSERT INTO public.blocks (key, data) VALUES ($1, $2)`, cid, mockData)
-				Expect(err).ToNot(HaveOccurred())
-			}
-
-			tx, err := db.Beginx()
-			Expect(err).ToNot(HaveOccurred())
-			var startingIPFSBlocksCount int
-			pgStr := `SELECT COUNT(*) FROM public.blocks`
-			err = tx.Get(&startingIPFSBlocksCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var startingTxCount int
-			pgStr = `SELECT COUNT(*) FROM btc.transaction_cids`
-			err = tx.Get(&startingTxCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var startingHeaderCount int
-			pgStr = `SELECT COUNT(*) FROM btc.header_cids`
-			err = tx.Get(&startingHeaderCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Commit()
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(startingIPFSBlocksCount).To(Equal(5))
-			Expect(startingTxCount).To(Equal(3))
-			Expect(startingHeaderCount).To(Equal(2))
-		})
-		AfterEach(func() {
-			btc.TearDownDB(db)
-		})
-		It("Cleans everything", func() {
-			err := cleaner.Clean(rngs, shared.Full)
-			Expect(err).ToNot(HaveOccurred())
-
-			tx, err := db.Beginx()
-			Expect(err).ToNot(HaveOccurred())
-			var txCount int
-			pgStr := `SELECT COUNT(*) FROM btc.transaction_cids`
-			err = tx.Get(&txCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txInCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_inputs`
-			err = tx.Get(&txInCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txOutCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_outputs`
-			err = tx.Get(&txOutCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var headerCount int
-			pgStr = `SELECT COUNT(*) FROM btc.header_cids`
-			err = tx.Get(&headerCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var blocksCount int
-			pgStr = `SELECT COUNT(*) FROM public.blocks`
-			err = tx.Get(&blocksCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Commit()
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(blocksCount).To(Equal(0))
-			Expect(txCount).To(Equal(0))
-			Expect(txInCount).To(Equal(0))
-			Expect(txOutCount).To(Equal(0))
-			Expect(headerCount).To(Equal(0))
-		})
-		It("Cleans headers and all linked data", func() {
-			err := cleaner.Clean(rngs, shared.Headers)
-			Expect(err).ToNot(HaveOccurred())
-
-			tx, err := db.Beginx()
-			Expect(err).ToNot(HaveOccurred())
-			var txCount int
-			pgStr := `SELECT COUNT(*) FROM btc.transaction_cids`
-			err = tx.Get(&txCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txInCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_inputs`
-			err = tx.Get(&txInCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txOutCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_outputs`
-			err = tx.Get(&txOutCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var headerCount int
-			pgStr = `SELECT COUNT(*) FROM btc.header_cids`
-			err = tx.Get(&headerCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var blocksCount int
-			pgStr = `SELECT COUNT(*) FROM public.blocks`
-			err = tx.Get(&blocksCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Commit()
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(blocksCount).To(Equal(0))
-			Expect(txCount).To(Equal(0))
-			Expect(txInCount).To(Equal(0))
-			Expect(txOutCount).To(Equal(0))
-			Expect(headerCount).To(Equal(0))
-		})
-		It("Cleans transactions", func() {
-			err := cleaner.Clean(rngs, shared.Transactions)
-			Expect(err).ToNot(HaveOccurred())
-
-			tx, err := db.Beginx()
-			Expect(err).ToNot(HaveOccurred())
-			var txCount int
-			pgStr := `SELECT COUNT(*) FROM btc.transaction_cids`
-			err = tx.Get(&txCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txInCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_inputs`
-			err = tx.Get(&txInCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var txOutCount int
-			pgStr = `SELECT COUNT(*) FROM btc.tx_outputs`
-			err = tx.Get(&txOutCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var headerCount int
-			pgStr = `SELECT COUNT(*) FROM btc.header_cids`
-			err = tx.Get(&headerCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			var blocksCount int
-			pgStr = `SELECT COUNT(*) FROM public.blocks`
-			err = tx.Get(&blocksCount, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-
-			err = tx.Commit()
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(blocksCount).To(Equal(2))
-			Expect(txCount).To(Equal(0))
-			Expect(txInCount).To(Equal(0))
-			Expect(txOutCount).To(Equal(0))
-			Expect(headerCount).To(Equal(2))
-		})
-	})
-
-	Describe("ResetValidation", func() {
-		BeforeEach(func() {
-			err := repo.Index(mockCIDPayload1)
-			Expect(err).ToNot(HaveOccurred())
-			err = repo.Index(mockCIDPayload2)
-			Expect(err).ToNot(HaveOccurred())
-
-			var validationTimes []int
-			pgStr := `SELECT times_validated FROM btc.header_cids`
-			err = db.Select(&validationTimes, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(validationTimes)).To(Equal(2))
-			Expect(validationTimes[0]).To(Equal(1))
-			Expect(validationTimes[1]).To(Equal(1))
-
-			err = repo.Index(mockCIDPayload1)
-			Expect(err).ToNot(HaveOccurred())
-
-			validationTimes = []int{}
-			pgStr = `SELECT times_validated FROM btc.header_cids ORDER BY block_number`
-			err = db.Select(&validationTimes, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(validationTimes)).To(Equal(2))
-			Expect(validationTimes[0]).To(Equal(2))
-			Expect(validationTimes[1]).To(Equal(1))
-		})
-		AfterEach(func() {
-			btc.TearDownDB(db)
-		})
-		It("Resets the validation level", func() {
-			err := cleaner.ResetValidation(rngs)
-			Expect(err).ToNot(HaveOccurred())
-
-			var validationTimes []int
-			pgStr := `SELECT times_validated FROM btc.header_cids`
-			err = db.Select(&validationTimes, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(validationTimes)).To(Equal(2))
-			Expect(validationTimes[0]).To(Equal(0))
-			Expect(validationTimes[1]).To(Equal(0))
-
-			err = repo.Index(mockCIDPayload2)
-			Expect(err).ToNot(HaveOccurred())
-
-			validationTimes = []int{}
-			pgStr = `SELECT times_validated FROM btc.header_cids ORDER BY block_number`
-			err = db.Select(&validationTimes, pgStr)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(validationTimes)).To(Equal(2))
-			Expect(validationTimes[0]).To(Equal(0))
-			Expect(validationTimes[1]).To(Equal(1))
-		})
-	})
-})
@@ -1,102 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"encoding/hex"
-	"fmt"
-
-	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/btcsuite/btcd/txscript"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// PayloadConverter satisfies the PayloadConverter interface for bitcoin
-type PayloadConverter struct {
-	chainConfig *chaincfg.Params
-}
-
-// NewPayloadConverter creates a pointer to a new PayloadConverter which satisfies the PayloadConverter interface
-func NewPayloadConverter(chainConfig *chaincfg.Params) *PayloadConverter {
-	return &PayloadConverter{
-		chainConfig: chainConfig,
-	}
-}
-
-// Convert method is used to convert a bitcoin BlockPayload to an IPLDPayload
-// Satisfies the shared.PayloadConverter interface
-func (pc *PayloadConverter) Convert(payload shared.RawChainData) (shared.ConvertedData, error) {
-	btcBlockPayload, ok := payload.(BlockPayload)
-	if !ok {
-		return nil, fmt.Errorf("btc converter: expected payload type %T got %T", BlockPayload{}, payload)
-	}
-	txMeta := make([]TxModelWithInsAndOuts, len(btcBlockPayload.Txs))
-	for i, tx := range btcBlockPayload.Txs {
-		txModel := TxModelWithInsAndOuts{
-			TxHash:    tx.Hash().String(),
-			Index:     int64(i),
-			SegWit:    tx.HasWitness(),
-			TxOutputs: make([]TxOutput, len(tx.MsgTx().TxOut)),
-			TxInputs:  make([]TxInput, len(tx.MsgTx().TxIn)),
-		}
-		if tx.HasWitness() {
-			txModel.WitnessHash = tx.WitnessHash().String()
-		}
-		for i, in := range tx.MsgTx().TxIn {
-			txModel.TxInputs[i] = TxInput{
-				Index:                 int64(i),
-				SignatureScript:       in.SignatureScript,
-				PreviousOutPointHash:  in.PreviousOutPoint.Hash.String(),
-				PreviousOutPointIndex: in.PreviousOutPoint.Index,
-				TxWitness:             convertBytesToHexArray(in.Witness),
-			}
-		}
-		for i, out := range tx.MsgTx().TxOut {
-			scriptClass, addresses, numberOfSigs, err := txscript.ExtractPkScriptAddrs(out.PkScript, pc.chainConfig)
-			// if we receive an error but the txscript type isn't NonStandardTy then something went wrong
-			if err != nil && scriptClass != txscript.NonStandardTy {
-				return nil, err
-			}
-			stringAddrs := make([]string, len(addresses))
-			for i, addr := range addresses {
-				stringAddrs[i] = addr.EncodeAddress()
-			}
-			txModel.TxOutputs[i] = TxOutput{
-				Index:        int64(i),
-				Value:        out.Value,
-				PkScript:     out.PkScript,
-				RequiredSigs: int64(numberOfSigs),
-				ScriptClass:  uint8(scriptClass),
-				Addresses:    stringAddrs,
-			}
-		}
-		txMeta[i] = txModel
-	}
-	return ConvertedPayload{
-		BlockPayload: btcBlockPayload,
-		TxMetaData:   txMeta,
-	}, nil
-}
-
-func convertBytesToHexArray(bytea [][]byte) []string {
-	var strs []string
-	for _, b := range bytea {
-		strs = append(strs, hex.EncodeToString(b))
-	}
-	return strs
-}
@@ -1,43 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	"github.com/btcsuite/btcd/chaincfg"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc/mocks"
-)
-
-var _ = Describe("Converter", func() {
-	Describe("Convert", func() {
-		It("Converts mock BlockPayloads into the expected IPLDPayloads", func() {
-			converter := btc.NewPayloadConverter(&chaincfg.MainNetParams)
-			payload, err := converter.Convert(mocks.MockBlockPayload)
-			Expect(err).ToNot(HaveOccurred())
-			convertedPayload, ok := payload.(btc.ConvertedPayload)
-			Expect(ok).To(BeTrue())
-			Expect(convertedPayload).To(Equal(mocks.MockConvertedPayload))
-			Expect(convertedPayload.BlockHeight).To(Equal(mocks.MockBlockHeight))
-			Expect(convertedPayload.Header).To(Equal(&mocks.MockBlock.Header))
-			Expect(convertedPayload.Txs).To(Equal(mocks.MockTransactions))
-			Expect(convertedPayload.TxMetaData).To(Equal(mocks.MockTxsMetaData))
-		})
-	})
-})
@@ -1,159 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"bytes"
-	"fmt"
-	"math/big"
-
-	"github.com/multiformats/go-multihash"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// ResponseFilterer satisfies the ResponseFilterer interface for bitcoin
-type ResponseFilterer struct{}
-
-// NewResponseFilterer creates a new Filterer satisfying the ResponseFilterer interface
-func NewResponseFilterer() *ResponseFilterer {
-	return &ResponseFilterer{}
-}
-
-// Filter is used to filter through btc data to extract and package requested data into a Payload
-func (s *ResponseFilterer) Filter(filter shared.SubscriptionSettings, payload shared.ConvertedData) (shared.IPLDs, error) {
-	btcFilters, ok := filter.(*SubscriptionSettings)
-	if !ok {
-		return IPLDs{}, fmt.Errorf("btc filterer expected filter type %T got %T", &SubscriptionSettings{}, filter)
-	}
-	btcPayload, ok := payload.(ConvertedPayload)
-	if !ok {
-		return IPLDs{}, fmt.Errorf("btc filterer expected payload type %T got %T", ConvertedPayload{}, payload)
-	}
-	height := int64(btcPayload.BlockPayload.BlockHeight)
-	if checkRange(btcFilters.Start.Int64(), btcFilters.End.Int64(), height) {
-		response := new(IPLDs)
-		if err := s.filterHeaders(btcFilters.HeaderFilter, response, btcPayload); err != nil {
-			return IPLDs{}, err
-		}
-		if err := s.filterTransactions(btcFilters.TxFilter, response, btcPayload); err != nil {
-			return IPLDs{}, err
-		}
-		response.BlockNumber = big.NewInt(height)
-		return *response, nil
-	}
-	return IPLDs{}, nil
-}
-
-func (s *ResponseFilterer) filterHeaders(headerFilter HeaderFilter, response *IPLDs, payload ConvertedPayload) error {
-	if !headerFilter.Off {
-		headerBuffer := new(bytes.Buffer)
-		if err := payload.Header.Serialize(headerBuffer); err != nil {
-			return err
-		}
-		data := headerBuffer.Bytes()
-		cid, err := ipld.RawdataToCid(ipld.MBitcoinHeader, data, multihash.DBL_SHA2_256)
-		if err != nil {
-			return err
-		}
-		response.Header = ipfs.BlockModel{
-			Data: data,
-			CID:  cid.String(),
-		}
-	}
-	return nil
-}
-
-func checkRange(start, end, actual int64) bool {
-	if (end <= 0 || end >= actual) && start <= actual {
-		return true
-	}
-	return false
-}
-
-func (s *ResponseFilterer) filterTransactions(trxFilter TxFilter, response *IPLDs, payload ConvertedPayload) error {
-	if !trxFilter.Off {
-		response.Transactions = make([]ipfs.BlockModel, 0, len(payload.TxMetaData))
-		for i, txMeta := range payload.TxMetaData {
-			if checkTransaction(txMeta, trxFilter) {
-				trxBuffer := new(bytes.Buffer)
-				if err := payload.Txs[i].MsgTx().Serialize(trxBuffer); err != nil {
-					return err
-				}
-				data := trxBuffer.Bytes()
-				cid, err := ipld.RawdataToCid(ipld.MBitcoinTx, data, multihash.DBL_SHA2_256)
-				if err != nil {
-					return err
-				}
-				response.Transactions = append(response.Transactions, ipfs.BlockModel{
-					Data: data,
-					CID:  cid.String(),
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// checkTransaction returns true if the provided transaction has a hit on the filter
-func checkTransaction(txMeta TxModelWithInsAndOuts, txFilter TxFilter) bool {
-	passesSegwitFilter := false
-	if !txFilter.Segwit || (txFilter.Segwit && txMeta.SegWit) {
-		passesSegwitFilter = true
-	}
-	passesMultiSigFilter := !txFilter.MultiSig
-	if txFilter.MultiSig {
-		for _, out := range txMeta.TxOutputs {
-			if out.RequiredSigs > 1 {
-				passesMultiSigFilter = true
-			}
-		}
-	}
-	passesWitnessFilter := len(txFilter.WitnessHashes) == 0
-	for _, wantedWitnessHash := range txFilter.WitnessHashes {
-		if wantedWitnessHash == txMeta.WitnessHash {
-			passesWitnessFilter = true
-		}
-	}
-	passesAddressFilter := len(txFilter.Addresses) == 0
-	for _, wantedAddress := range txFilter.Addresses {
-		for _, out := range txMeta.TxOutputs {
-			for _, actualAddress := range out.Addresses {
-				if wantedAddress == actualAddress {
-					passesAddressFilter = true
-				}
-			}
-		}
-	}
-	passesIndexFilter := len(txFilter.Indexes) == 0
-	for _, wantedIndex := range txFilter.Indexes {
-		if wantedIndex == txMeta.Index {
-			passesIndexFilter = true
-		}
-	}
-	passesPkScriptClassFilter := len(txFilter.PkScriptClasses) == 0
-	for _, wantedPkScriptClass := range txFilter.PkScriptClasses {
-		for _, out := range txMeta.TxOutputs {
-			if out.ScriptClass == wantedPkScriptClass {
-				passesPkScriptClassFilter = true
-			}
-		}
-	}
-	return passesSegwitFilter && passesMultiSigFilter && passesWitnessFilter && passesAddressFilter && passesIndexFilter && passesPkScriptClassFilter
-}
@@ -1,104 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"bytes"
-	"time"
-
-	"github.com/btcsuite/btcd/rpcclient"
-	"github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// HTTPPayloadStreamer satisfies the PayloadStreamer interface for bitcoin over http endpoints (since bitcoin core doesn't support websockets)
-type HTTPPayloadStreamer struct {
-	Config   *rpcclient.ConnConfig
-	lastHash []byte
-}
-
-// NewHTTPPayloadStreamer creates a pointer to a new PayloadStreamer which satisfies the PayloadStreamer interface for bitcoin
-func NewHTTPPayloadStreamer(clientConfig *rpcclient.ConnConfig) *HTTPPayloadStreamer {
-	return &HTTPPayloadStreamer{
-		Config: clientConfig,
-	}
-}
-
-// Stream is the main loop for subscribing to data from the btc block notifications
-// Satisfies the shared.PayloadStreamer interface
-func (ps *HTTPPayloadStreamer) Stream(payloadChan chan shared.RawChainData) (shared.ClientSubscription, error) {
-	logrus.Debug("streaming block payloads from btc")
-	client, err := rpcclient.New(ps.Config, nil)
-	if err != nil {
-		return nil, err
-	}
-	ticker := time.NewTicker(time.Second * 5)
-	errChan := make(chan error)
-	go func() {
-		for {
-			// start at
-			select {
-			case <-ticker.C:
-				height, err := client.GetBlockCount()
-				if err != nil {
-					errChan <- err
-					continue
-				}
-				blockHash, err := client.GetBlockHash(height)
-				if err != nil {
-					errChan <- err
-					continue
-				}
-				blockHashBytes := blockHash.CloneBytes()
-				if bytes.Equal(blockHashBytes, ps.lastHash) {
-					continue
-				}
-				block, err := client.GetBlock(blockHash)
-				if err != nil {
-					errChan <- err
-					continue
-				}
-				ps.lastHash = blockHashBytes
-				payloadChan <- BlockPayload{
-					Header:      &block.Header,
-					BlockHeight: height,
-					Txs:         msgTxsToUtilTxs(block.Transactions),
-				}
-			default:
-			}
-		}
-	}()
-	return &HTTPClientSubscription{client: client, errChan: errChan}, nil
-}
-
-// HTTPClientSubscription is a wrapper around the underlying bitcoind rpc client
-// to fit the shared.ClientSubscription interface
-type HTTPClientSubscription struct {
-	client  *rpcclient.Client
-	errChan chan error
-}
-
-// Unsubscribe satisfies the rpc.Subscription interface
-func (bcs *HTTPClientSubscription) Unsubscribe() {
-	bcs.client.Shutdown()
-}
-
-// Err() satisfies the rpc.Subscription interface
-func (bcs *HTTPClientSubscription) Err() <-chan error {
-	return bcs.errChan
-}
@@ -1,132 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-
-	"github.com/sirupsen/logrus"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/lib/pq"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-type CIDIndexer struct {
-	db *postgres.DB
-}
-
-func NewCIDIndexer(db *postgres.DB) *CIDIndexer {
-	return &CIDIndexer{
-		db: db,
-	}
-}
-
-func (in *CIDIndexer) Index(cids shared.CIDsForIndexing) error {
-	cidWrapper, ok := cids.(*CIDPayload)
-	if !ok {
-		return fmt.Errorf("btc indexer expected cids type %T got %T", &CIDPayload{}, cids)
-	}
-
-	// Begin new db tx
-	tx, err := in.db.Beginx()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	headerID, err := in.indexHeaderCID(tx, cidWrapper.HeaderCID)
-	if err != nil {
-		logrus.Error("btc indexer error when indexing header")
-		return err
-	}
-	err = in.indexTransactionCIDs(tx, cidWrapper.TransactionCIDs, headerID)
-	if err != nil {
-		logrus.Error("btc indexer error when indexing transactions")
-	}
-	return err
-}
-
-func (in *CIDIndexer) indexHeaderCID(tx *sqlx.Tx, header HeaderModel) (int64, error) {
-	var headerID int64
-	err := tx.QueryRowx(`INSERT INTO btc.header_cids (block_number, block_hash, parent_hash, cid, timestamp, bits, node_id, times_validated)
-							VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
-							ON CONFLICT (block_number, block_hash) DO UPDATE SET (parent_hash, cid, timestamp, bits, node_id, times_validated) = ($3, $4, $5, $6, $7, btc.header_cids.times_validated + 1)
-							RETURNING id`,
-		header.BlockNumber, header.BlockHash, header.ParentHash, header.CID, header.Timestamp, header.Bits, in.db.NodeID, 1).Scan(&headerID)
-	return headerID, err
-}
-
-func (in *CIDIndexer) indexTransactionCIDs(tx *sqlx.Tx, transactions []TxModelWithInsAndOuts, headerID int64) error {
-	for _, transaction := range transactions {
-		txID, err := in.indexTransactionCID(tx, transaction, headerID)
-		if err != nil {
-			logrus.Error("btc indexer error when indexing header")
-			return err
-		}
-		for _, input := range transaction.TxInputs {
-			if err := in.indexTxInput(tx, input, txID); err != nil {
-				logrus.Error("btc indexer error when indexing tx inputs")
-				return err
-			}
-		}
-		for _, output := range transaction.TxOutputs {
-			if err := in.indexTxOutput(tx, output, txID); err != nil {
-				logrus.Error("btc indexer error when indexing tx outputs")
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (in *CIDIndexer) indexTransactionCID(tx *sqlx.Tx, transaction TxModelWithInsAndOuts, headerID int64) (int64, error) {
-	var txID int64
-	err := tx.QueryRowx(`INSERT INTO btc.transaction_cids (header_id, tx_hash, index, cid, segwit, witness_hash)
-							VALUES ($1, $2, $3, $4, $5, $6)
-							ON CONFLICT (tx_hash) DO UPDATE SET (header_id, index, cid, segwit, witness_hash) = ($1, $3, $4, $5, $6)
-							RETURNING id`,
-		headerID, transaction.TxHash, transaction.Index, transaction.CID, transaction.SegWit, transaction.WitnessHash).Scan(&txID)
-	return txID, err
-}
-
-func (in *CIDIndexer) indexTxInput(tx *sqlx.Tx, txInput TxInput, txID int64) error {
-	_, err := tx.Exec(`INSERT INTO btc.tx_inputs (tx_id, index, witness, sig_script, outpoint_tx_hash, outpoint_index)
-						VALUES ($1, $2, $3, $4, $5, $6)
-						ON CONFLICT (tx_id, index) DO UPDATE SET (witness, sig_script, outpoint_tx_hash, outpoint_index) = ($3, $4, $5, $6)`,
-		txID, txInput.Index, pq.Array(txInput.TxWitness), txInput.SignatureScript, txInput.PreviousOutPointHash, txInput.PreviousOutPointIndex)
-	return err
-}
-
-func (in *CIDIndexer) indexTxOutput(tx *sqlx.Tx, txOuput TxOutput, txID int64) error {
-	_, err := tx.Exec(`INSERT INTO btc.tx_outputs (tx_id, index, value, pk_script, script_class, addresses, required_sigs)
-							VALUES ($1, $2, $3, $4, $5, $6, $7)
-							ON CONFLICT (tx_id, index) DO UPDATE SET (value, pk_script, script_class, addresses, required_sigs) = ($3, $4, $5, $6, $7)`,
-		txID, txOuput.Index, txOuput.Value, txOuput.PkScript, txOuput.ScriptClass, txOuput.Addresses, txOuput.RequiredSigs)
-	return err
-}
@@ -1,87 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc/mocks"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-var _ = Describe("Indexer", func() {
-	var (
-		db   *postgres.DB
-		err  error
-		repo *btc.CIDIndexer
-	)
-	BeforeEach(func() {
-		db, err = shared.SetupDB()
-		Expect(err).ToNot(HaveOccurred())
-		repo = btc.NewCIDIndexer(db)
-	})
-	AfterEach(func() {
-		btc.TearDownDB(db)
-	})
-
-	Describe("Index", func() {
-		It("Indexes CIDs and related metadata into vulcanizedb", func() {
-			err = repo.Index(&mocks.MockCIDPayload)
-			Expect(err).ToNot(HaveOccurred())
-			pgStr := `SELECT * FROM btc.header_cids
-				WHERE block_number = $1`
-			// check header was properly indexed
-			header := new(btc.HeaderModel)
-			err = db.Get(header, pgStr, mocks.MockHeaderMetaData.BlockNumber)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(header.CID).To(Equal(mocks.MockHeaderMetaData.CID))
-			Expect(header.BlockNumber).To(Equal(mocks.MockHeaderMetaData.BlockNumber))
-			Expect(header.Bits).To(Equal(mocks.MockHeaderMetaData.Bits))
-			Expect(header.Timestamp).To(Equal(mocks.MockHeaderMetaData.Timestamp))
-			Expect(header.BlockHash).To(Equal(mocks.MockHeaderMetaData.BlockHash))
-			Expect(header.ParentHash).To(Equal(mocks.MockHeaderMetaData.ParentHash))
-			// check trxs were properly indexed
-			trxs := make([]btc.TxModel, 0)
-			pgStr = `SELECT transaction_cids.id, transaction_cids.header_id, transaction_cids.index,
-				transaction_cids.tx_hash, transaction_cids.cid, transaction_cids.segwit, transaction_cids.witness_hash
-				FROM btc.transaction_cids INNER JOIN btc.header_cids ON (transaction_cids.header_id = header_cids.id)
-				WHERE header_cids.block_number = $1`
-			err = db.Select(&trxs, pgStr, mocks.MockHeaderMetaData.BlockNumber)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(trxs)).To(Equal(3))
-			for _, tx := range trxs {
-				Expect(tx.SegWit).To(Equal(false))
-				Expect(tx.HeaderID).To(Equal(header.ID))
-				Expect(tx.WitnessHash).To(Equal(""))
-				switch tx.Index {
-				case 0:
-					Expect(tx.CID).To(Equal("mockTrxCID1"))
-					Expect(tx.TxHash).To(Equal(mocks.MockBlock.Transactions[0].TxHash().String()))
-				case 1:
-					Expect(tx.CID).To(Equal("mockTrxCID2"))
-					Expect(tx.TxHash).To(Equal(mocks.MockBlock.Transactions[1].TxHash().String()))
-				case 2:
-					Expect(tx.CID).To(Equal("mockTrxCID3"))
-					Expect(tx.TxHash).To(Equal(mocks.MockBlock.Transactions[2].TxHash().String()))
-				}
-			}
-		})
-	})
-})
@@ -1,135 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/ipfs/go-block-format"
-	"github.com/ipfs/go-blockservice"
-	"github.com/ipfs/go-cid"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-var (
-	errUnexpectedNumberOfIPLDs = errors.New("ipfs batch fetch returned unexpected number of IPLDs")
-)
-
-// IPLDFetcher satisfies the IPLDFetcher interface for ethereum
-type IPLDFetcher struct {
-	BlockService blockservice.BlockService
-}
-
-// NewIPLDFetcher creates a pointer to a new IPLDFetcher
-// It interfaces with PG-IPFS through an internalized IPFS node interface
-func NewIPLDFetcher(ipfsPath string) (*IPLDFetcher, error) {
-	blockService, err := ipfs.InitIPFSBlockService(ipfsPath)
-	if err != nil {
-		return nil, err
-	}
-	return &IPLDFetcher{
-		BlockService: blockService,
-	}, nil
-}
-
-// Fetch is the exported method for fetching and returning all the IPLDS specified in the CIDWrapper
-func (f *IPLDFetcher) Fetch(cids shared.CIDsForFetching) (shared.IPLDs, error) {
-	cidWrapper, ok := cids.(*CIDWrapper)
-	if !ok {
-		return nil, fmt.Errorf("btc fetcher: expected cids type %T got %T", &CIDWrapper{}, cids)
-	}
-	log.Debug("fetching iplds")
-	iplds := IPLDs{}
-	iplds.BlockNumber = cidWrapper.BlockNumber
-	var err error
-	iplds.Header, err = f.FetchHeader(cidWrapper.Header)
-	if err != nil {
-		return nil, err
-	}
-	iplds.Transactions, err = f.FetchTrxs(cidWrapper.Transactions)
-	if err != nil {
-		return nil, err
-	}
-	return iplds, nil
-}
-
-// FetchHeaders fetches headers
-// It uses the f.fetch method
-func (f *IPLDFetcher) FetchHeader(c HeaderModel) (ipfs.BlockModel, error) {
-	log.Debug("fetching header ipld")
-	dc, err := cid.Decode(c.CID)
-	if err != nil {
-		return ipfs.BlockModel{}, err
-	}
-	header, err := f.fetch(dc)
-	if err != nil {
-		return ipfs.BlockModel{}, err
-	}
-	return ipfs.BlockModel{
-		Data: header.RawData(),
-		CID:  header.Cid().String(),
-	}, nil
-}
-
-// FetchTrxs fetches transactions
-// It uses the f.fetchBatch method
-func (f *IPLDFetcher) FetchTrxs(cids []TxModel) ([]ipfs.BlockModel, error) {
-	log.Debug("fetching transaction iplds")
-	trxCids := make([]cid.Cid, len(cids))
-	for i, c := range cids {
-		dc, err := cid.Decode(c.CID)
-		if err != nil {
-			return nil, err
-		}
-		trxCids[i] = dc
-	}
-	trxs := f.fetchBatch(trxCids)
-	trxIPLDs := make([]ipfs.BlockModel, len(trxs))
-	for i, trx := range trxs {
-		trxIPLDs[i] = ipfs.BlockModel{
-			Data: trx.RawData(),
-			CID:  trx.Cid().String(),
-		}
-	}
-	if len(trxIPLDs) != len(trxCids) {
-		log.Errorf("ipfs fetcher: number of transaction blocks returned (%d) does not match number expected (%d)", len(trxs), len(trxCids))
-		return trxIPLDs, errUnexpectedNumberOfIPLDs
-	}
-	return trxIPLDs, nil
-}
-
-// fetch is used to fetch a single cid
-func (f *IPLDFetcher) fetch(cid cid.Cid) (blocks.Block, error) {
-	return f.BlockService.GetBlock(context.Background(), cid)
-}
-
-// fetchBatch is used to fetch a batch of IPFS data blocks by cid
-// There is no guarantee all are fetched, and no error in such a case, so
-// downstream we will need to confirm which CIDs were fetched in the result set
-func (f *IPLDFetcher) fetchBatch(cids []cid.Cid) []blocks.Block {
-	fetchedBlocks := make([]blocks.Block, 0, len(cids))
-	blockChan := f.BlockService.GetBlocks(context.Background(), cids)
-	for block := range blockChan {
-		fetchedBlocks = append(fetchedBlocks, block)
-	}
-	return fetchedBlocks
-}
@@ -1,107 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-
-	"github.com/jmoiron/sqlx"
-	log "github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// IPLDPGFetcher satisfies the IPLDFetcher interface for ethereum
-// it interfaces directly with PG-IPFS instead of going through a node-interface or remote node
-type IPLDPGFetcher struct {
-	db *postgres.DB
-}
-
-// NewIPLDPGFetcher creates a pointer to a new IPLDPGFetcher
-func NewIPLDPGFetcher(db *postgres.DB) *IPLDPGFetcher {
-	return &IPLDPGFetcher{
-		db: db,
-	}
-}
-
-// Fetch is the exported method for fetching and returning all the IPLDS specified in the CIDWrapper
-func (f *IPLDPGFetcher) Fetch(cids shared.CIDsForFetching) (shared.IPLDs, error) {
-	cidWrapper, ok := cids.(*CIDWrapper)
-	if !ok {
-		return nil, fmt.Errorf("btc fetcher: expected cids type %T got %T", &CIDWrapper{}, cids)
-	}
-	log.Debug("fetching iplds")
-	iplds := IPLDs{}
-	iplds.BlockNumber = cidWrapper.BlockNumber
-
-	tx, err := f.db.Beginx()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	iplds.Header, err = f.FetchHeader(tx, cidWrapper.Header)
-	if err != nil {
-		return nil, fmt.Errorf("btc pg fetcher: header fetching error: %s", err.Error())
-	}
-	iplds.Transactions, err = f.FetchTrxs(tx, cidWrapper.Transactions)
-	if err != nil {
-		return nil, fmt.Errorf("btc pg fetcher: transaction fetching error: %s", err.Error())
-	}
-	return iplds, err
-}
-
-// FetchHeaders fetches headers
-func (f *IPLDPGFetcher) FetchHeader(tx *sqlx.Tx, c HeaderModel) (ipfs.BlockModel, error) {
-	log.Debug("fetching header ipld")
-	headerBytes, err := shared.FetchIPLD(tx, c.CID)
-	if err != nil {
-		return ipfs.BlockModel{}, err
-	}
-	return ipfs.BlockModel{
-		Data: headerBytes,
-		CID:  c.CID,
-	}, nil
-}
-
-// FetchTrxs fetches transactions
-func (f *IPLDPGFetcher) FetchTrxs(tx *sqlx.Tx, cids []TxModel) ([]ipfs.BlockModel, error) {
-	log.Debug("fetching transaction iplds")
-	trxIPLDs := make([]ipfs.BlockModel, len(cids))
-	for i, c := range cids {
-		trxBytes, err := shared.FetchIPLD(tx, c.CID)
-		if err != nil {
-			return nil, err
-		}
-		trxIPLDs[i] = ipfs.BlockModel{
-			Data: trxBytes,
-			CID:  c.CID,
-		}
-	}
-	return trxIPLDs, nil
-}
@@ -1,64 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package mocks
-
-import (
-	"fmt"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// PayloadConverter is the underlying struct for the Converter interface
-type PayloadConverter struct {
-	PassedStatediffPayload btc.BlockPayload
-	ReturnIPLDPayload      btc.ConvertedPayload
-	ReturnErr              error
-}
-
-// Convert method is used to convert a geth statediff.Payload to a IPLDPayload
-func (pc *PayloadConverter) Convert(payload shared.RawChainData) (shared.ConvertedData, error) {
-	stateDiffPayload, ok := payload.(btc.BlockPayload)
-	if !ok {
-		return nil, fmt.Errorf("convert expected payload type %T got %T", btc.BlockPayload{}, payload)
-	}
-	pc.PassedStatediffPayload = stateDiffPayload
-	return pc.ReturnIPLDPayload, pc.ReturnErr
-}
-
-// IterativePayloadConverter is the underlying struct for the Converter interface
-type IterativePayloadConverter struct {
-	PassedStatediffPayload []btc.BlockPayload
-	ReturnIPLDPayload      []btc.ConvertedPayload
-	ReturnErr              error
-	iteration              int
-}
-
-// Convert method is used to convert a geth statediff.Payload to a IPLDPayload
-func (pc *IterativePayloadConverter) Convert(payload shared.RawChainData) (shared.ConvertedData, error) {
-	stateDiffPayload, ok := payload.(btc.BlockPayload)
-	if !ok {
-		return nil, fmt.Errorf("convert expected payload type %T got %T", btc.BlockPayload{}, payload)
-	}
-	pc.PassedStatediffPayload = append(pc.PassedStatediffPayload, stateDiffPayload)
-	if len(pc.PassedStatediffPayload) < pc.iteration+1 {
-		return nil, fmt.Errorf("IterativePayloadConverter does not have a payload to return at iteration %d", pc.iteration)
-	}
-	returnPayload := pc.ReturnIPLDPayload[pc.iteration]
-	pc.iteration++
-	return returnPayload, pc.ReturnErr
-}
@@ -1,40 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package mocks
-
-import (
-	"fmt"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// CIDIndexer is the underlying struct for the Indexer interface
-type CIDIndexer struct {
-	PassedCIDPayload []*btc.CIDPayload
-	ReturnErr        error
-}
-
-// Index indexes a cidPayload in Postgres
-func (repo *CIDIndexer) Index(cids shared.CIDsForIndexing) error {
-	cidPayload, ok := cids.(*btc.CIDPayload)
-	if !ok {
-		return fmt.Errorf("index expected cids type %T got %T", &btc.CIDPayload{}, cids)
-	}
-	repo.PassedCIDPayload = append(repo.PassedCIDPayload, cidPayload)
-	return repo.ReturnErr
-}
@@ -1,65 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package mocks
-
-import (
-	"fmt"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// IPLDPublisher is the underlying struct for the Publisher interface
-type IPLDPublisher struct {
-	PassedIPLDPayload btc.ConvertedPayload
-	ReturnCIDPayload  *btc.CIDPayload
-	ReturnErr         error
-}
-
-// Publish publishes an IPLDPayload to IPFS and returns the corresponding CIDPayload
-func (pub *IPLDPublisher) Publish(payload shared.ConvertedData) (shared.CIDsForIndexing, error) {
-	ipldPayload, ok := payload.(btc.ConvertedPayload)
-	if !ok {
-		return nil, fmt.Errorf("publish expected payload type %T got %T", &btc.ConvertedPayload{}, payload)
-	}
-	pub.PassedIPLDPayload = ipldPayload
-	return pub.ReturnCIDPayload, pub.ReturnErr
-}
-
-// IterativeIPLDPublisher is the underlying struct for the Publisher interface; used in testing
-type IterativeIPLDPublisher struct {
-	PassedIPLDPayload []btc.ConvertedPayload
-	ReturnCIDPayload  []*btc.CIDPayload
-	ReturnErr         error
-	iteration         int
-}
-
-// Publish publishes an IPLDPayload to IPFS and returns the corresponding CIDPayload
-func (pub *IterativeIPLDPublisher) Publish(payload shared.ConvertedData) (shared.CIDsForIndexing, error) {
-	ipldPayload, ok := payload.(btc.ConvertedPayload)
-	if !ok {
-		return nil, fmt.Errorf("publish expected payload type %T got %T", &btc.ConvertedPayload{}, payload)
-	}
-	pub.PassedIPLDPayload = append(pub.PassedIPLDPayload, ipldPayload)
-	if len(pub.ReturnCIDPayload) < pub.iteration+1 {
-		return nil, fmt.Errorf("IterativeIPLDPublisher does not have a payload to return at iteration %d", pub.iteration)
-	}
-	returnPayload := pub.ReturnCIDPayload[pub.iteration]
-	pub.iteration++
-	return returnPayload, pub.ReturnErr
-}
@@ -1,744 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package mocks
-
-import (
-	"strconv"
-	"time"
-
-	"github.com/btcsuite/btcd/chaincfg"
-	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcd/txscript"
-	"github.com/btcsuite/btcd/wire"
-	"github.com/btcsuite/btcutil"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-)
-
-var (
-	MockBlockHeight int64 = 1337
-	MockBlock             = wire.MsgBlock{
-		Header: wire.BlockHeader{
-			Version: 1,
-			PrevBlock: chainhash.Hash([32]byte{ // Make go vet happy.
-				0x50, 0x12, 0x01, 0x19, 0x17, 0x2a, 0x61, 0x04,
-				0x21, 0xa6, 0xc3, 0x01, 0x1d, 0xd3, 0x30, 0xd9,
-				0xdf, 0x07, 0xb6, 0x36, 0x16, 0xc2, 0xcc, 0x1f,
-				0x1c, 0xd0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-			}), // 000000000002d01c1fccc21636b607dfd930d31d01c3a62104612a1719011250
-			MerkleRoot: chainhash.Hash([32]byte{ // Make go vet happy.
-				0x66, 0x57, 0xa9, 0x25, 0x2a, 0xac, 0xd5, 0xc0,
-				0xb2, 0x94, 0x09, 0x96, 0xec, 0xff, 0x95, 0x22,
-				0x28, 0xc3, 0x06, 0x7c, 0xc3, 0x8d, 0x48, 0x85,
-				0xef, 0xb5, 0xa4, 0xac, 0x42, 0x47, 0xe9, 0xf3,
-			}), // f3e94742aca4b5ef85488dc37c06c3282295ffec960994b2c0d5ac2a25a95766
-			Timestamp: time.Unix(1293623863, 0), // 2010-12-29 11:57:43 +0000 UTC
-			Bits:      0x1b04864c,               // 453281356
-			Nonce:     0x10572b0f,               // 274148111
-		},
-		Transactions: []*wire.MsgTx{
-			{
-				Version: 1,
-				TxIn: []*wire.TxIn{
-					{
-						PreviousOutPoint: wire.OutPoint{
-							Hash:  chainhash.Hash{},
-							Index: 0xffffffff,
-						},
-						SignatureScript: []byte{
-							0x04, 0x4c, 0x86, 0x04, 0x1b, 0x02, 0x06, 0x02,
-						},
-						Sequence: 0xffffffff,
-					},
-				},
-				TxOut: []*wire.TxOut{
-					{
-						Value: 0x12a05f200, // 5000000000
-						PkScript: []byte{
-							0x41, // OP_DATA_65
-							0x04, 0x1b, 0x0e, 0x8c, 0x25, 0x67, 0xc1, 0x25,
-							0x36, 0xaa, 0x13, 0x35, 0x7b, 0x79, 0xa0, 0x73,
-							0xdc, 0x44, 0x44, 0xac, 0xb8, 0x3c, 0x4e, 0xc7,
-							0xa0, 0xe2, 0xf9, 0x9d, 0xd7, 0x45, 0x75, 0x16,
-							0xc5, 0x81, 0x72, 0x42, 0xda, 0x79, 0x69, 0x24,
-							0xca, 0x4e, 0x99, 0x94, 0x7d, 0x08, 0x7f, 0xed,
-							0xf9, 0xce, 0x46, 0x7c, 0xb9, 0xf7, 0xc6, 0x28,
-							0x70, 0x78, 0xf8, 0x01, 0xdf, 0x27, 0x6f, 0xdf,
-							0x84, // 65-byte signature
-							0xac, // OP_CHECKSIG
-						},
-					},
-				},
-				LockTime: 0,
-			},
-			{
-				Version: 1,
-				TxIn: []*wire.TxIn{
-					{
-						PreviousOutPoint: wire.OutPoint{
-							Hash: chainhash.Hash([32]byte{ // Make go vet happy.
-								0x03, 0x2e, 0x38, 0xe9, 0xc0, 0xa8, 0x4c, 0x60,
-								0x46, 0xd6, 0x87, 0xd1, 0x05, 0x56, 0xdc, 0xac,
-								0xc4, 0x1d, 0x27, 0x5e, 0xc5, 0x5f, 0xc0, 0x07,
-								0x79, 0xac, 0x88, 0xfd, 0xf3, 0x57, 0xa1, 0x87,
-							}), // 87a157f3fd88ac7907c05fc55e271dc4acdc5605d187d646604ca8c0e9382e03
-							Index: 0,
-						},
-						SignatureScript: []byte{
-							0x49, // OP_DATA_73
-							0x30, 0x46, 0x02, 0x21, 0x00, 0xc3, 0x52, 0xd3,
-							0xdd, 0x99, 0x3a, 0x98, 0x1b, 0xeb, 0xa4, 0xa6,
-							0x3a, 0xd1, 0x5c, 0x20, 0x92, 0x75, 0xca, 0x94,
-							0x70, 0xab, 0xfc, 0xd5, 0x7d, 0xa9, 0x3b, 0x58,
-							0xe4, 0xeb, 0x5d, 0xce, 0x82, 0x02, 0x21, 0x00,
-							0x84, 0x07, 0x92, 0xbc, 0x1f, 0x45, 0x60, 0x62,
-							0x81, 0x9f, 0x15, 0xd3, 0x3e, 0xe7, 0x05, 0x5c,
-							0xf7, 0xb5, 0xee, 0x1a, 0xf1, 0xeb, 0xcc, 0x60,
-							0x28, 0xd9, 0xcd, 0xb1, 0xc3, 0xaf, 0x77, 0x48,
-							0x01, // 73-byte signature
-							0x41, // OP_DATA_65
-							0x04, 0xf4, 0x6d, 0xb5, 0xe9, 0xd6, 0x1a, 0x9d,
-							0xc2, 0x7b, 0x8d, 0x64, 0xad, 0x23, 0xe7, 0x38,
-							0x3a, 0x4e, 0x6c, 0xa1, 0x64, 0x59, 0x3c, 0x25,
-							0x27, 0xc0, 0x38, 0xc0, 0x85, 0x7e, 0xb6, 0x7e,
-							0xe8, 0xe8, 0x25, 0xdc, 0xa6, 0x50, 0x46, 0xb8,
-							0x2c, 0x93, 0x31, 0x58, 0x6c, 0x82, 0xe0, 0xfd,
-							0x1f, 0x63, 0x3f, 0x25, 0xf8, 0x7c, 0x16, 0x1b,
-							0xc6, 0xf8, 0xa6, 0x30, 0x12, 0x1d, 0xf2, 0xb3,
-							0xd3, // 65-byte pubkey
-						},
-						Sequence: 0xffffffff,
-					},
-				},
-				TxOut: []*wire.TxOut{
-					{
-						Value: 0x2123e300, // 556000000
-						PkScript: []byte{
-							0x76, // OP_DUP
-							0xa9, // OP_HASH160
-							0x14, // OP_DATA_20
-							0xc3, 0x98, 0xef, 0xa9, 0xc3, 0x92, 0xba, 0x60,
-							0x13, 0xc5, 0xe0, 0x4e, 0xe7, 0x29, 0x75, 0x5e,
-							0xf7, 0xf5, 0x8b, 0x32,
-							0x88, // OP_EQUALVERIFY
-							0xac, // OP_CHECKSIG
-						},
-					},
-					{
-						Value: 0x108e20f00, // 4444000000
-						PkScript: []byte{
-							0x76, // OP_DUP
-							0xa9, // OP_HASH160
-							0x14, // OP_DATA_20
-							0x94, 0x8c, 0x76, 0x5a, 0x69, 0x14, 0xd4, 0x3f,
-							0x2a, 0x7a, 0xc1, 0x77, 0xda, 0x2c, 0x2f, 0x6b,
-							0x52, 0xde, 0x3d, 0x7c,
-							0x88, // OP_EQUALVERIFY
-							0xac, // OP_CHECKSIG
-						},
-					},
-				},
-				LockTime: 0,
-			},
-			{
-				Version: 1,
-				TxIn: []*wire.TxIn{
-					{
-						PreviousOutPoint: wire.OutPoint{
-							Hash: chainhash.Hash([32]byte{ // Make go vet happy.
-								0xc3, 0x3e, 0xbf, 0xf2, 0xa7, 0x09, 0xf1, 0x3d,
-								0x9f, 0x9a, 0x75, 0x69, 0xab, 0x16, 0xa3, 0x27,
-								0x86, 0xaf, 0x7d, 0x7e, 0x2d, 0xe0, 0x92, 0x65,
-								0xe4, 0x1c, 0x61, 0xd0, 0x78, 0x29, 0x4e, 0xcf,
-							}), // cf4e2978d0611ce46592e02d7e7daf8627a316ab69759a9f3df109a7f2bf3ec3
-							Index: 1,
-						},
-						SignatureScript: []byte{
-							0x47, // OP_DATA_71
-							0x30, 0x44, 0x02, 0x20, 0x03, 0x2d, 0x30, 0xdf,
-							0x5e, 0xe6, 0xf5, 0x7f, 0xa4, 0x6c, 0xdd, 0xb5,
-							0xeb, 0x8d, 0x0d, 0x9f, 0xe8, 0xde, 0x6b, 0x34,
-							0x2d, 0x27, 0x94, 0x2a, 0xe9, 0x0a, 0x32, 0x31,
-							0xe0, 0xba, 0x33, 0x3e, 0x02, 0x20, 0x3d, 0xee,
-							0xe8, 0x06, 0x0f, 0xdc, 0x70, 0x23, 0x0a, 0x7f,
-							0x5b, 0x4a, 0xd7, 0xd7, 0xbc, 0x3e, 0x62, 0x8c,
-							0xbe, 0x21, 0x9a, 0x88, 0x6b, 0x84, 0x26, 0x9e,
-							0xae, 0xb8, 0x1e, 0x26, 0xb4, 0xfe, 0x01,
-							0x41, // OP_DATA_65
-							0x04, 0xae, 0x31, 0xc3, 0x1b, 0xf9, 0x12, 0x78,
-							0xd9, 0x9b, 0x83, 0x77, 0xa3, 0x5b, 0xbc, 0xe5,
-							0xb2, 0x7d, 0x9f, 0xff, 0x15, 0x45, 0x68, 0x39,
-							0xe9, 0x19, 0x45, 0x3f, 0xc7, 0xb3, 0xf7, 0x21,
-							0xf0, 0xba, 0x40, 0x3f, 0xf9, 0x6c, 0x9d, 0xee,
-							0xb6, 0x80, 0xe5, 0xfd, 0x34, 0x1c, 0x0f, 0xc3,
-							0xa7, 0xb9, 0x0d, 0xa4, 0x63, 0x1e, 0xe3, 0x95,
-							0x60, 0x63, 0x9d, 0xb4, 0x62, 0xe9, 0xcb, 0x85,
-							0x0f, // 65-byte pubkey
-						},
-						Sequence: 0xffffffff,
-					},
-				},
-				TxOut: []*wire.TxOut{
-					{
-						Value: 0xf4240, // 1000000
-						PkScript: []byte{
-							0x76, // OP_DUP
-							0xa9, // OP_HASH160
-							0x14, // OP_DATA_20
-							0xb0, 0xdc, 0xbf, 0x97, 0xea, 0xbf, 0x44, 0x04,
-							0xe3, 0x1d, 0x95, 0x24, 0x77, 0xce, 0x82, 0x2d,
-							0xad, 0xbe, 0x7e, 0x10,
-							0x88, // OP_EQUALVERIFY
-							0xac, // OP_CHECKSIG
-						},
-					},
-					{
-						Value: 0x11d260c0, // 299000000
-						PkScript: []byte{
-							0x76, // OP_DUP
-							0xa9, // OP_HASH160
-							0x14, // OP_DATA_20
-							0x6b, 0x12, 0x81, 0xee, 0xc2, 0x5a, 0xb4, 0xe1,
-							0xe0, 0x79, 0x3f, 0xf4, 0xe0, 0x8a, 0xb1, 0xab,
-							0xb3, 0x40, 0x9c, 0xd9,
-							0x88, // OP_EQUALVERIFY
-							0xac, // OP_CHECKSIG
-						},
-					},
-				},
-				LockTime: 0,
-			},
-		},
-	}
-	MockTransactions = []*btcutil.Tx{
-		btcutil.NewTx(MockBlock.Transactions[0]),
-		btcutil.NewTx(MockBlock.Transactions[1]),
-		btcutil.NewTx(MockBlock.Transactions[2]),
-	}
-	MockBlockPayload = btc.BlockPayload{
-		Header:      &MockBlock.Header,
-		Txs:         MockTransactions,
-		BlockHeight: MockBlockHeight,
-	}
-	sClass1, addresses1, numOfSigs1, _ = txscript.ExtractPkScriptAddrs([]byte{
-		0x41, // OP_DATA_65
-		0x04, 0x1b, 0x0e, 0x8c, 0x25, 0x67, 0xc1, 0x25,
-		0x36, 0xaa, 0x13, 0x35, 0x7b, 0x79, 0xa0, 0x73,
-		0xdc, 0x44, 0x44, 0xac, 0xb8, 0x3c, 0x4e, 0xc7,
-		0xa0, 0xe2, 0xf9, 0x9d, 0xd7, 0x45, 0x75, 0x16,
-		0xc5, 0x81, 0x72, 0x42, 0xda, 0x79, 0x69, 0x24,
-		0xca, 0x4e, 0x99, 0x94, 0x7d, 0x08, 0x7f, 0xed,
-		0xf9, 0xce, 0x46, 0x7c, 0xb9, 0xf7, 0xc6, 0x28,
-		0x70, 0x78, 0xf8, 0x01, 0xdf, 0x27, 0x6f, 0xdf,
-		0x84, // 65-byte signature
-		0xac, // OP_CHECKSIG
-	}, &chaincfg.MainNetParams)
-	sClass2a, addresses2a, numOfSigs2a, _ = txscript.ExtractPkScriptAddrs([]byte{
-		0x76, // OP_DUP
-		0xa9, // OP_HASH160
-		0x14, // OP_DATA_20
-		0xc3, 0x98, 0xef, 0xa9, 0xc3, 0x92, 0xba, 0x60,
-		0x13, 0xc5, 0xe0, 0x4e, 0xe7, 0x29, 0x75, 0x5e,
-		0xf7, 0xf5, 0x8b, 0x32,
-		0x88, // OP_EQUALVERIFY
-		0xac, // OP_CHECKSIG
-	}, &chaincfg.MainNetParams)
-	sClass2b, addresses2b, numOfSigs2b, _ = txscript.ExtractPkScriptAddrs([]byte{
-		0x76, // OP_DUP
-		0xa9, // OP_HASH160
-		0x14, // OP_DATA_20
-		0x94, 0x8c, 0x76, 0x5a, 0x69, 0x14, 0xd4, 0x3f,
-		0x2a, 0x7a, 0xc1, 0x77, 0xda, 0x2c, 0x2f, 0x6b,
-		0x52, 0xde, 0x3d, 0x7c,
-		0x88, // OP_EQUALVERIFY
-		0xac, // OP_CHECKSIG
-	}, &chaincfg.MainNetParams)
-	sClass3a, addresses3a, numOfSigs3a, _ = txscript.ExtractPkScriptAddrs([]byte{
-		0x76, // OP_DUP
-		0xa9, // OP_HASH160
-		0x14, // OP_DATA_20
-		0xb0, 0xdc, 0xbf, 0x97, 0xea, 0xbf, 0x44, 0x04,
-		0xe3, 0x1d, 0x95, 0x24, 0x77, 0xce, 0x82, 0x2d,
-		0xad, 0xbe, 0x7e, 0x10,
-		0x88, // OP_EQUALVERIFY
-		0xac, // OP_CHECKSIG
-	}, &chaincfg.MainNetParams)
-	sClass3b, addresses3b, numOfSigs3b, _ = txscript.ExtractPkScriptAddrs([]byte{
-		0x76, // OP_DUP
-		0xa9, // OP_HASH160
-		0x14, // OP_DATA_20
-		0x6b, 0x12, 0x81, 0xee, 0xc2, 0x5a, 0xb4, 0xe1,
-		0xe0, 0x79, 0x3f, 0xf4, 0xe0, 0x8a, 0xb1, 0xab,
-		0xb3, 0x40, 0x9c, 0xd9,
-		0x88, // OP_EQUALVERIFY
-		0xac, // OP_CHECKSIG
-	}, &chaincfg.MainNetParams)
-	MockTxsMetaData = []btc.TxModelWithInsAndOuts{
-		{
-			TxHash: MockBlock.Transactions[0].TxHash().String(),
-			Index:  0,
-			SegWit: MockBlock.Transactions[0].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					SignatureScript: []byte{
-						0x04, 0x4c, 0x86, 0x04, 0x1b, 0x02, 0x06, 0x02,
-					},
-					PreviousOutPointHash:  chainhash.Hash{}.String(),
-					PreviousOutPointIndex: 0xffffffff,
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Value: 5000000000,
-					Index: 0,
-					PkScript: []byte{
-						0x41, // OP_DATA_65
-						0x04, 0x1b, 0x0e, 0x8c, 0x25, 0x67, 0xc1, 0x25,
-						0x36, 0xaa, 0x13, 0x35, 0x7b, 0x79, 0xa0, 0x73,
-						0xdc, 0x44, 0x44, 0xac, 0xb8, 0x3c, 0x4e, 0xc7,
-						0xa0, 0xe2, 0xf9, 0x9d, 0xd7, 0x45, 0x75, 0x16,
-						0xc5, 0x81, 0x72, 0x42, 0xda, 0x79, 0x69, 0x24,
-						0xca, 0x4e, 0x99, 0x94, 0x7d, 0x08, 0x7f, 0xed,
-						0xf9, 0xce, 0x46, 0x7c, 0xb9, 0xf7, 0xc6, 0x28,
-						0x70, 0x78, 0xf8, 0x01, 0xdf, 0x27, 0x6f, 0xdf,
-						0x84, // 65-byte signature
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass1),
-					RequiredSigs: int64(numOfSigs1),
-					Addresses:    stringSliceFromAddresses(addresses1),
-				},
-			},
-		},
-		{
-			TxHash: MockBlock.Transactions[1].TxHash().String(),
-			Index:  1,
-			SegWit: MockBlock.Transactions[1].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					PreviousOutPointHash: chainhash.Hash([32]byte{ // Make go vet happy.
-						0x03, 0x2e, 0x38, 0xe9, 0xc0, 0xa8, 0x4c, 0x60,
-						0x46, 0xd6, 0x87, 0xd1, 0x05, 0x56, 0xdc, 0xac,
-						0xc4, 0x1d, 0x27, 0x5e, 0xc5, 0x5f, 0xc0, 0x07,
-						0x79, 0xac, 0x88, 0xfd, 0xf3, 0x57, 0xa1, 0x87,
-					}).String(),
-					PreviousOutPointIndex: 0,
-					SignatureScript: []byte{
-						0x49, // OP_DATA_73
-						0x30, 0x46, 0x02, 0x21, 0x00, 0xc3, 0x52, 0xd3,
-						0xdd, 0x99, 0x3a, 0x98, 0x1b, 0xeb, 0xa4, 0xa6,
-						0x3a, 0xd1, 0x5c, 0x20, 0x92, 0x75, 0xca, 0x94,
-						0x70, 0xab, 0xfc, 0xd5, 0x7d, 0xa9, 0x3b, 0x58,
-						0xe4, 0xeb, 0x5d, 0xce, 0x82, 0x02, 0x21, 0x00,
-						0x84, 0x07, 0x92, 0xbc, 0x1f, 0x45, 0x60, 0x62,
-						0x81, 0x9f, 0x15, 0xd3, 0x3e, 0xe7, 0x05, 0x5c,
-						0xf7, 0xb5, 0xee, 0x1a, 0xf1, 0xeb, 0xcc, 0x60,
-						0x28, 0xd9, 0xcd, 0xb1, 0xc3, 0xaf, 0x77, 0x48,
-						0x01, // 73-byte signature
-						0x41, // OP_DATA_65
-						0x04, 0xf4, 0x6d, 0xb5, 0xe9, 0xd6, 0x1a, 0x9d,
-						0xc2, 0x7b, 0x8d, 0x64, 0xad, 0x23, 0xe7, 0x38,
-						0x3a, 0x4e, 0x6c, 0xa1, 0x64, 0x59, 0x3c, 0x25,
-						0x27, 0xc0, 0x38, 0xc0, 0x85, 0x7e, 0xb6, 0x7e,
-						0xe8, 0xe8, 0x25, 0xdc, 0xa6, 0x50, 0x46, 0xb8,
-						0x2c, 0x93, 0x31, 0x58, 0x6c, 0x82, 0xe0, 0xfd,
-						0x1f, 0x63, 0x3f, 0x25, 0xf8, 0x7c, 0x16, 0x1b,
-						0xc6, 0xf8, 0xa6, 0x30, 0x12, 0x1d, 0xf2, 0xb3,
-						0xd3, // 65-byte pubkey
-					},
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Index: 0,
-					Value: 556000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0xc3, 0x98, 0xef, 0xa9, 0xc3, 0x92, 0xba, 0x60,
-						0x13, 0xc5, 0xe0, 0x4e, 0xe7, 0x29, 0x75, 0x5e,
-						0xf7, 0xf5, 0x8b, 0x32,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass2a),
-					RequiredSigs: int64(numOfSigs2a),
-					Addresses:    stringSliceFromAddresses(addresses2a),
-				},
-				{
-					Index: 1,
-					Value: 4444000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0x94, 0x8c, 0x76, 0x5a, 0x69, 0x14, 0xd4, 0x3f,
-						0x2a, 0x7a, 0xc1, 0x77, 0xda, 0x2c, 0x2f, 0x6b,
-						0x52, 0xde, 0x3d, 0x7c,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass2b),
-					RequiredSigs: int64(numOfSigs2b),
-					Addresses:    stringSliceFromAddresses(addresses2b),
-				},
-			},
-		},
-		{
-			TxHash: MockBlock.Transactions[2].TxHash().String(),
-			Index:  2,
-			SegWit: MockBlock.Transactions[2].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					PreviousOutPointHash: chainhash.Hash([32]byte{ // Make go vet happy.
-						0xc3, 0x3e, 0xbf, 0xf2, 0xa7, 0x09, 0xf1, 0x3d,
-						0x9f, 0x9a, 0x75, 0x69, 0xab, 0x16, 0xa3, 0x27,
-						0x86, 0xaf, 0x7d, 0x7e, 0x2d, 0xe0, 0x92, 0x65,
-						0xe4, 0x1c, 0x61, 0xd0, 0x78, 0x29, 0x4e, 0xcf,
-					}).String(),
-					PreviousOutPointIndex: 1,
-					SignatureScript: []byte{
-						0x47, // OP_DATA_71
-						0x30, 0x44, 0x02, 0x20, 0x03, 0x2d, 0x30, 0xdf,
-						0x5e, 0xe6, 0xf5, 0x7f, 0xa4, 0x6c, 0xdd, 0xb5,
-						0xeb, 0x8d, 0x0d, 0x9f, 0xe8, 0xde, 0x6b, 0x34,
-						0x2d, 0x27, 0x94, 0x2a, 0xe9, 0x0a, 0x32, 0x31,
-						0xe0, 0xba, 0x33, 0x3e, 0x02, 0x20, 0x3d, 0xee,
-						0xe8, 0x06, 0x0f, 0xdc, 0x70, 0x23, 0x0a, 0x7f,
-						0x5b, 0x4a, 0xd7, 0xd7, 0xbc, 0x3e, 0x62, 0x8c,
-						0xbe, 0x21, 0x9a, 0x88, 0x6b, 0x84, 0x26, 0x9e,
-						0xae, 0xb8, 0x1e, 0x26, 0xb4, 0xfe, 0x01,
-						0x41, // OP_DATA_65
-						0x04, 0xae, 0x31, 0xc3, 0x1b, 0xf9, 0x12, 0x78,
-						0xd9, 0x9b, 0x83, 0x77, 0xa3, 0x5b, 0xbc, 0xe5,
-						0xb2, 0x7d, 0x9f, 0xff, 0x15, 0x45, 0x68, 0x39,
-						0xe9, 0x19, 0x45, 0x3f, 0xc7, 0xb3, 0xf7, 0x21,
-						0xf0, 0xba, 0x40, 0x3f, 0xf9, 0x6c, 0x9d, 0xee,
-						0xb6, 0x80, 0xe5, 0xfd, 0x34, 0x1c, 0x0f, 0xc3,
-						0xa7, 0xb9, 0x0d, 0xa4, 0x63, 0x1e, 0xe3, 0x95,
-						0x60, 0x63, 0x9d, 0xb4, 0x62, 0xe9, 0xcb, 0x85,
-						0x0f, // 65-byte pubkey
-					},
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Index: 0,
-					Value: 1000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0xb0, 0xdc, 0xbf, 0x97, 0xea, 0xbf, 0x44, 0x04,
-						0xe3, 0x1d, 0x95, 0x24, 0x77, 0xce, 0x82, 0x2d,
-						0xad, 0xbe, 0x7e, 0x10,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass3a),
-					RequiredSigs: int64(numOfSigs3a),
-					Addresses:    stringSliceFromAddresses(addresses3a),
-				},
-				{
-					Index: 1,
-					Value: 299000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0x6b, 0x12, 0x81, 0xee, 0xc2, 0x5a, 0xb4, 0xe1,
-						0xe0, 0x79, 0x3f, 0xf4, 0xe0, 0x8a, 0xb1, 0xab,
-						0xb3, 0x40, 0x9c, 0xd9,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass3b),
-					RequiredSigs: int64(numOfSigs3b),
-					Addresses:    stringSliceFromAddresses(addresses3b),
-				},
-			},
-		},
-	}
-	MockTxsMetaDataPostPublish = []btc.TxModelWithInsAndOuts{
-		{
-			CID:    "mockTrxCID1",
-			TxHash: MockBlock.Transactions[0].TxHash().String(),
-			Index:  0,
-			SegWit: MockBlock.Transactions[0].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					SignatureScript: []byte{
-						0x04, 0x4c, 0x86, 0x04, 0x1b, 0x02, 0x06, 0x02,
-					},
-					PreviousOutPointHash:  chainhash.Hash{}.String(),
-					PreviousOutPointIndex: 0xffffffff,
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Value: 5000000000,
-					Index: 0,
-					PkScript: []byte{
-						0x41, // OP_DATA_65
-						0x04, 0x1b, 0x0e, 0x8c, 0x25, 0x67, 0xc1, 0x25,
-						0x36, 0xaa, 0x13, 0x35, 0x7b, 0x79, 0xa0, 0x73,
-						0xdc, 0x44, 0x44, 0xac, 0xb8, 0x3c, 0x4e, 0xc7,
-						0xa0, 0xe2, 0xf9, 0x9d, 0xd7, 0x45, 0x75, 0x16,
-						0xc5, 0x81, 0x72, 0x42, 0xda, 0x79, 0x69, 0x24,
-						0xca, 0x4e, 0x99, 0x94, 0x7d, 0x08, 0x7f, 0xed,
-						0xf9, 0xce, 0x46, 0x7c, 0xb9, 0xf7, 0xc6, 0x28,
-						0x70, 0x78, 0xf8, 0x01, 0xdf, 0x27, 0x6f, 0xdf,
-						0x84, // 65-byte signature
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass1),
-					RequiredSigs: int64(numOfSigs1),
-					Addresses:    stringSliceFromAddresses(addresses1),
-				},
-			},
-		},
-		{
-			CID:    "mockTrxCID2",
-			TxHash: MockBlock.Transactions[1].TxHash().String(),
-			Index:  1,
-			SegWit: MockBlock.Transactions[1].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					PreviousOutPointHash: chainhash.Hash([32]byte{ // Make go vet happy.
-						0x03, 0x2e, 0x38, 0xe9, 0xc0, 0xa8, 0x4c, 0x60,
-						0x46, 0xd6, 0x87, 0xd1, 0x05, 0x56, 0xdc, 0xac,
-						0xc4, 0x1d, 0x27, 0x5e, 0xc5, 0x5f, 0xc0, 0x07,
-						0x79, 0xac, 0x88, 0xfd, 0xf3, 0x57, 0xa1, 0x87,
-					}).String(),
-					PreviousOutPointIndex: 0,
-					SignatureScript: []byte{
-						0x49, // OP_DATA_73
-						0x30, 0x46, 0x02, 0x21, 0x00, 0xc3, 0x52, 0xd3,
-						0xdd, 0x99, 0x3a, 0x98, 0x1b, 0xeb, 0xa4, 0xa6,
-						0x3a, 0xd1, 0x5c, 0x20, 0x92, 0x75, 0xca, 0x94,
-						0x70, 0xab, 0xfc, 0xd5, 0x7d, 0xa9, 0x3b, 0x58,
-						0xe4, 0xeb, 0x5d, 0xce, 0x82, 0x02, 0x21, 0x00,
-						0x84, 0x07, 0x92, 0xbc, 0x1f, 0x45, 0x60, 0x62,
-						0x81, 0x9f, 0x15, 0xd3, 0x3e, 0xe7, 0x05, 0x5c,
-						0xf7, 0xb5, 0xee, 0x1a, 0xf1, 0xeb, 0xcc, 0x60,
-						0x28, 0xd9, 0xcd, 0xb1, 0xc3, 0xaf, 0x77, 0x48,
-						0x01, // 73-byte signature
-						0x41, // OP_DATA_65
-						0x04, 0xf4, 0x6d, 0xb5, 0xe9, 0xd6, 0x1a, 0x9d,
-						0xc2, 0x7b, 0x8d, 0x64, 0xad, 0x23, 0xe7, 0x38,
-						0x3a, 0x4e, 0x6c, 0xa1, 0x64, 0x59, 0x3c, 0x25,
-						0x27, 0xc0, 0x38, 0xc0, 0x85, 0x7e, 0xb6, 0x7e,
-						0xe8, 0xe8, 0x25, 0xdc, 0xa6, 0x50, 0x46, 0xb8,
-						0x2c, 0x93, 0x31, 0x58, 0x6c, 0x82, 0xe0, 0xfd,
-						0x1f, 0x63, 0x3f, 0x25, 0xf8, 0x7c, 0x16, 0x1b,
-						0xc6, 0xf8, 0xa6, 0x30, 0x12, 0x1d, 0xf2, 0xb3,
-						0xd3, // 65-byte pubkey
-					},
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Index: 0,
-					Value: 556000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0xc3, 0x98, 0xef, 0xa9, 0xc3, 0x92, 0xba, 0x60,
-						0x13, 0xc5, 0xe0, 0x4e, 0xe7, 0x29, 0x75, 0x5e,
-						0xf7, 0xf5, 0x8b, 0x32,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass2a),
-					RequiredSigs: int64(numOfSigs2a),
-					Addresses:    stringSliceFromAddresses(addresses2a),
-				},
-				{
-					Index: 1,
-					Value: 4444000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0x94, 0x8c, 0x76, 0x5a, 0x69, 0x14, 0xd4, 0x3f,
-						0x2a, 0x7a, 0xc1, 0x77, 0xda, 0x2c, 0x2f, 0x6b,
-						0x52, 0xde, 0x3d, 0x7c,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass2b),
-					RequiredSigs: int64(numOfSigs2b),
-					Addresses:    stringSliceFromAddresses(addresses2b),
-				},
-			},
-		},
-		{
-			CID:    "mockTrxCID3",
-			TxHash: MockBlock.Transactions[2].TxHash().String(),
-			Index:  2,
-			SegWit: MockBlock.Transactions[2].HasWitness(),
-			TxInputs: []btc.TxInput{
-				{
-					Index: 0,
-					PreviousOutPointHash: chainhash.Hash([32]byte{ // Make go vet happy.
-						0xc3, 0x3e, 0xbf, 0xf2, 0xa7, 0x09, 0xf1, 0x3d,
-						0x9f, 0x9a, 0x75, 0x69, 0xab, 0x16, 0xa3, 0x27,
-						0x86, 0xaf, 0x7d, 0x7e, 0x2d, 0xe0, 0x92, 0x65,
-						0xe4, 0x1c, 0x61, 0xd0, 0x78, 0x29, 0x4e, 0xcf,
-					}).String(),
-					PreviousOutPointIndex: 1,
-					SignatureScript: []byte{
-						0x47, // OP_DATA_71
-						0x30, 0x44, 0x02, 0x20, 0x03, 0x2d, 0x30, 0xdf,
-						0x5e, 0xe6, 0xf5, 0x7f, 0xa4, 0x6c, 0xdd, 0xb5,
-						0xeb, 0x8d, 0x0d, 0x9f, 0xe8, 0xde, 0x6b, 0x34,
-						0x2d, 0x27, 0x94, 0x2a, 0xe9, 0x0a, 0x32, 0x31,
-						0xe0, 0xba, 0x33, 0x3e, 0x02, 0x20, 0x3d, 0xee,
-						0xe8, 0x06, 0x0f, 0xdc, 0x70, 0x23, 0x0a, 0x7f,
-						0x5b, 0x4a, 0xd7, 0xd7, 0xbc, 0x3e, 0x62, 0x8c,
-						0xbe, 0x21, 0x9a, 0x88, 0x6b, 0x84, 0x26, 0x9e,
-						0xae, 0xb8, 0x1e, 0x26, 0xb4, 0xfe, 0x01,
-						0x41, // OP_DATA_65
-						0x04, 0xae, 0x31, 0xc3, 0x1b, 0xf9, 0x12, 0x78,
-						0xd9, 0x9b, 0x83, 0x77, 0xa3, 0x5b, 0xbc, 0xe5,
-						0xb2, 0x7d, 0x9f, 0xff, 0x15, 0x45, 0x68, 0x39,
-						0xe9, 0x19, 0x45, 0x3f, 0xc7, 0xb3, 0xf7, 0x21,
-						0xf0, 0xba, 0x40, 0x3f, 0xf9, 0x6c, 0x9d, 0xee,
-						0xb6, 0x80, 0xe5, 0xfd, 0x34, 0x1c, 0x0f, 0xc3,
-						0xa7, 0xb9, 0x0d, 0xa4, 0x63, 0x1e, 0xe3, 0x95,
-						0x60, 0x63, 0x9d, 0xb4, 0x62, 0xe9, 0xcb, 0x85,
-						0x0f, // 65-byte pubkey
-					},
-				},
-			},
-			TxOutputs: []btc.TxOutput{
-				{
-					Index: 0,
-					Value: 1000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0xb0, 0xdc, 0xbf, 0x97, 0xea, 0xbf, 0x44, 0x04,
-						0xe3, 0x1d, 0x95, 0x24, 0x77, 0xce, 0x82, 0x2d,
-						0xad, 0xbe, 0x7e, 0x10,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass3a),
-					RequiredSigs: int64(numOfSigs3a),
-					Addresses:    stringSliceFromAddresses(addresses3a),
-				},
-				{
-					Index: 1,
-					Value: 299000000,
-					PkScript: []byte{
-						0x76, // OP_DUP
-						0xa9, // OP_HASH160
-						0x14, // OP_DATA_20
-						0x6b, 0x12, 0x81, 0xee, 0xc2, 0x5a, 0xb4, 0xe1,
-						0xe0, 0x79, 0x3f, 0xf4, 0xe0, 0x8a, 0xb1, 0xab,
-						0xb3, 0x40, 0x9c, 0xd9,
-						0x88, // OP_EQUALVERIFY
-						0xac, // OP_CHECKSIG
-					},
-					ScriptClass:  uint8(sClass3b),
-					RequiredSigs: int64(numOfSigs3b),
-					Addresses:    stringSliceFromAddresses(addresses3b),
-				},
-			},
-		},
-	}
-	MockHeaderMetaData = btc.HeaderModel{
-		CID:         "mockHeaderCID",
-		ParentHash:  MockBlock.Header.PrevBlock.String(),
-		BlockNumber: strconv.Itoa(int(MockBlockHeight)),
-		BlockHash:   MockBlock.Header.BlockHash().String(),
-		Timestamp:   MockBlock.Header.Timestamp.UnixNano(),
-		Bits:        MockBlock.Header.Bits,
-	}
-	MockConvertedPayload = btc.ConvertedPayload{
-		BlockPayload: MockBlockPayload,
-		TxMetaData:   MockTxsMetaData,
-	}
-	MockCIDPayload = btc.CIDPayload{
-		HeaderCID:       MockHeaderMetaData,
-		TransactionCIDs: MockTxsMetaDataPostPublish,
-	}
-	DummyCIDPayloadForFKReference = btc.CIDPayload{
-		HeaderCID: btc.HeaderModel{
-			CID:         "dummyHeader",
-			ParentHash:  "",
-			BlockHash:   "",
-			BlockNumber: "1336",
-			Bits:        1,
-			Timestamp:   1000000000,
-		},
-		TransactionCIDs: []btc.TxModelWithInsAndOuts{
-			{
-				TxHash: "87a157f3fd88ac7907c05fc55e271dc4acdc5605d187d646604ca8c0e9382e03",
-				CID:    "dummyTx1",
-				Index:  0,
-				TxOutputs: []btc.TxOutput{
-					{
-						Index:        0,
-						RequiredSigs: 0,
-						Value:        0,
-						PkScript:     []byte{},
-						ScriptClass:  0,
-					},
-				},
-			},
-			{
-				TxHash: "cf4e2978d0611ce46592e02d7e7daf8627a316ab69759a9f3df109a7f2bf3ec3",
-				CID:    "dummyTx2",
-				Index:  1,
-				TxOutputs: []btc.TxOutput{
-					{
-						Index:        0,
-						RequiredSigs: 0,
-						Value:        0,
-						PkScript:     []byte{},
-						ScriptClass:  0,
-					},
-					{
-						Index:        1,
-						RequiredSigs: 0,
-						Value:        0,
-						PkScript:     []byte{},
-						ScriptClass:  0,
-					},
-				},
-			},
-		},
-	}
-)
-
-func stringSliceFromAddresses(addrs []btcutil.Address) []string {
-	strs := make([]string, len(addrs))
-	for i, addr := range addrs {
-		strs[i] = addr.EncodeAddress()
-	}
-	return strs
-}
@@ -1,79 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import "github.com/lib/pq"
-
-// HeaderModel is the db model for btc.header_cids table
-type HeaderModel struct {
-	ID             int64  `db:"id"`
-	BlockNumber    string `db:"block_number"`
-	BlockHash      string `db:"block_hash"`
-	ParentHash     string `db:"parent_hash"`
-	CID            string `db:"cid"`
-	Timestamp      int64  `db:"timestamp"`
-	Bits           uint32 `db:"bits"`
-	NodeID         int64  `db:"node_id"`
-	TimesValidated int64  `db:"times_validated"`
-}
-
-// TxModel is the db model for btc.transaction_cids table
-type TxModel struct {
-	ID          int64  `db:"id"`
-	HeaderID    int64  `db:"header_id"`
-	Index       int64  `db:"index"`
-	TxHash      string `db:"tx_hash"`
-	CID         string `db:"cid"`
-	SegWit      bool   `db:"segwit"`
-	WitnessHash string `db:"witness_hash"`
-}
-
-// TxModelWithInsAndOuts is the db model for btc.transaction_cids table that includes the children tx_input and tx_output tables
-type TxModelWithInsAndOuts struct {
-	ID          int64  `db:"id"`
-	HeaderID    int64  `db:"header_id"`
-	Index       int64  `db:"index"`
-	TxHash      string `db:"tx_hash"`
-	CID         string `db:"cid"`
-	SegWit      bool   `db:"segwit"`
-	WitnessHash string `db:"witness_hash"`
-	TxInputs    []TxInput
-	TxOutputs   []TxOutput
-}
-
-// TxInput is the db model for btc.tx_inputs table
-type TxInput struct {
-	ID                    int64    `db:"id"`
-	TxID                  int64    `db:"tx_id"`
-	Index                 int64    `db:"index"`
-	TxWitness             []string `db:"witness"`
-	SignatureScript       []byte   `db:"sig_script"`
-	PreviousOutPointIndex uint32   `db:"outpoint_tx_hash"`
-	PreviousOutPointHash  string   `db:"outpoint_index"`
-}
-
-// TxOutput is the db model for btc.tx_outputs table
-type TxOutput struct {
-	ID           int64          `db:"id"`
-	TxID         int64          `db:"tx_id"`
-	Index        int64          `db:"index"`
-	Value        int64          `db:"value"`
-	PkScript     []byte         `db:"pk_script"`
-	ScriptClass  uint8          `db:"script_class"`
-	RequiredSigs int64          `db:"required_sigs"`
-	Addresses    pq.StringArray `db:"addresses"`
-}
@@ -1,76 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-
-	"github.com/btcsuite/btcd/rpcclient"
-	"github.com/btcsuite/btcd/wire"
-	"github.com/btcsuite/btcutil"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// PayloadFetcher satisfies the PayloadFetcher interface for bitcoin
-type PayloadFetcher struct {
-	// PayloadFetcher is thread-safe as long as the underlying client is thread-safe, since it has/modifies no other state
-	// http.Client is thread-safe
-	client *rpcclient.Client
-}
-
-// NewStateDiffFetcher returns a PayloadFetcher
-func NewPayloadFetcher(c *rpcclient.ConnConfig) (*PayloadFetcher, error) {
-	client, err := rpcclient.New(c, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &PayloadFetcher{
-		client: client,
-	}, nil
-}
-
-// FetchAt fetches the block payloads at the given block heights
-func (fetcher *PayloadFetcher) FetchAt(blockHeights []uint64) ([]shared.RawChainData, error) {
-	blockPayloads := make([]shared.RawChainData, len(blockHeights))
-	for i, height := range blockHeights {
-		hash, err := fetcher.client.GetBlockHash(int64(height))
-		if err != nil {
-			return nil, fmt.Errorf("bitcoin PayloadFetcher GetBlockHash err at blockheight %d: %s", height, err.Error())
-		}
-		block, err := fetcher.client.GetBlock(hash)
-		if err != nil {
-			return nil, fmt.Errorf("bitcoin PayloadFetcher GetBlock err at blockheight %d: %s", height, err.Error())
-		}
-		blockPayloads[i] = BlockPayload{
-			BlockHeight: int64(height),
-			Header:      &block.Header,
-			Txs:         msgTxsToUtilTxs(block.Transactions),
-		}
-	}
-	return blockPayloads, nil
-}
-
-func msgTxsToUtilTxs(msgs []*wire.MsgTx) []*btcutil.Tx {
-	txs := make([]*btcutil.Tx, len(msgs))
-	for i, msg := range msgs {
-		tx := btcutil.NewTx(msg)
-		tx.SetIndex(i)
-		txs[i] = tx
-	}
-	return txs
-}
@@ -1,124 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// IPLDPublisherAndIndexer satisfies the IPLDPublisher interface for bitcoin
-// It interfaces directly with the public.blocks table of PG-IPFS rather than going through an ipfs intermediary
-// It publishes and indexes IPLDs together in a single sqlx.Tx
-type IPLDPublisherAndIndexer struct {
-	indexer *CIDIndexer
-}
-
-// NewIPLDPublisherAndIndexer creates a pointer to a new IPLDPublisherAndIndexer which satisfies the IPLDPublisher interface
-func NewIPLDPublisherAndIndexer(db *postgres.DB) *IPLDPublisherAndIndexer {
-	return &IPLDPublisherAndIndexer{
-		indexer: NewCIDIndexer(db),
-	}
-}
-
-// Publish publishes an IPLDPayload to IPFS and returns the corresponding CIDPayload
-func (pub *IPLDPublisherAndIndexer) Publish(payload shared.ConvertedData) (shared.CIDsForIndexing, error) {
-	ipldPayload, ok := payload.(ConvertedPayload)
-	if !ok {
-		return nil, fmt.Errorf("btc publisher expected payload type %T got %T", ConvertedPayload{}, payload)
-	}
-	// Generate the iplds
-	headerNode, txNodes, txTrieNodes, err := ipld.FromHeaderAndTxs(ipldPayload.Header, ipldPayload.Txs)
-	if err != nil {
-		return nil, err
-	}
-
-	// Begin new db tx
-	tx, err := pub.indexer.db.Beginx()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			shared.Rollback(tx)
-			panic(p)
-		} else if err != nil {
-			shared.Rollback(tx)
-		} else {
-			err = tx.Commit()
-		}
-	}()
-
-	// Publish trie nodes
-	for _, node := range txTrieNodes {
-		if err := shared.PublishIPLD(tx, node); err != nil {
-			return nil, err
-		}
-	}
-
-	// Publish and index header
-	if err := shared.PublishIPLD(tx, headerNode); err != nil {
-		return nil, err
-	}
-	header := HeaderModel{
-		CID:         headerNode.Cid().String(),
-		ParentHash:  ipldPayload.Header.PrevBlock.String(),
-		BlockNumber: strconv.Itoa(int(ipldPayload.BlockPayload.BlockHeight)),
-		BlockHash:   ipldPayload.Header.BlockHash().String(),
-		Timestamp:   ipldPayload.Header.Timestamp.UnixNano(),
-		Bits:        ipldPayload.Header.Bits,
-	}
-	headerID, err := pub.indexer.indexHeaderCID(tx, header)
-	if err != nil {
-		return nil, err
-	}
-
-	// Publish and index txs
-	for i, txNode := range txNodes {
-		if err := shared.PublishIPLD(tx, txNode); err != nil {
-			return nil, err
-		}
-		txModel := ipldPayload.TxMetaData[i]
-		txModel.CID = txNode.Cid().String()
-		txID, err := pub.indexer.indexTransactionCID(tx, txModel, headerID)
-		if err != nil {
-			return nil, err
-		}
-		for _, input := range txModel.TxInputs {
-			if err := pub.indexer.indexTxInput(tx, input, txID); err != nil {
-				return nil, err
-			}
-		}
-		for _, output := range txModel.TxOutputs {
-			if err := pub.indexer.indexTxOutput(tx, output, txID); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	// This IPLDPublisher does both publishing and indexing, we do not need to pass anything forward to the indexer
-	return nil, err
-}
-
-// Index satisfies the shared.CIDIndexer interface
-func (pub *IPLDPublisherAndIndexer) Index(cids shared.CIDsForIndexing) error {
-	return nil
-}
@@ -1,121 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	"bytes"
-
-	"github.com/ipfs/go-cid"
-	"github.com/ipfs/go-ipfs-blockstore"
-	"github.com/ipfs/go-ipfs-ds-help"
-	"github.com/multiformats/go-multihash"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/ipld"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc/mocks"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-var _ = Describe("PublishAndIndexer", func() {
-	var (
-		db        *postgres.DB
-		err       error
-		repo      *btc.IPLDPublisherAndIndexer
-		ipfsPgGet = `SELECT data FROM public.blocks
-					WHERE key = $1`
-	)
-	BeforeEach(func() {
-		db, err = shared.SetupDB()
-		Expect(err).ToNot(HaveOccurred())
-		repo = btc.NewIPLDPublisherAndIndexer(db)
-	})
-	AfterEach(func() {
-		btc.TearDownDB(db)
-	})
-
-	Describe("Publish", func() {
-		It("Published and indexes header and transaction IPLDs in a single tx", func() {
-			emptyReturn, err := repo.Publish(mocks.MockConvertedPayload)
-			Expect(emptyReturn).To(BeNil())
-			Expect(err).ToNot(HaveOccurred())
-			pgStr := `SELECT * FROM btc.header_cids
-				WHERE block_number = $1`
-			// check header was properly indexed
-			buf := bytes.NewBuffer(make([]byte, 0, 80))
-			err = mocks.MockBlock.Header.Serialize(buf)
-			Expect(err).ToNot(HaveOccurred())
-			headerBytes := buf.Bytes()
-			c, _ := ipld.RawdataToCid(ipld.MBitcoinHeader, headerBytes, multihash.DBL_SHA2_256)
-			header := new(btc.HeaderModel)
-			err = db.Get(header, pgStr, mocks.MockHeaderMetaData.BlockNumber)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(header.CID).To(Equal(c.String()))
-			Expect(header.BlockNumber).To(Equal(mocks.MockHeaderMetaData.BlockNumber))
-			Expect(header.Bits).To(Equal(mocks.MockHeaderMetaData.Bits))
-			Expect(header.Timestamp).To(Equal(mocks.MockHeaderMetaData.Timestamp))
-			Expect(header.BlockHash).To(Equal(mocks.MockHeaderMetaData.BlockHash))
-			Expect(header.ParentHash).To(Equal(mocks.MockHeaderMetaData.ParentHash))
-			dc, err := cid.Decode(header.CID)
-			Expect(err).ToNot(HaveOccurred())
-			mhKey := dshelp.MultihashToDsKey(dc.Hash())
-			prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
-			var data []byte
-			err = db.Get(&data, ipfsPgGet, prefixedKey)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(data).To(Equal(headerBytes))
-
-			// check that txs were properly indexed
-			trxs := make([]btc.TxModel, 0)
-			pgStr = `SELECT transaction_cids.id, transaction_cids.header_id, transaction_cids.index,
-				transaction_cids.tx_hash, transaction_cids.cid, transaction_cids.segwit, transaction_cids.witness_hash
-				FROM btc.transaction_cids INNER JOIN btc.header_cids ON (transaction_cids.header_id = header_cids.id)
-				WHERE header_cids.block_number = $1`
-			err = db.Select(&trxs, pgStr, mocks.MockHeaderMetaData.BlockNumber)
-			Expect(err).ToNot(HaveOccurred())
-			Expect(len(trxs)).To(Equal(3))
-			txData := make([][]byte, len(mocks.MockTransactions))
-			txCIDs := make([]string, len(mocks.MockTransactions))
-			for i, m := range mocks.MockTransactions {
-				buf := bytes.NewBuffer(make([]byte, 0))
-				err = m.MsgTx().Serialize(buf)
-				Expect(err).ToNot(HaveOccurred())
-				tx := buf.Bytes()
-				txData[i] = tx
-				c, _ := ipld.RawdataToCid(ipld.MBitcoinTx, tx, multihash.DBL_SHA2_256)
-				txCIDs[i] = c.String()
-			}
-			for _, tx := range trxs {
-				Expect(tx.SegWit).To(Equal(false))
-				Expect(tx.HeaderID).To(Equal(header.ID))
-				Expect(tx.WitnessHash).To(Equal(""))
-				Expect(tx.CID).To(Equal(txCIDs[tx.Index]))
-				Expect(tx.TxHash).To(Equal(mocks.MockBlock.Transactions[tx.Index].TxHash().String()))
-				dc, err := cid.Decode(tx.CID)
-				Expect(err).ToNot(HaveOccurred())
-				mhKey := dshelp.MultihashToDsKey(dc.Hash())
-				prefixedKey := blockstore.BlockPrefix.String() + mhKey.String()
-				var data []byte
-				err = db.Get(&data, ipfsPgGet, prefixedKey)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(data).To(Equal(txData[tx.Index]))
-			}
-		})
-	})
-})
@@ -1,117 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/dag_putters"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// IPLDPublisher satisfies the IPLDPublisher for ethereum
-type IPLDPublisher struct {
-	HeaderPutter          ipfs.DagPutter
-	TransactionPutter     ipfs.DagPutter
-	TransactionTriePutter ipfs.DagPutter
-}
-
-// NewIPLDPublisher creates a pointer to a new Publisher which satisfies the IPLDPublisher interface
-func NewIPLDPublisher(ipfsPath string) (*IPLDPublisher, error) {
-	node, err := ipfs.InitIPFSNode(ipfsPath)
-	if err != nil {
-		return nil, err
-	}
-	return &IPLDPublisher{
-		HeaderPutter:          dag_putters.NewBtcHeaderDagPutter(node),
-		TransactionPutter:     dag_putters.NewBtcTxDagPutter(node),
-		TransactionTriePutter: dag_putters.NewBtcTxTrieDagPutter(node),
-	}, nil
-}
-
-// Publish publishes an IPLDPayload to IPFS and returns the corresponding CIDPayload
-func (pub *IPLDPublisher) Publish(payload shared.ConvertedData) (shared.CIDsForIndexing, error) {
-	ipldPayload, ok := payload.(ConvertedPayload)
-	if !ok {
-		return nil, fmt.Errorf("eth publisher expected payload type %T got %T", &ConvertedPayload{}, payload)
-	}
-	// Generate nodes
-	headerNode, txNodes, txTrieNodes, err := ipld.FromHeaderAndTxs(ipldPayload.Header, ipldPayload.Txs)
-	if err != nil {
-		return nil, err
-	}
-	// Process and publish headers
-	headerCid, err := pub.publishHeader(headerNode)
-	if err != nil {
-		return nil, err
-	}
-	header := HeaderModel{
-		CID:         headerCid,
-		ParentHash:  ipldPayload.Header.PrevBlock.String(),
-		BlockNumber: strconv.Itoa(int(ipldPayload.BlockPayload.BlockHeight)),
-		BlockHash:   ipldPayload.Header.BlockHash().String(),
-		Timestamp:   ipldPayload.Header.Timestamp.UnixNano(),
-		Bits:        ipldPayload.Header.Bits,
-	}
-	// Process and publish transactions
-	transactionCids, err := pub.publishTransactions(txNodes, txTrieNodes, ipldPayload.TxMetaData)
-	if err != nil {
-		return nil, err
-	}
-	// Package CIDs and their metadata into a single struct
-	return &CIDPayload{
-		HeaderCID:       header,
-		TransactionCIDs: transactionCids,
-	}, nil
-}
-
-func (pub *IPLDPublisher) publishHeader(header *ipld.BtcHeader) (string, error) {
-	cid, err := pub.HeaderPutter.DagPut(header)
-	if err != nil {
-		return "", err
-	}
-	return cid, nil
-}
-
-func (pub *IPLDPublisher) publishTransactions(transactions []*ipld.BtcTx, txTrie []*ipld.BtcTxTrie, trxMeta []TxModelWithInsAndOuts) ([]TxModelWithInsAndOuts, error) {
-	txCids := make([]TxModelWithInsAndOuts, len(transactions))
-	for i, tx := range transactions {
-		cid, err := pub.TransactionPutter.DagPut(tx)
-		if err != nil {
-			return nil, err
-		}
-		txCids[i] = TxModelWithInsAndOuts{
-			CID:         cid,
-			Index:       trxMeta[i].Index,
-			TxHash:      trxMeta[i].TxHash,
-			SegWit:      trxMeta[i].SegWit,
-			WitnessHash: trxMeta[i].WitnessHash,
-			TxInputs:    trxMeta[i].TxInputs,
-			TxOutputs:   trxMeta[i].TxOutputs,
-		}
-	}
-	for _, txNode := range txTrie {
-		// We don't do anything with the tx trie cids atm
-		if _, err := pub.TransactionTriePutter.DagPut(txNode); err != nil {
-			return nil, err
-		}
-	}
-	return txCids, nil
-}
@@ -1,81 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc_test
-
-import (
-	"bytes"
-
-	"github.com/ethereum/go-ethereum/common"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/btc/mocks"
-	mocks2 "github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs/mocks"
-)
-
-var (
-	mockHeaderDagPutter  *mocks2.MappedDagPutter
-	mockTrxDagPutter     *mocks2.MappedDagPutter
-	mockTrxTrieDagPutter *mocks2.DagPutter
-)
-
-var _ = Describe("Publisher", func() {
-	BeforeEach(func() {
-		mockHeaderDagPutter = new(mocks2.MappedDagPutter)
-		mockTrxDagPutter = new(mocks2.MappedDagPutter)
-		mockTrxTrieDagPutter = new(mocks2.DagPutter)
-	})
-
-	Describe("Publish", func() {
-		It("Publishes the passed IPLDPayload objects to IPFS and returns a CIDPayload for indexing", func() {
-			by := new(bytes.Buffer)
-			err := mocks.MockConvertedPayload.BlockPayload.Header.Serialize(by)
-			Expect(err).ToNot(HaveOccurred())
-			headerBytes := by.Bytes()
-			err = mocks.MockTransactions[0].MsgTx().Serialize(by)
-			Expect(err).ToNot(HaveOccurred())
-			tx1Bytes := by.Bytes()
-			err = mocks.MockTransactions[1].MsgTx().Serialize(by)
-			Expect(err).ToNot(HaveOccurred())
-			tx2Bytes := by.Bytes()
-			err = mocks.MockTransactions[2].MsgTx().Serialize(by)
-			Expect(err).ToNot(HaveOccurred())
-			tx3Bytes := by.Bytes()
-			mockHeaderDagPutter.CIDsToReturn = map[common.Hash]string{
-				common.BytesToHash(headerBytes): "mockHeaderCID",
-			}
-			mockTrxDagPutter.CIDsToReturn = map[common.Hash]string{
-				common.BytesToHash(tx1Bytes): "mockTrxCID1",
-				common.BytesToHash(tx2Bytes): "mockTrxCID2",
-				common.BytesToHash(tx3Bytes): "mockTrxCID3",
-			}
-			publisher := btc.IPLDPublisher{
-				HeaderPutter:          mockHeaderDagPutter,
-				TransactionPutter:     mockTrxDagPutter,
-				TransactionTriePutter: mockTrxTrieDagPutter,
-			}
-			payload, err := publisher.Publish(mocks.MockConvertedPayload)
-			Expect(err).ToNot(HaveOccurred())
-			cidPayload, ok := payload.(*btc.CIDPayload)
-			Expect(ok).To(BeTrue())
-			Expect(cidPayload).To(Equal(&mocks.MockCIDPayload))
-			Expect(cidPayload.HeaderCID).To(Equal(mocks.MockHeaderMetaData))
-			Expect(cidPayload.TransactionCIDs).To(Equal(mocks.MockTxsMetaDataPostPublish))
-		})
-	})
-})
@@ -1,86 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"github.com/btcsuite/btcd/rpcclient"
-	"github.com/btcsuite/btcd/wire"
-	"github.com/btcsuite/btcutil"
-	"github.com/sirupsen/logrus"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-const (
-	PayloadChanBufferSize = 20000 // the max eth sub buffer size
-)
-
-// PayloadStreamer satisfies the PayloadStreamer interface for bitcoin
-type PayloadStreamer struct {
-	Config *rpcclient.ConnConfig
-}
-
-// NewPayloadStreamer creates a pointer to a new PayloadStreamer which satisfies the PayloadStreamer interface for bitcoin
-func NewPayloadStreamer(clientConfig *rpcclient.ConnConfig) *PayloadStreamer {
-	return &PayloadStreamer{
-		Config: clientConfig,
-	}
-}
-
-// Stream is the main loop for subscribing to data from the btc block notifications
-// Satisfies the shared.PayloadStreamer interface
-func (ps *PayloadStreamer) Stream(payloadChan chan shared.RawChainData) (shared.ClientSubscription, error) {
-	logrus.Info("streaming block payloads from btc")
-	blockNotificationHandler := rpcclient.NotificationHandlers{
-		// Notification handler for block connections, forwards new block data to the payloadChan
-		OnFilteredBlockConnected: func(height int32, header *wire.BlockHeader, txs []*btcutil.Tx) {
-			payloadChan <- BlockPayload{
-				BlockHeight: int64(height),
-				Header:      header,
-				Txs:         txs,
-			}
-		},
-	}
-	// Create a new client, and connect to btc ws server
-	client, err := rpcclient.New(ps.Config, &blockNotificationHandler)
-	if err != nil {
-		return nil, err
-	}
-	// Register for block connect notifications.
-	if err := client.NotifyBlocks(); err != nil {
-		return nil, err
-	}
-	client.WaitForShutdown()
-	return &ClientSubscription{client: client}, nil
-}
-
-// ClientSubscription is a wrapper around the underlying btcd rpc client
-// to fit the shared.ClientSubscription interface
-type ClientSubscription struct {
-	client *rpcclient.Client
-}
-
-// Unsubscribe satisfies the rpc.Subscription interface
-func (bcs *ClientSubscription) Unsubscribe() {
-	bcs.client.Shutdown()
-}
-
-// Err() satisfies the rpc.Subscription interface with a dummy err channel
-func (bcs *ClientSubscription) Err() <-chan error {
-	errChan := make(chan error)
-	return errChan
-}
@@ -1,115 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"errors"
-	"math/big"
-
-	"github.com/spf13/viper"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
-)
-
-// SubscriptionSettings config is used by a subscriber to specify what bitcoin data to stream from the super node
-type SubscriptionSettings struct {
-	BackFill     bool
-	BackFillOnly bool
-	Start        *big.Int
-	End          *big.Int // set to 0 or a negative value to have no ending block
-	HeaderFilter HeaderFilter
-	TxFilter     TxFilter
-}
-
-// HeaderFilter contains filter settings for headers
-type HeaderFilter struct {
-	Off bool
-}
-
-// TxFilter contains filter settings for txs
-type TxFilter struct {
-	Off             bool
-	Segwit          bool     // allow filtering for segwit trxs
-	WitnessHashes   []string // allow filtering for specific witness hashes
-	Indexes         []int64  // allow filtering for specific transaction indexes (e.g. 0 for coinbase transactions)
-	PkScriptClasses []uint8  // allow filtering for txs that have at least one tx output with the specified pkscript class
-	MultiSig        bool     // allow filtering for txs that have at least one tx output that requires more than one signature
-	Addresses       []string // allow filtering for txs that have at least one tx output with at least one of the provided addresses
-}
-
-// Init is used to initialize a EthSubscription struct with env variables
-func NewBtcSubscriptionConfig() (*SubscriptionSettings, error) {
-	sc := new(SubscriptionSettings)
-	// Below default to false, which means we do not backfill by default
-	sc.BackFill = viper.GetBool("superNode.btcSubscription.historicalData")
-	sc.BackFillOnly = viper.GetBool("superNode.btcSubscription.historicalDataOnly")
-	// Below default to 0
-	// 0 start means we start at the beginning and 0 end means we continue indefinitely
-	sc.Start = big.NewInt(viper.GetInt64("superNode.btcSubscription.startingBlock"))
-	sc.End = big.NewInt(viper.GetInt64("superNode.btcSubscription.endingBlock"))
-	// Below default to false, which means we get all headers by default
-	sc.HeaderFilter = HeaderFilter{
-		Off: viper.GetBool("superNode.btcSubscription.headerFilter.off"),
-	}
-	// Below defaults to false and two slices of length 0
-	// Which means we get all transactions by default
-	pksc := viper.Get("superNode.btcSubscription.txFilter.pkScriptClass")
-	pkScriptClasses, ok := pksc.([]uint8)
-	if !ok {
-		return nil, errors.New("superNode.btcSubscription.txFilter.pkScriptClass needs to be an array of uint8s")
-	}
-	is := viper.Get("superNode.btcSubscription.txFilter.indexes")
-	indexes, ok := is.([]int64)
-	if !ok {
-		return nil, errors.New("superNode.btcSubscription.txFilter.indexes needs to be an array of int64s")
-	}
-	sc.TxFilter = TxFilter{
-		Off:             viper.GetBool("superNode.btcSubscription.txFilter.off"),
-		Segwit:          viper.GetBool("superNode.btcSubscription.txFilter.segwit"),
-		WitnessHashes:   viper.GetStringSlice("superNode.btcSubscription.txFilter.witnessHashes"),
-		PkScriptClasses: pkScriptClasses,
-		Indexes:         indexes,
-		MultiSig:        viper.GetBool("superNode.btcSubscription.txFilter.multiSig"),
-		Addresses:       viper.GetStringSlice("superNode.btcSubscription.txFilter.addresses"),
-	}
-	return sc, nil
-}
-
-// StartingBlock satisfies the SubscriptionSettings() interface
-func (sc *SubscriptionSettings) StartingBlock() *big.Int {
-	return sc.Start
-}
-
-// EndingBlock satisfies the SubscriptionSettings() interface
-func (sc *SubscriptionSettings) EndingBlock() *big.Int {
-	return sc.End
-}
-
-// HistoricalData satisfies the SubscriptionSettings() interface
-func (sc *SubscriptionSettings) HistoricalData() bool {
-	return sc.BackFill
-}
-
-// HistoricalDataOnly satisfies the SubscriptionSettings() interface
-func (sc *SubscriptionSettings) HistoricalDataOnly() bool {
-	return sc.BackFillOnly
-}
-
-// ChainType satisfies the SubscriptionSettings() interface
-func (sc *SubscriptionSettings) ChainType() shared.ChainType {
-	return shared.Bitcoin
-}
@@ -1,43 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	. "github.com/onsi/gomega"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-)
-
-// TearDownDB is used to tear down the super node dbs after tests
-func TearDownDB(db *postgres.DB) {
-	tx, err := db.Beginx()
-	Expect(err).NotTo(HaveOccurred())
-
-	_, err = tx.Exec(`DELETE FROM btc.header_cids`)
-	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM btc.transaction_cids`)
-	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM btc.tx_inputs`)
-	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM btc.tx_outputs`)
-	Expect(err).NotTo(HaveOccurred())
-	_, err = tx.Exec(`DELETE FROM blocks`)
-	Expect(err).NotTo(HaveOccurred())
-
-	err = tx.Commit()
-	Expect(err).NotTo(HaveOccurred())
-}
@@ -1,76 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package btc
-
-import (
-	"math/big"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/ipfs"
-
-	"github.com/btcsuite/btcd/wire"
-	"github.com/btcsuite/btcutil"
-)
-
-// BlockPayload packages the block and tx data received from block connection notifications
-type BlockPayload struct {
-	BlockHeight int64
-	Header      *wire.BlockHeader
-	Txs         []*btcutil.Tx
-}
-
-// ConvertedPayload is a custom type which packages raw BTC data for publishing to IPFS and filtering to subscribers
-// Returned by PayloadConverter
-// Passed to IPLDPublisher and ResponseFilterer
-type ConvertedPayload struct {
-	BlockPayload
-	TxMetaData []TxModelWithInsAndOuts
-}
-
-// Height satisfies the StreamedIPLDs interface
-func (cp ConvertedPayload) Height() int64 {
-	return cp.BlockPayload.BlockHeight
-}
-
-// CIDPayload is a struct to hold all the CIDs and their associated meta data for indexing in Postgres
-// Returned by IPLDPublisher
-// Passed to CIDIndexer
-type CIDPayload struct {
-	HeaderCID       HeaderModel
-	TransactionCIDs []TxModelWithInsAndOuts
-}
-
-// CIDWrapper is used to direct fetching of IPLDs from IPFS
-// Returned by CIDRetriever
-// Passed to IPLDFetcher
-type CIDWrapper struct {
-	BlockNumber  *big.Int
-	Header       HeaderModel
-	Transactions []TxModel
-}
-
-// IPLDs is used to package raw IPLD block data fetched from IPFS and returned by the server
-// Returned by IPLDFetcher and ResponseFilterer
-type IPLDs struct {
-	BlockNumber  *big.Int
-	Header       ipfs.BlockModel
-	Transactions []ipfs.BlockModel
-}
-
-// Height satisfies the StreamedIPLDs interface
-func (i IPLDs) Height() int64 {
-	return i.BlockNumber.Int64()
-}
@@ -14,31 +14,32 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.

-package mocks
+// Client is used by watchers to stream chain IPLD data from a vulcanizedb ipld-eth-server
+package client

 import (
 	"context"

+	"github.com/vulcanize/ipld-eth-server/pkg/eth"
+
 	"github.com/ethereum/go-ethereum/rpc"
+
+	"github.com/vulcanize/ipld-eth-server/pkg/serve"
 )

-type StreamClient struct {
-	passedContext       context.Context
-	passedResult        interface{}
-	passedNamespace     string
-	passedPayloadChan   interface{}
-	passedSubscribeArgs []interface{}
+// Client is used to subscribe to the ipld-eth-server ipld data stream
+type Client struct {
+	c *rpc.Client
 }

-func (client *StreamClient) Subscribe(ctx context.Context, namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error) {
-	client.passedNamespace = namespace
-	client.passedPayloadChan = payloadChan
-	client.passedContext = ctx
-
-	for _, arg := range args {
-		client.passedSubscribeArgs = append(client.passedSubscribeArgs, arg)
+// NewClient creates a new Client
+func NewClient(c *rpc.Client) *Client {
+	return &Client{
+		c: c,
 	}
+}

-	subscription := rpc.ClientSubscription{}
-	return &subscription, nil
+// Stream is the main loop for subscribing to iplds from an ipld-eth-server server
+func (c *Client) Stream(payloadChan chan serve.SubscriptionPayload, params eth.SubscriptionSettings) (*rpc.ClientSubscription, error) {
+	return c.c.Subscribe(context.Background(), "vdb", payloadChan, "stream", params)
 }
@@ -1,93 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package client
-
-import (
-	"context"
-	"errors"
-	"reflect"
-
-	"github.com/ethereum/go-ethereum/rpc"
-)
-
-// RPCClient is a wrapper around the geth RPC client
-type RPCClient struct {
-	client  *rpc.Client
-	ipcPath string
-}
-
-// BatchElem is a struct to hold the elements of a BatchCall
-type BatchElem struct {
-	Method string
-	Args   []interface{}
-	Result interface{}
-	Error  error
-}
-
-// NewRPCClient creates a new RpcClient
-func NewRPCClient(client *rpc.Client, ipcPath string) RPCClient {
-	return RPCClient{
-		client:  client,
-		ipcPath: ipcPath,
-	}
-}
-
-// CallContext makes an rpc method call with the provided context and arguments
-func (client RPCClient) CallContext(ctx context.Context, result interface{}, method string, args ...interface{}) error {
-	//If an empty interface (or other nil object) is passed to CallContext, when the JSONRPC message is created the params will
-	//be interpreted as [null]. This seems to work fine for most of the ethereum clients (which presumably ignore a null parameter.
-	//Ganache however does not ignore it, and throws an 'Incorrect number of arguments' error.
-	if args == nil {
-		return client.client.CallContext(ctx, result, method)
-	}
-	return client.client.CallContext(ctx, result, method, args...)
-}
-
-func (client RPCClient) IpcPath() string {
-	return client.ipcPath
-}
-
-func (client RPCClient) SupportedModules() (map[string]string, error) {
-	return client.client.SupportedModules()
-}
-
-func (client RPCClient) BatchCall(batch []BatchElem) error {
-	var rpcBatch []rpc.BatchElem
-	for _, batchElem := range batch {
-		var newBatchElem = rpc.BatchElem{
-			Result: batchElem.Result,
-			Method: batchElem.Method,
-			Args:   batchElem.Args,
-			Error:  batchElem.Error,
-		}
-		rpcBatch = append(rpcBatch, newBatchElem)
-	}
-	return client.client.BatchCall(rpcBatch)
-}
-
-// Subscribe subscribes to an rpc "namespace_subscribe" subscription with the given channel
-// The first argument needs to be the method we wish to invoke
-func (client RPCClient) Subscribe(namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error) {
-	chanVal := reflect.ValueOf(payloadChan)
-	if chanVal.Kind() != reflect.Chan || chanVal.Type().ChanDir()&reflect.SendDir == 0 {
-		return nil, errors.New("second argument to Subscribe must be a writable channel")
-	}
-	if chanVal.IsNil() {
-		return nil, errors.New("channel given to Subscribe must not be nil")
-	}
-	return client.client.Subscribe(context.Background(), namespace, payloadChan, args...)
-}
@@ -1,29 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package config_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"testing"
-)
-
-func TestConfig(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Config Suite")
-}
@@ -1,54 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package config_test
-
-import (
-	"bytes"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-	"github.com/spf13/viper"
-)
-
-var vulcanizeConfig = []byte(`
-[database]
-name = "dbname"
-hostname = "localhost"
-port = 5432
-
-[client]
-ipcPath = "IPCPATH/geth.ipc"
-`)
-
-var _ = Describe("Loading the config", func() {
-
-	It("reads the private config using the environment", func() {
-		viper.SetConfigName("config")
-		viper.AddConfigPath("$GOPATH/src/github.com/vulcanize/ipfs-blockchain-watcher/environments/")
-		Expect(viper.Get("client.ipcpath")).To(BeNil())
-
-		testConfig := viper.New()
-		testConfig.SetConfigType("toml")
-		err := testConfig.ReadConfig(bytes.NewBuffer(vulcanizeConfig))
-		Expect(err).To(BeNil())
-		Expect(testConfig.Get("database.hostname")).To(Equal("localhost"))
-		Expect(testConfig.Get("database.name")).To(Equal("dbname"))
-		Expect(testConfig.Get("database.port")).To(Equal(int64(5432)))
-		Expect(testConfig.Get("client.ipcpath")).To(Equal("IPCPATH/geth.ipc"))
-	})
-
-})
@@ -1,78 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package config
-
-import (
-	"fmt"
-
-	"github.com/spf13/viper"
-)
-
-// Env variables
-const (
-	DATABASE_NAME                 = "DATABASE_NAME"
-	DATABASE_HOSTNAME             = "DATABASE_HOSTNAME"
-	DATABASE_PORT                 = "DATABASE_PORT"
-	DATABASE_USER                 = "DATABASE_USER"
-	DATABASE_PASSWORD             = "DATABASE_PASSWORD"
-	DATABASE_MAX_IDLE_CONNECTIONS = "DATABASE_MAX_IDLE_CONNECTIONS"
-	DATABASE_MAX_OPEN_CONNECTIONS = "DATABASE_MAX_OPEN_CONNECTIONS"
-	DATABASE_MAX_CONN_LIFETIME    = "DATABASE_MAX_CONN_LIFETIME"
-)
-
-type Database struct {
-	Hostname    string
-	Name        string
-	User        string
-	Password    string
-	Port        int
-	MaxIdle     int
-	MaxOpen     int
-	MaxLifetime int
-}
-
-func DbConnectionString(dbConfig Database) string {
-	if len(dbConfig.User) > 0 && len(dbConfig.Password) > 0 {
-		return fmt.Sprintf("postgresql://%s:%s@%s:%d/%s?sslmode=disable",
-			dbConfig.User, dbConfig.Password, dbConfig.Hostname, dbConfig.Port, dbConfig.Name)
-	}
-	if len(dbConfig.User) > 0 && len(dbConfig.Password) == 0 {
-		return fmt.Sprintf("postgresql://%s@%s:%d/%s?sslmode=disable",
-			dbConfig.User, dbConfig.Hostname, dbConfig.Port, dbConfig.Name)
-	}
-	return fmt.Sprintf("postgresql://%s:%d/%s?sslmode=disable", dbConfig.Hostname, dbConfig.Port, dbConfig.Name)
-}
-
-func (d *Database) Init() {
-	viper.BindEnv("database.name", DATABASE_NAME)
-	viper.BindEnv("database.hostname", DATABASE_HOSTNAME)
-	viper.BindEnv("database.port", DATABASE_PORT)
-	viper.BindEnv("database.user", DATABASE_USER)
-	viper.BindEnv("database.password", DATABASE_PASSWORD)
-	viper.BindEnv("database.maxIdle", DATABASE_MAX_IDLE_CONNECTIONS)
-	viper.BindEnv("database.maxOpen", DATABASE_MAX_OPEN_CONNECTIONS)
-	viper.BindEnv("database.maxLifetime", DATABASE_MAX_CONN_LIFETIME)
-
-	d.Name = viper.GetString("database.name")
-	d.Hostname = viper.GetString("database.hostname")
-	d.Port = viper.GetInt("database.port")
-	d.User = viper.GetString("database.user")
-	d.Password = viper.GetString("database.password")
-	d.MaxIdle = viper.GetInt("database.maxIdle")
-	d.MaxOpen = viper.GetInt("database.maxOpen")
-	d.MaxLifetime = viper.GetInt("database.maxLifetime")
-}
@@ -1,36 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package core
-
-import (
-	"context"
-	"math/big"
-
-	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core/types"
-)
-
-type EthClient interface {
-	BlockByNumber(ctx context.Context, number *big.Int) (*types.Block, error)
-	CallContract(ctx context.Context, msg ethereum.CallMsg, blockNumber *big.Int) ([]byte, error)
-	FilterLogs(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error)
-	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
-	TransactionSender(ctx context.Context, tx *types.Transaction, block common.Hash, index uint) (common.Address, error)
-	TransactionReceipt(ctx context.Context, txHash common.Hash) (*types.Receipt, error)
-	BalanceAt(ctx context.Context, account common.Address, blockNumber *big.Int) (*big.Int, error)
-}
@@ -1,57 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package core
-
-import (
-	"fmt"
-)
-
-type NodeType int
-
-const (
-	GETH NodeType = iota
-	PARITY
-	INFURA
-	GANACHE
-)
-
-const (
-	KOVAN_NETWORK_ID = 42
-)
-
-type Node struct {
-	GenesisBlock string
-	NetworkID    string
-	ID           string
-	ClientName   string
-}
-
-type ParityNodeInfo struct {
-	Track         string
-	ParityVersion `json:"version"`
-	Hash          string
-}
-
-func (pn ParityNodeInfo) String() string {
-	return fmt.Sprintf("Parity/v%d.%d.%d/", pn.Major, pn.Minor, pn.Patch)
-}
-
-type ParityVersion struct {
-	Major int
-	Minor int
-	Patch int
-}
@@ -1,33 +0,0 @@
-// VulcanizeDB
-// Copyright © 2019 Vulcanize
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package core
-
-import (
-	"context"
-
-	"github.com/ethereum/go-ethereum/rpc"
-
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
-)
-
-type RPCClient interface {
-	CallContext(ctx context.Context, result interface{}, method string, args ...interface{}) error
-	BatchCall(batch []client.BatchElem) error
-	IpcPath() string
-	SupportedModules() (map[string]string, error)
-	Subscribe(namespace string, payloadChan interface{}, args ...interface{}) (*rpc.ClientSubscription, error)
-}
@@ -20,7 +20,8 @@ import (
 	"context"
 	"math/big"

-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/pkg/shared"

 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
@@ -29,10 +30,10 @@ import (
 	"github.com/ethereum/go-ethereum/rpc"
 )

-// APIName is the namespace for the super node's eth api
+// APIName is the namespace for the watcher's eth api
 const APIName = "eth"

-// APIVersion is the version of the super node's eth api
+// APIVersion is the version of the watcher's eth api
 const APIVersion = "0.0.1"

 type PublicEthAPI struct {
@@ -127,7 +128,7 @@ func (pea *PublicEthAPI) GetLogs(ctx context.Context, crit ethereum.FilterQuery)
 	}
 	start := startingBlock.Int64()
 	end := endingBlock.Int64()
-	allRctCIDs := make([]ReceiptModel, 0)
+	allRctCIDs := make([]eth.ReceiptModel, 0)
 	for i := start; i <= end; i++ {
 		rctCIDs, err := pea.B.Retriever.RetrieveRctCIDs(tx, filter, i, nil, nil)
 		if err != nil {
@@ -181,7 +182,7 @@ func (pea *PublicEthAPI) GetBlockByHash(ctx context.Context, hash common.Hash, f
 }

 // GetTransactionByHash returns the transaction for the given hash
-// SuperNode cannot currently handle pending/tx_pool txs
+// eth ipld-eth-server cannot currently handle pending/tx_pool txs
 func (pea *PublicEthAPI) GetTransactionByHash(ctx context.Context, hash common.Hash) (*RPCTransaction, error) {
 	// Try to return an already finalized transaction
 	tx, blockHash, blockNumber, index, err := pea.B.GetTransaction(ctx, hash)
@@ -21,19 +21,20 @@ import (
 	"strconv"

 	"github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/core/types"
-
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/rpc"

 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"

-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth/mocks"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/shared"
+	eth2 "github.com/vulcanize/ipld-eth-indexer/pkg/eth"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/eth/mocks"
+	"github.com/vulcanize/ipld-eth-indexer/pkg/postgres"
+
+	"github.com/vulcanize/ipld-eth-server/pkg/eth"
+	"github.com/vulcanize/ipld-eth-server/pkg/shared"
 )

 var (
@@ -84,8 +85,8 @@ var _ = Describe("API", func() {
 	var (
 		db                *postgres.DB
 		retriever         *eth.CIDRetriever
-		fetcher           *eth.IPLDPGFetcher
-		indexAndPublisher *eth.IPLDPublisherAndIndexer
+		fetcher           *eth.IPLDFetcher
+		indexAndPublisher *eth2.IPLDPublisher
 		backend           *eth.Backend
 		api               *eth.PublicEthAPI
 	)
@@ -94,15 +95,15 @@ var _ = Describe("API", func() {
 		db, err = shared.SetupDB()
 		Expect(err).ToNot(HaveOccurred())
 		retriever = eth.NewCIDRetriever(db)
-		fetcher = eth.NewIPLDPGFetcher(db)
-		indexAndPublisher = eth.NewIPLDPublisherAndIndexer(db)
+		fetcher = eth.NewIPLDFetcher(db)
+		indexAndPublisher = eth2.NewIPLDPublisher(db)
 		backend = &eth.Backend{
 			Retriever: retriever,
 			Fetcher:   fetcher,
 			DB:        db,
 		}
 		api = eth.NewPublicEthAPI(backend)
-		_, err = indexAndPublisher.Publish(mocks.MockConvertedPayload)
+		err = indexAndPublisher.Publish(mocks.MockConvertedPayload)
 		Expect(err).ToNot(HaveOccurred())
 		uncles := mocks.MockBlock.Uncles()
 		uncleHashes := make([]common.Hash, len(uncles))
@@ -124,7 +125,7 @@ var _ = Describe("API", func() {
 	})

 	Describe("GetTransactionByHash", func() {
-		It("Retrieves the head block number", func() {
+		It("Retrieves a transaction by hash", func() {
 			hash := mocks.MockTransactions[0].Hash()
 			tx, err := api.GetTransactionByHash(context.Background(), hash)
 			Expect(err).ToNot(HaveOccurred())
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ramil Amerzyanov	4427bebe0a	Merge pull request #7 from vulcanize/vhost add * to vhost to allow connecting to server in docker-compose	2020-09-11 14:34:33 +03:00
ramil	4e063171a9	add * to vhost to allow connecting to server in docker-compose	2020-09-11 14:21:43 +03:00
Ramil Amerzyanov	b5fc0e7c44	Merge pull request #6 from vulcanize/docker Docker compose and CI	2020-09-09 23:12:36 +03:00
ramil	6027e7dc3d	remove unused commented lines	2020-09-09 23:06:43 +03:00
ramil	d21a6e65a7	fix postgraphile image tag	2020-09-09 23:04:15 +03:00
ramil	dc9081e271	github actions (pull request, master, release)	2020-09-07 16:31:18 +03:00
ramil	1d57f75dcf	docker compose for dapptools, postgraphile, eth-indexer and eth-server	2020-09-06 12:32:11 +03:00
Ian Norden	c098e07d51	Merge pull request #3 from vulcanize/ipld-eth-server Ipld eth server	2020-09-02 14:15:02 -05:00
Ian Norden	add6afadd7	fix subscribe command and client (remove rlp encoding of subscription params)	2020-09-02 14:13:51 -05:00
Ian Norden	e917ccb973	use v0.2.0-alpha release of eth-ipld-indexer	2020-09-02 14:04:36 -05:00
Ian Norden	065e70185a	using local dep until we cut release of ipld-eth-indexer	2020-09-02 10:23:37 -05:00
Ian Norden	dbcb2c0cf7	updat dep and serve cmd	2020-09-02 10:19:25 -05:00
Ian Norden	9758770579	update migrations and schema	2020-09-02 10:12:47 -05:00
Ian Norden	1dee766014	update readme	2020-09-02 09:18:31 -05:00
Ian Norden	0d28234804	continue refactor/purge	2020-09-01 16:15:31 -05:00
Ian Norden	f4b7b92dd8	bump minor version	2020-08-31 10:59:44 -05:00
Ian Norden	d645f52e87	watch => serve	2020-08-31 10:59:41 -05:00
Ian Norden	f4591a6beb	update deps/paths/names	2020-08-31 10:52:47 -05:00
Ian Norden	5830df44a4	decouple from sync	2020-08-31 10:47:06 -05:00
Ian Norden	558599dd32	remove btc stuff	2020-08-31 10:42:01 -05:00
Ian Norden	3fd2af61e8	Merge pull request #25 from vulcanize/staging_fixes log level env var; update geth dep	2020-08-17 17:08:19 -05:00
Ian Norden	2817d847ef	log level env var; update geth dep	2020-08-17 16:51:53 -05:00
Ian Norden	578afaf314	Merge pull request #17 from vulcanize/eth_json_rpc eth json rpc optimizations; begin ipfs-ethdb integration	2020-08-14 15:21:58 -05:00
Ian Norden	611fc2c11e	eth json rpc optimizations; begin ipfs-ethdb integration	2020-08-14 13:14:19 -05:00
Ian Norden	d842a5e796	Merge pull request #11 from vulcanize/doc Testnet fixes	2020-08-12 09:36:16 -05:00
Ian Norden	a532e17e21	remove option for publishing through ipfs node interface	2020-08-12 09:26:18 -05:00
Ian Norden	39354b2114	write code to pg-ipfs table, for codehash lookups	2020-08-12 09:26:18 -05:00
Ian Norden	52b5c99760	fix support for eth testnet chains (use correct tx signer)	2020-08-12 09:26:18 -05:00
Ian Norden	c4876739a1	Merge pull request #12 from ramilexe/fix_readme fix readme (database user and password)	2020-08-12 09:24:46 -05:00
ramil	6175fc02c4	fix readme (database user and password)	2020-08-12 04:35:17 +03:00
Ian Norden	15d037b8fd	Merge pull request #10 from vulcanize/docker-compose_fix Fixes issues with docker-compose	2020-08-11 11:19:52 -05:00
A. F. Dudley	30b07b8669	Fixes issues with docker-compose	2020-08-11 11:19:09 -05:00
A. F. Dudley	e2d591b3f7	Update README.md	2020-08-09 08:10:39 -07:00
Ian Norden	fb340aca18	Merge pull request #7 from vulcanize/doc Misc fixes	2020-08-07 23:29:10 -05:00
Ian Norden	4d4e5eb029	specify GO111MODLE state in readme, explicitly use GO111MODULE=on in make build	2020-08-07 23:17:16 -05:00
Ian Norden	7b0b613b92	misc adjustments	2020-08-07 23:17:16 -05:00
Ian Norden	74752d15aa	remove diff unique connstraint, overwrite as diff	2020-08-07 23:17:11 -05:00
Ian Norden	943e2ba8e2	Merge pull request #5 from vulcanize/doc update docs	2020-08-05 11:58:29 -05:00
Ian Norden	2b8e5ad05a	fix flaky test	2020-08-05 11:55:36 -05:00
Ian Norden	1137436ac0	remove references to vulcanizedb repo and some other minor changes/additions	2020-08-05 11:02:39 -05:00
Ian Norden	b9fbd2da53	update docs	2020-08-05 00:23:06 -05:00
Ian Norden	96ac218218	Merge pull request #4 from vulcanize/backfill_head_to_tail Reference IPLD data by multihash-key foreign key	2020-08-05 00:01:51 -05:00
Ian Norden	77b7bcc94c	adjust everything to work with mh fks	2020-08-04 22:35:05 -05:00
Ian Norden	77490e8b4b	add diff field to db constraint	2020-08-04 22:35:02 -05:00
Ian Norden	18299c76e2	refactor migrations for new db instance, add mh_key rows	2020-07-13 10:39:51 -05:00
Ian Norden	0ab55ef9d8	distinguish between differential state/storage nodes and eventual ones	2020-07-01 13:44:04 -05:00
Ian Norden	e2bcc06f8a	major refactor pt 3	2020-06-29 19:16:52 -05:00
Ian Norden	449d23757e	pkg rename	2020-06-29 16:56:25 -05:00