Replace pool view references

cardano-community · Sep 13, 2024 · 02704f9 · 02704f9
1 parent a63d0a2
commit 02704f9
Show file tree

Hide file tree

Showing 31 changed files with 140 additions and 140 deletions.
diff --git a/files/grest/rpc/00_blockchain/reserve_withdrawals.sql b/files/grest/rpc/00_blockchain/reserve_withdrawals.sql
@@ -19,7 +19,7 @@ AS $$
     ENCODE(b.hash,'hex'),
     b.block_no,
     r.amount::text,
-    sa.view,
+    grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
     earned_epoch,
     spendable_epoch
   FROM reserve AS r

diff --git a/files/grest/rpc/00_blockchain/treasury_withdrawals.sql b/files/grest/rpc/00_blockchain/treasury_withdrawals.sql
@@ -19,7 +19,7 @@ AS $$
     ENCODE(b.hash,'hex'),
     b.block_no,
     t.amount::text,
-    sa.view,
+    grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
     earned_epoch,
     spendable_epoch
   FROM treasury AS t

diff --git a/files/grest/rpc/01_cached_tables/active_stake_cache.sql b/files/grest/rpc/01_cached_tables/active_stake_cache.sql
@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS grest.pool_active_stake_cache (
-  pool_id varchar NOT NULL,
+  pool_id bigint NOT NULL,
   epoch_no bigint NOT NULL,
   amount lovelace NOT NULL,
   PRIMARY KEY (pool_id, epoch_no)
@@ -64,15 +64,14 @@ BEGIN
     -- POOL ACTIVE STAKE CACHE
     INSERT INTO grest.pool_active_stake_cache
       SELECT
-        pool_hash.view AS pool_id,
+        epoch_stake.pool_id AS pool_id,
         epoch_stake.epoch_no,
         SUM(epoch_stake.amount) AS amount
       FROM public.epoch_stake
-      INNER JOIN public.pool_hash ON pool_hash.id = epoch_stake.pool_id
       WHERE epoch_stake.epoch_no >= _last_active_stake_validated_epoch
         AND epoch_stake.epoch_no <= _epoch_no
       GROUP BY
-        pool_hash.view,
+        epoch_stake.pool_id,
         epoch_stake.epoch_no
     ON CONFLICT (
       pool_id,

diff --git a/files/grest/rpc/01_cached_tables/pool_history_cache.sql b/files/grest/rpc/01_cached_tables/pool_history_cache.sql
@@ -1,7 +1,7 @@
 DROP TABLE IF EXISTS grest.pool_history_cache;
 
 CREATE TABLE grest.pool_history_cache (
-  pool_id varchar,
+  pool_id bigint,
   epoch_no int8 NULL,
   active_stake lovelace NULL,
   active_stake_pct numeric NULL,
@@ -21,7 +21,7 @@ COMMENT ON TABLE grest.pool_history_cache IS 'A history of pool performance incl
 
 CREATE OR REPLACE FUNCTION grest.get_pool_history_data_bulk(_epoch_no_to_insert_from word31type, _pool_bech32 text [] DEFAULT null, _epoch_no_until word31type DEFAULT null)
 RETURNS TABLE (
-  pool_id_bech32 text,
+  pool_id bigint,
   epoch_no bigint,
   active_stake lovelace,
   active_stake_pct numeric,
@@ -41,7 +41,10 @@ AS $$
 DECLARE
   _pool_ids bigint [];
 BEGIN
-  _pool_ids := (SELECT array_agg(id) from pool_hash ph where ph.view = ANY(_pool_bech32));
+  _pool_ids := (SELECT ARRAY_AGG(id) from pool_hash ph where ph.hash_raw = ANY(
+    SELECT ARRAY_AGG(DECODE(b32_decode(pool),'hex'))
+    FROM UNNEST(_pool_bech32) AS pool
+  );
 
   RETURN QUERY
 
@@ -93,7 +96,7 @@ BEGIN
 
     activeandfees AS (
       SELECT
-        ph.view AS pool_id,
+        es.pool_id AS pool_id,
         es.epoch_no,
         SUM(es.amount) AS active_stake,
         COUNT(1) AS delegator_cnt,
@@ -134,84 +137,82 @@ BEGIN
           ), 2
         ) AS saturation_pct
       FROM epoch_stake AS es
-        INNER JOIN pool_hash AS ph ON es.pool_id = ph.id
       WHERE es.epoch_no >= _epoch_no_to_insert_from
         AND (_epoch_no_until is null or es.epoch_no < _epoch_no_until)
-        AND (_pool_bech32 is null or ph.view = ANY(_pool_bech32))
-      GROUP BY es.pool_id, ph.view, es.epoch_no
+        AND (_pool_bech32 is null or es.pool_id = ANY(_pool_ids))
+      GROUP BY es.pool_id, es.epoch_no
     )
 
-    SELECT
-      actf.pool_id::text,
-      actf.epoch_no::bigint,
-      actf.active_stake::lovelace,
-      actf.active_stake_pct,
-      actf.saturation_pct,
-      COALESCE(b.block_cnt, 0) AS block_cnt,
-      actf.delegator_cnt,
-      actf.pool_fee_variable::double precision,
-      actf.pool_fee_fixed,
-      -- for debugging: m.memtotal,
-      -- for debugging: l.leadertotal,
-      CASE COALESCE(b.block_cnt, 0)
-      WHEN 0 THEN
-        0
-      ELSE
-        -- special CASE for WHEN reward information is not available yet
-        CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
-          WHEN 0 THEN NULL
-          ELSE
-            CASE
-              WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN COALESCE(l.leadertotal, 0)
-              ELSE ROUND(actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0) + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))
-            END
-        END
-      END AS pool_fees,
-      CASE COALESCE(b.block_cnt, 0)
-      WHEN 0 THEN
-        0
-      ELSE
-        -- special CASE for WHEN reward information is not available yet
-        CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
-          WHEN 0 THEN NULL
+  SELECT
+    actf.pool_id::text,
+    actf.epoch_no::bigint,
+    actf.active_stake::lovelace,
+    actf.active_stake_pct,
+    actf.saturation_pct,
+    COALESCE(b.block_cnt, 0) AS block_cnt,
+    actf.delegator_cnt,
+    actf.pool_fee_variable::double precision,
+    actf.pool_fee_fixed,
+    -- for debugging: m.memtotal,
+    -- for debugging: l.leadertotal,
+    CASE COALESCE(b.block_cnt, 0)
+    WHEN 0 THEN
+      0
+    ELSE
+      -- special CASE for WHEN reward information is not available yet
+      CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
+        WHEN 0 THEN NULL
         ELSE
           CASE
-            WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN COALESCE(m.memtotal, 0)
-            ELSE ROUND(COALESCE(m.memtotal, 0) + (COALESCE(l.leadertotal, 0) - (actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0) + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))))
+            WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN COALESCE(l.leadertotal, 0)
+            ELSE ROUND(actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0) + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))
           END
-        END
-      END AS deleg_rewards,
-      CASE COALESCE(b.block_cnt, 0)
-        WHEN 0 THEN 0
+      END
+    END AS pool_fees,
+    CASE COALESCE(b.block_cnt, 0)
+    WHEN 0 THEN
+      0
+    ELSE
+      -- special CASE for WHEN reward information is not available yet
+      CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
+        WHEN 0 THEN NULL
       ELSE
-        CASE COALESCE(m.memtotal, 0)
-          WHEN 0 THEN NULL
-          ELSE COALESCE(m.memtotal, 0)
+        CASE
+          WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN COALESCE(m.memtotal, 0)
+          ELSE ROUND(COALESCE(m.memtotal, 0) + (COALESCE(l.leadertotal, 0) - (actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0) + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))))
         END
-      END::double precision AS member_rewards,
-      CASE COALESCE(b.block_cnt, 0)
-        WHEN 0 THEN 0
-      ELSE
-        -- special CASE for WHEN reward information is not available yet
-        CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
-          WHEN 0 THEN NULL
-          ELSE
-            CASE
-              WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN ROUND((((POW((LEAST(((COALESCE(m.memtotal, 0)) / (NULLIF(actf.active_stake, 0))), 1000) + 1), 73) - 1)) * 100)::numeric, 9)
-              -- using LEAST AS a way to prevent overflow, in CASE of dodgy database data (e.g. giant rewards / tiny active stake)
-              ELSE ROUND((((POW((LEAST((((COALESCE(m.memtotal, 0) + (COALESCE(l.leadertotal, 0) - (actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0)
-                  + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))))) / (NULLIF(actf.active_stake, 0))), 1000) + 1), 73) - 1)) * 100)::numeric, 9)
-            END
-        END
-      END AS epoch_ros
-    FROM pool_hash AS ph
-    INNER JOIN activeandfees AS actf ON actf.pool_id = ph.view
-    LEFT JOIN blockcounts AS b ON ph.id = b.pool_hash_id
-      AND actf.epoch_no = b.epoch_no
-    LEFT JOIN leadertotals AS l ON ph.id = l.pool_id
-      AND actf.epoch_no = l.earned_epoch
-    LEFT JOIN membertotals AS m ON ph.id = m.pool_id
-      AND actf.epoch_no = m.earned_epoch;
+      END
+    END AS deleg_rewards,
+    CASE COALESCE(b.block_cnt, 0)
+      WHEN 0 THEN 0
+    ELSE
+      CASE COALESCE(m.memtotal, 0)
+        WHEN 0 THEN NULL
+        ELSE COALESCE(m.memtotal, 0)
+      END
+    END::double precision AS member_rewards,
+    CASE COALESCE(b.block_cnt, 0)
+      WHEN 0 THEN 0
+    ELSE
+      -- special CASE for WHEN reward information is not available yet
+      CASE COALESCE(l.leadertotal, 0) + COALESCE(m.memtotal, 0)
+        WHEN 0 THEN NULL
+        ELSE
+          CASE
+            WHEN COALESCE(l.leadertotal, 0) < actf.pool_fee_fixed THEN ROUND((((POW((LEAST(((COALESCE(m.memtotal, 0)) / (NULLIF(actf.active_stake, 0))), 1000) + 1), 73) - 1)) * 100)::numeric, 9)
+            -- using LEAST AS a way to prevent overflow, in CASE of dodgy database data (e.g. giant rewards / tiny active stake)
+            ELSE ROUND((((POW((LEAST((((COALESCE(m.memtotal, 0) + (COALESCE(l.leadertotal, 0) - (actf.pool_fee_fixed + (((COALESCE(m.memtotal, 0)
+                + COALESCE(l.leadertotal, 0)) - actf.pool_fee_fixed) * actf.pool_fee_variable))))) / (NULLIF(actf.active_stake, 0))), 1000) + 1), 73) - 1)) * 100)::numeric, 9)
+          END
+      END
+    END AS epoch_ros
+  FROM activeandfees AS actf
+  LEFT JOIN blockcounts AS b ON actf.pool_id = b.pool_hash_id
+    AND actf.epoch_no = b.epoch_no
+  LEFT JOIN leadertotals AS l ON actf.pool_id = l.pool_id
+    AND actf.epoch_no = l.earned_epoch
+  LEFT JOIN membertotals AS m ON actf.pool_id = m.pool_id
+    AND actf.epoch_no = m.earned_epoch;
 
 END;
 $$;

diff --git a/files/grest/rpc/01_cached_tables/pool_info_cache.sql b/files/grest/rpc/01_cached_tables/pool_info_cache.sql
@@ -7,8 +7,6 @@ CREATE TABLE grest.pool_info_cache (
   tx_hash text,
   block_time numeric,
   pool_hash_id bigint NOT NULL,
-  pool_id_bech32 character varying NOT NULL,
-  pool_id_hex text NOT NULL,
   active_epoch_no bigint NOT NULL,
   vrf_key_hash text NOT NULL,
   margin double precision NOT NULL,
@@ -96,17 +94,15 @@ BEGIN
       encode(tx.hash::bytea, 'hex'),
       EXTRACT(EPOCH FROM b.time),
       _hash_id,
-      ph.view,
-      encode(ph.hash_raw::bytea, 'hex'),
       _active_epoch_no,
-      encode(_vrf_key_hash::bytea, 'hex'),
+      ENCODE(_vrf_key_hash::bytea, 'hex'),
       _margin,
       _fixed_cost,
       _pledge,
       _deposit,
-      sa.view,
+      grest.cip5_hex_to_stake_addr(sa.hash_raw),
       ARRAY(
-        SELECT sa.view
+        SELECT grest.cip5_hex_to_stake_addr(sa.hash_raw)
         FROM public.pool_owner AS po
         INNER JOIN public.stake_address AS sa ON sa.id = po.addr_id
         WHERE po.pool_update_id = _update_id

diff --git a/files/grest/rpc/01_cached_tables/stake_distribution_cache.sql b/files/grest/rpc/01_cached_tables/stake_distribution_cache.sql
@@ -1,6 +1,6 @@
 CREATE TABLE IF NOT EXISTS grest.stake_distribution_cache (
   stake_address_raw addr29type PRIMARY KEY,
-  pool_id varchar,
+  pool_id bigint,
   total_balance numeric,
   utxo numeric,
   rewards numeric,
@@ -65,7 +65,7 @@ BEGIN
     pool_ids AS (
       SELECT
         awdp.stake_address_id,
-        pool_hash.view AS pool_id
+        pool_hash.id AS pool_id
       FROM pool_hash
         INNER JOIN accounts_with_delegated_pools AS awdp ON awdp.pool_hash_id = pool_hash.id
     ),

diff --git a/files/grest/rpc/account/account_history.sql b/files/grest/rpc/account/account_history.sql
@@ -24,7 +24,7 @@ BEGIN
         grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
         JSONB_AGG(
           JSONB_BUILD_OBJECT(
-            'pool_id', ph.view,
+            'pool_id', b32_encode('pool', ph.hash_raw::text),
             'epoch_no', es.epoch_no::bigint,
             'active_stake', es.amount::text
           )
@@ -45,7 +45,7 @@ BEGIN
         grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
         JSONB_AGG(
           JSONB_BUILD_OBJECT(
-            'pool_id', ph.view,
+            'pool_id', b32_encode('pool', ph.hash_raw::text),
             'epoch_no', es.epoch_no::bigint,
             'active_stake', es.amount::text
           )

diff --git a/files/grest/rpc/account/account_info.sql b/files/grest/rpc/account/account_info.sql
@@ -91,7 +91,7 @@ BEGIN
     LEFT JOIN (
         SELECT
           delegation.addr_id,
-          pool_hash.view AS delegated_pool
+          b32_encode('pool', DECODE(ph.hash_raw,'hex')::text) AS delegated_pool
         FROM delegation
           INNER JOIN pool_hash ON pool_hash.id = delegation.pool_hash_id
         WHERE delegation.addr_id = ANY(sa_id_list)

diff --git a/files/grest/rpc/account/account_rewards.sql b/files/grest/rpc/account/account_rewards.sql
@@ -28,7 +28,7 @@ BEGIN
           'spendable_epoch', r.spendable_epoch,
           'amount', r.amount::text,
           'type', r.type,
-          'pool_id', ph.view
+          'pool_id', b32_encode('pool', DECODE(ph.hash_raw,'hex')::text)
           )
         ) AS rewards
       FROM
@@ -48,7 +48,7 @@ BEGIN
             'spendable_epoch', r.spendable_epoch,
             'amount', r.amount::text,
             'type', r.type,
-            'pool_id', ph.view
+            'pool_id', b32_encode('pool', DECODE(ph.hash_raw,'hex')::text)
           )
         ) AS rewards
       FROM

diff --git a/files/grest/rpc/address/address_utxos.sql b/files/grest/rpc/address/address_utxos.sql
@@ -47,7 +47,7 @@ BEGIN
       tx_out.index::smallint,
       tx_out.address::text,
       tx_out.value::text,
-      sa.view::text as stake_address,
+      grest.cip5_hex_to_stake_addr(sa.hash_raw)::text as stake_address,
       ENCODE(tx_out.payment_cred, 'hex') AS payment_cred,
       b.epoch_no,
       b.block_no,

diff --git a/files/grest/rpc/address/credential_utxos.sql b/files/grest/rpc/address/credential_utxos.sql
@@ -53,7 +53,7 @@ BEGIN
       tx_out.index::smallint,
       tx_out.address::text,
       tx_out.value::text,
-      sa.view::text as stake_address,
+      grest.cip5_hex_to_stake_addr(sa.hash_raw)::text as stake_address,
       ENCODE(tx_out.payment_cred, 'hex') AS payment_cred,
       b.epoch_no,
       b.block_no,

diff --git a/files/grest/rpc/assets/asset_utxos.sql b/files/grest/rpc/assets/asset_utxos.sql
@@ -66,7 +66,7 @@ BEGIN
       tx_out.index::smallint,
       tx_out.address::text,
       tx_out.value::text,
-      sa.view::text as stake_address,
+      grest.cip5_hex_to_stake_addr(sa.hash_raw)::text as stake_address,
       ENCODE(tx_out.payment_cred, 'hex') AS payment_cred,
       b.epoch_no,
       b.block_no,

diff --git a/files/grest/rpc/assets/policy_asset_addresses.sql b/files/grest/rpc/assets/policy_asset_addresses.sql
@@ -28,7 +28,7 @@ BEGIN
           SELECT
             atoc.ma_id,
             txo.address,
-            sa.view AS stake_address,
+            grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
             atoc.quantity
           FROM grest.asset_tx_out_cache AS atoc
           LEFT JOIN multi_asset AS ma ON ma.id = atoc.ma_id
@@ -47,7 +47,7 @@ BEGIN
       SELECT
         ENCODE(ma.name, 'hex') AS asset_name,
         txo.address,
-        sa.view AS stake_address,
+        grest.cip5_hex_to_stake_addr(sa.hash_raw) AS stake_address,
         SUM(mto.quantity)::text
       FROM multi_asset AS ma
       LEFT JOIN ma_tx_out AS mto ON mto.ident = ma.id
@@ -58,7 +58,7 @@ BEGIN
       GROUP BY
         ma.name,
         txo.address,
-        sa.view;
+        sa.hash_raw;
   END IF;
 END;
 $$;

diff --git a/files/grest/rpc/blocks/block_info.sql b/files/grest/rpc/blocks/block_info.sql
@@ -59,7 +59,7 @@ BEGIN
     b.vrf_key,
     ENCODE(b.op_cert::bytea, 'hex') AS op_cert,
     b.op_cert_counter,
-    ph.view AS pool,
+    b32_encode('pool', DECODE(ph.hash_raw,'hex')::text) AS pool,
     b.proto_major,
     b.proto_minor,
     block_data.total_output::text,

diff --git a/files/grest/rpc/blocks/blocks.sql b/files/grest/rpc/blocks/blocks.sql
@@ -27,7 +27,7 @@ AS $$
     EXTRACT(EPOCH FROM b.time)::integer AS block_time,
     b.tx_count,
     b.vrf_key,
-    ph.view AS pool,
+    b32_encode('pool', DECODE(ph.hash_raw,'hex')::text) AS pool,
     b.proto_major,
     b.proto_minor,
     b.op_cert_counter,