Merge remote-tracking branch 'upstream/master'

Emurgo · Dec 2, 2023 · 86e4f4a · 86e4f4a
2 parents edcd782 + c75830a
commit 86e4f4a
Show file tree

Hide file tree

Showing 24 changed files with 1,019 additions and 29 deletions.
diff --git a/cardano-chain-gen/cardano-chain-gen.cabal b/cardano-chain-gen/cardano-chain-gen.cabal
@@ -153,6 +153,7 @@ test-suite cardano-chain-gen
                         Test.Cardano.Db.Mock.Unit.Conway.CommandLineArg.MigrateConsumedPruneTxOut
                         Test.Cardano.Db.Mock.Unit.Conway.Config
                         Test.Cardano.Db.Mock.Unit.Conway.Other
+                        Test.Cardano.Db.Mock.Unit.Conway.Plutus
                         Test.Cardano.Db.Mock.Unit.Conway.Reward
                         Test.Cardano.Db.Mock.Unit.Conway.Rollback
                         Test.Cardano.Db.Mock.Unit.Conway.Simple

diff --git a/cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Alonzo.hs b/cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Alonzo.hs
@@ -349,10 +349,16 @@ consPoolParamsTwoOwners [rwCred, KeyHashObj owner0, KeyHashObj owner1] poolId =
 consPoolParamsTwoOwners _ _ = panic "expected 2 pool owners"
 
 mkScriptTx ::
+  forall era.
+  ( Core.Era era
+  , Core.EraCrypto era ~ StandardCrypto
+  , Core.Script era ~ AlonzoScript era
+  , Core.TxWits era ~ AlonzoTxWits era
+  ) =>
   Bool ->
-  [(RdmrPtr, (ScriptHash StandardCrypto, Core.Script StandardAlonzo))] ->
-  AlonzoTxBody StandardAlonzo ->
-  AlonzoTx StandardAlonzo
+  [(RdmrPtr, (ScriptHash StandardCrypto, Core.Script era))] ->
+  Core.TxBody era ->
+  AlonzoTx era
 mkScriptTx valid rdmrs txBody =
   AlonzoTx
     { body = txBody
@@ -364,7 +370,7 @@ mkScriptTx valid rdmrs txBody =
     witnesses =
       mkWitnesses
         (map (second Just) rdmrs)
-        [(hashData @StandardAlonzo plutusDataList, plutusDataList)]
+        [(hashData @era plutusDataList, plutusDataList)]
 
 mkWitnesses ::
   (Core.Era era, Core.EraCrypto era ~ StandardCrypto, Script era ~ AlonzoScript era) =>

diff --git a/cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Babbage.hs b/cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Babbage.hs
@@ -21,6 +21,7 @@ module Cardano.Mock.Forging.Tx.Babbage (
   mkPaymentTx,
   mkPaymentTx',
   scriptSucceeds,
+  getDatum,
   getInlineScript,
   mkLockByScriptTx,
   mkOutFromType,