Compare incremental and compressed DB schema.

db/migrations/00004_create_eth_header_cids_table.sql

@@ -20,5 +20,14 @@ CREATE TABLE eth.header_cids (
   UNIQUE (block_number, block_hash)
 );
 
+CREATE FUNCTION "ethHeaderCidByBlockNumber"(n bigint) returns SETOF eth.header_cids
+    stable
+    language sql
+as
+$$
+SELECT * FROM eth.header_cids WHERE block_number=$1 ORDER BY id
+    $$;
+
 -- +goose Down
+DROP FUNCTION "ethHeaderCidByBlockNumber"(bigint);
 DROP TABLE eth.header_cids;

db/migrations/00014_create_stored_functions.sql

@@ -40,77 +40,79 @@ CREATE TYPE child_result AS (
     children eth.header_cids[]
 );
 
-CREATE OR REPLACE FUNCTION has_child(hash VARCHAR(66), height BIGINT) RETURNS child_result AS
-$BODY$
+CREATE OR REPLACE FUNCTION has_child(hash VARCHAR(66), height BIGINT)
+    RETURNS child_result
+    LANGUAGE plpgsql
+    AS $function$
 DECLARE
-child_height INT;
-  temp_child eth.header_cids;
-  new_child_result child_result;
+    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;
+    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';
+$function$
+;
 -- +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;
+    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;
+    -- 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';

db/migrations/00017_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;

db/schema.sql

@@ -102,14 +102,40 @@ begin
 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: -
 --
 
-CREATE FUNCTION public.canonical_header_from_array(headers eth.header_cids[]) RETURNS eth.header_cids
-    LANGUAGE plpgsql
-    AS $$
+CREATE OR REPLACE FUNCTION public.canonical_header_from_array(headers eth.header_cids[])
+ RETURNS eth.header_cids
+ LANGUAGE plpgsql
+AS $function$
 DECLARE
 canonical_header eth.header_cids;
   canonical_child eth.header_cids;
@@ -150,7 +176,8 @@ WHERE block_hash = canonical_child.parent_hash;
 END IF;
 RETURN canonical_header;
 END
-$$;
+$function$
+;
 
 
 --
@@ -188,14 +215,25 @@ END IF;
 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: -
 --
 
-CREATE FUNCTION public.has_child(hash character varying, height bigint) RETURNS public.child_result
-    LANGUAGE plpgsql
-    AS $$
+CREATE OR REPLACE FUNCTION public.has_child(hash character varying, height bigint)
+ RETURNS child_result
+ LANGUAGE plpgsql
+AS $function$
 DECLARE
 child_height INT;
   temp_child eth.header_cids;
@@ -219,8 +257,8 @@ END LOOP;
 END IF;
 RETURN new_child_result;
 END
-$$;
-
+$function$
+;
 
 --
 -- Name: was_state_removed(bytea, bigint, character varying); Type: FUNCTION; Schema: public; Owner: -
@@ -251,8 +289,8 @@ CREATE FUNCTION public.was_storage_removed(path bytea, height bigint, hash chara
     AS $$
 SELECT exists(SELECT 1
               FROM eth.storage_cids
-                       INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
-                       INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
+                   INNER JOIN eth.state_cids ON (storage_cids.state_id = state_cids.id)
+                   INNER JOIN eth.header_cids ON (state_cids.header_id = header_cids.id)
               WHERE storage_path = path
                 AND block_number > height
                 AND block_number <= (SELECT block_number

docker-compose.yml

@@ -20,7 +20,7 @@ services:
     restart: on-failure
     depends_on:
       - db
-    image: vulcanize/statediff-migrations:v0.6.0
+    image: vulcanize/statediff-migrations:latest
     environment:
       DATABASE_USER: vdbm
       DATABASE_NAME: vulcanize_public

pkg/eth/api_test.go

@@ -260,7 +260,7 @@ var _ = Describe("API", func() {
 	})
 
 	// Single test db tear down at end of all tests
-	defer It("test teardown", func() { eth.TearDownDB(db) })
+	//defer It("test teardown", func() { eth.TearDownDB(db) })
 	/*
 
 	   Headers and blocks