Bump carano-api. Ongoing balancing error hunting

input-output-hk · Sep 2, 2024 · 91ea28d · 91ea28d
1 parent 93e9f72
commit 91ea28d
Show file tree

Hide file tree

Showing 23 changed files with 100 additions and 90 deletions.
diff --git a/cabal.project b/cabal.project
@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2024-06-23T23:01:13Z
-  , cardano-haskell-packages 2024-07-24T14:16:32Z 
+  , hackage.haskell.org 2024-08-07T14:18:16Z
+  , cardano-haskell-packages 2024-08-28T06:44:16Z
 
 packages:
   async-components
@@ -205,9 +205,10 @@ source-repository-package
 source-repository-package
    type: git
    location: https://github.com/input-output-hk/marlowe
-   tag: c144edd67361eccb0aabe15403e9f0788ccc6d56
+   tag: e94fab24826f5b095e8fc7c5a41fac939e5fb9ae
    subdir: marlowe-spec-test
            isabelle
-   --sha256: sha256-ento9kEmQnblcqLcvbc6R6DdF0izqb8ROl7t3yE99M4=
+   --sha256: sha256-29HMWsmDsRTyuJVJE+yc1rujNX6U6oVZ2homTab1syw=
+
 
 
diff --git a/flake.lock b/flake.lock
diff --git a/libs/cardano-debug/cardano-debug.cabal b/libs/cardano-debug/cardano-debug.cabal
@@ -56,7 +56,7 @@ library
     , aeson
     , base >=4.9 && <5
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-ledger-core
     , cardano-ledger-shelley
     , containers

diff --git a/libs/plutus-ledger-ada/plutus-ledger-ada.cabal b/libs/plutus-ledger-ada/plutus-ledger-ada.cabal
@@ -46,8 +46,8 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-ledger-api ^>=1.30
-    , plutus-tx ^>=1.30
+    , plutus-ledger-api ^>=1.31
+    , plutus-tx ^>=1.31
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal b/libs/plutus-ledger-aeson/plutus-ledger-aeson.cabal
@@ -40,9 +40,9 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-core ^>=1.30
-    , plutus-ledger-api ^>=1.30
-    , plutus-tx ^>=1.30
+    , plutus-core ^>=1.31
+    , plutus-ledger-api ^>=1.31
+    , plutus-tx ^>=1.31
 
   ------------------------
   -- Non-IOG dependencies

diff --git a/libs/plutus-ledger-slot/plutus-ledger-slot.cabal b/libs/plutus-ledger-slot/plutus-ledger-slot.cabal
@@ -48,8 +48,8 @@ library
   -- Other IOG dependencies
   --------------------------
   build-depends:
-    , plutus-ledger-api ^>=1.30
-    , plutus-tx ^>=1.30
+    , plutus-ledger-api ^>=1.31
+    , plutus-tx ^>=1.31
 
   -- We don't need plutus ledger here but
   -- we have orphans collision.

diff --git a/marlowe-actus/marlowe-actus.cabal b/marlowe-actus/marlowe-actus.cabal
@@ -37,7 +37,7 @@ library
     , base
     , marlowe-cardano
     , mtl
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , plutus-tx
     , time
     , validation

diff --git a/marlowe-adapter/marlowe-adapter.cabal b/marlowe-adapter/marlowe-adapter.cabal
@@ -42,7 +42,7 @@ library
   build-depends:
     , aeson
     , base >=4.9 && <5
-    , plutus-tx ^>=1.30
+    , plutus-tx ^>=1.31
     , time
 
   ghc-options:      -fprint-potential-instances

diff --git a/marlowe-apps/marlowe-apps.cabal b/marlowe-apps/marlowe-apps.cabal
@@ -30,7 +30,7 @@ library
     , async
     , base >=4.9 && <5
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , containers
     , data-default
     , eventuo11y >=0.9 && <0.11
@@ -99,7 +99,7 @@ executable marlowe-oracle
     , base >=4.9 && <5
     , base16-aeson
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , eventuo11y >=0.9 && <0.11
     , eventuo11y-dsl ^>=0.2
     , eventuo11y-json ^>=0.3.0.3
@@ -111,7 +111,7 @@ executable marlowe-oracle
     , marlowe-runtime
     , mtl
     , optparse-applicative
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , process
     , servant
     , servant-client

diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal
@@ -75,7 +75,7 @@ library
     , base16 ^>=0.3.2
     , binary ^>=0.8.8
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , cardano-binary
     , cardano-crypto-class
@@ -101,8 +101,8 @@ library
     , nonempty-containers ^>=0.3.4
     , ouroboros-consensus ^>=0.20
     , ouroboros-consensus-cardano ^>=0.18
-    , plutus-core ^>=1.30
-    , plutus-ledger-api ^>=1.30
+    , plutus-core ^>=1.31
+    , plutus-ledger-api ^>=1.31
     , postgresql-simple
     , reflection
     , scientific
@@ -133,7 +133,7 @@ library libchainsync
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , cardano-binary
     , cardano-ledger-binary ^>=1.3.3
@@ -176,7 +176,7 @@ library chain-indexer
     , base >=4.9 && <5
     , base16 ^>=0.3.2
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , cardano-crypto-wrapper ^>=1.5
     , cardano-ledger-alonzo ^>=1.10
@@ -219,13 +219,13 @@ library plutus-compat
   build-depends:
     , base >=4.9 && <5
     , base16 ^>=0.3.2
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-ledger-binary ^>=1.3.3
     , cardano-ledger-byron ^>=1.0.1
     , containers ^>=0.6.5
     , marlowe-chain-sync ==1.0.0
-    , plutus-ledger-api ^>=1.30
-    , plutus-tx ^>=1.30
+    , plutus-ledger-api ^>=1.31
+    , plutus-tx ^>=1.31
 
 library gen
   import:          lang
@@ -236,7 +236,7 @@ library gen
   build-depends:
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api-gen ^>=8.1
     , cardano-api:internal
     , containers ^>=0.6.5
@@ -287,7 +287,7 @@ executable marlowe-chain-indexer
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , cardano-crypto-wrapper ^>=1.5
     , cardano-ledger-byron ^>=1.0.1
@@ -321,7 +321,7 @@ executable marlowe-chain-sync
     , async-components ==0.1.1.0
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , eventuo11y >=0.9 && <0.11
     , eventuo11y-extras ==0.1.1.0
@@ -352,7 +352,7 @@ executable marlowe-chain-copy
   build-depends:
     , base >=4.9 && <5
     , bytestring >=0.10.12 && <0.12
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-api:internal
     , cassava
     , marlowe-chain-sync ==1.0.0

diff --git a/marlowe-cli/marlowe-cli.cabal b/marlowe-cli/marlowe-cli.cabal
@@ -96,7 +96,7 @@ library
     , base16-bytestring
     , bech32
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-crypto-class
     , cardano-ledger-alonzo
     , cardano-ledger-byron ^>=1.0.1
@@ -118,7 +118,7 @@ library
     , parser-combinators
     , plutus-core
     , plutus-ledger-ada
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , plutus-ledger-slot
     , plutus-tx
     , prettyprinter
@@ -182,7 +182,7 @@ library cli-test
     , base >=4.9 && <5
     , base16-aeson ==0.1.0.0
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-debug
     , containers
     , data-has
@@ -206,7 +206,7 @@ library cli-test
     , monad-loops
     , mtl
     , network
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , plutus-ledger-slot
     , plutus-tx
     , random
@@ -253,7 +253,7 @@ library command
     , mtl
     , optparse-applicative
     , plutus-ledger-ada
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , plutus-ledger-slot
     , regex-posix
     , servant-client
@@ -287,15 +287,15 @@ test-suite marlowe-cli-test
     , aeson-pretty
     , base >=4.9 && <5
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-ledger-core ^>=1.13.2
     , containers
     , marlowe-cardano
     , marlowe-cli
     , marlowe-test
     , megaparsec
     , mtl
-    , plutus-ledger-api ^>=1.30
+    , plutus-ledger-api ^>=1.31
     , plutus-ledger-slot
     , plutus-tx
     , tasty

diff --git a/marlowe-cli/run-test.sh b/marlowe-cli/run-test.sh
@@ -9,6 +9,10 @@
 # Required variables:
 #
 # CARDANO_NODE_SOCKET_PATH - path to the cardno-node socket - requires read / write permissions.
+#
+# All the below ports are usually the same when you are using marlowe-proxy.
+# Additionally when you run marlowe-proxy through our docker compose then you should be able
+# to get the port number by running: `docker compose port marlowe-proxy 3700`
 # MARLOWE_RT_PORT - port to run the marlowe runtime server.
 # MARLOWE_CHAIN_SYNC_PORT - port to run the chain sync server.
 # MARLOWE_CHAIN_SYNC_COMMAND_PORT - port to run the chain sync command server.
@@ -18,17 +22,20 @@
 #
 #
 cabal run exe:marlowe-cli -- \
-  --conway-era test \
+  --conway-era \
+  test \
   --testnet-magic "$CARDANO_NODE_NETWORK_ID" \
-  --max-concurrent-runners 8 \
+  --max-concurrent-runners 4 \
   --socket-path "$CARDANO_NODE_SOCKET_PATH" \
   --faucet-skey-file "$FAUCET_SKEY_FILE" \
   --faucet-address "$FAUCET_ADDRESS" \
   --marlowe-runtime-port "$MARLOWE_RT_PORT" \
   --write-to-json-file report.json \
-  --max-retries 3 \
+  --max-retries 0 \
   --stream-json \
-  ./test/operations/runtime.yaml 
+  ./test/templates/address-based/runtime/swap.yaml \
+  ./test/operations/burn.yaml \
+  ./test/operations/return-funds.yaml \
   ./test/inline/role-based/cli/contract-for-differences-with-oracle.yaml \
   ./test/inline/role-based/cli/contract-for-differences.yaml \
   ./test/inline/role-based/cli/coupon-bond-guaranteed.yaml \

diff --git a/marlowe-cli/test/templates/address-based/runtime/swap.yaml b/marlowe-cli/test/templates/address-based/runtime/swap.yaml
@@ -38,6 +38,8 @@ operations:
       - [BPartyCurrency, BPartyTokenName, 100]
       - [ADA, "*"]
 
+- Sleep: 360
+
 - RuntimeCreateContract:
     minLovelace: 2000000
     awaitConfirmed: 120

diff --git a/marlowe-client/marlowe-client.cabal b/marlowe-client/marlowe-client.cabal
@@ -55,7 +55,7 @@ library
 
   build-depends:
     , base >=4.9 && <5
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , containers ^>=0.6.5
     , eventuo11y >=0.9 && <0.11
     , eventuo11y-extras ==0.1.1.0

diff --git a/marlowe-contracts/marlowe-contracts.cabal b/marlowe-contracts/marlowe-contracts.cabal
@@ -78,8 +78,8 @@ library
     , ilist
     , marlowe-cardano
     , marlowe-object
-    , plutus-ledger-api ^>=1.30
-    , plutus-tx ^>=1.30
+    , plutus-ledger-api ^>=1.31
+    , plutus-tx ^>=1.31
     , split
     , text
     , time

diff --git a/marlowe-integration-tests/marlowe-integration-tests.cabal b/marlowe-integration-tests/marlowe-integration-tests.cabal
@@ -94,7 +94,7 @@ executable marlowe-integration-tests
     , base >=4.9 && <5
     , base16
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , co-log ^>=0.6
     , containers
     , deepseq
@@ -127,7 +127,7 @@ executable marlowe-integration-tests
     , ouroboros-network-protocols ^>=0.9
     , pipes ^>=4.3.16
     , plutus-ledger-api
-    , plutus-tx ^>=1.30
+    , plutus-tx ^>=1.31
     , QuickCheck
     , resourcet
     , servant-client

diff --git a/marlowe-integration/marlowe-integration.cabal b/marlowe-integration/marlowe-integration.cabal
@@ -57,7 +57,7 @@ library
     , async-components
     , base >=4.9 && <5
     , bytestring
-    , cardano-api ^>=9.1
+    , cardano-api ^>=9.2
     , cardano-crypto-wrapper
     , cardano-integration
     , cardano-ledger-byron