Bump cardano-api

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Read.hs

@@ -10,7 +10,7 @@ module Cardano.CLI.EraBased.Script.Mint.Read
   )
 where
 
-import Cardano.Api
+import Cardano.Api hiding (AnyScriptWitness)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScriptWitness
 import Cardano.Api.Experimental.Plutus qualified as Exp
@@ -27,13 +27,13 @@ import Cardano.Ledger.Core qualified as L
 readMintScriptWitness
   :: forall era e
    . Exp.IsEra era
-  => ScriptRequirements Exp.MintItem -> CIO e (PolicyId, Exp.AnyWitness (Exp.LedgerEra era))
+  => ScriptRequirements Exp.MintItem -> CIO e (PolicyId, AnyScriptWitness (Exp.LedgerEra era))
 readMintScriptWitness (OnDiskSimpleScript scriptFp) = do
   let sFp = unFile scriptFp
   s <- readFileSimpleScript sFp (Exp.useEra @era)
   let sHash :: L.ScriptHash =
         Exp.hashSimpleScript (s :: Exp.SimpleScript (Exp.LedgerEra era))
-  return (fromMaryPolicyID $ L.PolicyID sHash, Exp.AnySimpleScriptWitness $ Exp.SScript s)
+  return (fromMaryPolicyID $ L.PolicyID sHash, AnyScriptWitnessSimple $ Exp.SScript s)
 readMintScriptWitness
   ( OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
@@ -57,7 +57,7 @@ readMintScriptWitness
             execUnits
     return
       ( polId
-      , Exp.AnyPlutusScriptWitness $
+      , AnyScriptWitnessPlutus $
           AnyPlutusMintingScriptWitness sw
       )
 readMintScriptWitness
@@ -83,9 +83,9 @@ readMintScriptWitness
             execUnits
     return
       ( polId
-      , Exp.AnyPlutusScriptWitness $
+      , AnyScriptWitnessPlutus $
           AnyPlutusMintingScriptWitness
             sw
       )
 readMintScriptWitness (SimpleReferenceScript (SimpleRefScriptArgs refTxIn polId)) =
-  return (polId, Exp.AnySimpleScriptWitness $ Exp.SReferenceScript refTxIn)
+  return (polId, AnyScriptWitnessSimple $ Exp.SReferenceScript refTxIn)

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

@@ -204,9 +204,13 @@ runTransactionBuildCmd
 
     requiredSigners <-
       mapM (fromEitherIOCli . readRequiredSigner) reqSigners
-    mReturnCollateral <- forM mReturnColl toTxOutInShelleyBasedEra
+    mReturnCollateral :: Maybe (Exp.TxOut (Exp.LedgerEra era)) <-
+      forM mReturnColl toTxOutInShelleyBasedEra
 
-    txOuts <- mapM (toTxOutInAnyEra eon) txouts
+    txOuts <-
+      mapM
+        toTxOutInEra
+        txouts
 
     -- Conway related
     votingProceduresAndMaybeScriptWits :: [(VotingProcedures era, Exp.AnyWitness (Exp.LedgerEra era))] <-
@@ -368,6 +372,15 @@ runTransactionBuildCmd
           then writeTxFileTextEnvelopeCanonical eon fpath noWitTx
           else writeTxFileTextEnvelope eon fpath noWitTx
 
+toTxOutInEra
+  :: Exp.IsEra era
+  => TxOutAnyEra
+  -> CIO e (Exp.TxOut (Exp.LedgerEra era))
+toTxOutInEra (TxOutAnyEra addr' val' mDatumHash refScriptFp) = do
+  let addr = anyAddressInShelleyBasedEra (convert Exp.useEra) addr'
+  o <- mkTxOut (convert Exp.useEra) addr val' mDatumHash refScriptFp
+  fromEitherCli $ Exp.fromLegacyTxOut o
+
 runTransactionBuildEstimateCmd
   :: forall era e
    . Exp.IsEra era
@@ -435,7 +448,7 @@ runTransactionBuildEstimateCmd -- TODO change type
 
     mReturnCollateral <- mapM toTxOutInShelleyBasedEra mReturnColl
 
-    txOuts <- mapM (toTxOutInAnyEra sbe) txouts
+    txOuts <- mapM toTxOutInEra txouts
 
     -- the same collateral input can be used for several plutus scripts
     let filteredTxinsc = nubOrd txInsCollateral
@@ -532,7 +545,7 @@ runTransactionBuildEstimateCmd -- TODO change type
         txBodyOutFile
       $ unsignedToToApiTx unsignedTx
 
-unsignedToToApiTx :: forall era. Exp.IsEra era => Exp.UnsignedTx era -> Api.Tx era
+unsignedToToApiTx :: forall era. Exp.IsEra era => Exp.UnsignedTx (Exp.LedgerEra era) -> Api.Tx era
 unsignedToToApiTx (Exp.UnsignedTx lTx) =
   ShelleyTx (convert $ Exp.useEra @era) $ obtainCommonConstraints (Exp.useEra @era) lTx
 
@@ -643,7 +656,7 @@ runTransactionBuildRawCmd
 
     mReturnCollateral <- mapM toTxOutInShelleyBasedEra mReturnColl
 
-    txOuts <- mapM (toTxOutInAnyEra (convert Exp.useEra)) txouts
+    txOuts <- mapM toTxOutInEra txouts
 
     -- the same collateral input can be used for several plutus scripts
     let filteredTxinsc = toList @(Set _) $ fromList txInsCollateral
@@ -665,7 +678,7 @@ runTransactionBuildRawCmd
                 )
         | (CertificateFile certFile, mSwit) <- certFilesAndMaybeScriptWits
         ]
-    txBody :: Exp.UnsignedTx era <-
+    txBody :: Exp.UnsignedTx (Exp.LedgerEra era) <-
       fromEitherCli $
         runTxBuildRaw
           mScriptValidity
@@ -688,7 +701,6 @@ runTransactionBuildRawCmd
           votingProceduresAndMaybeScriptWits
           proposals
           currentTreasuryValueAndDonation
-
     let Exp.UnsignedTx lTx = txBody
         noWitTx = ShelleyTx (convert eon) lTx
     fromEitherIOCli $
@@ -706,18 +718,18 @@ runTxBuildRaw
   -- ^ Read only reference inputs
   -> [TxIn]
   -- ^ TxIn for collateral
-  -> Maybe (TxOut CtxTx era)
+  -> Maybe (Exp.TxOut (Exp.LedgerEra era))
   -- ^ Return collateral
   -> Maybe Lovelace
   -- ^ Total collateral
-  -> [TxOut CtxTx era]
+  -> [Exp.TxOut (Exp.LedgerEra era)]
   -> Maybe SlotNo
   -- ^ Tx lower bound
   -> TxValidityUpperBound era
   -- ^ Tx upper bound
   -> Lovelace
   -- ^ Tx fee
-  -> (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])
+  -> (L.MultiAsset, [(PolicyId, Exp.AnyScriptWitness (Exp.LedgerEra era))])
   -- ^ Multi-Asset minted value(s)
   -> [(Exp.Certificate (Exp.LedgerEra era), Exp.AnyWitness (Exp.LedgerEra era))]
   -- ^ Certificate with potential script witness
@@ -730,7 +742,7 @@ runTxBuildRaw
   -> [(VotingProcedures era, Exp.AnyWitness (Exp.LedgerEra era))]
   -> [(Proposal era, Exp.AnyWitness (Exp.LedgerEra era))]
   -> Maybe (TxCurrentTreasuryValue, TxTreasuryDonation)
-  -> Either TxCmdError (Exp.UnsignedTx era)
+  -> Either TxCmdError (Exp.UnsignedTx (Exp.LedgerEra era))
 runTxBuildRaw
   mScriptValidity
   inputsAndMaybeScriptWits
@@ -788,17 +800,17 @@ constructTxBodyContent
   -- ^ Read only reference inputs
   -> [TxIn]
   -- ^ TxIn for collateral
-  -> Maybe (TxOut CtxTx era)
+  -> Maybe (Exp.TxOut (Exp.LedgerEra era))
   -- ^ Return collateral
   -> Maybe Lovelace
   -- ^ Total collateral
-  -> [TxOut CtxTx era]
+  -> [Exp.TxOut (Exp.LedgerEra era)]
   -- ^ Normal outputs
   -> Maybe SlotNo
   -- ^ Tx lower bound
   -> TxValidityUpperBound era
   -- ^ Tx upper bound
-  -> (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])
+  -> (L.MultiAsset, [(PolicyId, Exp.AnyScriptWitness (Exp.LedgerEra era))])
   -- ^ Multi-Asset value(s)
   -> [(Exp.Certificate (Exp.LedgerEra era), Exp.AnyWitness (Exp.LedgerEra era))]
   -- ^ Certificate with potential script witness
@@ -851,17 +863,18 @@ constructTxBodyContent
       -- TODO The last argument of validateTxInsReference is a datum set from reference inputs
       -- Should we allow providing of datum from CLI?
       -- TODO: Figure how to expose resolved datums
+
+      txRetCollateral :: Maybe (Exp.TxReturnCollateral (Exp.LedgerEra era)) <- case mReturnCollateral of
+        Just rc -> do
+          let Exp.TxOut o = rc
+          Right $ Just $ Exp.TxReturnCollateral (o :: (L.TxOut (Exp.LedgerEra era)))
+        Nothing -> Right Nothing
+
       let refInputs = Exp.TxInsReference allReferenceInputs Set.empty
-          expTxouts = map Exp.fromLegacyTxOut txouts
           auxScripts = case txAuxScripts of
             TxAuxScriptsNone -> []
             -- TODO: Auxiliary scripts cannot be plutus scripts
             TxAuxScripts _ scripts -> mapMaybe scriptInEraToSimpleScript scripts
-          txRetCollateral = case mReturnCollateral of
-            Just rc ->
-              let Exp.TxOut o _ = Exp.fromLegacyTxOut rc
-               in Just $ Exp.TxReturnCollateral (o :: (L.TxOut (Exp.LedgerEra era)))
-            Nothing -> Nothing
           txTotCollateral = Exp.TxTotalCollateral <$> (mTotCollateral :: Maybe L.Coin)
           expTxMetadata = case txMetadata of
             TxMetadataNone -> TxMetadata mempty
@@ -883,7 +896,7 @@ constructTxBodyContent
             & Exp.setTxIns inputsAndMaybeScriptWits
             & Exp.setTxInsCollateral txinsc
             & Exp.setTxInsReference refInputs
-            & Exp.setTxOuts expTxouts
+            & Exp.setTxOuts txouts
             & maybe id Exp.setTxReturnCollateral txRetCollateral
             & maybe id Exp.setTxTotalCollateral txTotCollateral
             & Exp.setTxFee fee
@@ -941,16 +954,15 @@ runTxBuild
   -- ^ TxIn with potential script witness
   -> [TxIn]
   -- ^ TxIn for collateral
-  -> Maybe (TxOut CtxTx era)
+  -> Maybe (Exp.TxOut (Exp.LedgerEra era))
   -- ^ Return collateral
   -> Maybe Lovelace
   -- ^ Total collateral
-  -> [TxOut CtxTx era]
+  -> [Exp.TxOut (Exp.LedgerEra era)]
   -- ^ Normal outputs
   -> TxOutChangeAddress
   -- ^ A change output
-  -> (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))]) -- TODO: Double check why this is a list
-
+  -> (L.MultiAsset, [(PolicyId, Exp.AnyScriptWitness (Exp.LedgerEra era))])
   -- ^ Multi-Asset value(s)
   -> Maybe SlotNo
   -- ^ Tx lower bound
@@ -969,7 +981,7 @@ runTxBuild
   -> [(Proposal era, Exp.AnyWitness (Exp.LedgerEra era))]
   -> Maybe (TxCurrentTreasuryValue, TxTreasuryDonation)
   -- ^ The current treasury value and the donation.
-  -> ExceptT TxCmdError IO (Exp.UnsignedTx era, Exp.TxBodyContent (Exp.LedgerEra era))
+  -> ExceptT TxCmdError IO (Exp.UnsignedTx (Exp.LedgerEra era), Exp.TxBodyContent (Exp.LedgerEra era))
 runTxBuild
   socketPath
   networkId
@@ -1110,7 +1122,7 @@ runTxBuild
 
 getAllReferenceInputs
   :: [Exp.AnyWitness (Exp.LedgerEra era)]
-  -> [Exp.AnyWitness (Exp.LedgerEra era)]
+  -> [Exp.AnyScriptWitness (Exp.LedgerEra era)]
   -> [Exp.AnyWitness (Exp.LedgerEra era)]
   -- \^ Certificate witnesses
   -> [Exp.AnyWitness (Exp.LedgerEra era)]
@@ -1128,7 +1140,7 @@ getAllReferenceInputs
   propProceduresAnMaybeScriptWits
   readOnlyRefIns = do
     let txinsWitByRefInputs = mapMaybe Exp.getAnyWitnessReferenceInput spendingWitnesses
-        mintingRefInputs = mapMaybe Exp.getAnyWitnessReferenceInput mintWitnesses
+        mintingRefInputs = mapMaybe Exp.getAnyScriptWitnessReferenceInput mintWitnesses
         certsWitByRefInputs = mapMaybe Exp.getAnyWitnessReferenceInput certScriptWitnesses
         withdrawalsWitByRefInputs = mapMaybe Exp.getAnyWitnessReferenceInput withdrawals
         votesWitByRefInputs = mapMaybe Exp.getAnyWitnessReferenceInput votingProceduresAndMaybeScriptWits
@@ -1147,19 +1159,20 @@ getAllReferenceInputs
 toTxOutInShelleyBasedEra
   :: Exp.IsEra era
   => TxOutShelleyBasedEra
-  -> CIO e (TxOut CtxTx era)
+  -> CIO e (Exp.TxOut (Exp.LedgerEra era))
 toTxOutInShelleyBasedEra (TxOutShelleyBasedEra addr' val' mDatumHash refScriptFp) = do
   let sbe = convert Exp.useEra
       addr = shelleyAddressInEra sbe addr'
-  mkTxOut sbe addr val' mDatumHash refScriptFp
+  o <- mkTxOut sbe addr val' mDatumHash refScriptFp
+  fromEitherCli $ Exp.fromLegacyTxOut o
 
 -- TODO: Currently we specify the policyId with the '--mint' option on the cli
 -- and we added a separate '--policy-id' parser that parses the policy id for the
 -- given reference input (since we don't have the script in this case). To avoid asking
 -- for the policy id twice (in the build command) we can potentially query the UTxO and
 -- access the script (and therefore the policy id).
 createTxMintValue
-  :: (L.MultiAsset, [(PolicyId, Exp.AnyWitness (Exp.LedgerEra era))])
+  :: (L.MultiAsset, [(PolicyId, Exp.AnyScriptWitness (Exp.LedgerEra era))])
   -> Either TxCmdError (Exp.TxMintValue (Exp.LedgerEra era))
 createTxMintValue (val, scriptWitnesses) =
   if mempty == val && List.null scriptWitnesses
@@ -1181,7 +1194,7 @@ createTxMintValue (val, scriptWitnesses) =
       pure $
         Exp.TxMintValue $
           Map.intersectionWith
-            (\assets wit -> (assets, wit))
+            (,)
             policiesWithAssets
             witnessesProvidedMap
  where
@@ -1422,16 +1435,16 @@ runTransactionCalculateMinValueCmd
   -> CIO e ()
 runTransactionCalculateMinValueCmd
   Cmd.TransactionCalculateMinValueCmdArgs
-    { era
+    { era = era :: Exp.Era era
     , protocolParamsFile
     , txOut
     } = do
-    pp <-
+    pp :: L.PParams (Exp.LedgerEra era) <-
       fromExceptTCli @ProtocolParamsError
         (obtainCommonConstraints era $ readProtocolParameters protocolParamsFile)
     out <- obtainCommonConstraints era $ toTxOutInShelleyBasedEra txOut
 
-    let minValue = calculateMinimumUTxO (convert era) pp out
+    let minValue = Exp.calculateMinimumUTxO pp out
     liftIO . IO.print $ minValue
 
 runTransactionCalculatePlutusScriptCostCmd

cardano-cli/src/Cardano/CLI/Type/Error/TxCmdError.hs

@@ -42,6 +42,7 @@ data AnyTxBodyErrorAutoBalance where
 
 data TxCmdError
   = TxCmdCBORDecodeError !CBOR.DecoderError
+  | TxCmdDatumDecodingError Exp.DatumDecodingError
   | TxCmdProtocolParamsError ProtocolParamsError
   | forall era. LostScriptWitnesses
       [Exp.AnyIndexedPlutusScriptWitness (Exp.LedgerEra era)]
@@ -195,6 +196,8 @@ renderTxCmdError = \case
       , pretty (length after)
       , "."
       ]
+  TxCmdDatumDecodingError err ->
+    "Error decoding datum: " <> pshow err
 
 prettyPolicyIdList :: [PolicyId] -> Doc ann
 prettyPolicyIdList =

cardano-cli/test/cardano-cli-golden/files/golden/shelley/build-raw-tx-body-out-6.json

@@ -1,5 +1,5 @@
 {
     "type": "Tx ConwayEra",
     "description": "Ledger Cddl Format",
-    "cborHex": "84a300d90102818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181a3005839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf011864028201d81842182a020ca0f5f6"
+    "cborHex": "84a300d90102818258202392d2b1200b5139fe555c81261697b29a8ccf561c5c783d46e78a479d977053000181a3005839016b837ca50316ee4e00033482ed128887d72c2bae5b0438d692dc1251b0c8b17595ebdb93c1f974be0a9b1ef26c474649d9c2ae766ed135cf011864028201d81842182a020ca104d9010281182af5f6"
 }