Merge pull request #103 from mlabs-haskell/gergely/vasil

Vasil update
mlabs-haskell · Sep 2, 2022 · 67db4a6 · 67db4a6
2 parents 761a0d6 + 7a47f37
commit 67db4a6
Show file tree

Hide file tree

Showing 47 changed files with 3,067 additions and 2,049 deletions.
diff --git a/README.md b/README.md
@@ -65,8 +65,6 @@ instance HasDefinitions MyContracts where
 3. Write your main entrypoint for the application and the configuration file
 
 ```haskell
-import BotPlutusInterface qualified
-import BotPlutusInterface.Config qualified as BotPlutusInterface
 import Prelude
 
 main :: IO ()
@@ -79,7 +77,7 @@ main = do
 
 Configuration format (example: <examples/plutus-game/pabConfig.value>):
 
-``` console
+```console
 $ cabal repl --disable-optimisation --repl-options -Wwarn
 ...
 BotPlutusInterface> :m Prelude

diff --git a/bot-plutus-interface.cabal b/bot-plutus-interface.cabal
@@ -27,12 +27,10 @@ common common-lang
     -Wall -Wcompat -Wincomplete-record-updates
     -Wincomplete-uni-patterns -Wredundant-constraints -fobject-code
     -fno-ignore-interface-pragmas -fno-omit-interface-pragmas
-    -fplugin=RecordDotPreprocessor
-
-  -- -Werror
+    -fplugin=RecordDotPreprocessor -Werror
 
   build-depends:
-    , base                     ^>=4.14
+    , base
     , record-dot-preprocessor
     , record-hasfield
 
@@ -80,7 +78,10 @@ library
     BotPlutusInterface
     BotPlutusInterface.Balance
     BotPlutusInterface.BodyBuilder
+    BotPlutusInterface.CardanoAPI
     BotPlutusInterface.CardanoCLI
+    BotPlutusInterface.CardanoNode.Effects
+    BotPlutusInterface.CardanoNode.Query
     BotPlutusInterface.ChainIndex
     BotPlutusInterface.CoinSelection
     BotPlutusInterface.Collateral
@@ -90,7 +91,6 @@ library
     BotPlutusInterface.ExBudget
     BotPlutusInterface.Files
     BotPlutusInterface.Helpers
-    BotPlutusInterface.QueryNode
     BotPlutusInterface.Server
     BotPlutusInterface.TimeSlot
     BotPlutusInterface.Types
@@ -103,13 +103,15 @@ library
     PlutusConfig.Types
 
   build-depends:
-    , aeson                      ^>=1.5.0.0
+    , aeson
     , attoparsec                 >=0.13.2.2
     , bytestring                 ^>=0.10.12.0
     , cardano-api
     , cardano-crypto
     , cardano-ledger-alonzo
+    , cardano-ledger-babbage
     , cardano-ledger-core
+    , cardano-ledger-shelley
     , cardano-prelude
     , cardano-slotting
     , config-schema
@@ -138,6 +140,7 @@ library
     , plutus-ledger-api
     , plutus-ledger-constraints
     , plutus-pab
+    , plutus-script-utils
     , plutus-tx
     , plutus-tx-plugin
     , pretty
@@ -176,6 +179,7 @@ test-suite bot-plutus-interface-test
   main-is:        Spec.hs
   ghc-options:    -fplugin-opt PlutusTx.Plugin:defer-errors
   other-modules:
+    Spec.BotPlutusInterface.AdjustUnbalanced
     Spec.BotPlutusInterface.Balance
     Spec.BotPlutusInterface.CoinSelection
     Spec.BotPlutusInterface.Collateral
@@ -184,12 +188,11 @@ test-suite bot-plutus-interface-test
     Spec.BotPlutusInterface.ContractStats
     Spec.BotPlutusInterface.Server
     Spec.BotPlutusInterface.TxStatusChange
-    Spec.BotPlutusInterface.UtxoParser
     Spec.MockContract
     Spec.RandomLedger
 
   build-depends:
-    , aeson                      ^>=1.5.0.0
+    , aeson
     , attoparsec
     , base
     , base-compat
@@ -220,6 +223,7 @@ test-suite bot-plutus-interface-test
     , plutus-ledger-api
     , plutus-ledger-constraints
     , plutus-pab
+    , plutus-script-utils
     , plutus-tx
     , plutus-tx-plugin
     , pretty-diff

diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
-index-state: 2022-01-22T00:00:00Z
+index-state: 2022-05-18T00:00:00Z
 
 packages: ./bot-plutus-interface.cabal
           ./examples/plutus-game/plutus-game.cabal

diff --git a/examples/plutus-game/cabal.project b/examples/plutus-game/cabal.project
@@ -1,5 +1,5 @@
 -- Bump this if you need newer packages
-index-state: 2021-10-20T00:00:00Z
+index-state: 2022-05-18T00:00:00Z
 
 packages:
   ./.
@@ -11,4 +11,3 @@ write-ghc-environment-files: never
 -- Always build tests and benchmarks.
 tests: true
 benchmarks: true
-
diff --git a/examples/plutus-game/pabConfig.value b/examples/plutus-game/pabConfig.value
@@ -1,7 +1,7 @@
 -- Calling the cli locally or through an ssh connection
 cliLocation:   local
 chainIndexUrl: "http://localhost:9083"
-networkId:     1097911063
+networkId:     9
 
 -- Directory name of the script and data files
 scriptFileDir:      "./scripts"

diff --git a/examples/plutus-game/plutus-game.cabal b/examples/plutus-game/plutus-game.cabal
@@ -74,7 +74,7 @@ library
   import:          common-lang
   exposed-modules: Cardano.PlutusExample.Game
   build-depends:
-    , aeson                      ^>=1.5.0.0
+    , aeson
     , attoparsec                 >=0.13.2.2
     , bot-plutus-interface
     , bytestring                 ^>=0.10.12.0
@@ -126,7 +126,7 @@ library
 executable plutus-game-pab
   import:         common-lang
   build-depends:
-    , aeson                 ^>=1.5.0.0
+    , aeson
     , bot-plutus-interface
     , bytestring
     , cardano-api