Merge branch 'gergely/wait-slots' of github.com:mlabs-haskell/bot-plutus-interface into gergely/manual-sign

Author: gege251

README.md

@@ -39,6 +39,10 @@ data MyContracts
 2. Define a HasDefinitions instance for the endpoints
 
 ```haskell
+import BotPlutusInterface.Types (HasDefinitions (..), SomeBuiltin (..), endpointsToSchemas)
+import Playground.Types (FunctionSchema)
+import Schema (FormSchema)
+
 instance HasDefinitions MyContracts where
   getDefinitions :: [MyContract]
   getDefinitions = []
@@ -61,6 +65,13 @@ instance HasDefinitions MyContracts where
 3. Write your main entrypoint for the application, with the preferred configurations
 
 ```haskell
+import BotPlutusInterface.Types (CLILocation (Local), LogLevel (Debug), PABConfig (..))
+import Cardano.Api (NetworkId (Testnet), NetworkMagic (..))
+import Data.Aeson qualified as JSON
+import Data.ByteString.Lazy qualified as LazyByteString
+import Data.Default (def)
+import Servant.Client.Core (BaseUrl (BaseUrl), Scheme (Http))
+
 main :: IO ()
 main = do
   protocolParams <- JSON.decode <$> LazyByteString.readFile "protocol.json"
@@ -72,6 +83,8 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , -- | Slot configuration of the network, the default value can be used for the mainnet
+            pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , -- Directory name of the script and data files
             pcScriptFileDir = "./scripts"

cabal-haskell.nix.project

@@ -11,11 +11,12 @@ source-repository-package
     plutus-ledger
     plutus-ledger-constraints
     plutus-pab
+    plutus-pab-executables
     plutus-playground-server
     plutus-use-cases
     quickcheck-dynamic
     web-ghc
-  tag: 75a581c6eb98d36192ce3d3f86ea60a04bc4a52a
+  tag: 34fe6eeff441166fee0cd0ceba68c1439f0e93d2
 
 -- The following sections are copied from the 'plutus-pab' repository cabal.project at the revision
 -- given above.
@@ -61,6 +62,16 @@ package ouroboros-consensus-cardano
   optimization: False
 package cardano-api
   optimization: False
+package cardano-wallet
+  optimization: False
+package cardano-wallet-core
+  optimization: False
+package cardano-wallet-cli
+  optimization: False
+package cardano-wallet-launcher
+  optimization: False
+package cardano-wallet-core-integration
+  optimization: False
 
 -- Copied from plutus-core
 source-repository-package
@@ -83,13 +94,15 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-crypto.git
-  tag: 07397f0e50da97eaa0575d93bee7ac4b2b2576ec
+  tag: f73079303f663e028288f9f4a9e08bcca39a923e
+  --sha256: 1n87i15x54s0cjkh3nsxs4r1x016cdw1fypwmr68936n3xxsjn6q
 
 -- Copied from plutus-core
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-base
-  tag: 4ea7e2d927c9a7f78ddc69738409a5827ab66b98
+  tag: 654f5b7c76f7cc57900b4ddc664a82fc3b925fb0
+  --sha256: 0j4x9zbx5dkww82sqi086h39p456iq5xr476ylmrnpwcpfb4xai4
   subdir:
     base-deriving-via
     binary
@@ -106,7 +119,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-prelude
-  tag: fd773f7a58412131512b9f694ab95653ac430852
+  tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
+  --sha256: 00h10l5mmiza9819p9v5q5749nb9pzgi20vpzpy1d34zmh6gf1cj
   subdir:
     cardano-prelude
     cardano-prelude-test
@@ -121,9 +135,11 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/j-mueller/cardano-wallet
-  tag: 6be73ab852c0592713dfe78218856d4a8a0ee69e
+  location: https://github.com/input-output-hk/cardano-wallet
+  tag: 760140e238a5fbca61d1b286d7a80ece058dc729
+  --sha256: 014njpddrlqm9bbab636h2gf58zkm0bx04i1jsn07vh5j3k0gri6
   subdir:
+    lib/dbvar
     lib/text-class
     lib/strict-non-empty-containers
     lib/core
@@ -137,7 +153,8 @@ source-repository-package
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/ouroboros-network
-  tag: 1f4973f36f689d6da75b5d351fb124d66ef1057d
+  tag: d613de3d872ec8b4a5da0c98afb443f322dc4dab
+  --sha256: 0lfbipfdrzay8v1pcazx0qgkda3d1j0505yig9jrml9j7991rmhl
   subdir:
     monoidal-synchronisation
     typed-protocols
@@ -181,8 +198,9 @@ source-repository-package
 
 source-repository-package
   type: git
-  location: https://github.com/input-output-hk/cardano-ledger-specs
+  location: https://github.com/input-output-hk/cardano-ledger
   tag: bf008ce028751cae9fb0b53c3bef20f07c06e333
+  --sha256: 0my3801w1vinc0kf5yh9lxl6saqxgwm6ccg0vvzi104pafcwwcqx
   subdir:
     byron/ledger/impl
     cardano-ledger-core
@@ -203,23 +221,13 @@ source-repository-package
     libs/cardano-ledger-pretty
     semantics/small-steps-test
 
--- A lot of plutus-apps dependencies have to be synchronized with the dependencies of
--- cardano-node. If you update cardano-node, please make sure that all dependencies
--- of cardano-node are also updated.
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node.git
-  tag: b6ca519f97a0e795611a63174687e6bb70c9f752
+  tag: 4f65fb9a27aa7e3a1873ab4211e412af780a3648
+  --sha256: 00k9fqrm0gphjji23x0nc9z6bqh8bqrncgivn3mi3csacjzicrrx
   subdir:
     cardano-api
-    cardano-node
-    cardano-cli
-    cardano-config
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/optparse-applicative
-  tag: 7497a29cb998721a9068d5725d49461f2bba0e7a
 
 source-repository-package
   type: git
@@ -235,14 +243,14 @@ source-repository-package
 -- plutus. If you update plutus, please make sure that all dependencies of plutus
 -- are also updated
 source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/plutus
-  tag: c8c5183f7facd967d48fe07b3b14465b8dd48fe7
-  subdir:
-    plutus-core
-    plutus-ledger-api
-    plutus-tx
-    plutus-tx-plugin
-    word-array
-    prettyprinter-configurable
-    stubs/plutus-ghc-stub
+ type: git
+ location: https://github.com/input-output-hk/plutus
+ tag: 65bad0fd53e432974c3c203b1b1999161b6c2dce
+ subdir:
+   plutus-ledger-api
+   word-array
+   prettyprinter-configurable
+   stubs/plutus-ghc-stub
+   plutus-core
+   plutus-tx
+   plutus-tx-plugin

examples/plutus-game/app/Main.hs

@@ -22,6 +22,7 @@ import Cardano.PlutusExample.Game (
 import Data.Aeson qualified as JSON
 import Data.Aeson.TH (defaultOptions, deriveJSON)
 import Data.ByteString.Lazy qualified as LazyByteString
+import Data.Default (def)
 import Data.Maybe (fromMaybe)
 import Playground.Types (FunctionSchema)
 import Schema (FormSchema)
@@ -57,6 +58,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"

examples/plutus-game/plutus-game.cabal

@@ -129,6 +129,7 @@ executable plutus-game-pab
     , bot-plutus-interface
     , bytestring
     , cardano-api
+    , data-default
     , playground-common
     , plutus-game
     , plutus-ledger

examples/plutus-nft/app/Main.hs

@@ -20,6 +20,7 @@ import Cardano.PlutusExample.NFT (
 import Data.Aeson qualified as JSON
 import Data.Aeson.TH (defaultOptions, deriveJSON)
 import Data.ByteString.Lazy qualified as LazyByteString
+import Data.Default (def)
 import Data.Maybe (fromMaybe)
 import Ledger.Value (TokenName)
 import Playground.Types (FunctionSchema)
@@ -57,6 +58,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"

examples/plutus-nft/plutus-nft.cabal

@@ -129,6 +129,7 @@ executable plutus-nft-pab
     , bot-plutus-interface
     , bytestring
     , cardano-api
+    , data-default
     , playground-common
     , plutus-ledger
     , plutus-nft

examples/plutus-transfer/app/Main.hs

@@ -21,6 +21,7 @@ import Cardano.PlutusExample.Transfer (
 import Data.Aeson qualified as JSON
 import Data.Aeson.TH (defaultOptions, deriveJSON)
 import Data.ByteString.Lazy qualified as LazyByteString
+import Data.Default (def)
 import Data.Maybe (fromMaybe)
 import Playground.Types (FunctionSchema)
 import Schema (FormSchema)
@@ -56,6 +57,7 @@ main = do
           , pcChainIndexUrl = BaseUrl Http "localhost" 9083 ""
           , pcPort = 9080
           , pcProtocolParams = protocolParams
+          , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"

examples/plutus-transfer/plutus-transfer.cabal

@@ -129,6 +129,7 @@ executable plutus-transfer-pab
     , bot-plutus-interface
     , bytestring
     , cardano-api
+    , data-default
     , playground-common
     , plutus-ledger
     , plutus-transfer

examples/plutus-transfer/src/Cardano/PlutusExample/Transfer.hs

@@ -12,6 +12,7 @@ import Data.Aeson.TH (defaultOptions, deriveJSON)
 import Data.Bifunctor (first)
 import Data.Monoid (Last (Last))
 import Data.Text (Text)
+import Data.Void (Void)
 import GHC.Generics (Generic)
 import Ledger hiding (singleton)
 import Ledger.Constraints as Constraints
@@ -35,10 +36,12 @@ transfer :: TransferParams -> Contract (Last Text) TransferSchema Text ()
 transfer (TransferParams outputPerTx allPayments) = do
   tell $ Last $ Just "Contract started"
   let txs =
-        map (mconcat . map (uncurry Constraints.mustPayToPubKey . first PaymentPubKeyHash)) $
-          group outputPerTx allPayments
+        map toTx $ group outputPerTx allPayments
   forM_ txs $ \tx -> submitTx tx >> waitNSlots 1
   tell $ Last $ Just "Finished"
+  where
+    toTx :: [(PubKeyHash, Value)] -> TxConstraints Void Void
+    toTx = mconcat . map (uncurry Constraints.mustPayToPubKey . first PaymentPubKeyHash)
 
 group :: Int -> [a] -> [[a]]
 group n list