tapdb+universe: consolidate code, link commitment to previous one

We clean up and consolidate a bunch of code:
 - Parsing the supply commitment and data was duplicated, is now
   a single function.
 - The commitmentChainInfo can be merged directly into the
   commitment.CommitmentBlock, gets rid of a parameter.

We also add a new spent_commitment field to the supply_commitments table
that tracks the previous commitment transaction that was spent, to
create the full chain.
To be able to traverse that chain, we also need to be able to query the
commitments either by a commitment's outpoint or by the outpoint a
commitment is spending, which allows backward lookup in a loop.

Author: guggero

tapdb/sqlc/migrations/000044_supply_syncer_log.down.sql

@@ -1,3 +1,9 @@
 -- Drop the supply_syncer_log table and its index.
 DROP INDEX IF EXISTS supply_syncer_log_group_key_idx;
-DROP TABLE IF EXISTS supply_syncer_log;
+DROP TABLE IF EXISTS supply_syncer_log;
+
+DROP INDEX IF EXISTS supply_commitments_output_index_idx;
+DROP INDEX IF EXISTS supply_commitments_spent_commitment_idx;
+
+ALTER TABLE supply_commitments
+    DROP COLUMN spent_commitment;

tapdb/sqlc/migrations/000044_supply_syncer_log.up.sql

@@ -20,4 +20,21 @@ CREATE TABLE supply_syncer_log (
 
 -- Add index for frequent lookups by group key.
 CREATE UNIQUE INDEX supply_syncer_log_group_key_idx
-    ON supply_syncer_log(group_key);
+    ON supply_syncer_log(group_key);
+
+-- A nullable column to track the previous supply commitment that was spent to
+-- create a new supply commitment. This is only NULL for the very first
+-- commitment of an asset group, each subsequent commitment needs to spend a
+-- prior commitment to ensure continuity in the supply chain.
+ALTER TABLE supply_commitments
+    ADD COLUMN spent_commitment BIGINT
+        REFERENCES supply_commitments(commit_id);
+
+-- Add an index to speed up lookups by spent commitment.
+CREATE INDEX supply_commitments_spent_commitment_idx
+    ON supply_commitments(spent_commitment);
+
+-- We also add an index on the output index of the supply commitment to speed
+-- up lookups of commitments by outpoint (will need a join over chain_txns).
+CREATE INDEX supply_commitments_output_index_idx
+    ON supply_commitments(output_index);

tapdb/sqlc/models.go

@@ -30,20 +30,20 @@ RETURNING current_state_id, latest_commitment_id;
 -- name: InsertSupplyCommitment :one
 INSERT INTO supply_commitments (
     group_key, chain_txn_id,
-    output_index, internal_key_id, output_key, -- Core fields
+    output_index, internal_key_id, output_key, spent_commitment, -- Core fields
     block_height, block_header, merkle_proof, -- Nullable chain details
     supply_root_hash, supply_root_sum -- Nullable root details
 ) VALUES (
-    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10
+    $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11
 ) RETURNING commit_id;
 
 -- name: UpdateSupplyCommitmentChainDetails :exec
 UPDATE supply_commitments
-SET merkle_proof = @merkle_proof,
-    output_index = @output_index,
-    block_header = @block_header,
-    chain_txn_id = @chain_txn_id,
-    block_height = @block_height
+SET merkle_proof     = @merkle_proof,
+    output_index     = @output_index,
+    block_header     = @block_header,
+    chain_txn_id     = @chain_txn_id,
+    block_height     = @block_height
 WHERE commit_id = @commit_id;
 
 -- name: UpdateSupplyCommitmentRoot :exec
@@ -134,10 +134,37 @@ SET transition_id = @transition_id
 WHERE group_key = @group_key AND transition_id IS NULL;
 
 -- name: QuerySupplyCommitment :one
-SELECT *
-FROM supply_commitments
+SELECT sqlc.embed(sc), ct.tx_index
+FROM supply_commitments AS sc
+JOIN chain_txns AS ct
+    ON sc.chain_txn_id = ct.txn_id
 WHERE commit_id = @commit_id;
 
+-- name: QuerySupplyCommitmentByOutpoint :one
+SELECT sqlc.embed(sc), ct.tx_index
+FROM supply_commitments AS sc
+JOIN chain_txns AS ct
+    ON sc.chain_txn_id = ct.txn_id
+WHERE sc.group_key = @group_key AND
+    sc.output_index = @output_index AND
+    ct.txid = @txid;
+
+-- name: QuerySupplyCommitmentBySpentOutpoint :one
+WITH spent_commitment AS (
+    SELECT ssc.commit_id
+    FROM supply_commitments AS ssc
+        JOIN chain_txns AS ct
+        ON ssc.chain_txn_id = ct.txn_id
+    WHERE ssc.group_key = @group_key AND
+        ssc.output_index = @output_index AND
+        ct.txid = @txid
+)
+SELECT sqlc.embed(sc), ct.tx_index
+FROM supply_commitments AS sc
+    JOIN chain_txns AS ct
+    ON sc.chain_txn_id = ct.txn_id
+WHERE sc.spent_commitment = (SELECT commit_id FROM spent_commitment);
+
 -- name: UpdateSupplyCommitTransitionCommitment :exec
 UPDATE supply_commit_transitions
 SET new_commitment_id = @new_commitment_id,
@@ -181,17 +208,7 @@ WHERE outpoint = @outpoint
 
 -- name: FetchSupplyCommit :one
 SELECT
-    sc.commit_id,
-    sc.output_index,
-    sc.output_key,
-    sqlc.embed(ik),
-    txn.raw_tx,
-    txn.block_height,
-    txn.block_hash,
-    txn.tx_index,
-    txn.chain_fees,
-    sc.supply_root_hash AS root_hash,
-    sc.supply_root_sum AS root_sum 
+    sqlc.embed(sc), txn.tx_index
 FROM supply_commit_state_machines sm
 JOIN supply_commitments sc
     ON sm.latest_commitment_id = sc.commit_id

tapdb/sqlc/querier.go

@@ -1,6 +1,9 @@
 -- name: UpsertSupplySyncerLog :exec
-INSERT INTO supply_syncer_log (group_key, max_fetched_block_height, max_inserted_block_height)
-VALUES (@group_key, @max_fetched_block_height, @max_inserted_block_height)
+INSERT INTO supply_syncer_log (
+   group_key, max_fetched_block_height, max_inserted_block_height
+) VALUES (
+  @group_key, @max_fetched_block_height, @max_inserted_block_height
+)
 ON CONFLICT (group_key) DO UPDATE SET
     max_fetched_block_height = COALESCE(@max_fetched_block_height, supply_syncer_log.max_fetched_block_height),
     max_inserted_block_height = COALESCE(@max_inserted_block_height, supply_syncer_log.max_inserted_block_height);
@@ -9,3 +12,4 @@ ON CONFLICT (group_key) DO UPDATE SET
 SELECT group_key, max_fetched_block_height, max_inserted_block_height
 FROM supply_syncer_log
 WHERE group_key = @group_key;
+

tapdb/sqlc/queries/supply_commit.sql

@@ -879,12 +879,19 @@ CREATE TABLE supply_commitments (
 
     -- The root sum of the supply commitment at this snapshot.
     supply_root_sum BIGINT
-);
+, spent_commitment BIGINT
+        REFERENCES supply_commitments(commit_id));
 
 CREATE INDEX supply_commitments_chain_txn_id_idx ON supply_commitments(chain_txn_id);
 
 CREATE INDEX supply_commitments_group_key_idx ON supply_commitments(group_key);
 
+CREATE INDEX supply_commitments_output_index_idx
+    ON supply_commitments(output_index);
+
+CREATE INDEX supply_commitments_spent_commitment_idx
+    ON supply_commitments(spent_commitment);
+
 CREATE TABLE supply_syncer_log (
     id INTEGER PRIMARY KEY,