Merge pull request #33 from vulcanize/fill_gaps

use v1.9.25-statediff-0.0.15

.github/workflows/on-master.yaml

@@ -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}}
+

.github/workflows/on-pr.yaml

@@ -0,0 +1,35 @@
+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
+  test:
+    name: Run integration tests
+    env:
+      GOPATH: /tmp/go
+    strategy:
+      matrix:
+        go-version: [1.14.x, 1.15.x]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Create GOPATH
+        run: mkdir -p /tmp/go
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - uses: actions/checkout@v2
+      - name: Run database
+        run: docker-compose up -d db
+      - name: Test
+        run: |
+          sleep 10
+          PGPASSWORD=password DATABASE_USER=vdbm DATABASE_PORT=8077 DATABASE_PASSWORD=password DATABASE_HOSTNAME=127.0.0.1 make test

.github/workflows/publish.yaml

@@ -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}}
+

.gitignore

@@ -7,7 +7,7 @@ Vagrantfile
 vagrant*.sh
 .vagrant
 test_scripts/
-ipfs-chain-watcher
+ipld-eth-server
 postgraphile/build/
 postgraphile/node_modules/
 postgraphile/package-lock.json

.travis.yml

@@ -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-chain-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

Dockerfile

@@ -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-chain-watcher
-ADD . /go/src/github.com/vulcanize/ipfs-chain-watcher
-WORKDIR /go/src/github.com/vulcanize/ipfs-chain-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-chain-watcher/vulcanizedb /app/vulcanizedb
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-chain-watcher/environments/staging.toml /app/environments/
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-chain-watcher/dockerfiles/startup_script.sh /app/
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-chain-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"]

Makefile

@@ -11,8 +11,7 @@ $(BIN)/ginkgo:
 ## Migration tool
 GOOSE = $(BIN)/goose
 $(BIN)/goose:
-	go get -u -d github.com/pressly/goose/cmd/goose
-	go build -tags='no_mysql no_sqlite' -o $(BIN)/goose github.com/pressly/goose/cmd/goose
+	go get -u github.com/pressly/goose/cmd/goose
 
 ## Source linter
 LINT = $(BIN)/golint
@@ -46,37 +45,59 @@ HOST_NAME = localhost
 PORT = 5432
 NAME =
 USER = postgres
-CONNECT_STRING=postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable
+PASSWORD = password
+CONNECT_STRING=postgresql://$(USER):$(PASSWORD)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable
 
 #Test
 TEST_DB = vulcanize_testing
-TEST_CONNECT_STRING = postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(TEST_DB)?sslmode=disable
+TEST_CONNECT_STRING = postgresql://$(DATABASE_USER):$(DATABASE_PASSWORD)@$(DATABASE_HOSTNAME):$(DATABASE_PORT)/$(TEST_DB)?sslmode=disable
+TEST_CONNECT_STRING_LOCAL = postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(TEST_DB)?sslmode=disable
 
 .PHONY: test
-test: | $(GINKGO) $(LINT)
+test: | $(GINKGO) $(GOOSE)
 	go vet ./...
 	go fmt ./...
-	dropdb --if-exists $(TEST_DB)
-	createdb $(TEST_DB)
+	export PGPASSWORD=$(DATABASE_PASSWORD)
+	dropdb -h $(DATABASE_HOSTNAME) -p $(DATABASE_PORT) -U $(DATABASE_USER) --if-exists $(TEST_DB)
+	createdb -h $(DATABASE_HOSTNAME) -p $(DATABASE_PORT) -U $(DATABASE_USER) $(TEST_DB)
 	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING)" up
-	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING)" reset
-	make migrate NAME=$(TEST_DB)
 	$(GINKGO) -r --skipPackage=integration_tests,integration
 
 .PHONY: integrationtest
-integrationtest: | $(GINKGO) $(LINT)
+integrationtest: | $(GINKGO) $(GOOSE)
 	go vet ./...
 	go fmt ./...
-	dropdb --if-exists $(TEST_DB)
-	createdb $(TEST_DB)
-	$(GOOSE) -dir db/migrations "$(TEST_CONNECT_STRING)" up
-	$(GOOSE) -dir db/migrations "$(TEST_CONNECT_STRING)" reset
+	export PGPASSWORD=$(DATABASE_PASSWORD)
+	dropdb -h $(DATABASE_HOSTNAME) -p $(DATABASE_PORT) -U $(DATABASE_USER) --if-exists $(TEST_DB)
+	createdb -h $(DATABASE_HOSTNAME) -p $(DATABASE_PORT) -U $(DATABASE_USER) $(TEST_DB)
+	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING)" up
+	$(GINKGO) -r integration_test/
+
+.PHONY: test_local
+test_local: | $(GINKGO) $(GOOSE)
+	go vet ./...
+	go fmt ./...
+	dropdb -h $(HOST_NAME) -p $(PORT) -U $(USER) --if-exists $(TEST_DB)
+	createdb -h $(HOST_NAME) -p $(PORT) -U $(USER) $(TEST_DB)
+	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING_LOCAL)" up
+	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING_LOCAL)" reset
+	make migrate NAME=$(TEST_DB)
+	$(GINKGO) -r --skipPackage=integration_tests,integration
+
+.PHONY: integrationtest_local
+integrationtest_local: | $(GINKGO) $(GOOSE)
+	go vet ./...
+	go fmt ./...
+	dropdb -h $(HOST_NAME) -p $(PORT) -U $(USER) --if-exists $(TEST_DB)
+	createdb -h $(HOST_NAME) -p $(PORT) -U $(USER) $(TEST_DB)
+	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING_LOCAL)" up
+	$(GOOSE) -dir db/migrations postgres "$(TEST_CONNECT_STRING_LOCAL)" reset
 	make migrate NAME=$(TEST_DB)
 	$(GINKGO) -r integration_test/
 
 build:
 	go fmt ./...
-	go build
+	GO111MODULE=on go build
 
 # Parameter checks
 ## Check that DB variables are provided
@@ -105,7 +126,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 +159,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 .

README.md

@@ -1,170 +1,41 @@
-# Vulcanize DB
+# 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 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-chain-watcher`
-
-`cd $GOPATH/src/github.com/vulcanize/ipfs-chain-watcher`
+`cd $GOPATH/src/github.com/vulcanize/ipld-eth-server`
 
 Then, build the binary:
 
@@ -173,62 +44,35 @@ 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
+    graphql = true # $SERVER_GRAPHQL
+    graphqlEndpoint = "" # $SERVER_GRAPHQL_ENDPOINT
 
-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
+    chainID = "1" # $ETH_CHAIN_ID
+    defaultSender = "" # $ETH_DEFAULT_SENDER_ADDR
+    rpcGasCap = "1000000000000" # $ETH_RPC_GAS_CAP
     httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
     nodeID = "arch1" # $ETH_NODE_ID
     clientName = "Geth" # $ETH_CLIENT_NAME
@@ -236,17 +80,65 @@ For Ethereum:
     networkID = "1" # $ETH_NETWORK_ID
 ```
 
-### 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)
+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  
+The `ethereum` fields set the chainID and default sender address to use for EVM simulation, and can optionally be used to configure a remote eth node to forward cache misses to  
+
+
+### Endpoints
+#### IPLD subscription
+TODO: Port the IPLD RPC subscription endpoints after the decoupling
+
+#### Ethereum JSON-RPC
+ipld-eth-server currently recapitulates portions of the Ethereum JSON-RPC api standard.
+
+The currently supported standard endpoints are:  
+`eth_call`  
+`eth_getBalance`  
+`eth_getStorageAt`  
+`eth_getCode`  
+`eth_getProof`  
+`eth_blockNumber`  
+`eth_getHeaderByNumber`  
+`eth_getHeaderByHash`  
+`eth_getBlockByNumber`  
+`eth_getBlockByHash`  
+`eth_getTransactionCount`  
+`eth_getBlockTransactionCountByHash`  
+`eth_getBlockTransactionCountByNumber`  
+`eth_getTransactionByHash`  
+`eth_getRawTransactionByHash`  
+`eth_getTransactionByBlockHashAndIndex`  
+`eth_getTransactionByBlockNumberAndIndex`  
+`eth_getRawTransactionByBlockHashAndIndex`  
+`eth_getRawTransactionByBlockNumberAndIndex`  
+`eth_getTransactionReceipt`  
+`eth_getLogs`  
+`eth_getUncleCountByBlockHash`  
+`eth_getUncleCountByBlockNumber`  
+`eth_getUncleByBlockHashAndIndex`  
+`eth_getUncleByBlockNumberAndIndex`  
+
+TODO: Add the rest of the standard endpoints and 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
 
+## Monitoring
+
+* Enable http server and metrics using parameters `--http --metrics`
+* ipld-eth-server exposes prometheus metrics at `/metric` endpoint
+* start prometheus using `monitoring/prometheus.yml` config (`prometheus --config.file=monitoring/prometheus.yml`)
+* start grafana, connect to prometheus datasource and import dashboard from `monitoring/grafana/dashboard_main.json`
+
+![](monitoring/grafana.png)
+
+
 ## Contributing
 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

cmd/resync.go

@@ -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-chain-watcher/pkg/shared"
-
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/resync"
-	v "github.com/vulcanize/ipfs-chain-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"))
-}

cmd/root.go

@@ -20,43 +20,34 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"time"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/config"
+	"github.com/vulcanize/ipld-eth-server/pkg/prom"
 )
 
 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")
+	viper.BindEnv("log.file", "LOGRUS_FILE")
+	logfile := viper.GetString("log.file")
 	if logfile != "" {
 		file, err := os.OpenFile(logfile,
 			os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
@@ -73,21 +64,23 @@ func initFuncs(cmd *cobra.Command, args []string) {
 	if err := logLevel(); err != nil {
 		log.Fatal("Could not set log level: ", err)
 	}
-}
 
-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"),
+	if viper.GetBool("metrics") {
+		prom.Init()
+	}
+
+	if viper.GetBool("prom.http") {
+		addr := fmt.Sprintf(
+			"%s:%s",
+			viper.GetString("prom.http.addr"),
+			viper.GetString("prom.http.port"),
+		)
+		prom.Serve(addr)
 	}
-	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,28 +95,38 @@ 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()
 
 	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file location")
-	rootCmd.PersistentFlags().String("logfile", "", "file path for logging")
 	rootCmd.PersistentFlags().String("database-name", "vulcanize_public", "database name")
 	rootCmd.PersistentFlags().Int("database-port", 5432, "database port")
 	rootCmd.PersistentFlags().String("database-hostname", "localhost", "database hostname")
 	rootCmd.PersistentFlags().String("database-user", "", "database user")
 	rootCmd.PersistentFlags().String("database-password", "", "database password")
 	rootCmd.PersistentFlags().String("client-ipcPath", "", "location of geth.ipc file")
-	rootCmd.PersistentFlags().String("log-level", log.InfoLevel.String(), "Log level (trace, debug, info, warn, error, fatal, panic")
+	rootCmd.PersistentFlags().String("log-level", log.InfoLevel.String(), "log level (trace, debug, info, warn, error, fatal, panic)")
+	rootCmd.PersistentFlags().String("log-file", "", "file path for logging")
+
+	rootCmd.PersistentFlags().Bool("metrics", false, "enable metrics")
+
+	rootCmd.PersistentFlags().Bool("prom-http", false, "enable http service for prometheus")
+	rootCmd.PersistentFlags().String("prom-http-addr", "127.0.0.1", "http host for prometheus")
+	rootCmd.PersistentFlags().String("prom-http-port", "8090", "http port for prometheus")
 
-	viper.BindPFlag("logfile", rootCmd.PersistentFlags().Lookup("logfile"))
 	viper.BindPFlag("database.name", rootCmd.PersistentFlags().Lookup("database-name"))
 	viper.BindPFlag("database.port", rootCmd.PersistentFlags().Lookup("database-port"))
 	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"))
+	viper.BindPFlag("log.file", rootCmd.PersistentFlags().Lookup("log-file"))
+
+	viper.BindPFlag("metrics", rootCmd.PersistentFlags().Lookup("metrics"))
+
+	viper.BindPFlag("prom.http", rootCmd.PersistentFlags().Lookup("prom-http"))
+	viper.BindPFlag("prom.http.addr", rootCmd.PersistentFlags().Lookup("prom-http-addr"))
+	viper.BindPFlag("prom.http.port", rootCmd.PersistentFlags().Lookup("prom-http-port"))
 }
 
 func initConfig() {

cmd/serve.go

@@ -0,0 +1,156 @@
+// 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/vulcanize/ipld-eth-server/pkg/graphql"
+
+	"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"
+
+	srpc "github.com/vulcanize/ipld-eth-server/pkg/rpc"
+	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)
+	}
+	graphQL, err := startGraphQL(server)
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
+
+	shutdown := make(chan os.Signal)
+	signal.Notify(shutdown, os.Interrupt)
+	<-shutdown
+	if graphQL != nil {
+		graphQL.Stop()
+	}
+	server.Stop()
+	wg.Wait()
+}
+
+func startServers(server s.Server, settings *s.Config) error {
+	logWithCommand.Info("starting up IPC server")
+	_, _, err := srpc.StartIPCEndpoint(settings.IPCEndpoint, server.APIs())
+	if err != nil {
+		return err
+	}
+	logWithCommand.Info("starting up WS server")
+	_, _, err = srpc.StartWSEndpoint(settings.WSEndpoint, server.APIs(), []string{"vdb"}, nil, true)
+	if err != nil {
+		return err
+	}
+	logWithCommand.Info("starting up HTTP server")
+	_, err = srpc.StartHTTPEndpoint(settings.HTTPEndpoint, server.APIs(), []string{"eth"}, nil, []string{"*"}, rpc.HTTPTimeouts{})
+	return err
+}
+
+func startGraphQL(server s.Server) (graphQLServer *graphql.Service, err error) {
+	viper.BindEnv("server.graphql", "SERVER_GRAPHQL")
+	if viper.GetBool("server.graphql") {
+		logWithCommand.Info("starting up GraphQL server")
+		viper.BindEnv("server.graphqlEndpoint", "SERVER_GRAPHQL_ENDPOINT")
+		endPoint := viper.GetString("server.graphqlEndpoint")
+		if endPoint != "" {
+			graphQLServer, err = graphql.New(server.Backend(), endPoint, nil, []string{"*"}, rpc.HTTPTimeouts{})
+			if err != nil {
+				return
+			}
+			err = graphQLServer.Start(nil)
+		}
+	}
+	return
+}
+
+func init() {
+	rootCmd.AddCommand(serveCmd)
+
+	// flags for all config variables
+	serveCmd.PersistentFlags().Bool("server-graphql", false, "turn on the graphql server")
+	serveCmd.PersistentFlags().String("server-graphql-endpoint", "", "endpoint url for graphql server")
+	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-http-path", "", "http url for ethereum node")
+	serveCmd.PersistentFlags().String("eth-node-id", "", "eth node id")
+	serveCmd.PersistentFlags().String("eth-client-name", "Geth", "eth client name")
+	serveCmd.PersistentFlags().String("eth-genesis-block", "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3", "eth genesis block hash")
+	serveCmd.PersistentFlags().String("eth-network-id", "1", "eth network id")
+	serveCmd.PersistentFlags().String("eth-chain-id", "1", "eth chain id")
+	serveCmd.PersistentFlags().String("eth-default-sender", "", "default sender address")
+	serveCmd.PersistentFlags().String("eth-rpc-gas-cap", "", "rpc gas cap (for eth_Call execution)")
+
+	// and their bindings
+	viper.BindPFlag("server.graphql", serveCmd.PersistentFlags().Lookup("server-graphql"))
+	viper.BindPFlag("server.graphqlEndpoint", serveCmd.PersistentFlags().Lookup("server-graphql-endpoint"))
+	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.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"))
+	viper.BindPFlag("ethereum.chainID", serveCmd.PersistentFlags().Lookup("eth-chain-id"))
+	viper.BindPFlag("ethereum.defaultSender", serveCmd.PersistentFlags().Lookup("eth-default-sender"))
+	viper.BindPFlag("ethereum.rpcGasCap", serveCmd.PersistentFlags().Lookup("eth-rpc-gas-cap"))
+}

cmd/subscribe.go

@@ -28,31 +28,29 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/client"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/core"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/eth"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/streamer"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/watcher"
+	"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 +58,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)
 	}
@@ -167,14 +164,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)
 }

cmd/version.go

@@ -19,20 +19,20 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	v "github.com/vulcanize/ipfs-chain-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-chain-watcher",
-	Long: `Use this command to fetch the version of ipfs-chain-watcher
+	Short: "Prints the version of ipld-eth-server",
+	Long: `Use this command to fetch the version of ipld-eth-server
 
-Usage: ./ipfs-chain-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-chain-watcher version: %s", v.VersionWithMeta)
+		logWithCommand.Infof("ipld-eth-server version: %s", v.VersionWithMeta)
 	},
 }
 

cmd/watch.go

@@ -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-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/watcher"
-	v "github.com/vulcanize/ipfs-chain-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-chain-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"))
-}

db/migrations/00004_create_eth_header_cids_table.sql

@@ -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)
 );
 

db/migrations/00005_create_eth_uncle_cids_table.sql

@@ -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)
 );

db/migrations/00006_create_eth_transaction_cids_table.sql

@@ -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)
 );
 

db/migrations/00007_create_eth_receipt_cids_table.sql

@@ -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

db/migrations/00007_create_eth_state_cids_table.sql

@@ -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;

db/migrations/00008_create_eth_state_cids_table.sql

@@ -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;

db/migrations/00008_create_eth_storage_cids_table.sql

@@ -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;

db/migrations/00009_create_eth_storage_cids_table.sql

@@ -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;

db/migrations/00010_create_btc_schema.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE SCHEMA btc;
-
--- +goose Down
-DROP SCHEMA btc;

db/migrations/00010_create_eth_state_accouts_table.sql

@@ -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,

db/migrations/00011_create_btc_header_cids_table.sql

@@ -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;

db/migrations/00011_create_postgraphile_comments.sql

@@ -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';

db/migrations/00012_add_chain_id_to_nodes.sql

@@ -0,0 +1,21 @@
+-- +goose Up
+ALTER TABLE public.nodes
+ADD COLUMN chain_id INTEGER DEFAULT 1;
+
+ALTER TABLE public.nodes
+DROP CONSTRAINT node_uc;
+
+ALTER TABLE public.nodes
+ADD CONSTRAINT node_uc
+UNIQUE (genesis_block, network_id, node_id, chain_id);
+
+-- +goose Down
+ALTER TABLE public.nodes
+DROP CONSTRAINT node_uc;
+
+ALTER TABLE public.nodes
+ADD CONSTRAINT node_uc
+UNIQUE (genesis_block, network_id, node_id);
+
+ALTER TABLE public.nodes
+DROP COLUMN chain_id;

db/migrations/00012_create_btc_transaction_cids_table.sql

@@ -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;

db/migrations/00013_create_btc_tx_outputs_table.sql

@@ -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;

db/migrations/00013_potgraphile_triggers.sql

@@ -0,0 +1,69 @@
+-- +goose Up
+-- +goose StatementBegin
+CREATE FUNCTION eth.graphql_subscription() returns TRIGGER as $$
+declare
+    table_name text = TG_ARGV[0];
+    attribute text = TG_ARGV[1];
+    id text;
+begin
+    execute 'select $1.' || quote_ident(attribute)
+        using new
+        into id;
+    perform pg_notify('postgraphile:' || table_name,
+                      json_build_object(
+                              '__node__', json_build_array(
+                              table_name,
+                              id
+                          )
+                          )::text
+        );
+    return new;
+end;
+$$ language plpgsql;
+-- +goose StatementEnd
+
+CREATE TRIGGER header_cids_ai
+    after INSERT ON eth.header_cids
+    for each row
+    execute procedure eth.graphql_subscription('header_cids', 'id');
+
+CREATE TRIGGER receipt_cids_ai
+    after INSERT ON eth.receipt_cids
+    for each row
+    execute procedure eth.graphql_subscription('receipt_cids', 'id');
+
+CREATE TRIGGER state_accounts_ai
+    after INSERT ON eth.state_accounts
+    for each row
+    execute procedure eth.graphql_subscription('state_accounts', 'id');
+
+CREATE TRIGGER state_cids_ai
+    after INSERT ON eth.state_cids
+    for each row
+    execute procedure eth.graphql_subscription('state_cids', 'id');
+
+CREATE TRIGGER storage_cids_ai
+    after INSERT ON eth.storage_cids
+    for each row
+    execute procedure eth.graphql_subscription('storage_cids', 'id');
+
+CREATE TRIGGER transaction_cids_ai
+    after INSERT ON eth.transaction_cids
+    for each row
+    execute procedure eth.graphql_subscription('transaction_cids', 'id');
+
+CREATE TRIGGER uncle_cids_ai
+    after INSERT ON eth.uncle_cids
+    for each row
+    execute procedure eth.graphql_subscription('uncle_cids', 'id');
+
+-- +goose Down
+DROP TRIGGER uncle_cids_ai ON eth.uncle_cids;
+DROP TRIGGER transaction_cids_ai ON eth.transaction_cids;
+DROP TRIGGER storage_cids_ai ON eth.storage_cids;
+DROP TRIGGER state_cids_ai ON eth.state_cids;
+DROP TRIGGER state_accounts_ai ON eth.state_accounts;
+DROP TRIGGER receipt_cids_ai ON eth.receipt_cids;
+DROP TRIGGER header_cids_ai ON eth.header_cids;
+
+DROP FUNCTION eth.graphql_subscription();

db/migrations/00014_create_btc_tx_inputs_table.sql

@@ -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;

db/migrations/00014_create_cid_indexes.sql

@@ -0,0 +1,121 @@
+-- +goose Up
+-- header indexes
+CREATE INDEX block_number_index ON eth.header_cids USING brin (block_number);
+
+CREATE INDEX block_hash_index ON eth.header_cids USING btree (block_hash);
+
+CREATE INDEX header_cid_index ON eth.header_cids USING btree (cid);
+
+CREATE INDEX header_mh_index ON eth.header_cids USING btree (mh_key);
+
+CREATE INDEX state_root_index ON eth.header_cids USING btree (state_root);
+
+CREATE INDEX timestamp_index ON eth.header_cids USING brin (timestamp);
+
+-- transaction indexes
+CREATE INDEX tx_header_id_index ON eth.transaction_cids USING btree (header_id);
+
+CREATE INDEX tx_hash_index ON eth.transaction_cids USING btree (tx_hash);
+
+CREATE INDEX tx_cid_index ON eth.transaction_cids USING btree (cid);
+
+CREATE INDEX tx_mh_index ON eth.transaction_cids USING btree (mh_key);
+
+CREATE INDEX tx_dst_index ON eth.transaction_cids USING btree (dst);
+
+CREATE INDEX tx_src_index ON eth.transaction_cids USING btree (src);
+
+-- receipt indexes
+CREATE INDEX rct_tx_id_index ON eth.receipt_cids USING btree (tx_id);
+
+CREATE INDEX rct_cid_index ON eth.receipt_cids USING btree (cid);
+
+CREATE INDEX rct_mh_index ON eth.receipt_cids USING btree (mh_key);
+
+CREATE INDEX rct_contract_index ON eth.receipt_cids USING btree (contract);
+
+CREATE INDEX rct_contract_hash_index ON eth.receipt_cids USING btree (contract_hash);
+
+CREATE INDEX rct_topic0_index ON eth.receipt_cids USING gin (topic0s);
+
+CREATE INDEX rct_topic1_index ON eth.receipt_cids USING gin (topic1s);
+
+CREATE INDEX rct_topic2_index ON eth.receipt_cids USING gin (topic2s);
+
+CREATE INDEX rct_topic3_index ON eth.receipt_cids USING gin (topic3s);
+
+CREATE INDEX rct_log_contract_index ON eth.receipt_cids USING gin (log_contracts);
+
+-- state node indexes
+CREATE INDEX state_header_id_index ON eth.state_cids USING btree (header_id);
+
+CREATE INDEX state_leaf_key_index ON eth.state_cids USING btree (state_leaf_key);
+
+CREATE INDEX state_cid_index ON eth.state_cids USING btree (cid);
+
+CREATE INDEX state_mh_index ON eth.state_cids USING btree (mh_key);
+
+CREATE INDEX state_path_index ON eth.state_cids USING btree (state_path);
+
+-- storage node indexes
+CREATE INDEX storage_state_id_index ON eth.storage_cids USING btree (state_id);
+
+CREATE INDEX storage_leaf_key_index ON eth.storage_cids USING btree (storage_leaf_key);
+
+CREATE INDEX storage_cid_index ON eth.storage_cids USING btree (cid);
+
+CREATE INDEX storage_mh_index ON eth.storage_cids USING btree (mh_key);
+
+CREATE INDEX storage_path_index ON eth.storage_cids USING btree (storage_path);
+
+-- state accounts indexes
+CREATE INDEX account_state_id_index ON eth.state_accounts USING btree (state_id);
+
+CREATE INDEX storage_root_index ON eth.state_accounts USING btree (storage_root);
+
+-- +goose Down
+-- state account indexes
+DROP INDEX eth.storage_root_index;
+DROP INDEX eth.account_state_id_index;
+
+-- storage node indexes
+DROP INDEX eth.storage_path_index;
+DROP INDEX eth.storage_mh_index;
+DROP INDEX eth.storage_cid_index;
+DROP INDEX eth.storage_leaf_key_index;
+DROP INDEX eth.storage_state_id_index;
+
+-- state node indexes
+DROP INDEX eth.state_path_index;
+DROP INDEX eth.state_mh_index;
+DROP INDEX eth.state_cid_index;
+DROP INDEX eth.state_leaf_key_index;
+DROP INDEX eth.state_header_id_index;
+
+-- receipt indexes
+DROP INDEX eth.rct_log_contract_index;
+DROP INDEX eth.rct_topic3_index;
+DROP INDEX eth.rct_topic2_index;
+DROP INDEX eth.rct_topic1_index;
+DROP INDEX eth.rct_topic0_index;
+DROP INDEX eth.rct_contract_hash_index;
+DROP INDEX eth.rct_contract_index;
+DROP INDEX eth.rct_mh_index;
+DROP INDEX eth.rct_cid_index;
+DROP INDEX eth.rct_tx_id_index;
+
+-- transaction indexes
+DROP INDEX eth.tx_src_index;
+DROP INDEX eth.tx_dst_index;
+DROP INDEX eth.tx_mh_index;
+DROP INDEX eth.tx_cid_index;
+DROP INDEX eth.tx_hash_index;
+DROP INDEX eth.tx_header_id_index;
+
+-- header indexes
+DROP INDEX eth.timestamp_index;
+DROP INDEX eth.state_root_index;
+DROP INDEX eth.header_mh_index;
+DROP INDEX eth.header_cid_index;
+DROP INDEX eth.block_hash_index;
+DROP INDEX eth.block_number_index;

db/migrations/00015_create_canonical_hash_finder_functions.sql

@@ -0,0 +1,48 @@
+-- +goose Up
+-- +goose StatementBegin
+-- returns the number of child headers that reference backwards to the header with the provided hash
+CREATE OR REPLACE FUNCTION header_weight(hash VARCHAR(66)) RETURNS BIGINT
+AS $$
+  WITH RECURSIVE validator AS (
+          SELECT block_hash, parent_hash, block_number
+          FROM eth.header_cids
+          WHERE block_hash = hash
+      UNION
+          SELECT eth.header_cids.block_hash, eth.header_cids.parent_hash, eth.header_cids.block_number
+          FROM eth.header_cids
+          INNER JOIN validator
+            ON eth.header_cids.parent_hash = validator.block_hash
+            AND eth.header_cids.block_number = validator.block_number + 1
+  )
+  SELECT COUNT(*) FROM validator;
+$$ LANGUAGE SQL;
+-- +goose StatementEnd
+
+-- +goose StatementBegin
+-- returns the id for the header at the provided height which is heaviest
+CREATE OR REPLACE FUNCTION canonical_header(height BIGINT) RETURNS INT AS
+$BODY$
+DECLARE
+  current_weight INT;
+  heaviest_weight INT DEFAULT 0;
+  heaviest_id INT;
+  r eth.header_cids%ROWTYPE;
+BEGIN
+  FOR r IN SELECT * FROM eth.header_cids
+  WHERE block_number = height
+  LOOP
+    SELECT INTO current_weight * FROM header_weight(r.block_hash);
+    IF current_weight > heaviest_weight THEN
+        heaviest_weight := current_weight;
+        heaviest_id := r.id;
+    END IF;
+  END LOOP;
+  RETURN heaviest_id;
+END
+$BODY$
+LANGUAGE 'plpgsql';
+-- +goose StatementEnd
+
+-- +goose Down
+DROP FUNCTION header_weight;
+DROP FUNCTION canonical_header;

db/migrations/00015_create_eth_queued_data_table.sql

@@ -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;

db/migrations/00016_create_btc_queued_data_table.sql

@@ -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;

db/migrations/00016_remove_deployment_from_tx_cids.sql

@@ -0,0 +1,7 @@
+-- +goose Up
+ALTER TABLE eth.transaction_cids
+DROP COLUMN deployment;
+
+-- +goose Down
+ALTER TABLE eth.transaction_cids
+ADD COLUMN deployment BOOL NOT NULL DEFAULT FALSE;

db/migrations/00017_state_and_storage_ids_use_big_serial.sql

@@ -0,0 +1,25 @@
+-- +goose Up
+ALTER TABLE eth.storage_cids
+ALTER COLUMN state_id TYPE BIGINT;
+
+ALTER TABLE eth.state_accounts
+ALTER COLUMN state_id TYPE BIGINT;
+
+ALTER TABLE eth.state_cids
+ALTER COLUMN id TYPE BIGINT;
+
+ALTER TABLE eth.storage_cids
+ALTER COLUMN id TYPE BIGINT;
+
+-- +goose Down
+ALTER TABLE eth.storage_cids
+ALTER COLUMN id TYPE INTEGER;
+
+ALTER TABLE eth.state_cids
+ALTER COLUMN id TYPE INTEGER;
+
+ALTER TABLE eth.state_accounts
+ALTER COLUMN state_id TYPE INTEGER;
+
+ALTER TABLE eth.storage_cids
+ALTER COLUMN state_id TYPE INTEGER;

db/migrations/00018_create_check_if_removed_functions.sql

@@ -0,0 +1,39 @@
+-- +goose Up
+-- +goose StatementBegin
+-- returns if a storage node at the provided path was removed in the range > the provided height and <= the provided block hash
+CREATE OR REPLACE FUNCTION was_storage_removed(path BYTEA, height BIGINT, hash VARCHAR(66)) RETURNS BOOLEAN
+AS $$
+  SELECT exists(SELECT 1
+					FROM eth.storage_cids
+            INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
+            INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
+					WHERE storage_path = path
+					AND block_number > height
+					AND block_number <= (SELECT block_number
+										FROM eth.header_cids
+										WHERE block_hash = hash)
+					AND storage_cids.node_type = 3
+					LIMIT 1);
+$$ LANGUAGE SQL;
+-- +goose StatementEnd
+
+-- +goose StatementBegin
+-- returns if a state node at the provided path was removed in the range > the provided height and <= the provided block hash
+CREATE OR REPLACE FUNCTION was_state_removed(path BYTEA, height BIGINT, hash VARCHAR(66)) RETURNS BOOLEAN
+AS $$
+  SELECT exists(SELECT 1
+					FROM eth.state_cids
+            INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
+					WHERE state_path = path
+					AND block_number > height
+					AND block_number <= (SELECT block_number
+										FROM eth.header_cids
+										WHERE block_hash = hash)
+					AND state_cids.node_type = 3
+					LIMIT 1);
+$$ LANGUAGE SQL;
+-- +goose StatementEnd
+
+-- +goose Down
+DROP FUNCTION was_storage_removed;
+DROP FUNCTION was_state_removed;

db/migrations/00018_update_state_cids.sql

@@ -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;

db/migrations/00019_update_storage_cids.sql

@@ -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;

db/migrations/00019_updated_canonical_hash_finder_functions.sql

@@ -0,0 +1,121 @@
+-- +goose Up
+-- +goose StatementBegin
+CREATE TYPE child_result AS (
+  has_child BOOLEAN,
+  children eth.header_cids[]
+);
+
+CREATE OR REPLACE FUNCTION has_child(hash VARCHAR(66), height BIGINT) RETURNS child_result AS
+$BODY$
+DECLARE
+  child_height INT;
+  temp_child eth.header_cids;
+  new_child_result child_result;
+BEGIN
+  child_height = height + 1;
+  -- short circuit if there are no children
+  SELECT exists(SELECT 1
+                FROM eth.header_cids
+                WHERE parent_hash = hash
+                AND block_number = child_height
+                LIMIT 1)
+  INTO new_child_result.has_child;
+  -- collect all the children for this header
+  IF new_child_result.has_child THEN
+    FOR temp_child IN
+      SELECT * FROM eth.header_cids WHERE parent_hash = hash AND block_number = child_height
+    LOOP
+      new_child_result.children = array_append(new_child_result.children, temp_child);
+    END LOOP;
+  END IF;
+  RETURN new_child_result;
+END
+$BODY$
+LANGUAGE 'plpgsql';
+-- +goose StatementEnd
+
+-- +goose StatementBegin
+CREATE OR REPLACE FUNCTION canonical_header_from_array(headers eth.header_cids[]) RETURNS eth.header_cids AS
+$BODY$
+DECLARE
+  canonical_header eth.header_cids;
+  canonical_child eth.header_cids;
+  header eth.header_cids;
+  current_child_result child_result;
+  child_headers eth.header_cids[];
+  current_header_with_child eth.header_cids;
+  has_children_count INT DEFAULT 0;
+BEGIN
+  -- for each header in the provided set
+  FOREACH header IN ARRAY headers
+  LOOP
+    -- check if it has any children
+    current_child_result = has_child(header.block_hash, header.block_number);
+    IF current_child_result.has_child THEN
+      -- if it does, take note
+      has_children_count = has_children_count + 1;
+      current_header_with_child = header;
+      -- and add the children to the growing set of child headers
+      child_headers = array_cat(child_headers, current_child_result.children);
+    END IF;
+  END LOOP;
+  -- if none of the headers had children, none is more canonical than the other
+  IF has_children_count = 0 THEN
+    -- return the first one selected
+    SELECT * INTO canonical_header FROM unnest(headers) LIMIT 1;
+  -- if only one header had children, it can be considered the heaviest/canonical header of the set
+  ELSIF has_children_count = 1 THEN
+    -- return the only header with a child
+    canonical_header = current_header_with_child;
+  -- if there are multiple headers with children
+  ELSE
+    -- find the canonical header from the child set
+    canonical_child = canonical_header_from_array(child_headers);
+    -- the header that is parent to this header, is the canonical header at this level
+    SELECT * INTO canonical_header FROM unnest(headers)
+    WHERE block_hash = canonical_child.parent_hash;
+  END IF;
+  RETURN canonical_header;
+END
+$BODY$
+LANGUAGE 'plpgsql';
+-- +goose StatementEnd
+
+-- +goose StatementBegin
+CREATE OR REPLACE FUNCTION canonical_header_id(height BIGINT) RETURNS INTEGER AS
+$BODY$
+DECLARE
+  canonical_header eth.header_cids;
+  headers eth.header_cids[];
+  header_count INT;
+  temp_header eth.header_cids;
+BEGIN
+  -- collect all headers at this height
+  FOR temp_header IN
+    SELECT * FROM eth.header_cids WHERE block_number = height
+  LOOP
+    headers = array_append(headers, temp_header);
+  END LOOP;
+  -- count the number of headers collected
+  header_count = array_length(headers, 1);
+  -- if we have less than 1 header, return NULL
+  IF header_count IS NULL OR header_count < 1 THEN
+    RETURN NULL;
+  -- if we have one header, return its id
+  ELSIF header_count = 1 THEN
+    RETURN headers[1].id;
+  -- if we have multiple headers we need to determine which one is canonical
+  ELSE
+    canonical_header = canonical_header_from_array(headers);
+    RETURN canonical_header.id;
+  END IF;
+END;
+$BODY$
+LANGUAGE 'plpgsql';
+-- +goose StatementEnd
+
+-- +goose Down
+DROP FUNCTION canonical_header_id;
+DROP FUNCTION canonical_header_from_array;
+DROP FUNCTION has_child;
+DROP TYPE child_result;

db/migrations/00020_add_poststate_and_status_to_receipt_cids.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+ALTER TABLE eth.receipt_cids
+ADD COLUMN post_state VARCHAR(66);
+
+ALTER TABLE eth.receipt_cids
+ADD COLUMN post_status INTEGER;
+
+-- +goose Down
+ALTER TABLE eth.receipt_cids
+DROP COLUMN post_status;
+
+ALTER TABLE eth.receipt_cids
+DROP COLUMN post_state;

db/migrations/00020_update_header_cids.sql

@@ -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;

db/migrations/00022_rename_to_leaf_key.sql

@@ -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;

db/migrations/00023_update_receipt_cids.sql

@@ -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;

db/migrations/00024_add_times_validated.sql

@@ -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;

docker-compose.yml

@@ -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:

dockerfiles/README.md

@@ -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`.
-

dockerfiles/migrations/Dockerfile

@@ -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-chain-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-chain-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-chain-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-chain-watcher/db/migrations migrations/vulcanizedb
-# XXX dir is already writeable RUN touch vulcanizedb.log
-
-CMD ["./startup_script.sh"]

dockerfiles/migrations/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

dockerfiles/postgraphile/Dockerfile

@@ -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"]

dockerfiles/postgraphile/docker-compose.yml

@@ -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:

dockerfiles/startup_script.sh

@@ -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

dockerfiles/super_node/Dockerfile

@@ -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-chain-watcher
-WORKDIR /go/src/github.com/vulcanize/ipfs-chain-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-chain-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-chain-watcher/$CONFIG_FILE config.toml
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-chain-watcher/dockerfiles/super_node/startup_script.sh .
-COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-chain-watcher/dockerfiles/super_node/entrypoint.sh .
-
-
-# keep binaries immutable
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-chain-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-chain-watcher/db/migrations migrations/vulcanizedb
-COPY --from=builder /go/src/github.com/vulcanize/ipfs-chain-watcher/environments environments
-
-EXPOSE $EXPOSE_PORT_1
-EXPOSE $EXPOSE_PORT_2
-
-ENTRYPOINT ["/app/entrypoint.sh"]

dockerfiles/super_node/docker-compose.yml

@@ -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:

dockerfiles/super_node/entrypoint.sh

@@ -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

dockerfiles/super_node/startup_script.sh

@@ -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

documentation/apis.md

@@ -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-chain-watcher/pkg/client"
-        "github.com/vulcanize/ipfs-chain-watcher/pkg/eth"
-        "github.com/vulcanize/ipfs-chain-watcher/pkg/streamer"
-        "github.com/vulcanize/ipfs-chain-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-chain-watcher/libraries/shared/streamer"
-    	"github.com/vulcanize/ipfs-chain-watcher/pkg/eth/client"
-    	"github.com/vulcanize/ipfs-chain-watcher/pkg/super_node"
-    	"github.com/vulcanize/ipfs-chain-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`  

documentation/architecture.md

@@ -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.

documentation/resync.md

@@ -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
-```

documentation/watcher.md

@@ -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

entrypoint.sh

@@ -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

environments/example.toml

@@ -0,0 +1,27 @@
+[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
+    graphql = true # $SERVER_GRAPHQL
+    graphqlEndpoint = "127.0.0.1:8083" # $SERVER_GRAPHQL_ENDPOINT
+
+[ethereum]
+    chainID = "1" # $ETH_CHAIN_ID
+    defaultSender = "" # $ETH_DEFAULT_SENDER_ADDR
+    rpcGasCap = "1000000000000" # $ETH_RPC_GAS_CAP
+    httpPath = "127.0.0.1:8545" # $ETH_HTTP_PATH
+    supportsStateDiff = true # $ETH_SUPPORTS_STATEDIFF
+    nodeID = "arch1" # $ETH_NODE_ID
+    clientName = "Geth" # $ETH_CLIENT_NAME
+    genesisBlock = "0xd4e56740f876aef8c010b86a40d5f56745a118d0906a34e69aec8c0db1cb8fa3" # $ETH_GENESIS_BLOCK
+    networkID = "1" # $ETH_NETWORK_ID

environments/subscribeExample.toml

@@ -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 = []

environments/superNodeBTC.toml

@@ -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

environments/superNodeETH.toml

@@ -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

go.mod

@@ -1,101 +1,29 @@
-module github.com/vulcanize/ipfs-chain-watcher
+module github.com/vulcanize/ipld-eth-server
 
-go 1.12
+go 1.13
 
 require (
-	bazil.org/fuse v0.0.0-20180421153158-65cc252bf669 // indirect
-	github.com/aristanetworks/goarista v0.0.0-20190712234253-ed1100a1c015 // indirect
-	github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d // indirect
-	github.com/btcsuite/btcd v0.0.0-20190629003639-c26ffa870fd8
-	github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d
-	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
-	github.com/dave/jennifer v1.3.0
-	github.com/davidlazar/go-crypto v0.0.0-20190522120613-62389b5e4ae0 // indirect
-	github.com/deckarep/golang-set v1.7.1 // indirect
-	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/elastic/gosigar v0.10.4 // indirect
-	github.com/ethereum/go-ethereum v1.9.1
-	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
-	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/hashicorp/golang-lru v0.5.3
-	github.com/hpcloud/tail v1.0.0
-	github.com/ipfs/go-bitswap v0.1.6 // indirect
+	github.com/ethereum/go-ethereum v1.9.25
+	github.com/graph-gophers/graphql-go v0.0.0-20201003130358-c5bdf3b1108e
 	github.com/ipfs/go-block-format v0.0.2
-	github.com/ipfs/go-blockservice v0.1.2
-	github.com/ipfs/go-cid v0.0.3
-	github.com/ipfs/go-cidutil v0.0.2 // indirect
-	github.com/ipfs/go-ds-flatfs v0.0.2 // indirect
-	github.com/ipfs/go-ds-leveldb v0.0.2 // indirect
-	github.com/ipfs/go-ds-measure v0.0.1 // indirect
-	github.com/ipfs/go-fs-lock v0.0.1 // indirect
-	github.com/ipfs/go-ipfs v0.4.22
-	github.com/ipfs/go-ipfs-blockstore v0.0.1
-	github.com/ipfs/go-ipfs-cmds v0.1.1 // indirect
-	github.com/ipfs/go-ipfs-config v0.0.3 // indirect
-	github.com/ipfs/go-ipfs-ds-help v0.0.1
-	github.com/ipfs/go-ipfs-exchange-interface v0.0.1
-	github.com/ipfs/go-ipld-cbor v0.0.3 // indirect
-	github.com/ipfs/go-ipld-format v0.0.2
-	github.com/ipfs/go-ipld-git v0.0.2 // indirect
-	github.com/ipfs/go-ipns v0.0.1 // indirect
-	github.com/ipfs/go-mfs v0.1.1 // indirect
-	github.com/ipfs/interface-go-ipfs-core v0.1.0 // indirect
-	github.com/jbenet/go-is-domain v1.0.2 // indirect
-	github.com/jmoiron/sqlx v0.0.0-20190426154859-38398a30ed85
-	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
-	github.com/lib/pq v1.2.0
-	github.com/libp2p/go-eventbus v0.0.3 // indirect
-	github.com/libp2p/go-libp2p v0.1.2 // indirect
-	github.com/libp2p/go-libp2p-autonat-svc v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-connmgr v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-core v0.0.9 // indirect
-	github.com/libp2p/go-libp2p-kad-dht v0.1.1 // indirect
-	github.com/libp2p/go-libp2p-peerstore v0.1.3 // indirect
-	github.com/libp2p/go-libp2p-pnet v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-pubsub-router v0.1.0 // indirect
-	github.com/libp2p/go-libp2p-quic-transport v0.1.1 // indirect
-	github.com/libp2p/go-libp2p-secio v0.1.1 // indirect
-	github.com/libp2p/go-libp2p-swarm v0.1.1 // indirect
-	github.com/libp2p/go-libp2p-tls v0.1.0 // indirect
-	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/marten-seemann/qtls v0.2.4 // indirect
-	github.com/miekg/dns v1.1.15 // indirect
-	github.com/mitchellh/go-homedir v1.1.0
-	github.com/multiformats/go-multiaddr-dns v0.0.3 // indirect
-	github.com/multiformats/go-multihash v0.0.6
-	github.com/onsi/ginkgo v1.8.0
-	github.com/onsi/gomega v1.5.0
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/pelletier/go-toml v1.4.0 // indirect
-	github.com/polydawn/refmt v0.0.0-20190731040541-eff0b363297a // indirect
-	github.com/pressly/goose v2.6.0+incompatible
-	github.com/prometheus/tsdb v0.10.0 // indirect
-	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/sirupsen/logrus v1.4.2
-	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cobra v0.0.5
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.4.0
-	github.com/status-im/keycard-go v0.0.0-20190424133014-d95853db0f48 // indirect
-	github.com/whyrusleeping/sql-datastore v0.0.0-20190124195324-b24eb8d0ce14 // indirect
-	go.opencensus.io v0.22.0 // indirect
-	go.uber.org/dig v1.7.0 // indirect
-	go.uber.org/fx v1.9.0 // indirect
-	go.uber.org/goleak v1.0.0 // indirect
-	go4.org v0.0.0-20190313082347-94abd6928b1d // indirect
-	golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
-	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
+	github.com/ipfs/go-cid v0.0.7
+	github.com/ipfs/go-ipfs-blockstore v1.0.1
+	github.com/ipfs/go-ipfs-ds-help v1.0.0
+	github.com/ipfs/go-ipld-format v0.2.0
+	github.com/jmoiron/sqlx v1.2.0
+	github.com/lib/pq v1.8.0
+	github.com/multiformats/go-multihash v0.0.14
+	github.com/onsi/ginkgo v1.15.0
+	github.com/onsi/gomega v1.10.1
+	github.com/prometheus/client_golang v1.5.1
+	github.com/sirupsen/logrus v1.6.0
+	github.com/spf13/cobra v1.0.0
+	github.com/spf13/viper v1.7.0
+	github.com/vulcanize/ipld-eth-indexer v0.7.0-alpha
+	github.com/vulcanize/ipfs-ethdb v0.0.2-alpha
+	golang.org/x/sys v0.0.0-20210218155724-8ebf48af031b // indirect
 )
 
-replace github.com/dgraph-io/badger v2.0.0-rc.2+incompatible => github.com/dgraph-io/badger/v2 v2.0.0-rc.2
+replace github.com/ethereum/go-ethereum v1.9.25 => github.com/vulcanize/go-ethereum v1.9.25-statediff-0.0.15
 
-replace github.com/dgraph-io/badger/v2 v2.0.0-rc2 => github.com/dgraph-io/badger v1.6.0-rc1
-
-replace github.com/ipfs/go-ipfs v0.4.22 => github.com/vulcanize/go-ipfs v0.4.22-alpha
-
-replace github.com/ipfs/go-ipfs-config v0.0.3 => github.com/vulcanize/go-ipfs-config v0.0.8-alpha
-
-replace github.com/ethereum/go-ethereum v1.9.1 => github.com/vulcanize/go-ethereum v1.9.11-statediff-0.0.2
+replace github.com/vulcanize/ipfs-ethdb v0.0.2-alpha => github.com/vulcanize/pg-ipfs-ethdb v0.0.2-alpha

main.go

@@ -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-chain-watcher/cmd"
-
 	"github.com/sirupsen/logrus"
+
+	"github.com/vulcanize/ipld-eth-server/cmd"
 )
 
 func main() {

monitoring/grafana/dashboard_main.json

@@ -0,0 +1,353 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": 4,
+  "links": [],
+  "panels": [
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 4,
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "7.2.1",
+      "targets": [
+        {
+          "expr": "ipld_eth_server_ws_count",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Websocket Connection Count",
+      "type": "gauge"
+    },
+    {
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 0
+      },
+      "id": 5,
+      "options": {
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": true
+      },
+      "pluginVersion": "7.2.1",
+      "targets": [
+        {
+          "expr": "ipld_eth_server_ipc_count",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "IPC Connection Count",
+      "type": "gauge"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {}
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.2.1",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "rate(ipld_eth_server_http_count[1m])",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "HTTP requests per second",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "custom": {},
+          "unit": "s"
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 8
+      },
+      "hiddenSeries": false,
+      "id": 7,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "7.2.1",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "histogram_quantile(0.9, rate(ipld_eth_server_http_duration_bucket[1m]))",
+          "hide": false,
+          "interval": "",
+          "legendFormat": "0.9",
+          "refId": "B"
+        },
+        {
+          "expr": "histogram_quantile(0.75, rate(ipld_eth_server_http_duration_bucket[1m]))",
+          "interval": "",
+          "legendFormat": "0.75",
+          "refId": "A"
+        },
+        {
+          "expr": "histogram_quantile(0.5, rate(ipld_eth_server_http_duration_bucket[1m]))",
+          "interval": "",
+          "legendFormat": "0.5",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "HTTP Requests duration (percentile)",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "s",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 26,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-15m",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "ipld-eth-server",
+  "uid": "lFVEvNtGk",
+  "version": 7
+}

monitoring/prometheus.yml

@@ -0,0 +1,7 @@
+global:
+  scrape_interval: 10s
+
+scrape_configs:
+  - job_name: 'ipld-eth-server'
+    static_configs:
+    - targets: ['localhost:8090']

pkg/btc/cid_retriever.go

@@ -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-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/shared"
-	"github.com/vulcanize/ipfs-chain-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)
-}

pkg/btc/cleaner.go

@@ -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-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/cleaner_test.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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))
-		})
-	})
-})

pkg/btc/converter.go

@@ -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-chain-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
-}

pkg/btc/converter_test.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-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))
-		})
-	})
-})

pkg/btc/filterer.go

@@ -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-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/http_streamer.go

@@ -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-chain-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
-}

pkg/btc/indexer.go

@@ -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-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/indexer_test.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/btc/mocks"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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()))
-				}
-			}
-		})
-	})
-})

pkg/btc/ipld_fetcher.go

@@ -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-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/ipld_pg_fetcher.go

@@ -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-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/mocks/converter.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/mocks/indexer.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/mocks/publisher.go

@@ -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-chain-watcher/pkg/btc"
-
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/mocks/test_data.go

@@ -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-chain-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
-}

pkg/btc/models.go

@@ -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"`
-}

pkg/btc/payload_fetcher.go

@@ -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-chain-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
-}

pkg/btc/publish_and_indexer.go

@@ -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-chain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/publish_and_indexer_test.go

@@ -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-chain-watcher/pkg/ipfs/ipld"
-
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/btc/mocks"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/postgres"
-	"github.com/vulcanize/ipfs-chain-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.CidToDsKey(dc)
-			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.CidToDsKey(dc)
-				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]))
-			}
-		})
-	})
-})

pkg/btc/publisher.go

@@ -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-chain-watcher/pkg/ipfs"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs/dag_putters"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/ipfs/ipld"
-	"github.com/vulcanize/ipfs-chain-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
-}

pkg/btc/publisher_test.go

@@ -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-chain-watcher/pkg/btc"
-	"github.com/vulcanize/ipfs-chain-watcher/pkg/btc/mocks"
-	mocks2 "github.com/vulcanize/ipfs-chain-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))
-		})
-	})
-})

pkg/btc/streamer.go

@@ -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-chain-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
-}

pkg/btc/subscription_config.go

@@ -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-chain-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
-}

pkg/btc/test_helpers.go

@@ -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-chain-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())
-}