Merge pull request #3 from vulcanize/dshelp_update

update ipfs stack dshelp.CidToDsKey => dshelp.Multihash…

.gitignore

@@ -7,10 +7,13 @@ Vagrantfile
 vagrant*.sh
 .vagrant
 test_scripts/
-vulcanizedb
+ipfs-blockchain-watcher
 postgraphile/build/
 postgraphile/node_modules/
 postgraphile/package-lock.json
 vulcanizedb.log
 db/migrations/20*.sql
 plugins/*.so
+postgraphile/*.toml
+postgraphile/schema.graphql
+vulcanizedb.pem

.travis.yml

@@ -1,29 +1,27 @@
 dist: trusty
 language: go
 go:
-  - 1.11
+- 1.12
 services:
-  - postgresql
+- postgresql
 addons:
-  postgresql: '9.6'
+  ssh_known_hosts: arch1.vdb.to
-go_import_path: github.com/vulcanize/vulcanizedb
+  postgresql: '11.2'
+go_import_path: github.com/vulcanize/ipfs-blockchain-watcher
 before_install:
-  - make installtools
+- openssl aes-256-cbc -K $encrypted_e1db309e8776_key -iv $encrypted_e1db309e8776_iv
-  - bash ./scripts/install-postgres-10.sh
+  -in temp_rsa.enc -out temp_rsa -d
-  - curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+- eval "$(ssh-agent -s)"
-  - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+- chmod 600 temp_rsa
-  - sudo apt-get update && sudo apt-get install yarn
+- ssh-add temp_rsa
-before_script:
+- ssh -4 -fNL 8545:localhost:8545 geth@arch1.vdb.to
-  - sudo -u postgres createdb vulcanize_private
+- make installtools
-  - make migrate NAME=vulcanize_private
+- bash ./scripts/install-postgres-11.sh
-  - cd postgraphile && yarn
+- 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:
-  - yarn test
+- env GO111MODULE=on make test
-  - cd ../
+- env GO111MODULE=on make integrationtest
-  - make test
-  - make integrationtest
 notifications:
   email: false
-env:
-  matrix:
-    secure: GA4GiMHy868UD/C+59jRUOdJxxdLSMauNapPA31AODUMv0lcEOXg6TBJkv6Vn3OOrLHYYSpwCGiGQjF86U2vpKWzD1mSITalPfP/kNpFnrHVNf2oPpfrQs8ccs9gnFpbCNLDy0w2+55pgnrd5hvdnlsTEUS1lHWSKEZmWsSqUeS/dw22IS0+nUja0Pc3pHaWlJz2R502uEKIixjq1fOX65Z/9r1BrMqklOwWrABK0GwgYcDZwc+b3iovyDPkDa3sT/Ddz/srkcYi/Y182zdLdrknj3MVR3GiW5iSqIVm6gr427SFXF4EQVwkEBwAGoo83wRhCgCAslYTRZZ5aleb1HUtAWzuiMAd/JlAYb2jc6VJa19+rQ/5wd7Bann3hB5bY2uV+b02qFK3qWe6uqZLBSESWjFEyWJVoaXgpH0QDc0JG1R9UFxLSVa8NM3P/jgTnUgnAvdW36mTC4dg73Ha9bYdeLpuAZr6k8iTh5qp0CazKAazsdJ+ECNt6q3fkgsI/V5ZwCFfQwlauq+PiBaZsQqr7eeP19klipE3vGf6BCBRvCBdubzSgGZPIRkxOQREc24j/gzBjBNGeqoU2uOp8sXMEG5idfIyHbMU+n2Yi6IRKKPe5lwjgWEsqLkkoM2REMPIEPffRQz0f+mD48HWP0H4KjKHvubKRCE0v2ONlM4=

Dockerfile

@@ -2,9 +2,9 @@ FROM golang:alpine as builder
 RUN apk --update --no-cache add make git g++
 
 # Build statically linked vDB binary (wonky path because of Dep)
-RUN mkdir -p /go/src/github.com/vulcanize/vulcanizedb
+RUN mkdir -p /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-ADD . /go/src/github.com/vulcanize/vulcanizedb
+ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
-WORKDIR /go/src/github.com/vulcanize/vulcanizedb
+WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
 RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' .
 
 # Build migration tool
@@ -14,10 +14,10 @@ RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflag
 
 # Second stage
 FROM alpine
-COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/vulcanizedb /app/vulcanizedb
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/vulcanizedb /app/vulcanizedb
-COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/environments/staging.toml /app/environments/
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environments/staging.toml /app/environments/
-COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/dockerfiles/startup_script.sh /app/
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/startup_script.sh /app/
-COPY --from=builder /go/src/github.com/vulcanize/vulcanizedb/db/migrations/* /app/
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations/* /app/
 COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose /app/goose
 
 WORKDIR /app

Gopkg.lock

@@ -1,564 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  digest = "1:48a213e9dc4880bbbd6999309a476fa4d3cc67560aa7127154cf8ea95bd464c2"
-  name = "github.com/allegro/bigcache"
-  packages = [
-    ".",
-    "queue",
-  ]
-  pruneopts = ""
-  revision = "f31987a23e44c5121ef8c8b2f2ea2e8ffa37b068"
-  version = "v1.1.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:a313376bcbcce8ae8bddb8089a7293e0473a0f8e9e3710d6244e09e81875ccf0"
-  name = "github.com/aristanetworks/goarista"
-  packages = ["monotime"]
-  pruneopts = ""
-  revision = "ff33da284e760fcdb03c33d37a719e5ed30ba844"
-
-[[projects]]
-  branch = "master"
-  digest = "1:c6bf1ac7bbc0fe51637bf54d5a88ff79b171b3b42dbc665dec98303c862d8662"
-  name = "github.com/btcsuite/btcd"
-  packages = ["btcec"]
-  pruneopts = ""
-  revision = "cff30e1d23fc9e800b2b5b4b41ef1817dda07e9f"
-
-[[projects]]
-  digest = "1:5d47691333460db6ac83ced03c79b4bdb9aff3e322be24affb7855bed8affc6c"
-  name = "github.com/dave/jennifer"
-  packages = ["jen"]
-  pruneopts = ""
-  revision = "14e399b6b5e8456c66c45c955fc27b568bacb5c9"
-  version = "v1.3.0"
-
-[[projects]]
-  digest = "1:aaeffbff5bd24654cb4c190ed75d6c7b57b4f5d6741914c1a7a6bb7447e756c5"
-  name = "github.com/deckarep/golang-set"
-  packages = ["."]
-  pruneopts = ""
-  revision = "cbaa98ba5575e67703b32b4b19f73c91f3c4159e"
-  version = "v1.7.1"
-
-[[projects]]
-  digest = "1:90d36f5b581e95e00ced808cd48824ed6c320c25887828cce461bdef4cb7bc7c"
-  name = "github.com/ethereum/go-ethereum"
-  packages = [
-    ".",
-    "accounts",
-    "accounts/abi",
-    "accounts/abi/bind",
-    "accounts/keystore",
-    "common",
-    "common/bitutil",
-    "common/hexutil",
-    "common/math",
-    "common/mclock",
-    "common/prque",
-    "core/rawdb",
-    "core/types",
-    "crypto",
-    "crypto/ecies",
-    "crypto/secp256k1",
-    "ethclient",
-    "ethdb",
-    "ethdb/leveldb",
-    "ethdb/memorydb",
-    "event",
-    "log",
-    "metrics",
-    "p2p",
-    "p2p/discover",
-    "p2p/discv5",
-    "p2p/enode",
-    "p2p/enr",
-    "p2p/nat",
-    "p2p/netutil",
-    "params",
-    "rlp",
-    "rpc",
-    "trie",
-  ]
-  pruneopts = ""
-  revision = "cd79bc61a983d6482579d12cdd239b37bbfa12ef"
-
-[[projects]]
-  digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd"
-  name = "github.com/fsnotify/fsnotify"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  version = "v1.4.7"
-
-[[projects]]
-  digest = "1:a01080d20c45c031c13f3828c56e58f4f51d926a482ad10cc0316225097eb7ea"
-  name = "github.com/go-stack/stack"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2fee6af1a9795aafbe0253a0cfbdf668e1fb8a9a"
-  version = "v1.8.0"
-
-[[projects]]
-  digest = "1:3dd078fda7500c341bc26cfbc6c6a34614f295a2457149fc1045cab767cbcf18"
-  name = "github.com/golang/protobuf"
-  packages = ["proto"]
-  pruneopts = ""
-  revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:2a5888946cdbc8aa360fd43301f9fc7869d663f60d5eedae7d4e6e5e4f06f2bf"
-  name = "github.com/golang/snappy"
-  packages = ["."]
-  pruneopts = ""
-  revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"
-
-[[projects]]
-  digest = "1:5247b135b5492aa232a731acdcb52b08f32b874cb398f21ab460396eadbe866b"
-  name = "github.com/google/uuid"
-  packages = ["."]
-  pruneopts = ""
-  revision = "d460ce9f8df2e77fb1ba55ca87fafed96c607494"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:9c776d7d9c54b7ed89f119e449983c3f24c0023e75001d6092442412ebca6b94"
-  name = "github.com/hashicorp/golang-lru"
-  packages = [
-    ".",
-    "simplelru",
-  ]
-  pruneopts = ""
-  revision = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"
-
-[[projects]]
-  digest = "1:d14365c51dd1d34d5c79833ec91413bfbb166be978724f15701e17080dc06dec"
-  name = "github.com/hashicorp/hcl"
-  packages = [
-    ".",
-    "hcl/ast",
-    "hcl/parser",
-    "hcl/printer",
-    "hcl/scanner",
-    "hcl/strconv",
-    "hcl/token",
-    "json/parser",
-    "json/scanner",
-    "json/token",
-  ]
-  pruneopts = ""
-  revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:b3c5b95e56c06f5aa72cb2500e6ee5f44fcd122872d4fec2023a488e561218bc"
-  name = "github.com/hpcloud/tail"
-  packages = [
-    ".",
-    "ratelimiter",
-    "util",
-    "watch",
-    "winfile",
-  ]
-  pruneopts = ""
-  revision = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b6e4cc26365c004808649862e22069de09594a9222143399a7a04904e9f7018c"
-  name = "github.com/huin/goupnp"
-  packages = [
-    ".",
-    "dcps/internetgateway1",
-    "dcps/internetgateway2",
-    "httpu",
-    "scpd",
-    "soap",
-    "ssdp",
-  ]
-  pruneopts = ""
-  revision = "1395d1447324cbea88d249fbfcfd70ea878fdfca"
-
-[[projects]]
-  digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be"
-  name = "github.com/inconshreveable/mousetrap"
-  packages = ["."]
-  pruneopts = ""
-  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
-  version = "v1.0"
-
-[[projects]]
-  digest = "1:76f836364ae83ed811c415aa92e1209ce49de9f62aad85b85fca749a8b96a110"
-  name = "github.com/jackpal/go-nat-pmp"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c9cfead9f2a36ddf3daa40ba269aa7f4bbba6b62"
-  version = "v1.0.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:617ee2434b77e911fa26b678730be9a617f75243b194eadc8201c8ac860844aa"
-  name = "github.com/jmoiron/sqlx"
-  packages = [
-    ".",
-    "reflectx",
-  ]
-  pruneopts = ""
-  revision = "0dae4fefe7c0e190f7b5a78dac28a1c82cc8d849"
-
-[[projects]]
-  digest = "1:6a874e3ddfb9db2b42bd8c85b6875407c702fa868eed20634ff489bc896ccfd3"
-  name = "github.com/konsorten/go-windows-terminal-sequences"
-  packages = ["."]
-  pruneopts = ""
-  revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-  version = "v1.0.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:29145d7af4adafd72a79df5e41456ac9e232d5a28c1cd4dacf3ff008a217fc10"
-  name = "github.com/lib/pq"
-  packages = [
-    ".",
-    "oid",
-  ]
-  pruneopts = ""
-  revision = "4ded0e9383f75c197b3a2aaa6d590ac52df6fd79"
-
-[[projects]]
-  digest = "1:961dc3b1d11f969370533390fdf203813162980c858e1dabe827b60940c909a5"
-  name = "github.com/magiconair/properties"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2353362d570a7bfa228149c62842019201cfb71"
-  version = "v1.8.0"
-
-[[projects]]
-  digest = "1:096a8a9182648da3d00ff243b88407838902b6703fc12657f76890e08d1899bf"
-  name = "github.com/mitchellh/go-homedir"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:5219b4506253ccc598f9340677162a42d6a78f340a4cc6df2d62db4d0593c4e9"
-  name = "github.com/mitchellh/mapstructure"
-  packages = ["."]
-  pruneopts = ""
-  revision = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:a7fd918fb5bd2188436785c0424f8a50b4addfedf37a2b14d796be2a927b8007"
-  name = "github.com/onsi/ginkgo"
-  packages = [
-    ".",
-    "config",
-    "internal/codelocation",
-    "internal/containernode",
-    "internal/failer",
-    "internal/leafnodes",
-    "internal/remote",
-    "internal/spec",
-    "internal/spec_iterator",
-    "internal/specrunner",
-    "internal/suite",
-    "internal/testingtproxy",
-    "internal/writer",
-    "reporters",
-    "reporters/stenographer",
-    "reporters/stenographer/support/go-colorable",
-    "reporters/stenographer/support/go-isatty",
-    "types",
-  ]
-  pruneopts = ""
-  revision = "3774a09d95489ccaa16032e0770d08ea77ba6184"
-  version = "v1.6.0"
-
-[[projects]]
-  digest = "1:3ecd0a37c4a90c12a97e31c398cdbc173824351aa891898ee178120bfe71c478"
-  name = "github.com/onsi/gomega"
-  packages = [
-    ".",
-    "format",
-    "ghttp",
-    "internal/assertion",
-    "internal/asyncassertion",
-    "internal/oraclematcher",
-    "internal/testingtsupport",
-    "matchers",
-    "matchers/support/goraph/bipartitegraph",
-    "matchers/support/goraph/edge",
-    "matchers/support/goraph/node",
-    "matchers/support/goraph/util",
-    "types",
-  ]
-  pruneopts = ""
-  revision = "7615b9433f86a8bdf29709bf288bc4fd0636a369"
-  version = "v1.4.2"
-
-[[projects]]
-  digest = "1:a5484d4fa43127138ae6e7b2299a6a52ae006c7f803d98d717f60abf3e97192e"
-  name = "github.com/pborman/uuid"
-  packages = ["."]
-  pruneopts = ""
-  revision = "adf5a7427709b9deb95d29d3fa8a2bf9cfd388f1"
-  version = "v1.2"
-
-[[projects]]
-  digest = "1:894aef961c056b6d85d12bac890bf60c44e99b46292888bfa66caf529f804457"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:7143292549152d009ca9e9c493b74736a2ebd93f921bea8a4b308d7cc5edc6b3"
-  name = "github.com/rjeczalik/notify"
-  packages = ["."]
-  pruneopts = ""
-  revision = "0f065fa99b48b842c3fd3e2c8b194c6f2b69f6b8"
-  version = "v0.9.1"
-
-[[projects]]
-  digest = "1:78c9cf43ddeacd0e472f412082227a0fac2ae107ee60e9112156f9371f9912cf"
-  name = "github.com/rs/cors"
-  packages = ["."]
-  pruneopts = ""
-  revision = "3fb1b69b103a84de38a19c3c6ec073dd6caa4d3f"
-  version = "v1.5.0"
-
-[[projects]]
-  digest = "1:9d57e200ef5ccc4217fe0a34287308bac652435e7c6513f6263e0493d2245c56"
-  name = "github.com/sirupsen/logrus"
-  packages = ["."]
-  pruneopts = ""
-  revision = "bcd833dfe83d3cebad139e4a29ed79cb2318bf95"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:d0431c2fd72e39ee43ea7742322abbc200c3e704c9102c5c3c2e2e667095b0ca"
-  name = "github.com/spf13/afero"
-  packages = [
-    ".",
-    "mem",
-  ]
-  pruneopts = ""
-  revision = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd"
-  version = "v1.1.2"
-
-[[projects]]
-  digest = "1:d0b38ba6da419a6d4380700218eeec8623841d44a856bb57369c172fbf692ab4"
-  name = "github.com/spf13/cast"
-  packages = ["."]
-  pruneopts = ""
-  revision = "8965335b8c7107321228e3e3702cab9832751bac"
-  version = "v1.2.0"
-
-[[projects]]
-  digest = "1:a1403cc8a94b8d7956ee5e9694badef0e7b051af289caad1cf668331e3ffa4f6"
-  name = "github.com/spf13/cobra"
-  packages = ["."]
-  pruneopts = ""
-  revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"
-  version = "v0.0.3"
-
-[[projects]]
-  digest = "1:9ceffa4ab5f7195ecf18b3a7fff90c837a9ed5e22e66d18069e4bccfe1f52aa0"
-  name = "github.com/spf13/jwalterweatherman"
-  packages = ["."]
-  pruneopts = ""
-  revision = "4a4406e478ca629068e7768fc33f3f044173c0a6"
-  version = "v1.0.0"
-
-[[projects]]
-  digest = "1:0a52bcb568386d98f4894575d53ce3e456f56471de6897bb8b9de13c33d9340e"
-  name = "github.com/spf13/pflag"
-  packages = ["."]
-  pruneopts = ""
-  revision = "9a97c102cda95a86cec2345a6f09f55a939babf5"
-  version = "v1.0.2"
-
-[[projects]]
-  digest = "1:ac25ea6cc1156aca9611411274b4a0bdd83a623845df6985aab508253955cc66"
-  name = "github.com/spf13/viper"
-  packages = ["."]
-  pruneopts = ""
-  revision = "8fb642006536c8d3760c99d4fa2389f5e2205631"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ce5194e5afac308cc34e500cab45b4ce88a0742d689e3cf7e37b607ad76bed2f"
-  name = "github.com/syndtr/goleveldb"
-  packages = [
-    "leveldb",
-    "leveldb/cache",
-    "leveldb/comparer",
-    "leveldb/errors",
-    "leveldb/filter",
-    "leveldb/iterator",
-    "leveldb/journal",
-    "leveldb/memdb",
-    "leveldb/opt",
-    "leveldb/storage",
-    "leveldb/table",
-    "leveldb/util",
-  ]
-  pruneopts = ""
-  revision = "ae2bd5eed72d46b28834ec3f60db3a3ebedd8dbd"
-
-[[projects]]
-  branch = "master"
-  digest = "1:59b49c47c11a48f1054529207f65907c014ecf5f9a7c0d9c0f1616dec7b062ed"
-  name = "golang.org/x/crypto"
-  packages = [
-    "pbkdf2",
-    "scrypt",
-    "sha3",
-    "ssh/terminal",
-  ]
-  pruneopts = ""
-  revision = "ff983b9c42bc9fbf91556e191cc8efb585c16908"
-
-[[projects]]
-  branch = "master"
-  digest = "1:fbdbb6cf8db3278412c9425ad78b26bb8eb788181f26a3ffb3e4f216b314f86a"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "html",
-    "html/atom",
-    "html/charset",
-    "websocket",
-  ]
-  pruneopts = ""
-  revision = "26e67e76b6c3f6ce91f7c52def5af501b4e0f3a2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b2ea75de0ccb2db2ac79356407f8a4cd8f798fe15d41b381c00abf3ae8e55ed1"
-  name = "golang.org/x/sync"
-  packages = ["errgroup"]
-  pruneopts = ""
-  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
-
-[[projects]]
-  branch = "master"
-  digest = "1:70d519d5cddeb60ceda2db88c24c340b1b2d7efb25ab54bacb38f57ea1998df7"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows",
-  ]
-  pruneopts = ""
-  revision = "d641721ec2dead6fe5ca284096fe4b1fcd49e427"
-
-[[projects]]
-  digest = "1:5acd3512b047305d49e8763eef7ba423901e85d5dd2fd1e71778a0ea8de10bd4"
-  name = "golang.org/x/text"
-  packages = [
-    "encoding",
-    "encoding/charmap",
-    "encoding/htmlindex",
-    "encoding/internal",
-    "encoding/internal/identifier",
-    "encoding/japanese",
-    "encoding/korean",
-    "encoding/simplifiedchinese",
-    "encoding/traditionalchinese",
-    "encoding/unicode",
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "internal/utf8internal",
-    "language",
-    "runes",
-    "transform",
-    "unicode/cldr",
-    "unicode/norm",
-  ]
-  pruneopts = ""
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
-[[projects]]
-  digest = "1:eb53021a8aa3f599d29c7102e65026242bdedce998a54837dc67f14b6a97c5fd"
-  name = "gopkg.in/fsnotify.v1"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
-  source = "gopkg.in/fsnotify/fsnotify.v1"
-  version = "v1.4.7"
-
-[[projects]]
-  branch = "v2"
-  digest = "1:4f830ee018eb8c56d0def653ad7c9a1d2a053f0cef2ac6b2200f73b98fa6a681"
-  name = "gopkg.in/natefinch/npipe.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"
-
-[[projects]]
-  branch = "v1"
-  digest = "1:a96d16bd088460f2e0685d46c39bcf1208ba46e0a977be2df49864ec7da447dd"
-  name = "gopkg.in/tomb.v1"
-  packages = ["."]
-  pruneopts = ""
-  revision = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"
-
-[[projects]]
-  digest = "1:f0620375dd1f6251d9973b5f2596228cc8042e887cd7f827e4220bc1ce8c30e2"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  pruneopts = ""
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
-  version = "v2.2.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/dave/jennifer/jen",
-    "github.com/ethereum/go-ethereum",
-    "github.com/ethereum/go-ethereum/accounts/abi",
-    "github.com/ethereum/go-ethereum/accounts/abi/bind",
-    "github.com/ethereum/go-ethereum/common",
-    "github.com/ethereum/go-ethereum/common/hexutil",
-    "github.com/ethereum/go-ethereum/core/rawdb",
-    "github.com/ethereum/go-ethereum/core/types",
-    "github.com/ethereum/go-ethereum/crypto",
-    "github.com/ethereum/go-ethereum/ethclient",
-    "github.com/ethereum/go-ethereum/ethdb",
-    "github.com/ethereum/go-ethereum/p2p",
-    "github.com/ethereum/go-ethereum/p2p/discv5",
-    "github.com/ethereum/go-ethereum/params",
-    "github.com/ethereum/go-ethereum/rlp",
-    "github.com/ethereum/go-ethereum/rpc",
-    "github.com/hashicorp/golang-lru",
-    "github.com/hpcloud/tail",
-    "github.com/jmoiron/sqlx",
-    "github.com/lib/pq",
-    "github.com/mitchellh/go-homedir",
-    "github.com/onsi/ginkgo",
-    "github.com/onsi/gomega",
-    "github.com/onsi/gomega/ghttp",
-    "github.com/sirupsen/logrus",
-    "github.com/spf13/cobra",
-    "github.com/spf13/viper",
-    "golang.org/x/net/context",
-    "golang.org/x/sync/errgroup",
-    "gopkg.in/tomb.v1",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1

Gopkg.toml

@@ -1,54 +0,0 @@
-
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
-[[override]]
-  name = "gopkg.in/fsnotify.v1"
-  source = "gopkg.in/fsnotify/fsnotify.v1"
-
-[[override]]
-  name = "github.com/pressly/sup"
-  version = "0.5.3"
-
-[[constraint]]
-  name = "github.com/onsi/ginkgo"
-  version = "1.4.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/jmoiron/sqlx"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/lib/pq"
-
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  version = "1.2.0"
-
-[[constraint]]
-  name = "github.com/spf13/cobra"
-  version = "0.0.1"
-
-[[constraint]]
-  name = "github.com/ethereum/go-ethereum"
-  revision = "cd79bc61a983d6482579d12cdd239b37bbfa12ef"

Makefile

@@ -3,11 +3,6 @@ BASE = $(GOPATH)/src/$(PACKAGE)
 PKGS = go list ./... | grep -v "^vendor/"
 
 # Tools
-## Dependency management
-DEP = $(BIN)/dep
-$(BIN)/dep:
-	go get -u github.com/golang/dep/cmd/dep
-
 ## Testing library
 GINKGO = $(BIN)/ginkgo
 $(BIN)/ginkgo:
@@ -32,7 +27,7 @@ $(BIN)/gometalinter.v2:
 
 
 .PHONY: installtools
-installtools: | $(LINT) $(GOOSE) $(GINKGO) $(DEP)
+installtools: | $(LINT) $(GOOSE) $(GINKGO)
 	echo "Installing tools"
 
 .PHONY: metalint
@@ -46,32 +41,43 @@ metalint: | $(METALINT)
 lint:
 	$(LINT) $$($(PKGS)) | grep -v -E "exported (function)|(var)|(method)|(type).*should have comment or be unexported"
 
+#Database
+HOST_NAME = localhost
+PORT = 5432
+NAME =
+USER = postgres
+CONNECT_STRING=postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable
+
+#Test
+TEST_DB = vulcanize_testing
+TEST_CONNECT_STRING = postgresql://$(USER)@$(HOST_NAME):$(PORT)/$(TEST_DB)?sslmode=disable
+
 .PHONY: test
 test: | $(GINKGO) $(LINT)
 	go vet ./...
 	go fmt ./...
+	dropdb --if-exists $(TEST_DB)
+	createdb $(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)
 	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
+	make migrate NAME=$(TEST_DB)
 	$(GINKGO) -r integration_test/
 
-.PHONY: dep
+build:
-dep: | $(DEP)
-	$(DEP) ensure
-
-build: dep
 	go fmt ./...
 	go build
 
-#Database
-HOST_NAME = localhost
-PORT = 5432
-NAME =
-CONNECT_STRING=postgresql://$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable
-
 # Parameter checks
 ## Check that DB variables are provided
 .PHONY: checkdbvars
@@ -95,41 +101,36 @@ checkmigname:
 ## Rollback the last migration
 .PHONY: rollback
 rollback: $(GOOSE) checkdbvars
-	cd db/migrations;\
+	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" down
-	  $(GOOSE) postgres "$(CONNECT_STRING)" down
 	pg_dump -O -s $(CONNECT_STRING) > db/schema.sql
 
 
 ## Rollbackt to a select migration (id/timestamp)
 .PHONY: rollback_to
 rollback_to: $(GOOSE) checkmigration checkdbvars
-	cd db/migrations;\
+	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" down-to "$(MIGRATION)"
-	  $(GOOSE) postgres "$(CONNECT_STRING)" down-to "$(MIGRATION)"
 
 ## Apply all migrations not already run
 .PHONY: migrate
 migrate: $(GOOSE) checkdbvars
-	cd db/migrations;\
+	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" up
-	  $(GOOSE) postgres "$(CONNECT_STRING)" up
 	pg_dump -O -s $(CONNECT_STRING) > db/schema.sql
 
 ## Create a new migration file
 .PHONY: new_migration
 new_migration: $(GOOSE) checkmigname
-	cd db/migrations;\
+	$(GOOSE) -dir db/migrations create $(NAME) sql
-	  $(GOOSE) create $(NAME) sql
 
 ## Check which migrations are applied at the moment
 .PHONY: migration_status
 migration_status: $(GOOSE) checkdbvars
-	cd db/migrations;\
+	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" status
-	  $(GOOSE) postgres "$(CONNECT_STRING)" status
 
 # Convert timestamped migrations to versioned (to be run in CI);
 # merge timestamped files to prevent conflict
 .PHONY: version_migrations
 version_migrations:
-	cd db/migrations; $(GOOSE) fix
+	$(GOOSE) -dir db/migrations fix
 
 # Import a psql schema to the database
 .PHONY: import

README.md

@@ -1,134 +1,252 @@
-# Vulcanize DB
+# ipfs-blockchain-watcher
 
-[![Build Status](https://travis-ci.org/vulcanize/vulcanizedb.svg?branch=master)](https://travis-ci.org/vulcanize/vulcanizedb)
+[![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/vulcanizedb)](https://goreportcard.com/report/github.com/vulcanize/vulcanizedb)
-
-> Vulcanize DB is a set of tools that make it easier for developers to write application-specific indexes and caches for dapps built on Ethereum.
 
+> Tool for extracting and indexing blockchain data on PG-IPFS
 
 ## Table of Contents
-1. [Background](../staging/README.md#background)
+1. [Background](#background)
-1. [Dependencies](../staging/README.md#dependencies)
+1. [Architecture](#architecture)
-1. [Install](../staging/README.md#install)
+1. [Install](#install)
-1. [Usage](../staging/README.md#usage)
+1. [Usage](#usage)
-1. [Tests](../staging/README.md#tests)
+1. [Contributing](#contributing)
-1. [API](../staging/README.md#API)
+1. [License](#license)
-1. [Contributing](../staging/README.md#contributing)
-1. [License](../staging/README.md#license)
-
 
 ## Background
-The same data structures and encodings that make Ethereum an effective and trust-less distributed virtual machine
+ipfs-blockchain-watcher is a collection of interfaces that are used to extract, process, and store in Postgres-IPFS
-complicate data accessibility and usability for dApp developers.
+all chain data. The raw data indexed by ipfs-blockchain-watcher serves as the basis for more specific watchers and applications.
 
+Currently the service supports complete processing of all Bitcoin and Ethereum data.
 
-## Dependencies
+## Architecture
- - Go 1.11+
+More details on the design of ipfs-blockchain-watcher can be found in [here](./documentation/architecture.md)
- - Postgres 10.6
- - Ethereum Node
-   - [Go Ethereum](https://ethereum.github.io/go-ethereum/downloads/) (1.8.23+)
-   - [Parity 1.8.11+](https://github.com/paritytech/parity/releases)
-
 
 ## Install
-1. [Building the project](../staging/README.md#building-the-project)
+1. [Postgres](#postgres)
-1. [Setting up the database](../staging/README.md#setting-up-the-database)
+1. [Goose](#goose)
-1. [Configuring a synced Ethereum node](../staging/README.md#configuring-a-synced-ethereum-node)
+1. [IPFS](#ipfs)
+1. [Blockchain](#blockchain)
+1. [Watcher](#watcher)
 
-### Building the project
+### Postgres
-Download the codebase to your local `GOPATH` via:
+1. [Install Postgres](https://wiki.postgresql.org/wiki/Detailed_installation_guides)
-
-`go get github.com/vulcanize/vulcanizedb`
-
-Move to the project directory and use [golang/dep](https://github.com/golang/dep) to install the dependencies:
-
-`cd $GOPATH/src/github.com/vulcanize/vulcanizedb`
-
-`dep ensure`
-
-Once the dependencies have been successfully installed, build the executable with:
-
-`make build`
-
-If you are running into issues at this stage, ensure that `GOPATH` is defined in your shell.
-If necessary, `GOPATH` can be set in `~/.bashrc` or `~/.bash_profile`, depending upon your system.
-It can be additionally helpful to add `$GOPATH/bin` to your shell's `$PATH`.
-
-### Setting up the database
-1. Install Postgres
 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/vulcanizedb`
+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`
 
     * 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
+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)
 
-### Configuring a synced Ethereum node
+### Goose
-- To use a local Ethereum node, copy `environments/public.toml.example` to
+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
-  `environments/public.toml` and update the `ipcPath` and `levelDbPath`.
+is required for running the automated tests.
-  - `ipcPath` should match the local node's IPC filepath:
-      - For Geth:
-        - The IPC file is called `geth.ipc`.
-        - The geth IPC file path is printed to the console when you start geth.
-        - The default location is:
-          - Mac: `<full home path>/Library/Ethereum`
-          - Linux: `<full home path>/ethereum/geth.ipc`
 
-      - For Parity:
+### IPFS
-        - The IPC file is called `jsonrpc.ipc`.
+We use IPFS to store IPLD objects for each type of data we extract from on chain.
-        - The default location is:
-          - Mac: `<full home path>/Library/Application\ Support/io.parity.ethereum/`
-          - Linux: `<full home path>/local/share/io.parity.ethereum/`
 
-  - `levelDbPath` should match Geth's chaindata directory path.
+To start, download and install [IPFS](https://github.com/vulcanize/go-ipfs):
-      - The geth LevelDB chaindata path is printed to the console when you start geth.
-      - The default location is:
-          - Mac: `<full home path>/Library/Ethereum/geth/chaindata`
-          - Linux: `<full home path>/ethereum/geth/chaindata`
-      - `levelDbPath` is irrelevant (and `coldImport` is currently unavailable) if only running parity.
 
+`go get github.com/ipfs/go-ipfs`
+
+`cd $GOPATH/src/github.com/ipfs/go-ipfs`
+
+`make install`
+
+If we want to use Postgres as our backing datastore, we need to use the vulcanize fork of go-ipfs.
+
+Start by adding the fork and switching over to it:
+
+`git remote add vulcanize https://github.com/vulcanize/go-ipfs.git`
+
+`git fetch vulcanize`
+
+`git checkout -b postgres_update vulcanize/postgres_update`
+
+Now install this fork of ipfs, first be sure to remove any previous installation:
+
+`make install`
+
+Check that is installed properly by running:
+
+`ipfs`
+
+You should see the CLI info/help output.
+
+And now we initialize with the `postgresds` profile.
+If ipfs was previously initialized we will need to remove the old profile first.
+We also need to provide env variables for the postgres connection:
+
+We can either set these manually, e.g.
+```bash
+export IPFS_PGHOST=
+export IPFS_PGUSER=
+export IPFS_PGDATABASE=
+export IPFS_PGPORT=
+export IPFS_PGPASSWORD=
+```
+
+And then run the ipfs command:
+
+`ipfs init --profile=postgresds`
+
+Or we can use the pre-made script at `GOPATH/src/github.com/ipfs/go-ipfs/misc/utility/ipfs_postgres.sh`
+which has usage:
+
+`./ipfs_postgres.sh <IPFS_PGHOST> <IPFS_PGPORT> <IPFS_PGUSER> <IPFS_PGDATABASE>"`
+
+and will ask us to enter the password, avoiding storing it to an ENV variable.
+
+Once we have initialized ipfs, that is all we need to do with it- we do not need to run a daemon during the subsequent processes.
+
+### Blockchain
+This section describes how to setup an Ethereum or Bitcoin node to serve as a data source for ipfs-blockchain-watcher
+
+#### Ethereum
+For Ethereum, we currently *require* [a special fork of go-ethereum](https://github.com/vulcanize/go-ethereum/tree/statediff_at_anyblock-1.9.11). This can be setup as follows.
+Skip this steps if you already have access to a node that displays the statediffing endpoints.
+
+Begin by downloading geth and switching to the vulcanize/rpc_statediffing branch:
+
+`go get github.com/ethereum/go-ethereum`
+
+`cd $GOPATH/src/github.com/ethereum/go-ethereum`
+
+`git remote add vulcanize https://github.com/vulcanize/go-ethereum.git`
+
+`git fetch vulcanize`
+
+`git checkout -b statediffing vulcanize/statediff_at_anyblock-1.9.11`
+
+Now, install this fork of geth (make sure any old versions have been uninstalled/binaries removed first):
+
+`make geth`
+
+And run the output binary with statediffing turned on:
+
+`cd $GOPATH/src/github.com/ethereum/go-ethereum/build/bin`
+
+`./geth --statediff --statediff.streamblock --ws --syncmode=full`
+
+Note: if you wish to access historical data (perform `backFill`) then the node will need to operate as an archival node (`--gcmode=archive`)
+
+Note: other CLI options- statediff specific ones included- can be explored with `./geth help`
+
+The output from geth should mention that it is `Starting statediff service` and block synchronization should begin shortly thereafter.
+Note that until it receives a subscriber, the statediffing process does nothing but wait for one. Once a subscription is received, this
+will be indicated in the output and node will begin processing and sending statediffs.
+
+Also in the output will be the endpoints that we will use to interface with the node.
+The default ws url is "127.0.0.1:8546" and the default http url is "127.0.0.1:8545".
+These values will be used as the `ethereum.wsPath` and `ethereum.httpPath` in the config, respectively.
+
+#### Bitcoin
+For Bitcoin, ipfs-blockchain-watcher is able to operate entirely through the universally exposed JSON-RPC interfaces.
+This means we can use any of the standard full nodes (e.g. bitcoind, btcd) as our data source.
+
+Point at a remote node or set one up locally using the instructions for [bitcoind](https://github.com/bitcoin/bitcoin) and [btcd](https://github.com/btcsuite/btcd).
+
+The default http url is "127.0.0.1:8332". We will use the http endpoint as both the `bitcoin.wsPath` and `bitcoin.httpPath`
+(bitcoind does not support websocket endpoints, we are currently using a "subscription" wrapper around the http endpoints)
+
+### Watcher
+Finally, we can setup the watcher process itself.
+
+Start by downloading vulcanizedb and moving into the repo:
+
+`go get github.com/vulcanize/ipfs-blockchain-watcher`
+
+`cd $GOPATH/src/github.com/vulcanize/ipfs-blockchain-watcher`
+
+Then, build the binary:
+
+`make build`
 
 ## Usage
-Usage is broken up into two processes:
+After building the binary, run as
 
-### Data syncing
+`./ipfs-blockchain-watcher watch --config=<config_file.toml`
-To provide data for transformations, raw Ethereum data must first be synced into vDB.
-This is accomplished through the use of the `lightSync`, `sync`, or `coldImport` commands.
-These commands are described in detail [here](../staging/documentation/sync.md).
 
-### Data transformation
+### Configuration
-Contract watchers use the raw data that has been synced into Postgres to filter out and apply transformations to specific data of interest.
 
-There is a built-in `contractWatcher` command which provides generic transformation of most contract data. This command is described in detail [here](../staging/documentation/contractWatcher.md).
+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.
 
-In many cases a custom transformer or set of transformers will need to be written to provide complete or more comprehensive coverage or to optimize other aspects of the output for a specific end-use.
+```toml
-In this case we have provided the `compose`, `execute`, and `composeAndExecute` commands for running custom transformers from external repositories. This is described in detail [here](../staging/documentation/composeAndExecute.md).
+[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 = "postgres" # $IPFS_MODE
 
-## Tests
+[superNode]
-- Replace the empty `ipcPath` in the `environments/infura.toml` with a path to a full node's eth_jsonrpc endpoint (e.g. local geth node ipc path or infura url)
+    chain = "bitcoin" # $SUPERNODE_CHAIN
-    - Note: integration tests require configuration with an archival node
+    server = true # $SUPERNODE_SERVER
-- `createdb vulcanize_private` will create the test db
+    ipcPath = "~/.vulcanize/vulcanize.ipc" # $SUPERNODE_IPC_PATH
-- `make migrate NAME=vulcanize_private` will run the db migrations
+    wsPath = "127.0.0.1:8082" # $SUPERNODE_WS_PATH
-- `make test` will run the unit tests and skip the integration tests
+    httpPath = "127.0.0.1:8083" # $SUPERNODE_HTTP_PATH
-- `make integrationtest` will run just the integration tests
+    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
+```
 
-## API
+Additional parameters need to be set depending on the specific chain.
-[Postgraphile](https://www.graphile.org/postgraphile/) is used to expose GraphQL endpoints for our database schemas, this is described in detail [here](../staging/postgraphile/README.md).
 
+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
+```
+
+### 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)
+
+### Testing
+`make test` will run the unit tests
+`make test` setups a clean `vulcanize_testing` db
 
 ## Contributing
-Contributions are welcome! For more on this, please see [here](../staging/documentation/contributing.md).
+Contributions are welcome!
-
-Small note: If editing the Readme, please conform to the [standard-readme specification](https://github.com/RichardLitt/standard-readme).
 
+VulcanizeDB follows the [Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct).
 
 ## License
-[AGPL-3.0](../staging/LICENSE) © Vulcanize Inc
+[AGPL-3.0](LICENSE) © Vulcanize Inc

cmd/coldImport.go

@@ -1,95 +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 cmd
-
-import (
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
-	"github.com/vulcanize/vulcanizedb/pkg/crypto"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore/ethereum"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
-	"github.com/vulcanize/vulcanizedb/pkg/fs"
-	"github.com/vulcanize/vulcanizedb/pkg/geth/cold_import"
-	"github.com/vulcanize/vulcanizedb/pkg/geth/converters/cold_db"
-	vulcCommon "github.com/vulcanize/vulcanizedb/pkg/geth/converters/common"
-	"github.com/vulcanize/vulcanizedb/utils"
-)
-
-var coldImportCmd = &cobra.Command{
-	Use:   "coldImport",
-	Short: "Sync vulcanize from a cold instance of LevelDB.",
-	Long: `Populate core vulcanize db data directly out of LevelDB, rather than over rpc calls. For example:
-
-./vulcanizedb coldImport -s 0 -e 5000000
-
-Geth must be synced over all of the desired blocks and must not be running in order to execute this command.`,
-	Run: func(cmd *cobra.Command, args []string) {
-		coldImport()
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(coldImportCmd)
-	coldImportCmd.Flags().Int64VarP(&startingBlockNumber, "starting-block-number", "s", 0, "BlockNumber for first block to cold import.")
-	coldImportCmd.Flags().Int64VarP(&endingBlockNumber, "ending-block-number", "e", 5500000, "BlockNumber for last block to cold import.")
-	coldImportCmd.Flags().BoolVarP(&syncAll, "all", "a", false, "Option to sync all missing blocks.")
-}
-
-func coldImport() {
-	// init eth db
-	ethDBConfig := ethereum.CreateDatabaseConfig(ethereum.Level, levelDbPath)
-	ethDB, err := ethereum.CreateDatabase(ethDBConfig)
-	if err != nil {
-		log.Fatal("Error connecting to ethereum db: ", err)
-	}
-	mostRecentBlockNumberInDb := ethDB.GetHeadBlockNumber()
-	if syncAll {
-		startingBlockNumber = 0
-		endingBlockNumber = mostRecentBlockNumberInDb
-	}
-	if endingBlockNumber < startingBlockNumber {
-		log.Fatal("Ending block number must be greater than starting block number for cold import.")
-	}
-	if endingBlockNumber > mostRecentBlockNumberInDb {
-		log.Fatal("Ending block number is greater than most recent block in db: ", mostRecentBlockNumberInDb)
-	}
-
-	// init pg db
-	genesisBlock := ethDB.GetBlockHash(0)
-	reader := fs.FsReader{}
-	parser := crypto.EthPublicKeyParser{}
-	nodeBuilder := cold_import.NewColdImportNodeBuilder(reader, parser)
-	coldNode, err := nodeBuilder.GetNode(genesisBlock, levelDbPath)
-	if err != nil {
-		log.Fatal("Error getting node: ", err)
-	}
-	pgDB := utils.LoadPostgres(databaseConfig, coldNode)
-
-	// init cold importer deps
-	blockRepository := repositories.NewBlockRepository(&pgDB)
-	receiptRepository := repositories.ReceiptRepository{DB: &pgDB}
-	transactionConverter := cold_db.NewColdDbTransactionConverter()
-	blockConverter := vulcCommon.NewBlockConverter(transactionConverter)
-
-	// init and execute cold importer
-	coldImporter := cold_import.NewColdImporter(ethDB, blockRepository, receiptRepository, blockConverter)
-	err = coldImporter.Execute(startingBlockNumber, endingBlockNumber, coldNode.ID)
-	if err != nil {
-		log.Fatal("Error executing cold import: ", err)
-	}
-}

cmd/compose.go

@@ -1,187 +0,0 @@
-// Copyright © 2019 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 (
-	"errors"
-	"fmt"
-	"strconv"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	"github.com/vulcanize/vulcanizedb/pkg/config"
-	p2 "github.com/vulcanize/vulcanizedb/pkg/plugin"
-)
-
-// composeCmd represents the compose command
-var composeCmd = &cobra.Command{
-	Use:   "compose",
-	Short: "Composes transformer initializer plugin",
-	Long: `This command needs a config .toml file of form:
-
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    user     = "vulcanize"
-    password = "vulcanize"
-    port     = 5432
-
-[client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-[exporter]
-    home     = "github.com/vulcanize/vulcanizedb"
-    name     = "exampleTransformerExporter"
-    save     = false
-    transformerNames = [
-        "transformer1",
-        "transformer2",
-        "transformer3",
-        "transformer4",
-    ]
-    [exporter.transformer1]
-        path = "path/to/transformer1"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer2]
-        path = "path/to/transformer2"
-        type = "eth_contract"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer3]
-        path = "path/to/transformer3"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer4]
-        path = "path/to/transformer4"
-        type = "eth_storage"
-        repository = "github.com/account2/repo2"
-        migrations = "to/db/migrations"
-        rank = "1"
-
-
-Note: If any of the plugin transformer need additional
-configuration variables include them in the .toml file as well
-
-This information is used to write and build a go plugin with a transformer 
-set composed from the transformer imports specified in the config file
-This plugin is loaded and the set of transformer initializers is exported
-from it and loaded into and executed over by the appropriate watcher. 
-
-The type of watcher that the transformer works with is specified using the 
-type variable for each transformer in the config. Currently there are watchers 
-of event data from an eth node (eth_event) and storage data from an eth node 
-(eth_storage), and a more generic interface for accepting contract_watcher pkg
-based transformers which can perform both event watching and public method 
-polling (eth_contract).
-
-Transformers of different types can be ran together in the same command using a 
-single config file or in separate command instances using different config files
-
-Specify config location when executing the command:
-./vulcanizedb compose --config=./environments/config_name.toml`,
-	Run: func(cmd *cobra.Command, args []string) {
-		compose()
-	},
-}
-
-func compose() {
-	// Build plugin generator config
-	prepConfig()
-
-	// Generate code to build the plugin according to the config file
-	log.Info("generating plugin")
-	generator, err := p2.NewGenerator(genConfig, databaseConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = generator.GenerateExporterPlugin()
-	if err != nil {
-		log.Debug("generating plugin failed")
-		log.Fatal(err)
-	}
-	// TODO: Embed versioning info in the .so files so we know which version of vulcanizedb to run them with
-	_, pluginPath, err := genConfig.GetPluginPaths()
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Composed plugin %s", pluginPath)
-	log.Info("plugin .so file output to", pluginPath)
-}
-
-func init() {
-	rootCmd.AddCommand(composeCmd)
-}
-
-func prepConfig() {
-	log.Info("configuring plugin")
-	names := viper.GetStringSlice("exporter.transformerNames")
-	transformers := make(map[string]config.Transformer)
-	for _, name := range names {
-		transformer := viper.GetStringMapString("exporter." + name)
-		p, pOK := transformer["path"]
-		if !pOK || p == "" {
-			log.Fatal(name, "transformer config is missing `path` value")
-		}
-		r, rOK := transformer["repository"]
-		if !rOK || r == "" {
-			log.Fatal(name, "transformer config is missing `repository` value")
-		}
-		m, mOK := transformer["migrations"]
-		if !mOK || m == "" {
-			log.Fatal(name, "transformer config is missing `migrations` value")
-		}
-		mr, mrOK := transformer["rank"]
-		if !mrOK || mr == "" {
-			log.Fatal(name, "transformer config is missing `rank` value")
-		}
-		rank, err := strconv.ParseUint(mr, 10, 64)
-		if err != nil {
-			log.Fatal(name, "migration `rank` can't be converted to an unsigned integer")
-		}
-		t, tOK := transformer["type"]
-		if !tOK {
-			log.Fatal(name, "transformer config is missing `type` value")
-		}
-		transformerType := config.GetTransformerType(t)
-		if transformerType == config.UnknownTransformerType {
-			log.Fatal(errors.New(`unknown transformer type in exporter config accepted types are "eth_event", "eth_storage"`))
-		}
-
-		transformers[name] = config.Transformer{
-			Path:           p,
-			Type:           transformerType,
-			RepositoryPath: r,
-			MigrationPath:  m,
-			MigrationRank:  rank,
-		}
-	}
-
-	genConfig = config.Plugin{
-		Transformers: transformers,
-		FilePath:     "$GOPATH/src/github.com/vulcanize/vulcanizedb/plugins",
-		FileName:     viper.GetString("exporter.name"),
-		Save:         viper.GetBool("exporter.save"),
-		Home:         viper.GetString("exporter.home"),
-	}
-}

cmd/composeAndExecute.go

@@ -1,191 +0,0 @@
-// Copyright © 2019 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/vulcanize/vulcanizedb/libraries/shared/watcher"
-	"github.com/vulcanize/vulcanizedb/pkg/fs"
-	p2 "github.com/vulcanize/vulcanizedb/pkg/plugin"
-	"github.com/vulcanize/vulcanizedb/pkg/plugin/helpers"
-	"github.com/vulcanize/vulcanizedb/utils"
-	"os"
-	"plugin"
-	syn "sync"
-)
-
-// composeAndExecuteCmd represents the composeAndExecute command
-var composeAndExecuteCmd = &cobra.Command{
-	Use:   "composeAndExecute",
-	Short: "Composes, loads, and executes transformer initializer plugin",
-	Long: `This command needs a config .toml file of form:
-
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    user     = "vulcanize"
-    password = "vulcanize"
-    port     = 5432
-
-[client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-[exporter]
-    home     = "github.com/vulcanize/vulcanizedb"
-    name     = "exampleTransformerExporter"
-    save     = false
-    transformerNames = [
-        "transformer1",
-        "transformer2",
-        "transformer3",
-        "transformer4",
-    ]
-    [exporter.transformer1]
-        path = "path/to/transformer1"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer2]
-        path = "path/to/transformer2"
-        type = "eth_contract"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "2"
-    [exporter.transformer3]
-        path = "path/to/transformer3"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer4]
-        path = "path/to/transformer4"
-        type = "eth_storage"
-        repository = "github.com/account2/repo2"
-        migrations = "to/db/migrations"
-        rank = "1"
-
-
-Note: If any of the plugin transformer need additional
-configuration variables include them in the .toml file as well
-
-This information is used to write and build a go plugin with a transformer 
-set composed from the transformer imports specified in the config file
-This plugin is loaded and the set of transformer initializers is exported
-from it and loaded into and executed over by the appropriate watcher. 
-
-The type of watcher that the transformer works with is specified using the 
-type variable for each transformer in the config. Currently there are watchers 
-of event data from an eth node (eth_event) and storage data from an eth node 
-(eth_storage), and a more generic interface for accepting contract_watcher pkg
-based transformers which can perform both event watching and public method 
-polling (eth_contract).
-
-Transformers of different types can be ran together in the same command using a 
-single config file or in separate command instances using different config files
-
-Specify config location when executing the command:
-./vulcanizedb composeAndExecute --config=./environments/config_name.toml`,
-	Run: func(cmd *cobra.Command, args []string) {
-		composeAndExecute()
-	},
-}
-
-func composeAndExecute() {
-	// Build plugin generator config
-	prepConfig()
-
-	// Generate code to build the plugin according to the config file
-	log.Info("generating plugin")
-	generator, err := p2.NewGenerator(genConfig, databaseConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = generator.GenerateExporterPlugin()
-	if err != nil {
-		log.Debug("generating plugin failed")
-		log.Fatal(err)
-	}
-
-	// Get the plugin path and load the plugin
-	_, pluginPath, err := genConfig.GetPluginPaths()
-	if err != nil {
-		log.Fatal(err)
-	}
-	if !genConfig.Save {
-		defer helpers.ClearFiles(pluginPath)
-	}
-	log.Info("linking plugin", pluginPath)
-	plug, err := plugin.Open(pluginPath)
-	if err != nil {
-		log.Debug("linking plugin failed")
-		log.Fatal(err)
-	}
-
-	// Load the `Exporter` symbol from the plugin
-	log.Info("loading transformers from plugin")
-	symExporter, err := plug.Lookup("Exporter")
-	if err != nil {
-		log.Debug("loading Exporter symbol failed")
-		log.Fatal(err)
-	}
-
-	// Assert that the symbol is of type Exporter
-	exporter, ok := symExporter.(Exporter)
-	if !ok {
-		log.Debug("plugged-in symbol not of type Exporter")
-		os.Exit(1)
-	}
-
-	// Use the Exporters export method to load the EventTransformerInitializer, StorageTransformerInitializer, and ContractTransformerInitializer sets
-	ethEventInitializers, ethStorageInitializers, ethContractInitializers := exporter.Export()
-
-	// Setup bc and db objects
-	blockChain := getBlockChain()
-	db := utils.LoadPostgres(databaseConfig, blockChain.Node())
-
-	// Execute over transformer sets returned by the exporter
-	// Use WaitGroup to wait on both goroutines
-	var wg syn.WaitGroup
-	if len(ethEventInitializers) > 0 {
-		ew := watcher.NewEventWatcher(&db, blockChain)
-		ew.AddTransformers(ethEventInitializers)
-		wg.Add(1)
-		go watchEthEvents(&ew, &wg)
-	}
-
-	if len(ethStorageInitializers) > 0 {
-		tailer := fs.FileTailer{Path: storageDiffsPath}
-		sw := watcher.NewStorageWatcher(tailer, &db)
-		sw.AddTransformers(ethStorageInitializers)
-		wg.Add(1)
-		go watchEthStorage(&sw, &wg)
-	}
-
-	if len(ethContractInitializers) > 0 {
-		gw := watcher.NewContractWatcher(&db, blockChain)
-		gw.AddTransformers(ethContractInitializers)
-		wg.Add(1)
-		go watchEthContract(&gw, &wg)
-	}
-	wg.Wait()
-}
-
-func init() {
-	rootCmd.AddCommand(composeAndExecuteCmd)
-	composeAndExecuteCmd.Flags().BoolVar(&recheckHeadersArg, "recheckHeaders", false, "checks headers that are already checked for each transformer.")
-}

cmd/contractWatcher.go

@@ -1,125 +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 cmd
-
-import (
-	"fmt"
-	"github.com/vulcanize/vulcanizedb/pkg/config"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
-	st "github.com/vulcanize/vulcanizedb/libraries/shared/transformer"
-	ft "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/full/transformer"
-	lt "github.com/vulcanize/vulcanizedb/pkg/contract_watcher/light/transformer"
-	"github.com/vulcanize/vulcanizedb/utils"
-)
-
-// contractWatcherCmd represents the contractWatcher command
-var contractWatcherCmd = &cobra.Command{
-	Use:   "contractWatcher",
-	Short: "Watches events at the provided contract address using fully synced vDB",
-	Long: `Uses input contract address and event filters to watch events
-
-Expects an ethereum node to be running
-Expects an archival node synced into vulcanizeDB
-Requires a .toml config file:
-
-  [database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    port     = 5432
-
-  [client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-  [contract]
-    network  = ""
-    addresses  = [
-        "contractAddress1",
-        "contractAddress2"
-    ]
-    [contract.contractAddress1]
-        abi    = 'ABI for contract 1'
-        startingBlock = 982463
-    [contract.contractAddress2]
-        abi    = 'ABI for contract 2'
-        events = [
-            "event1",
-            "event2"
-        ]
-		eventArgs = [
-			"arg1",
-			"arg2"
-		]
-        methods = [
-            "method1",
-			"method2"
-        ]
-		methodArgs = [
-			"arg1",
-			"arg2"
-		]
-        startingBlock = 4448566
-        piping = true
-`,
-	Run: func(cmd *cobra.Command, args []string) {
-		contractWatcher()
-	},
-}
-
-var (
-	mode string
-)
-
-func contractWatcher() {
-	ticker := time.NewTicker(5 * time.Second)
-	defer ticker.Stop()
-
-	blockChain := getBlockChain()
-	db := utils.LoadPostgres(databaseConfig, blockChain.Node())
-
-	var t st.ContractTransformer
-	con := config.ContractConfig{}
-	con.PrepConfig()
-	switch mode {
-	case "light":
-		t = lt.NewTransformer(con, blockChain, &db)
-	case "full":
-		t = ft.NewTransformer(con, blockChain, &db)
-	default:
-		log.Fatal("Invalid mode")
-	}
-
-	err := t.Init()
-	if err != nil {
-		log.Fatal(fmt.Sprintf("Failed to initialized transformer\r\nerr: %v\r\n", err))
-	}
-
-	for range ticker.C {
-		err = t.Execute()
-		if err != nil {
-			log.Error("Execution error for transformer:", t.GetConfig().Name, err)
-		}
-	}
-}
-
-func init() {
-	rootCmd.AddCommand(contractWatcherCmd)
-	contractWatcherCmd.Flags().StringVarP(&mode, "mode", "o", "light", "'light' or 'full' mode to work with either light synced or fully synced vDB (default is light)")
-}

cmd/execute.go

@@ -1,182 +0,0 @@
-// Copyright © 2019 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 (
-	"fmt"
-	"os"
-	"plugin"
-	syn "sync"
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
-	"github.com/vulcanize/vulcanizedb/libraries/shared/constants"
-	"github.com/vulcanize/vulcanizedb/libraries/shared/transformer"
-	"github.com/vulcanize/vulcanizedb/libraries/shared/watcher"
-	"github.com/vulcanize/vulcanizedb/pkg/fs"
-	"github.com/vulcanize/vulcanizedb/utils"
-)
-
-// executeCmd represents the execute command
-var executeCmd = &cobra.Command{
-	Use:   "execute",
-	Short: "executes a precomposed transformer initializer plugin",
-	Long: `This command needs a config .toml file of form:
-
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    user     = "vulcanize"
-    password = "vulcanize"
-    port     = 5432
-
-[client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-[exporter]
-    name     = "exampleTransformerExporter"
-
-Note: If any of the plugin transformer need additional
-configuration variables include them in the .toml file as well
-
-The exporter.name is the name (without extension) of the plugin to be loaded.
-The plugin file needs to be located in the /plugins directory and this command assumes 
-the db migrations remain from when the plugin was composed. Additionally, the plugin 
-must have been composed by the same version of vulcanizedb or else it will not be compatible.
-
-Specify config location when executing the command:
-./vulcanizedb execute --config=./environments/config_name.toml`,
-	Run: func(cmd *cobra.Command, args []string) {
-		execute()
-	},
-}
-
-func execute() {
-	// Build plugin generator config
-	prepConfig()
-
-	// Get the plugin path and load the plugin
-	_, pluginPath, err := genConfig.GetPluginPaths()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("Executing plugin %s", pluginPath)
-	log.Info("linking plugin", pluginPath)
-	plug, err := plugin.Open(pluginPath)
-	if err != nil {
-		log.Debug("linking plugin failed")
-		log.Fatal(err)
-	}
-
-	// Load the `Exporter` symbol from the plugin
-	log.Info("loading transformers from plugin")
-	symExporter, err := plug.Lookup("Exporter")
-	if err != nil {
-		log.Debug("loading Exporter symbol failed")
-		log.Fatal(err)
-	}
-
-	// Assert that the symbol is of type Exporter
-	exporter, ok := symExporter.(Exporter)
-	if !ok {
-		log.Debug("plugged-in symbol not of type Exporter")
-		os.Exit(1)
-	}
-
-	// Use the Exporters export method to load the EventTransformerInitializer, StorageTransformerInitializer, and ContractTransformerInitializer sets
-	ethEventInitializers, ethStorageInitializers, ethContractInitializers := exporter.Export()
-
-	// Setup bc and db objects
-	blockChain := getBlockChain()
-	db := utils.LoadPostgres(databaseConfig, blockChain.Node())
-
-	// Execute over transformer sets returned by the exporter
-	// Use WaitGroup to wait on both goroutines
-	var wg syn.WaitGroup
-	if len(ethEventInitializers) > 0 {
-		ew := watcher.NewEventWatcher(&db, blockChain)
-		ew.AddTransformers(ethEventInitializers)
-		wg.Add(1)
-		go watchEthEvents(&ew, &wg)
-	}
-
-	if len(ethStorageInitializers) > 0 {
-		tailer := fs.FileTailer{Path: storageDiffsPath}
-		sw := watcher.NewStorageWatcher(tailer, &db)
-		sw.AddTransformers(ethStorageInitializers)
-		wg.Add(1)
-		go watchEthStorage(&sw, &wg)
-	}
-
-	if len(ethContractInitializers) > 0 {
-		gw := watcher.NewContractWatcher(&db, blockChain)
-		gw.AddTransformers(ethContractInitializers)
-		wg.Add(1)
-		go watchEthContract(&gw, &wg)
-	}
-	wg.Wait()
-}
-
-func init() {
-	rootCmd.AddCommand(executeCmd)
-	executeCmd.Flags().BoolVar(&recheckHeadersArg, "recheckHeaders", false, "checks headers that are already checked for each transformer.")
-}
-
-type Exporter interface {
-	Export() ([]transformer.EventTransformerInitializer, []transformer.StorageTransformerInitializer, []transformer.ContractTransformerInitializer)
-}
-
-func watchEthEvents(w *watcher.EventWatcher, wg *syn.WaitGroup) {
-	defer wg.Done()
-	// Execute over the EventTransformerInitializer set using the watcher
-	log.Info("executing event transformers")
-	var recheck constants.TransformerExecution
-	if recheckHeadersArg {
-		recheck = constants.HeaderRecheck
-	} else {
-		recheck = constants.HeaderMissing
-	}
-	ticker := time.NewTicker(pollingInterval)
-	defer ticker.Stop()
-	for range ticker.C {
-		w.Execute(recheck)
-	}
-}
-
-func watchEthStorage(w *watcher.StorageWatcher, wg *syn.WaitGroup) {
-	defer wg.Done()
-	// Execute over the StorageTransformerInitializer set using the storage watcher
-	log.Info("executing storage transformers")
-	ticker := time.NewTicker(pollingInterval)
-	defer ticker.Stop()
-	for range ticker.C {
-		w.Execute()
-	}
-}
-
-func watchEthContract(w *watcher.ContractWatcher, wg *syn.WaitGroup) {
-	defer wg.Done()
-	// Execute over the ContractTransformerInitializer set using the contract watcher
-	log.Info("executing contract_watcher transformers")
-	ticker := time.NewTicker(pollingInterval)
-	defer ticker.Stop()
-	for range ticker.C {
-		w.Execute()
-	}
-}

cmd/lightSync.go

@@ -1,112 +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 cmd
-
-import (
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
-	"github.com/vulcanize/vulcanizedb/pkg/core"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
-	"github.com/vulcanize/vulcanizedb/pkg/geth"
-	"github.com/vulcanize/vulcanizedb/pkg/history"
-	"github.com/vulcanize/vulcanizedb/utils"
-)
-
-// lightSyncCmd represents the lightSync command
-var lightSyncCmd = &cobra.Command{
-	Use:   "lightSync",
-	Short: "Syncs VulcanizeDB with local ethereum node's block headers",
-	Long: `Syncs VulcanizeDB with local ethereum node. Populates
-Postgres with block headers.
-
-./vulcanizedb lightSync --starting-block-number 0 --config public.toml
-
-Expects ethereum node to be running and requires a .toml config:
-
-  [database]
-  name = "vulcanize_public"
-  hostname = "localhost"
-  port = 5432
-
-  [client]
-  ipcPath = "/Users/user/Library/Ethereum/geth.ipc"
-`,
-	Run: func(cmd *cobra.Command, args []string) {
-		lightSync()
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(lightSyncCmd)
-	lightSyncCmd.Flags().Int64VarP(&startingBlockNumber, "starting-block-number", "s", 0, "Block number to start syncing from")
-}
-
-func backFillAllHeaders(blockchain core.BlockChain, headerRepository datastore.HeaderRepository, missingBlocksPopulated chan int, startingBlockNumber int64) {
-	populated, err := history.PopulateMissingHeaders(blockchain, headerRepository, startingBlockNumber)
-	if err != nil {
-		// TODO Lots of possible errors in the call stack above. If errors occur, we still put
-		// 0 in the channel, triggering another round
-		log.Error("backfillAllHeaders: Error populating headers: ", err)
-	}
-	missingBlocksPopulated <- populated
-}
-
-func lightSync() {
-	ticker := time.NewTicker(pollingInterval)
-	defer ticker.Stop()
-	blockChain := getBlockChain()
-	validateArgs(blockChain)
-	db := utils.LoadPostgres(databaseConfig, blockChain.Node())
-
-	headerRepository := repositories.NewHeaderRepository(&db)
-	validator := history.NewHeaderValidator(blockChain, headerRepository, validationWindow)
-	missingBlocksPopulated := make(chan int)
-	go backFillAllHeaders(blockChain, headerRepository, missingBlocksPopulated, startingBlockNumber)
-
-	for {
-		select {
-		case <-ticker.C:
-			window, err := validator.ValidateHeaders()
-			if err != nil {
-				log.Error("lightSync: ValidateHeaders failed: ", err)
-			}
-			log.Info(window.GetString())
-		case n := <-missingBlocksPopulated:
-			if n == 0 {
-				time.Sleep(3 * time.Second)
-			}
-			go backFillAllHeaders(blockChain, headerRepository, missingBlocksPopulated, startingBlockNumber)
-		}
-	}
-}
-
-func validateArgs(blockChain *geth.BlockChain) {
-	lastBlock, err := blockChain.LastBlock()
-	if err != nil {
-		log.Error("validateArgs: Error getting last block: ", err)
-	}
-	if lastBlock.Int64() == 0 {
-		log.Fatal("geth initial: state sync not finished")
-	}
-	if startingBlockNumber > lastBlock.Int64() {
-		log.Fatal("starting block number > current block number")
-	}
-}

cmd/resync.go

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

cmd/root.go

@@ -22,30 +22,19 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/rpc"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"github.com/vulcanize/vulcanizedb/pkg/config"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/config"
-	"github.com/vulcanize/vulcanizedb/pkg/geth"
-	"github.com/vulcanize/vulcanizedb/pkg/geth/client"
-	vRpc "github.com/vulcanize/vulcanizedb/pkg/geth/converters/rpc"
-	"github.com/vulcanize/vulcanizedb/pkg/geth/node"
 )
 
 var (
-	cfgFile             string
+	cfgFile        string
-	databaseConfig      config.Database
+	databaseConfig config.Database
-	genConfig           config.Plugin
+	ipc            string
-	ipc                 string
+	subCommand     string
-	levelDbPath         string
+	logWithCommand log.Entry
-	startingBlockNumber int64
-	storageDiffsPath    string
-	syncAll             bool
-	endingBlockNumber   int64
-	recheckHeadersArg   bool
 )
 
 const (
@@ -55,21 +44,39 @@ const (
 
 var rootCmd = &cobra.Command{
 	Use:              "vulcanizedb",
-	PersistentPreRun: database,
+	PersistentPreRun: initFuncs,
 }
 
 func Execute() {
 	log.Info("----- Starting vDB -----")
 	if err := rootCmd.Execute(); err != nil {
 		log.Fatal(err)
-		os.Exit(1)
 	}
 }
 
-func database(cmd *cobra.Command, args []string) {
+func initFuncs(cmd *cobra.Command, args []string) {
+	setViperConfigs()
+	logfile := viper.GetString("logfile")
+	if logfile != "" {
+		file, err := os.OpenFile(logfile,
+			os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+		if err == nil {
+			log.Infof("Directing output to %s", logfile)
+			log.SetOutput(file)
+		} else {
+			log.SetOutput(os.Stdout)
+			log.Info("Failed to log to file, using default stdout")
+		}
+	} else {
+		log.SetOutput(os.Stdout)
+	}
+	if err := logLevel(); err != nil {
+		log.Fatal("Could not set log level: ", err)
+	}
+}
+
+func setViperConfigs() {
 	ipc = viper.GetString("client.ipcpath")
-	levelDbPath = viper.GetString("client.leveldbpath")
-	storageDiffsPath = viper.GetString("filesystem.storageDiffsPath")
 	databaseConfig = config.Database{
 		Name:     viper.GetString("database.name"),
 		Hostname: viper.GetString("database.hostname"),
@@ -80,6 +87,19 @@ func database(cmd *cobra.Command, args []string) {
 	viper.Set("database.config", databaseConfig)
 }
 
+func logLevel() error {
+	lvl, err := log.ParseLevel(viper.GetString("log.level"))
+	if err != nil {
+		return err
+	}
+	log.SetLevel(lvl)
+	if lvl > log.InfoLevel {
+		log.SetReportCaller(true)
+	}
+	log.Info("Log level set to ", lvl.String())
+	return nil
+}
+
 func init() {
 	cobra.OnInitialize(initConfig)
 	// When searching for env variables, replace dots in config keys with underscores
@@ -87,57 +107,34 @@ func init() {
 	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("client-levelDbPath", "", "location of levelDb chaindata")
+	rootCmd.PersistentFlags().String("log-level", log.InfoLevel.String(), "Log level (trace, debug, info, warn, error, fatal, panic")
-	rootCmd.PersistentFlags().String("filesystem-storageDiffsPath", "", "location of storage diffs csv file")
-	rootCmd.PersistentFlags().String("exporter-name", "exporter", "name of exporter plugin")
 
+	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("client.levelDbPath", rootCmd.PersistentFlags().Lookup("client-levelDbPath"))
+	viper.BindPFlag("log.level", rootCmd.PersistentFlags().Lookup("log-level"))
-	viper.BindPFlag("filesystem.storageDiffsPath", rootCmd.PersistentFlags().Lookup("filesystem-storageDiffsPath"))
-	viper.BindPFlag("exporter.fileName", rootCmd.PersistentFlags().Lookup("exporter-name"))
 }
 
 func initConfig() {
 	if cfgFile != "" {
 		viper.SetConfigFile(cfgFile)
+		if err := viper.ReadInConfig(); err == nil {
+			log.Printf("Using config file: %s", viper.ConfigFileUsed())
+		} else {
+			log.Fatal(fmt.Sprintf("Couldn't read config file: %s", err.Error()))
+		}
 	} else {
-		noConfigError := "No config file passed with --config flag"
+		log.Warn("No config file passed with --config flag")
-		fmt.Println("Error: ", noConfigError)
-		log.Fatal(noConfigError)
-		os.Exit(1)
-	}
-
-	if err := viper.ReadInConfig(); err == nil {
-		log.Printf("Using config file: %s\n\n", viper.ConfigFileUsed())
-	} else {
-		invalidConfigError := "Couldn't read config file"
-		fmt.Println("Error: ", invalidConfigError)
-		log.Fatal(invalidConfigError)
-		os.Exit(1)
 	}
 }
-
-func getBlockChain() *geth.BlockChain {
-	rawRpcClient, err := rpc.Dial(ipc)
-
-	if err != nil {
-		log.Fatal(err)
-	}
-	rpcClient := client.NewRpcClient(rawRpcClient, ipc)
-	ethClient := ethclient.NewClient(rawRpcClient)
-	vdbEthClient := client.NewEthClient(ethClient)
-	vdbNode := node.MakeNode(rpcClient)
-	transactionConverter := vRpc.NewRpcTransactionConverter(ethClient)
-	return geth.NewBlockChain(vdbEthClient, rpcClient, vdbNode, transactionConverter)
-}

cmd/streamEthSubscribe.go

@@ -0,0 +1,180 @@
+// Copyright © 2019 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 (
+	"bytes"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/rpc"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/core"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
+	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+)
+
+// 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.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		subCommand = cmd.CalledAs()
+		logWithCommand = *log.WithField("SubCommand", subCommand)
+		streamEthSubscription()
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(streamEthSubscriptionCmd)
+}
+
+func streamEthSubscription() {
+	// Prep the subscription config/filters to be sent to the server
+	ethSubConfig, err := eth.NewEthSubscriptionConfig()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	// 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)
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
+	sub, err := str.Stream(payloadChan, rlpParams)
+	if err != nil {
+		logWithCommand.Fatal(err)
+	}
+	logWithCommand.Info("awaiting payloads")
+	// Receive response payloads and print out the results
+	for {
+		select {
+		case payload := <-payloadChan:
+			if payload.Err != "" {
+				logWithCommand.Error(payload.Err)
+				continue
+			}
+			var ethData eth.IPLDs
+			if err := rlp.DecodeBytes(payload.Data, &ethData); err != nil {
+				logWithCommand.Error(err)
+				continue
+			}
+			var header types.Header
+			err = rlp.Decode(bytes.NewBuffer(ethData.Header.Data), &header)
+			if err != nil {
+				logWithCommand.Error(err)
+				continue
+			}
+			fmt.Printf("Header number %d, hash %s\n", header.Number.Int64(), header.Hash().Hex())
+			fmt.Printf("header: %v\n", header)
+			for _, trxRlp := range ethData.Transactions {
+				var trx types.Transaction
+				buff := bytes.NewBuffer(trxRlp.Data)
+				stream := rlp.NewStream(buff, 0)
+				err := trx.DecodeRLP(stream)
+				if err != nil {
+					logWithCommand.Error(err)
+					continue
+				}
+				fmt.Printf("Transaction with hash %s\n", trx.Hash().Hex())
+				fmt.Printf("trx: %v\n", trx)
+			}
+			for _, rctRlp := range ethData.Receipts {
+				var rct types.Receipt
+				buff := bytes.NewBuffer(rctRlp.Data)
+				stream := rlp.NewStream(buff, 0)
+				err = rct.DecodeRLP(stream)
+				if err != nil {
+					logWithCommand.Error(err)
+					continue
+				}
+				fmt.Printf("Receipt with block hash %s, trx hash %s\n", rct.BlockHash.Hex(), rct.TxHash.Hex())
+				fmt.Printf("rct: %v\n", rct)
+				for _, l := range rct.Logs {
+					if len(l.Topics) < 1 {
+						logWithCommand.Error(fmt.Sprintf("log only has %d topics", len(l.Topics)))
+						continue
+					}
+					fmt.Printf("Log for block hash %s, trx hash %s, address %s, and with topic0 %s\n",
+						l.BlockHash.Hex(), l.TxHash.Hex(), l.Address.Hex(), l.Topics[0].Hex())
+					fmt.Printf("log: %v\n", l)
+				}
+			}
+			// This assumes leafs only
+			for _, stateNode := range ethData.StateNodes {
+				var acct state.Account
+				err = rlp.DecodeBytes(stateNode.IPLD.Data, &acct)
+				if err != nil {
+					logWithCommand.Error(err)
+					continue
+				}
+				fmt.Printf("Account for key %s, and root %s, with balance %s\n",
+					stateNode.StateLeafKey.Hex(), acct.Root.Hex(), acct.Balance.String())
+				fmt.Printf("state account: %+v\n", acct)
+			}
+			for _, storageNode := range ethData.StorageNodes {
+				fmt.Printf("Storage for state key %s ", storageNode.StateLeafKey.Hex())
+				fmt.Printf("with storage key %s\n", storageNode.StorageLeafKey.Hex())
+				var i []interface{}
+				err := rlp.DecodeBytes(storageNode.IPLD.Data, &i)
+				if err != nil {
+					logWithCommand.Error(err)
+					continue
+				}
+				// if a value node
+				if len(i) == 1 {
+					valueBytes, ok := i[0].([]byte)
+					if !ok {
+						continue
+					}
+					fmt.Printf("Storage leaf key: %s, and value hash: %s\n",
+						storageNode.StorageLeafKey.Hex(), common.BytesToHash(valueBytes).Hex())
+				}
+			}
+		case err = <-sub.Err():
+			logWithCommand.Fatal(err)
+		}
+	}
+}
+
+func getRPCClient() core.RPCClient {
+	vulcPath := viper.GetString("superNode.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)
+}

cmd/sync.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 cmd
-
-import (
-	"time"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
-
-	"github.com/vulcanize/vulcanizedb/pkg/core"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore"
-	"github.com/vulcanize/vulcanizedb/pkg/datastore/postgres/repositories"
-	"github.com/vulcanize/vulcanizedb/pkg/history"
-	"github.com/vulcanize/vulcanizedb/utils"
-)
-
-// syncCmd represents the sync command
-var syncCmd = &cobra.Command{
-	Use:   "sync",
-	Short: "Syncs VulcanizeDB with local ethereum node",
-	Long: `Syncs VulcanizeDB with local ethereum node. Populates
-Postgres with blocks, transactions, receipts, and logs.
-
-./vulcanizedb sync --starting-block-number 0 --config public.toml
-
-Expects ethereum node to be running and requires a .toml config:
-
-  [database]
-  name = "vulcanize_public"
-  hostname = "localhost"
-  port = 5432
-
-  [client]
-  ipcPath = "/Users/user/Library/Ethereum/geth.ipc"
-`,
-	Run: func(cmd *cobra.Command, args []string) {
-		sync()
-	},
-}
-
-func init() {
-	rootCmd.AddCommand(syncCmd)
-
-	syncCmd.Flags().Int64VarP(&startingBlockNumber, "starting-block-number", "s", 0, "Block number to start syncing from")
-}
-
-func backFillAllBlocks(blockchain core.BlockChain, blockRepository datastore.BlockRepository, missingBlocksPopulated chan int, startingBlockNumber int64) {
-	populated, err := history.PopulateMissingBlocks(blockchain, blockRepository, startingBlockNumber)
-	if err != nil {
-		log.Error("backfillAllBlocks: error in populateMissingBlocks: ", err)
-	}
-	missingBlocksPopulated <- populated
-}
-
-func sync() {
-	ticker := time.NewTicker(pollingInterval)
-	defer ticker.Stop()
-
-	blockChain := getBlockChain()
-	lastBlock, err := blockChain.LastBlock()
-	if err != nil {
-		log.Error("sync: Error getting last block: ", err)
-	}
-	if lastBlock.Int64() == 0 {
-		log.Fatal("geth initial: state sync not finished")
-	}
-	if startingBlockNumber > lastBlock.Int64() {
-		log.Fatal("sync: starting block number > current block number")
-	}
-
-	db := utils.LoadPostgres(databaseConfig, blockChain.Node())
-	blockRepository := repositories.NewBlockRepository(&db)
-	validator := history.NewBlockValidator(blockChain, blockRepository, validationWindow)
-	missingBlocksPopulated := make(chan int)
-	go backFillAllBlocks(blockChain, blockRepository, missingBlocksPopulated, startingBlockNumber)
-
-	for {
-		select {
-		case <-ticker.C:
-			window, err := validator.ValidateBlocks()
-			if err != nil {
-				log.Error("sync: error in validateBlocks: ", err)
-			}
-			log.Info(window.GetString())
-		case <-missingBlocksPopulated:
-			go backFillAllBlocks(blockChain, blockRepository, missingBlocksPopulated, startingBlockNumber)
-		}
-	}
-}

cmd/version.go

@@ -0,0 +1,41 @@
+// 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"
+
+	v "github.com/vulcanize/ipfs-blockchain-watcher/version"
+)
+
+// versionCmd represents the version command
+var versionCmd = &cobra.Command{
+	Use:   "version",
+	Short: "Prints the version of ipfs-blockchain-watcher",
+	Long: `Use this command to fetch the version of ipfs-blockchain-watcher
+
+Usage: ./ipfs-blockchain-watcher version`,
+	Run: func(cmd *cobra.Command, args []string) {
+		subCommand = cmd.CalledAs()
+		logWithCommand = *log.WithField("SubCommand", subCommand)
+		logWithCommand.Infof("ipfs-blockchain-watcher version: %s", v.VersionWithMeta)
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(versionCmd)
+}

cmd/watch.go

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

db/migrations/00001_create_blocks_table.sql

@@ -1,23 +0,0 @@
--- +goose Up
-CREATE TABLE public.blocks (
-  id            SERIAL PRIMARY KEY,
-  difficulty    BIGINT,
-  extra_data    VARCHAR,
-  gas_limit      BIGINT,
-  gas_used       BIGINT,
-  hash          VARCHAR(66),
-  miner         VARCHAR(42),
-  nonce         VARCHAR(20),
-  "number"      BIGINT,
-  parent_hash    VARCHAR(66),
-  reward        NUMERIC,
-  uncles_reward NUMERIC,
-  "size"        VARCHAR,
-  "time"        BIGINT,
-  is_final      BOOLEAN,
-  uncle_hash    VARCHAR(66)
-);
-
-
--- +goose Down
-DROP TABLE public.blocks;

db/migrations/00001_create_nodes_table.sql

@@ -0,0 +1,12 @@
+-- +goose Up
+CREATE TABLE nodes (
+  id            SERIAL PRIMARY KEY,
+  client_name   VARCHAR,
+  genesis_block VARCHAR(66),
+  network_id    VARCHAR,
+  node_id       VARCHAR(128),
+  CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id)
+);
+
+-- +goose Down
+DROP TABLE nodes;

db/migrations/00002_create_eth_schema.sql

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

db/migrations/00002_create_full_sync_transactions_table.sql

@@ -1,18 +0,0 @@
--- +goose Up
-CREATE TABLE full_sync_transactions (
-  id          SERIAL PRIMARY KEY,
-  block_id    INTEGER NOT NULL REFERENCES blocks(id) ON DELETE CASCADE,
-  gas_limit    NUMERIC,
-  gas_price    NUMERIC,
-  hash        VARCHAR(66),
-  input_data  BYTEA,
-  nonce       NUMERIC,
-  raw         BYTEA,
-  tx_from     VARCHAR(66),
-  tx_index    INTEGER,
-  tx_to       VARCHAR(66),
-  "value"     NUMERIC
-);
-
--- +goose Down
-DROP TABLE full_sync_transactions;

db/migrations/00003_add_block_index_to_blocks.sql

@@ -1,6 +0,0 @@
--- +goose Up
-CREATE INDEX number_index ON blocks (number);
-
-
--- +goose Down
-DROP INDEX number_index;

db/migrations/00003_create_eth_header_cids_table.sql

@@ -0,0 +1,15 @@
+-- +goose Up
+CREATE TABLE eth.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,
+  td                    NUMERIC NOT NULL,
+  node_id               INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE,
+  reward                NUMERIC NOT NULL,
+  UNIQUE (block_number, block_hash)
+);
+
+-- +goose Down
+DROP TABLE eth.header_cids;

db/migrations/00004_create_contracts_table.sql

@@ -1,10 +0,0 @@
--- +goose Up
-CREATE TABLE watched_contracts
-(
-  contract_id   SERIAL PRIMARY KEY,
-  contract_abi  json,
-  contract_hash VARCHAR(66) UNIQUE
-);
-
--- +goose Down
-DROP TABLE watched_contracts;

db/migrations/00004_create_eth_uncle_cids_table.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+CREATE TABLE eth.uncle_cids (
+  id                    SERIAL PRIMARY KEY,
+  header_id             INTEGER NOT NULL REFERENCES eth.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  block_hash            VARCHAR(66) NOT NULL,
+  parent_hash           VARCHAR(66) NOT NULL,
+  cid                   TEXT NOT NULL,
+  reward                NUMERIC NOT NULL,
+  UNIQUE (header_id, block_hash)
+);
+
+-- +goose Down
+DROP TABLE eth.uncle_cids;

db/migrations/00005_create_eth_transaction_cids_table.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+CREATE TABLE eth.transaction_cids (
+  id                    SERIAL PRIMARY KEY,
+  header_id             INTEGER NOT NULL REFERENCES eth.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+  tx_hash               VARCHAR(66) NOT NULL,
+  index                 INTEGER NOT NULL,
+  cid                   TEXT NOT NULL,
+  dst                   VARCHAR(66) NOT NULL,
+  src                   VARCHAR(66) NOT NULL,
+  UNIQUE (header_id, tx_hash)
+);
+
+-- +goose Down
+DROP TABLE eth.transaction_cids;

db/migrations/00005_create_nodes_table.sql

@@ -1,12 +0,0 @@
--- +goose Up
-CREATE TABLE nodes (
-  id            SERIAL PRIMARY KEY,
-  client_name   VARCHAR,
-  genesis_block VARCHAR(66),
-  network_id    NUMERIC,
-  node_id       VARCHAR(128),
-  CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id)
-);
-
--- +goose Down
-DROP TABLE nodes;

db/migrations/00006_add_node_fk_to_blocks.sql

@@ -1,11 +0,0 @@
--- +goose Up
-ALTER TABLE blocks
-  ADD COLUMN node_id INTEGER NOT NULL,
-  ADD CONSTRAINT node_fk
-FOREIGN KEY (node_id)
-REFERENCES nodes (id)
-ON DELETE CASCADE;
-
--- +goose Down
-ALTER TABLE blocks
-  DROP COLUMN node_id;

db/migrations/00006_create_eth_receipt_cids_table.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+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,
+  contract              VARCHAR(66),
+  topic0s               VARCHAR(66)[],
+  topic1s               VARCHAR(66)[],
+  topic2s               VARCHAR(66)[],
+  topic3s               VARCHAR(66)[]
+);
+
+-- +goose Down
+DROP TABLE eth.receipt_cids;

db/migrations/00007_create_eth_state_cids_table.sql

@@ -0,0 +1,12 @@
+-- +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/00007_create_logs_table.sql

@@ -1,19 +0,0 @@
--- +goose Up
-CREATE TABLE logs (
-  id           SERIAL PRIMARY KEY,
-  block_number BIGINT,
-  address      VARCHAR(66),
-  tx_hash      VARCHAR(66),
-  index        BIGINT,
-  topic0       VARCHAR(66),
-  topic1       VARCHAR(66),
-  topic2       VARCHAR(66),
-  topic3       VARCHAR(66),
-  data         TEXT,
-  CONSTRAINT log_uc UNIQUE (block_number, index)
-);
-
-
-
--- +goose Down
-DROP TABLE logs;

db/migrations/00008_add_node_block_number_unique_constraint_to_blocks.sql

@@ -1,7 +0,0 @@
--- +goose Up
-ALTER TABLE blocks
-  ADD CONSTRAINT node_id_block_number_uc UNIQUE (number, node_id);
-
--- +goose Down
-ALTER TABLE blocks
-  DROP CONSTRAINT node_id_block_number_uc;

db/migrations/00008_create_eth_storage_cids_table.sql

@@ -0,0 +1,12 @@
+-- +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_add_block_id_index_to_full_sync_transactions.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE INDEX block_id_index ON full_sync_transactions (block_id);
-
--- +goose Down
-DROP INDEX block_id_index;

db/migrations/00009_create_ipfs_blocks_table.sql

@@ -0,0 +1,8 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS public.blocks (
+  key TEXT UNIQUE NOT NULL,
+  data BYTEA NOT NULL
+);
+
+-- +goose Down
+DROP TABLE public.blocks;

db/migrations/00010_add_node_id_index_to_blocks.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE INDEX node_id_index ON blocks (node_id);
-
--- +goose Down
-DROP INDEX node_id_index;

db/migrations/00010_create_btc_schema.sql

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

db/migrations/00011_add_tx_to_index_to_full_sync_transactions.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE INDEX tx_to_index ON full_sync_transactions(tx_to);
-
--- +goose Down
-DROP INDEX tx_to_index;

db/migrations/00011_create_btc_header_cids_table.sql

@@ -0,0 +1,15 @@
+-- +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/00012_add_tx_from_index_to_full_sync_transactions.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE INDEX tx_from_index ON full_sync_transactions(tx_from);
-
--- +goose Down
-DROP INDEX tx_from_index;

db/migrations/00012_create_btc_transaction_cids_table.sql

@@ -0,0 +1,13 @@
+-- +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

@@ -0,0 +1,15 @@
+-- +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_create_receipts_table.sql

@@ -1,16 +0,0 @@
--- +goose Up
-CREATE TABLE full_sync_receipts
-(
-  id                  SERIAL PRIMARY KEY,
-  transaction_id      INTEGER NOT NULL REFERENCES full_sync_transactions (id) ON DELETE CASCADE,
-  contract_address    VARCHAR(42),
-  cumulative_gas_used NUMERIC,
-  gas_used            NUMERIC,
-  state_root          VARCHAR(66),
-  status              INTEGER,
-  tx_hash             VARCHAR(66)
-);
-
-
--- +goose Down
-DROP TABLE full_sync_receipts;

db/migrations/00014_add_transaction_id_index_to_receipts.sql

@@ -1,5 +0,0 @@
--- +goose Up
-CREATE INDEX transaction_id_index ON full_sync_receipts (transaction_id);
-
--- +goose Down
-DROP INDEX transaction_id_index;

db/migrations/00014_create_btc_tx_inputs_table.sql

@@ -0,0 +1,14 @@
+-- +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/00015_add_receipts_fk_to_logs.sql

@@ -1,23 +0,0 @@
--- +goose Up
-ALTER TABLE logs
-    DROP CONSTRAINT log_uc;
-
-ALTER TABLE logs
-  ADD COLUMN receipt_id INT;
-
-ALTER TABLE logs
-  ADD CONSTRAINT receipts_fk
-FOREIGN KEY (receipt_id)
-REFERENCES full_sync_receipts (id)
-ON DELETE CASCADE;
-
-
--- +goose Down
-ALTER TABLE logs
-  DROP CONSTRAINT receipts_fk;
-
-ALTER TABLE logs
-  DROP COLUMN receipt_id;
-
-ALTER TABLE logs
-  ADD CONSTRAINT log_uc UNIQUE (block_number, index);

db/migrations/00015_create_eth_queued_data_table.sql

@@ -0,0 +1,9 @@
+-- +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

@@ -0,0 +1,9 @@
+-- +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_create_log_filters.sql

@@ -1,16 +0,0 @@
--- +goose Up
-CREATE TABLE log_filters (
-  id         SERIAL,
-  name       VARCHAR NOT NULL CHECK (name <> ''),
-  from_block BIGINT CHECK (from_block >= 0),
-  to_block   BIGINT CHECK (from_block >= 0),
-  address    VARCHAR(66),
-  topic0     VARCHAR(66),
-  topic1     VARCHAR(66),
-  topic2     VARCHAR(66),
-  topic3     VARCHAR(66),
-  CONSTRAINT name_uc UNIQUE (name)
-);
-
--- +goose Down
-DROP TABLE log_filters;

db/migrations/00017_create_postgraphile_comments.sql

@@ -0,0 +1,11 @@
+-- +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/00017_create_watched_event_logs.sql

@@ -1,34 +0,0 @@
--- +goose Up
-CREATE VIEW block_stats AS
-  SELECT
-    max(block_number) AS max_block,
-    min(block_number) AS min_block
-  FROM logs;
-
-CREATE VIEW watched_event_logs AS
-  SELECT
-    log_filters.name,
-    logs.id,
-    block_number,
-    logs.address,
-    tx_hash,
-    index,
-    logs.topic0,
-    logs.topic1,
-    logs.topic2,
-    logs.topic3,
-    data,
-    receipt_id
-  FROM log_filters
-    CROSS JOIN block_stats
-    JOIN logs ON logs.address = log_filters.address
-                 AND logs.block_number >= coalesce(log_filters.from_block, block_stats.min_block)
-                 AND logs.block_number <= coalesce(log_filters.to_block, block_stats.max_block)
-  WHERE (log_filters.topic0 = logs.topic0 OR log_filters.topic0 ISNULL)
-        AND (log_filters.topic1 = logs.topic1 OR log_filters.topic1 ISNULL)
-        AND (log_filters.topic2 = logs.topic2 OR log_filters.topic2 ISNULL)
-        AND (log_filters.topic3 = logs.topic3 OR log_filters.topic3 ISNULL);
-
--- +goose Down
-DROP VIEW watched_event_logs;
-DROP VIEW block_stats;

db/migrations/00018_update_log_filters_to_block_constraint.sql

@@ -1,14 +0,0 @@
--- +goose Up
-ALTER TABLE log_filters
-  DROP CONSTRAINT log_filters_from_block_check1;
-
-ALTER TABLE log_filters
-  ADD CONSTRAINT log_filters_to_block_check CHECK (to_block >= 0);
-
-
--- +goose Down
-ALTER TABLE log_filters
-  DROP CONSTRAINT log_filters_to_block_check;
-
-ALTER TABLE log_filters
-  ADD CONSTRAINT log_filters_from_block_check1 CHECK (to_block >= 0);

db/migrations/00018_update_state_cids.sql

@@ -0,0 +1,37 @@
+-- +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_rename_node_table.sql

@@ -1,43 +0,0 @@
--- +goose Up
-ALTER TABLE public.nodes RENAME TO eth_nodes;
-
-ALTER TABLE public.eth_nodes RENAME COLUMN node_id TO eth_node_id;
-
-ALTER TABLE public.eth_nodes DROP CONSTRAINT node_uc;
-ALTER TABLE public.eth_nodes
-  ADD CONSTRAINT eth_node_uc UNIQUE (genesis_block, network_id, eth_node_id);
-
-ALTER TABLE public.blocks RENAME COLUMN node_id TO eth_node_id;
-
-ALTER TABLE public.blocks DROP CONSTRAINT node_id_block_number_uc;
-ALTER TABLE public.blocks
-  ADD CONSTRAINT eth_node_id_block_number_uc UNIQUE (number, eth_node_id);
-
-ALTER TABLE public.blocks DROP CONSTRAINT node_fk;
-ALTER TABLE public.blocks
-  ADD CONSTRAINT node_fk
-FOREIGN KEY (eth_node_id) REFERENCES eth_nodes (id) ON DELETE CASCADE;
-
-
--- +goose Down
-ALTER TABLE public.eth_nodes
-  RENAME TO nodes;
-
-ALTER TABLE public.nodes
-  RENAME COLUMN eth_node_id TO node_id;
-
-ALTER TABLE public.nodes
-  DROP CONSTRAINT eth_node_uc;
-ALTER TABLE public.nodes
-  ADD CONSTRAINT node_uc UNIQUE (genesis_block, network_id, node_id);
-
-ALTER TABLE public.blocks RENAME COLUMN eth_node_id TO node_id;
-
-ALTER TABLE public.blocks DROP CONSTRAINT eth_node_id_block_number_uc;
-ALTER TABLE public.blocks
-  ADD CONSTRAINT node_id_block_number_uc UNIQUE (number, node_id);
-
-ALTER TABLE public.blocks DROP CONSTRAINT node_fk;
-ALTER TABLE public.blocks
-  ADD CONSTRAINT node_fk
-FOREIGN KEY (node_id) REFERENCES nodes (id) ON DELETE CASCADE;

db/migrations/00019_update_storage_cids.sql

@@ -0,0 +1,37 @@
+-- +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/00020_associate_receipts_with_blocks.sql

@@ -1,44 +0,0 @@
--- +goose Up
-ALTER TABLE full_sync_receipts
-  ADD COLUMN block_id INT;
-
-UPDATE full_sync_receipts
-  SET block_id = (
-    SELECT block_id FROM full_sync_transactions WHERE full_sync_transactions.id = full_sync_receipts.transaction_id
-  );
-
-ALTER TABLE full_sync_receipts
-  ALTER COLUMN block_id SET NOT NULL;
-
-ALTER TABLE full_sync_receipts
-  ADD CONSTRAINT blocks_fk
-FOREIGN KEY (block_id)
-REFERENCES blocks (id)
-ON DELETE CASCADE;
-
-ALTER TABLE full_sync_receipts
-  DROP COLUMN transaction_id;
-
-
--- +goose Down
-ALTER TABLE full_sync_receipts
-  ADD COLUMN transaction_id INT;
-
-CREATE INDEX transaction_id_index ON full_sync_receipts (transaction_id);
-
-UPDATE full_sync_receipts
-  SET transaction_id = (
-    SELECT id FROM full_sync_transactions WHERE full_sync_transactions.hash = full_sync_receipts.tx_hash
-  );
-
-ALTER TABLE full_sync_receipts
-  ALTER COLUMN transaction_id SET NOT NULL;
-
-ALTER TABLE full_sync_receipts
-  ADD CONSTRAINT transaction_fk
-FOREIGN KEY (transaction_id)
-REFERENCES full_sync_transactions (id)
-ON DELETE CASCADE;
-
-ALTER TABLE full_sync_receipts
-  DROP COLUMN block_id;

db/migrations/00020_update_header_cids.sql

@@ -0,0 +1,37 @@
+-- +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/00021_add_eth_node_fingerprint_to_blocks.sql

@@ -1,16 +0,0 @@
--- +goose Up
-ALTER TABLE blocks
-  ADD COLUMN eth_node_fingerprint VARCHAR(128);
-
-UPDATE blocks
-  SET eth_node_fingerprint = (
-    SELECT eth_node_id FROM eth_nodes WHERE eth_nodes.id = blocks.eth_node_id
-  );
-
-ALTER TABLE blocks
-  ALTER COLUMN eth_node_fingerprint SET NOT NULL;
-
-
--- +goose Down
-ALTER TABLE blocks
-  DROP COLUMN eth_node_fingerprint;

db/migrations/00021_create_eth_state_accouts_table.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+CREATE TABLE eth.state_accounts (
+  id                    SERIAL PRIMARY KEY,
+  state_id              INTEGER NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE,
+  balance               NUMERIC NOT NULL,
+  nonce                 INTEGER NOT NULL,
+  code_hash             BYTEA NOT NULL,
+  storage_root          VARCHAR(66) NOT NULL,
+  UNIQUE (state_id)
+);
+
+-- +goose Down
+DROP TABLE eth.state_accounts;

db/migrations/00022_create_headers_table.sql

@@ -1,17 +0,0 @@
--- +goose Up
-CREATE TABLE public.headers (
-  id                    SERIAL PRIMARY KEY,
-  hash                  VARCHAR(66),
-  block_number          BIGINT,
-  raw                   JSONB,
-  block_timestamp       NUMERIC,
-  eth_node_id           INTEGER NOT NULL REFERENCES eth_nodes (id) ON DELETE CASCADE,
-  eth_node_fingerprint  VARCHAR(128)
-);
-
--- Index is removed when table is
-CREATE INDEX headers_block_number ON public.headers (block_number);
-
-
--- +goose Down
-DROP TABLE public.headers;

db/migrations/00022_rename_to_leaf_key.sql

@@ -0,0 +1,13 @@
+-- +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_create_checked_headers_table.sql

@@ -1,8 +0,0 @@
--- +goose Up
-CREATE TABLE public.checked_headers (
-  id                  SERIAL PRIMARY KEY,
-  header_id           INTEGER UNIQUE NOT NULL REFERENCES headers (id) ON DELETE CASCADE
-);
-
--- +goose Down
-DROP TABLE public.checked_headers;

db/migrations/00023_update_receipt_cids.sql

@@ -0,0 +1,22 @@
+-- +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

@@ -0,0 +1,13 @@
+-- +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;

db/migrations/00024_create_queued_storage.sql

@@ -1,12 +0,0 @@
--- +goose Up
-CREATE TABLE public.queued_storage (
-  id            SERIAL PRIMARY KEY,
-  block_height  BIGINT,
-  block_hash    BYTEA,
-  contract      BYTEA,
-  storage_key   BYTEA,
-  storage_value BYTEA
-);
-
--- +goose Down
-DROP TABLE public.queued_storage;

db/migrations/00025_create_light_sync_transactions_table.sql

@@ -1,19 +0,0 @@
--- +goose Up
-CREATE TABLE light_sync_transactions (
-  id          SERIAL PRIMARY KEY,
-  header_id   INTEGER NOT NULL REFERENCES headers(id) ON DELETE CASCADE,
-  hash        VARCHAR(66),
-  gas_limit   NUMERIC,
-  gas_price   NUMERIC,
-  input_data  BYTEA,
-  nonce       NUMERIC,
-  raw         BYTEA,
-  tx_from     VARCHAR(44),
-  tx_index    INTEGER,
-  tx_to       VARCHAR(44),
-  "value"     NUMERIC,
-  UNIQUE (header_id, hash)
-);
-
--- +goose Down
-DROP TABLE light_sync_transactions;

db/migrations/00026_create_light_sync_receipts_table.sql

@@ -1,18 +0,0 @@
--- +goose Up
-CREATE TABLE light_sync_receipts(
-  id                  SERIAL PRIMARY KEY,
-  transaction_id      INTEGER NOT NULL REFERENCES light_sync_transactions(id) ON DELETE CASCADE,
-  header_id           INTEGER NOT NULL REFERENCES headers(id) ON DELETE CASCADE,
-  contract_address    VARCHAR(42),
-  cumulative_gas_used NUMERIC,
-  gas_used            NUMERIC,
-  state_root          VARCHAR(66),
-  status              INTEGER,
-  tx_hash             VARCHAR(66),
-  rlp                 BYTEA,
-  UNIQUE(header_id, transaction_id)
-);
-
-
--- +goose Down
-DROP TABLE light_sync_receipts;

db/migrations/00027_create_uncles_table.sql

@@ -1,16 +0,0 @@
--- +goose Up
-CREATE TABLE public.uncles (
-  id                    SERIAL PRIMARY KEY,
-  hash                  VARCHAR(66) NOT NULL,
-  block_id              INTEGER NOT NULL REFERENCES blocks (id) ON DELETE CASCADE,
-  reward                NUMERIC NOT NULL,
-  miner                 VARCHAR(42) NOT NULL,
-  raw                   JSONB,
-  block_timestamp       NUMERIC,
-  eth_node_id           INTEGER NOT NULL REFERENCES eth_nodes (id) ON DELETE CASCADE,
-  eth_node_fingerprint  VARCHAR(128),
-  UNIQUE (block_id, hash)
-);
-
--- +goose Down
-DROP TABLE public.uncles;

dockerfiles/README.md

@@ -2,7 +2,7 @@ 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 `lightSync` and `continuousLogSync`, started with the default configuration `environments/staging.toml`.
+- 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..."`.
 
@@ -18,8 +18,8 @@ e`
   * `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 `lightSync` and `continuousLogSync` services:
+6. Start the `headerSync` and `continuousLogSync` services:
-  * `./vulcanizedb lightSync --config environments/staging.toml`
+  * `./vulcanizedb headerSync --config environments/staging.toml`
   * `./vulcanizedb continuousLogSync --config environments/staging.toml`
 
 ### Automated

dockerfiles/migrations/Dockerfile

@@ -0,0 +1,40 @@
+FROM golang:alpine
+
+RUN apk --update --no-cache add make git g++ linux-headers
+# DEBUG
+RUN apk add busybox-extras
+
+# this is probably a noob move, but I want apk from alpine for the above but need to avoid Go 1.13 below as this error still occurs https://github.com/ipfs/go-ipfs/issues/6603
+FROM golang:1.12.4 as builder
+
+# Get and build vulcanizedb
+ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
+
+# Build migration tool
+RUN go get -u -d github.com/pressly/goose/cmd/goose
+WORKDIR /go/src/github.com/pressly/goose/cmd/goose
+RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose .
+
+WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
+
+# app container
+FROM alpine
+
+ARG USER
+
+RUN adduser -Du 5000 $USER
+WORKDIR /app
+RUN chown $USER /app
+USER $USER
+
+# chown first so dir is writable
+# note: using $USER is merged, but not in the stable release yet
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/migrations/startup_script.sh .
+
+
+# keep binaries immutable
+COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose goose
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations migrations/vulcanizedb
+# XXX dir is already writeable RUN touch vulcanizedb.log
+
+CMD ["./startup_script.sh"]

dockerfiles/migrations/startup_script.sh

@@ -0,0 +1,32 @@
+#!/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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,60 @@
+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/rinkeby/Dockerfile

@@ -1,9 +0,0 @@
-FROM golang:1.10.3-alpine3.7
-
-RUN apk add --no-cache make gcc musl-dev
-
-ADD . /go/src/github.com/vulcanize/vulcanizedb
-WORKDIR /go/src/github.com/vulcanize/vulcanizedb
-RUN go build -o /app main.go
-
-ENTRYPOINT ["/app"]

dockerfiles/rinkeby/config.toml

@@ -1,9 +0,0 @@
-[database]
-name = "vulcanizedb"
-hostname = "postgres"
-port = 5432
-user = "postgres"
-password = "postgres"
-
-[client]
-ipcPath = "/geth/geth.ipc"

dockerfiles/rinkeby/docker-compose.yml

@@ -1,63 +0,0 @@
-version: '2.2'
-
-services:
-
-  vulcanizedb:
-    build:
-      context: ./../../
-      dockerfile: dockerfiles/rinkeby/Dockerfile
-    container_name: rinkeby_vulcanizedb
-    command: "sync --starting-block-number 0 --config /config.toml"
-    volumes:
-      - "./config.toml:/config.toml"
-      - "vulcanizedb_geth_data:/geth"
-    networks:
-      vulcanizedb_net:
-
-  migrations:
-    image: migrate/migrate:v3.3.0
-    container_name: rinkeby_vulcanizedb_migrations
-    depends_on:
-      postgres:
-        condition: service_healthy
-    command: -database postgresql://postgres:postgres@postgres:5432/vulcanizedb?sslmode=disable -path /migrations up
-    volumes:
-      - ./../../db/migrations:/migrations
-    networks:
-      vulcanizedb_net:
-
-  postgres:
-    image: postgres:9.6.5-alpine
-    container_name: rinkeby_vulcanizedb_postgres
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_DB: vulcanizedb
-      POSTGRES_PASSWORD: postgres
-    volumes:
-      - "vulcanizedb_db_data:/var/lib/postgresql/data"
-    networks:
-      vulcanizedb_net:
-    healthcheck:
-      test: ["CMD", "pg_isready"]
-      interval: 5s
-      timeout: 5s
-      retries: 30
-  
-  geth:
-    image: ethereum/client-go:v1.8.11
-    container_name: rinkeby_vulcanizedb_geth
-    cpus: 0.3
-    hostname: eth
-    command: '--rinkeby --rpc --rpcaddr="0.0.0.0" --rpcvhosts="geth"'
-    volumes:
-      - "vulcanizedb_geth_data:/root/.ethereum/rinkeby"
-    networks:
-      vulcanizedb_net:
-
-volumes:
-  vulcanizedb_geth_data:
-  vulcanizedb_db_data:
-
-networks:
-  vulcanizedb_net:
-    driver: bridge

dockerfiles/startup_script.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Runs the migrations and starts the lightSync and continuousLogSync services
+# Runs the migrations and starts the headerSync and continuousLogSync services
 
 # Exit if the variable tests fail
 set -e
@@ -21,7 +21,7 @@ set +e
 ./goose postgres "$CONNECT_STRING" up
 if [ $? -eq 0 ]; then
   # Fire up the services
-  ./vulcanizedb lightSync --config environments/staging.toml &
+  ./vulcanizedb headerSync --config environments/staging.toml &
   ./vulcanizedb continuousLogSync --config environments/staging.toml &
 else
   echo "Could not run migrations. Are the database details correct?"

dockerfiles/super_node/Dockerfile

@@ -0,0 +1,48 @@
+FROM golang:1.12-alpine as builder
+
+RUN apk --update --no-cache add make git g++ linux-headers
+# DEBUG
+RUN apk add busybox-extras
+
+# Get and build vulcanizedb
+ADD . /go/src/github.com/vulcanize/ipfs-blockchain-watcher
+WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
+RUN GO111MODULE=on GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -o vulcanizedb .
+
+# Build migration tool
+RUN go get -u -d github.com/pressly/goose/cmd/goose
+WORKDIR /go/src/github.com/pressly/goose/cmd/goose
+RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_mysql no_sqlite' -o goose .
+
+WORKDIR /go/src/github.com/vulcanize/ipfs-blockchain-watcher
+
+# app container
+FROM alpine
+
+ARG USER
+ARG CONFIG_FILE
+ARG EXPOSE_PORT_1
+ARG EXPOSE_PORT_2
+
+RUN adduser -Du 5000 $USER
+WORKDIR /app
+RUN chown $USER /app
+USER $USER
+
+# chown first so dir is writable
+# note: using $USER is merged, but not in the stable release yet
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/$CONFIG_FILE config.toml
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/super_node/startup_script.sh .
+COPY --chown=5000:5000 --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/dockerfiles/super_node/entrypoint.sh .
+
+
+# keep binaries immutable
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/vulcanizedb vulcanizedb
+COPY --from=builder /go/src/github.com/pressly/goose/cmd/goose/goose goose
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/db/migrations migrations/vulcanizedb
+COPY --from=builder /go/src/github.com/vulcanize/ipfs-blockchain-watcher/environments environments
+
+EXPOSE $EXPOSE_PORT_1
+EXPOSE $EXPOSE_PORT_2
+
+ENTRYPOINT ["/app/entrypoint.sh"]

dockerfiles/super_node/docker-compose.yml

@@ -0,0 +1,87 @@
+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

@@ -0,0 +1,60 @@
+#!/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

@@ -0,0 +1,65 @@
+#!/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

@@ -0,0 +1,262 @@
+## ipfs-blockchain-watcher APIs
+We can expose a number of different APIs for remote access to ipfs-blockchain-watcher data
+
+
+### Table of Contents
+1. [Postgraphile](#postgraphile)
+1. [RPC Subscription Interface](#rpc-subscription-interface)
+1. [Native API Recapitulation](#native-api-recapitulation)
+
+
+### Postgraphile
+ipfs-blockchain-watcher 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. 
+
+`postgraphile --plugins @graphile/pg-pubsub --subscriptions --simple-subscriptions -c postgres://localhost:5432/vulcanize_public?sslmode=disable -s public,btc,eth -a -j`
+
+
+This will stand up a Postgraphile server on the public, eth, and btc schemas- exposing GraphQL endpoints for all of the tables contained under those schemas.
+All of their data can then be queried with standard [GraphQL](https://graphql.org) queries.
+
+
+### 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.
+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).
+
+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)).
+
+#### 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
+
+```go
+    package main 
+
+    import (
+    	"github.com/ethereum/go-ethereum/rlp"
+    	"github.com/ethereum/go-ethereum/rpc"
+    	"github.com/spf13/viper"
+    	
+        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/client"
+        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth"
+        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/streamer"
+        "github.com/vulcanize/ipfs-blockchain-watcher/pkg/watcher"
+    )
+
+    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)
+    for {
+        select {
+        case payload := <- payloadChan:
+            // do something with the subscription payload
+        case err := <- subscription.Err():
+            // do something with the subscription error
+        }
+    }
+```
+
+The .toml file being used to fill the Ethereum subscription config would look something like this:
+
+```toml
+[superNode]
+    [superNode.ethSubscription]
+        historicalData = false
+        historicalDataOnly = false
+        startingBlock = 0
+        endingBlock = 0
+        wsPath = "ws://127.0.0.1:8080"
+        [superNode.ethSubscription.headerFilter]
+            off = false
+            uncles = false
+        [superNode.ethSubscription.txFilter]
+            off = false
+            src = []
+            dst = []
+        [superNode.ethSubscription.receiptFilter]
+            off = false
+            contracts = []
+            topic0s = []
+            topic1s = []
+            topic2s = []
+            topic3s = []
+        [superNode.ethSubscription.stateFilter]
+            off = false
+            addresses = []
+           intermediateNodes = false
+        [superNode.ethSubscription.storageFilter]
+            off = true
+            addresses = []
+            storageKeys = []
+            intermediateNodes = false
+```
+
+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.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.historicalDataOnly` will tell ipfs-blockchain-watcher 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.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.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.
+
+`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
+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
+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.
+
+`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`.
+
+`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
+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`.
+
+### 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
+
+```go
+    package main 
+
+    import (
+    	"github.com/ethereum/go-ethereum/rlp"
+    	"github.com/ethereum/go-ethereum/rpc"
+    	"github.com/spf13/viper"
+    	
+    	"github.com/vulcanize/ipfs-blockchain-watcher/libraries/shared/streamer"
+    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/eth/client"
+    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/super_node"
+    	"github.com/vulcanize/ipfs-blockchain-watcher/pkg/super_node/btc"
+    )
+
+    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)
+    for {
+        select {
+        case payload := <- payloadChan:
+            // do something with the subscription payload
+        case err := <- subscription.Err():
+            // do something with the subscription error
+        }
+    }
+```
+
+The .toml file being used to fill the Bitcoin subscription config would look something like this:
+
+```toml
+[superNode]
+    [superNode.btcSubscription]
+        historicalData = false
+        historicalDataOnly = false
+        startingBlock = 0
+        endingBlock = 0
+        wsPath = "ws://127.0.0.1:8080"
+        [superNode.btcSubscription.headerFilter]
+            off = false
+        [superNode.btcSubscription.txFilter]
+            off = false
+            segwit = false
+            witnessHashes = []
+            indexes = []
+            pkScriptClass = []
+            multiSig = false
+            addresses = []
+```
+
+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.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.historicalDataOnly` will tell ipfs-blockchain-watcher 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.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.headerFilter` has one sub-option: `off`. 
+
+- Setting `off` to true tells ipfs-blockchain-watcher 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;
+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.
+
+
+### Native API Recapitulation:
+In addition to providing novel Postgraphile and RPC-Subscription endpoints, we are working towards complete recapitulation of the
+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.
+
+The currently supported endpoints include:  
+`eth_blockNumber`  
+`eth_getLogs`  
+`eth_getHeaderByNumber`  
+`eth_getBlockByNumber`  
+`eth_getBlockByHash`  
+`eth_getTransactionByHash`  
+
+Additional endpoints will be added in the near future, with the immediate goal of recapitulating the largest set of "eth_" endpoints which can be provided as a service.
+
+#### Bitcoin JSON-RPC API:
+In the near future, the standard Bitcoin JSON-RPC interfaces will be implemented.

documentation/architecture.md

@@ -0,0 +1,136 @@
+# 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/composeAndExecute.md

@@ -1,152 +0,0 @@
-# composeAndExecute
-The `composeAndExecute` command is used to compose and execute over an arbitrary set of custom transformers.
-This is accomplished by generating a Go pluggin which allows the `vulcanizedb` binary to link to external transformers, so
-long as they abide by one of the standard [interfaces](../staging/libraries/shared/transformer).
-
-This command requires Go 1.11+ and [Go plugins](https://golang.org/pkg/plugin/) only work on Unix-based systems.
-
-## Writing custom transformers
-Storage Transformers
-   * [Guide](../../staging/libraries/shared/factories/storage/README.md)
-   * [Example](../../staging/libraries/shared/factories/storage/EXAMPLE.md)
-    
-Event Transformers   
-   * [Guide](../../staging/libraries/shared/factories/event/README.md)
-   * [Example 1](https://github.com/vulcanize/ens_transformers/tree/master/transformers/registar)
-   * [Example 2](https://github.com/vulcanize/ens_transformers/tree/master/transformers/registry)
-   * [Example 3](https://github.com/vulcanize/ens_transformers/tree/master/transformers/resolver)
-
-Contract Transformers
-   * [Example 1](https://github.com/vulcanize/account_transformers)
-   * [Example 2](https://github.com/vulcanize/ens_transformers/tree/master/transformers/domain_records)
-
-## Preparing transformers to work as a plugin for composeAndExecute
-To plug in an external transformer we need to:
-
-1. Create a package that exports a variable `TransformerInitializer`, `StorageTransformerInitializer`, or `ContractTransformerInitializer` that are of type [TransformerInitializer](../staging/libraries/shared/transformer/event_transformer.go#L33)
-or [StorageTransformerInitializer](../../staging/libraries/shared/transformer/storage_transformer.go#L31),
-or [ContractTransformerInitializer](../../staging/libraries/shared/transformer/contract_transformer.go#L31), respectively
-2. Design the transformers to work in the context of their [event](../staging/libraries/shared/watcher/event_watcher.go#L83),
-[storage](../../staging/libraries/shared/watcher/storage_watcher.go#L53),
-or [contract](../../staging/libraries/shared/watcher/contract_watcher.go#L68) watcher execution modes
-3. Create db migrations to run against vulcanizeDB so that we can store the transformer output
-    * Do not `goose fix` the transformer migrations, this is to ensure they are always ran after the core vulcanizedb migrations which are kept in their fixed form
-    * Specify migration locations for each transformer in the config with the `exporter.transformer.migrations` fields
-    * If the base vDB migrations occupy this path as well, they need to be in their `goose fix`ed form
-    as they are [here](../../staging/db/migrations)
-
-To update a plugin repository with changes to the core vulcanizedb repository, replace the vulcanizedb vendored in the plugin repo (`plugin_repo/vendor/github.com/vulcanize/vulcanizedb`)
-with the newly updated version
-* The entire vendor lib within the vendored vulcanizedb needs to be deleted (`plugin_repo/vendor/github.com/vulcanize/vulcanizedb/vendor`)
-* These complications arise due to this [conflict](https://github.com/golang/go/issues/20481) between `dep` and Go plugins
-
-## Configuration
-A .toml config file is specified when executing the command:
-`./vulcanizedb composeAndExecute --config=./environments/config_name.toml`
-
-The config provides information for composing a set of transformers:
-
-```toml
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    user     = "vulcanize"
-    password = "vulcanize"
-    port     = 5432
-
-[client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-[exporter]
-    home     = "github.com/vulcanize/vulcanizedb"
-    name     = "exampleTransformerExporter"
-    save     = false
-    transformerNames = [
-        "transformer1",
-        "transformer2",
-        "transformer3",
-        "transformer4",
-    ]
-    [exporter.transformer1]
-        path = "path/to/transformer1"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer2]
-        path = "path/to/transformer2"
-        type = "eth_contract"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer3]
-        path = "path/to/transformer3"
-        type = "eth_event"
-        repository = "github.com/account/repo"
-        migrations = "db/migrations"
-        rank = "0"
-    [exporter.transformer4]
-        path = "path/to/transformer4"
-        type = "eth_storage"
-        repository = "github.com/account2/repo2"
-        migrations = "to/db/migrations"
-        rank = "1"
-```
-- `home` is the name of the package you are building the plugin for, in most cases this is github.com/vulcanize/vulcanizedb
-- `name` is the name used for the plugin files (.so and .go)   
-- `save` indicates whether or not the user wants to save the .go file instead of removing it after .so compilation. Sometimes useful for debugging/trouble-shooting purposes.
-- `transformerNames` is the list of the names of the transformers we are composing together, so we know how to access their submaps in the exporter map
-- `exporter.<transformerName>`s are the sub-mappings containing config info for the transformers
-    - `repository` is the path for the repository which contains the transformer and its `TransformerInitializer`
-    - `path` is the relative path from `repository` to the transformer's `TransformerInitializer` directory (initializer package).
-        - Transformer repositories need to be cloned into the user's $GOPATH (`go get`)
-    - `type` is the type of the transformer; indicating which type of watcher it works with (for now, there are only two options: `eth_event` and `eth_storage`)
-        - `eth_storage` indicates the transformer works with the [storage watcher](../../staging/libraries/shared/watcher/storage_watcher.go)
-         that fetches state and storage diffs from an ETH node (instead of, for example, from IPFS)
-        - `eth_event` indicates the transformer works with the [event watcher](../../staging/libraries/shared/watcher/event_watcher.go)
-         that fetches event logs from an ETH node
-        - `eth_contract` indicates the transformer works with the [contract watcher](../staging/libraries/shared/watcher/contract_watcher.go)
-        that is made to work with [contract_watcher pkg](../../staging/pkg/contract_watcher)
-        based transformers which work with either a light or full sync vDB to watch events and poll public methods ([example1](https://github.com/vulcanize/account_transformers/tree/master/transformers/account/light), [example2](https://github.com/vulcanize/ens_transformers/tree/working/transformers/domain_records))
-    - `migrations` is the relative path from `repository` to the db migrations directory for the transformer
-    - `rank` determines the order that migrations are ran, with lower ranked migrations running first
-        - this is to help isolate any potential conflicts between transformer migrations
-        - start at "0" 
-        - use strings
-        - don't leave gaps
-        - transformers with identical migrations/migration paths should share the same rank
-- Note: If any of the imported transformers need additional config variables those need to be included as well   
-
-This information is used to write and build a Go plugin which exports the configured transformers.
-These transformers are loaded onto their specified watchers and executed.
-
-Transformers of different types can be run together in the same command using a single config file or in separate instances using different config files   
-
-The general structure of a plugin .go file, and what we would see built with the above config is shown below
-
-```go
-package main
-
-import (
-	interface1 "github.com/vulcanize/vulcanizedb/libraries/shared/transformer"
-	transformer1 "github.com/account/repo/path/to/transformer1"
-	transformer2 "github.com/account/repo/path/to/transformer2"
-	transformer3 "github.com/account/repo/path/to/transformer3"
-	transformer4 "github.com/account2/repo2/path/to/transformer4"
-)
-
-type exporter string
-
-var Exporter exporter
-
-func (e exporter) Export() []interface1.EventTransformerInitializer, []interface1.StorageTransformerInitializer, []interface1.ContractTransformerInitializer {
-	return []interface1.TransformerInitializer{
-            transformer1.TransformerInitializer,
-            transformer3.TransformerInitializer,
-        },     []interface1.StorageTransformerInitializer{
-            transformer4.StorageTransformerInitializer,
-        },     []interface1.ContractTransformerInitializer{
-            transformer2.TransformerInitializer,
-        }
-}
-```

documentation/contractWatcher.md

@@ -1,160 +0,0 @@
-# contractWatcher
-The `contractWatcher` command is a built-in generic contract watcher. It can watch any and all events for a given contract provided the contract's ABI is available.
-It also provides some state variable coverage by automating polling of public methods, with some restrictions:
-1. The method must have 2 or less arguments
-1. The method's arguments must all be of type address or bytes32 (hash)
-1. The method must return a single value
-
-This command operates in two modes- `light` and `full`- which require a light or full-synced vulcanizeDB, respectively.
-
-This command requires the contract ABI be available on Etherscan if it is not provided in the config file by the user.
-
-If method polling is turned on we require an archival node at the ETH ipc endpoint in our config, whether or not we are operating in `light` or `full` mode.
-Otherwise we only need to connect to a full node.
-
-## Configuration
-This command takes a config of the form:
-
-```toml
-  [database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    port     = 5432
-
-  [client]
-    ipcPath  = "/Users/user/Library/Ethereum/geth.ipc"
-
-  [contract]
-    network  = ""
-    addresses  = [
-        "contractAddress1",
-        "contractAddress2"
-    ]
-    [contract.contractAddress1]
-        abi    = 'ABI for contract 1'
-        startingBlock = 982463
-    [contract.contractAddress2]
-        abi    = 'ABI for contract 2'
-        events = [
-            "event1",
-            "event2"
-        ]
-		eventArgs = [
-			"arg1",
-			"arg2"
-		]
-        methods = [
-            "method1",
-			"method2"
-        ]
-		methodArgs = [
-			"arg1",
-			"arg2"
-		]
-        startingBlock = 4448566
-        piping = true
-````
-
-- The `contract` section defines which contracts we want to watch and with which conditions.
-- `network` is only necessary if the ABIs are not provided and wish to be fetched from Etherscan.
-    - Empty or nil string indicates mainnet
-    - "ropsten", "kovan", and "rinkeby" indicate their respective networks
-- `addresses` lists the contract addresses we are watching and is used to load their individual configuration parameters
-- `contract.<contractAddress>` are the sub-mappings which contain the parameters specific to each contract address
-    - `abi` is the ABI for the contract; if none is provided the application will attempt to fetch one from Etherscan using the provided address and network
-    - `events` is the list of events to watch
-        - If this field is omitted or no events are provided then by defualt ALL events extracted from the ABI will be watched
-        - If event names are provided then only those events will be watched
-    - `eventArgs` is the list of arguments to filter events with
-        - If this field is omitted or no eventArgs are provided then by default watched events are not filtered by their argument values
-        - If eventArgs are provided then only those events which emit at least one of these values as an argument are watched
-    - `methods` is the list of methods to poll
-        - If this is omitted or no methods are provided then by default NO methods are polled
-        - If method names are provided then those methods will be polled, provided
-            1) Method has two or less arguments
-            1) Arguments are all of address or hash types
-            1) Method returns a single value
-    - `methodArgs` is the list of arguments to limit polling methods to
-        - If this field is omitted or no methodArgs are provided then by default methods will be polled with every combination of the appropriately typed values that have been collected from watched events
-        - If methodArgs are provided then only those values will be used to poll methods
-    - `startingBlock` is the block we want to begin watching the contract, usually the deployment block of that contract
-    - `piping` is a boolean flag which indicates whether or not we want to pipe return method values forward as arguments to subsequent method calls
-
-At the very minimum, for each contract address an ABI and a starting block number need to be provided (or just the starting block if the ABI can be reliably fetched from Etherscan).
-With just this information we will be able to watch all events at the contract, but with no additional filters and no method polling.
-
-## Output
-
-Transformed events and polled method results are committed to Postgres in schemas and tables generated according to the contract abi.      
-
-Schemas are created for each contract using the naming convention `<sync-type>_<lowercase contract-address>`
-Under this schema, tables are generated for watched events as `<lowercase event name>_event` and for polled methods as `<lowercase method name>_method`  
-The 'method' and 'event' identifiers are tacked onto the end of the table names to prevent collisions between methods and events of the same lowercase name    
-
-## Example:
-
-Modify `./environments/example.toml` to replace the empty `ipcPath` with a path that points to an ethjson_rpc endpoint (e.g. a local geth node ipc path or an Infura url).
-This endpoint should be for an archival eth node if we want to perform method polling as this configuration is currently set up to do. To work with a non-archival full node,
-remove the `balanceOf` method from the `0x8dd5fbce2f6a956c3022ba3663759011dd51e73e` (TrueUSD) contract.
-
-If you are operating a light sync vDB, run:
-
- `./vulcanizedb contractWatcher --config=./environments/example.toml --mode=light`
-
-If instead you are operating a full sync vDB and provided an archival node IPC path, run in full mode:
-
- `./vulcanizedb contractWatcher --config=./environments/example.toml --mode=full`
-
-This will run the contractWatcher and configures it to watch the contracts specified in the config file. Note that
-by default we operate in `light` mode but the flag is included here to demonstrate its use.
-
-The example config we link to in this example watches two contracts, the ENS Registry (0x314159265dD8dbb310642f98f50C066173C1259b) and TrueUSD (0x8dd5fbCe2F6a956C3022bA3663759011Dd51e73E).
-
-Because the ENS Registry is configured with only an ABI and a starting block, we will watch all events for this contract and poll none of its methods. Note that the ENS Registry is an example
-of a contract which does not have its ABI available over Etherscan and must have it included in the config file.
-
-The TrueUSD contract is configured with two events (`Transfer` and `Mint`) and a single method (`balanceOf`), as such it will watch these two events and use any addresses it collects emitted from them
-to poll the `balanceOf` method with those addresses at every block. Note that we do not provide an ABI for TrueUSD as its ABI can be fetched from Etherscan.
-
-For the ENS contract, it produces and populates a schema with four tables"
-`light_0x314159265dd8dbb310642f98f50c066173c1259b.newowner_event`
-`light_0x314159265dd8dbb310642f98f50c066173c1259b.newresolver_event`
-`light_0x314159265dd8dbb310642f98f50c066173c1259b.newttl_event`
-`light_0x314159265dd8dbb310642f98f50c066173c1259b.transfer_event`
-
-For the TrusUSD contract, it produces and populates a schema with three tables:
-
-`light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.transfer_event`
-`light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.mint_event`
-`light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.balanceof_method`
-
-Column ids and types for these tables are generated based on the event and method argument names and types and method return types, resulting in tables such as:
-
-Table "light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.transfer_event"
-
-|  Column    |         Type          | Collation | Nullable |                                           Default                                           | Storage  | Stats target | Description  
-|:----------:|:---------------------:|:---------:|:--------:|:-------------------------------------------------------------------------------------------:|:--------:|:------------:|:-----------:|
-| id         | integer               |           | not null | nextval('light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.transfer_event_id_seq'::regclass) | plain    |              |             |
-| header_id  | integer               |           | not null |                                                                                             | plain    |              |             |
-| token_name | character varying(66) |           | not null |                                                                                             | extended |              |             |
-| raw_log    | jsonb                 |           |          |                                                                                             | extended |              |             |
-| log_idx    | integer               |           | not null |                                                                                             | plain    |              |             |
-| tx_idx     | integer               |           | not null |                                                                                             | plain    |              |             |
-| from_      | character varying(66) |           | not null |                                                                                             | extended |              |             |
-| to_        | character varying(66) |           | not null |                                                                                             | extended |              |             |
-| value_     | numeric               |           | not null |                                                                                             | main     |              |             |
-
-
-Table "light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.balanceof_method"
-
-|   Column   |         Type          | Collation | Nullable |                                            Default                                            | Storage  | Stats target | Description |
-|:----------:|:---------------------:|:---------:|:--------:|:-------------------------------------------------------------------------------------------:|:--------:|:------------:|:-----------:|
-| id         | integer               |           | not null | nextval('light_0x8dd5fbce2f6a956c3022ba3663759011dd51e73e.balanceof_method_id_seq'::regclass) | plain    |              |             |
-| token_name | character varying(66) |           | not null |                                                                                               | extended |              |             |
-| block      | integer               |           | not null |                                                                                               | plain    |              |             |
-| who_       | character varying(66) |           | not null |                                                                                               | extended |              |             |
-| returned   | numeric               |           | not null |                                                                                               | main     |              |             |
-  
-The addition of '_' after table names is to prevent collisions with reserved Postgres words.
-
-Also notice that the contract address used for the schema name has been down-cased.

documentation/contributing.md

@@ -1,11 +0,0 @@
-# Contribution guidelines
-
-Contributions are welcome! In addition to core contributions, developers are encouraged to build their own custom transformers which
-can be run together with other custom transformers using the [composeAndExeucte](../../staging/documentation/composeAndExecute.md) command.
-
-## Creating a new migration file
-1. `make new_migration NAME=add_columnA_to_table1`
-    - This will create a new timestamped migration file in `db/migrations`
-1. Write the migration code in the created file, under the respective `goose` pragma
-    - Goose automatically runs each migration in a transaction; don't add `BEGIN` and `COMMIT` statements.
-1. Core migrations should be committed in their `goose fix`ed form.

documentation/resync.md

@@ -0,0 +1,73 @@
+## 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/sync.md

@@ -1,26 +0,0 @@
-# Syncing commands
-These commands are used to sync raw Ethereum data into Postgres.
-
-## lightSync
-Syncs VulcanizeDB with the configured Ethereum node, populating only block headers.
-This command is useful when you want a minimal baseline from which to track targeted data on the blockchain (e.g. individual smart contract storage values or event logs).
-1. Start Ethereum node
-1. In a separate terminal start VulcanizeDB:
-    - `./vulcanizedb lightSync --config <config.toml> --starting-block-number <block-number>`
-    
-## sync
-Syncs VulcanizeDB with the configured Ethereum node, populating blocks, transactions, receipts, and logs.
-This command is useful when you want to maintain a broad cache of what's happening on the blockchain.
-1. Start Ethereum node (**if fast syncing your Ethereum node, wait for initial sync to finish**)
-1. In a separate terminal start VulcanizeDB:
-    - `./vulcanizedb sync --config <config.toml> --starting-block-number <block-number>`
-
-## coldImport
-Sync VulcanizeDB from the LevelDB underlying a Geth node.
-1. Assure node is not running, and that it has synced to the desired block height.
-1. Start vulcanize_db
-   - `./vulcanizedb coldImport --config <config.toml>`
-1. Optional flags:
-    - `--starting-block-number <block number>`/`-s <block number>`: block number to start syncing from
-    - `--ending-block-number <block number>`/`-e <block number>`: block number to sync to
-    - `--all`/`-a`: sync all missing blocks

documentation/watcher.md

@@ -0,0 +1,16 @@
+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

environments/composeAndExecuteAccountTransformer.toml

@@ -1,38 +0,0 @@
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    port     = 5432
-
-[client]
-    ipcPath = ""
-
-[exporter]
-    home     = "github.com/vulcanize/vulcanizedb"
-    name     = "accountTransformerExporter"
-    save     = false
-    transformerNames = [
-        "account"
-    ]
-    [exporter.account]
-        path = "transformers/account/light/initializer"
-        type = "eth_contract"
-        repository = "github.com/vulcanize/account_transformers"
-        migrations = "db/migrations"
-        rank = "0"
-
-[token]
-    addresses = [
-        "0x58b6A8A3302369DAEc383334672404Ee733aB239",
-        "0x862Da0A691bb0b74038377295f8fF523D0493eB4",
-    ]
-    [token.equivalents]
-        0x0000000000085d4780B73119b644AE5ecd22b376 = [
-           "0x8dd5fbCe2F6a956C3022bA3663759011Dd51e73E"
-        ]
-        0x58b6A8A3302369DAEc383334672404Ee733aB239 = [
-           "0x8e306b005773bee6bA6A6e8972Bc79D766cC15c8"
-        ]
-
-[account]
-    start = 0
-    addresses = []

environments/example.toml

@@ -1,26 +0,0 @@
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    port     = 5432
-
-[client]
-    ipcPath  = ""
-
-[contract]
-    network  = ""
-    addresses  = [
-        "0x314159265dD8dbb310642f98f50C066173C1259b",
-        "0x8dd5fbCe2F6a956C3022bA3663759011Dd51e73E"
-    ]
-    [contract.0x314159265dD8dbb310642f98f50C066173C1259b]
-        abi    = '[{"constant":true,"inputs":[{"name":"node","type":"bytes32"}],"name":"resolver","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"node","type":"bytes32"}],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"node","type":"bytes32"},{"name":"label","type":"bytes32"},{"name":"owner","type":"address"}],"name":"setSubnodeOwner","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"node","type":"bytes32"},{"name":"ttl","type":"uint64"}],"name":"setTTL","outputs":[],"payable":false,"type":"function"},{"constant":true,"inputs":[{"name":"node","type":"bytes32"}],"name":"ttl","outputs":[{"name":"","type":"uint64"}],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"node","type":"bytes32"},{"name":"resolver","type":"address"}],"name":"setResolver","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"node","type":"bytes32"},{"name":"owner","type":"address"}],"name":"setOwner","outputs":[],"payable":false,"type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"node","type":"bytes32"},{"indexed":false,"name":"owner","type":"address"}],"name":"Transfer","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"node","type":"bytes32"},{"indexed":true,"name":"label","type":"bytes32"},{"indexed":false,"name":"owner","type":"address"}],"name":"NewOwner","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"node","type":"bytes32"},{"indexed":false,"name":"resolver","type":"address"}],"name":"NewResolver","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"node","type":"bytes32"},{"indexed":false,"name":"ttl","type":"uint64"}],"name":"NewTTL","type":"event"}]'
-        startingBlock = 3327417
-    [contract.0x8dd5fbCe2F6a956C3022bA3663759011Dd51e73E]
-        events = [
-            "Transfer",
-            "Issue"
-        ]
-        methods = [
-            "balanceOf"
-        ]
-        startingBlock = 5197514

environments/infura.toml

@@ -1,7 +0,0 @@
-[database]
-    name     = "vulcanize_public"
-    hostname = "localhost"
-    port     = 5432
-
-[client]
-    ipcPath  = ""

environments/private.toml

@@ -1,7 +0,0 @@
-[database]
-    name     = "vulcanize_private"
-    hostname = "localhost"
-    port     = 5432
-
-[client]
-    ipcPath  = "http://127.0.0.1:7545"

environments/public.toml.example

@@ -1,8 +0,0 @@
-[database]
-    name = "vulcanize_public"
-    hostname = "localhost"
-    port = 5432
-
-[client]
-    ipcPath = <local node's IPC filepath>
-    levelDbPath = <local node's LevelDB chaindata filepath>

environments/superNodeBTC.toml

@@ -0,0 +1,45 @@
+[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

@@ -0,0 +1,45 @@
+[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

environments/superNodeSubscription.toml

@@ -0,0 +1,30 @@
+[superNode]
+    [superNode.ethSubscription]
+        historicalData = false
+        historicalDataOnly = false
+        startingBlock = 0
+        endingBlock = 0
+        wsPath = "ws://127.0.0.1:8080"
+        [superNode.ethSubscription.headerFilter]
+            off = false
+            uncles = false
+        [superNode.ethSubscription.txFilter]
+            off = false
+            src = []
+            dst = []
+        [superNode.ethSubscription.receiptFilter]
+            off = false
+            contracts = []
+            topic0s = []
+            topic1s = []
+            topic2s = []
+            topic3s = []
+        [superNode.ethSubscription.stateFilter]
+            off = false
+            addresses = []
+           intermediateNodes = false
+        [superNode.ethSubscription.storageFilter]
+            off = true
+            addresses = []
+            storageKeys = []
+            intermediateNodes = false