From b423ec54391b656c750320bd78bf469225d48caf Mon Sep 17 00:00:00 2001 From: Doris Benda Date: Fri, 24 May 2024 13:54:19 +0300 Subject: [PATCH] Update submodule link --- ChangeLog.md | 8 ++++---- deps/concordium-base | 2 +- src/Concordium/Client/Runner.hs | 2 +- src/Concordium/Client/Types/Transaction.hs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 38be96be..c637f723 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,7 +5,7 @@ - Rename subcommand `TransactionSubmit` to `TransactionSignAndSubmit`. - Add subcommand `TransactionSubmit` to submit a signed transaction on chain. - Add subcommand `TransactionAddSignature` to add a signature to a partially-signed transaction. -- Add optional `--outFile` flag to all transaction-creating commands to output a partially-singed transaction to a file. +- Add optional `--out` flag to all transaction-creating commands to output a partially-singed transaction to a file. - Update GHC version to 9.6.4 (lts-22.9). - Update Rust version to 1.73. - Support protocol version 7. @@ -62,7 +62,7 @@ - Add round and epoch to the output of `raw GetBlockInfo`. - Add round and epoch to the output of `block show` when they are present. - Print "Block time" instead of "Slot time" in the output of `block show`. -- In the output of `consensus show-parameters`, only print election difficulty when present. +- In the output of `consensus show-parameters`, only print election difficulty when present. ## 5.2.0 @@ -125,10 +125,10 @@ - Add support of contract schema V3. - V3 schemas offer the same options as V2, but also optionally includes a schema for contract events. - - `transaction status` now displays contract events, and a schema can be provided with `--schema`, which + - `transaction status` now displays contract events, and a schema can be provided with `--schema`, which will be used to parse the contract events. By default events are parsed with the schema embedded in the contract, if present. - - This enables concordium-client to interact with contracts and schemas + - This enables concordium-client to interact with contracts and schemas using `concordium-std` version 5. - Improved formatting of `transaction status` output using contract schemas if they are available for displaying contract events. diff --git a/deps/concordium-base b/deps/concordium-base index 377398d9..1c97f303 160000 --- a/deps/concordium-base +++ b/deps/concordium-base @@ -1 +1 @@ -Subproject commit 377398d920e8b09f4105287de52f69f013af1c00 +Subproject commit 1c97f30317960427e59e2643bd55fd8f6f26697a diff --git a/src/Concordium/Client/Runner.hs b/src/Concordium/Client/Runner.hs index fd785a07..989c45ff 100644 --- a/src/Concordium/Client/Runner.hs +++ b/src/Concordium/Client/Runner.hs @@ -1696,7 +1696,7 @@ signAndProcessTransaction verbose txCfg pl intOpts outFile backend = do -- Decode the payload from the transaction let decPl = case Types.promoteProtocolVersion pv of - Types.SomeProtocolVersion spv -> Types.decodePayload spv (Types.payloadSize pl) pl + Types.SomeProtocolVersion spv -> Types.decodePayload spv pl decPayload <- case decPl of Right decPL -> return decPL Left err -> logFatal ["Decoding of payload failed: " <> err] diff --git a/src/Concordium/Client/Types/Transaction.hs b/src/Concordium/Client/Types/Transaction.hs index 1471035e..ca63f13c 100644 --- a/src/Concordium/Client/Types/Transaction.hs +++ b/src/Concordium/Client/Types/Transaction.hs @@ -367,8 +367,8 @@ instance AE.FromJSON TransactionJSON where -- -- The chosen representation is the minimal necessary data needed to construct the -- 'TransactionSignHash' which is the value that is signed by the signer. The --- 'TransactionSignHash' and 'payloadSize' should be re-computed when processing a --- 'SignedTransaction' (e.g. when adding signatures or sending the transaction on-chain). +-- 'TransactionSignHash' should be re-computed when processing a 'SignedTransaction' +-- (e.g. when adding signatures or sending the transaction on-chain). data SignedTransaction = SignedTransaction { -- | Amount of energy dedicated to the execution of this transaction. stEnergy :: !Energy,