Merge pull request #47 from vulcanize/release-v3.0.6

split pk application into two parts

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,12 +48,26 @@ 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
@@ -61,6 +79,11 @@ migrate: $(GOOSE) checkdbvars
 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

db/migrations/00014_create_cid_indexes.sql

@@ -1,8 +1,8 @@
 -- +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 UNIQUE 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 UNIQUE 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);
 
@@ -11,14 +11,14 @@ 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 UNIQUE 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 UNIQUE 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 UNIQUE 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 UNIQUE 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);
 

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/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_drop_non_unique_indexes.sql

@@ -0,0 +1,9 @@
+-- +goose Up
+DROP INDEX eth.log_cids_index;
+DROP INDEX eth.tx_tx_hash_index;
+DROP INDEX eth.header_block_hash_index;
+
+-- +goose Down
+CREATE INDEX header_block_hash_index ON eth.header_cids USING btree (block_hash);
+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);

db/post_batch_processing_migrations/00023_create_pk_constraints_part1.sql

@@ -0,0 +1,25 @@
+-- +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);
+
+-- +goose Down
+ALTER TABLE eth.transaction_cids
+DROP CONSTRAINT pk_eth_transaction_cids;
+
+ALTER TABLE eth.uncle_cids
+DROP CONSTRAINT pk_eth_uncle_cids;
+
+ALTER TABLE eth.header_cids
+DROP CONSTRAINT pk_eth_header_cids;
+
+ALTER TABLE public.nodes
+DROP CONSTRAINT pk_public_nodes;

db/post_batch_processing_migrations/00024_create_pk_constraints_part2.sql

@@ -1,19 +1,4 @@
 -- +goose Up
-ALTER TABLE public.blocks
-ADD CONSTRAINT pk_public_blocks PRIMARY KEY (key);
-
-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);
 
@@ -33,35 +18,20 @@ ALTER TABLE eth.state_accounts
 ADD CONSTRAINT pk_eth_state_accounts PRIMARY KEY (header_id, state_path);
 
 -- +goose Down
-ALTER TABLE public.blocks
+ALTER TABLE eth.state_accounts
-DROP CONSTRAINT pk_public_blocks;
+DROP CONSTRAINT pk_eth_state_accounts;
-
-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
+ALTER TABLE eth.state_cids
-DROP CONSTRAINT pk_eth_state_accounts;
+DROP CONSTRAINT pk_eth_state_cids;
+
+ALTER TABLE eth.log_cids
+DROP CONSTRAINT pk_eth_log_cids;
+
+ALTER TABLE eth.access_list_elements
+DROP CONSTRAINT pk_eth_access_list_elements;
+
+ALTER TABLE eth.receipt_cids
+DROP CONSTRAINT pk_eth_receipt_cids;

db/post_batch_processing_migrations/00028_create_cid_indexes.sql

@@ -1,8 +1,8 @@
 -- +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 UNIQUE 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 UNIQUE 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);
 
@@ -11,14 +11,14 @@ 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 UNIQUE 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 UNIQUE 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 UNIQUE 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 UNIQUE 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);
 
@@ -46,8 +46,8 @@ CREATE INDEX access_list_element_address_index ON eth.access_list_elements USING
 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_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);
@@ -61,8 +61,8 @@ 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;
+DROP INDEX eth.log_cid_index;
 
 -- access list indexes
 DROP INDEX eth.access_list_storage_keys_index;

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

schema.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 10.12
+-- Dumped from database version 14beta3
--- Dumped by pg_dump version 14.1
+-- Dumped by pg_dump version 14beta3
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -25,6 +25,8 @@ CREATE SCHEMA eth;
 
 SET default_tablespace = '';
 
+SET default_table_access_method = heap;
+
 --
 -- Name: header_cids; Type: TABLE; Schema: eth; Owner: -
 --
@@ -410,6 +412,18 @@ CREATE TABLE public.blocks (
 );
 
 
+--
+-- Name: db_version; Type: TABLE; Schema: public; Owner: -
+--
+
+CREATE TABLE public.db_version (
+    singleton boolean DEFAULT true NOT NULL,
+    version text NOT NULL,
+    tstamp timestamp without time zone DEFAULT now(),
+    CONSTRAINT db_version_singleton_check CHECK (singleton)
+);
+
+
 --
 -- Name: goose_db_version; Type: TABLE; Schema: public; Owner: -
 --
@@ -556,6 +570,14 @@ ALTER TABLE ONLY public.blocks
     ADD CONSTRAINT blocks_pkey PRIMARY KEY (key);
 
 
+--
+-- Name: db_version db_version_singleton_key; Type: CONSTRAINT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY public.db_version
+    ADD CONSTRAINT db_version_singleton_key UNIQUE (singleton);
+
+
 --
 -- Name: goose_db_version goose_db_version_pkey; Type: CONSTRAINT; Schema: public; Owner: -
 --
@@ -835,63 +857,63 @@ CREATE INDEX uncle_header_id_index ON eth.uncle_cids USING btree (header_id);
 -- Name: access_list_elements trg_eth_access_list_elements; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_access_list_elements AFTER INSERT ON eth.access_list_elements 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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: header_cids trg_eth_header_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_header_cids AFTER INSERT ON eth.header_cids FOR EACH ROW EXECUTE PROCEDURE eth.graphql_subscription();
+CREATE TRIGGER trg_eth_header_cids AFTER INSERT ON eth.header_cids FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: log_cids trg_eth_log_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_log_cids AFTER INSERT ON eth.log_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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: receipt_cids trg_eth_receipt_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_receipt_cids AFTER INSERT ON eth.receipt_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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: state_accounts trg_eth_state_accounts; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_state_accounts AFTER INSERT ON eth.state_accounts FOR EACH ROW EXECUTE PROCEDURE eth.graphql_subscription();
+CREATE TRIGGER trg_eth_state_accounts AFTER INSERT ON eth.state_accounts FOR EACH ROW EXECUTE FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: state_cids trg_eth_state_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_state_cids AFTER INSERT ON eth.state_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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: storage_cids trg_eth_storage_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_storage_cids AFTER INSERT ON eth.storage_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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: transaction_cids trg_eth_transaction_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_transaction_cids AFTER INSERT ON eth.transaction_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 FUNCTION eth.graphql_subscription();
 
 
 --
 -- Name: uncle_cids trg_eth_uncle_cids; Type: TRIGGER; Schema: eth; Owner: -
 --
 
-CREATE TRIGGER trg_eth_uncle_cids AFTER INSERT ON eth.uncle_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 FUNCTION eth.graphql_subscription();
 
 
 --
@@ -951,11 +973,11 @@ ALTER TABLE ONLY eth.receipt_cids
 
 
 --
--- Name: state_accounts state_accounts_header_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+-- Name: state_accounts state_accounts_header_id_state_path_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --
 
 ALTER TABLE ONLY eth.state_accounts
-    ADD CONSTRAINT state_accounts_header_id_fkey FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids(header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+    ADD CONSTRAINT state_accounts_header_id_state_path_fkey FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids(header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
 
 
 --
@@ -975,11 +997,11 @@ ALTER TABLE ONLY eth.state_cids
 
 
 --
--- Name: storage_cids storage_cids_header_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+-- Name: storage_cids storage_cids_header_id_state_path_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --
 
 ALTER TABLE ONLY eth.storage_cids
-    ADD CONSTRAINT storage_cids_header_id_fkey FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids(header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+    ADD CONSTRAINT storage_cids_header_id_state_path_fkey FOREIGN KEY (header_id, state_path) REFERENCES eth.state_cids(header_id, state_path) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
 
 
 --

vulcanize_db.uml

@@ -3,145 +3,146 @@
   <ID>DATABASE</ID>
   <OriginalElement>407978cb-39e6-453c-b9b7-c4183a4e26ef</OriginalElement>
   <nodes>
-    <node x="623.125" y="196.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids</node>
+    <node x="553.96484375" y="196.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.header_cids</node>
-    <node x="245.5" y="944.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids</node>
+    <node x="93.5" y="944.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.receipt_cids</node>
-    <node x="922.837890625" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.nodes</node>
+    <node x="884.80078125" y="966.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_accounts</node>
-    <node x="689.794921875" 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="586.353515625" y="680.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.uncle_cids</node>
+    <node x="127.30078125" y="680.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.uncle_cids</node>
-    <node x="351.294921875" y="33.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks</node>
+    <node x="102.67578125" y="33.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks</node>
-    <node x="226.353515625" y="636.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids</node>
+    <node x="341.30078125" y="636.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.transaction_cids</node>
-    <node x="10.5" y="988.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.access_list_elements</node>
+    <node x="357.365234375" y="988.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.access_list_elements</node>
-    <node x="800.353515625" y="669.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids</node>
+    <node x="832.365234375" y="669.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.state_cids</node>
-    <node x="152.435546875" y="1206.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.log_cids</node>
+    <node x="1433.705078125" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.db_version</node>
-    <node x="1273.837890625" y="0.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.goose_db_version</node>
+    <node x="58.0" y="1206.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.log_cids</node>
-    <node x="906.794921875" y="944.0">407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.eth.storage_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="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="118.0" y="922.0" />
+      <point x="464.865234375" y="922.0" />
-      <point x="396.353515625" y="922.0" />
+      <point x="511.30078125" y="922.0" />
       <point x="0.0" y="127.0" />
     </edge>
     <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="852.603515625" y="614.0" />
+      <point x="884.615234375" y="614.0" />
-      <point x="770.125" 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.receipt_cids" target="407978cb-39e6-453c-b9b7-c4183a4e26ef.TABLE:vulcanize_test.public.blocks" relationship="REFERENCES">
       <point x="-51.75" y="-105.0" />
-      <point x="297.25" y="912.0" />
+      <point x="145.25" y="922.0" />
-      <point x="129.669921875" y="912.0" />
+      <point x="59.365234375" y="922.0" />
-      <point x="129.669921875" y="175.0" />
+      <point x="59.365234375" y="175.0" />
-      <point x="108.0" y="175.0" />
+      <point x="52.75" y="175.0" />
-      <point x="108.0" y="165.0" />
+      <point x="52.75" y="165.0" />
-      <point x="376.544921875" y="165.0" />
+      <point x="127.92578125" y="165.0" />
       <point x="-25.25" y="39.0" />
     </edge>
     <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="788.294921875" y="922.0" />
+      <point x="983.30078125" y="922.0" />
-      <point x="904.853515625" y="922.0" />
+      <point x="936.865234375" y="922.0" />
       <point x="0.0" y="94.0" />
     </edge>
     <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="193.435546875" y="1180.0" />
+      <point x="99.0" y="1180.0" />
-      <point x="0.0" y="1180.0" />
+      <point x="47.5" y="1180.0" />
-      <point x="0.0" y="175.0" />
+      <point x="47.5" y="175.0" />
-      <point x="108.0" y="175.0" />
+      <point x="52.75" y="175.0" />
-      <point x="108.0" y="165.0" />
+      <point x="52.75" y="165.0" />
-      <point x="376.544921875" y="165.0" />
+      <point x="127.92578125" y="165.0" />
       <point x="-25.25" y="39.0" />
     </edge>
-    <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="1076.294921875" y="922.0" />
-      <point x="1024.794921875" y="922.0" />
-      <point x="1024.794921875" y="175.0" />
-      <point x="699.087890625" y="175.0" />
-      <point x="699.087890625" y="165.0" />
-      <point x="427.044921875" y="165.0" />
-      <point x="25.25" y="39.0" />
-    </edge>
     <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="400.75" y="922.0" />
+      <point x="248.75" y="922.0" />
-      <point x="396.353515625" y="922.0" />
+      <point x="511.30078125" y="922.0" />
       <point x="0.0" y="127.0" />
     </edge>
+    <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="481.353515625" y="614.0" />
+      <point x="596.30078125" y="614.0" />
-      <point x="770.125" 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.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="963.294921875" y="922.0" />
-      <point x="904.853515625" y="922.0" />
-      <point x="0.0" y="94.0" />
-    </edge>
     <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="957.103515625" y="614.0" />
+      <point x="989.115234375" y="614.0" />
-      <point x="953.478515625" y="614.0" />
+      <point x="970.279296875" y="614.0" />
-      <point x="953.478515625" y="175.0" />
+      <point x="970.279296875" y="175.0" />
-      <point x="699.087890625" y="175.0" />
+      <point x="437.205078125" y="175.0" />
-      <point x="699.087890625" y="165.0" />
+      <point x="437.205078125" y="165.0" />
-      <point x="427.044921875" 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.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="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="275.435546875" y="1180.0" />
+      <point x="181.0" y="1180.0" />
-      <point x="349.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="843.625" y="165.0" />
+      <point x="774.46484375" y="165.0" />
-      <point x="1075.837890625" 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="731.853515625" y="614.0" />
+      <point x="272.80078125" y="614.0" />
-      <point x="770.125" 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="696.625" y="175.0" />
+      <point x="627.46484375" y="175.0" />
-      <point x="699.087890625" y="175.0" />
+      <point x="437.205078125" y="175.0" />
-      <point x="699.087890625" y="165.0" />
+      <point x="437.205078125" y="165.0" />
-      <point x="427.044921875" 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="634.853515625" y="604.0" />
+      <point x="175.80078125" y="614.0" />
-      <point x="523.044921875" y="604.0" />
+      <point x="214.30078125" y="614.0" />
-      <point x="523.044921875" y="175.0" />
+      <point x="214.30078125" y="175.0" />
-      <point x="699.087890625" y="175.0" />
+      <point x="437.205078125" y="175.0" />
-      <point x="699.087890625" y="165.0" />
+      <point x="437.205078125" y="165.0" />
-      <point x="427.044921875" 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="311.353515625" y="614.0" />
+      <point x="426.30078125" y="604.0" />
-      <point x="386.353515625" y="614.0" />
+      <point x="344.55078125" y="604.0" />
-      <point x="386.353515625" y="175.0" />
+      <point x="344.55078125" y="175.0" />
-      <point x="699.087890625" y="175.0" />
+      <point x="437.205078125" y="175.0" />
-      <point x="699.087890625" y="165.0" />
+      <point x="437.205078125" y="165.0" />
-      <point x="427.044921875" y="165.0" />
+      <point x="178.42578125" y="165.0" />
       <point x="25.25" y="39.0" />
     </edge>
   </edges>
-  <settings layout="Hierarchic" zoom="0.40337837837837837" showDependencies="false" x="731.0" y="730.0" />
+  <settings layout="Hierarchic" zoom="0.40337837837837837" showDependencies="false" x="791.0" y="730.0" />
   <SelectedNodes />
   <Categories>
     <Category>Columns</Category>