diff --git a/async-components/async-components.cabal b/async-components/async-components.cabal
index f8a9ca1e0d..f971b0a76c 100644
--- a/async-components/async-components.cabal
+++ b/async-components/async-components.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: async-components
-version: 0.1.0.0
+version: 0.1.1.0
synopsis: Async components for building concurrent server processes.
bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues
license: Apache-2.0
@@ -56,7 +56,7 @@ library
, base >=4.9 && <5
, co-log >=0.5.0.0 && <0.6.0.0
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, exceptions ^>=0.10
, general-allocate ^>=0.2
diff --git a/eventuo11y-extras/eventuo11y-extras.cabal b/eventuo11y-extras/eventuo11y-extras.cabal
index 27e5e288ba..d52a58690e 100644
--- a/eventuo11y-extras/eventuo11y-extras.cabal
+++ b/eventuo11y-extras/eventuo11y-extras.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: eventuo11y-extras
-version: 0.1.0.0
+version: 0.1.1.0
synopsis: O11y helpers for Malowe Runtime and other Marlowe processes
bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues
license: Apache-2.0
diff --git a/marlowe-apps/changelog.d/20230603_174929_brian.bush_PLT_6142.rst b/marlowe-apps/CHANGELOG.rst
similarity index 64%
rename from marlowe-apps/changelog.d/20230603_174929_brian.bush_PLT_6142.rst
rename to marlowe-apps/CHANGELOG.rst
index 61ea12bb8f..0af4e71003 100644
--- a/marlowe-apps/changelog.d/20230603_174929_brian.bush_PLT_6142.rst
+++ b/marlowe-apps/CHANGELOG.rst
@@ -1,3 +1,9 @@
+
+.. _changelog-0.2.5.0:
+
+0.2.5.0 — 2023-06-15
+====================
+
Removed
-------
@@ -12,3 +18,8 @@
-----
- `exe:marlowe-scaling` now successfully submits transactions.
+
+Added
+-----
+
+- Added simple transaction signing service for use in demonstrations.
diff --git a/marlowe-apps/changelog.d/20230524_064345_brian.bush_hackathon.rst b/marlowe-apps/changelog.d/20230524_064345_brian.bush_hackathon.rst
deleted file mode 100644
index 47368a6b5e..0000000000
--- a/marlowe-apps/changelog.d/20230524_064345_brian.bush_hackathon.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Added
------
-
-- Added simple transaction signing service for use in demonstrations.
diff --git a/marlowe-apps/marlowe-apps.cabal b/marlowe-apps/marlowe-apps.cabal
index 83509cb988..4c84dfe8cf 100644
--- a/marlowe-apps/marlowe-apps.cabal
+++ b/marlowe-apps/marlowe-apps.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-apps
-version: 0.2.4.0
+version: 0.2.5.0
synopsis: Marlowe Runtimee applications
license: Apache-2.0
license-file: LICENSE
diff --git a/marlowe-chain-sync/marlowe-chain-sync.cabal b/marlowe-chain-sync/marlowe-chain-sync.cabal
index 1cb1c97a0a..5dffe7a42e 100644
--- a/marlowe-chain-sync/marlowe-chain-sync.cabal
+++ b/marlowe-chain-sync/marlowe-chain-sync.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-chain-sync
-version: 0.0.1
+version: 0.0.2
synopsis: Cardano chain sync system for thee Marlowe Runtime
description:
Marlowe runtime component for Cardano node synchronization. Communicates with
@@ -70,7 +70,7 @@ library
, cardano-ledger-core ==0.1.0.0
, containers ^>=0.6.5
, hashable >=1.3 && <2
- , marlowe-protocols ==0.1.0.0
+ , marlowe-protocols ==0.1.1.0
, nonempty-containers ^>=0.3.4
, ouroboros-consensus ==0.1.0.1
, ouroboros-network ==0.1.0.1
@@ -97,7 +97,7 @@ library libchainsync
other-modules:
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, cardano-api ==1.35.4
@@ -105,14 +105,14 @@ library libchainsync
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, foldl >=1.4 && <2
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hasql-th ^>=0.4
, hasql-transaction ^>=1
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
, nonempty-containers ^>=0.3.4
, ouroboros-network ==0.1.0.1
, stm ^>=2.5
@@ -135,7 +135,7 @@ library chain-indexer
other-modules:
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, base16 ^>=0.3.2
, bytestring >=0.10.12 && <0.12
@@ -150,7 +150,7 @@ library chain-indexer
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hasql-th ^>=0.4
@@ -179,7 +179,7 @@ library plutus-compat
, cardano-api ==1.35.4
, cardano-ledger-byron ==0.1.0.0
, containers ^>=0.6.5
- , marlowe-chain-sync ==0.0.1
+ , marlowe-chain-sync ==0.0.2
, plutus-ledger-api ==1.0.0.1
, plutus-tx ==1.0.0.0
, serialise ^>=0.2.6
@@ -195,8 +195,8 @@ library gen
, bytestring >=0.10.12 && <0.12
, cardano-api:{cardano-api, gen} ==1.35.4
, hedgehog-quickcheck ^>=0.1
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
, nonempty-containers ^>=0.3.4
, ouroboros-consensus ==0.1.0.1
, QuickCheck >=2.14 && <3
@@ -215,8 +215,8 @@ 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.1
- , marlowe-protocols ==0.1.0.0
+ , marlowe-chain-sync:{marlowe-chain-sync, gen} ==0.0.2
+ , marlowe-protocols ==0.1.1.0
build-tool-depends: hspec-discover:hspec-discover
ghc-options: -threaded
@@ -234,14 +234,14 @@ executable marlowe-chain-indexer
autogen-modules: Paths_marlowe_chain_sync
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, cardano-api ==1.35.4
, cardano-crypto-wrapper ==1.3.0
, cardano-ledger-byron ==0.1.0.0
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
@@ -269,20 +269,20 @@ executable marlowe-chain-sync
autogen-modules: Paths_marlowe_chain_sync
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, cardano-api ==1.35.4
, cardano-ledger-byron ==0.1.0.0
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-chain-sync:{marlowe-chain-sync, libchainsync} ==0.0.1
- , marlowe-protocols ==0.1.0.0
+ , marlowe-chain-sync:{marlowe-chain-sync, libchainsync} ==0.0.2
+ , marlowe-protocols ==0.1.1.0
, mtl >=2.2 && <3
, network >=3.1 && <4
, optparse-applicative
diff --git a/marlowe-cli/CHANGELOG.md b/marlowe-cli/CHANGELOG.md
new file mode 100644
index 0000000000..8917c82879
--- /dev/null
+++ b/marlowe-cli/CHANGELOG.md
@@ -0,0 +1,45 @@
+
+
+# 0.0.11.0 — 2023-06-15
+
+## Removed
+
+- Removed `RuntimeAwaitInputsApplied`, `RuntimeAwaitContractCreated` - the can be easily simulated by using the new `awaitConfirmed` param.
+
+## Added
+
+- Test runner for the Runtime with basic set of operations (we still miss `withdraw`).
+
+- Implementation for all the basic (roless) flows with template contracts from marlowe-contracts.
+
+- Improved ergonimcs of the "DSL" (simpler structure, nicer field names etc.).
+
+- Improved balance checking.
+
+- Added `awaitConfirmed` - most of the actions provide this optional await setup now.
+
+- Added `RuntimeWithdraw` action to the marlowe-cli testing DSL.
+
+- Added `RuntimeAwaitTxsConfirmed` action which awaits all the pending Marlowe transaction till they are registered in the Runtime.
+
+- Ports of old inline role-based tests `./marlowe-cli/tests/inline/*` (currently only marlowe-cli based flows)
+
+- `--max-retries` option to the test command which performs retries based on the type of the failure
+
+- More `yaml` DSL rewrites of operation properties (handling more compact representations) and Marlowe contract (handling relative timeouts)
+
+- `ShouldFail` operation
+
+## Changed
+
+- Changed encoding of operations so we don't use `tag` field but instead a constructor name is a key in a singleton object.
+
+- Improve report structure to incorporate more details.
+
+- Error handling across the interpreters by introducing more semantic error representation
+
+## Fixed
+
+ - Funds management. Bracketing is applied to every subfaucet or funds acquisition.
+
+- Value parsing of the `--submit` option in all the relevant commands.
diff --git a/marlowe-cli/changelog.d/20230412_180025_tomasz.rybarczyk_SCP_5144_adapt_DSL_for_runtime_testing.md b/marlowe-cli/changelog.d/20230412_180025_tomasz.rybarczyk_SCP_5144_adapt_DSL_for_runtime_testing.md
deleted file mode 100644
index 0a964dd09a..0000000000
--- a/marlowe-cli/changelog.d/20230412_180025_tomasz.rybarczyk_SCP_5144_adapt_DSL_for_runtime_testing.md
+++ /dev/null
@@ -1,38 +0,0 @@
-
-### Added
-
-- Test runner for the Runtime with basic set of operations (we still miss `withdraw`).
-
-- Implementation for all the basic (roless) flows with template contracts from marlowe-contracts.
-
-- Improved ergonimcs of the "DSL" (simpler structure, nicer field names etc.).
-
-- Improved balance checking.
-
-
-
-
-
diff --git a/marlowe-cli/changelog.d/20230417_144045_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md b/marlowe-cli/changelog.d/20230417_144045_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md
deleted file mode 100644
index ad4ae376d8..0000000000
--- a/marlowe-cli/changelog.d/20230417_144045_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-### Removed
-
-- Removed `RuntimeAwaitInputsApplied`, `RuntimeAwaitContractCreated` - the can be easily simulated by using the new `awaitConfirmed` param.
-
-### Added
-
-- Added `awaitConfirmed` - most of the actions provide this optional await setup now.
-
-- Added `RuntimeWithdraw` action to the marlowe-cli testing DSL.
-
-- Added `RuntimeAwaitTxsConfirmed` action which awaits all the pending Marlowe transaction till they are registered in the Runtime.
-
-### Changed
-
-- Changed encoding of operations so we don't use `tag` field but instead a constructor name is a key in a singleton object.
-
-- Improve report structure to incorporate more details.
-
-
-### Fixed
-
- - Funds management. Bracketing is applied to every subfaucet or funds acquisition.
-
-
diff --git a/marlowe-cli/changelog.d/20230509_085651_tomasz.rybarczyk_PLT_5874_fix_second_parsing_on_the_command_line.md b/marlowe-cli/changelog.d/20230509_085651_tomasz.rybarczyk_PLT_5874_fix_second_parsing_on_the_command_line.md
deleted file mode 100644
index a0737d75e7..0000000000
--- a/marlowe-cli/changelog.d/20230509_085651_tomasz.rybarczyk_PLT_5874_fix_second_parsing_on_the_command_line.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-### Fixed
-
-- Value parsing of the `--submit` option in all the relevant commands.
-
-
diff --git a/marlowe-cli/changelog.d/20230516_102734_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md b/marlowe-cli/changelog.d/20230516_102734_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md
deleted file mode 100644
index 8bb330023e..0000000000
--- a/marlowe-cli/changelog.d/20230516_102734_tomasz.rybarczyk_PLT_5560_role_based_test_scenarios.md
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-### Added
-
-- Ports of old inline role-based tests `./marlowe-cli/tests/inline/*` (currently only marlowe-cli based flows)
-
-- `--max-retries` option to the test command which performs retries based on the type of the failure
-
-- More `yaml` DSL rewrites of operation properties (handling more compact representations) and Marlowe contract (handling relative timeouts)
-
-- `ShouldFail` operation
-
-### Changed
-
-- Error handling across the interpreters by introducing more semantic error representation
-
-
-
-
diff --git a/marlowe-cli/marlowe-cli.cabal b/marlowe-cli/marlowe-cli.cabal
index 1cab92ffe2..8151d9e732 100644
--- a/marlowe-cli/marlowe-cli.cabal
+++ b/marlowe-cli/marlowe-cli.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-cli
-version: 0.0.10.2
+version: 0.0.11.0
license: Apache-2.0
license-files:
LICENSE
diff --git a/marlowe-client/marlowe-client.cabal b/marlowe-client/marlowe-client.cabal
index bbeeff94ff..0cbeff6dea 100644
--- a/marlowe-client/marlowe-client.cabal
+++ b/marlowe-client/marlowe-client.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-client
-version: 0.0.1
+version: 0.0.2
synopsis: A client library for the Marlowe Runtime.
bug-reports: https://github.com/input-output-hk/marlowe-marlowe/issues
license: Apache-2.0
@@ -56,12 +56,12 @@ library
, base >=4.9 && <5
, cardano-api ==1.35.4
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, exceptions ^>=0.10
, general-allocate ^>=0.2
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, contract-api, discovery-api, history-api, proxy-api, sync-api, tx-api} ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, contract-api, discovery-api, history-api, proxy-api, sync-api, tx-api} ==0.0.2
, monad-control ^>=1
, mtl >=2.2 && <3
, network >=3.1 && <4
diff --git a/marlowe-protocols/marlowe-protocols.cabal b/marlowe-protocols/marlowe-protocols.cabal
index f5773f0cbf..499ca0df0f 100644
--- a/marlowe-protocols/marlowe-protocols.cabal
+++ b/marlowe-protocols/marlowe-protocols.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-protocols
-version: 0.1.0.0
+version: 0.1.1.0
synopsis: Protocol definitions for Marlowe
bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues
license: Apache-2.0
@@ -73,7 +73,7 @@ library
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, base16 ^>=0.3.2
, binary ^>=0.8.8
@@ -81,7 +81,7 @@ library
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hspec >=2.10 && <3
diff --git a/marlowe-runtime-cli/marlowe-runtime-cli.cabal b/marlowe-runtime-cli/marlowe-runtime-cli.cabal
index dca86d32f3..86fcbc4501 100644
--- a/marlowe-runtime-cli/marlowe-runtime-cli.cabal
+++ b/marlowe-runtime-cli/marlowe-runtime-cli.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-runtime-cli
-version: 0.0.1
+version: 0.0.2
synopsis: A command line interface for the Marlowe Runtime.
bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues
license: Apache-2.0
diff --git a/marlowe-runtime-web/changelog.d/20230417_165332_tomasz.rybarczyk_SCP_4926_cip30_friendly_web_server.md b/marlowe-runtime-web/CHANGELOG.md
similarity index 55%
rename from marlowe-runtime-web/changelog.d/20230417_165332_tomasz.rybarczyk_SCP_4926_cip30_friendly_web_server.md
rename to marlowe-runtime-web/CHANGELOG.md
index 0822056008..bcafaf5b50 100644
--- a/marlowe-runtime-web/changelog.d/20230417_165332_tomasz.rybarczyk_SCP_4926_cip30_friendly_web_server.md
+++ b/marlowe-runtime-web/CHANGELOG.md
@@ -1,16 +1,8 @@
-
+
+# 0.0.2 — 2023-06-15
-
-### Added
+## Added
* These endpoints `POST` handlers were extended so they return transaction as a result (instead of transaction body) if a particular header is present:
@@ -21,28 +13,3 @@ Uncomment the section that is right (remove the HTML comment wrapper).
* `withdraw` endpoint uses "Accept: application/vendor.iog.marlowe-runtime.withdraw-tx-json" header
* All the above endpoints accept also `witnessset` as a payload for `PUT` request now.
-
-
-
-
-
diff --git a/marlowe-runtime-web/marlowe-runtime-web.cabal b/marlowe-runtime-web/marlowe-runtime-web.cabal
index e5dc01d93b..52df9fa789 100644
--- a/marlowe-runtime-web/marlowe-runtime-web.cabal
+++ b/marlowe-runtime-web/marlowe-runtime-web.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-runtime-web
-version: 0.0.1
+version: 0.0.2
synopsis: Web server for Marlowe Runtime on Cardano.
bug-reports: https://github.com/input-output-hk/marlowe-cardano/issues
license: Apache-2.0
@@ -68,7 +68,7 @@ library
, containers ^>=0.6.5
, http-media ^>=0.8
, lens >=5.2 && <6
- , marlowe-cardano ==0.1.0.3
+ , marlowe-cardano ==0.1.1.0
, mtl >=2.2 && <3
, network-uri >=2.6 && <3
, openapi3 >=3.2 && <4
@@ -103,7 +103,7 @@ library server
build-depends:
, aeson >=2 && <3
, async >=2.2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, cardano-api ==1.35.4
@@ -115,17 +115,17 @@ library server
, containers ^>=0.6.5
, errors >=2.3 && <3
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, exceptions >=0.10 && <0.12
, general-allocate ^>=0.2
, http-media ^>=0.8
, lens >=5.2 && <6
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-client ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime-web ==0.0.1
- , marlowe-runtime:{marlowe-runtime, discovery-api, proxy-api, sync-api, tx-api} ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-client ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime-web ==0.0.2
+ , marlowe-runtime:{marlowe-runtime, discovery-api, proxy-api, sync-api, tx-api} ==0.0.2
, monad-control ^>=1
, mtl >=2.2 && <3
, openapi3 >=3.2 && <4
@@ -153,7 +153,7 @@ executable marlowe-web-server
autogen-modules: Paths_marlowe_runtime_web
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, co-log >=0.5.0.0 && <0.6.0.0
, eventuo11y >=0.9 && <0.11
@@ -186,7 +186,7 @@ test-suite marlowe-runtime-web-test
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, hspec
- , marlowe-cardano ==0.1.0.3
+ , marlowe-cardano ==0.1.1.0
, marlowe-runtime-web
, marlowe-test
, network-arbitrary
diff --git a/marlowe-runtime/CHANGELOG.md b/marlowe-runtime/CHANGELOG.md
new file mode 100644
index 0000000000..22f6c3b576
--- /dev/null
+++ b/marlowe-runtime/CHANGELOG.md
@@ -0,0 +1,71 @@
+
+
+# 0.0.2 — 2023-06-15
+
+## Removed
+
+- JSON console logs
+- BREAKING - `--log-config-file` command line options
+- BREAKING - `--print-log-config` commands
+
+## Added
+
+- Safety checks for Marlowe contracts.
+
+- OpenTelemetry-based tracing
+- Second port to `marlowe-proxy` for clients that provide their own tracing
+ information.
+
+- `marlowe-contract` service for contract definition storage.
+ - Includes a file-based store and a server for the `MarloweLoad` protocol.
+- BREAKING `MarloweLoad` as a sub-protocol of `MarloweRuntime` service
+ - `marlowe-proxy` now requires a host and port for `marlowe-contract`
+- functions for running `MarloweLoad` clients to `marlowe-client`
+- `load` command to `marlowe-runtime-cli`
+
+- Contract query to `marlowe-proxy`
+- `query store` commands to `marlowe-runtime-cli`
+
+- `MarkleizeInputs` request to `ContractRequest` (`marlowe-contract` query API)
+
+- Option to pass a `DatumHash` to `marlowe-tx`'s `Create` command. This will
+ load the matching contract from the contract store.
+- `--contract-hash` option to `marlowe-runtime-cli create` to pass a contract hash
+ obtained via `marlowe-runtime-cli load` when creating a contract.
+
+- Safety checks for invalid Plutus addresses.
+
+- Uncaught exceptions in server threads are now logged to stderr rather than
+ being swallowed.
+
+## Changed
+
+- [Internal] tracing code refactored to use a mtl-style class instead of
+ explicit tracer passing.
+
+- BREAKING - Extracted generic query protocol and reworked `marlowe-sync`'s
+ query protocol to use it.
+
+- `Apply` will auto-merkleize normal inputs to a contract if the contract is in
+ the store.
+ - E.g. Given an on-chain contract `When [MerkleizedCase (Notify TrueObs) "foo"] 0 Close`,
+ a client can call `Apply` with `[NormalInput INotify]` and `marlowe-tx` will
+ merkleize it automatically if it can find the contract in the store.
+ Clients can still pass manually merkleized inputs to `Apply` if desired.
+
+- Console log formatting.
+- Increased the maximum confirmation wait time in `marlowe-tx` to 1 hour.
+
+- If `OTEL_EXPORTER_OTLP_ENDPOINT` env var is not set, runtime will not attempt
+ to send traces anywhere.
+
+## Fixed
+
+- Implements missing support in the Marlowe Runtime CLI `apply` command to accept input files through the `--input-file` argument.
+
+- Driver state threading in runPeerDriverTraced
+
+- `marlowe-runtime-cli choose --help` displayed description for `notify`.
+
+- Console logs are now thread-safe.
+- `marlowe-scaling` did not delay polling at all when submitting a transaction.
diff --git a/marlowe-runtime/changelog.d/20230419_135649_brian.bush_PLT_4588.md b/marlowe-runtime/changelog.d/20230419_135649_brian.bush_PLT_4588.md
deleted file mode 100644
index 7cccbbffd2..0000000000
--- a/marlowe-runtime/changelog.d/20230419_135649_brian.bush_PLT_4588.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-### Added
-
-- Safety checks for Marlowe contracts.
-
-
-
-
-
diff --git a/marlowe-runtime/changelog.d/20230503_133619_jhbertra_logging.md b/marlowe-runtime/changelog.d/20230503_133619_jhbertra_logging.md
deleted file mode 100644
index 6ee640507e..0000000000
--- a/marlowe-runtime/changelog.d/20230503_133619_jhbertra_logging.md
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-### Changed
-
-- [Internal] tracing code refactored to use a mtl-style class instead of
- explicit tracer passing.
-
-
-
-
diff --git a/marlowe-runtime/changelog.d/20230503_170553_bjorn.wilhelm.kihlberg_PLT_4173.md b/marlowe-runtime/changelog.d/20230503_170553_bjorn.wilhelm.kihlberg_PLT_4173.md
deleted file mode 100644
index a5f0b57496..0000000000
--- a/marlowe-runtime/changelog.d/20230503_170553_bjorn.wilhelm.kihlberg_PLT_4173.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Fixed
-
-- Implements missing support in the Marlowe Runtime CLI `apply` command to accept input files through the `--input-file` argument.
diff --git a/marlowe-runtime/changelog.d/20230505_095221_jhbertra_otel.md b/marlowe-runtime/changelog.d/20230505_095221_jhbertra_otel.md
deleted file mode 100644
index 7dfd9b8dc2..0000000000
--- a/marlowe-runtime/changelog.d/20230505_095221_jhbertra_otel.md
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-### Removed
-
-- JSON console logs
-- BREAKING - `--log-config-file` command line options
-- BREAKING - `--print-log-config` commands
-
-### Added
-
-- OpenTelemetry-based tracing
-- Second port to `marlowe-proxy` for clients that provide their own tracing
- information.
-
-
-
-
-
diff --git a/marlowe-runtime/changelog.d/20230515_101947_jhbertra_fix_driver_bug.md b/marlowe-runtime/changelog.d/20230515_101947_jhbertra_fix_driver_bug.md
deleted file mode 100644
index 0b3df90e4e..0000000000
--- a/marlowe-runtime/changelog.d/20230515_101947_jhbertra_fix_driver_bug.md
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-### Fixed
-
-- Driver state threading in runPeerDriverTraced
-
-
diff --git a/marlowe-runtime/changelog.d/20230519_090639_jhbertra_plt_5847_marlowe_loader.md b/marlowe-runtime/changelog.d/20230519_090639_jhbertra_plt_5847_marlowe_loader.md
deleted file mode 100644
index 495a469e9e..0000000000
--- a/marlowe-runtime/changelog.d/20230519_090639_jhbertra_plt_5847_marlowe_loader.md
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-### Added
-
-- `marlowe-contract` service for contract definition storage.
- - Includes a file-based store and a server for the `MarloweLoad` protocol.
-- BREAKING `MarloweLoad` as a sub-protocol of `MarloweRuntime` service
- - `marlowe-proxy` now requires a host and port for `marlowe-contract`
-- functions for running `MarloweLoad` clients to `marlowe-client`
-- `load` command to `marlowe-runtime-cli`
-
-
-
-
-
diff --git a/marlowe-runtime/changelog.d/20230524_161249_jhbertra_plt_5848_get_contract.md b/marlowe-runtime/changelog.d/20230524_161249_jhbertra_plt_5848_get_contract.md
deleted file mode 100644
index 03917828ac..0000000000
--- a/marlowe-runtime/changelog.d/20230524_161249_jhbertra_plt_5848_get_contract.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Added
-
-- Contract query to `marlowe-proxy`
-- `query store` commands to `marlowe-runtime-cli`
-
-### Changed
-
-- BREAKING - Extracted generic query protocol and reworked `marlowe-sync`'s
- query protocol to use it.
diff --git a/marlowe-runtime/changelog.d/20230531_163411_jhbertra_plt_5850_get_merkleized_inputs.md b/marlowe-runtime/changelog.d/20230531_163411_jhbertra_plt_5850_get_merkleized_inputs.md
deleted file mode 100644
index c2c1fb5eac..0000000000
--- a/marlowe-runtime/changelog.d/20230531_163411_jhbertra_plt_5850_get_merkleized_inputs.md
+++ /dev/null
@@ -1,12 +0,0 @@
-### Added
-
-- `MarkleizeInputs` request to `ContractRequest` (`marlowe-contract` query API)
-
-### Changed
-
-- `Apply` will auto-merkleize normal inputs to a contract if the contract is in
- the store.
- - E.g. Given an on-chain contract `When [MerkleizedCase (Notify TrueObs) "foo"] 0 Close`,
- a client can call `Apply` with `[NormalInput INotify]` and `marlowe-tx` will
- merkleize it automatically if it can find the contract in the store.
- Clients can still pass manually merkleized inputs to `Apply` if desired.
diff --git a/marlowe-runtime/changelog.d/20230601_161758_jhbertra_plt_5854_create_by_hash.md b/marlowe-runtime/changelog.d/20230601_161758_jhbertra_plt_5854_create_by_hash.md
deleted file mode 100644
index 5f73e22869..0000000000
--- a/marlowe-runtime/changelog.d/20230601_161758_jhbertra_plt_5854_create_by_hash.md
+++ /dev/null
@@ -1,6 +0,0 @@
-### Added
-
-- Option to pass a `DatumHash` to `marlowe-tx`'s `Create` command. This will
- load the matching contract from the contract store.
-- `--contract-hash` option to `marlowe-runtime-cli create` to pass a contract hash
- obtained via `marlowe-runtime-cli load` when creating a contract.
diff --git a/marlowe-runtime/changelog.d/20230602_132507_brian.bush_PLT_5901.md b/marlowe-runtime/changelog.d/20230602_132507_brian.bush_PLT_5901.md
deleted file mode 100644
index ce4eab550b..0000000000
--- a/marlowe-runtime/changelog.d/20230602_132507_brian.bush_PLT_5901.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Added
-
-- Safety checks for invalid Plutus addresses.
diff --git a/marlowe-runtime/changelog.d/20230602_153400_jhbertra_log_exceptions.md b/marlowe-runtime/changelog.d/20230602_153400_jhbertra_log_exceptions.md
deleted file mode 100644
index fd1b080248..0000000000
--- a/marlowe-runtime/changelog.d/20230602_153400_jhbertra_log_exceptions.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Added
-
-- Uncaught exceptions in server threads are now logged to stderr rather than
- being swallowed.
diff --git a/marlowe-runtime/changelog.d/20230602_164218_jhbertra_plt_5623_choose_description.md b/marlowe-runtime/changelog.d/20230602_164218_jhbertra_plt_5623_choose_description.md
deleted file mode 100644
index 3d5c685956..0000000000
--- a/marlowe-runtime/changelog.d/20230602_164218_jhbertra_plt_5623_choose_description.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Fixed
-
-- `marlowe-runtime-cli choose --help` displayed description for `notify`.
diff --git a/marlowe-runtime/changelog.d/20230612_154054_jhbertra_plt_6202_console_logging.md b/marlowe-runtime/changelog.d/20230612_154054_jhbertra_plt_6202_console_logging.md
deleted file mode 100644
index 48a3ecd12f..0000000000
--- a/marlowe-runtime/changelog.d/20230612_154054_jhbertra_plt_6202_console_logging.md
+++ /dev/null
@@ -1,9 +0,0 @@
-### Changed
-
-- Console log formatting.
-- Increased the maximum confirmation wait time in `marlowe-tx` to 1 hour.
-
-### Fixed
-
-- Console logs are now thread-safe.
-- `marlowe-scaling` did not delay polling at all when submitting a transaction.
diff --git a/marlowe-runtime/changelog.d/20230613_135425_jhbertra_plt_6201_disable_otel.md b/marlowe-runtime/changelog.d/20230613_135425_jhbertra_plt_6201_disable_otel.md
deleted file mode 100644
index 0a3649afe9..0000000000
--- a/marlowe-runtime/changelog.d/20230613_135425_jhbertra_plt_6201_disable_otel.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Changed
-
-- If `OTEL_EXPORTER_OTLP_ENDPOINT` env var is not set, runtime will not attempt
- to send traces anywhere.
diff --git a/marlowe-runtime/marlowe-runtime.cabal b/marlowe-runtime/marlowe-runtime.cabal
index b1d8795d6f..d8cae2883c 100644
--- a/marlowe-runtime/marlowe-runtime.cabal
+++ b/marlowe-runtime/marlowe-runtime.cabal
@@ -1,6 +1,6 @@
cabal-version: 3.0
name: marlowe-runtime
-version: 0.0.1
+version: 0.0.2
synopsis:
Runtime system for running Marlowe financial contracts on the Cardano Computation Layer
@@ -85,9 +85,9 @@ library
, bytestring >=0.10.12 && <0.12
, cardano-api ==1.35.4
, containers ^>=0.6.5
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
, ouroboros-network ==0.1.0.1
, plutus-ledger-api ==1.0.0.1
, plutus-tx ==1.0.0.0
@@ -110,10 +110,10 @@ library gen
, cardano-api:{cardano-api, gen} ==1.35.4
, hedgehog-quickcheck ^>=0.1
, http-media ^>=0.8
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync:{gen, plutus-compat} ==0.0.1
- , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, tx-api} ==0.0.1
- , marlowe-test ==0.1.1.0
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync:{gen, plutus-compat} ==0.0.2
+ , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, tx-api} ==0.0.2
+ , marlowe-test ==0.1.2.0
, network-uri >=2.6 && <3
, QuickCheck >=2.14 && <3
, quickcheck-instances ^>=0.3.29
@@ -136,10 +136,10 @@ library history-api
, containers ^>=0.6.5
, errors >=2.3 && <3
, hs-opentelemetry-api >=0.0.3 && <0.0.4
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime ==0.0.2
, ouroboros-consensus ==0.1.0.1
, ouroboros-network ==0.1.0.1
, plutus-ledger-api ==1.0.0.1
@@ -164,7 +164,7 @@ library indexer
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, binary ^>=0.8.8
, bytestring >=0.10.12 && <0.12
@@ -172,15 +172,15 @@ library indexer
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hasql-th ^>=0.4
, hasql-transaction ^>=1
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.2
, mtl >=2.2 && <3
, nonempty-containers ^>=0.3.4
, plutus-ledger-api ==1.0.0.1
@@ -206,9 +206,9 @@ library sync-api
, base >=4.9 && <5
, binary ^>=0.8.8
, containers ^>=0.6.5
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, discovery-api} ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, discovery-api} ==0.0.2
, unliftio ^>=0.2.1
library contract-api
@@ -228,10 +228,10 @@ library contract-api
, cardano-api ==1.35.4
, containers ^>=0.6.5
, hs-opentelemetry-api >=0.0.3 && <0.0.4
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime ==0.0.2
, plutus-ledger-api ==1.0.0.1
, text >=1.2.4 && <2
, typed-protocols ==0.1.0.0
@@ -249,7 +249,7 @@ library contract
Language.Marlowe.Runtime.Contract.Store.Memory
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, binary ^>=0.8.8
, bytestring >=0.10.12 && <0.12
@@ -257,14 +257,14 @@ library contract
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, exceptions ^>=0.10
, filepath ^>=1.4
, lock-file ^>=0.7
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, contract-api} ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, contract-api} ==0.0.2
, plutus-ledger-api ==1.0.0.1
, transformers ^>=0.5.6
, typed-protocols ==0.1.0.0
@@ -300,22 +300,22 @@ library sync
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, binary ^>=0.8.8
, bytestring >=0.10.12 && <0.12
, co-log >=0.5.0.0 && <0.6.0.0
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, foldl >=1.4 && <2
, hasql >=1.6 && <2
, hasql-th ^>=0.4
, hasql-transaction ^>=1
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, sync-api} ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, sync-api} ==0.0.2
, plutus-ledger-api ==1.0.0.1
, time >=1.9 && <2
, transformers ^>=0.5.6
@@ -338,9 +338,9 @@ library discovery-api
, base >=4.9 && <5
, binary ^>=0.8.8
, hs-opentelemetry-api >=0.0.3 && <0.0.4
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime ==0.0.2
, typed-protocols ==0.1.0.0
library tx-api
@@ -356,9 +356,9 @@ library tx-api
, cardano-api ==1.35.4
, containers ^>=0.6.5
, http-media ^>=0.8
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, history-api} ==0.0.2
, network-uri >=2.6 && <3
, text >=1.2.4 && <2
, time >=1.9 && <2
@@ -379,7 +379,7 @@ library tx
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, cardano-api ==1.35.4
, cardano-ledger-core ==0.1.0.0
@@ -387,11 +387,11 @@ library tx
, containers ^>=0.6.5
, errors >=2.3 && <3
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, contract-api, history-api, plutus-scripts, tx-api} ==0.0.1
+ , eventuo11y-extras ==0.1.1.0
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, contract-api, history-api, plutus-scripts, tx-api} ==0.0.2
, ouroboros-consensus ==0.1.0.1
, ouroboros-network ==0.1.0.1
, plutus-ledger-api ==1.0.0.1
@@ -415,8 +415,8 @@ library proxy-api
build-depends:
, base >=4.9 && <5
, binary ^>=0.8.8
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{contract-api, discovery-api, history-api, sync-api, tx-api} ==0.0.1
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{contract-api, discovery-api, history-api, sync-api, tx-api} ==0.0.2
, typed-protocols ==0.1.0.0
library proxy
@@ -425,13 +425,13 @@ library proxy
visibility: public
exposed-modules: Language.Marlowe.Runtime.Proxy
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, co-log >=0.5.0.0 && <0.6.0.0
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{contract-api, discovery-api, history-api, proxy-api, sync-api, tx-api} ==0.0.1
+ , eventuo11y-extras ==0.1.1.0
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{contract-api, discovery-api, history-api, proxy-api, sync-api, tx-api} ==0.0.2
, resourcet >=1.3 && <2
, typed-protocols ==0.1.0.0
, unliftio ^>=0.2.1
@@ -462,8 +462,8 @@ library config
exposed-modules: Language.Marlowe.Runtime.CLI.Option
build-depends:
, base >=4.9 && <5
- , marlowe-chain-sync ==0.0.1
- , marlowe-runtime ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-runtime ==0.0.2
, network >=3.1 && <4
, optparse-applicative ^>=0.17
, split ^>=0.2.3
@@ -479,20 +479,20 @@ executable marlowe-indexer
autogen-modules: Paths_marlowe_runtime
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, indexer} ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, indexer} ==0.0.2
, mtl >=2.2 && <3
, network >=3.1 && <4
, nonempty-containers ^>=0.3.4
@@ -513,18 +513,18 @@ executable marlowe-sync
autogen-modules: Paths_marlowe_runtime
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, bytestring >=0.10.12 && <0.12
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hasql >=1.6 && <2
, hasql-pool ^>=0.8
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, sync, sync-api} ==0.0.1
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, discovery-api, history-api, sync, sync-api} ==0.0.2
, mtl >=2.2 && <3
, network >=3.1 && <4
, optparse-applicative ^>=0.17
@@ -544,18 +544,18 @@ executable marlowe-tx
autogen-modules: Paths_marlowe_runtime
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, cardano-api ==1.35.4
, containers ^>=0.6.5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-chain-sync ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, contract-api, tx, tx-api} ==0.0.1
+ , marlowe-chain-sync ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, contract-api, tx, tx-api} ==0.0.2
, network >=3.1 && <4
, optparse-applicative ^>=0.17
, text >=1.2.4 && <2
@@ -573,16 +573,16 @@ executable marlowe-contract
autogen-modules: Paths_marlowe_runtime
build-depends:
, aeson >=2 && <3
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-cardano ==0.1.0.3
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{contract, contract-api} ==0.0.1
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{contract, contract-api} ==0.0.2
, network >=3.1 && <4
, optparse-applicative ^>=0.17
, text >=1.2.4 && <2
@@ -600,15 +600,15 @@ executable marlowe-proxy
autogen-modules: Paths_marlowe_runtime
build-depends:
- , async-components ==0.1.0.0
+ , async-components ==0.1.1.0
, base >=4.9 && <5
, eventuo11y >=0.9 && <0.11
- , eventuo11y-extras ==0.1.0.0
+ , eventuo11y-extras ==0.1.1.0
, eventuo11y-otel ^>=0.1
, hs-opentelemetry-api >=0.0.3 && <0.0.4
, hs-opentelemetry-sdk >=0.0.3 && <0.0.4
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{config, contract-api, discovery-api, history-api, proxy, proxy-api, sync-api, tx-api} ==0.0.1
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{config, contract-api, discovery-api, history-api, proxy, proxy-api, sync-api, tx-api} ==0.0.2
, network >=3.1 && <4
, optparse-applicative ^>=0.17
, text >=1.2.4 && <2
@@ -645,11 +645,11 @@ test-suite marlowe-runtime-test
, hedgehog-quickcheck ^>=0.1
, hspec
, http-media ^>=0.8
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync:{marlowe-chain-sync, gen, plutus-compat} ==0.0.1
- , marlowe-protocols ==0.1.0.0
- , marlowe-runtime:{marlowe-runtime, contract-api, discovery-api, gen, history-api, sync-api, tx, tx-api} ==0.0.1
- , marlowe-test ==0.1.1.0
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync:{marlowe-chain-sync, gen, plutus-compat} ==0.0.2
+ , marlowe-protocols ==0.1.1.0
+ , marlowe-runtime:{marlowe-runtime, contract-api, discovery-api, gen, history-api, sync-api, tx, tx-api} ==0.0.2
+ , marlowe-test ==0.1.2.0
, network-uri >=2.6 && <3
, ouroboros-consensus ==0.1.0.1
, plutus-ledger-api ==1.0.0.1
@@ -679,10 +679,10 @@ test-suite indexer-test
, cardano-api ==1.35.4
, containers ^>=0.6.5
, hspec
- , marlowe-cardano ==0.1.0.3
- , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.1
- , marlowe-runtime:{marlowe-runtime, gen, history-api, indexer} ==0.0.1
- , marlowe-test ==0.1.1.0
+ , marlowe-cardano ==0.1.1.0
+ , marlowe-chain-sync:{marlowe-chain-sync, plutus-compat} ==0.0.2
+ , marlowe-runtime:{marlowe-runtime, gen, history-api, indexer} ==0.0.2
+ , marlowe-test ==0.1.2.0
, ouroboros-consensus ==0.1.0.1
, plutus-tx ==1.0.0.0
, QuickCheck >=2.14 && <3
diff --git a/marlowe-test/changelog.d/20230602_132224_brian.bush_PLT_5901.rst b/marlowe-test/CHANGELOG.rst
similarity index 51%
rename from marlowe-test/changelog.d/20230602_132224_brian.bush_PLT_5901.rst
rename to marlowe-test/CHANGELOG.rst
index daa05da2cd..0b633b3f12 100644
--- a/marlowe-test/changelog.d/20230602_132224_brian.bush_PLT_5901.rst
+++ b/marlowe-test/CHANGELOG.rst
@@ -1,3 +1,9 @@
+
+.. _changelog-0.1.2.0:
+
+0.1.2.0 — 2023-06-15
+====================
+
Added
-----
diff --git a/marlowe-test/marlowe-test.cabal b/marlowe-test/marlowe-test.cabal
index 95d7b1918e..a1f7c36d32 100644
--- a/marlowe-test/marlowe-test.cabal
+++ b/marlowe-test/marlowe-test.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: marlowe-test
-version: 0.1.1.0
+version: 0.1.2.0
license: Apache-2.0
license-files:
LICENSE
@@ -170,7 +170,7 @@ library
, filepath ^>=1.4
, hint ^>=0.9
, lens >=5.2 && <6
- , marlowe-cardano ==0.1.0.3
+ , marlowe-cardano ==0.1.1.0
, marlowe-spec-test ==0.1.0.0
, mtl >=2.2 && <3
, plutus-ledger ^>=1.2
diff --git a/marlowe/CHANGELOG.md b/marlowe/CHANGELOG.md
index 83216ff30b..3a47438bd9 100644
--- a/marlowe/CHANGELOG.md
+++ b/marlowe/CHANGELOG.md
@@ -1,4 +1,22 @@
+
+# 0.1.1.0 — 2023-06-15
+
+## Added
+
+- Safety checks for Marlowe contracts.
+
+- Implemented `marlowe-validators` executable that benchmark Plutus execution costs of the Marlowe validators.
+- Instrumeted `marlowe-test` to optionally generate benchmark cases.
+
+- Safety checks for valid Plutus addresses.
+
+## Changed
+
+PLT-5462 adds a cabal flag `--flag trace-plutus` for the `marlowe-cardano` and `marlowe-test` packages. In production this flag should not be set because it enlarges the validator and changes its hash. If the flag is turned on, however, the test suite `test:marlowe-test` will check the Plutus logs to see that the correct error is occurring in cases where the validator should fail.
+
+This flag is also useful in `marlowe-cli` for creating a tracing validator for on-chain usage.
+
# SCP-5126: Differences between Marlowe's Isabelle semantics and its Plutus validator
diff --git a/marlowe/changelog.d/20230418_154551_brian.bush_PLT_5462.md b/marlowe/changelog.d/20230418_154551_brian.bush_PLT_5462.md
deleted file mode 100644
index c36f8ec6a4..0000000000
--- a/marlowe/changelog.d/20230418_154551_brian.bush_PLT_5462.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Changed
-
-PLT-5462 adds a cabal flag `--flag trace-plutus` for the `marlowe-cardano` and `marlowe-test` packages. In production this flag should not be set because it enlarges the validator and changes its hash. If the flag is turned on, however, the test suite `test:marlowe-test` will check the Plutus logs to see that the correct error is occurring in cases where the validator should fail.
-
-This flag is also useful in `marlowe-cli` for creating a tracing validator for on-chain usage.
diff --git a/marlowe/changelog.d/20230419_135732_brian.bush_PLT_4588.md b/marlowe/changelog.d/20230419_135732_brian.bush_PLT_4588.md
deleted file mode 100644
index 3800d17837..0000000000
--- a/marlowe/changelog.d/20230419_135732_brian.bush_PLT_4588.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Added
-
-- Safety checks for Marlowe contracts.
diff --git a/marlowe/changelog.d/20230515_083226_brian.bush_PLT_5596.md b/marlowe/changelog.d/20230515_083226_brian.bush_PLT_5596.md
deleted file mode 100644
index 7ba94a97d6..0000000000
--- a/marlowe/changelog.d/20230515_083226_brian.bush_PLT_5596.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Added
-
-- Implemented `marlowe-validators` executable that benchmark Plutus execution costs of the Marlowe validators.
-- Instrumeted `marlowe-test` to optionally generate benchmark cases.
diff --git a/marlowe/changelog.d/20230602_132119_brian.bush_PLT_5901.md b/marlowe/changelog.d/20230602_132119_brian.bush_PLT_5901.md
deleted file mode 100644
index 3cfde8bb9a..0000000000
--- a/marlowe/changelog.d/20230602_132119_brian.bush_PLT_5901.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Added
-
-- Safety checks for valid Plutus addresses.
diff --git a/marlowe/marlowe-cardano.cabal b/marlowe/marlowe-cardano.cabal
index 1ef37d5822..82098b789e 100644
--- a/marlowe/marlowe-cardano.cabal
+++ b/marlowe/marlowe-cardano.cabal
@@ -1,6 +1,6 @@
cabal-version: 2.2
name: marlowe-cardano
-version: 0.1.0.3
+version: 0.1.1.0
license: Apache-2.0
license-files:
LICENSE