Revert a change in the V1 node API where an additional tag was added …

…in responseencoding. Bump version to 5.4.2.
Concordium · Jun 6, 2023 · f79b7ce · f79b7ce
1 parent d1cf5be
commit f79b7ce
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git 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
@@ -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
diff --git 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 <developers@concordium.com>"]
 exclude = [".gitignore", ".gitlab-ci.yml", "test/**/*","**/**/.gitignore","**/**/.gitlab-ci.yml"]

diff --git a/service/windows/installer/Node.wxs b/service/windows/installer/Node.wxs
@@ -2,9 +2,9 @@
 <!-- When updating the product version, the Product Id should be refreshed, otherwise it will not be
     possible to upgrade an existing installation.
 -->
-<?define VersionNumber="5.4.1" ?>
+<?define VersionNumber="5.4.2" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:Util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Name="Concordium Node" Manufacturer="Concordium Software" Id="0fa50010-d9b4-46e0-a2ef-88672e41e094" UpgradeCode="297295b4-c716-4d33-8170-0f6136663bfd" Language="1033" Codepage="1252" Version="$(var.VersionNumber)">
+    <Product Name="Concordium Node" Manufacturer="Concordium Software" Id="5e741d55-9190-48f6-8d8a-58024c84f19e" UpgradeCode="297295b4-c716-4d33-8170-0f6136663bfd" Language="1033" Codepage="1252" Version="$(var.VersionNumber)">
         <Package Id="*" Keywords="Concordium Installer" Description="Concordium Node $(var.VersionNumber) Installer" Manufacturer="Concordium Software" InstallerVersion="500" Languages="1033" Compressed="yes" InstallScope="perMachine" />
         <MajorUpgrade Schedule="afterInstallValidate" DowngradeErrorMessage="The currently-installed version of [ProductName] is newer than the version you are trying to install. The installation cannot continue. If you wish to install this version, please remove the newer version first." />
         <Media Id="1" Cabinet="Node.cab" EmbedCab="yes" />