Merge pull request #4 from vulcanize/btree_indexes

Btree indexes

Makefile

@@ -0,0 +1,79 @@
+BIN = $(GOPATH)/bin
+
+# Tools
+## Migration tool
+GOOSE = $(BIN)/goose
+$(BIN)/goose:
+	go get -u github.com/pressly/goose/cmd/goose
+
+.PHONY: installtools
+installtools: | $(GOOSE)
+	echo "Installing tools"
+
+#Database
+HOST_NAME = localhost
+PORT = 5432
+NAME =
+USER = postgres
+PASSWORD = password
+CONNECT_STRING=postgresql://$(USER):$(PASSWORD)@$(HOST_NAME):$(PORT)/$(NAME)?sslmode=disable
+
+# Parameter checks
+## Check that DB variables are provided
+.PHONY: checkdbvars
+checkdbvars:
+	test -n "$(HOST_NAME)" # $$HOST_NAME
+	test -n "$(PORT)" # $$PORT
+	test -n "$(NAME)" # $$NAME
+	@echo $(CONNECT_STRING)
+
+## Check that the migration variable (id/timestamp) is provided
+.PHONY: checkmigration
+checkmigration:
+	test -n "$(MIGRATION)" # $$MIGRATION
+
+# Check that the migration name is provided
+.PHONY: checkmigname
+checkmigname:
+	test -n "$(NAME)" # $$NAME
+
+# Migration operations
+## Rollback the last migration
+.PHONY: rollback
+rollback: $(GOOSE) checkdbvars
+	$(GOOSE) -dir 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 migrations postgres "$(CONNECT_STRING)" down-to "$(MIGRATION)"
+
+## Apply all migrations not already run
+.PHONY: migrate
+migrate: $(GOOSE) checkdbvars
+	$(GOOSE) -dir migrations postgres "$(CONNECT_STRING)" up
+	pg_dump -O -s $(CONNECT_STRING) > schema.sql
+
+## Create a new migration file
+.PHONY: new_migration
+new_migration: $(GOOSE) checkmigname
+	$(GOOSE) -dir migrations create $(NAME) sql
+
+## Check which migrations are applied at the moment
+.PHONY: migration_status
+migration_status: $(GOOSE) checkdbvars
+	$(GOOSE) -dir migrations postgres "$(CONNECT_STRING)" status
+
+# Convert timestamped migrations to versioned (to be run in CI);
+# merge timestamped files to prevent conflict
+.PHONY: version_migrations
+version_migrations:
+	$(GOOSE) -dir migrations fix
+
+# Import a psql schema to the database
+.PHONY: import
+import:
+	test -n "$(NAME)" # $$NAME
+	psql $(NAME) < schema.sql

migrations/00004_create_eth_header_cids_table.sql

@@ -16,6 +16,7 @@ CREATE TABLE eth.header_cids (
   bloom                 BYTEA NOT NULL,
   timestamp             NUMERIC NOT NULL,
   times_validated       INTEGER NOT NULL DEFAULT 1,
+  base_fee              BIGINT,
   UNIQUE (block_number, block_hash)
 );
 

migrations/00006_create_eth_transaction_cids_table.sql

@@ -9,6 +9,7 @@ CREATE TABLE eth.transaction_cids (
   dst                   VARCHAR(66) NOT NULL,
   src                   VARCHAR(66) NOT NULL,
   tx_data               BYTEA,
+  tx_type               BYTEA,
   UNIQUE (header_id, tx_hash)
 );
 

migrations/00007_create_eth_receipt_cids_table.sql

@@ -6,13 +6,9 @@ CREATE TABLE eth.receipt_cids (
   mh_key                TEXT NOT NULL REFERENCES public.blocks (key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   contract              VARCHAR(66),
   contract_hash         VARCHAR(66),
-  topic0s               VARCHAR(66)[],
-  topic1s               VARCHAR(66)[],
-  topic2s               VARCHAR(66)[],
-  topic3s               VARCHAR(66)[],
-  log_contracts         VARCHAR(66)[],
   post_state            VARCHAR(66),
   post_status           INTEGER,
+  log_root              VARCHAR(66),
   UNIQUE (tx_id)
 );
 

migrations/00013_create_cid_indexes.sql

@@ -36,16 +36,6 @@ CREATE INDEX rct_contract_index ON eth.receipt_cids USING btree (contract);
 
 CREATE INDEX rct_contract_hash_index ON eth.receipt_cids USING btree (contract_hash);
 
-CREATE INDEX rct_topic0_index ON eth.receipt_cids USING gin (topic0s);
-
-CREATE INDEX rct_topic1_index ON eth.receipt_cids USING gin (topic1s);
-
-CREATE INDEX rct_topic2_index ON eth.receipt_cids USING gin (topic2s);
-
-CREATE INDEX rct_topic3_index ON eth.receipt_cids USING gin (topic3s);
-
-CREATE INDEX rct_log_contract_index ON eth.receipt_cids USING gin (log_contracts);
-
 -- state node indexes
 CREATE INDEX state_header_id_index ON eth.state_cids USING btree (header_id);
 
@@ -57,6 +47,8 @@ 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);
 
@@ -68,6 +60,8 @@ 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);
 
@@ -79,6 +73,7 @@ DROP INDEX eth.storage_root_index;
 DROP INDEX eth.account_state_id_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;
@@ -86,6 +81,7 @@ DROP INDEX eth.storage_leaf_key_index;
 DROP INDEX eth.storage_state_id_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;
@@ -93,11 +89,6 @@ DROP INDEX eth.state_leaf_key_index;
 DROP INDEX eth.state_header_id_index;
 
 -- receipt indexes
-DROP INDEX eth.rct_log_contract_index;
-DROP INDEX eth.rct_topic3_index;
-DROP INDEX eth.rct_topic2_index;
-DROP INDEX eth.rct_topic1_index;
-DROP INDEX eth.rct_topic0_index;
 DROP INDEX eth.rct_contract_hash_index;
 DROP INDEX eth.rct_contract_index;
 DROP INDEX eth.rct_mh_index;

migrations/00014_create_stored_functions.sql

@@ -1,14 +1,14 @@
 -- +goose Up
 -- +goose StatementBegin
--- returns if a storage node at the provided path was removed in the range >= the provided height and <= the provided block hash
+-- returns if a storage node at the provided path was removed in the range > the provided height and <= the provided block hash
 CREATE OR REPLACE FUNCTION was_storage_removed(path BYTEA, height BIGINT, hash VARCHAR(66)) RETURNS BOOLEAN
 AS $$
 SELECT exists(SELECT 1
               FROM eth.storage_cids
-                       INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
+                INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
-                       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.id)
               WHERE storage_path = path
-                AND block_number >= height
+                AND block_number > height
                 AND block_number <= (SELECT block_number
                                      FROM eth.header_cids
                                      WHERE block_hash = hash)
@@ -23,7 +23,7 @@ CREATE OR REPLACE FUNCTION was_state_removed(path BYTEA, height BIGINT, hash VAR
 AS $$
 SELECT exists(SELECT 1
               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.id)
               WHERE state_path = path
                 AND block_number > height
                 AND block_number <= (SELECT block_number
@@ -43,26 +43,26 @@ CREATE TYPE child_result AS (
 CREATE OR REPLACE FUNCTION has_child(hash VARCHAR(66), height BIGINT) RETURNS child_result AS
 $BODY$
 DECLARE
-child_height INT;
+  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
+  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;
+  INTO new_child_result.has_child;
--- collect all the children for this header
+  -- collect all the children for this header
-IF new_child_result.has_child THEN
+  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
+    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 LOOP;
-END IF;
+  END IF;
 RETURN new_child_result;
 END
 $BODY$
@@ -73,7 +73,7 @@ LANGUAGE 'plpgsql';
 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_header eth.header_cids;
   canonical_child eth.header_cids;
   header eth.header_cids;
   current_child_result child_result;
@@ -92,25 +92,25 @@ BEGIN
       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 IF;
-END LOOP;
+  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;
+    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
+  -- if only one header had children, it can be considered the heaviest/canonical header of the set
-ELSIF has_children_count = 1 THEN
+  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
+  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)
+    SELECT * INTO canonical_header FROM unnest(headers)
-WHERE block_hash = canonical_child.parent_hash;
+    WHERE block_hash = canonical_child.parent_hash;
-END IF;
+  END IF;
-RETURN canonical_header;
+  RETURN canonical_header;
 END
 $BODY$
 LANGUAGE 'plpgsql';
@@ -120,17 +120,17 @@ LANGUAGE 'plpgsql';
 CREATE OR REPLACE FUNCTION canonical_header_id(height BIGINT) RETURNS INTEGER AS
 $BODY$
 DECLARE
-canonical_header eth.header_cids;
+  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
+  FOR temp_header IN
-SELECT * FROM eth.header_cids WHERE block_number = height
+  SELECT * FROM eth.header_cids WHERE block_number = height
-    LOOP
+  LOOP
     headers = array_append(headers, temp_header);
-END LOOP;
+  END LOOP;
   -- count the number of headers collected
   header_count = array_length(headers, 1);
   -- if we have less than 1 header, return NULL
@@ -140,10 +140,10 @@ END LOOP;
   ELSIF header_count = 1 THEN
     RETURN headers[1].id;
   -- if we have multiple headers we need to determine which one is canonical
-ELSE
+  ELSE
     canonical_header = canonical_header_from_array(headers);
-RETURN canonical_header.id;
+    RETURN canonical_header.id;
-END IF;
+  END IF;
 END;
 $BODY$
 LANGUAGE 'plpgsql';

migrations/00015_create_access_list_table.sql

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

migrations/00016_create_eth_log_cids_table.sql

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

schema.sql

@@ -2,8 +2,8 @@
 -- PostgreSQL database dump
 --
 
--- Dumped from database version 12.4
+-- Dumped from database version 14beta3
--- Dumped by pg_dump version 12.4
+-- Dumped by pg_dump version 14beta3
 
 SET statement_timeout = 0;
 SET lock_timeout = 0;
@@ -47,7 +47,8 @@ CREATE TABLE eth.header_cids (
     uncle_root character varying(66) NOT NULL,
     bloom bytea NOT NULL,
     "timestamp" numeric NOT NULL,
-    times_validated integer DEFAULT 1 NOT NULL
+    times_validated integer DEFAULT 1 NOT NULL,
+    base_fee bigint
 );
 
 
@@ -103,33 +104,6 @@ end;
 $_$;
 
 
---
--- Name: canonical_header(bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.canonical_header(height bigint) RETURNS integer
-    LANGUAGE plpgsql
-    AS $$
-DECLARE
-  current_weight INT;
-  heaviest_weight INT DEFAULT 0;
-  heaviest_id INT;
-  r eth.header_cids%ROWTYPE;
-BEGIN
-  FOR r IN SELECT * FROM eth.header_cids
-  WHERE block_number = height
-  LOOP
-    SELECT INTO current_weight * FROM header_weight(r.block_hash);
-    IF current_weight > heaviest_weight THEN
-        heaviest_weight := current_weight;
-        heaviest_id := r.id;
-    END IF;
-  END LOOP;
-  RETURN heaviest_id;
-END
-$$;
-
-
 --
 -- Name: canonical_header_from_array(eth.header_cids[]); Type: FUNCTION; Schema: public; Owner: -
 --
@@ -216,17 +190,6 @@ END;
 $$;
 
 
---
--- Name: ethHeaderCidByBlockNumber(bigint); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public."ethHeaderCidByBlockNumber"(n bigint) RETURNS SETOF eth.header_cids
-    LANGUAGE sql STABLE
-    AS $_$
-SELECT * FROM eth.header_cids WHERE block_number=$1 ORDER BY id
-$_$;
-
-
 --
 -- Name: has_child(character varying, bigint); Type: FUNCTION; Schema: public; Owner: -
 --
@@ -255,33 +218,11 @@ BEGIN
       new_child_result.children = array_append(new_child_result.children, temp_child);
     END LOOP;
   END IF;
-  RETURN new_child_result;
+RETURN new_child_result;
 END
 $$;
 
 
---
--- Name: header_weight(character varying); Type: FUNCTION; Schema: public; Owner: -
---
-
-CREATE FUNCTION public.header_weight(hash character varying) RETURNS bigint
-    LANGUAGE sql
-    AS $$
-  WITH RECURSIVE validator AS (
-          SELECT block_hash, parent_hash, block_number
-          FROM eth.header_cids
-          WHERE block_hash = hash
-      UNION
-          SELECT eth.header_cids.block_hash, eth.header_cids.parent_hash, eth.header_cids.block_number
-          FROM eth.header_cids
-          INNER JOIN validator
-            ON eth.header_cids.parent_hash = validator.block_hash
-            AND eth.header_cids.block_number = validator.block_number + 1
-  )
-  SELECT COUNT(*) FROM validator;
-$$;
-
-
 --
 -- Name: was_state_removed(bytea, bigint, character varying); Type: FUNCTION; Schema: public; Owner: -
 --
@@ -376,6 +317,45 @@ CREATE SEQUENCE eth.header_cids_id_seq
 ALTER SEQUENCE eth.header_cids_id_seq OWNED BY eth.header_cids.id;
 
 
+--
+-- Name: log_cids; Type: TABLE; Schema: eth; Owner: -
+--
+
+CREATE TABLE eth.log_cids (
+    id integer NOT NULL,
+    leaf_cid text NOT NULL,
+    leaf_mh_key text NOT NULL,
+    receipt_id integer NOT NULL,
+    address character varying(66),
+    log_data bytea,
+    index integer NOT NULL,
+    topic0 character varying(66),
+    topic1 character varying(66),
+    topic2 character varying(66),
+    topic3 character varying(66)
+);
+
+
+--
+-- Name: log_cids_id_seq; Type: SEQUENCE; Schema: eth; Owner: -
+--
+
+CREATE SEQUENCE eth.log_cids_id_seq
+    AS integer
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: log_cids_id_seq; Type: SEQUENCE OWNED BY; Schema: eth; Owner: -
+--
+
+ALTER SEQUENCE eth.log_cids_id_seq OWNED BY eth.log_cids.id;
+
+
 --
 -- Name: receipt_cids; Type: TABLE; Schema: eth; Owner: -
 --
@@ -387,13 +367,9 @@ CREATE TABLE eth.receipt_cids (
     mh_key text NOT NULL,
     contract character varying(66),
     contract_hash character varying(66),
-    topic0s character varying(66)[],
-    topic1s character varying(66)[],
-    topic2s character varying(66)[],
-    topic3s character varying(66)[],
-    log_contracts character varying(66)[],
     post_state character varying(66),
-    post_status integer
+    post_status integer,
+    log_root character varying(66)
 );
 
 
@@ -705,6 +681,13 @@ ALTER TABLE ONLY eth.access_list_element ALTER COLUMN id SET DEFAULT nextval('et
 ALTER TABLE ONLY eth.header_cids ALTER COLUMN id SET DEFAULT nextval('eth.header_cids_id_seq'::regclass);
 
 
+--
+-- Name: log_cids id; Type: DEFAULT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.log_cids ALTER COLUMN id SET DEFAULT nextval('eth.log_cids_id_seq'::regclass);
+
+
 --
 -- Name: receipt_cids id; Type: DEFAULT; Schema: eth; Owner: -
 --
@@ -793,6 +776,22 @@ ALTER TABLE ONLY eth.header_cids
     ADD CONSTRAINT header_cids_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: log_cids log_cids_pkey; Type: CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.log_cids
+    ADD CONSTRAINT log_cids_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: log_cids log_cids_receipt_id_index_key; Type: CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.log_cids
+    ADD CONSTRAINT log_cids_receipt_id_index_key UNIQUE (receipt_id, index);
+
+
 --
 -- Name: receipt_cids receipt_cids_pkey; Type: CONSTRAINT; Schema: eth; Owner: -
 --
@@ -963,6 +962,55 @@ 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);
 
 
+--
+-- Name: log_cid_index; Type: INDEX; Schema: eth; Owner: -
+--
+
+CREATE INDEX log_cid_index ON eth.log_cids USING btree (leaf_cid);
+
+
+--
+-- Name: log_mh_index; Type: INDEX; Schema: eth; Owner: -
+--
+
+CREATE INDEX log_mh_index ON eth.log_cids USING btree (leaf_mh_key);
+
+
+--
+-- Name: log_rct_id_index; Type: INDEX; Schema: eth; Owner: -
+--
+
+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);
+
+
 --
 -- Name: rct_cid_index; Type: INDEX; Schema: eth; Owner: -
 --
@@ -984,13 +1032,6 @@ CREATE INDEX rct_contract_hash_index ON eth.receipt_cids USING btree (contract_h
 CREATE INDEX rct_contract_index ON eth.receipt_cids USING btree (contract);
 
 
---
--- Name: rct_log_contract_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX rct_log_contract_index ON eth.receipt_cids USING gin (log_contracts);
-
-
 --
 -- Name: rct_mh_index; Type: INDEX; Schema: eth; Owner: -
 --
@@ -998,34 +1039,6 @@ CREATE INDEX rct_log_contract_index ON eth.receipt_cids USING gin (log_contracts
 CREATE INDEX rct_mh_index ON eth.receipt_cids USING btree (mh_key);
 
 
---
--- Name: rct_topic0_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX rct_topic0_index ON eth.receipt_cids USING gin (topic0s);
-
-
---
--- Name: rct_topic1_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX rct_topic1_index ON eth.receipt_cids USING gin (topic1s);
-
-
---
--- Name: rct_topic2_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX rct_topic2_index ON eth.receipt_cids USING gin (topic2s);
-
-
---
--- Name: rct_topic3_index; Type: INDEX; Schema: eth; Owner: -
---
-
-CREATE INDEX rct_topic3_index ON eth.receipt_cids USING gin (topic3s);
-
-
 --
 -- Name: rct_tx_id_index; Type: INDEX; Schema: eth; Owner: -
 --
@@ -1061,6 +1074,13 @@ CREATE INDEX state_leaf_key_index ON eth.state_cids USING btree (state_leaf_key)
 CREATE INDEX state_mh_index ON eth.state_cids USING btree (mh_key);
 
 
+--
+-- Name: state_node_type_index; Type: INDEX; Schema: eth; Owner: -
+--
+
+CREATE INDEX state_node_type_index ON eth.state_cids USING btree (node_type);
+
+
 --
 -- Name: state_path_index; Type: INDEX; Schema: eth; Owner: -
 --
@@ -1096,6 +1116,13 @@ CREATE INDEX storage_leaf_key_index ON eth.storage_cids USING btree (storage_lea
 CREATE INDEX storage_mh_index ON eth.storage_cids USING btree (mh_key);
 
 
+--
+-- Name: storage_node_type_index; Type: INDEX; Schema: eth; Owner: -
+--
+
+CREATE INDEX storage_node_type_index ON eth.storage_cids USING btree (node_type);
+
+
 --
 -- Name: storage_path_index; Type: INDEX; Schema: eth; Owner: -
 --
@@ -1239,6 +1266,22 @@ ALTER TABLE ONLY eth.header_cids
     ADD CONSTRAINT header_cids_node_id_fkey FOREIGN KEY (node_id) REFERENCES public.nodes(id) ON DELETE CASCADE;
 
 
+--
+-- Name: log_cids log_cids_leaf_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.log_cids
+    ADD CONSTRAINT log_cids_leaf_mh_key_fkey FOREIGN KEY (leaf_mh_key) REFERENCES public.blocks(key) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
+--
+-- Name: log_cids log_cids_receipt_id_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
+--
+
+ALTER TABLE ONLY eth.log_cids
+    ADD CONSTRAINT log_cids_receipt_id_fkey FOREIGN KEY (receipt_id) REFERENCES eth.receipt_cids(id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
+
+
 --
 -- Name: receipt_cids receipt_cids_mh_key_fkey; Type: FK CONSTRAINT; Schema: eth; Owner: -
 --