Merge branch 'master' into sam/fix-remote-cli

Author: samuelWilliams99

README.md

@@ -83,6 +83,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcTipPollingInterval = 10_000_000
           , -- | Slot configuration of the network, the default value can be used for the mainnet
             pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
@@ -97,6 +98,7 @@ main = do
           , pcLogLevel = Debug
           , -- Protocol params file location relative to the cardano-cli working directory (needed for the cli)
           , pcProtocolParamsFile = "./protocol.json"
+          , pcEnableTxEndpoint = True
           }
   BotPlutusInterface.runPAB @MyContracts pabConf
 ```

examples/plutus-game/app/Main.hs

@@ -58,6 +58,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"

examples/plutus-nft/app/Main.hs

@@ -58,6 +58,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"

examples/plutus-transfer/app/Main.hs

@@ -57,6 +57,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"

src/BotPlutusInterface/Contract.hs

@@ -232,7 +232,7 @@ awaitSlot ::
   Slot ->
   Eff effs Slot
 awaitSlot contractEnv s@(Slot n) = do
-  threadDelay @w 10_000_000
+  threadDelay @w (fromIntegral contractEnv.cePABConfig.pcTipPollingInterval)
   tip <- CardanoCLI.queryTip @w contractEnv.cePABConfig
   case tip of
     Right tip'

src/BotPlutusInterface/Types.hs

@@ -31,6 +31,7 @@ import GHC.Generics (Generic)
 import Ledger (PubKeyHash)
 import Ledger.TimeSlot (SlotConfig)
 import Network.Wai.Handler.Warp (Port)
+import Numeric.Natural (Natural)
 import Plutus.PAB.Core.ContractInstance.STM (Activity)
 import Plutus.PAB.Effects.Contract.Builtin (
   HasDefinitions (..),
@@ -61,6 +62,7 @@ data PABConfig = PABConfig
     pcDryRun :: !Bool
   , pcLogLevel :: !LogLevel
   , pcOwnPubKeyHash :: !PubKeyHash
+  , pcTipPollingInterval :: !Natural
   , pcPort :: !Port
   , pcEnableTxEndpoint :: !Bool
   }
@@ -115,6 +117,7 @@ instance Default PABConfig where
       , pcNetwork = Testnet (NetworkMagic 42)
       , pcProtocolParams = def
       , pcSlotConfig = def
+      , pcTipPollingInterval = 10_000_000
       , pcScriptFileDir = "./result-scripts"
       , pcSigningKeyFileDir = "./signing-keys"
       , pcTxFileDir = "./txs"