diff --git a/cabal.project b/cabal.project index 4701d3206b..5edbf6e709 100644 --- 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 index 555ddbadfc..460db2e5da 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1722589833, - "narHash": "sha256-2buGzz1bHYZ+2pQ/CIP1RkmtyAt6OTem+IC4EsJdwU8=", + "lastModified": 1724867125, + "narHash": "sha256-CH0nOWZV8hHzio00fYa654uPkhoCe8DfqmO4MsUTg/E=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "e9da05ac39d5792029170fee1aaf3330a16ba9b0", + "rev": "c438edce9052c6bb83d922d65e35c198fdee4b56", "type": "github" }, "original": { @@ -1903,11 +1903,11 @@ "hackage": { "flake": false, "locked": { - "lastModified": 1722558333, - "narHash": "sha256-MFpzbH3YYTvjHFj6Fz869pEPBJKaNuUphYyEMynxs2w=", + "lastModified": 1724891268, + "narHash": "sha256-zB7MRl83l0GjW4q6f9xkH3nKPq6OKiDQKaRMv5b6l4c=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "d40e86135178aa67a05be79223cceb115a7343df", + "rev": "ed1da3f8023913a597642a8c34bbecf5cf440ff7", "type": "github" }, "original": { diff --git a/libs/cardano-debug/cardano-debug.cabal b/libs/cardano-debug/cardano-debug.cabal index 50ea53f74f..a77b01973a 100644 --- 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 index f0ec866024..37d555a77e 100644 --- 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 index d145f526e7..87b9283a8c 100644 --- 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 index c6a409bda0..c2044d66af 100644 --- 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 index 8934874ff8..bbf07a644d 100644 --- 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 index 475d8ec313..7520671a6d 100644 --- 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 index d227fa2ed8..4330a0b262 100644 --- 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 index 9bbaa30abd..14f68942a8 100644 --- 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 index e77d23b150..659408eaf4 100644 --- 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,7 +287,7 @@ 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 @@ -295,7 +295,7 @@ test-suite marlowe-cli-test , 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 index 3365a0d5d1..07249efda2 100755 --- 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 index 1e8e9ff973..7f00a76e90 100644 --- 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 index 08ec327305..885586fa40 100644 --- 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 index 0bdca299df..a3eb9535a8 100644 --- 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 index 3b642978cd..c7ceec94c0 100644 --- 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 index 006b4473a1..d075476ac5 100644 --- 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 diff --git a/marlowe-object/marlowe-object.cabal b/marlowe-object/marlowe-object.cabal index 0ec667465b..b32375861d 100644 --- a/marlowe-object/marlowe-object.cabal +++ b/marlowe-object/marlowe-object.cabal @@ -63,7 +63,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-ledger-core ^>=1.13.2 , dlist ^>=1.0 , filepath ^>=1.4 @@ -73,7 +73,7 @@ library , marlowe-protocols ==0.3.0.0 , mtl >=2.2 && <3 , pipes ^>=4.3.16 - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , text ^>=2.0 , time >=1.9 && <2 , transformers ^>=0.5.6 diff --git a/marlowe-runtime-web/marlowe-runtime-web.cabal b/marlowe-runtime-web/marlowe-runtime-web.cabal index b61203feae..7439d6b812 100644 --- a/marlowe-runtime-web/marlowe-runtime-web.cabal +++ b/marlowe-runtime-web/marlowe-runtime-web.cabal @@ -112,7 +112,7 @@ library , base >=4.9 && <5 , base16 ^>=0.3.2 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , cardano-ledger-alonzo ^>=1.10 , cardano-ledger-binary ^>=1.3.3 , cardano-ledger-core ^>=1.13.2 @@ -142,7 +142,7 @@ library , openapi3 >=3.2 && <4 , parsec ^>=3.1.14 , pipes ^>=4.3.16 - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , servant ^>=0.20 , servant-client ^>=0.20 , servant-client-core ^>=0.20 diff --git a/marlowe-runtime/marlowe-runtime.cabal b/marlowe-runtime/marlowe-runtime.cabal index f9057f9be4..0ff7313366 100644 --- a/marlowe-runtime/marlowe-runtime.cabal +++ b/marlowe-runtime/marlowe-runtime.cabal @@ -200,12 +200,12 @@ library , base16 ^>=0.3.2 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , marlowe-cardano ==0.2.1.0 , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , text ^>=2.0 , time >=1.9 && <2 @@ -232,7 +232,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 , errors , hedgehog-quickcheck ^>=0.1 @@ -273,7 +273,7 @@ library indexer , base >=4.9 && <5 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , co-log ^>=0.6 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 @@ -291,8 +291,8 @@ library indexer , marlowe-runtime:sync-api , mtl >=2.2 && <3 , nonempty-containers ^>=0.3.4 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , stm ^>=2.5 , text ^>=2.0 , time >=1.9 && <2 @@ -325,7 +325,7 @@ library sync-api , aeson ^>=2.2 , base >=4.9 && <5 , binary ^>=0.8.8 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , errors >=2.3 && <3 , hs-opentelemetry-api ^>=0.0.3 @@ -335,7 +335,7 @@ library sync-api , marlowe-runtime ==1.0.0 , ouroboros-consensus ^>=0.20 , ouroboros-network-api ^>=0.7.3 - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , time >=1.9 && <2 , transformers ^>=0.5.6 , typed-protocols ^>=0.1 @@ -365,7 +365,7 @@ library contract-api , marlowe-object ==1.0.0 , marlowe-protocols ==0.3.0.0 , marlowe-runtime ==1.0.0 - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , text ^>=2.0 , typed-protocols ^>=0.1 @@ -409,7 +409,7 @@ library contract , marlowe-runtime ==1.0.0 , marlowe-runtime:contract-api , marlowe-runtime:sync-api - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , resourcet >=1.3 && <2 , text ^>=2.0 , time >=1.9 && <2 @@ -472,7 +472,7 @@ library sync , marlowe-runtime ==1.0.0 , marlowe-runtime:schema , marlowe-runtime:sync-api - , plutus-ledger-api ^>=1.30 + , plutus-ledger-api ^>=1.31 , postgresql-syntax ^>=0.4.1 , profunctors >=5.6 && <6 , text ^>=2.0 @@ -492,7 +492,7 @@ library tx-api , base >=4.9 && <5 , binary ^>=0.8.8 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , http-media ^>=0.8 , keys @@ -504,8 +504,8 @@ library tx-api , marlowe-runtime:sync-api , network-uri >=2.6 && <3 , nonempty-containers ^>=0.3.4 - , plutus-core ^>=1.30 - , plutus-ledger-api ^>=1.30 + , plutus-core ^>=1.31 + , plutus-ledger-api ^>=1.31 , semigroupoids ^>=5.3 , text ^>=2.0 , time >=1.9 && <2 @@ -533,7 +533,7 @@ library tx , base >=4.9 && <5 , base16 ^>=0.3.2 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , cardano-ledger-core ^>=1.13.2 , co-log ^>=0.6 , containers ^>=0.6.5 @@ -554,8 +554,8 @@ library tx , nonempty-containers ^>=0.3.4 , ouroboros-consensus ^>=0.20 , ouroboros-network-api ^>=0.7.3 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , retry ^>=0.9.3 , semialign >=1.2 && <2 , sop-core @@ -618,7 +618,7 @@ library runtime , async-components ==0.1.1.0 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , co-log ^>=0.6 , containers ^>=0.6.5 , eventuo11y >=0.9 && <0.11 @@ -821,7 +821,7 @@ executable marlowe-runtime , aeson ^>=2.2 , async-components ==0.1.1.0 , base >=4.9 && <5 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , cardano-crypto-wrapper ^>=1.5 , cardano-ledger-byron ^>=1.0.1 , eventuo11y >=0.9 && <0.11 @@ -881,7 +881,7 @@ test-suite marlowe-runtime-test , aeson ^>=2.2 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , cardano-api-gen ^>=8.1 , cardano-ledger-core ^>=1.13.2 , containers ^>=0.6.5 @@ -909,8 +909,8 @@ test-suite marlowe-runtime-test , network-uri >=2.6 && <3 , nonempty-containers ^>=0.3.4 , ouroboros-consensus ^>=0.20 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , QuickCheck >=2.14 && <3 , quickcheck-instances ^>=0.3.29 , sop-core @@ -936,7 +936,7 @@ test-suite indexer-test build-depends: , base >=4.9 && <5 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , hspec , marlowe-cardano ==0.2.1.0 @@ -948,7 +948,7 @@ test-suite indexer-test , marlowe-runtime:sync-api , marlowe-test ==0.2.1.0 , ouroboros-consensus ^>=0.20 - , plutus-tx ^>=1.30 + , plutus-tx ^>=1.31 , QuickCheck >=2.14 && <3 , sop-core , sop-extras diff --git a/marlowe-test/marlowe-test.cabal b/marlowe-test/marlowe-test.cabal index 2f15f41560..03e2ba41b8 100644 --- a/marlowe-test/marlowe-test.cabal +++ b/marlowe-test/marlowe-test.cabal @@ -147,8 +147,8 @@ library , filepath ^>=1.4 , marlowe-cardano ==0.2.1.0 , mtl >=2.2 && <3 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , QuickCheck >=2.14 && <3 , tasty-quickcheck ^>=0.11 @@ -199,7 +199,7 @@ executable test-suite , aeson ^>=2.2 , base >=4.9 && <5 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , data-default ^>=0.7.1 , filepath ^>=1.4 @@ -210,12 +210,12 @@ executable test-suite , marlowe-spec-test ==0.1.0.1 , marlowe-test , mtl >=2.2 && <3 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , QuickCheck >=2.14 && <3 , quickcheck-instances ^>=0.3.29 , sbv >=8.4 - , tasty ^>=1.5.1 + , tasty ^>=1.5 , tasty-hunit ^>=0.10 , tasty-quickcheck ^>=0.11 , text ^>=2.0 diff --git a/marlowe/marlowe-cardano.cabal b/marlowe/marlowe-cardano.cabal index 66cecd253f..d977ebe592 100644 --- a/marlowe/marlowe-cardano.cabal +++ b/marlowe/marlowe-cardano.cabal @@ -65,7 +65,7 @@ library , base16-aeson ==0.1.0.0 , bech32 >=1.1 && <2 , bytestring >=0.10.12 && <0.12 - , cardano-api ^>=9.1 + , cardano-api ^>=9.2 , containers ^>=0.6.5 , deepseq , deriving-aeson ^>=0.2.9 @@ -76,8 +76,8 @@ library , multiplate ==0.0.3 , newtype-generics ^>=0.6.2 , ordered-containers ^>=0.2 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 , profunctors >=5.6 && <6 , range ==0.3.0.2 , sbv ^>=9.2 diff --git a/nix/marlowe-cardano/compose.nix b/nix/marlowe-cardano/compose.nix index bbc87603c3..6bbebcc14b 100644 --- a/nix/marlowe-cardano/compose.nix +++ b/nix/marlowe-cardano/compose.nix @@ -2,7 +2,7 @@ let inherit (pkgs) z3 sqitchPg postgresql runCommand writeShellScriptBin writeText glibcLocales; - network = inputs.self.networks.preview; + network = inputs.self.networks.preprod; inherit (inputs) marlowe-plutus; mkSqitchRunner = name: path: writeShellScriptBin name ''