Update to GHC 9.6.6

Concordium · Nov 12, 2024 · 7522a22 · 7522a22
1 parent 4e58082
commit 7522a22
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -33,8 +33,8 @@ on:
   workflow_dispatch: # allow manual trigger
 
 env:
-  RUST: 1.73
-  GHC: 9.6.4
+  RUST: 1.82
+  GHC: 9.6.6
 
 jobs:
   fourmolu:

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -6,6 +6,7 @@
 - Add command `consensus detailed-status` for getting detailed consensus status (from protocol
   version 6).
 - Add `raw GetConsensusDetailedStatus` that presents the detailed consensus status as JSON.
+- Update GHC version to 9.6.6 (lts-22.39).
 
 ## 7.0.1
 

diff --git a/deps/concordium-base b/deps/concordium-base
diff --git a/scripts/distributables/linux-concordium-client.Jenkinsfile b/scripts/distributables/linux-concordium-client.Jenkinsfile
@@ -1,7 +1,7 @@
 pipeline {
     agent any
     environment {
-        GHC_VERSION = '9.6.4'
+        GHC_VERSION = '9.6.6'
         VERSION = sh(
             returnStdout: true, 
             script: '''\

diff --git a/scripts/distributables/linux-distributable-concordium-client.Dockerfile b/scripts/distributables/linux-distributable-concordium-client.Dockerfile
@@ -10,10 +10,10 @@ COPY . /build
 
 RUN apk add perl g++ make protoc ncurses ncurses-dev zlib zlib-static zlib-dev git wget postgresql-dev gmp-dev gmp xz
 
-ARG RUST_VERSION=1.73
+ARG RUST_VERSION=1.82
 RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y
 
-ARG GHC_VERSION=9.6.4
+ARG GHC_VERSION=9.6.6
 RUN wget -q https://s3-eu-west-1.amazonaws.com/static-libraries.concordium.com/ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \
         tar -xf ghc-${GHC_VERSION}-x86_64-unknown-linux-integer-gmp.tar.xz && \
         cd ghc-${GHC_VERSION}-x86_64-unknown-linux && \

diff --git a/scripts/distributables/macos-concordium-client.Jenkinsfile b/scripts/distributables/macos-concordium-client.Jenkinsfile
@@ -1,8 +1,8 @@
 pipeline {
     agent { label 'jenkins-worker' }
     environment {
-        GHC_VERSION = '9.6.4'
-        RUST_VERSION = '1.73'
+        GHC_VERSION = '9.6.6'
+        RUST_VERSION = '1.82'
         VERSION = sh(
             returnStdout: true,
             script: '''\

diff --git a/scripts/distributables/windows-concordium-client.Jenkinsfile b/scripts/distributables/windows-concordium-client.Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
     stages {
         stage('build') {
             environment {
-                GHC_VERSION = '9.6.4'
+                GHC_VERSION = '9.6.6'
                 BASE_OUTFILE = 's3://distribution.concordium.software/tools/windows/concordium-client'
             }
             steps {
@@ -22,7 +22,7 @@ pipeline {
                     fi    
 
                     # Ensure correct rust env
-                    rustup default 1.73-x86_64-pc-windows-gnu
+                    rustup default 1.82-x86_64-pc-windows-gnu
 
                     # Build project
                     stack build --force-dirty

diff --git a/stack.linux-static.yaml b/stack.linux-static.yaml
@@ -1,4 +1,4 @@
-resolver: lts-22.9
+resolver: lts-22.39
 
 packages:
 - .
@@ -18,6 +18,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
 
 - ./deps/concordium-base
 

diff --git a/stack.yaml b/stack.yaml
@@ -17,7 +17,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.
@@ -54,6 +54,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
 
 - ./deps/concordium-base
+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
+842 −535		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
+0 −0		rust-src/.cargo/config.toml
+318 −285		rust-src/Cargo.lock
+0 −2		rust-src/concordium_base/src/aggregate_sig/ffi.rs
+3 −1		rust-src/concordium_base/src/bulletproofs/inner_product_proof.rs
+1 −1		rust-src/concordium_base/src/common/version.rs
+1 −1		rust-src/concordium_base/src/ecvrf/public.rs
+0 −1		rust-src/concordium_base/src/encrypted_transfers/ffi.rs
+129 −93		rust-src/concordium_base/src/encrypted_transfers/proofs/generate_proofs.rs
+5 −12		rust-src/concordium_base/src/id/account_holder.rs
+2 −2		rust-src/concordium_base/src/id/chain.rs
+18 −20		rust-src/concordium_base/src/id/ffi.rs
+4 −1		rust-src/concordium_base/src/id/id_proof_types.rs
+1 −0		rust-src/concordium_base/src/id/id_prover.rs
+2 −0		rust-src/concordium_base/src/id/id_verifier.rs
+3 −2		rust-src/concordium_base/src/id/identity_provider.rs
+1 −0		rust-src/concordium_base/src/id/test.rs
+7 −4		rust-src/concordium_base/src/id/types.rs
+4 −3		rust-src/concordium_base/src/id/utils.rs
+2 −2		rust-src/concordium_base/src/random_oracle/mod.rs
+1 −0		rust-src/concordium_base/src/sigma_protocols/com_enc_eq.rs
+1 −0		rust-src/concordium_base/src/sigma_protocols/com_eq.rs
+2 −0		rust-src/concordium_base/src/sigma_protocols/common.rs
+2 −0		scripts/identity-provider-service.Dockerfile
+0 −0		smart-contracts/rust-contracts/example-contracts/counter/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/erc20/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/escrow/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/fib/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/lockup/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/rate-limited/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/simple-game/.cargo/config.toml
+0 −0		smart-contracts/rust-contracts/example-contracts/use-all-host-functions/.cargo/config.toml
+350 −339		smart-contracts/wasm-chain-integration/Cargo.lock
+1 −1		smart-contracts/wasm-chain-integration/benches/trie_benches.rs
+1 −1		smart-contracts/wasm-chain-integration/benches/wasm.rs
+3 −3		smart-contracts/wasm-chain-integration/src/utils.rs
+14 −14		smart-contracts/wasm-chain-integration/src/v0/mod.rs
+3 −1		smart-contracts/wasm-chain-integration/src/v1/ffi.rs
+21 −21		smart-contracts/wasm-chain-integration/src/v1/mod.rs
+6 −6		smart-contracts/wasm-chain-integration/src/v1/tests.rs
+2 −2		smart-contracts/wasm-test/Cargo.lock
+2 −2		smart-contracts/wasm-test/src/main.rs
+2 −2		smart-contracts/wasm-transform/src/machine.rs
+4 −4		smart-contracts/wasm-transform/src/parse.rs
+1 −1		smart-contracts/wasm-transform/src/tests.rs
+5 −1		stack.yaml