Add support for supplementary datums

IntersectMBO · Oct 21, 2024 · 67a9191 · 67a9191
1 parent 235cb3e
commit 67a9191
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Transaction.hs
@@ -75,6 +75,7 @@ data TransactionBuildRawCmdArgs era = TransactionBuildRawCmdArgs
   , metadataSchema :: !TxMetadataJsonSchema
   , scriptFiles :: ![ScriptFile]
   -- ^ Auxiliary scripts
+  , supplementaryDatums :: ![ScriptDataOrFile]
   , metadataFiles :: ![MetadataFile]
   , mProtocolParamsFile :: !(Maybe ProtocolParamsFile)
   , mUpdateProprosalFile :: !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
@@ -124,6 +125,7 @@ data TransactionBuildCmdArgs era = TransactionBuildCmdArgs
   , metadataSchema :: !TxMetadataJsonSchema
   , scriptFiles :: ![ScriptFile]
   -- ^ Auxiliary scripts
+  , supplementaryDatums :: ![ScriptDataOrFile]
   , metadataFiles :: ![MetadataFile]
   , mUpdateProposalFile :: !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
   , voteFiles :: ![(VoteFile In, Maybe (ScriptWitnessFiles WitCtxStake))]
@@ -174,6 +176,7 @@ data TransactionBuildEstimateCmdArgs era = TransactionBuildEstimateCmdArgs
   , metadataSchema :: !TxMetadataJsonSchema
   , scriptFiles :: ![ScriptFile]
   -- ^ Auxiliary scripts
+  , supplementaryDatums :: ![ScriptDataOrFile]
   , metadataFiles :: ![MetadataFile]
   , mUpdateProposalFile :: !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
   , voteFiles :: ![(VoteFile In, Maybe (ScriptWitnessFiles WitCtxStake))]

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs
@@ -193,6 +193,7 @@ pTransactionBuildCmd sbe envCli = do
               Nothing
               "Filepath of auxiliary script(s)"
           )
+        <*> many (pScriptDataOrFile "supplementary-datum" "The supplementary datum." "The supplementary datum file.")
         <*> many pMetadataFile
         <*> pFeatured (toCardanoEra sbe) (optional pUpdateProposalFile)
         <*> pVoteFiles sbe AutoBalance
@@ -255,6 +256,7 @@ pTransactionBuildEstimateCmd eon' _envCli = do
               Nothing
               "Filepath of auxiliary script(s)"
           )
+        <*> many (pScriptDataOrFile "supplementary-datum" "The supplementary datum." "The supplementary datum file.") 
         <*> many pMetadataFile
         <*> pFeatured (toCardanoEra sbe) (optional pUpdateProposalFile)
         <*> pVoteFiles sbe ManualBalance
@@ -292,6 +294,7 @@ pTransactionBuildRaw era' =
       <*> many (pWithdrawal era' ManualBalance)
       <*> pTxMetadataJsonSchema
       <*> many (pScriptFor "auxiliary-script-file" Nothing "Filepath of auxiliary script(s)")
+      <*> many (pScriptDataOrFile "supplementary-datum" "The supplementary datum." "The supplementary datum file.")
       <*> many pMetadataFile
       <*> optional pProtocolParamsFile
       <*> pFeatured era' (optional pUpdateProposalFile)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs
@@ -124,6 +124,7 @@ runTransactionBuildCmd
     , certificates
     , withdrawals
     , metadataSchema
+    , supplementaryDatums
     , scriptFiles
     , metadataFiles
     , mUpdateProposalFile
@@ -168,6 +169,10 @@ runTransactionBuildCmd
       firstExceptT TxCmdMetadataError . newExceptT $
         readTxMetadata eon metadataSchema metadataFiles
     valuesWithScriptWits <- readValueScriptWitnesses eon $ fromMaybe mempty mValue
+
+    txSupplementaryDatums <-
+      firstExceptT TxCmdScriptDataError $ readTxSupplementaryDatums supplementaryDatums
+
     scripts <-
       firstExceptT TxCmdScriptFileError $
         mapM (readFileScriptInAnyLang . unFile) scriptFiles
@@ -255,6 +260,7 @@ runTransactionBuildCmd
         withdrawalsAndMaybeScriptWits
         requiredSigners
         txAuxScripts
+        txSupplementaryDatums
         txMetadata
         mProp
         mOverrideWitnesses
@@ -330,6 +336,7 @@ runTransactionBuildEstimateCmd -- TODO change type
     , withdrawals
     , metadataSchema
     , scriptFiles
+    , supplementaryDatums
     , metadataFiles
     , mUpdateProposalFile
     , voteFiles
@@ -365,6 +372,9 @@ runTransactionBuildEstimateCmd -- TODO change type
     txAuxScripts <-
       hoistEither $ first TxCmdAuxScriptsValidationError $ validateTxAuxScripts sbe scripts
 
+    txSupplementalDatums <-
+      firstExceptT TxCmdScriptDataError $ readTxSupplementaryDatums supplementaryDatums
+
     txUpdateProposal <- case mUpdateProposalFile of
       Just (Featured w (Just updateProposalFile)) ->
         readTxUpdateProposal w updateProposalFile & firstExceptT TxCmdReadTextViewFileError
@@ -426,6 +436,7 @@ runTransactionBuildEstimateCmd -- TODO change type
           requiredSigners
           0
           txAuxScripts
+          txSupplementalDatums
           txMetadata
           txUpdateProposal
           votingProceduresAndMaybeScriptWits
@@ -570,6 +581,7 @@ runTransactionBuildRawCmd
     , withdrawals
     , metadataSchema
     , scriptFiles
+    , supplementaryDatums
     , metadataFiles
     , mProtocolParamsFile
     , mUpdateProprosalFile
@@ -596,6 +608,10 @@ runTransactionBuildRawCmd
     scripts <-
       firstExceptT TxCmdScriptFileError $
         mapM (readFileScriptInAnyLang . unFile) scriptFiles
+
+    txSupplementaryDatums <-
+      firstExceptT TxCmdScriptDataError $ readTxSupplementaryDatums supplementaryDatums
+
     txAuxScripts <-
       hoistEither $ first TxCmdAuxScriptsValidationError $ validateTxAuxScripts eon scripts
 
@@ -663,6 +679,7 @@ runTransactionBuildRawCmd
           withdrawalsAndMaybeScriptWits
           requiredSigners
           txAuxScripts
+          txSupplementaryDatums
           txMetadata
           mLedgerPParams
           txUpdateProposal
@@ -704,6 +721,7 @@ runTxBuildRaw
   -> [Hash PaymentKey]
   -- ^ Required signers
   -> TxAuxScripts era
+  -> TxSupplementalDatums era
   -> TxMetadataInEra era
   -> Maybe (LedgerProtocolParameters era)
   -> TxUpdateProposal era
@@ -728,6 +746,7 @@ runTxBuildRaw
   withdrawals
   reqSigners
   txAuxScripts
+  txSupplementalDatums
   txMetadata
   mpparams
   txUpdateProposal
@@ -753,6 +772,7 @@ runTxBuildRaw
         reqSigners
         fee
         txAuxScripts
+        txSupplementalDatums
         txMetadata
         txUpdateProposal
         votingProcedures
@@ -793,6 +813,7 @@ constructTxBodyContent
   -> Lovelace
   -- ^ Tx fee
   -> TxAuxScripts era
+  -> TxSupplementalDatums era
   -> TxMetadataInEra era
   -> TxUpdateProposal era
   -> [(VotingProcedures era, Maybe (ScriptWitness WitCtxStake era))]
@@ -820,6 +841,7 @@ constructTxBodyContent
   reqSigners
   fee
   txAuxScripts
+  txSupplementalDatums
   txMetadata
   txUpdateProposal
   votingProcedures
@@ -879,6 +901,7 @@ constructTxBodyContent
               & setTxValidityLowerBound validatedLowerBound
               & setTxValidityUpperBound mUpperBound
               & setTxMetadata txMetadata
+              & setTxSupplementalDatums txSupplementalDatums
               & setTxAuxScripts txAuxScripts
               & setTxExtraKeyWits validatedReqSigners
               & setTxProtocolParams (BuildTxWith $ LedgerProtocolParameters <$> mPparams)
@@ -934,6 +957,7 @@ runTxBuild
   -> [Hash PaymentKey]
   -- ^ Required signers
   -> TxAuxScripts era
+  -> TxSupplementalDatums era
   -> TxMetadataInEra era
   -> TxUpdateProposal era
   -> Maybe Word
@@ -961,6 +985,7 @@ runTxBuild
   withdrawals
   reqSigners
   txAuxScripts
+  txSupplementaryData
   txMetadata
   txUpdateProposal
   mOverrideWits
@@ -1033,6 +1058,7 @@ runTxBuild
             reqSigners
             0
             txAuxScripts
+            txSupplementaryData
             txMetadata
             txUpdateProposal
             votingProcedures

diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -29,6 +29,7 @@ module Cardano.CLI.Read
   , ScriptDataError (..)
   , readScriptDatumOrFile
   , readScriptRedeemerOrFile
+  , readTxSupplementaryDatums
   , renderScriptDataError
 
     -- * Tx
@@ -490,6 +491,11 @@ readScriptDataOrFile (ScriptDataCborFile fp) = do
         getScriptData hSd
   return hSd
 
+readTxSupplementaryDatums ::  [ScriptDataOrFile] -> ExceptT ScriptDataError IO (TxSupplementalDatums era)
+readTxSupplementaryDatums supplementaryDatums = 
+  TxSupplementalDatums <$> mapM readScriptDataOrFile supplementaryDatums
+
+
 readVerificationKeyOrHashOrFileOrScript
   :: MonadIOTransError (Either (FileError ScriptDecodeError) (FileError InputDecodeError)) t m
   => Key keyrole