Update Rust and Haskell versions.

Concordium · Nov 11, 2024 · bf29b4c · bf29b4c
1 parent 24c605c
commit bf29b4c
Show file tree

Hide file tree

Showing 21 changed files with 1,206 additions and 655 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,12 +21,12 @@ on:
 
 env:
   UBUNTU_VERSION: '20.04'
-  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.73.0_ghc-9.6.4'
-  RUST_VERSION: '1.73'
-  STACK_VERSION: '2.13.1'
+  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.6.6-0'
+  RUST_VERSION: '1.82'
+  STACK_VERSION: '3.1.1'
   FLATBUFFERS_VERSION: '23.5.26'
-  GHC_VERSION: '9.6.4'
-  PROTOC_VERSION: '25.2'
+  GHC_VERSION: '9.6.6'
+  PROTOC_VERSION: '28.3'
   STATIC_NODE_BINARY_IMAGE_NAME: 'static-node-binaries'
   AWS_ROLE_TO_ASSUME: 'arn:aws:iam::192549843005:role/github_concordium-node'
   S3_ARN_TEMPLATES: '{

diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ issues.
 
 ## Rust workflow
 
-We use **stable version** of rust, 1.73, to compile the code.
+We use **stable version** of rust, 1.82, to compile the code.
 
 The CI is configured to check two things
 - the [clippy](https://github.com/rust-lang/rust-clippy) tool is run to check

diff --git a/concordium-base b/concordium-base
diff --git a/concordium-consensus/README.md b/concordium-consensus/README.md
@@ -29,7 +29,7 @@ rustup default stable-x86_64-pc-windows-gnu
 ```
 
 ### `user specified .o/.so/.DLL could not be loaded (addDLL: pthread or dependencies not loaded. (Win32 error 5)) whilst trying to load:  (dynamic) pthread`
-Copy `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.6.4\mingw\bin\libwinpthread-1.dll` to `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.6.4\mingw\bin\pthread.dll`.
+Copy `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.6.6\mingw\bin\libwinpthread-1.dll` to `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.6.6\mingw\bin\pthread.dll`.
 
 # The library and dependencies
 

diff --git a/concordium-consensus/stack.static.yaml b/concordium-consensus/stack.static.yaml
@@ -1,4 +1,4 @@
-resolver: lts-22.9
+resolver: lts-22.39
 
 packages:
 - .
@@ -9,6 +9,10 @@ extra-deps:
   - proto-lens-setup-0.4.0.7@sha256:acca0b04e033ea0a017f809d91a7dbc942e025ec6bc275fa21647352722c74cc,3122
   - proto-lens-protoc-0.8.0.0@sha256:a146ee8c9af9e445ab05651e688deb0ff849357d320657d6cea5be33cb54b960,2235
   - ghc-source-gen-0.4.4.0@sha256:8499f23c5989c295f3b002ad92784ca5fed5260fd4891dc816f17d30c5ba9cd9,4236
+  # Cabal-3.10.3.0 (from the lts-22.39 snapshot) breaks linking on Windows, but this should be
+  # fixed in newer versions.  This should be removed once we update to an lts that uses a new
+  # enough version of Cabal.
+  - Cabal-3.10.1.0
 
 extra-lib-dirs:
 - ../concordium-base/lib

diff --git a/concordium-consensus/stack.yaml b/concordium-consensus/stack.yaml
@@ -18,7 +18,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-22.9
+resolver: lts-22.39
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -45,6 +45,10 @@ extra-deps:
   - proto-lens-setup-0.4.0.7@sha256:acca0b04e033ea0a017f809d91a7dbc942e025ec6bc275fa21647352722c74cc,3122
   - proto-lens-protoc-0.8.0.0@sha256:a146ee8c9af9e445ab05651e688deb0ff849357d320657d6cea5be33cb54b960,2235
   - ghc-source-gen-0.4.4.0@sha256:8499f23c5989c295f3b002ad92784ca5fed5260fd4891dc816f17d30c5ba9cd9,4236
+  # Cabal-3.10.3.0 (from the lts-22.39 snapshot) breaks linking on Windows, but this should be
+  # fixed in newer versions.  This should be removed once we update to an lts that uses a new
+  # enough version of Cabal.
+  - Cabal-3.10.1.0
 
 
 extra-lib-dirs:
+1 −1		.github/workflows/build-test-contracts-common.yaml
+1 −1		.github/workflows/build-test-smart-contracts.yaml
+4 −4		.github/workflows/build-test-sources.yaml
+15 −0		.github/workflows/release-identity-provider-service.yaml
+3 −3		README.md
+592 −521		identity-provider-service/Cargo.lock
+1 −1		identity-provider-service/Cargo.toml
+1 −1		identity-provider-service/src/bin/identity_verifier.rs
+0 −1		identity-provider-service/src/bin/main.rs
+374 −354		idiss/Cargo.lock
+1 −1		idiss/README.md
+13 −29		idiss/src/cs_exports.rs
+407 −428		mobile_wallet/Cargo.lock
+3 −0		mobile_wallet/src/lib.rs
+546 −543		rust-bins/Cargo.lock
+1 −1		rust-bins/src/bin/anonymity_revocation.rs
+1 −1		rust-bins/src/bin/keygen-genesis.rs
+318 −285		rust-src/Cargo.lock
+2 −0		scripts/identity-provider-service.Dockerfile
+350 −339		smart-contracts/wasm-chain-integration/Cargo.lock
+1 −1		smart-contracts/wasm-chain-integration/src/v1/ffi.rs
+5 −1		stack.yaml