From f79b7cebf9af87950cb79db054c4ececce88f16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Bizjak?= Date: Tue, 6 Jun 2023 12:34:15 +0200 Subject: [PATCH] Revert a change in the V1 node API where an additional tag was added in responseencoding. Bump version to 5.4.2. --- CHANGELOG.md | 4 ++++ concordium-consensus/src/Concordium/External.hs | 2 +- concordium-node/Cargo.lock | 2 +- concordium-node/Cargo.toml | 2 +- service/windows/installer/Node.wxs | 4 ++-- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3b88c120c..1d97007355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased changes +## 5.4.2 + +- Revert a change in getModuleSource of the V1 GRPC API. + ## 5.4.0 - Support using block height as block identifiers in gRPC v2 API. diff --git a/concordium-consensus/src/Concordium/External.hs b/concordium-consensus/src/Concordium/External.hs index 22c4ccb8f1..5a20eba012 100644 --- a/concordium-consensus/src/Concordium/External.hs +++ b/concordium-consensus/src/Concordium/External.hs @@ -1281,7 +1281,7 @@ getModuleSource cptr blockcstr modcstr = do case (mblock, mmod) of (Just bh, Just modref) -> do msrc <- runMVR (Q.responseToMaybe <$> Q.getModuleSource (Queries.Given bh) modref) mvr - byteStringToCString $ maybe BS.empty S.encode msrc + byteStringToCString $ maybe BS.empty S.encode (join msrc) _ -> byteStringToCString BS.empty -- |Get the list of bakers registered at the given block. The block must be given as a diff --git a/concordium-node/Cargo.lock b/concordium-node/Cargo.lock index 700c6c0f08..8fef1a06c3 100644 --- a/concordium-node/Cargo.lock +++ b/concordium-node/Cargo.lock @@ -644,7 +644,7 @@ dependencies = [ [[package]] name = "concordium_node" -version = "5.4.1" +version = "5.4.2" dependencies = [ "anyhow", "app_dirs2", diff --git a/concordium-node/Cargo.toml b/concordium-node/Cargo.toml index 3a8ccff5b9..cad3c9cc8c 100644 --- a/concordium-node/Cargo.toml +++ b/concordium-node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "concordium_node" -version = "5.4.1" # must be kept in sync with 'is_compatible_version' in 'src/configuration.rs' +version = "5.4.2" # must be kept in sync with 'is_compatible_version' in 'src/configuration.rs' description = "Concordium Node" authors = ["Concordium "] exclude = [".gitignore", ".gitlab-ci.yml", "test/**/*","**/**/.gitignore","**/**/.gitlab-ci.yml"] diff --git a/service/windows/installer/Node.wxs b/service/windows/installer/Node.wxs index 8b04b68e3e..38ba933751 100644 --- a/service/windows/installer/Node.wxs +++ b/service/windows/installer/Node.wxs @@ -2,9 +2,9 @@ - + - +