Merge branch 'dev' into 'main'

fix(Action expiration): update the expiry time of an action  to reference that...

See merge request voltaire/govtool-outcomes-pillar!81

Author: profd2004

backend/src/queries/governanceAction.ts

@@ -264,10 +264,10 @@ CommitteeVotes AS (
 ),
 StatusTimes AS (
     SELECT
-        e_ratified.end_time AS ratified_time,
-        e_enacted.end_time AS enacted_time,
-        e_dropped.end_time AS dropped_time,
-        e_expired.end_time AS expired_time
+        e_ratified.start_time AS ratified_time,
+        e_enacted.start_time AS enacted_time,
+        e_dropped.start_time AS dropped_time,
+        e_expired.start_time AS expired_time
     FROM
         TargetAction ta
     LEFT JOIN epoch e_ratified ON ta.ratified_epoch = e_ratified.no

backend/src/queries/governanceActions.ts

@@ -19,7 +19,7 @@ LatestEpoch AS (
 EpochTimes AS (
     SELECT
         no,
-        end_time
+        start_time
     FROM
         epoch
 ),
@@ -209,10 +209,10 @@ SELECT
         'expired_epoch', gov_action_proposal.expired_epoch
     ) AS status,
     JSON_BUILD_OBJECT(
-        'ratified_time', e_ratified.end_time,
-        'enacted_time', e_enacted.end_time,
-        'dropped_time', e_dropped.end_time,
-        'expired_time', e_expired.end_time
+        'ratified_time', e_ratified.start_time,
+        'enacted_time', e_enacted.start_time,
+        'dropped_time', e_dropped.start_time,
+        'expired_time', e_expired.start_time
     ) AS status_times
 FROM
     RankedProposals rp

backend/src/queries/networkMetrics.ts

@@ -116,8 +116,7 @@ LatestPoolDelegations AS (
     JOIN tx dv_tx ON dv.tx_id = dv_tx.id
     JOIN block dv_block ON dv_tx.block_id = dv_block.id
     JOIN stake_address sa ON dv.addr_id = sa.id
-    JOIN pool_owner po ON po.addr_id = sa.id
-    JOIN pool_update pu ON pu.id = po.pool_update_id
+    JOIN pool_update pu ON pu.reward_addr_id = sa.id
     JOIN pool_hash ph ON pu.hash_id = ph.id
     JOIN drep_hash dh ON dv.drep_hash_id = dh.id
     CROSS JOIN CurrentEpoch ce

ui/src/Components/SingleAction/GovernanceVoting.tsx

@@ -98,11 +98,15 @@ const GovernanceVoting = ({ action }: GovernanceVotingProps) => {
   const totalStakeControlledByAlwaysAbstain =
     Number(networkMetrics?.always_abstain_voting_power) ?? 0;
   const totalStakeControlledByAlwaysAbstainForSPOs =
-    Number(networkMetrics?.spos_abstain_voting_power) ?? 0;
+    action.type !== "HardForkInitiation"
+      ? Number(networkMetrics?.spos_abstain_voting_power)
+      : 0;
   const totalStakeControlledByNoConfidence =
     Number(networkMetrics?.always_no_confidence_voting_power) ?? 0;
   const totalStakeControlledByNoConfidenceForSPOs =
-    Number(networkMetrics?.spos_no_confidence_voting_power) ?? 0;
+    action.type !== "HardForkInitiation"
+      ? Number(networkMetrics?.spos_no_confidence_voting_power)
+      : 0;
   const totalStakeControlledByDReps =
     Number(networkMetrics?.total_stake_controlled_by_active_dreps) ?? 0;
   const totalStakeControlledBySPOs = Number(