add minFeeRefScriptCostPerByte to create-protocol-param-update + bump…

… cardano-api Signed-off-by: Carlos LopezDeLara <carlos.lopezdelara@iohk.io>
IntersectMBO · Apr 25, 2024 · 2360183 · 2360183
1 parent 61647dd
commit 2360183
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 8 deletions.
diff --git a/cabal.project b/cabal.project
@@ -14,8 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2024-04-15T08:36:34Z
-  , cardano-haskell-packages 2024-04-15T08:36:34Z
-
+  , cardano-haskell-packages 	2024-04-24T22:24:37Z
 packages:
   cardano-cli
 
@@ -40,4 +39,4 @@ write-ghc-environment-files: always
 
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
--- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -196,7 +196,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.45.0.0
+                      , cardano-api ^>= 8.45.1.0
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -47,8 +47,8 @@ import           GHC.Natural (Natural)
 import           Network.Socket (PortNumber)
 import           Options.Applicative hiding (help, str)
 import qualified Options.Applicative as Opt
-import qualified Text.Parsec as Parsec
 import           Text.Parsec ((<?>))
+import qualified Text.Parsec as Parsec
 import qualified Text.Parsec.Error as Parsec
 import qualified Text.Parsec.Language as Parsec
 import qualified Text.Parsec.String as Parsec

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs
@@ -13,6 +13,7 @@ import           Cardano.Api.Shelley
 import qualified Cardano.CLI.EraBased.Commands.Governance.Actions as Cmd
 import           Cardano.CLI.EraBased.Options.Common
 import           Cardano.CLI.Types.Common
+import           Cardano.CLI.Parser
 
 import           Data.Foldable
 import           GHC.Natural (Natural)
@@ -218,6 +219,13 @@ pGovernanceActionProtocolParametersUpdateCmd era = do
   pure $ Cmd.GovernanceActionProtocolParametersUpdateCmd
     <$> pUpdateProtocolParametersCmd w
 
+pMinFeeRefScriptCostPerByte :: Parser L.NonNegativeInterval
+pMinFeeRefScriptCostPerByte =
+  Opt.option (toNonNegativeIntervalOrErr <$> readRational)  $ mconcat
+    [ Opt.long "ref-script-cost-per-byte"
+    , Opt.metavar "RATIONAL"
+    , Opt.help "Reference script cost per byte for free calculation"
+    ]
 
 convertToLedger :: (a -> b) -> Parser (Maybe a) -> Parser (L.StrictMaybe b)
 convertToLedger conv = fmap (L.maybeToStrictMaybe . fmap conv)
@@ -299,6 +307,7 @@ pIntroducedInConwayPParams =
     <*> convertToLedger id (optional pNewGovActionDeposit)
     <*> convertToLedger id (optional pDRepDeposit)
     <*> convertToLedger id (optional pDRepActivity)
+    <*> convertToLedger id (optional pMinFeeRefScriptCostPerByte)
 
 -- Not necessary in Conway era onwards
 pProtocolParametersUpdateGenesisKeys :: Parser [VerificationKeyFile In]
@@ -375,3 +384,5 @@ pNetwork  = asum $ mconcat
       ]
     ]
   ]
+
+
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -6419,6 +6419,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update
                                                                                 [--new-governance-action-deposit NATURAL]
                                                                                 [--drep-deposit LOVELACE]
                                                                                 [--drep-activity WORD32]
+                                                                                [--ref-script-cost-per-byte RATIONAL]
                                                                                 [--cost-model-file FILE]
                                                                                 --out-file FILE
 

diff --git a/...i-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli b/...i-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli
@@ -56,6 +56,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update
                                                                                 [--new-governance-action-deposit NATURAL]
                                                                                 [--drep-deposit LOVELACE]
                                                                                 [--drep-activity WORD32]
+                                                                                [--ref-script-cost-per-byte RATIONAL]
                                                                                 [--cost-model-file FILE]
                                                                                 --out-file FILE
 
@@ -196,6 +197,8 @@ Available options:
                            a governance action.
   --drep-deposit LOVELACE  DRep deposit amount.
   --drep-activity WORD32   DRep activity period, in epochs.
+  --ref-script-cost-per-byte RATIONAL
+                           Reference script cost per byte for free calculation
   --cost-model-file FILE   Filepath of the JSON formatted cost model
   --out-file FILE          The output file.
   -h,--help                Show this help text
diff --git a/flake.lock b/flake.lock