Zip proposals with their GovActionId

Author: kderme

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Conway.hs

@@ -21,10 +21,11 @@ import Cardano.Ledger.BaseTypes
 import Cardano.Ledger.Conway.Governance
 import Cardano.Ledger.Conway.TxBody
 import qualified Cardano.Ledger.Core as Core
+import Cardano.Ledger.TxIn
 import Cardano.Prelude
 import qualified Data.Map.Strict as Map
 import Lens.Micro
-import Ouroboros.Consensus.Cardano.Block (StandardConway)
+import Ouroboros.Consensus.Cardano.Block (StandardConway, StandardCrypto)
 
 fromConwayTx :: Bool -> Maybe Alonzo.Prices -> (Word64, Core.Tx StandardConway) -> Tx
 fromConwayTx ioExtraPlutus mprices (blkIndex, tx) =
@@ -68,12 +69,15 @@ fromConwayTx ioExtraPlutus mprices (blkIndex, tx) =
     , txScripts = getScripts tx
     , txExtraKeyWitnesses = extraKeyWits txBody
     , txVotingProcedure = Map.toList $ fmap Map.toList (unVotingProcedures $ ctbVotingProcedures txBody)
-    , txProposalProcedure = toList $ ctbProposalProcedures txBody
+    , txProposalProcedure = zipWith mkProposalIndex [0 ..] $ toList $ ctbProposalProcedures txBody
     }
   where
     txBody :: Core.TxBody StandardConway
     txBody = tx ^. Core.bodyTxL
 
+    txId :: TxId StandardCrypto
+    txId = mkTxId tx
+
     outputs :: [TxOut]
     outputs = zipWith Babbage.fromTxOut [0 ..] $ toList (txBody ^. Core.outputsTxBodyL)
 
@@ -98,3 +102,6 @@ fromConwayTx ioExtraPlutus mprices (blkIndex, tx) =
     (invalidBef, invalidAfter) = getInterval txBody
 
     collInputs = mkCollTxIn txBody
+
+    mkProposalIndex :: Word32 -> a -> (GovActionId StandardCrypto, a)
+    mkProposalIndex gix a = (GovActionId txId (GovActionIx gix), a)

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Shelley.hs

@@ -22,6 +22,7 @@ module Cardano.DbSync.Era.Shelley.Generic.Tx.Shelley (
   getTxMetadata,
   mkTxParamProposal,
   txHashId,
+  mkTxId,
   txHashFromSafe,
 ) where
 
@@ -128,7 +129,13 @@ fromTxIn (Ledger.TxIn (Ledger.TxId txid) (TxIx w64)) =
     }
 
 txHashId :: (EraCrypto era ~ StandardCrypto, Core.EraTx era) => Core.Tx era -> ByteString
-txHashId tx = safeHashToByteString $ Ledger.hashAnnotated (tx ^. Core.bodyTxL)
+txHashId = safeHashToByteString . txSafeHash
+
+txSafeHash :: (EraCrypto era ~ StandardCrypto, Core.EraTx era) => Core.Tx era -> Ledger.SafeHash StandardCrypto Core.EraIndependentTxBody
+txSafeHash tx = Ledger.hashAnnotated (tx ^. Core.bodyTxL)
+
+mkTxId :: (EraCrypto era ~ StandardCrypto, Core.EraTx era) => Core.Tx era -> Ledger.TxId StandardCrypto
+mkTxId = Ledger.TxId . txSafeHash
 
 txHashFromSafe :: Ledger.SafeHash StandardCrypto Core.EraIndependentTxBody -> ByteString
 txHashFromSafe = Crypto.hashToBytes . Ledger.extractHash

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Types.hs

@@ -73,7 +73,7 @@ data Tx = Tx
   , txScripts :: [TxScript]
   , txExtraKeyWitnesses :: ![ByteString]
   , txVotingProcedure :: ![(Voter StandardCrypto, [(GovActionId StandardCrypto, VotingProcedure StandardConway)])]
-  , txProposalProcedure :: ![ProposalProcedure StandardConway]
+  , txProposalProcedure :: ![(GovActionId StandardCrypto, ProposalProcedure StandardConway)]
   }
 
 type ShelleyCert = ShelleyTxCert StandardShelley

cardano-db-sync/src/Cardano/DbSync/Era/Universal/Insert/Tx.hs

@@ -184,7 +184,7 @@ insertTx syncEnv isMember blkId epochNo slotNo applyResult blockIndex tx grouped
           Generic.txExtraKeyWitnesses tx
 
       when (ioGov iopts) $ do
-        mapM_ (insertGovActionProposal tracer cache blkId txId (getGovExpiresAt applyResult epochNo) (apCommittee applyResult)) $ zip [0 ..] (Generic.txProposalProcedure tx)
+        mapM_ (insertGovActionProposal tracer cache blkId txId (getGovExpiresAt applyResult epochNo) (apCommittee applyResult)) $ zip [0 ..] (snd <$> Generic.txProposalProcedure tx)
         mapM_ (insertVotingProcedures tracer cache blkId txId) (Generic.txVotingProcedure tx)
 
       let !txIns = map (prepareTxIn txId redeemers) resolvedInputs