Merge branch 'master' into misha/ex-units-for-plutip

Author: mikekeke

bot-plutus-interface.cabal

@@ -88,7 +88,8 @@ library
     BotPlutusInterface.Server
     BotPlutusInterface.Types
     BotPlutusInterface.UtxoParser
-
+    BotPlutusInterface.Server
+    BotPlutusInterface.Helpers
   build-depends:
     , aeson                      ^>=1.5.0.0
     , QuickCheck

cabal.project

@@ -1,6 +1,6 @@
 index-state: 2022-01-22T00:00:00Z
 
-packages: ./.
+packages: ./bot-plutus-interface.cabal
           ./examples/plutus-game/plutus-game.cabal
           ./examples/plutus-transfer/plutus-transfer.cabal
           ./examples/plutus-nft/plutus-nft.cabal

examples/plutus-game/app/Main.hs

@@ -61,13 +61,14 @@ main = do
           , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
+          , pcOwnStakePubKeyHash = Nothing
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"
           , pcTxFileDir = "./txs"
           , pcDryRun = True
           , pcLogLevel = Debug
           , pcProtocolParamsFile = "./protocol.json"
-          , pcForceBudget = Just (1000, 1000)
+          , pcForceBudget = Just (9_000_000_000, 15_000_000)
           , pcEnableTxEndpoint = True
           }
   BotPlutusInterface.runPAB @GameContracts pabConf

examples/plutus-game/guess.sh

@@ -6,7 +6,7 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
     "caID": {
         "tag": "Guess",
         "contents": {
-            "guessGameId": 2,
+            "guessGameId": 3,
             "guessSecret": "secret"
         }
     }

examples/plutus-game/lock.sh

@@ -6,7 +6,7 @@ CONTRACT_INST_ID=$(curl --location --request POST 'localhost:9080/api/contract/a
     "caID": {
         "tag": "Lock",
         "contents": {
-            "lockGameId": 2,
+            "lockGameId": 3,
             "lockAmount": 1000000,
             "lockSecret": "secret"
         }

examples/plutus-game/plutus-game.cabal

@@ -81,6 +81,7 @@ library
     , cardano-crypto
     , cardano-ledger-alonzo
     , containers
+    , bot-plutus-interface
     , data-default
     , data-default-class
     , directory

examples/plutus-game/protocol.json

@@ -61,6 +61,7 @@ main = do
           , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
+          , pcOwnStakePubKeyHash = Nothing
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"
           , pcTxFileDir = "./txs"

examples/plutus-nft/app/Main.hs

@@ -60,6 +60,7 @@ main = do
           , pcTipPollingInterval = 10_000_000
           , pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
+          , pcOwnStakePubKeyHash = Nothing
           , pcScriptFileDir = "./scripts"
           , pcSigningKeyFileDir = "./signing-keys"
           , pcTxFileDir = "./txs"

examples/plutus-transfer/app/Main.hs

@@ -328,7 +328,15 @@
             withHoogle = true;
             tools.haskell-language-server = {};
             exactDeps = true;
-            nativeBuildInputs = [ pkgs'.cabal-install pkgs'.hlint pkgs'.haskellPackages.fourmolu pkgs'.jq pkgs'.websocat ];
+            nativeBuildInputs = [
+              pkgs'.cabal-install
+              pkgs'.haskellPackages.cabal-fmt
+              pkgs'.haskellPackages.implicit-hie
+              pkgs'.hlint
+              pkgs'.haskellPackages.fourmolu
+              pkgs'.jq
+              pkgs'.websocat
+            ];
           };
           modules = haskellModules;
         };