Merge pull request #45 from vulcanize/release-v3.0.3

prep for integrated node of v3

Makefile

@@ -1,10 +1,14 @@
+ifndef GOPATH
+override GOPATH = $(HOME)/go
+endif
+
 BIN = $(GOPATH)/bin
 
 # Tools
 ## Migration tool
 GOOSE = $(BIN)/goose
 $(BIN)/goose:
-	go get -u github.com/pressly/goose/cmd/goose
+	GO111MODULE=off go get -u github.com/pressly/goose/cmd/goose
 
 .PHONY: installtools
 installtools: | $(GOOSE)
@@ -44,18 +48,47 @@ rollback: $(GOOSE) checkdbvars
 	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" down
 	pg_dump -O -s $(CONNECT_STRING) > schema.sql
 
-
 ## Rollback to a select migration (id/timestamp)
 .PHONY: rollback_to
 rollback_to: $(GOOSE) checkmigration checkdbvars
 	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" down-to "$(MIGRATION)"
 
+## Rollback pre_batch_set
+.PHONY: `rollback_pre_batch_set`
+rollback_pre_batch_set: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/pre_batch_processing_migrations postgres "$(CONNECT_STRING)" down
+
+## Rollback post_batch_set
+.PHONY: rollback_post_batch_set
+rollback_post_batch_set: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/post_batch_processing_migrations postgres "$(CONNECT_STRING)" down
+
+## Apply the next up migration
+.PHONY: migrate_up_by_one
+migrate_up_by_one: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" up-by-one
+
 ## Apply all migrations not already run
 .PHONY: migrate
 migrate: $(GOOSE) checkdbvars
 	$(GOOSE) -dir db/migrations postgres "$(CONNECT_STRING)" up
 	pg_dump -O -s $(CONNECT_STRING) > schema.sql
 
+## Apply migrations to be ran before a batch processing
+.PHONY: migrate_pre_batch_set
+migrate_pre_batch_set: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/pre_batch_processing_migrations postgres "$(CONNECT_STRING)" up
+
+## Apply migrations to be ran after a batch processing, one-by-one
+.PHONY: migrate_post_batch_set_up_by_one
+migrate_post_batch_set_up_by_one: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/post_batch_processing_migrations postgres "$(CONNECT_STRING)" up-by-one
+
+## Apply migrations to be ran after a batch processing
+.PHONY: migrate_post_batch_set
+migrate_post_batch_set: $(GOOSE) checkdbvars
+	$(GOOSE) -dir db/post_batch_processing_migrations postgres "$(CONNECT_STRING)" up
+
 ## Create a new migration file
 .PHONY: new_migration
 new_migration: $(GOOSE) checkmigname
@@ -91,4 +124,4 @@ docker-concise-migration-build:
 
 .PHONY: test-migrations
 test-migrations: $(GOOSE)
-	./scripts/test_migration.sh
+	./scripts/test_migration.sh

db/Dockerfile

@@ -8,7 +8,7 @@ ADD . /go/src/github.com/vulcanize/ipld-eth-db
 WORKDIR /go/src/github.com/pressly
 RUN git clone https://github.com/pressly/goose.git
 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 .
+RUN GCO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-extldflags "-static"' -tags='no_sqlite3' -o goose .
 
 # app container
 FROM alpine

db/migrations/00001_create_ipfs_blocks_table.sql

@@ -1,6 +1,6 @@
 -- +goose Up
 CREATE TABLE IF NOT EXISTS public.blocks (
-  key TEXT UNIQUE NOT NULL,
+  key TEXT PRIMARY KEY,
   data BYTEA NOT NULL
 );
 

db/migrations/00002_create_nodes_table.sql

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

db/migrations/00004_create_eth_header_cids_table.sql

@@ -1,24 +1,22 @@
 -- +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,
-  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  td                    NUMERIC NOT NULL,
-  node_id               INTEGER NOT NULL REFERENCES nodes (id) ON DELETE CASCADE,
-  reward                NUMERIC NOT NULL,
-  state_root            VARCHAR(66) NOT NULL,
-  tx_root               VARCHAR(66) NOT NULL,
-  receipt_root          VARCHAR(66) NOT NULL,
-  uncle_root            VARCHAR(66) NOT NULL,
-  bloom                 BYTEA NOT NULL,
-  timestamp             NUMERIC NOT NULL,
-  times_validated       INTEGER NOT NULL DEFAULT 1,
-  base_fee              BIGINT,
-  UNIQUE (block_number, block_hash)
+    block_number          BIGINT NOT NULL,
+    block_hash            VARCHAR(66) PRIMARY KEY,
+    parent_hash           VARCHAR(66) NOT NULL,
+    cid                   TEXT NOT NULL,
+    td                    NUMERIC NOT NULL,
+    node_id               VARCHAR(128) NOT NULL REFERENCES nodes (node_id) ON DELETE CASCADE,
+    reward                NUMERIC NOT NULL,
+    state_root            VARCHAR(66) NOT NULL,
+    tx_root               VARCHAR(66) NOT NULL,
+    receipt_root          VARCHAR(66) NOT NULL,
+    uncle_root            VARCHAR(66) NOT NULL,
+    bloom                 BYTEA NOT NULL,
+    timestamp             BIGINT NOT NULL,
+    mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    times_validated       INTEGER NOT NULL DEFAULT 1,
+    coinbase              VARCHAR(66) NOT NULL
 );
 
 -- +goose Down
-DROP TABLE eth.header_cids;
+DROP TABLE eth.header_cids;

db/migrations/00005_create_eth_uncle_cids_table.sql

@@ -1,14 +1,12 @@
 -- +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,
-  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  reward                NUMERIC NOT NULL,
-  UNIQUE (header_id, block_hash)
+    block_hash            VARCHAR(66) PRIMARY KEY,
+    header_id             VARCHAR(66) NOT NULL REFERENCES eth.header_cids (block_hash) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    parent_hash           VARCHAR(66) NOT NULL,
+    cid                   TEXT NOT NULL,
+    reward                NUMERIC NOT NULL,
+    mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED
 );
 
 -- +goose Down
-DROP TABLE eth.uncle_cids;
+DROP TABLE eth.uncle_cids;

db/migrations/00006_create_eth_transaction_cids_table.sql

@@ -1,16 +1,15 @@
 -- +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,
-  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  dst                   VARCHAR(66) NOT NULL,
-  src                   VARCHAR(66) NOT NULL,
-  tx_data               BYTEA,
-  tx_type               BYTEA,
-  UNIQUE (header_id, tx_hash)
+    header_id             VARCHAR(66) NOT NULL REFERENCES eth.header_cids (block_hash) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    tx_hash               VARCHAR(66) PRIMARY KEY,
+    cid                   TEXT NOT NULL,
+    dst                   VARCHAR(66) NOT NULL,
+    src                   VARCHAR(66) NOT NULL,
+    index                 INTEGER NOT NULL,
+    mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    tx_data               BYTEA,
+    tx_type               INTEGER,
+    value                 NUMERIC
 );
 
 -- +goose Down

db/migrations/00007_create_eth_receipt_cids_table.sql

@@ -1,16 +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,
-  leaf_cid              TEXT NOT NULL,
-  leaf_mh_key           TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  contract              VARCHAR(66),
-  contract_hash         VARCHAR(66),
-  post_state            VARCHAR(66),
-  post_status           INTEGER,
-  log_root              VARCHAR(66),
-  UNIQUE (tx_id)
+    tx_id                 VARCHAR(66) PRIMARY KEY REFERENCES eth.transaction_cids (tx_hash) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    leaf_cid              TEXT NOT NULL,
+    contract              VARCHAR(66),
+    contract_hash         VARCHAR(66),
+    leaf_mh_key           TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    post_state            VARCHAR(66),
+    post_status           INTEGER,
+    log_root              VARCHAR(66)
 );
 
 -- +goose Down
-DROP TABLE eth.receipt_cids;
+DROP TABLE eth.receipt_cids;

db/migrations/00008_create_eth_state_cids_table.sql

@@ -1,15 +1,14 @@
 -- +goose Up
 CREATE TABLE eth.state_cids (
-  id                    BIGSERIAL PRIMARY KEY,
-  header_id             INTEGER NOT NULL REFERENCES eth.header_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  state_leaf_key        VARCHAR(66),
-  cid                   TEXT NOT NULL,
-  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  state_path            BYTEA,
-  node_type             INTEGER NOT NULL,
-  diff                  BOOLEAN NOT NULL DEFAULT FALSE,
-  UNIQUE (header_id, state_path)
+    header_id             VARCHAR(66) NOT NULL REFERENCES eth.header_cids (block_hash) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    state_leaf_key        VARCHAR(66),
+    cid                   TEXT NOT NULL,
+    state_path            BYTEA NOT NULL,
+    node_type             INTEGER NOT NULL,
+    diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+    mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    PRIMARY KEY (header_id, state_path)
 );
 
 -- +goose Down
-DROP TABLE eth.state_cids;
+DROP TABLE eth.state_cids;

db/migrations/00009_create_eth_storage_cids_table.sql

@@ -1,15 +1,16 @@
 -- +goose Up
 CREATE TABLE eth.storage_cids (
-  id                    BIGSERIAL PRIMARY KEY,
-  state_id              BIGINT NOT NULL REFERENCES eth.state_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  storage_leaf_key      VARCHAR(66),
-  cid                   TEXT NOT NULL,
-  mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-  storage_path          BYTEA,
-  node_type             INTEGER NOT NULL,
-  diff                  BOOLEAN NOT NULL DEFAULT FALSE,
-  UNIQUE (state_id, storage_path)
+    header_id             VARCHAR(66) NOT NULL,
+    state_path            BYTEA NOT NULL,
+    storage_leaf_key      VARCHAR(66),
+    cid                   TEXT NOT NULL,
+    storage_path          BYTEA NOT NULL,
+    node_type             INTEGER NOT NULL,
+    diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+    mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids (header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    PRIMARY KEY (header_id, state_path, storage_path)
 );
 
 -- +goose Down
-DROP TABLE eth.storage_cids;
+DROP TABLE eth.storage_cids;

db/migrations/00010_create_eth_state_accounts_table.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+CREATE TABLE eth.state_accounts (
+    header_id             VARCHAR(66) NOT NULL,
+    state_path            BYTEA NOT NULL,
+    balance               NUMERIC NOT NULL,
+    nonce                 BIGINT NOT NULL,
+    code_hash             BYTEA NOT NULL,
+    storage_root          VARCHAR(66) NOT NULL,
+    FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids (header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    PRIMARY KEY (header_id, state_path)
+);
+
+-- +goose Down
+DROP TABLE eth.state_accounts;

db/migrations/00010_create_eth_state_accouts_table.sql

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

db/migrations/00011_create_eth_access_list_elements_table.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+CREATE TABLE eth.access_list_elements (
+    tx_id                 VARCHAR(66) NOT NULL REFERENCES eth.transaction_cids (tx_hash) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    index                 INTEGER NOT NULL,
+    address               VARCHAR(66),
+    storage_keys          VARCHAR(66)[],
+    PRIMARY KEY (tx_id, index)
+);
+
+-- +goose Down
+DROP TABLE eth.access_list_elements;

db/migrations/00012_create_eth_log_cids_table.sql

@@ -0,0 +1,18 @@
+-- +goose Up
+CREATE TABLE eth.log_cids (
+    leaf_cid            TEXT NOT NULL,
+    leaf_mh_key         TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    rct_id              VARCHAR(66) NOT NULL REFERENCES eth.receipt_cids (tx_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
+    address             VARCHAR(66) NOT NULL,
+    index               INTEGER NOT NULL,
+    topic0              VARCHAR(66),
+    topic1              VARCHAR(66),
+    topic2              VARCHAR(66),
+    topic3              VARCHAR(66),
+    log_data            BYTEA,
+    PRIMARY KEY (rct_id, index)
+);
+
+-- +goose Down
+-- log indexes
+DROP TABLE eth.log_cids;

db/migrations/00012_potgraphile_triggers.sql

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

db/migrations/00014_create_cid_indexes.sql

@@ -1,76 +1,76 @@
 -- +goose Up
 -- header indexes
 CREATE INDEX block_number_index ON eth.header_cids USING brin (block_number);
-
-CREATE INDEX block_hash_index ON eth.header_cids USING btree (block_hash);
-
 CREATE INDEX header_cid_index ON eth.header_cids USING btree (cid);
-
 CREATE INDEX header_mh_index ON eth.header_cids USING btree (mh_key);
-
 CREATE INDEX state_root_index ON eth.header_cids USING btree (state_root);
-
 CREATE INDEX timestamp_index ON eth.header_cids USING brin (timestamp);
 
+-- uncle indexes
+CREATE INDEX uncle_header_id_index ON eth.uncle_cids USING btree (header_id);
+
 -- transaction indexes
 CREATE INDEX tx_header_id_index ON eth.transaction_cids USING btree (header_id);
-
-CREATE INDEX tx_hash_index ON eth.transaction_cids USING btree (tx_hash);
-
 CREATE INDEX tx_cid_index ON eth.transaction_cids USING btree (cid);
-
 CREATE INDEX tx_mh_index ON eth.transaction_cids USING btree (mh_key);
-
 CREATE INDEX tx_dst_index ON eth.transaction_cids USING btree (dst);
-
 CREATE INDEX tx_src_index ON eth.transaction_cids USING btree (src);
 
 -- receipt indexes
-CREATE INDEX rct_tx_id_index ON eth.receipt_cids USING btree (tx_id);
-
 CREATE INDEX rct_leaf_cid_index ON eth.receipt_cids USING btree (leaf_cid);
-
 CREATE INDEX rct_leaf_mh_index ON eth.receipt_cids USING btree (leaf_mh_key);
-
 CREATE INDEX rct_contract_index ON eth.receipt_cids USING btree (contract);
-
 CREATE INDEX rct_contract_hash_index ON eth.receipt_cids USING btree (contract_hash);
 
 -- state node indexes
-CREATE INDEX state_header_id_index ON eth.state_cids USING btree (header_id);
-
 CREATE INDEX state_leaf_key_index ON eth.state_cids USING btree (state_leaf_key);
-
 CREATE INDEX state_cid_index ON eth.state_cids USING btree (cid);
-
 CREATE INDEX state_mh_index ON eth.state_cids USING btree (mh_key);
-
 CREATE INDEX state_path_index ON eth.state_cids USING btree (state_path);
-
 CREATE INDEX state_node_type_index ON eth.state_cids USING btree (node_type);
 
 -- storage node indexes
-CREATE INDEX storage_state_id_index ON eth.storage_cids USING btree (state_id);
-
+CREATE INDEX storage_state_path_index ON eth.storage_cids USING btree (state_path);
 CREATE INDEX storage_leaf_key_index ON eth.storage_cids USING btree (storage_leaf_key);
-
 CREATE INDEX storage_cid_index ON eth.storage_cids USING btree (cid);
-
 CREATE INDEX storage_mh_index ON eth.storage_cids USING btree (mh_key);
-
 CREATE INDEX storage_path_index ON eth.storage_cids USING btree (storage_path);
-
 CREATE INDEX storage_node_type_index ON eth.storage_cids USING btree (node_type);
 
 -- state accounts indexes
-CREATE INDEX account_state_id_index ON eth.state_accounts USING btree (state_id);
-
+CREATE INDEX account_state_path_index ON eth.state_accounts USING btree (state_path);
 CREATE INDEX storage_root_index ON eth.state_accounts USING btree (storage_root);
 
+-- access list indexes
+CREATE INDEX access_list_element_address_index ON eth.access_list_elements USING btree (address);
+CREATE INDEX access_list_storage_keys_index ON eth.access_list_elements USING gin (storage_keys);
+
+-- log indexes
+CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
+CREATE INDEX log_cid_index ON  eth.log_cids USING btree (leaf_cid);
+CREATE INDEX log_address_index ON eth.log_cids USING btree (address);
+CREATE INDEX log_topic0_index ON eth.log_cids USING btree (topic0);
+CREATE INDEX log_topic1_index ON eth.log_cids USING btree (topic1);
+CREATE INDEX log_topic2_index ON eth.log_cids USING btree (topic2);
+CREATE INDEX log_topic3_index ON eth.log_cids USING btree (topic3);
+
 -- +goose Down
+-- log indexes
+DROP INDEX eth.log_topic3_index;
+DROP INDEX eth.log_topic2_index;
+DROP INDEX eth.log_topic1_index;
+DROP INDEX eth.log_topic0_index;
+DROP INDEX eth.log_address_index;
+DROP INDEX eth.log_cid_index;
+DROP INDEX eth.log_mh_index;
+
+-- access list indexes
+DROP INDEX eth.access_list_storage_keys_index;
+DROP INDEX eth.access_list_element_address_index;
+
 -- state account indexes
 DROP INDEX eth.storage_root_index;
-DROP INDEX eth.account_state_id_index;
+DROP index eth.account_state_path_index;
 
 -- storage node indexes
 DROP INDEX eth.storage_node_type_index;
@@ -78,7 +78,7 @@ DROP INDEX eth.storage_path_index;
 DROP INDEX eth.storage_mh_index;
 DROP INDEX eth.storage_cid_index;
 DROP INDEX eth.storage_leaf_key_index;
-DROP INDEX eth.storage_state_id_index;
+DROP INDEX eth.storage_state_path_index;
 
 -- state node indexes
 DROP INDEX eth.state_node_type_index;
@@ -86,27 +86,26 @@ DROP INDEX eth.state_path_index;
 DROP INDEX eth.state_mh_index;
 DROP INDEX eth.state_cid_index;
 DROP INDEX eth.state_leaf_key_index;
-DROP INDEX eth.state_header_id_index;
 
 -- receipt indexes
 DROP INDEX eth.rct_contract_hash_index;
 DROP INDEX eth.rct_contract_index;
 DROP INDEX eth.rct_leaf_mh_index;
 DROP INDEX eth.rct_leaf_cid_index;
-DROP INDEX eth.rct_tx_id_index;
 
 -- transaction indexes
 DROP INDEX eth.tx_src_index;
 DROP INDEX eth.tx_dst_index;
 DROP INDEX eth.tx_mh_index;
 DROP INDEX eth.tx_cid_index;
-DROP INDEX eth.tx_hash_index;
 DROP INDEX eth.tx_header_id_index;
 
+-- uncle indexes
+DROP INDEX eth.uncle_header_id_index;
+
 -- header indexes
 DROP INDEX eth.timestamp_index;
 DROP INDEX eth.state_root_index;
 DROP INDEX eth.header_mh_index;
 DROP INDEX eth.header_cid_index;
-DROP INDEX eth.block_hash_index;
-DROP INDEX eth.block_number_index;
+DROP INDEX eth.block_number_index;

db/migrations/00015_create_access_list_table.sql

@@ -1,15 +0,0 @@
--- +goose Up
-CREATE TABLE eth.access_list_element (
-    id                    SERIAL PRIMARY KEY,
-    tx_id                 INTEGER NOT NULL REFERENCES eth.transaction_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    index                 INTEGER NOT NULL,
-    address               VARCHAR(66),
-    storage_keys          VARCHAR(66)[],
-    UNIQUE (tx_id, index)
-);
-
-CREATE INDEX accesss_list_element_address_index ON eth.access_list_element USING btree (address);
-
--- +goose Down
-DROP INDEX eth.accesss_list_element_address_index;
-DROP TABLE eth.access_list_element;

db/migrations/00015_create_stored_functions.sql

@@ -5,7 +5,7 @@ CREATE OR REPLACE FUNCTION was_state_leaf_removed(key character varying, hash ch
     RETURNS boolean AS $$
     SELECT state_cids.node_type = 3
     FROM eth.state_cids
-             INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
+             INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.block_hash)
     WHERE state_leaf_key = key
       AND block_number <= (SELECT block_number
                            FROM eth.header_cids
@@ -98,7 +98,7 @@ LANGUAGE 'plpgsql';
 -- +goose StatementEnd
 
 -- +goose StatementBegin
-CREATE OR REPLACE FUNCTION canonical_header_id(height BIGINT) RETURNS INTEGER AS
+CREATE OR REPLACE FUNCTION canonical_header_hash(height BIGINT) RETURNS character varying AS
 $BODY$
 DECLARE
   canonical_header eth.header_cids;
@@ -117,13 +117,13 @@ BEGIN
   -- if we have less than 1 header, return NULL
   IF header_count IS NULL OR header_count < 1 THEN
     RETURN NULL;
-  -- if we have one header, return its id
+  -- if we have one header, return its hash
   ELSIF header_count = 1 THEN
-    RETURN headers[1].id;
+    RETURN headers[1].block_hash;
   -- if we have multiple headers we need to determine which one is canonical
   ELSE
     canonical_header = canonical_header_from_array(headers);
-    RETURN canonical_header.id;
+    RETURN canonical_header.block_hash;
   END IF;
 END;
 $BODY$
@@ -132,7 +132,7 @@ LANGUAGE 'plpgsql';
 
 -- +goose Down
 DROP FUNCTION was_state_leaf_removed;
-DROP FUNCTION canonical_header_id;
+DROP FUNCTION canonical_header_hash;
 DROP FUNCTION canonical_header_from_array;
 DROP FUNCTION has_child;
-DROP TYPE child_result;
+DROP TYPE child_result;

db/migrations/00016_create_eth_log_cids_table.sql

@@ -1,61 +0,0 @@
--- +goose Up
-CREATE TABLE eth.log_cids (
-    id                  SERIAL PRIMARY KEY,
-    leaf_cid            TEXT NOT NULL,
-    leaf_mh_key         TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    receipt_id          INTEGER NOT NULL REFERENCES eth.receipt_cids (id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
-    address             VARCHAR(66) NOT NULL,
-    log_data            BYTEA,
-    index               INTEGER NOT NULL,
-    topic0              VARCHAR(66),
-    topic1              VARCHAR(66),
-    topic2              VARCHAR(66),
-    topic3              VARCHAR(66),
-    UNIQUE (receipt_id, index)
-);
-
-CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
-
-CREATE INDEX log_cid_index ON  eth.log_cids USING btree (leaf_cid);
-
-CREATE INDEX log_rct_id_index ON eth.log_cids USING btree (receipt_id);
-
---
--- Name: log_topic0_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX log_topic0_index ON eth.log_cids USING btree (topic0);
-
-
---
--- Name: log_topic1_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX log_topic1_index ON eth.log_cids USING btree (topic1);
-
-
---
--- Name: log_topic2_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX log_topic2_index ON eth.log_cids USING btree (topic2);
-
-
---
--- Name: log_topic3_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX log_topic3_index ON eth.log_cids USING btree (topic3);
-
-
--- +goose Down
--- log indexes
-DROP INDEX eth.log_mh_index;
-DROP INDEX eth.log_cid_index;
-DROP INDEX eth.log_rct_id_index;
-DROP INDEX eth.log_topic0_index;
-DROP INDEX eth.log_topic1_index;
-DROP INDEX eth.log_topic2_index;
-DROP INDEX eth.log_topic3_index;
-
-DROP TABLE eth.log_cids;

db/migrations/00016_create_postgraphile_triggers.sql

@@ -0,0 +1,116 @@
+-- +goose Up
+-- Name: graphql_subscription(); Type: FUNCTION; Schema: eth; Owner: -
+
+-- +goose StatementBegin
+CREATE FUNCTION eth.graphql_subscription() RETURNS TRIGGER AS $$
+DECLARE
+obj jsonb;
+BEGIN
+    IF (TG_TABLE_NAME = 'state_cids') OR (TG_TABLE_NAME = 'state_accounts') THEN
+             obj := json_build_array(
+                        TG_TABLE_NAME,
+                        NEW.header_id,
+                        NEW.state_path
+                    );
+    ELSIF (TG_TABLE_NAME = 'storage_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.header_id,
+                    NEW.state_path,
+                    NEW.storage_path
+                );
+    ELSIF (TG_TABLE_NAME = 'log_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.rct_id,
+                    NEW.index
+                );
+    ELSIF (TG_TABLE_NAME = 'receipt_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_id
+                );
+    ELSIF (TG_TABLE_NAME = 'transaction_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_hash
+                );
+    ELSIF (TG_TABLE_NAME = 'access_list_elements') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_id,
+                    NEW.index
+                );
+    ELSIF (TG_TABLE_NAME = 'uncle_cids') OR (TG_TABLE_NAME = 'header_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.block_hash
+                );
+END IF;
+
+    perform pg_notify('postgraphile:' || TG_RELNAME , json_build_object(
+            '__node__', obj
+            )::text
+        );
+RETURN NEW;
+END;
+$$ language plpgsql;
+-- +goose StatementEnd
+
+CREATE TRIGGER trg_eth_header_cids
+    AFTER INSERT ON eth.header_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_uncle_cids
+    AFTER INSERT ON eth.uncle_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_transaction_cids
+    AFTER INSERT ON eth.transaction_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_receipt_cids
+    AFTER INSERT ON eth.receipt_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_state_cids
+    AFTER INSERT ON eth.state_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_log_cids
+    AFTER INSERT ON eth.log_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_storage_cids
+    AFTER INSERT ON eth.storage_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_state_accounts
+    AFTER INSERT ON eth.state_accounts
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_access_list_elements
+    AFTER INSERT ON eth.access_list_elements
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+-- +goose Down
+DROP TRIGGER trg_eth_uncle_cids ON eth.uncle_cids;
+DROP TRIGGER trg_eth_transaction_cids ON eth.transaction_cids;
+DROP TRIGGER trg_eth_storage_cids ON eth.storage_cids;
+DROP TRIGGER trg_eth_state_cids ON eth.state_cids;
+DROP TRIGGER trg_eth_state_accounts ON eth.state_accounts;
+DROP TRIGGER trg_eth_receipt_cids ON eth.receipt_cids;
+DROP TRIGGER trg_eth_header_cids ON eth.header_cids;
+DROP TRIGGER trg_eth_log_cids ON eth.log_cids;
+DROP TRIGGER trg_eth_access_list_elements ON eth.access_list_elements;
+
+DROP FUNCTION eth.graphql_subscription();

db/migrations/00017_create_db_version_table.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS public.db_version (
+    singleton BOOLEAN NOT NULL DEFAULT TRUE UNIQUE CHECK (singleton),
+    version TEXT NOT NULL,
+    tstamp TIMESTAMP WITHOUT TIME ZONE DEFAULT NOW()
+);
+
+-- +goose Down
+DROP TABLE public.db_version;

db/migrations/00017_create_eth_meta_schema.sql

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

db/migrations/00018_create_watched_addresses_table.sql

@@ -1,10 +0,0 @@
--- +goose Up
-CREATE TABLE eth_meta.watched_addresses (
-    address                 VARCHAR(66) PRIMARY KEY,
-    created_at              BIGINT NOT NULL,
-    watched_at              BIGINT NOT NULL,
-    last_filled_at          BIGINT NOT NULL DEFAULT 0
-);
-
--- +goose Down
-DROP TABLE eth_meta.watched_addresses;

db/migrations/00018_update_db_version.sql

@@ -0,0 +1,6 @@
+-- +goose Up
+INSERT INTO public.db_version (singleton, version) VALUES (true, 'v3.0.0')
+ON CONFLICT (singleton) DO UPDATE SET (version, tstamp) = ('v3.0.0', NOW());
+
+-- +goose Down
+DELETE FROM public.db_version WHERE version = 'v3.0.0';

db/post_batch_processing_migrations/00016_create_ipld_pk_constraint.sql

@@ -0,0 +1,7 @@
+-- +goose Up
+ALTER TABLE public.blocks
+ADD CONSTRAINT pk_public_blocks PRIMARY KEY (key);
+
+-- +goose Down
+ALTER TABLE public.blocks
+DROP CONSTRAINT pk_public_blocks;

db/post_batch_processing_migrations/00017_update_db_version.sql

@@ -0,0 +1,8 @@
+-- +goose Up
+INSERT INTO public.db_version (singleton, version) VALUES (true, 'v3.0.0')
+ON CONFLICT (singleton) DO UPDATE SET (version, tstamp) = ('v3.0.0', NOW());
+
+-- +goose Down
+DELETE FROM public.db_version WHERE version = 'v3.0.0';
+INSERT INTO public.db_version (singleton, version) VALUES (true, 'v0.3.2')
+ON CONFLICT (singleton) DO UPDATE SET (version, tstamp) = ('v0.3.2', NOW());

db/post_batch_processing_migrations/00018_create_log_indexes.sql

@@ -0,0 +1,15 @@
+-- +goose Up
+CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
+CREATE INDEX block_number_index ON eth.header_cids USING brin (block_number);
+CREATE INDEX header_block_hash_index ON eth.header_cids USING btree (block_hash);
+CREATE INDEX tx_header_id_index ON eth.transaction_cids USING btree (header_id);
+CREATE INDEX tx_tx_hash_index ON eth.transaction_cids USING btree (tx_hash);
+CREATE INDEX log_cids_index ON eth.log_cids USING btree (rct_id, index);
+
+-- +goose Down
+DROP INDEX eth.log_cids_index;
+DROP INDEX eth.tx_tx_hash_index;
+DROP INDEX eth.tx_header_id_index;
+DROP INDEX eth.header_block_hash_index;
+DROP INDEX eth.block_number_index;
+DROP INDEX eth.log_mh_index;

db/post_batch_processing_migrations/00019_create_log_mhk_fk.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+ALTER TABLE eth.log_cids
+ADD CONSTRAINT fk_log_leaf_mh_key
+    FOREIGN KEY (leaf_mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+-- +goose Down
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT fk_log_leaf_mh_key;

db/post_batch_processing_migrations/00020_disable_log_indexes_and_drop_mhk_fk.sql

@@ -0,0 +1,53 @@
+-- +goose Up
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.log_cids'
+);
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.transaction_cids'
+);
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.header_cids'
+);
+
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT fk_log_leaf_mh_key;
+
+-- +goose Down
+ALTER TABLE eth.log_cids
+ADD CONSTRAINT fk_log_leaf_mh_key
+    FOREIGN KEY (leaf_mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.header_cids'
+);
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.transaction_cids'
+);
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.log_cids'
+);

db/post_batch_processing_migrations/00021_reenable_and_drop_log_indexes.sql

@@ -0,0 +1,53 @@
+-- +goose Up
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.header_cids'
+);
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.transaction_cids'
+);
+UPDATE pg_index
+SET indisready=true
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.log_cids'
+);
+
+DROP INDEX eth.tx_header_id_index;
+DROP INDEX eth.block_number_index;
+DROP INDEX eth.log_mh_index;
+
+-- +goose Down
+CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
+CREATE INDEX block_number_index ON eth.header_cids USING brin (block_number);
+CREATE INDEX tx_header_id_index ON eth.transaction_cids USING btree (header_id);
+
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.log_cids'
+);
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.transaction_cids'
+);
+UPDATE pg_index
+SET indisready=false
+WHERE indrelid = (
+    SELECT oid
+    FROM pg_class
+    WHERE relname='eth.header_cids'
+);

db/post_batch_processing_migrations/00022_create_pk_constraints.sql

@@ -0,0 +1,61 @@
+-- +goose Up
+ALTER TABLE public.nodes
+ADD CONSTRAINT pk_public_nodes PRIMARY KEY (node_id);
+
+ALTER TABLE eth.header_cids
+ADD CONSTRAINT pk_eth_header_cids PRIMARY KEY (block_hash);
+
+ALTER TABLE eth.uncle_cids
+ADD CONSTRAINT pk_eth_uncle_cids PRIMARY KEY (block_hash);
+
+ALTER TABLE eth.transaction_cids
+ADD CONSTRAINT pk_eth_transaction_cids PRIMARY KEY (tx_hash);
+
+ALTER TABLE eth.receipt_cids
+ADD CONSTRAINT pk_eth_receipt_cids PRIMARY KEY (tx_id);
+
+ALTER TABLE eth.access_list_elements
+ADD CONSTRAINT pk_eth_access_list_elements PRIMARY KEY (tx_id, index);
+
+ALTER TABLE eth.log_cids
+ADD CONSTRAINT pk_eth_log_cids PRIMARY KEY (rct_id, index);
+
+ALTER TABLE eth.state_cids
+ADD CONSTRAINT pk_eth_state_cids PRIMARY KEY (header_id, state_path);
+
+ALTER TABLE eth.storage_cids
+ADD CONSTRAINT pk_eth_storage_cids PRIMARY KEY (header_id, state_path, storage_path);
+
+ALTER TABLE eth.state_accounts
+ADD CONSTRAINT pk_eth_state_accounts PRIMARY KEY (header_id, state_path);
+
+-- +goose Down
+ALTER TABLE public.nodes
+DROP CONSTRAINT pk_public_nodes;
+
+ALTER TABLE eth.header_cids
+DROP CONSTRAINT pk_eth_header_cids;
+
+ALTER TABLE eth.uncle_cids
+DROP CONSTRAINT pk_eth_uncle_cids;
+
+ALTER TABLE eth.transaction_cids
+DROP CONSTRAINT pk_eth_transaction_cids;
+
+ALTER TABLE eth.receipt_cids
+DROP CONSTRAINT pk_eth_receipt_cids;
+
+ALTER TABLE eth.access_list_elements
+DROP CONSTRAINT pk_eth_access_list_elements;
+
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT pk_eth_log_cids;
+
+ALTER TABLE eth.state_cids
+DROP CONSTRAINT pk_eth_state_cids;
+
+ALTER TABLE eth.storage_cids
+DROP CONSTRAINT pk_eth_storage_cids;
+
+ALTER TABLE eth.state_accounts
+DROP CONSTRAINT pk_eth_state_accounts;

db/post_batch_processing_migrations/00023_make_tables_logged.sql

@@ -0,0 +1,25 @@
+-- +goose Up
+ALTER TABLE public.blocks SET LOGGED;
+ALTER TABLE public.nodes SET LOGGED;
+ALTER TABLE eth.header_cids SET LOGGED;
+ALTER TABLE eth.uncle_cids SET LOGGED;
+ALTER TABLE eth.transaction_cids SET LOGGED;
+ALTER TABLE eth.receipt_cids SET LOGGED;
+ALTER TABLE eth.state_cids SET LOGGED;
+ALTER TABLE eth.storage_cids SET LOGGED;
+ALTER TABLE eth.state_accounts SET LOGGED;
+ALTER TABLE eth.access_list_elements SET LOGGED;
+ALTER TABLE eth.log_cids SET LOGGED;
+
+-- +goose Down
+ALTER TABLE public.blocks SET UNLOGGED;
+ALTER TABLE public.nodes SET UNLOGGED;
+ALTER TABLE eth.header_cids SET UNLOGGED;
+ALTER TABLE eth.uncle_cids SET UNLOGGED;
+ALTER TABLE eth.transaction_cids SET UNLOGGED;
+ALTER TABLE eth.receipt_cids SET UNLOGGED;
+ALTER TABLE eth.state_cids SET UNLOGGED;
+ALTER TABLE eth.storage_cids SET UNLOGGED;
+ALTER TABLE eth.state_accounts SET UNLOGGED;
+ALTER TABLE eth.access_list_elements SET UNLOGGED;
+ALTER TABLE eth.log_cids SET UNLOGGED;

db/post_batch_processing_migrations/00024_create_fk_relations.sql

@@ -0,0 +1,129 @@
+-- +goose Up
+ALTER TABLE eth.header_cids
+ADD CONSTRAINT fk_header_mh_key
+    FOREIGN KEY (mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.header_cids
+ADD CONSTRAINT fk_header_node_id
+    FOREIGN KEY (node_id) REFERENCES public.nodes (node_id)
+    ON DELETE CASCADE;
+
+ALTER TABLE eth.uncle_cids
+ADD CONSTRAINT fk_uncle_mh_key
+    FOREIGN KEY (mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.uncle_cids
+ADD CONSTRAINT fk_uncle_header_id
+    FOREIGN KEY (header_id) REFERENCES eth.header_cids (block_hash)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.transaction_cids
+ADD CONSTRAINT fk_tx_mh_key
+    FOREIGN KEY (mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.transaction_cids
+ADD CONSTRAINT fk_tx_header_id
+    FOREIGN KEY (header_id) REFERENCES eth.header_cids (block_hash)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.receipt_cids
+ADD CONSTRAINT fk_rct_leaf_mh_key
+    FOREIGN KEY (leaf_mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.receipt_cids
+ADD CONSTRAINT fk_rct_tx_id
+    FOREIGN KEY (tx_id) REFERENCES eth.transaction_cids (tx_hash)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.state_cids
+ADD CONSTRAINT fk_state_mh_key
+    FOREIGN KEY (mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.state_cids
+ADD CONSTRAINT fk_state_header_id
+    FOREIGN KEY (header_id) REFERENCES eth.header_cids (block_hash)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.storage_cids
+ADD CONSTRAINT fk_storage_mh_key
+    FOREIGN KEY (mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.storage_cids
+ADD CONSTRAINT fk_storage_header_id_state_path
+    FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids (header_id, state_path)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.state_accounts
+ADD CONSTRAINT fk_account_header_id_state_path
+    FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids (header_id, state_path)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.access_list_elements
+ADD CONSTRAINT fk_access_list_tx_id
+    FOREIGN KEY (tx_id) REFERENCES eth.transaction_cids (tx_hash)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.log_cids
+ADD CONSTRAINT fk_log_leaf_mh_key
+    FOREIGN KEY (leaf_mh_key) REFERENCES public.blocks (key)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+ALTER TABLE eth.log_cids
+ADD CONSTRAINT fk_log_rct_id
+    FOREIGN KEY (rct_id) REFERENCES eth.receipt_cids (tx_id)
+    ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+-- +goose Down
+ALTER TABLE eth.header_cids
+DROP CONSTRAINT fk_header_mh_key;
+
+ALTER TABLE eth.header_cids
+DROP CONSTRAINT fk_header_node_id;
+
+ALTER TABLE eth.uncle_cids
+DROP CONSTRAINT fk_uncle_mh_key;
+
+ALTER TABLE eth.uncle_cids
+DROP CONSTRAINT fk_uncle_header_id;
+
+ALTER TABLE eth.transaction_cids
+DROP CONSTRAINT fk_tx_mh_key;
+
+ALTER TABLE eth.transaction_cids
+DROP CONSTRAINT fk_tx_header_id;
+
+ALTER TABLE eth.receipt_cids
+DROP CONSTRAINT fk_rct_leaf_mh_key;
+
+ALTER TABLE eth.receipt_cids
+DROP CONSTRAINT fk_rct_tx_id;
+
+ALTER TABLE eth.state_cids
+DROP CONSTRAINT fk_state_mh_key;
+
+ALTER TABLE eth.state_cids
+DROP CONSTRAINT fk_state_header_id;
+
+ALTER TABLE eth.storage_cids
+DROP CONSTRAINT fk_storage_mh_key;
+
+ALTER TABLE eth.storage_cids
+DROP CONSTRAINT fk_storage_header_id_state_path;
+
+ALTER TABLE eth.state_accounts
+DROP CONSTRAINT fk_account_header_id_state_path;
+
+ALTER TABLE eth.access_list_elements
+DROP CONSTRAINT fk_access_list_tx_id;
+
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT fk_log_leaf_mh_key;
+
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT fk_log_rct_id;

db/post_batch_processing_migrations/00025_create_postgraphile_comments.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+COMMENT ON TABLE public.nodes IS E'@name NodeInfo';
+COMMENT ON TABLE eth.transaction_cids IS E'@name EthTransactionCids';
+COMMENT ON TABLE eth.header_cids IS E'@name EthHeaderCids';
+COMMENT ON COLUMN public.nodes.node_id IS E'@name ChainNodeID';
+COMMENT ON COLUMN eth.header_cids.node_id IS E'@name EthNodeID';
+
+-- +goose Down
+
+COMMENT ON TABLE public.nodes IS NULL;
+COMMENT ON TABLE eth.transaction_cids IS NULL;
+COMMENT ON TABLE eth.header_cids IS NULL;
+COMMENT ON COLUMN public.nodes.node_id IS NULL;
+COMMENT ON COLUMN eth.header_cids.node_id IS NULL;

db/post_batch_processing_migrations/00026_create_cid_indexes.sql

@@ -0,0 +1,111 @@
+-- +goose Up
+-- header indexes
+CREATE INDEX block_number_index ON eth.header_cids USING brin (block_number);
+CREATE INDEX header_cid_index ON eth.header_cids USING btree (cid);
+CREATE INDEX header_mh_index ON eth.header_cids USING btree (mh_key);
+CREATE INDEX state_root_index ON eth.header_cids USING btree (state_root);
+CREATE INDEX timestamp_index ON eth.header_cids USING brin (timestamp);
+
+-- uncle indexes
+CREATE INDEX uncle_header_id_index ON eth.uncle_cids USING btree (header_id);
+
+-- transaction indexes
+CREATE INDEX tx_header_id_index ON eth.transaction_cids USING btree (header_id);
+CREATE INDEX tx_cid_index ON eth.transaction_cids USING btree (cid);
+CREATE INDEX tx_mh_index ON eth.transaction_cids USING btree (mh_key);
+CREATE INDEX tx_dst_index ON eth.transaction_cids USING btree (dst);
+CREATE INDEX tx_src_index ON eth.transaction_cids USING btree (src);
+
+-- receipt indexes
+CREATE INDEX rct_leaf_cid_index ON eth.receipt_cids USING btree (leaf_cid);
+CREATE INDEX rct_leaf_mh_index ON eth.receipt_cids USING btree (leaf_mh_key);
+CREATE INDEX rct_contract_index ON eth.receipt_cids USING btree (contract);
+CREATE INDEX rct_contract_hash_index ON eth.receipt_cids USING btree (contract_hash);
+
+-- state node indexes
+CREATE INDEX state_leaf_key_index ON eth.state_cids USING btree (state_leaf_key);
+CREATE INDEX state_cid_index ON eth.state_cids USING btree (cid);
+CREATE INDEX state_mh_index ON eth.state_cids USING btree (mh_key);
+CREATE INDEX state_path_index ON eth.state_cids USING btree (state_path);
+CREATE INDEX state_node_type_index ON eth.state_cids USING btree (node_type);
+
+-- storage node indexes
+CREATE INDEX storage_state_path_index ON eth.storage_cids USING btree (state_path);
+CREATE INDEX storage_leaf_key_index ON eth.storage_cids USING btree (storage_leaf_key);
+CREATE INDEX storage_cid_index ON eth.storage_cids USING btree (cid);
+CREATE INDEX storage_mh_index ON eth.storage_cids USING btree (mh_key);
+CREATE INDEX storage_path_index ON eth.storage_cids USING btree (storage_path);
+CREATE INDEX storage_node_type_index ON eth.storage_cids USING btree (node_type);
+
+-- state accounts indexes
+CREATE INDEX account_state_path_index ON eth.state_accounts USING btree (state_path);
+CREATE INDEX storage_root_index ON eth.state_accounts USING btree (storage_root);
+
+-- access list indexes
+CREATE INDEX access_list_element_address_index ON eth.access_list_elements USING btree (address);
+CREATE INDEX access_list_storage_keys_index ON eth.access_list_elements USING gin (storage_keys);
+
+-- log indexes
+CREATE INDEX log_cid_index ON  eth.log_cids USING btree (leaf_cid);
+CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
+CREATE INDEX log_address_index ON eth.log_cids USING btree (address);
+CREATE INDEX log_topic0_index ON eth.log_cids USING btree (topic0);
+CREATE INDEX log_topic1_index ON eth.log_cids USING btree (topic1);
+CREATE INDEX log_topic2_index ON eth.log_cids USING btree (topic2);
+CREATE INDEX log_topic3_index ON eth.log_cids USING btree (topic3);
+
+-- +goose Down
+-- log indexes
+DROP INDEX eth.log_topic3_index;
+DROP INDEX eth.log_topic2_index;
+DROP INDEX eth.log_topic1_index;
+DROP INDEX eth.log_topic0_index;
+DROP INDEX eth.log_address_index;
+DROP INDEX eth.log_mh_index;
+DROP INDEX eth.log_cid_index;
+
+-- access list indexes
+DROP INDEX eth.access_list_storage_keys_index;
+DROP INDEX eth.access_list_element_address_index;
+
+-- state account indexes
+DROP INDEX eth.storage_root_index;
+DROP index eth.account_state_path_index;
+
+-- storage node indexes
+DROP INDEX eth.storage_node_type_index;
+DROP INDEX eth.storage_path_index;
+DROP INDEX eth.storage_mh_index;
+DROP INDEX eth.storage_cid_index;
+DROP INDEX eth.storage_leaf_key_index;
+DROP INDEX eth.storage_state_path_index;
+
+-- state node indexes
+DROP INDEX eth.state_node_type_index;
+DROP INDEX eth.state_path_index;
+DROP INDEX eth.state_mh_index;
+DROP INDEX eth.state_cid_index;
+DROP INDEX eth.state_leaf_key_index;
+
+-- receipt indexes
+DROP INDEX eth.rct_contract_hash_index;
+DROP INDEX eth.rct_contract_index;
+DROP INDEX eth.rct_leaf_mh_index;
+DROP INDEX eth.rct_leaf_cid_index;
+
+-- transaction indexes
+DROP INDEX eth.tx_src_index;
+DROP INDEX eth.tx_dst_index;
+DROP INDEX eth.tx_mh_index;
+DROP INDEX eth.tx_cid_index;
+DROP INDEX eth.tx_header_id_index;
+
+-- uncle indexes
+DROP INDEX eth.uncle_header_id_index;
+
+-- header indexes
+DROP INDEX eth.timestamp_index;
+DROP INDEX eth.state_root_index;
+DROP INDEX eth.header_mh_index;
+DROP INDEX eth.header_cid_index;
+DROP INDEX eth.block_number_index;

db/post_batch_processing_migrations/00027_create_stored_functions.sql

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

db/post_batch_processing_migrations/00028_create_postgraphile_triggers.sql

@@ -0,0 +1,116 @@
+-- +goose Up
+-- Name: graphql_subscription(); Type: FUNCTION; Schema: eth; Owner: -
+
+-- +goose StatementBegin
+CREATE FUNCTION eth.graphql_subscription() RETURNS TRIGGER AS $$
+DECLARE
+obj jsonb;
+BEGIN
+    IF (TG_TABLE_NAME = 'state_cids') OR (TG_TABLE_NAME = 'state_accounts') THEN
+             obj := json_build_array(
+                        TG_TABLE_NAME,
+                        NEW.header_id,
+                        NEW.state_path
+                    );
+    ELSIF (TG_TABLE_NAME = 'storage_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.header_id,
+                    NEW.state_path,
+                    NEW.storage_path
+                );
+    ELSIF (TG_TABLE_NAME = 'log_cids')w THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.rct_id,
+                    NEW.index
+                );
+    ELSIF (TG_TABLE_NAME = 'receipt_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_id
+                );
+    ELSIF (TG_TABLE_NAME = 'transaction_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_hash
+                );
+    ELSIF (TG_TABLE_NAME = 'access_list_elements') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.tx_id,
+                    NEW.index
+                );
+    ELSIF (TG_TABLE_NAME = 'uncle_cids') OR (TG_TABLE_NAME = 'header_cids') THEN
+         obj := json_build_array(
+                    TG_TABLE_NAME,
+                    NEW.block_hash
+                );
+END IF;
+
+    perform pg_notify('postgraphile:' || TG_RELNAME , json_build_object(
+            '__node__', obj
+            )::text
+        );
+RETURN NEW;
+END;
+$$ language plpgsql;
+-- +goose StatementEnd
+
+CREATE TRIGGER trg_eth_header_cids
+    AFTER INSERT ON eth.header_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_uncle_cids
+    AFTER INSERT ON eth.uncle_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_transaction_cids
+    AFTER INSERT ON eth.transaction_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_receipt_cids
+    AFTER INSERT ON eth.receipt_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_state_cids
+    AFTER INSERT ON eth.state_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_log_cids
+    AFTER INSERT ON eth.log_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_storage_cids
+    AFTER INSERT ON eth.storage_cids
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_state_accounts
+    AFTER INSERT ON eth.state_accounts
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+CREATE TRIGGER trg_eth_access_list_elements
+    AFTER INSERT ON eth.access_list_elements
+    FOR EACH ROW
+    EXECUTE PROCEDURE eth.graphql_subscription();
+
+-- +goose Down
+DROP TRIGGER trg_eth_uncle_cids ON eth.uncle_cids;
+DROP TRIGGER trg_eth_transaction_cids ON eth.transaction_cids;
+DROP TRIGGER trg_eth_storage_cids ON eth.storage_cids;
+DROP TRIGGER trg_eth_state_cids ON eth.state_cids;
+DROP TRIGGER trg_eth_state_accounts ON eth.state_accounts;
+DROP TRIGGER trg_eth_receipt_cids ON eth.receipt_cids;
+DROP TRIGGER trg_eth_header_cids ON eth.header_cids;
+DROP TRIGGER trg_eth_log_cids ON eth.log_cids;
+DROP TRIGGER trg_eth_access_list_elements ON eth.access_list_elements;
+
+DROP FUNCTION eth.graphql_subscription();

db/pre_batch_processing_migrations/00001_create_ipfs_blocks_table.sql

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

db/pre_batch_processing_migrations/00002_create_nodes_table.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+CREATE TABLE nodes (
+    genesis_block VARCHAR(66),
+    network_id    VARCHAR,
+    node_id       VARCHAR(128) NOT NULL,
+    client_name   VARCHAR,
+    chain_id      INTEGER DEFAULT 1
+);
+
+-- +goose Down
+DROP TABLE nodes;

db/pre_batch_processing_migrations/00003_create_eth_schema.sql

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

db/pre_batch_processing_migrations/00004_create_eth_header_cids_table.sql

@@ -0,0 +1,22 @@
+-- +goose Up
+CREATE TABLE eth.header_cids (
+     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               VARCHAR(128) NOT NULL,
+     reward                NUMERIC NOT NULL,
+     state_root            VARCHAR(66) NOT NULL,
+     tx_root               VARCHAR(66) NOT NULL,
+     receipt_root          VARCHAR(66) NOT NULL,
+     uncle_root            VARCHAR(66) NOT NULL,
+     bloom                 BYTEA NOT NULL,
+     timestamp             BIGINT NOT NULL,
+     mh_key                TEXT NOT NULL,
+     times_validated       INTEGER NOT NULL DEFAULT 1,
+     coinbase              VARCHAR(66) NOT NULL
+);
+
+-- +goose Down
+DROP TABLE eth.header_cids;

db/pre_batch_processing_migrations/00005_create_eth_uncle_cids_table.sql

@@ -0,0 +1,12 @@
+-- +goose Up
+CREATE TABLE eth.uncle_cids (
+    block_hash            VARCHAR(66) NOT NULL,
+    header_id             VARCHAR(66) NOT NULL,
+    parent_hash           VARCHAR(66) NOT NULL,
+    cid                   TEXT NOT NULL,
+    reward                NUMERIC NOT NULL,
+    mh_key                TEXT NOT NULL
+);
+
+-- +goose Down
+DROP TABLE eth.uncle_cids;

db/pre_batch_processing_migrations/00006_create_eth_transaction_cids_table.sql

@@ -0,0 +1,16 @@
+-- +goose Up
+CREATE TABLE eth.transaction_cids (
+    header_id             VARCHAR(66) NOT NULL,
+    tx_hash               VARCHAR(66) NOT NULL,
+    cid                   TEXT NOT NULL,
+    dst                   VARCHAR(66) NOT NULL,
+    src                   VARCHAR(66) NOT NULL,
+    index                 INTEGER NOT NULL,
+    mh_key                TEXT NOT NULL,
+    tx_data               BYTEA,
+    tx_type               INTEGER,
+    value                 NUMERIC
+);
+
+-- +goose Down
+DROP TABLE eth.transaction_cids;

db/pre_batch_processing_migrations/00007_create_eth_receipt_cids_table.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+CREATE TABLE eth.receipt_cids (
+    tx_id                 VARCHAR(66) NOT NULL,
+    leaf_cid              TEXT NOT NULL,
+    contract              VARCHAR(66),
+    contract_hash         VARCHAR(66),
+    leaf_mh_key           TEXT NOT NULL,
+    post_state            VARCHAR(66),
+    post_status           INTEGER,
+    log_root              VARCHAR(66)
+);
+
+-- +goose Down
+DROP TABLE eth.receipt_cids;

db/pre_batch_processing_migrations/00008_create_eth_state_cids_table.sql

@@ -0,0 +1,13 @@
+-- +goose Up
+CREATE TABLE eth.state_cids (
+    header_id             VARCHAR(66) NOT NULL,
+    state_leaf_key        VARCHAR(66),
+    cid                   TEXT NOT NULL,
+    state_path            BYTEA NOT NULL,
+    node_type             INTEGER NOT NULL,
+    diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+    mh_key                TEXT NOT NULL
+);
+
+-- +goose Down
+DROP TABLE eth.state_cids;

db/pre_batch_processing_migrations/00009_create_eth_storage_cids_table.sql

@@ -0,0 +1,14 @@
+-- +goose Up
+CREATE TABLE eth.storage_cids (
+    header_id             VARCHAR(66) NOT NULL,
+    state_path            BYTEA NOT NULL,
+    storage_leaf_key      VARCHAR(66),
+    cid                   TEXT NOT NULL,
+    storage_path          BYTEA NOT NULL,
+    node_type             INTEGER NOT NULL,
+    diff                  BOOLEAN NOT NULL DEFAULT FALSE,
+    mh_key                TEXT NOT NULL
+);
+
+-- +goose Down
+DROP TABLE eth.storage_cids;

db/pre_batch_processing_migrations/00010_create_eth_state_accounts_table.sql

@@ -0,0 +1,12 @@
+-- +goose Up
+CREATE TABLE eth.state_accounts (
+    header_id             VARCHAR(66) NOT NULL,
+    state_path            BYTEA NOT NULL,
+    balance               NUMERIC NOT NULL,
+    nonce                 BIGINT NOT NULL,
+    code_hash             BYTEA NOT NULL,
+    storage_root          VARCHAR(66) NOT NULL
+);
+
+-- +goose Down
+DROP TABLE eth.state_accounts;

db/pre_batch_processing_migrations/00011_create_eth_access_list_elements_table.sql

@@ -0,0 +1,10 @@
+-- +goose Up
+CREATE TABLE eth.access_list_elements (
+    tx_id                 VARCHAR(66) NOT NULL,
+    index                 INTEGER NOT NULL,
+    address               VARCHAR(66),
+    storage_keys          VARCHAR(66)[]
+);
+
+-- +goose Down
+DROP TABLE eth.access_list_elements;

db/pre_batch_processing_migrations/00012_create_eth_log_cids_table.sql

@@ -0,0 +1,17 @@
+-- +goose Up
+CREATE TABLE eth.log_cids (
+    leaf_cid            TEXT NOT NULL,
+    leaf_mh_key         TEXT NOT NULL,
+    rct_id              VARCHAR(66) NOT NULL,
+    address             VARCHAR(66) NOT NULL,
+    index               INTEGER NOT NULL,
+    topic0              VARCHAR(66),
+    topic1              VARCHAR(66),
+    topic2              VARCHAR(66),
+    topic3              VARCHAR(66),
+    log_data            BYTEA
+);
+
+-- +goose Down
+-- log indexes
+DROP TABLE eth.log_cids;

db/pre_batch_processing_migrations/00013_make_tables_unlogged.sql

@@ -0,0 +1,25 @@
+-- +goose Up
+ALTER TABLE public.blocks SET UNLOGGED;
+ALTER TABLE public.nodes SET UNLOGGED;
+ALTER TABLE eth.header_cids SET UNLOGGED;
+ALTER TABLE eth.uncle_cids SET UNLOGGED;
+ALTER TABLE eth.transaction_cids SET UNLOGGED;
+ALTER TABLE eth.receipt_cids SET UNLOGGED;
+ALTER TABLE eth.state_cids SET UNLOGGED;
+ALTER TABLE eth.storage_cids SET UNLOGGED;
+ALTER TABLE eth.state_accounts SET UNLOGGED;
+ALTER TABLE eth.access_list_elements SET UNLOGGED;
+ALTER TABLE eth.log_cids SET UNLOGGED;
+
+-- +goose Down
+ALTER TABLE public.blocks SET LOGGED;
+ALTER TABLE public.nodes SET LOGGED;
+ALTER TABLE eth.header_cids SET LOGGED;
+ALTER TABLE eth.uncle_cids SET LOGGED;
+ALTER TABLE eth.transaction_cids SET LOGGED;
+ALTER TABLE eth.receipt_cids SET LOGGED;
+ALTER TABLE eth.state_cids SET LOGGED;
+ALTER TABLE eth.storage_cids SET LOGGED;
+ALTER TABLE eth.state_accounts SET LOGGED;
+ALTER TABLE eth.access_list_elements SET LOGGED;
+ALTER TABLE eth.log_cids SET LOGGED;

db/pre_batch_processing_migrations/00014_create_eth_db_version_table.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+CREATE TABLE IF NOT EXISTS public.db_version (
+    singleton BOOLEAN NOT NULL DEFAULT TRUE UNIQUE CHECK (singleton),
+    version TEXT NOT NULL,
+    tstamp TIMESTAMP WITHOUT TIME ZONE DEFAULT NOW()
+);
+
+-- +goose Down
+DROP TABLE public.db_version;

db/pre_batch_processing_migrations/00015_update_db_version.sql

@@ -0,0 +1,6 @@
+-- +goose Up
+INSERT INTO public.db_version (singleton, version) VALUES (true, 'v0.3.2')
+ON CONFLICT (singleton) DO UPDATE SET (version, tstamp) = ('v0.3.2', NOW());
+
+-- +goose Down
+DELETE FROM public.db_version WHERE version = 'v0.3.2';

vulcanize_db.uml

@@ -1,150 +1,148 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Diagram>
   <ID>DATABASE</ID>
-  <OriginalElement>763cb2dc-728a-4fbd-a163-94dd564429aa</OriginalElement>
+  <OriginalElement>407978cb-39e6-453c-b9b7-c4183a4e26ef</OriginalElement>
   <nodes>
-    <node x="508.5625" y="998.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.receipt_cids</node>
-    <node x="227.705078125" y="1282.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.log_cids</node>
-    <node x="256.5" y="1031.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_accounts</node>
-    <node x="156.705078125" y="712.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_cids</node>
-    <node x="193.330078125" y="44.5">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks</node>
-    <node x="10.5" y="1009.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.storage_cids</node>
-    <node x="547.375" y="723.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.uncle_cids</node>
-    <node x="1146.375" y="0.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.goose_db_version</node>
-    <node x="499.455078125" y="0.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.nodes</node>
-    <node x="824.375" y="1042.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.access_list_element</node>
-    <node x="614.5" y="228.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids</node>
-    <node x="761.375" y="690.0">763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.transaction_cids</node>
+    <node x="553.96484375" y="196.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids</node>
+    <node x="93.5" y="944.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids</node>
+    <node x="884.80078125" y="966.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_accounts</node>
+    <node x="849.705078125" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.nodes</node>
+    <node x="127.30078125" y="680.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.uncle_cids</node>
+    <node x="102.67578125" y="33.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks</node>
+    <node x="341.30078125" y="636.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids</node>
+    <node x="357.365234375" y="988.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.access_list_elements</node>
+    <node x="832.365234375" y="669.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids</node>
+    <node x="1433.705078125" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.db_version</node>
+    <node x="58.0" y="1206.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.log_cids</node>
+    <node x="1200.705078125" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.goose_db_version</node>
+    <node x="592.365234375" y="944.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.storage_cids</node>
   </nodes>
   <notes />
   <edges>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.nodes" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.nodes" relationship="REFERENCES">
-      <point x="-76.5" y="83.0" />
-      <point x="575.955078125" y="151.63819095477388" />
-      <point x="532.3193997330402" y="151.63819095477388" />
-      <point x="532.3193997330402" y="83.0" />
-      <point x="-153.0" y="0.0" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.access_list_elements" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids" relationship="REFERENCES">
+      <point x="0.0" y="-61.0" />
+      <point x="464.865234375" y="922.0" />
+      <point x="511.30078125" y="922.0" />
+      <point x="0.0" y="127.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.uncle_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids" relationship="REFERENCES">
-      <point x="48.5" y="-94.0" />
-      <point x="692.875" y="668.0" />
-      <point x="756.0" y="668.0" />
-      <point x="0.0" y="204.0" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids" relationship="REFERENCES">
+      <point x="-52.25" y="-94.0" />
+      <point x="884.615234375" y="614.0" />
+      <point x="700.96484375" y="614.0" />
+      <point x="0.0" y="193.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.storage_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-56.5" y="-105.0" />
-      <point x="67.0" y="971.0" />
-      <point x="111.205078125" y="971.0" />
-      <point x="111.205078125" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="-51.75" y="-105.0" />
+      <point x="145.25" y="922.0" />
+      <point x="59.365234375" y="922.0" />
+      <point x="59.365234375" y="175.0" />
+      <point x="52.75" y="175.0" />
+      <point x="52.75" y="165.0" />
+      <point x="127.92578125" y="165.0" />
+      <point x="-25.25" y="39.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_accounts" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_cids" relationship="REFERENCES">
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_accounts" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids" relationship="REFERENCES">
       <point x="0.0" y="-83.0" />
-      <point x="355.0" y="971.0" />
-      <point x="261.205078125" y="971.0" />
-      <point x="0.0" y="105.0" />
+      <point x="983.30078125" y="922.0" />
+      <point x="936.865234375" y="922.0" />
+      <point x="0.0" y="94.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.uncle_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-48.5" y="-94.0" />
-      <point x="595.875" y="658.0" />
-      <point x="589.25" y="658.0" />
-      <point x="589.25" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.log_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="-41.0" y="-127.0" />
+      <point x="99.0" y="1180.0" />
+      <point x="47.5" y="1180.0" />
+      <point x="47.5" y="175.0" />
+      <point x="52.75" y="175.0" />
+      <point x="52.75" y="165.0" />
+      <point x="127.92578125" y="165.0" />
+      <point x="-25.25" y="39.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.storage_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_cids" relationship="REFERENCES">
-      <point x="56.5" y="-105.0" />
-      <point x="180.0" y="971.0" />
-      <point x="261.205078125" y="971.0" />
-      <point x="0.0" y="105.0" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.log_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.receipt_cids" relationship="REFERENCES">
-      <point x="41.0" y="-138.0" />
-      <point x="350.705078125" y="1256.0" />
-      <point x="612.0625" y="1256.0" />
-      <point x="0.0" y="116.0" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-70.75" y="-204.0" />
-      <point x="685.25" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids" relationship="REFERENCES">
-      <point x="52.25" y="-105.0" />
-      <point x="313.455078125" y="668.0" />
-      <point x="756.0" y="668.0" />
-      <point x="0.0" y="204.0" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.receipt_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.transaction_cids" relationship="REFERENCES">
-      <point x="51.75" y="-116.0" />
-      <point x="663.8125" y="971.0" />
-      <point x="931.375" y="971.0" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids" relationship="REFERENCES">
+      <point x="51.75" y="-105.0" />
+      <point x="248.75" y="922.0" />
+      <point x="511.30078125" y="922.0" />
       <point x="0.0" y="127.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.transaction_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.storage_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="-56.5" y="-105.0" />
+      <point x="648.865234375" y="912.0" />
+      <point x="116.80078125" y="912.0" />
+      <point x="116.80078125" y="175.0" />
+      <point x="437.205078125" y="175.0" />
+      <point x="437.205078125" y="165.0" />
+      <point x="178.42578125" y="165.0" />
+      <point x="25.25" y="39.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids" relationship="REFERENCES">
       <point x="85.0" y="-127.0" />
-      <point x="1016.375" y="668.0" />
-      <point x="923.3125" y="668.0" />
-      <point x="923.3125" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
+      <point x="596.30078125" y="614.0" />
+      <point x="700.96484375" y="614.0" />
+      <point x="0.0" y="193.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.receipt_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-51.75" y="-116.0" />
-      <point x="560.3125" y="971.0" />
-      <point x="497.625" y="971.0" />
-      <point x="497.625" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="52.25" y="-94.0" />
+      <point x="989.115234375" y="614.0" />
+      <point x="970.279296875" y="614.0" />
+      <point x="970.279296875" y="175.0" />
+      <point x="437.205078125" y="175.0" />
+      <point x="437.205078125" y="165.0" />
+      <point x="178.42578125" y="165.0" />
+      <point x="25.25" y="39.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.log_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-41.0" y="-138.0" />
-      <point x="268.705078125" y="1256.0" />
-      <point x="0.0" y="1256.0" />
-      <point x="0.0" y="197.0" />
-      <point x="218.580078125" y="197.0" />
-      <point x="-25.25" y="38.5" />
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.storage_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids" relationship="REFERENCES">
+      <point x="56.5" y="-105.0" />
+      <point x="761.865234375" y="922.0" />
+      <point x="936.865234375" y="922.0" />
+      <point x="0.0" y="94.0" />
     </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.transaction_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids" relationship="REFERENCES">
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.log_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids" relationship="REFERENCES">
+      <point x="41.0" y="-127.0" />
+      <point x="181.0" y="1180.0" />
+      <point x="197.0" y="1180.0" />
+      <point x="0.0" y="105.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.nodes" relationship="REFERENCES">
+      <point x="73.5" y="-193.0" />
+      <point x="774.46484375" y="165.0" />
+      <point x="1002.705078125" y="165.0" />
+      <point x="0.0" y="72.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.uncle_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids" relationship="REFERENCES">
+      <point x="48.5" y="-83.0" />
+      <point x="272.80078125" y="614.0" />
+      <point x="700.96484375" y="614.0" />
+      <point x="0.0" y="193.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="-73.5" y="-193.0" />
+      <point x="627.46484375" y="175.0" />
+      <point x="437.205078125" y="175.0" />
+      <point x="437.205078125" y="165.0" />
+      <point x="178.42578125" y="165.0" />
+      <point x="25.25" y="39.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.uncle_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
+      <point x="-48.5" y="-83.0" />
+      <point x="175.80078125" y="614.0" />
+      <point x="214.30078125" y="614.0" />
+      <point x="214.30078125" y="175.0" />
+      <point x="437.205078125" y="175.0" />
+      <point x="437.205078125" y="165.0" />
+      <point x="178.42578125" y="165.0" />
+      <point x="25.25" y="39.0" />
+    </edge>
+    <edge source="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
       <point x="-85.0" y="-127.0" />
-      <point x="846.375" y="668.0" />
-      <point x="756.0" y="668.0" />
-      <point x="0.0" y="204.0" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.state_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.blocks" relationship="REFERENCES">
-      <point x="-52.25" y="-105.0" />
-      <point x="208.955078125" y="668.0" />
-      <point x="256.205078125" y="668.0" />
-      <point x="256.205078125" y="207.0" />
-      <point x="502.875" y="207.0" />
-      <point x="502.875" y="197.0" />
-      <point x="269.080078125" y="197.0" />
-      <point x="25.25" y="38.5" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.access_list_element" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.transaction_cids" relationship="REFERENCES">
-      <point x="0.0" y="-72.0" />
-      <point x="0.0" y="127.0" />
-    </edge>
-    <edge source="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.eth.header_cids" target="763cb2dc-728a-4fbd-a163-94dd564429aa.TABLE:vulcanize_testing.public.nodes" relationship="REFERENCES">
-      <point x="70.75" y="-204.0" />
-      <point x="826.75" y="197.0" />
-      <point x="728.955078125" y="197.0" />
-      <point x="76.5" y="83.0" />
+      <point x="426.30078125" y="604.0" />
+      <point x="344.55078125" y="604.0" />
+      <point x="344.55078125" y="175.0" />
+      <point x="437.205078125" y="175.0" />
+      <point x="437.205078125" y="165.0" />
+      <point x="178.42578125" y="165.0" />
+      <point x="25.25" y="39.0" />
     </edge>
   </edges>
-  <settings layout="Hierarchic" zoom="0.37832699619771865" showDependencies="false" x="667.5" y="779.0" />
+  <settings layout="Hierarchic" zoom="0.40337837837837837" showDependencies="false" x="791.0" y="730.0" />
   <SelectedNodes />
   <Categories>
     <Category>Columns</Category>