chore: bump cardano-db-sync

Includes minimal compatibility updates
cardano-foundation · Oct 26, 2020 · c793a43 · c793a43
1 parent 6d3e377
commit c793a43
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
         max-size: "200k"
         max-file: "10"
   cardano-node:
-    image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.20.0}
+    image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.21.1}
     command: [
       "run",
       "--config", "/config/config.json",
@@ -44,7 +44,7 @@ services:
         max-size: "400k"
         max-file: "20"
   cardano-db-sync-extended:
-    image: rhyslbw/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-09205d901ee86299cc68b3a0d0a8feb52489858f}
+    image: rhyslbw/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-0935886773eca22ed91a8cdf0cdc628878be3c61}
     command: [
       "--config", "/config/cardano-db-sync/config.json",
       "--socket-path", "/node-ipc/node.socket",

diff --git a/packages/api-cardano-db-hasura/hasura/project/migrations/1589369664961_init/up.sql b/packages/api-cardano-db-hasura/hasura/project/migrations/1589369664961_init/up.sql
@@ -1,14 +1,14 @@
 CREATE VIEW "Block" AS
  SELECT (COALESCE(( SELECT sum((tx.fee)::bigint) AS sum
            FROM tx
-          WHERE (tx.block = block.id)), (0)::NUMERIC))::bigint AS fees,
+          WHERE (tx.block_id = block.id)), (0)::NUMERIC))::bigint AS fees,
     block.hash,
     block.merkel_root AS "merkelRoot",
     block.block_no AS "number",
     block.op_cert AS "opCert",
     previous_block.hash AS "previousBlockHash",
     next_block.hash AS "nextBlockHash",
-    block.proto_version AS "protocolVersion",
+    jsonb_build_object('major', block.proto_major, 'minor', block.proto_minor) AS "protocolVersion",
     block.size,
     block.tx_count AS "transactionsCount",
     block.epoch_no AS "epochNo",
@@ -18,9 +18,9 @@ CREATE VIEW "Block" AS
     slot_leader.id AS "slot_leader_id",
     block.vrf_key As "vrfKey"
    FROM (((block
-     LEFT JOIN block previous_block ON ((block.previous = previous_block.id)))
-     LEFT JOIN block next_block ON ((next_block.previous = block.id)))
-     LEFT JOIN slot_leader ON ((block.slot_leader = slot_leader.id)));
+     LEFT JOIN block previous_block ON ((block.previous_id = previous_block.id)))
+     LEFT JOIN block next_block ON ((next_block.previous_id = block.id)))
+     LEFT JOIN slot_leader ON ((block.slot_leader_id = slot_leader.id)));
 
 CREATE OR REPLACE VIEW "Cardano" AS
  SELECT block.block_no AS "tipBlockNo",
@@ -90,7 +90,7 @@ WITH
     SELECT pool.hash_id, max(block.time) AS blockTime
     FROM pool_update AS pool
     JOIN tx ON pool.registered_tx_id = tx.id
-    JOIN block ON tx.block = block.id
+    JOIN block ON tx.block_id = block.id
     group by pool.hash_id
 )
 SELECT
@@ -107,10 +107,10 @@ SELECT
   ( SELECT stake_address.view FROM stake_address WHERE stake_address.id = pool.reward_addr_id) AS "rewardAddress",
   pool_meta_data.url AS "url"
 FROM pool_update AS pool
-  LEFT JOIN pool_meta_data ON pool.meta = pool_meta_data.id
+  LEFT JOIN pool_meta_data ON pool.meta_id = pool_meta_data.id
   INNER JOIN tx ON pool.registered_tx_id = tx.id
   INNER JOIN latest_block_times ON latest_block_times.hash_id = pool.hash_id
-  INNER JOIN block ON tx.block = block.id AND latest_block_times.blockTime = block.time;
+  INNER JOIN block ON tx.block_id = block.id AND latest_block_times.blockTime = block.time;
 
 CREATE VIEW "StakePoolRetirement" AS
 SELECT
@@ -157,7 +157,7 @@ SELECT
 FROM
   tx
 INNER JOIN block
-  ON block.id = tx.block;
+  ON block.id = tx.block_id;
 
 CREATE VIEW "TransactionInput" AS
 SELECT
@@ -239,6 +239,6 @@ RETURNS SETOF "TransactionOutput" AS $$
     ON tx_out.tx_id = tx_in.tx_out_id
     AND tx_out.index = tx_in.tx_out_index
   WHERE tx_in.tx_in_id IS NULL
-  AND tx.block <= (SELECT id FROM block WHERE hash = "hash")
+  AND tx.block_id <= (SELECT id FROM block WHERE hash = "hash")
 $$ LANGUAGE SQL stable;
 
diff --git a/packages/api-cardano-db-hasura/schema.graphql b/packages/api-cardano-db-hasura/schema.graphql
@@ -6,6 +6,7 @@ scalar Hash28Hex
 scalar Hash32Hex
 scalar IPv4
 scalar IPv6
+scalar JSONObject
 scalar BigInt
 scalar DateTime
 scalar Percentage
@@ -714,7 +715,7 @@ type Block {
   slotNo: Int
   # Ouroboros Classic Epoch Boundary blocks (EBB) do not have a slot number
   previousBlock: Block
-  protocolVersion: String
+  protocolVersion: JSONObject
   nextBlock: Block
   size: BigInt!
   transactions(