Merge branch 'nhenin/new-release'

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

marlowe-apps/CHANGELOG.md

@@ -1,4 +1,24 @@
 
+<a id='changelog-1.0.0'></a>
+# 1.0.0 — 2024-04-22
+
+## Removed
+
+- Removed `marlowe-scaling` executable because `marlowe-benchmark` now serves this function.
+
+- Removed `marlowe-finder` executable because `marlowe-benchmark` now serves this function.
+
+- Removed `marlowe-streamer` executable because `marlowe-benchmark` now serves this function.
+
+- Removed `marlower-signer` executable.
+
+## Changed
+
+- Upgrade to cardano-api 8.37.1.1
+
+- Upgrade `cardano-api` `8.37.1.1` to `8.39.2.0` (Conway Hard Fork Adaptation)
+- Upgrade `plutus` from `1.15` to `1.21` (`plutus-core`, `plutus-ledger-api`, `plutus-tx`) (Conway Hard Fork Adaptation)
+
 <a id='changelog-0.4.0.0'></a>
 # 0.4.0.0 — 2023-12-06
 

marlowe-benchmark/CHANGELOG.rst

@@ -0,0 +1,16 @@
+
+2024-04-22
+==========
+
+### Changed
+
+- Added `sanchonet` as a new network example (Conway Hard Fork Adaptation)
+
+Added
+-----
+
+- Implemented basic benchmarking for Marlowe Runtime sync and query protocols.
+
+- Added benchmark for the basic lifecycle of a Marlowe contract.
+
+- Benchmarking of arbitrary complex queries.

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

marlowe-cli/CHANGELOG.md

@@ -1,4 +1,39 @@
 
+<a id='changelog-1.0.0'></a>
+# 1.0.0 — 2024-04-22
+
+## Removed
+
+- `watch` command
+- Alonzo era support
+
+## Added
+
+- Upgrade to `cardano-api` 8.37.1.1
+
+## Changed
+
+- Marlowe CLI swap template tokens default to ada if not specified.
+
+- Upgrade `cardano-api` `8.37.1.1` to `8.39.2.0` (Conway Hard Fork Adaptation)
+- Upgrade `plutus` from `1.15` to `1.21` (`plutus-core`, `plutus-ledger-api`, `plutus-tx`) (Conway Hard Fork Adaptation)
+- Upgrade `cardano-ledger` (Conway Hard Fork Adaptation)
+    - `cardano-ledger-conway` from `1.11` to `1.12`
+    - `cardano-ledger-core` from `1.9` to `1.10`
+    - `cardano-ledger-mary` from `1.4` to `1.5`
+    - `cardano-ledger-shelley` from `1.8` to `1.9`
+    -  `cardano-ledger-binary` from `1.2` to `1.3`
+- Upgrade `ouroboros-network` (Conway Hard Fork Adaptation)
+    - `ouroboros-network-api` from `0.6.0` to `0.7.0`
+    - `ouroboros-consensus` from `0.14` to `0.16`
+    - `ouroboros-network-protocols` from `0.6.0` to `0.8`
+
+## Fixed
+
+- Marlowe CLI withdrawal no longer includes a validity interval.
+
+- `analyze` command so it doesn't override provided state.
+
 <a id='changelog-0.2.0.0'></a>
 # 0.2.0.0 — 2023-12-06
 

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

marlowe-contracts/CHANGELOG.md

@@ -1,4 +1,22 @@
 
+<a id='changelog-1.0.0.0'></a>
+# 1.0.0.0 — 2024-04-22
+
+## Changed
+
+- Upgrade `cardano-api` `8.37.1.1` to `8.39.2.0` (Conway Hard Fork Adaptation)
+- Upgrade `plutus` from `1.15` to `1.21` (`plutus-core`, `plutus-ledger-api`, `plutus-tx`) (Conway Hard Fork Adaptation)
+- Upgrade `cardano-ledger` (Conway Hard Fork Adaptation)
+    - `cardano-ledger-conway` from `1.11` to `1.12`
+    - `cardano-ledger-core` from `1.9` to `1.10`
+    - `cardano-ledger-mary` from `1.4` to `1.5`
+    - `cardano-ledger-shelley` from `1.8` to `1.9`
+    -  `cardano-ledger-binary` from `1.2` to `1.3`
+- Upgrade `ouroboros-network` (Conway Hard Fork Adaptation)
+    - `ouroboros-network-api` from `0.6.0` to `0.7.0`
+    - `ouroboros-consensus` from `0.14` to `0.16`
+    - `ouroboros-network-protocols` from `0.6.0` to `0.8`
+
 <a id='changelog-0.2.0.0'></a>
 # 0.2.0.0 — 2023-09-22
 

marlowe-object/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+<a id='changelog-1.0.0.0'></a>
+# 1.0.0.0 — 2024-04-22
+
+## Changed
+
+- Upgrade `cardano-api` `8.37.1.1` to `8.39.2.0` (Conway Hard Fork Adaptation)
+- Upgrade `plutus` from `1.15` to `1.21` (`plutus-core`, `plutus-ledger-api`, `plutus-tx`) (Conway Hard Fork Adaptation)
+- Upgrade `cardano-ledger` (Conway Hard Fork Adaptation)
+    - `cardano-ledger-conway` from `1.11` to `1.12`
+    - `cardano-ledger-core` from `1.9` to `1.10`
+    - `cardano-ledger-mary` from `1.4` to `1.5`
+    - `cardano-ledger-shelley` from `1.8` to `1.9`
+    -  `cardano-ledger-binary` from `1.2` to `1.3`
+
 <a id='changelog-0.1.0.0'></a>
 # 0.1.0.0 — 2023-08-10
 

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": {