Add posibility to supply supplemental datum hash preimage

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2025-04-16T18:30:40Z
-  , cardano-haskell-packages 2025-04-25T15:50:18Z
+  , cardano-haskell-packages 2025-05-12T17:34:03Z
 
 
 packages:

cardano-cli/cardano-cli.cabal

@@ -233,7 +233,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=10.15,
+    cardano-api ^>=10.16,
     cardano-binary,
     cardano-crypto,
     cardano-crypto-class ^>=2.2,

cardano-cli/src/Cardano/CLI/Byron/Parser.hs

@@ -277,7 +277,7 @@ parseTxInAtto =
 parseTxIdAtto :: Atto.Parser TxId
 parseTxIdAtto = (<?> "Transaction ID (hexadecimal)") $ do
   bstr <- Atto.takeWhile1 Char.isHexDigit
-  case deserialiseFromRawBytesHex AsTxId bstr of
+  case deserialiseFromRawBytesHex bstr of
     Right addr -> return addr
     Left e -> fail $ docToString $ "Incorrect transaction id format: " <> prettyError e
 

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs

@@ -58,14 +58,14 @@ runStakePoolRegistrationCertificateCmd
       vrfVerKey <-
         fromExceptTCli $
           firstExceptT StakePoolCmdReadKeyFileError $
-            readVerificationKeyOrFile AsVrfKey vrfVerificationKeyOrFile
+            readVerificationKeyOrFile vrfVerificationKeyOrFile
       let vrfKeyHash' = verificationKeyHash vrfVerKey
 
       -- Pool reward account
       rwdStakeVerKey <-
         fromExceptTCli $
           firstExceptT StakePoolCmdReadKeyFileError $
-            readVerificationKeyOrFile AsStakeKey rewardStakeVerificationKeyOrFile
+            readVerificationKeyOrFile rewardStakeVerificationKeyOrFile
       let stakeCred = StakeCredentialByKey (verificationKeyHash rwdStakeVerKey)
           rewardAccountAddr = makeStakeAddress network stakeCred
 
@@ -74,7 +74,7 @@ runStakePoolRegistrationCertificateCmd
         forM ownerStakeVerificationKeyOrFiles $
           fromExceptTCli
             . firstExceptT StakePoolCmdReadKeyFileError
-            . readVerificationKeyOrFile AsStakeKey
+            . readVerificationKeyOrFile
       let stakePoolOwners' = map verificationKeyHash sPoolOwnerVkeys
 
       let stakePoolParams =

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Option.hs

@@ -113,7 +113,7 @@ pTxOutDatum =
 
   pTxOutDatumByHashOnly =
     fmap TxOutDatumByHashOnly $
-      Opt.option (readerFromParsecParser $ parseHash (AsHash AsScriptData)) $
+      Opt.option (readerFromParsecParser parseHash) $
         mconcat
           [ Opt.long "tx-out-datum-hash"
           , Opt.metavar "HASH"

cardano-cli/src/Cardano/CLI/Compatible/Transaction/Run.hs

@@ -74,7 +74,7 @@ runCompatibleTransactionCmd
         sequenceA
           [ fmap (,cswScriptWitness <$> mSwit) $
               fromEitherIOCli $
-                readFileTextEnvelope AsCertificate $
+                readFileTextEnvelope $
                   File certFile
           | (CertificateFile certFile, mSwit) <- certFilesAndMaybeScriptWits
           ]