Move hot key committee to a new table

Fixes #1571

Author: kderme

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

@@ -35,7 +35,7 @@ import Cardano.DbSync.Cache (
  )
 import Cardano.DbSync.Cache.Types (Cache (..), CacheNew (..))
 import qualified Cardano.DbSync.Era.Shelley.Generic as Generic
-import Cardano.DbSync.Era.Universal.Insert.GovAction (insertCredDrepHash, insertDrep, insertVotingAnchor)
+import Cardano.DbSync.Era.Universal.Insert.GovAction (insertCommitteeHash, insertCredDrepHash, insertDrep, insertVotingAnchor)
 import Cardano.DbSync.Era.Universal.Insert.Pool (IsPoolMember, insertPoolCert)
 import Cardano.DbSync.Error
 import Cardano.DbSync.Types
@@ -280,14 +280,15 @@ insertCommitteeRegistration ::
   Ledger.Credential 'ColdCommitteeRole StandardCrypto ->
   Ledger.Credential 'HotCommitteeRole StandardCrypto ->
   ReaderT SqlBackend m ()
-insertCommitteeRegistration txId idx khCold khHot = do
+insertCommitteeRegistration txId idx khCold cred = do
+  khHotId <- insertCommitteeHash cred
   void
     . DB.insertCommitteeRegistration
     $ DB.CommitteeRegistration
       { DB.committeeRegistrationTxId = txId
       , DB.committeeRegistrationCertIndex = idx
       , DB.committeeRegistrationColdKey = Generic.unCredentialHash khCold
-      , DB.committeeRegistrationHotKey = Generic.unCredentialHash khHot
+      , DB.committeeRegistrationHotKeyId = khHotId
       }
 
 insertCommitteeDeRegistration ::

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

@@ -17,6 +17,7 @@ module Cardano.DbSync.Era.Universal.Insert.GovAction (
   insertGovActionProposal,
   insertParamProposal,
   insertVotingProcedures,
+  insertCommitteeHash,
   insertVotingAnchor,
   resolveGovActionProposal,
   updateEnacted,
@@ -254,9 +255,10 @@ insertVotingProcedure ::
 insertVotingProcedure trce cache txId voter (index, (gaId, vp)) = do
   govActionId <- resolveGovActionProposal gaId
   votingAnchorId <- whenMaybe (strictMaybeToMaybe $ vProcAnchor vp) $ lift . insertVotingAnchor txId
-  (mCommitteeVoter, mDRepVoter, mStakePoolVoter) <- case voter of
-    CommitteeVoter cred ->
-      pure (Just $ Generic.unCredentialHash cred, Nothing, Nothing)
+  (mCommitteeVoterId, mDRepVoter, mStakePoolVoter) <- case voter of
+    CommitteeVoter cred -> do
+      khId <- lift $ insertCommitteeHash cred
+      pure (Just khId, Nothing, Nothing)
     DRepVoter cred -> do
       drep <- lift $ insertCredDrepHash cred
       pure (Nothing, Just drep, Nothing)
@@ -270,7 +272,7 @@ insertVotingProcedure trce cache txId voter (index, (gaId, vp)) = do
       { DB.votingProcedureTxId = txId
       , DB.votingProcedureIndex = index
       , DB.votingProcedureGovActionProposalId = govActionId
-      , DB.votingProcedureCommitteeVoter = mCommitteeVoter
+      , DB.votingProcedureCommitteeVoter = mCommitteeVoterId
       , DB.votingProcedureDrepVoter = mDRepVoter
       , DB.votingProcedurePoolVoter = mStakePoolVoter
       , DB.votingProcedureVoterRole = Generic.toVoterRole voter
@@ -296,6 +298,14 @@ insertAnchor txId anchor =
       , DB.votingAnchorDataHash = Generic.safeHashToByteString $ anchorDataHash anchor
       }
 
+insertCommitteeHash :: (MonadBaseControl IO m, MonadIO m) => Ledger.Credential kr StandardCrypto -> ReaderT SqlBackend m DB.CommitteeHashId
+insertCommitteeHash cred = do
+  DB.insertCommitteeHash
+    DB.CommitteeHash
+      { DB.committeeHashRaw = Generic.unCredentialHash cred
+      , DB.committeeHashHasScript = Generic.hasCredScript cred
+      }
+
 --------------------------------------------------------------------------------------
 -- DREP
 --------------------------------------------------------------------------------------

cardano-db/src/Cardano/Db/Insert.hs

@@ -74,6 +74,7 @@ module Cardano.Db.Insert (
   insertNewCommittee,
   insertVotingProcedure,
   insertDrepHash,
+  insertCommitteeHash,
   insertDelegationVote,
   insertCommitteeRegistration,
   insertCommitteeDeRegistration,
@@ -404,6 +405,9 @@ insertVotingProcedure = insertUnchecked "VotingProcedure"
 insertDrepHash :: (MonadBaseControl IO m, MonadIO m) => DrepHash -> ReaderT SqlBackend m DrepHashId
 insertDrepHash = insertCheckUnique "DrepHash"
 
+insertCommitteeHash :: (MonadBaseControl IO m, MonadIO m) => CommitteeHash -> ReaderT SqlBackend m CommitteeHashId
+insertCommitteeHash = insertCheckUnique "CommitteeHash"
+
 insertDelegationVote :: (MonadBaseControl IO m, MonadIO m) => DelegationVote -> ReaderT SqlBackend m DelegationVoteId
 insertDelegationVote = insertUnchecked "DelegationVote"
 

cardano-db/src/Cardano/Db/Query.hs

@@ -60,6 +60,7 @@ module Cardano.Db.Query (
   queryGovActionProposalId,
   queryDrepHashAlwaysAbstain,
   queryDrepHashAlwaysNoConfidence,
+  queryCommitteeHash,
   -- queries used in smash
   queryOffChainPoolData,
   queryPoolRegister,
@@ -807,6 +808,14 @@ queryDrepHashAlwaysNoConfidence = do
     pure $ dh ^. DrepHashId
   pure $ unValue <$> listToMaybe res
 
+queryCommitteeHash :: MonadIO m => ByteString -> ReaderT SqlBackend m (Maybe CommitteeHashId)
+queryCommitteeHash hash = do
+  res <- select $ do
+    ch <- from $ table @CommitteeHash
+    where_ (ch ^. CommitteeHashRaw ==. val hash)
+    pure $ ch ^. CommitteeHashId
+  pure $ unValue <$> listToMaybe res
+
 {--------------------------------------------
   Queries use in SMASH
 ----------------------------------------------}

cardano-db/src/Cardano/Db/Schema.hs

@@ -554,7 +554,12 @@ share
     raw                 ByteString Maybe   sqltype=hash28type
     view                Text
     hasScript           Bool
-    UniqueDrepHash      raw !force
+    UniqueDrepHash      raw hasScript !force
+
+  CommitteeHash
+    raw                 ByteString         sqltype=hash28type
+    hasScript           Bool
+    UniqueCommitteeHash raw hasScript
 
   DelegationVote
     addrId              StakeAddressId      noreference
@@ -567,7 +572,7 @@ share
     txId                TxId                noreference
     certIndex           Word16
     coldKey             ByteString          sqltype=hash28type
-    hotKey              ByteString          sqltype=hash28type
+    hotKeyId            CommitteeHashId     noreference
 
   CommitteeDeRegistration
     txId                TxId                noreference
@@ -626,7 +631,7 @@ share
     index                Word16
     govActionProposalId   GovActionProposalId   noreference
     voterRole            VoterRole            sqltype=voterrole
-    committeeVoter       ByteString Maybe
+    committeeVoter       CommitteeHashId Maybe noreference
     drepVoter            DrepHashId Maybe     noreference
     poolVoter            PoolHashId Maybe     noreference
     vote                 Vote                 sqltype=vote
@@ -1182,12 +1187,17 @@ schemaDocs =
 
     DrepHash --^ do
       "A table for every unique drep key hash.\
-      \ The existance of an entry doesn't mean the DRep is registered or in fact that is was ever registered.\
+      \ The existance of an entry doesn't mean the DRep is registered.\
       \ New in 13.2-Conway."
       DrepHashRaw # "The raw bytes of the DRep."
       DrepHashView # "The human readable encoding of the Drep."
       DrepHashHasScript # "Flag which shows if this DRep credentials are a script hash"
 
+    CommitteeHash --^ do
+      "A table for all committee hot credentials"
+      CommitteeHashRaw # "The key or script hash"
+      CommitteeHashHasScript # "Flag which shows if this credential is a script hash"
+
     DelegationVote --^ do
       "A table containing delegations from a stake address to a stake pool. New in 13.2-Conway."
       DelegationVoteAddrId # "The StakeAddress table index for the stake address."
@@ -1201,7 +1211,7 @@ schemaDocs =
       CommitteeRegistrationTxId # "The Tx table index of the tx that includes this certificate."
       CommitteeRegistrationCertIndex # "The index of this registration within the certificates of this transaction."
       CommitteeRegistrationColdKey # "The registered cold hey hash. TODO: should this reference DrepHashId or some separate hash table?"
-      CommitteeRegistrationHotKey # "The registered hot hey hash"
+      CommitteeRegistrationHotKeyId # "The registered hot hey hash id"
 
     CommitteeDeRegistration --^ do
       "A table for every committee key de-registration. New in 13.2-Conway."
@@ -1273,7 +1283,9 @@ schemaDocs =
       VotingProcedureIndex # "The index of this VotingProcedure within this transaction."
       VotingProcedureGovActionProposalId # "The index of the GovActionProposal that this vote targets."
       VotingProcedureVoterRole # "The role of the voter. Can be one of ConstitutionalCommittee, DRep, SPO."
-      VotingProcedureCommitteeVoter # ""
+      VotingProcedureCommitteeVoter # "A reference to the hot key committee hash entry that voted"
+      VotingProcedureDrepVoter # "A reference to the drep hash entry that voted"
+      VotingProcedurePoolVoter # "A reference to the pool hash entry that voted"
       VotingProcedureVote # "The Vote. Can be one of Yes, No, Abstain."
       VotingProcedureVotingAnchorId # "The VotingAnchor table index associated with this VotingProcedure."