Merge pull request #381 from Concordium/pipeline-fix-rust-version

Fix the rust version used in pipeline
Concordium · Aug 7, 2024 · 98a2736 · 98a2736
2 parents 6180775 + 83e61e1
commit 98a2736
Show file tree

Hide file tree

Showing 16 changed files with 407 additions and 107 deletions.
diff --git a/.github/workflows/deploy-ccd-js-gen.yml b/.github/workflows/deploy-ccd-js-gen.yml
@@ -38,12 +38,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
 
+      - name: Install rust
+        run: rustup default ${{ env.RUST_VERSION }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Cache dependencies
         id: yarn-cache

diff --git a/.github/workflows/deploy-react-components.yml b/.github/workflows/deploy-react-components.yml
@@ -38,12 +38,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
 
+      - name: Install rust
+        run: rustup default ${{ env.RUST_VERSION }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Cache dependencies
         id: yarn-cache

diff --git a/.github/workflows/deploy-rust-bindings.yml b/.github/workflows/deploy-rust-bindings.yml
@@ -22,7 +22,7 @@ concurrency:
 
 env:
   NODE_VERSION: 18.16.0
-  RUST_VERSION: 1.73
+  RUST_VERSION: 1.73 ## Make sure to update wasm-pack to 0.13 or higher when this is rust version 1.74 or higher
   RUST_FMT: nightly-2023-04-01-x86_64-unknown-linux-gnu
 
 jobs:
@@ -38,12 +38,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
 
+      - name: Install rust
+        run: rustup default ${{ env.RUST_VERSION }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Cache dependencies
         id: yarn-cache

diff --git a/.github/workflows/deploy-sdk.yml b/.github/workflows/deploy-sdk.yml
@@ -38,12 +38,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
 
+      - name: Install rust
+        run: rustup default ${{ env.RUST_VERSION }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Cache dependencies
         id: yarn-cache

diff --git a/.github/workflows/deploy-wallet-connectors.yml b/.github/workflows/deploy-wallet-connectors.yml
@@ -38,12 +38,15 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
 
+      - name: Install rust
+        run: rustup default ${{ env.RUST_VERSION }}
+
       - uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Cache dependencies
         id: yarn-cache

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -96,7 +96,7 @@ jobs:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Build
         run: yarn build-ci
@@ -331,7 +331,7 @@ jobs:
           workspaces: |
             packages/rust-bindings
             deps/concordium-base/rust-src
-            deps/concordium-base/concordium-contracts-common
+            deps/concordium-base/smart-contracts/contracts-common
 
       - name: Run clippy
         run: cargo clippy --color=always --tests --benches -- -Dclippy::all
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-// Yarn stuff
+# Yarn stuff
 .pnp.*
 .yarn/*
 !.yarn/patches
@@ -45,3 +45,5 @@ package-lock.json
 
 # MacOS
 .DS_Store
+
+.vscode
diff --git a/packages/rust-bindings/CHANGELOG.md b/packages/rust-bindings/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.2.1
+
+### Fixed
+
+- The build pipeline was using rust version `1.79` instead of the version specified as part of the workflow.
+  This caused runtime error `unreachable` for the WebAssembly module for certain operations.
+  Fixing the pipeline to use `1.73` as intended, resolved the issue.
+
 ## 3.2.0
 
 ### Added

diff --git a/packages/rust-bindings/package.json b/packages/rust-bindings/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@concordium/rust-bindings",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "license": "Apache-2.0",
     "engines": {
         "node": ">=16"

diff --git a/packages/rust-bindings/packages/wallet/src/aux_functions.rs b/packages/rust-bindings/packages/wallet/src/aux_functions.rs
@@ -31,7 +31,6 @@ use rand::thread_rng;
 use serde::{Deserialize as SerdeDeserialize, Serialize as SerdeSerialize};
 use serde_json::{from_str, from_value, Value as SerdeValue};
 use std::{collections::BTreeMap, convert::TryInto};
-use thiserror::Error;
 
 #[derive(SerdeSerialize, SerdeDeserialize)]
 #[serde(bound(serialize = "P: Pairing", deserialize = "P: Pairing"))]
@@ -505,28 +504,6 @@ pub struct UnsignedCredentialInput {
     cred_number:              u8,
 }
 
-struct AttributeRandomness(BTreeMap<AttributeTag, PedersenRandomness<ArCurve>>);
-
-#[derive(Debug, Error)]
-pub enum AttributeError {
-    #[error("Missing randomness for given attribute tag.")]
-    NotFound,
-}
-
-impl HasAttributeRandomness<ArCurve> for AttributeRandomness {
-    type ErrorType = AttributeError;
-
-    fn get_attribute_commitment_randomness(
-        &self,
-        attribute_tag: &AttributeTag,
-    ) -> Result<PedersenRandomness<ArCurve>, Self::ErrorType> {
-        match self.0.get(attribute_tag) {
-            Some(v) => Ok(v.clone()),
-            None => Err(AttributeError::NotFound),
-        }
-    }
-}
-
 #[derive(SerdeSerialize)]
 #[serde(rename_all = "camelCase")]
 pub struct BakerKeys {

diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 7.5.1
+
+### Fixed
+
+- Update `@concordium/rust-bindings` to `3.2.1` which fixes an issue causing runtime error `unreachable` for the internal WebAssembly module.
+- Update JSON serialization of `AccountTransactionPayload` through `AccountTransactionPayloadHandler` to correctly serialize `CcdAmount` as `string`
+
 ## 7.5.0
 
 ### Added

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@concordium/web-sdk",
-    "version": "7.5.0",
+    "version": "7.5.1",
     "license": "Apache-2.0",
     "engines": {
         "node": ">=16"