Merge branch 'master' into t4/metadata-2

Author: nazrhom

.github/format.sh

@@ -4,7 +4,7 @@
 
 .PHONY: hoogle pab_servers_all pab_servers_all pab_db clean_db \
 	nix_build_lib nix_build_examples build test accept_pirs watch ghci readme_contents \
-	format lint requires_nix_shell 
+	format lint requires_nix_shell
 
 usage:
 	@echo "usage: make <command> [OPTIONS]"
@@ -25,8 +25,10 @@ usage:
 	@echo "  ghci                -- Run cabal v2-repl bot-plutus-interface"
 	@echo "  format              -- Apply source code formatting with fourmolu"
 	@echo "  format_check        -- Check source code formatting without making changes"
-	@echo "  nixfmt              -- Apply nix formatting with nixfmt"
-	@echo "  nixfmt_check        -- Check nix files for format errors"
+	@echo "  cabalfmt            -- Apply cabal formatting with cabal-fmt"
+	@echo "  cabalfmt_check      -- Check cabal files for formatting errors without making changes"
+	@echo "  nixpkgsfmt          -- Apply nix formatting with nixfmt"
+	@echo "  nixpkgsfmt_check    -- Check nix files for format errors"
 	@echo "  lint                -- Check the sources with hlint"
 	@echo "  readme_contents     -- Add table of contents to README"
 	@echo "  update_plutus       -- Update plutus version with niv"
@@ -68,7 +70,7 @@ ghci: requires_nix_shell
 	cabal v2-repl $(GHC_FLAGS) bot-plutus-interface
 
 # Source dirs to run fourmolu on
-FORMAT_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.hs' )
+FORMAT_SOURCES := $(shell fd -e hs)
 
 # Extensions we need to tell fourmolu about
 FORMAT_EXTENSIONS := -o -XTemplateHaskell -o -XTypeApplications -o -XImportQualifiedPost -o -XPatternSynonyms -o -fplugin=RecordDotPreprocessor
@@ -81,14 +83,23 @@ format: requires_nix_shell
 format_check: requires_nix_shell
 	fourmolu --mode check --check-idempotence $(FORMAT_EXTENSIONS) $(FORMAT_SOURCES)
 
+# Cabal package definitions
+CABAL_SOURCES := $(shell fd -e cabal)
+
+cabalfmt: requires_nix_shell
+	cabal-fmt --inplace $(CABAL_SOURCES)
+
+cabalfmt_check: requires_nix_shell
+	cabal-fmt --check $(CABAL_SOURCES)
+
 # Nix files to format
-NIX_SOURCES := $(shell git ls-tree -r HEAD --full-tree --name-only | grep -E '.*\.nix' )
+NIX_SOURCES := $(shell fd -e nix)
 
-nixfmt: requires_nix_shell
-	nixfmt $(NIX_SOURCES)
+nixpkgsfmt: requires_nix_shell
+	nixpkgs-fmt $(NIX_SOURCES)
 
-nixfmt_check: requires_nix_shell
-	nixfmt --check $(NIX_SOURCES)
+nixpkgsfmt_check: requires_nix_shell
+	nixpkgs-fmt --check $(NIX_SOURCES)
 
 # Check with hlint, currently I couldn't get --refactor to work
 lint: requires_nix_shell
@@ -124,4 +135,3 @@ update_plutus:
 build_path = dist-newstyle/build/x86_64-linux/ghc-8.10.4.20210212/bot-plutus-interface-0.1
 clear_build:
 	@[ ! -e $(build_path) ] || rm -rf $(build_path)
-

.github/workflows/integrate.yaml

@@ -87,6 +87,7 @@ main = do
           , -- | Slot configuration of the network, the default value can be used for the mainnet
             pcSlotConfig = def
           , pcOwnPubKeyHash = "0f45aaf1b2959db6e5ff94dbb1f823bf257680c3c723ac2d49f97546"
+          , pcOwnStakePubKeyHash = Nothing
           , -- Directory name of the script and data files
             pcScriptFileDir = "./scripts"
           , -- Directory for the signing key file(s)
@@ -96,11 +97,11 @@ main = do
           , -- Dry run mode will build the tx, but skip the submit step
             pcDryRun = False
           , pcLogLevel = Debug
-          , -- | Forced budget for scripts, as optional (CPU Steps, Memory Units)
-            pcForceBudget = Nothing
           , -- Protocol params file location relative to the cardano-cli working directory (needed for the cli)
           , pcProtocolParamsFile = "./protocol.json"
           , pcEnableTxEndpoint = True
+          -- Save some stats during contract run (only transactions execution budgets supported atm)
+          , pcCollectStats = False
           }
   BotPlutusInterface.runPAB @MyContracts pabConf
 ```

Makefile

@@ -76,15 +76,20 @@ library
   import:          common-lang
   exposed-modules:
     BotPlutusInterface
+    BotPlutusInterface.Balance
+    BotPlutusInterface.BodyBuilder
     BotPlutusInterface.CardanoCLI
     BotPlutusInterface.ChainIndex
     BotPlutusInterface.Contract
     BotPlutusInterface.Effects
+    BotPlutusInterface.ExBudget
     BotPlutusInterface.Files
-    BotPlutusInterface.Balance
+    BotPlutusInterface.Helpers
+    BotPlutusInterface.QueryNode
+    BotPlutusInterface.Server
     BotPlutusInterface.Types
     BotPlutusInterface.UtxoParser
-    BotPlutusInterface.Server
+
   build-depends:
     , aeson                      ^>=1.5.0.0
     , attoparsec                 >=0.13.2.2
@@ -93,6 +98,7 @@ library
     , cardano-crypto
     , cardano-ledger-alonzo
     , cardano-prelude
+    , cardano-slotting
     , containers
     , data-default
     , data-default-class
@@ -146,10 +152,11 @@ test-suite bot-plutus-interface-test
   main-is:        Spec.hs
   ghc-options:    -fplugin-opt PlutusTx.Plugin:defer-errors
   other-modules:
-    Spec.BotPlutusInterface.Contract
     Spec.BotPlutusInterface.Balance
-    Spec.BotPlutusInterface.UtxoParser
+    Spec.BotPlutusInterface.Contract
+    Spec.BotPlutusInterface.ContractStats
     Spec.BotPlutusInterface.Server
+    Spec.BotPlutusInterface.UtxoParser
     Spec.MockContract
 
   build-depends:
@@ -199,8 +206,8 @@ test-suite bot-plutus-interface-test
     , tasty-quickcheck
     , temporary
     , text                       ^>=1.2.4.0
-    , uuid
     , utf8-string
+    , uuid
     , warp
 
   hs-source-dirs: test

README.md

@@ -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

bot-plutus-interface.cabal

@@ -61,14 +61,15 @@ 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)
           , pcEnableTxEndpoint = True
           , pcMetadataDir = "./metadata"
+          , pcCollectStats = False
           }
   BotPlutusInterface.runPAB @GameContracts pabConf

cabal.project

@@ -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/app/Main.hs

@@ -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/guess.sh

@@ -76,6 +76,7 @@ library
   build-depends:
     , aeson                      ^>=1.5.0.0
     , attoparsec                 >=0.13.2.2
+    , bot-plutus-interface
     , bytestring                 ^>=0.10.12.0
     , cardano-api
     , cardano-crypto