Merge pull request #115 from mlabs-haskell/gergely/vasil-update-apps

Vasil compliance update

Author: mikekeke

cluster-data/alonzo-genesis.yaml

@@ -360,4 +360,4 @@ costModels:
     verifyEd25519Signature-memory-arguments: 10
     verifySchnorrSecp256k1Signature-cpu-arguments-intercept: 38887044
     verifySchnorrSecp256k1Signature-cpu-arguments-slope: 32947
-    verifySchnorrSecp256k1Signature-memory-arguments: 10
+    verifySchnorrSecp256k1Signature-memory-arguments: 10

cluster-data/node.config

@@ -21,7 +21,6 @@ MaxConcurrencyBulkSync: 1
 # The maximum number of used peers when fetching newly forged blocks.
 MaxConcurrencyDeadline: 2
 
-
 #     _   _           _       _          ____
 #    | | | |_ __   __| | __ _| |_ ___   |  _ \ __ _ _ __ __ _ _ __ ___  ___
 #    | | | | '_ \ / _` |/ _` | __/ _ \  | |_) / _` | '__/ _` | '_ ` _ \/ __|
@@ -61,32 +60,32 @@ defaultBackends:
 #     - stdout
 
 # Tracing options cargo-culted from cardano-node/configuration/byron-mainnet/configuration.yaml
-TraceBlockFetchClient: True
-TraceBlockFetchDecisions: True
-TraceBlockFetchProtocol: True
-TraceBlockFetchProtocolSerialised: True
-TraceBlockFetchServer: True
+TraceBlockFetchClient: False
+TraceBlockFetchDecisions: False
+TraceBlockFetchProtocol: False
+TraceBlockFetchProtocolSerialised: False
+TraceBlockFetchServer: False
 TraceChainDb: True
-TraceChainSyncClient: True
-TraceChainSyncBlockServer: True
-TraceChainSyncHeaderServer: True
-TraceChainSyncProtocol: True
+TraceChainSyncClient: False
+TraceChainSyncBlockServer: False
+TraceChainSyncHeaderServer: False
+TraceChainSyncProtocol: False
 TraceDNSResolver: True
 TraceDNSSubscription: True
 TraceErrorPolicy: True
 TraceLocalErrorPolicy: True
 TraceForge: True
 TraceHandshake: False
 TraceIpSubscription: True
-TraceLocalChainSyncProtocol: True
+TraceLocalChainSyncProtocol: False
 TraceLocalHandshake: False
-TraceLocalTxSubmissionProtocol: True
-TraceLocalTxSubmissionServer: True
+TraceLocalTxSubmissionProtocol: False
+TraceLocalTxSubmissionServer: False
 TraceMempool: True
-TraceMux: True
-TraceTxInbound: True
-TraceTxOutbound: True
-TraceTxSubmissionProtocol: True
+TraceMux: False
+TraceTxInbound: False
+TraceTxOutbound: False
+TraceTxSubmissionProtocol: False
 
 # more options which can be passed as key-value pairs:
 options:

flake.lock

@@ -11,7 +11,7 @@
       flake = false;
     };
     bot-plutus-interface.url =
-      "github:mlabs-haskell/bot-plutus-interface?rev=142f1195e06906c18577fa05da5a6f981913a538";
+      "github:mlabs-haskell/bot-plutus-interface?rev=c5d2624440c7320a22269f0c085d4eefc889bc2f";
   };
 
   outputs =

flake.nix

@@ -87,7 +87,7 @@ startClusterHandler
             addSomeWallet (fromInteger . unLovelace <$> lovelaceAmounts)
         waitSeconds 2 -- wait for transactions to submit
         pure (env, wallets)
-      getNodeSocketFile (runningNode -> RunningNode conn _ _) = nodeSocketFile conn
+      getNodeSocketFile (runningNode -> RunningNode conn _ _ _) = nodeSocketFile conn
       getNodeConfigFile =
         -- assumption is that node.config lies in the same directory as node.socket
         flip replaceFileName "node.config" . getNodeSocketFile

plutip-server/Api/Handlers.hs

@@ -338,7 +338,7 @@ withContractAs walletIdx toContract = do
   execValues <- liftIO $ runContract cEnv ownWallet valuesAtWallet
 
   case outcome execValues of
-    Left _ -> fail "Failed to get values"
+    Left e -> fail $ "Failed to get values. Error: " ++ show e
     Right values -> return $ execRes {outcome = (,values) <$> outcome execRes}
   where
     separateWallets :: forall b. Int -> NonEmpty b -> (b, [b])

src/Test/Plutip/Contract.hs

@@ -45,11 +45,11 @@ walletToLedger wAddr =
 ledgerToCardanoMainnet ::
   Address.Address ->
   Either Ledger.ToCardanoError (CAPI.AddressInEra CAPI.BabbageEra)
-ledgerToCardanoMainnet = Ledger.toCardanoAddressBabbage CAPI.Mainnet
+ledgerToCardanoMainnet = Ledger.toCardanoAddressInEra CAPI.Mainnet
 
 ledgerToCardanoMainnet' :: Address.Address -> Either Ledger.ToCardanoError Text
 ledgerToCardanoMainnet' addr =
-  CAPI.serialiseAddress <$> Ledger.toCardanoAddressBabbage CAPI.Mainnet addr
+  CAPI.serialiseAddress <$> Ledger.toCardanoAddressInEra CAPI.Mainnet addr
 
 -- | Get `String` representation of address on mainnet
 -- mkMainnetAddress :: BpiWallet -> String

src/Test/Plutip/Tools/Address.hs

@@ -174,20 +174,21 @@ test =
           (withContract $ const lockThenSpend)
           [ shouldSucceed
           , budgetsFitUnder
-              (scriptLimit 426019962 1082502)
-              (policyLimit 428879716 1098524)
+              (scriptLimit 406250690 1016102)
+              (policyLimit 405210181 1019024)
           , assertOverallBudget
-              "Assert CPU == 1156006922 and MEM == 2860068"
-              (== 1156006922)
-              (== 2860068)
-          , overallBudgetFits 1156006922 2860068
+              "Assert CPU == 1106851699 and MEM == 2694968"
+              (== 1106851699)
+              (== 2694968)
+          , overallBudgetFits 1106851699 2694968
           ]
       , -- regression tests for time <-> slot conversions
         assertExecution
           "Fails because outside validity interval"
           (initAda [100])
           (withContract $ const failingTimeContract)
-          [shouldFail]
+          [shouldFail] -- FIXME: add check that "OutsideValidityIntervalUTxO" is in error message
+          -- [shouldSucceed] 
       , assertExecution
           "Passes validation with exact time range checks"
           (initAda [100])

test/Spec/Integration.hs

@@ -52,7 +52,7 @@ spendFromScript = do
 
           lkps =
             Hask.mconcat
-              [ Constraints.otherScript validator
+              [ Constraints.plutusV1OtherScript validator
               , Constraints.unspentOutputs (Map.fromList utxos)
               ]
       tx <- submitTxConstraintsWith @AlwaysFail lkps txc

test/Spec/TestContract/AlwaysFail.hs

@@ -75,8 +75,8 @@ spendFromScript = do
               <> Constraints.mustMintValueWithRedeemer Scripts.unitRedeemer token
           lookups1 =
             Constraints.unspentOutputs (Map.fromList utxos1)
-              <> Constraints.otherScript validator
-              <> Constraints.mintingPolicy mintingPolicy
+              <> Constraints.plutusV1OtherScript validator
+              <> Constraints.plutusV1MintingPolicy mintingPolicy
 
       let txc2 =
             Constraints.mustSpendScriptOutput oref2 Scripts.unitRedeemer
@@ -85,7 +85,7 @@ spendFromScript = do
                 (adaValueOf 200)
           lookups2 =
             Constraints.unspentOutputs (Map.fromList utxos2)
-              <> Constraints.otherScript (validator2 2)
+              <> Constraints.plutusV1OtherScript (validator2 2)
 
       tx <-
         submitTxConstraintsWith @TestLockSpend