From 246faeabf90e688982aa732645b4c9113f410d2c Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:42:51 +0200 Subject: [PATCH 01/10] Modify ScriptDatumOrFile to make spending datums optional --- cardano-cli/src/Cardano/CLI/Types/Common.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cardano-cli/src/Cardano/CLI/Types/Common.hs b/cardano-cli/src/Cardano/CLI/Types/Common.hs index 63c6459017..4ba096442a 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Common.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Common.hs @@ -415,7 +415,7 @@ deriving instance Show (ScriptWitnessFiles witctx) data ScriptDatumOrFile witctx where ScriptDatumOrFileForTxIn - :: ScriptDataOrFile + :: Maybe ScriptDataOrFile -- CIP-0069 - Spending datums optional in Conway era onwards -> ScriptDatumOrFile WitCtxTxIn InlineDatumPresentAtTxIn :: ScriptDatumOrFile WitCtxTxIn NoScriptDatumOrFileForMint :: ScriptDatumOrFile WitCtxMint From be8eef59e1473515c5ccfdff5b87319c3f72cccf Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:20:16 +0200 Subject: [PATCH 02/10] Introduce pScriptDatumOrFileCip69 parser that makes supplying a datum for a spending script optional --- .../Cardano/CLI/EraBased/Options/Common.hs | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 2e2ad6349b..b5d8b33ab0 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1243,6 +1243,31 @@ pScriptRedeemerOrFile scriptFlagPrefix = "The script redeemer value." "The script redeemer file." +pScriptDatumOrFileCip69 :: String -> WitCtx witctx -> Parser (ScriptDatumOrFile witctx) +pScriptDatumOrFileCip69 scriptFlagPrefix witctx = + case witctx of + WitCtxTxIn -> + asum + [ ScriptDatumOrFileForTxIn + <$> optional + ( pScriptDataOrFile + (scriptFlagPrefix ++ "-datum") + "The script datum." + "The script datum file." + ) + , pInlineDatumPresent + ] + WitCtxMint -> pure NoScriptDatumOrFileForMint + WitCtxStake -> pure NoScriptDatumOrFileForStake + where + pInlineDatumPresent :: Parser (ScriptDatumOrFile WitCtxTxIn) + pInlineDatumPresent = + flag' InlineDatumPresentAtTxIn $ + mconcat + [ long (scriptFlagPrefix ++ "-inline-datum-present") + , Opt.help "Inline datum present at transaction input." + ] + pScriptDatumOrFile :: String -> WitCtx witctx -> Parser (ScriptDatumOrFile witctx) pScriptDatumOrFile scriptFlagPrefix witctx = case witctx of From e47a35ce1299cb291b4c726f1431c265e3e4d710 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:32:24 +0200 Subject: [PATCH 03/10] Parameterize pScriptWitnessFiles on ShelleyBasedEra era so that we can relax the datum requirement of spending scripts in the conway era --- .../src/Cardano/CLI/EraBased/Options/Common.hs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index b5d8b33ab0..947d9ee25e 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1190,8 +1190,9 @@ pPollNonce = -------------------------------------------------------------------------------- pScriptWitnessFiles - :: forall witctx - . WitCtx witctx + :: forall witctx era + . ShelleyBasedEra era + -> WitCtx witctx -> BalanceTxExecUnits -- ^ Use the @execution-units@ flag. -> String @@ -1199,7 +1200,7 @@ pScriptWitnessFiles -> Maybe String -> String -> Parser (ScriptWitnessFiles witctx) -pScriptWitnessFiles witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefixDeprecated help = +pScriptWitnessFiles sbe witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefixDeprecated help = toScriptWitnessFiles <$> pScriptFor (scriptFlagPrefix ++ "-script-file") @@ -1207,7 +1208,7 @@ pScriptWitnessFiles witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefi ("The file containing the script to witness " ++ help) <*> optional ( (,,) - <$> pScriptDatumOrFile scriptFlagPrefix witctx + <$> cip69Modification sbe <*> pScriptRedeemerOrFile scriptFlagPrefix <*> ( case autoBalanceExecUnits of AutoBalance -> pure (ExecutionUnits 0 0) @@ -1215,6 +1216,12 @@ pScriptWitnessFiles witctx autoBalanceExecUnits scriptFlagPrefix scriptFlagPrefi ) ) where + cip69Modification :: ShelleyBasedEra era -> Parser (ScriptDatumOrFile witctx) + cip69Modification = + caseShelleyToBabbageOrConwayEraOnwards + (const $ pScriptDatumOrFile scriptFlagPrefix witctx) + (const $ pScriptDatumOrFileCip69 scriptFlagPrefix witctx) + toScriptWitnessFiles :: ScriptFile -> Maybe From 1f455ca598c6a66d93f400a1fe0ddd531c76b387 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:43:49 +0200 Subject: [PATCH 04/10] Modify the voting script parser to allow specification of reference script witnesses --- .../src/Cardano/CLI/EraBased/Options/Common.hs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 947d9ee25e..88977b7edd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1368,11 +1368,14 @@ pVoteFiles pVoteFiles sbe bExUnits = caseShelleyToBabbageOrConwayEraOnwards (const $ pure []) - (const . many $ pVoteFile bExUnits) + (const . many $ pVoteFile sbe bExUnits) sbe -pVoteFile :: BalanceTxExecUnits -> Parser (VoteFile In, Maybe (ScriptWitnessFiles WitCtxStake)) -pVoteFile balExUnits = +pVoteFile + :: ShelleyBasedEra era + -> BalanceTxExecUnits + -> Parser (VoteFile In, Maybe (ScriptWitnessFiles WitCtxStake)) +pVoteFile sbe balExUnits = (,) <$> pFileInDirection "vote-file" "Filepath of the vote." <*> optional (pVoteScriptOrReferenceScriptWitness balExUnits) @@ -1381,11 +1384,13 @@ pVoteFile balExUnits = :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxStake) pVoteScriptOrReferenceScriptWitness bExUnits = pScriptWitnessFiles + sbe WitCtxStake bExUnits "vote" Nothing "a vote" + <|> pPlutusStakeReferenceScriptWitnessFilesVotingProposing "vote-" balExUnits pProposalFiles :: ShelleyBasedEra era From 0f2704be8febabc6160164b8d0375494f93589b7 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:48:08 +0200 Subject: [PATCH 05/10] Implement parser for proposing or voting reference script witnesses --- .../Cardano/CLI/EraBased/Options/Common.hs | 35 ++++++++++++++----- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 88977b7edd..663b38e917 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1716,6 +1716,23 @@ pWithdrawal balance = parseWithdrawal = (,) <$> parseStakeAddress <* Parsec.char '+' <*> parseLovelace +pPlutusStakeReferenceScriptWitnessFilesVotingProposing + :: String + -> BalanceTxExecUnits + -- ^ Use the @execution-units@ flag. + -> Parser (ScriptWitnessFiles WitCtxStake) +pPlutusStakeReferenceScriptWitnessFilesVotingProposing prefix autoBalanceExecUnits = + PlutusReferenceScriptWitnessFiles + <$> pReferenceTxIn prefix "plutus" + <*> plutusP prefix PlutusScriptV3 "v3" + <*> pure NoScriptDatumOrFileForStake + <*> pScriptRedeemerOrFile (prefix ++ "reference-tx-in") + <*> ( case autoBalanceExecUnits of + AutoBalance -> pure (ExecutionUnits 0 0) + ManualBalance -> pExecutionUnits $ prefix ++ "reference-tx-in" + ) + <*> pure Nothing + pPlutusStakeReferenceScriptWitnessFiles :: String -> BalanceTxExecUnits @@ -1734,15 +1751,15 @@ pPlutusStakeReferenceScriptWitnessFiles prefix autoBalanceExecUnits = <*> pure Nothing pPlutusScriptLanguage :: String -> Parser AnyScriptLanguage -pPlutusScriptLanguage prefix = plutusP PlutusScriptV2 "v2" <|> plutusP PlutusScriptV3 "v3" - where - plutusP :: PlutusScriptVersion lang -> String -> Parser AnyScriptLanguage - plutusP plutusVersion versionString = - Opt.flag' - (AnyScriptLanguage $ PlutusScriptLanguage plutusVersion) - ( Opt.long (prefix <> "plutus-script-" <> versionString) - <> Opt.help ("Specify a plutus script " <> versionString <> " reference script.") - ) +pPlutusScriptLanguage prefix = plutusP prefix PlutusScriptV2 "v2" <|> plutusP prefix PlutusScriptV3 "v3" + +plutusP :: String -> PlutusScriptVersion lang -> String -> Parser AnyScriptLanguage +plutusP prefix plutusVersion versionString = + Opt.flag' + (AnyScriptLanguage $ PlutusScriptLanguage plutusVersion) + ( Opt.long (prefix <> "plutus-script-" <> versionString) + <> Opt.help ("Specify a plutus script " <> versionString <> " reference script.") + ) pUpdateProposalFile :: Parser UpdateProposalFile pUpdateProposalFile = From d6339c5b60a2b9da7ede8b6e1d506354b6cf15ca Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:44:50 +0200 Subject: [PATCH 06/10] Modify the proposal script parser to allow specification of reference script witnesses --- cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 663b38e917..560ad915ae 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1399,12 +1399,14 @@ pProposalFiles pProposalFiles sbe balExUnits = caseShelleyToBabbageOrConwayEraOnwards (const $ pure []) - (const $ many (pProposalFile balExUnits)) + (const $ many (pProposalFile sbe balExUnits)) sbe pProposalFile - :: BalanceTxExecUnits -> Parser (ProposalFile In, Maybe (ScriptWitnessFiles WitCtxStake)) -pProposalFile balExUnits = + :: ShelleyBasedEra era + -> BalanceTxExecUnits + -> Parser (ProposalFile In, Maybe (ScriptWitnessFiles WitCtxStake)) +pProposalFile sbe balExUnits = (,) <$> pFileInDirection "proposal-file" "Filepath of the proposal." <*> optional (pProposingScriptOrReferenceScriptWitness balExUnits) @@ -1413,11 +1415,13 @@ pProposalFile balExUnits = :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxStake) pProposingScriptOrReferenceScriptWitness bExUnits = pScriptWitnessFiles + sbe WitCtxStake bExUnits "proposal" Nothing "a proposal" + <|> pPlutusStakeReferenceScriptWitnessFilesVotingProposing "proposal-" balExUnits pCurrentTreasuryValueAndDonation :: ShelleyBasedEra era -> Parser (Maybe (TxCurrentTreasuryValue, TxTreasuryDonation)) From 536b9d7b24d6cf3a10fd1e1fe591bd15d2714696 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:52:48 +0200 Subject: [PATCH 07/10] Modify pPlutusReferenceScriptWitness parser to relax the requirement for a spending script datum in Conway --- .../Cardano/CLI/EraBased/Options/Common.hs | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 560ad915ae..37bb1e013f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -2227,17 +2227,33 @@ pTxIn balance = let simpleLang = AnyScriptLanguage SimpleScriptLanguage in SimpleReferenceScriptWitnessFiles refTxIn simpleLang Nothing - pPlutusReferenceScriptWitness :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxTxIn) - pPlutusReferenceScriptWitness autoBalanceExecUnits = - createPlutusReferenceScriptWitnessFiles - <$> pReferenceTxIn "spending-" "plutus" - <*> pPlutusScriptLanguage "spending-" - <*> pScriptDatumOrFile "spending-reference-tx-in" WitCtxTxIn - <*> pScriptRedeemerOrFile "spending-reference-tx-in" - <*> ( case autoBalanceExecUnits of - AutoBalance -> pure (ExecutionUnits 0 0) - ManualBalance -> pExecutionUnits "spending-reference-tx-in" - ) + pPlutusReferenceScriptWitness + :: ShelleyBasedEra era -> BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxTxIn) + pPlutusReferenceScriptWitness sbe' autoBalanceExecUnits = + caseShelleyToBabbageOrConwayEraOnwards + ( const $ + createPlutusReferenceScriptWitnessFiles + <$> pReferenceTxIn "spending-" "plutus" + <*> pPlutusScriptLanguage "spending-" + <*> pScriptDatumOrFile "spending-reference-tx-in" WitCtxTxIn + <*> pScriptRedeemerOrFile "spending-reference-tx-in" + <*> ( case autoBalanceExecUnits of + AutoBalance -> pure (ExecutionUnits 0 0) + ManualBalance -> pExecutionUnits "spending-reference-tx-in" + ) + ) + ( const $ + createPlutusReferenceScriptWitnessFiles + <$> pReferenceTxIn "spending-" "plutus" + <*> pPlutusScriptLanguage "spending-" + <*> pScriptDatumOrFileCip69 "spending-reference-tx-in" WitCtxTxIn + <*> pScriptRedeemerOrFile "spending-reference-tx-in" + <*> ( case autoBalanceExecUnits of + AutoBalance -> pure (ExecutionUnits 0 0) + ManualBalance -> pExecutionUnits "spending-reference-tx-in" + ) + ) + sbe' where createPlutusReferenceScriptWitnessFiles :: TxIn From ad19a1e9bbdb7136b5eff42becded7e8b639c63f Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:53:45 +0200 Subject: [PATCH 08/10] Propagate changes in Cardano.CLI.EraBased.Options.Common --- .../Cardano/CLI/EraBased/Options/Common.hs | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 37bb1e013f..652d35591c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -1280,7 +1280,7 @@ pScriptDatumOrFile scriptFlagPrefix witctx = case witctx of WitCtxTxIn -> asum - [ ScriptDatumOrFileForTxIn + [ ScriptDatumOrFileForTxIn . Just <$> pScriptDataOrFile (scriptFlagPrefix ++ "-datum") "The script datum." @@ -1583,9 +1583,10 @@ pTxBuildOutputOptions = ) pCertificateFile - :: BalanceTxExecUnits + :: ShelleyBasedEra era + -> BalanceTxExecUnits -> Parser (CertificateFile, Maybe (ScriptWitnessFiles WitCtxStake)) -pCertificateFile balanceExecUnits = +pCertificateFile sbe balanceExecUnits = (,) <$> ( fmap CertificateFile $ asum @@ -1605,6 +1606,7 @@ pCertificateFile balanceExecUnits = :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxStake) pCertifyingScriptOrReferenceScriptWit bExecUnits = pScriptWitnessFiles + sbe WitCtxStake balanceExecUnits "certificate" @@ -1682,13 +1684,14 @@ pMetadataFile = ] pWithdrawal - :: BalanceTxExecUnits + :: ShelleyBasedEra era + -> BalanceTxExecUnits -> Parser ( StakeAddress , L.Coin , Maybe (ScriptWitnessFiles WitCtxStake) ) -pWithdrawal balance = +pWithdrawal sbe balance = (\(stakeAddr, lovelace) maybeScriptFp -> (stakeAddr, lovelace, maybeScriptFp)) <$> Opt.option (readerFromParsecParser parseWithdrawal) @@ -1701,6 +1704,7 @@ pWithdrawal balance = pWithdrawalScriptOrReferenceScriptWit :: Parser (ScriptWitnessFiles WitCtxStake) pWithdrawalScriptOrReferenceScriptWit = pScriptWitnessFiles + sbe WitCtxStake balance "withdrawal" @@ -2199,9 +2203,10 @@ pTxSubmitFile = ] pTxIn - :: BalanceTxExecUnits + :: ShelleyBasedEra era + -> BalanceTxExecUnits -> Parser (TxIn, Maybe (ScriptWitnessFiles WitCtxTxIn)) -pTxIn balance = +pTxIn sbe balance = (,) <$> Opt.option (readerFromParsecParser parseTxIn) @@ -2210,7 +2215,7 @@ pTxIn balance = <> Opt.help "TxId#TxIx" ) <*> optional - ( pPlutusReferenceScriptWitness balance + ( pPlutusReferenceScriptWitness sbe balance <|> pSimpleReferenceSpendingScriptWitess <|> pEmbeddedPlutusScriptWitness ) @@ -2268,6 +2273,7 @@ pTxIn balance = pEmbeddedPlutusScriptWitness :: Parser (ScriptWitnessFiles WitCtxTxIn) pEmbeddedPlutusScriptWitness = pScriptWitnessFiles + sbe WitCtxTxIn balance "tx-in" @@ -2437,9 +2443,10 @@ pRefScriptFp = <|> pure ReferenceScriptAnyEraNone pMintMultiAsset - :: BalanceTxExecUnits + :: ShelleyBasedEra era + -> BalanceTxExecUnits -> Parser (Value, [ScriptWitnessFiles WitCtxMint]) -pMintMultiAsset balanceExecUnits = +pMintMultiAsset sbe balanceExecUnits = (,) <$> Opt.option (readerFromParsecParser parseValue) @@ -2457,6 +2464,7 @@ pMintMultiAsset balanceExecUnits = :: BalanceTxExecUnits -> Parser (ScriptWitnessFiles WitCtxMint) pMintingScriptOrReferenceScriptWit bExecUnits = pScriptWitnessFiles + sbe WitCtxMint bExecUnits "mint" From 4cff54bad099dc19f9ac7e4dec70c97c66594c27 Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:54:30 +0200 Subject: [PATCH 09/10] Propage changes in: - Cardano.CLI.Read - Cardano.CLI.Legacy.Options - Cardano.CLI.EraBased.Options.Transaction --- .../CLI/EraBased/Options/Transaction.hs | 24 +++++++++---------- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 16 ++++++------- cardano-cli/src/Cardano/CLI/Read.hs | 3 ++- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs index a5d8a7c7d3..1d7c7acd84 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs @@ -173,7 +173,7 @@ pTransactionBuildCmd era envCli = do <*> pNetworkId envCli <*> optional pScriptValidity <*> optional pWitnessOverride - <*> some (pTxIn AutoBalance) + <*> some (pTxIn sbe AutoBalance) <*> many pReadOnlyReferenceTxIn <*> many pRequiredSigner <*> many pTxInCollateral @@ -181,11 +181,11 @@ pTransactionBuildCmd era envCli = do <*> optional pTotalCollateral <*> many pTxOut <*> pChangeAddress - <*> optional (pMintMultiAsset AutoBalance) + <*> optional (pMintMultiAsset sbe AutoBalance) <*> optional pInvalidBefore <*> pInvalidHereafter sbe - <*> many (pCertificateFile AutoBalance) - <*> many (pWithdrawal AutoBalance) + <*> many (pCertificateFile sbe AutoBalance) + <*> many (pWithdrawal sbe AutoBalance) <*> pTxMetadataJsonSchema <*> many ( pScriptFor @@ -232,18 +232,18 @@ pTransactionBuildEstimateCmd era _envCli = do <*> optional pNumberOfByronKeyWitnesses <*> pProtocolParamsFile <*> pTotalUTxOValue - <*> some (pTxIn ManualBalance) + <*> some (pTxIn sbe ManualBalance) <*> many pReadOnlyReferenceTxIn <*> many pRequiredSigner <*> many pTxInCollateral <*> optional pReturnCollateral <*> many pTxOut <*> pChangeAddress - <*> optional (pMintMultiAsset ManualBalance) + <*> optional (pMintMultiAsset sbe ManualBalance) <*> optional pInvalidBefore <*> pInvalidHereafter sbe - <*> many (pCertificateFile ManualBalance) - <*> many (pWithdrawal ManualBalance) + <*> many (pCertificateFile sbe ManualBalance) + <*> many (pWithdrawal sbe ManualBalance) <*> optional pTotalCollateral <*> optional pReferenceScriptSize <*> pTxMetadataJsonSchema @@ -275,19 +275,19 @@ pTransactionBuildRaw era = fmap TransactionBuildRawCmd $ TransactionBuildRawCmdArgs era <$> optional pScriptValidity - <*> some (pTxIn ManualBalance) + <*> some (pTxIn era ManualBalance) <*> many pReadOnlyReferenceTxIn <*> many pTxInCollateral <*> optional pReturnCollateral <*> optional pTotalCollateral <*> many pRequiredSigner <*> many pTxOut - <*> optional (pMintMultiAsset ManualBalance) + <*> optional (pMintMultiAsset era ManualBalance) <*> optional pInvalidBefore <*> pInvalidHereafter era <*> pTxFee - <*> many (pCertificateFile ManualBalance) - <*> many (pWithdrawal ManualBalance) + <*> many (pCertificateFile era ManualBalance) + <*> many (pWithdrawal era ManualBalance) <*> pTxMetadataJsonSchema <*> many (pScriptFor "auxiliary-script-file" Nothing "Filepath of auxiliary script(s)") <*> many pMetadataFile diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index b915c59f54..3c3471cfdc 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -353,7 +353,7 @@ pTransaction envCli = <*> pNetworkId envCli <*> optional pScriptValidity <*> optional pWitnessOverride - <*> some (pTxIn AutoBalance) + <*> some (pTxIn ShelleyBasedEraConway AutoBalance) <*> many pReadOnlyReferenceTxIn <*> many pRequiredSigner <*> many pTxInCollateral @@ -361,11 +361,11 @@ pTransaction envCli = <*> optional pTotalCollateral <*> many pTxOut <*> pChangeAddress - <*> optional (pMintMultiAsset AutoBalance) + <*> optional (pMintMultiAsset ShelleyBasedEraConway AutoBalance) <*> optional pInvalidBefore <*> optional pLegacyInvalidHereafter - <*> many (pCertificateFile AutoBalance) - <*> many (pWithdrawal AutoBalance) + <*> many (pCertificateFile ShelleyBasedEraConway AutoBalance) + <*> many (pWithdrawal ShelleyBasedEraConway AutoBalance) <*> pTxMetadataJsonSchema <*> many ( pScriptFor @@ -395,19 +395,19 @@ pTransaction envCli = TransactionBuildRawCmd <$> pLegacyCardanoEra envCli <*> optional pScriptValidity - <*> some (pTxIn ManualBalance) + <*> some (pTxIn ShelleyBasedEraConway ManualBalance) <*> many pReadOnlyReferenceTxIn <*> many pTxInCollateral <*> optional pReturnCollateral <*> optional pTotalCollateral <*> many pRequiredSigner <*> many pTxOut - <*> optional (pMintMultiAsset ManualBalance) + <*> optional (pMintMultiAsset ShelleyBasedEraConway ManualBalance) <*> optional pInvalidBefore <*> optional pLegacyInvalidHereafter <*> pTxFee - <*> many (pCertificateFile ManualBalance) - <*> many (pWithdrawal ManualBalance) + <*> many (pCertificateFile ShelleyBasedEraConway ManualBalance) + <*> many (pWithdrawal ShelleyBasedEraConway ManualBalance) <*> pTxMetadataJsonSchema <*> many (pScriptFor "auxiliary-script-file" Nothing "Filepath of auxiliary script(s)") <*> many pMetadataFile diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index a7e120a2f6..8ca249b1fa 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -450,7 +450,8 @@ renderScriptDataError = \case readScriptDatumOrFile :: ScriptDatumOrFile witctx -> ExceptT ScriptDataError IO (ScriptDatum witctx) -readScriptDatumOrFile (ScriptDatumOrFileForTxIn df) = +readScriptDatumOrFile (ScriptDatumOrFileForTxIn Nothing) = pure $ ScriptDatumForTxIn Nothing +readScriptDatumOrFile (ScriptDatumOrFileForTxIn (Just df)) = ScriptDatumForTxIn . Just <$> readScriptDataOrFile df readScriptDatumOrFile InlineDatumPresentAtTxIn = pure InlineScriptDatum From 7a4271ad002f1b21db2da0d31e5add854b3da9ec Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Wed, 24 Jul 2024 13:55:16 +0200 Subject: [PATCH 10/10] Update golden tests --- .../cardano-cli-golden/files/golden/help.cli | 170 +++++++++++++----- .../conway_transaction_build-estimate.cli | 65 ++++++- .../help/conway_transaction_build-raw.cli | 65 ++++++- .../golden/help/conway_transaction_build.cli | 59 +++++- .../help/legacy_transaction_build-raw.cli | 8 +- .../golden/help/legacy_transaction_build.cli | 59 +++++- .../golden/help/transaction_build-raw.cli | 8 +- .../files/golden/help/transaction_build.cli | 59 +++++- 8 files changed, 397 insertions(+), 96 deletions(-) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli index d3610b6194..f604dd8172 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -7708,11 +7708,11 @@ Usage: cardano-cli conway transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -7721,11 +7721,11 @@ Usage: cardano-cli conway transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -7821,21 +7821,37 @@ Usage: cardano-cli conway transaction build-raw ] [--protocol-params-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -7859,11 +7875,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -7871,11 +7887,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -7960,17 +7976,31 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -7993,11 +8023,11 @@ Usage: cardano-cli conway transaction build-estimate ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -8006,11 +8036,11 @@ Usage: cardano-cli conway transaction build-estimate | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -8106,21 +8136,37 @@ Usage: cardano-cli conway transaction build-estimate | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -10291,11 +10337,11 @@ Usage: cardano-cli legacy transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -10304,11 +10350,11 @@ Usage: cardano-cli legacy transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -10431,11 +10477,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -10443,11 +10489,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -10533,17 +10579,31 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -11556,11 +11616,11 @@ Usage: cardano-cli transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -11569,11 +11629,11 @@ Usage: cardano-cli transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -11691,11 +11751,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -11703,11 +11763,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -11793,17 +11853,31 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli index 631c34b42d..4caabf9c91 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-estimate.cli @@ -11,11 +11,11 @@ Usage: cardano-cli conway transaction build-estimate ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -24,11 +24,11 @@ Usage: cardano-cli conway transaction build-estimate | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -124,21 +124,37 @@ Usage: cardano-cli conway transaction build-estimate | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -437,6 +453,22 @@ Available options: top-level strings and numbers. --vote-execution-units (INT, INT) The time and space units needed by the script. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --vote-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -452,6 +484,23 @@ Available options: top-level strings and numbers. --proposal-execution-units (INT, INT) The time and space units needed by the script. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --proposal-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --current-treasury-value LOVELACE The current treasury value. --treasury-donation LOVELACE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli index 21160033df..8a34ba8d4c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli @@ -7,11 +7,11 @@ Usage: cardano-cli conway transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -20,11 +20,11 @@ Usage: cardano-cli conway transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -120,21 +120,37 @@ Usage: cardano-cli conway transaction build-raw ] [--protocol-params-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ ( --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE ) - --vote-execution-units (INT, INT)]]] + --vote-execution-units (INT, INT)] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + --vote-reference-tx-in-execution-units (INT, INT) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ ( --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE ) - --proposal-execution-units (INT, INT)]]] + --proposal-execution-units (INT, INT)] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + --proposal-reference-tx-in-execution-units (INT, INT) + ]] [--current-treasury-value LOVELACE --treasury-donation LOVELACE] --out-file FILE @@ -422,6 +438,22 @@ Available options: top-level strings and numbers. --vote-execution-units (INT, INT) The time and space units needed by the script. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --vote-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -437,6 +469,23 @@ Available options: top-level strings and numbers. --proposal-execution-units (INT, INT) The time and space units needed by the script. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. + --proposal-reference-tx-in-execution-units (INT, INT) + The time and space units needed by the script. --current-treasury-value LOVELACE The current treasury value. --treasury-donation LOVELACE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli index 85450a9ecc..24450a10c5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli @@ -13,11 +13,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -25,11 +25,11 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -114,17 +114,31 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH | --metadata-cbor-file FILE ] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -408,6 +422,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -421,6 +449,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli index 8d4c1c0323..32a68972b5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli @@ -14,11 +14,11 @@ Usage: cardano-cli legacy transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -27,11 +27,11 @@ Usage: cardano-cli legacy transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli index b025a10087..44d02588b1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli @@ -19,11 +19,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -31,11 +31,11 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -121,17 +121,31 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -422,6 +436,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -435,6 +463,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli index b4a45a09f8..75e445574f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli @@ -12,11 +12,11 @@ Usage: cardano-cli transaction build-raw ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -25,11 +25,11 @@ Usage: cardano-cli transaction build-raw | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli index 7875ebc0ae..c03d260244 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli @@ -14,11 +14,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ( --spending-plutus-script-v2 | --spending-plutus-script-v3 ) - ( --spending-reference-tx-in-datum-cbor-file CBOR_FILE + [ --spending-reference-tx-in-datum-cbor-file CBOR_FILE | --spending-reference-tx-in-datum-file JSON_FILE | --spending-reference-tx-in-datum-value JSON_VALUE | --spending-reference-tx-in-inline-datum-present - ) + ] ( --spending-reference-tx-in-redeemer-cbor-file CBOR_FILE | --spending-reference-tx-in-redeemer-file JSON_FILE | --spending-reference-tx-in-redeemer-value JSON_VALUE @@ -26,11 +26,11 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH | --simple-script-tx-in-reference TX-IN | --tx-in-script-file FILE [ - ( --tx-in-datum-cbor-file CBOR_FILE + [ --tx-in-datum-cbor-file CBOR_FILE | --tx-in-datum-file JSON_FILE | --tx-in-datum-value JSON_VALUE | --tx-in-inline-datum-present - ) + ] ( --tx-in-redeemer-cbor-file CBOR_FILE | --tx-in-redeemer-file JSON_FILE | --tx-in-redeemer-value JSON_VALUE @@ -116,17 +116,31 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH ] [--update-proposal-file FILE] [--vote-file FILE - [--vote-script-file FILE + [ --vote-script-file FILE [ --vote-redeemer-cbor-file CBOR_FILE | --vote-redeemer-file JSON_FILE | --vote-redeemer-value JSON_VALUE - ]]] + ] + | --vote-tx-in-reference TX-IN + --vote-plutus-script-v3 + ( --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --vote-reference-tx-in-redeemer-file JSON_FILE + | --vote-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--proposal-file FILE - [--proposal-script-file FILE + [ --proposal-script-file FILE [ --proposal-redeemer-cbor-file CBOR_FILE | --proposal-redeemer-file JSON_FILE | --proposal-redeemer-value JSON_VALUE - ]]] + ] + | --proposal-tx-in-reference TX-IN + --proposal-plutus-script-v3 + ( --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + | --proposal-reference-tx-in-redeemer-file JSON_FILE + | --proposal-reference-tx-in-redeemer-value JSON_VALUE + ) + ]] [--treasury-donation LOVELACE] ( --out-file FILE | --calculate-plutus-script-cost FILE @@ -417,6 +431,20 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --vote-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --vote-plutus-script-v3 Specify a plutus script v3 reference script. + --vote-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --vote-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --vote-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --proposal-file FILE Filepath of the proposal. --proposal-script-file FILE The file containing the script to witness a proposal @@ -430,6 +458,21 @@ Available options: The script redeemer value. There is no schema: (almost) any JSON value is supported, including top-level strings and numbers. + --proposal-tx-in-reference TX-IN + TxId#TxIx - Specify a reference input. The reference + input must have a plutus reference script attached. + --proposal-plutus-script-v3 + Specify a plutus script v3 reference script. + --proposal-reference-tx-in-redeemer-cbor-file CBOR_FILE + The script redeemer file. The file has to be in CBOR + format. + --proposal-reference-tx-in-redeemer-file JSON_FILE + The script redeemer file. The file must follow the + detailed JSON schema for script data. + --proposal-reference-tx-in-redeemer-value JSON_VALUE + The script redeemer value. There is no schema: + (almost) any JSON value is supported, including + top-level strings and numbers. --treasury-donation LOVELACE The donation to the treasury to perform. --out-file FILE Output filepath of the JSON TxBody.