Merge branch 'gergely/vasil' into david/adjust-tx-test-2

Author: mikekeke

flake.lock

@@ -11,7 +11,7 @@
       flake = false;
     };
     bot-plutus-interface.url =
-      "github:mlabs-haskell/bot-plutus-interface?rev=d62bb6ee68c2be7fa5bc1afb9f6d6902c7bd400b";
+      "github:mlabs-haskell/bot-plutus-interface?ref=vasil-compliant-v1.0.0";
   };
 
   outputs =

flake.nix

@@ -6,6 +6,8 @@ As long as the cluster is not stopped, the relay node can be used for arbitrary
 
 The node socket path can be obtained from console output.
 
+NOTE: This branch currently starts local network in Alonzo era. Stable branch that not yet merged to master, but can start local network in Babbage era, can be found [here](https://github.com/mlabs-haskell/plutip/tree/gergely/vasil/local-cluster).
+
 The `Main.hs` module can also serve as an example of how to make your own executable for starting local cluster with funded wallets. Note that when wallet is added with `addSomeWallet` it is recommended to wait some time (1 or 2 seconds) with `waitSeconds` while funding transaction is sent and confirmed.
 
 ## Usage 

local-cluster/README.md

@@ -13,7 +13,7 @@ import Cardano.Api qualified as CAPI
 import Cardano.Launcher.Node (nodeSocketFile)
 import Data.Aeson (encodeFile)
 import Data.Foldable (traverse_)
-import Plutus.V2.Ledger.Api (PubKeyHash (PubKeyHash))
+import Plutus.V1.Ledger.Api (PubKeyHash (PubKeyHash))
 import PlutusTx.Builtins qualified as PlutusTx
 import System.Directory (createDirectoryIfMissing, doesDirectoryExist)
 import System.Environment (setEnv)

nix/haskell.nix

@@ -256,7 +256,7 @@ waitForRelayNode trCluster rn =
     wait _ = do
       tip <- getTip
       case tip of
-        (ChainTip (SlotNo _) _ _) -> pure ()
+        ChainTip (SlotNo _) _ _ -> pure ()
         a -> throwString $ "Timeout waiting for node to start. Last 'tip' response:\n" <> show a
       pure ()
 
@@ -277,7 +277,7 @@ launchChainIndex conf (RunningNode sp _block0 (netParams, _vData) _) dir = do
           & CIC.port .~ maybe (CIC.cicPort ChainIndex.defaultConfig) fromEnum (chainIndexPort conf)
           & CIC.slotConfig .~ (def {scSlotLength = toMilliseconds slotLen})
 
-  void . async $ void $ ChainIndex.runMainWithLog (const $ return ()) config chainIndexConfig
+  void $ async $ void $ ChainIndex.runMainWithLog (const $ return ()) config chainIndexConfig
   waitForChainIndex port
   return $ chainIndexConfig ^. CIC.port
   where
@@ -292,7 +292,7 @@ launchChainIndex conf (RunningNode sp _block0 (netParams, _vData) _) dir = do
           a ->
             throwString $
               "Timeout waiting for chain-index to start indexing. Last response:\n"
-                <> show a
+                <> either show show a
 
     queryTipWithChIndex port = do
       manager' <- newManager defaultManagerSettings

src/Test/Plutip/Internal/BotPlutusInterface/Setup.hs

@@ -109,7 +109,6 @@ test =
         assertExecution
           "Pay from wallet to wallet"
           (initAda [100] <> initAndAssertAda [100, 13] 123)
-          -- (initAda [100] <> initAda [100, 13])
           (withContract $ \[pkh1] -> payTo pkh1 10_000_000)
           [shouldSucceed]
       , assertExecution
@@ -193,8 +192,7 @@ test =
           "Fails because outside validity interval"
           (initAda [100])
           (withContract $ const failingTimeContract)
-          [shouldFail] -- FIXME: add check that "OutsideValidityIntervalUTxO" is in error message
-          -- [shouldSucceed]
+          [shouldFail]
       , assertExecution
           "Passes validation with exact time range checks"
           (initAda [100])
@@ -223,7 +221,7 @@ testValueAssertionsOrderCorrectness =
         wallet1 = 200_000_000
         wallet2 = 300_000_000
 
-        payFee = 146000
+        payFee = 146400
         payTo1Amt = 22_000_000
         payTo2Amt = 33_000_000
         wallet1After = wallet1 + payTo1Amt
@@ -253,7 +251,7 @@ testValueAssertionsOrderCorrectness =
         wallet1 = 200_000_000
         wallet2 = 300_000_000
 
-        payFee = 146000
+        payFee = 146400
         payTo0Amt = 11_000_000
         payTo1Amt = 22_000_000
         payTo2Amt = 33_000_000

src/Test/Plutip/Internal/LocalCluster.hs

@@ -31,7 +31,7 @@ import Ledger (
 import Ledger.Ada qualified as Ada
 import Ledger.Constraints qualified as Constraints
 import Ledger.Typed.Scripts (mkUntypedValidator)
-import Plutus.Contract (Contract, awaitTxConfirmed, submitTx, submitTxConstraintsWith)
+import Plutus.Contract (Contract)
 import Plutus.Contract qualified as Contract
 import Plutus.PAB.Effects.Contract.Builtin (EmptySchema)
 import Plutus.Script.Utils.V1.Address (mkValidatorAddress)
@@ -122,6 +122,9 @@ validatorAddr = mkValidatorAddress validator
 failingTimeContract :: Contract () EmptySchema Text Hask.String
 failingTimeContract = do
   startTime <- Contract.currentTime
+  -- amount of seconds was picked empirically
+  -- it is relatively small, but big enough so Tx won't be silently dropped
+  -- from the node mempool coz it stayed there longer than validation range
   let timeDiff = POSIXTime 5_000
       endTime = startTime + timeDiff
 
@@ -132,8 +135,8 @@ failingTimeContract = do
           <> Constraints.mustValidateIn validInterval
 
   void $ Contract.awaitTime (endTime - POSIXTime 1_000)
-  tx <- submitTx constr
-  awaitTxConfirmed $ getCardanoTxId tx
+  tx <- Contract.submitTx constr
+  Contract.awaitTxConfirmed $ getCardanoTxId tx
   pure "Light debug done"
 
 successTimeContract :: Contract () EmptySchema Text ()
@@ -146,7 +149,7 @@ lockAtScript = do
           (validatorHash validator)
           unitDatum
           (Ada.adaValueOf 10)
-  tx <- submitTx constr
+  tx <- Contract.submitTx constr
   Contract.awaitTxConfirmed $ getCardanoTxId tx
 
 unlockWithTimeCheck :: Contract () EmptySchema Text ()
@@ -173,6 +176,6 @@ unlockWithTimeCheck = do
               [ Constraints.plutusV1OtherScript validator
               , Constraints.unspentOutputs (Map.fromList utxos)
               ]
-      tx <- submitTxConstraintsWith @TestTime lkps txc
+      tx <- Contract.submitTxConstraintsWith @TestTime lkps txc
       Contract.awaitTxConfirmed (getCardanoTxId tx)
     rest -> Contract.throwError $ "Unlocking error: Unwanted set of utxos: " Hask.<> Text.pack (Hask.show rest)