Merge pull request #914 from IntersectMBO/cl/createtw

Update create-treasury-withdrawal
IntersectMBO · Sep 25, 2024 · fef657b · fef657b
2 parents 4a5096b + a58a54e
commit fef657b
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 12 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs
@@ -128,7 +128,7 @@ data GovernanceActionTreasuryWithdrawalCmdArgs era
   , returnAddr :: !StakeIdentifier
   , proposalUrl :: !ProposalUrl
   , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData)
-  , treasuryWithdrawal :: ![(VerificationKeyOrHashOrFile StakeKey, Lovelace)]
+  , treasuryWithdrawal :: ![(StakeIdentifier, Lovelace)]
   , constitutionScriptHash :: !(Maybe ScriptHash)
   , outFile :: !(File () Out)
   }

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -491,6 +491,20 @@ pTransferAmt =
       , Opt.help "The amount to transfer."
       ]
 
+pTreasuryWithdrawalAmt :: Parser Lovelace
+pTreasuryWithdrawalAmt =
+  Opt.option (readerFromParsecParser parseLovelace) $
+    mconcat
+      [ Opt.long "transfer"
+      , Opt.metavar "LOVELACE"
+      , Opt.help $
+          mconcat
+            [ "The amount of lovelace the proposal intends to withdraw from the Treasury. "
+            , "Multiple withdrawals can be proposed in a single governance action "
+            , "by repeating the --funds-receiving-stake and --transfer options as many times as needed."
+            ]
+      ]
+
 rHexHash
   :: ()
   => SerialiseAsRawBytes (Hash a)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
@@ -395,7 +395,7 @@ pGovernanceActionTreasuryWithdrawalCmd era = do
             <*> pStakeIdentifier (Just "deposit-return")
             <*> pAnchorUrl
             <*> pAnchorDataHash
-            <*> some ((,) <$> pStakeVerificationKeyOrHashOrFile (Just "funds-receiving") <*> pTransferAmt)
+            <*> some ((,) <$> pStakeIdentifier (Just "funds-receiving") <*> pTreasuryWithdrawalAmt)
             <*> optional pConstitutionScriptHash
             <*> pFileOutDirection "out-file" "Output filepath of the treasury withdrawal."
       )

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs
@@ -386,12 +386,6 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do
         pure . addCostModelsToEraBasedProtocolParametersUpdate alonzoOnwards costModels $
           uppNewPParams eraBasedPParams'
 
-readStakeKeyHash
-  :: VerificationKeyOrHashOrFile StakeKey -> ExceptT GovernanceActionsError IO (Hash StakeKey)
-readStakeKeyHash stake =
-  modifyError GovernanceActionsCmdReadFileError $
-    readVerificationKeyOrHashOrFile AsStakeKey stake
-
 addCostModelsToEraBasedProtocolParametersUpdate
   :: AlonzoEraOnwards era
   -> L.CostModels
@@ -439,9 +433,10 @@ runGovernanceActionTreasuryWithdrawalCmd
       firstExceptT GovernanceActionsReadStakeCredErrror $
         getStakeCredentialFromIdentifier returnAddr
 
-    withdrawals <- forM treasuryWithdrawal $ \(verificationKeyOrHashOrFile, lovelace) -> do
-      stakeKeyHash <- readStakeKeyHash verificationKeyOrHashOrFile
-      pure (networkId, StakeCredentialByKey stakeKeyHash, lovelace)
+    withdrawals <- forM treasuryWithdrawal $ \(stakeIdentifier, lovelace) -> do
+      stakeCredential <-
+        firstExceptT GovernanceActionsReadStakeCredErrror $ getStakeCredentialFromIdentifier stakeIdentifier
+      pure (networkId, stakeCredential, lovelace)
 
     let sbe = conwayEraOnwardsToShelleyBasedEra eon
         treasuryWithdrawals =

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -6082,6 +6082,8 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal
                                                                            ( --funds-receiving-stake-verification-key STRING
                                                                            | --funds-receiving-stake-verification-key-file FILEPATH
                                                                            | --funds-receiving-stake-key-hash HASH
+                                                                           | --funds-receiving-stake-script-file FILEPATH
+                                                                           | --funds-receiving-stake-address ADDRESS
                                                                            )
                                                                            --transfer LOVELACE)
                                                                          [--constitution-script-hash HASH]

diff --git a/...dano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli b/...dano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli
@@ -15,6 +15,8 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal
                                                                            ( --funds-receiving-stake-verification-key STRING
                                                                            | --funds-receiving-stake-verification-key-file FILEPATH
                                                                            | --funds-receiving-stake-key-hash HASH
+                                                                           | --funds-receiving-stake-script-file FILEPATH
+                                                                           | --funds-receiving-stake-address ADDRESS
                                                                            )
                                                                            --transfer LOVELACE)
                                                                          [--constitution-script-hash HASH]
@@ -46,7 +48,15 @@ Available options:
                            Filepath of the staking verification key.
   --funds-receiving-stake-key-hash HASH
                            Stake verification key hash (hex-encoded).
-  --transfer LOVELACE      The amount to transfer.
+  --funds-receiving-stake-script-file FILEPATH
+                           Filepath of the staking script.
+  --funds-receiving-stake-address ADDRESS
+                           Target stake address (bech32 format).
+  --transfer LOVELACE      The amount of lovelace the proposal intends to
+                           withdraw from the Treasury. Multiple withdrawals can
+                           be proposed in a single governance action by
+                           repeating the --funds-receiving-stake and --transfer
+                           options as many times as needed.
   --constitution-script-hash HASH
                            Constitution script hash (hex-encoded). Obtain it
                            with "cardano-cli hash script ...".