From bd5850d184ba9b0823c581e75ff8e593bd60ba29 Mon Sep 17 00:00:00 2001 From: Nicolas Henin Date: Mon, 22 Apr 2024 14:14:04 +0200 Subject: [PATCH] bumped 0.0.6 -> 1.0.0 --- deploy/marlowe-runtime/values.yaml | 7 ++ marlowe-chain-sync/marlowe-chain-sync.cabal | 16 ++-- marlowe-client/marlowe-client.cabal | 6 +- marlowe-runtime-web/.golden/OpenApi/golden | 2 +- marlowe-runtime-web/marlowe-runtime-web.cabal | 14 ++-- marlowe-runtime/marlowe-runtime.cabal | 78 +++++++++---------- nix/marlowe-cardano/compose.nix | 4 +- 7 files changed, 67 insertions(+), 60 deletions(-) diff --git a/deploy/marlowe-runtime/values.yaml b/deploy/marlowe-runtime/values.yaml index 1f07ca28d2..c3a46c217c 100644 --- a/deploy/marlowe-runtime/values.yaml +++ b/deploy/marlowe-runtime/values.yaml @@ -24,6 +24,13 @@ instances: repo: ghcr.io org: input-output-hk cardanoNode: cardano-node + 1_0_0: + parentDomain: 1.0.0.scdev.aws.iohkdev.io + webTag: 1.0.0 + tag: 1.0.0 + repo: ghcr.io + org: input-output-hk + cardanoNode: cardano-node namespace: marlowe-staging releaseName: marlowe-runtime databaseName: marlowe-runtime-database diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal index 307c8eff18..0487ddf673 100644 --- a/marlowe-chain-sync/marlowe-chain-sync.cabal +++ b/marlowe-chain-sync/marlowe-chain-sync.cabal @@ -1,6 +1,6 @@ cabal-version: 3.4 name: marlowe-chain-sync -version: 0.0.6 +version: 1.0.0 synopsis: Cardano chain sync system for thee Marlowe Runtime description: Marlowe runtime component for Cardano node synchronization. Communicates with @@ -144,7 +144,7 @@ library libchainsync , hasql-th ^>=0.4 , hasql-transaction ^>=1 , hs-opentelemetry-api ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 , nonempty-containers ^>=0.3.4 , ouroboros-network-protocols ^>=0.8 @@ -190,7 +190,7 @@ library chain-indexer , hasql-th ^>=0.4 , hasql-transaction ^>=1 , hs-opentelemetry-api ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , mtl >=2.2 && <3 , ouroboros-consensus-cardano , ouroboros-network-api ^>=0.7.0 @@ -218,7 +218,7 @@ library plutus-compat , cardano-ledger-binary ^>=1.3 , cardano-ledger-byron ^>=1.0 , containers ^>=0.6.5 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , plutus-ledger-api ^>=1.21 , plutus-tx ^>=1.21 @@ -235,7 +235,7 @@ library gen , cardano-api:{cardano-api, internal} ^>=8.39.2.0 , containers ^>=0.6.5 , hedgehog-quickcheck ^>=0.1 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 , nonempty-containers ^>=0.3.4 , ouroboros-consensus ^>=0.16 @@ -258,7 +258,7 @@ test-suite marlowe-chain-sync-test build-depends: , base >=4.9 && <5 , hspec >=2.10 && <3 - , marlowe-chain-sync:{marlowe-chain-sync, gen} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, gen} ==1.0.0 , marlowe-protocols ==0.3.0.0 build-tool-depends: hspec-discover:hspec-discover @@ -320,7 +320,7 @@ executable marlowe-chain-sync , hasql >=1.6 && <2 , hasql-pool ^>=0.8 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync:{marlowe-chain-sync, libchainsync} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, libchainsync} ==1.0.0 , marlowe-protocols ==0.3.0.0 , mtl >=2.2 && <3 , network >=3.1 && <4 @@ -344,7 +344,7 @@ executable marlowe-chain-copy , bytestring >=0.10.12 && <0.12 , cardano-api:{cardano-api, internal} ^>=8.39.2.0 , cassava - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , optparse-applicative , postgresql-simple , unliftio ^>=0.2.1 diff --git a/marlowe-client/marlowe-client.cabal b/marlowe-client/marlowe-client.cabal index ba81f382e7..3567c027a8 100644 --- a/marlowe-client/marlowe-client.cabal +++ b/marlowe-client/marlowe-client.cabal @@ -1,6 +1,6 @@ cabal-version: 3.4 name: marlowe-client -version: 0.0.6 +version: 1.0.0 synopsis: A client library for the Marlowe Runtime. bug-reports: https://github.com/input-output-hk/marlowe-marlowe/issues license: Apache-2.0 @@ -61,10 +61,10 @@ library , eventuo11y-extras ==0.1.1.0 , exceptions ^>=0.10 , general-allocate ^>=0.2 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-object ==0.2.0.1 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, proxy-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, proxy-api, sync-api, tx-api} ==1.0.0 , monad-control ^>=1 , mtl >=2.2 && <3 , network >=3.1 && <4 diff --git a/marlowe-runtime-web/.golden/OpenApi/golden b/marlowe-runtime-web/.golden/OpenApi/golden index 2df63bd6ed..fbca9bd528 100644 --- a/marlowe-runtime-web/.golden/OpenApi/golden +++ b/marlowe-runtime-web/.golden/OpenApi/golden @@ -3448,7 +3448,7 @@ "url": "https://www.apache.org/licenses/LICENSE-2.0.html" }, "title": "Marlowe Runtime REST API", - "version": "0.0.6" + "version": "1.0.0" }, "openapi": "3.1.0", "paths": { diff --git a/marlowe-runtime-web/marlowe-runtime-web.cabal b/marlowe-runtime-web/marlowe-runtime-web.cabal index a542c2c678..ec74cb0e2c 100644 --- a/marlowe-runtime-web/marlowe-runtime-web.cabal +++ b/marlowe-runtime-web/marlowe-runtime-web.cabal @@ -1,6 +1,6 @@ cabal-version: 3.4 name: marlowe-runtime-web -version: 0.0.6 +version: 1.0.0 synopsis: Web server for Marlowe Runtime on Cardano. bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues license: Apache-2.0 @@ -126,11 +126,11 @@ library , http-media ^>=0.8 , lens >=5.2 && <6 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 - , marlowe-client ==0.0.6 + , marlowe-chain-sync ==1.0.0 + , marlowe-client ==1.0.0 , marlowe-object ==0.2.0.1 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, proxy-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, proxy-api, sync-api, tx-api} ==1.0.0 , monad-control ^>=1 , mtl >=2.2 && <3 , network-uri >=2.6 && <3 @@ -177,10 +177,10 @@ library server , insert-ordered-containers >=0.2.5 && <0.3 , lens >=5.2 && <6 , lens-aeson ^>=1.2 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime-web ==0.0.6 - , marlowe-runtime:{marlowe-runtime, proxy-api, sync-api} ==0.0.6 + , marlowe-runtime-web ==1.0.0 + , marlowe-runtime:{marlowe-runtime, proxy-api, sync-api} ==1.0.0 , mtl >=2.2 && <3 , network , openapi3 >=3.2 && <4 diff --git a/marlowe-runtime/marlowe-runtime.cabal b/marlowe-runtime/marlowe-runtime.cabal index 3c3e6dd3c2..c132c3c46a 100644 --- a/marlowe-runtime/marlowe-runtime.cabal +++ b/marlowe-runtime/marlowe-runtime.cabal @@ -1,6 +1,6 @@ cabal-version: 3.4 name: marlowe-runtime -version: 0.0.6 +version: 1.0.0 synopsis: Runtime system for running Marlowe financial contracts on the Cardano Computation Layer @@ -203,7 +203,7 @@ library , cardano-api ^>=8.39.2.0 , containers ^>=0.6.5 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 , plutus-ledger-api ^>=1.21 , text ^>=2.0 @@ -238,9 +238,9 @@ library gen , hedgehog-quickcheck ^>=0.1 , http-media ^>=0.8 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync:{gen, plutus-compat} ==0.0.6 + , marlowe-chain-sync:{gen, plutus-compat} ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, sync-api, tx-api} ==1.0.0 , marlowe-test ==0.2.1.0 , network-uri >=2.6 && <3 , nonempty-containers ^>=0.3.4 @@ -282,9 +282,9 @@ library indexer , hasql-transaction ^>=1 , hs-opentelemetry-api ^>=0.0.3 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, sync-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, sync-api} ==1.0.0 , mtl >=2.2 && <3 , nonempty-containers ^>=0.3.4 , plutus-ledger-api ^>=1.21 @@ -326,9 +326,9 @@ library sync-api , errors >=2.3 && <3 , hs-opentelemetry-api ^>=0.0.3 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime ==0.0.6 + , marlowe-runtime ==1.0.0 , ouroboros-consensus ^>=0.16 , ouroboros-network-api ^>=0.7.0 , plutus-ledger-api ^>=1.21 @@ -357,10 +357,10 @@ library contract-api , containers ^>=0.6.5 , hs-opentelemetry-api ^>=0.0.3 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-object ==0.2.0.1 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime ==0.0.6 + , marlowe-runtime ==1.0.0 , plutus-ledger-api ^>=1.21 , text ^>=2.0 , typed-protocols ^>=0.1 @@ -399,10 +399,10 @@ library contract , hs-opentelemetry-api ^>=0.0.3 , lock-file ^>=0.7 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-object ==0.2.0.1 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, sync-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, sync-api} ==1.0.0 , plutus-ledger-api ^>=1.21 , resourcet >=1.3 && <2 , text ^>=2.0 @@ -461,9 +461,9 @@ library sync , hasql-transaction ^>=1 , hs-opentelemetry-api ^>=0.0.3 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, schema, sync-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, schema, sync-api} ==1.0.0 , plutus-ledger-api ^>=1.21 , postgresql-syntax ^>=0.4.1 , profunctors >=5.6 && <6 @@ -490,9 +490,9 @@ library tx-api , keys , lens >=5.2 && <6 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, sync-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, sync-api} ==1.0.0 , network-uri >=2.6 && <3 , nonempty-containers ^>=0.3.4 , plutus-core ^>=1.21 @@ -535,9 +535,9 @@ library tx , eventuo11y-otel ^>=0.1 , hs-opentelemetry-api ^>=0.0.3 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, sync-api, tx-api} ==1.0.0 , nonempty-containers ^>=0.3.4 , ouroboros-consensus ^>=0.16 , ouroboros-network-api ^>=0.7.0 @@ -568,7 +568,7 @@ library proxy-api , base >=4.9 && <5 , binary ^>=0.8.8 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{contract-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{contract-api, sync-api, tx-api} ==1.0.0 , typed-protocols ^>=0.1 library proxy @@ -582,7 +582,7 @@ library proxy , eventuo11y >=0.9 && <0.11 , eventuo11y-extras ==0.1.1.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{contract-api, proxy-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{contract-api, proxy-api, sync-api, tx-api} ==1.0.0 , resourcet >=1.3 && <2 , transformers ^>=0.5.6 , typed-protocols ^>=0.1 @@ -607,9 +607,9 @@ library runtime , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync:{marlowe-chain-sync, chain-indexer, libchainsync} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, chain-indexer, libchainsync} ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract, indexer, proxy, proxy-api, sync, sync-api, tx} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract, indexer, proxy, proxy-api, sync, sync-api, tx} ==1.0.0 , nonempty-containers ^>=0.3.4 , random ^>=1.2.1 , time >=1.9 && <2 @@ -623,8 +623,8 @@ library config exposed-modules: Language.Marlowe.Runtime.CLI.Option build-depends: , base >=4.9 && <5 - , marlowe-chain-sync ==0.0.6 - , marlowe-runtime ==0.0.6 + , marlowe-chain-sync ==1.0.0 + , marlowe-runtime ==1.0.0 , network >=3.1 && <4 , optparse-applicative ^>=0.16.1 , split ^>=0.2.3 @@ -649,9 +649,9 @@ executable marlowe-indexer , hasql >=1.6 && <2 , hasql-pool ^>=0.8 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, indexer} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, indexer} ==1.0.0 , mtl >=2.2 && <3 , network >=3.1 && <4 , nonempty-containers ^>=0.3.4 @@ -681,9 +681,9 @@ executable marlowe-sync , hasql >=1.6 && <2 , hasql-pool ^>=0.8 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{sync, sync-api} ==0.0.6 + , marlowe-runtime:{sync, sync-api} ==1.0.0 , mtl >=2.2 && <3 , network >=3.1 && <4 , optparse-applicative ^>=0.16.1 @@ -709,9 +709,9 @@ executable marlowe-tx , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, sync-api, tx, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, sync-api, tx, tx-api} ==1.0.0 , network >=3.1 && <4 , optparse-applicative ^>=0.16.1 , text ^>=2.0 @@ -735,9 +735,9 @@ executable marlowe-contract , eventuo11y-extras ==0.1.1.0 , eventuo11y-otel ^>=0.1 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync ==0.0.6 + , marlowe-chain-sync ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{config, contract, contract-api, sync-api} ==0.0.6 + , marlowe-runtime:{config, contract, contract-api, sync-api} ==1.0.0 , network >=3.1 && <4 , optparse-applicative ^>=0.16.1 , text ^>=2.0 @@ -763,7 +763,7 @@ executable marlowe-proxy , eventuo11y-otel ^>=0.1 , hs-opentelemetry-sdk ^>=0.0.3 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{config, contract-api, proxy, proxy-api, sync-api, tx-api} ==0.0.6 + , marlowe-runtime:{config, contract-api, proxy, proxy-api, sync-api, tx-api} ==1.0.0 , network >=3.1 && <4 , optparse-applicative ^>=0.16.1 , text ^>=2.0 @@ -788,9 +788,9 @@ executable marlowe-runtime , hasql >=1.6 && <2 , hasql-pool ^>=0.8 , hs-opentelemetry-sdk ^>=0.0.3 - , marlowe-chain-sync:{marlowe-chain-sync, chain-indexer, libchainsync} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, chain-indexer, libchainsync} ==1.0.0 , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract, indexer, proxy-api, runtime, sync, tx} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract, indexer, proxy-api, runtime, sync, tx} ==1.0.0 , mtl >=2.2 && <3 , network >=3.1 && <4 , nonempty-containers ^>=0.3.4 @@ -844,10 +844,10 @@ test-suite marlowe-runtime-test , hspec-golden ^>=0.2 , http-media ^>=0.8 , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync:{marlowe-chain-sync, gen, plutus-compat} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, gen, plutus-compat} ==1.0.0 , marlowe-object:gen , marlowe-protocols ==0.3.0.0 - , marlowe-runtime:{marlowe-runtime, contract-api, gen, sync, sync-api, tx, tx-api} ==0.0.6 + , marlowe-runtime:{marlowe-runtime, contract-api, gen, sync, sync-api, tx, tx-api} ==1.0.0 , marlowe-test ==0.2.1.0 , network-uri >=2.6 && <3 , nonempty-containers ^>=0.3.4 @@ -883,8 +883,8 @@ test-suite indexer-test , containers ^>=0.6.5 , hspec , marlowe-cardano ==0.2.1.0 - , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.6 - , marlowe-runtime:{marlowe-runtime, gen, indexer, sync-api} ==0.0.6 + , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==1.0.0 + , marlowe-runtime:{marlowe-runtime, gen, indexer, sync-api} ==1.0.0 , marlowe-test ==0.2.1.0 , ouroboros-consensus ^>=0.16 , plutus-tx ^>=1.21 diff --git a/nix/marlowe-cardano/compose.nix b/nix/marlowe-cardano/compose.nix index ce7a2d4198..aa2eda38c7 100644 --- a/nix/marlowe-cardano/compose.nix +++ b/nix/marlowe-cardano/compose.nix @@ -80,8 +80,8 @@ let ''; # We assume that all the components are versioned together. - marloweRuntimeVersion = "0.0.6"; - marloweRuntimeWebVersion = "0.0.6"; + marloweRuntimeVersion = "1.0.0"; + marloweRuntimeWebVersion = "1.0.0"; symlinks = runCommand "symlinks" { } '' mkdir -p $out ln -sv ${run-sqitch}/bin/run-sqitch $out