SCP-4225 rebase with cardano.1.35 for babbage updates

input-output-hk · Aug 10, 2022 · aa48bf9 · aa48bf9
1 parent 92d16ec
commit aa48bf9
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/marlowe-cli/src/Language/Marlowe/CLI/Run.hs b/marlowe-cli/src/Language/Marlowe/CLI/Run.hs
@@ -35,18 +35,14 @@ module Language.Marlowe.CLI.Run (
 ) where
 
 
-<<<<<<< HEAD
-import Cardano.Api (AddressAny, AddressInEra (..), BabbageEra, CardanoMode, LocalNodeConnectInfo (localNodeNetworkId),
-=======
-import Cardano.Api (AddressAny, AddressInEra (..), AlonzoEra, BabbageEra, CardanoMode,
-                    Key (deterministicSigningKeySeedSize), LocalNodeConnectInfo (localNodeNetworkId),
->>>>>>> 7dd23719c (SCP-4225 rebase with cardano.1.35 branch - work on execute and create wallet commands)
-                    MultiAssetSupportedInEra (MultiAssetInBabbageEra), NetworkId,
-                    QueryInShelleyBasedEra (QueryProtocolParameters, QueryUTxO), QueryUTxOFilter (QueryUTxOByAddress),
-                    Script (..), ScriptDataSupportedInEra (..), ShelleyBasedEra (ShelleyBasedEraBabbage), SlotNo (..),
-                    StakeAddressReference (..), TxId, TxIn, TxMintValue (TxMintNone), TxOut (..), TxOutDatum (..),
-                    TxOutValue (..), UTxO (..), anyAddressInShelleyBasedEra, calculateMinimumUTxO, getTxId,
-                    lovelaceToValue, selectLovelace, toAddressAny, txOutValueToValue, writeFileTextEnvelope)
+import Cardano.Api (AddressAny, AddressInEra (..), BabbageEra, CardanoMode, Key (deterministicSigningKeySeedSize),
+                    LocalNodeConnectInfo (localNodeNetworkId), MultiAssetSupportedInEra (MultiAssetInBabbageEra),
+                    NetworkId, QueryInShelleyBasedEra (QueryProtocolParameters, QueryUTxO),
+                    QueryUTxOFilter (QueryUTxOByAddress), Script (..), ScriptDataSupportedInEra (..),
+                    ShelleyBasedEra (ShelleyBasedEraBabbage), SlotNo (..), StakeAddressReference (..), TxId, TxIn,
+                    TxMintValue (TxMintNone), TxOut (..), TxOutDatum (..), TxOutValue (..), UTxO (..),
+                    anyAddressInShelleyBasedEra, calculateMinimumUTxO, getTxId, lovelaceToValue, selectLovelace,
+                    toAddressAny, txOutValueToValue, writeFileTextEnvelope)
 import qualified Cardano.Api as Api (Value)
 import qualified Cardano.Api as Cardano.Api.TxBody
 import Cardano.Api.Shelley (ProtocolParameters, ReferenceScript (ReferenceScriptNone), fromPlutusData)
@@ -310,6 +306,7 @@ runTransaction connection marloweInBundle marloweOutFile inputs outputs changeAd
       timeout
       printStats
       invalid
+
     liftCliIO
       $ writeFileTextEnvelope bodyFile Nothing body
     pure
@@ -427,6 +424,17 @@ runTransactionImpl connection marloweInBundle marloweOut inputs outputs changeAd
         ]
     let
       outputs' = payments <> outputs <> datumOutputs
+    body <-
+      buildBody connection
+        spend continue
+        [] inputs outputs'
+        collateral changeAddress
+        (mtRange marloweOut)
+        (hashSigningKey <$> signingKeys)
+        TxMintNone
+        metadata
+        printStats
+        invalid
     forM_ timeout
       $ if invalid
           then const $ throwError "Refusing to submit an invalid transaction: collateral would be lost."