Merge branch 'main' into fix-typos

.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ on:
   workflow_dispatch: # allow manual trigger
 
 env:
-  RUST: 1.68
+  RUST: 1.73
   GHC: 9.6.4
 
 jobs:
@@ -96,6 +96,6 @@ jobs:
           key: ${{ runner.os }}-rust-stack-deps-${{ env.RUST }}-${{ hashFiles('stack.yaml', 'package.yaml', 'deps/concordium-base/haskell-src/**.hs', 'deps/concordium-base/rust-src/Cargo.toml', 'deps/concordium-base/rust-src/**.rs') }}
 
       - name: Stack build # build all the binaries and tests, but don't run the tests
-        run: stack build --test --no-run-tests
+        run: stack build --test --no-run-tests --ghc-options "-Werror"
       - name: Stack test # run the tests
         run: stack build --test

ChangeLog.md

@@ -3,8 +3,30 @@
 ## Unreleased
 
 - Fix a bug in correctly accounting for parsed events.
-- Update GHC version to 9.6.4 (lts-22.9).
-- Support protocol version 7.
+
+## 7.0.0
+
+- Support node version 7 and protocol version 7.
+  - Display account balance "at disposal". (Note, this will (incorrectly) show as 0 if connecting to
+    an older version of the node.)
+  - List the cooldowns on an account, and their expiration times.
+- Improved checks when configuring a validator or delegator.
+- Fix the display of the expected expiry of pending changes to an account's stake, so that they
+  correctly account for the change taking place at a payday.
+
+## 6.3.0
+
+- Remove command `raw SendTransaction`.
+- Remove command `transaction send-shielded` to disable the transfer of CCD from the shielded
+  balance of the account to the shielded balance of another account.
+- Remove command `account shield` to disable the transfer of CCD from the public balance to the
+  shielded balance of an account.
+- Add command `transaction add-signature` to add a signature to a partially-signed transaction.
+- Revise command `transaction submit` to submit already-signed transactions to the chain.
+  (This is a breaking change, as transactions must now already be signed, e.g. with
+  `transaction add-signature`.)
+- Add optional `--out` flag to all transaction-creating commands to output a partially-singed
+  transaction to a file.
 
 ## 6.2.1
 
@@ -58,7 +80,7 @@
 - Add round and epoch to the output of `raw GetBlockInfo`.
 - Add round and epoch to the output of `block show` when they are present.
 - Print "Block time" instead of "Slot time" in the output of `block show`.
-- In the output of `consensus show-parameters`, only print election difficulty when present. 
+- In the output of `consensus show-parameters`, only print election difficulty when present.
 
 ## 5.2.0
 
@@ -121,10 +143,10 @@
 
 - Add support of contract schema V3.
 	  - V3 schemas offer the same options as V2, but also optionally includes a schema for contract events.
-	  - `transaction status` now displays contract events, and a schema can be provided with `--schema`, which 
+	  - `transaction status` now displays contract events, and a schema can be provided with `--schema`, which
 	    will be used to parse the contract events. By default events are parsed with the schema embedded in the
       contract, if present.
-	  - This enables concordium-client to interact with contracts and schemas 
+	  - This enables concordium-client to interact with contracts and schemas
 	    using `concordium-std` version 5.
 - Improved formatting of `transaction status` output using contract schemas if
   they are available for displaying contract events.

README.md

@@ -50,14 +50,14 @@ To build the tool from source, you need the following prerequisites:
     - Unix: `curl -sSL https://get.haskellstack.org/ | sh`
     - Windows: [Follow the Stack install guide](https://docs.haskellstack.org/en/stable/install_and_upgrade/).
 
-- Install Rust version 1.68+:
+- Install Rust version 1.73+:
   - Unix: `curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh`
   - Windows: [Follow the Rust install
      guide](https://www.rust-lang.org/tools/install)
     - Use the `x86_64-pc-windows-gnu` toolchain by choosing it during
        installation or by running `rustup toolchain default
        stable-x86_64-pc-windows-gnu`.
-  - *Recommended after installing: Set the default Rust version to 1.68 by running `rustup default 1.68`*.
+  - *Recommended after installing: Set the default Rust version to 1.73 by running `rustup default 1.73`*.
 
 - Install the [protoc](https://github.com/google/proto-lens/blob/master/docs/installing-protoc.md) tool for generating protobuf files:
   - MacOS: `brew install protobuf`

concordium-client.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.24
 -- see: https://github.com/sol/hpack
 
 name:           concordium-client
-version:        6.2.1
+version:        7.0.0
 description:    Please see the README on GitHub at <https://github.com/Concordium/concordium-client#readme>
 homepage:       https://github.com/Concordium/concordium-client#readme
 bug-reports:    https://github.com/Concordium/concordium-client/issues

package.yaml

@@ -1,5 +1,5 @@
 name:                concordium-client
-version:             6.2.1
+version:             7.0.0
 github:              "Concordium/concordium-client"
 author:              "Concordium"
 maintainer:          "[email protected]"
@@ -122,7 +122,7 @@ executables:
       - -Wredundant-constraints
       - -O
     when:
-      - condition: ! os(windows) 
+      - condition: ! os(windows)
         # the tool deadlocks on windows when -threaded is used
         ghc-options: -threaded
       - condition: flag(static)

scripts/distributables/linux-build-and-push-distributable-concordium-client.sh

@@ -3,7 +3,7 @@
 docker build -t concordium/linux-distributable-concordium-client \
        -f scripts/distributables/linux-distributable-concordium-client.Dockerfile \
        --build-arg GHC_VERSION=$GHC_VERSION \
-       --ssh default .
+       .
 
 mkdir out
 

scripts/distributables/linux-concordium-client.Jenkinsfile

@@ -13,15 +13,6 @@ pipeline {
         OUTFILE = "s3://distribution.concordium.software/tools/linux/concordium-client_${VERSION}"
     }
     stages {
-        stage('ecr-login') {
-            steps {
-                sh 'aws ecr get-login-password \
-                        --region eu-west-1 \
-                    | docker login \
-                        --username AWS \
-                        --password-stdin 192549843005.dkr.ecr.eu-west-1.amazonaws.com'
-            }
-        }
         stage('precheck') {
             steps {
                 sh '''\

scripts/distributables/linux-distributable-concordium-client.Dockerfile

@@ -10,7 +10,7 @@ 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.68
+ARG RUST_VERSION=1.73
 RUN wget -qO - https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain ${RUST_VERSION} -y
 
 ARG GHC_VERSION=9.6.4

scripts/distributables/macos-concordium-client.Jenkinsfile

@@ -2,7 +2,7 @@ pipeline {
     agent { label 'jenkins-worker' }
     environment {
         GHC_VERSION = '9.6.4'
-        RUST_VERSION = '1.68'
+        RUST_VERSION = '1.73'
         VERSION = sh(
             returnStdout: true,
             script: '''\

scripts/distributables/windows-concordium-client.Jenkinsfile

@@ -12,7 +12,7 @@ pipeline {
 
                     # Extract version number from package.yaml, if not set as parameter
                     [ -z "$VERSION" ] && VERSION=$(awk '/version: / { print $2; exit }' package.yaml)
-                    OUTFILE="${BASE_OUTFILE}_${VERSION}.exe"
+                    OUTFILE="${BASE_OUTFILE}_${VERSION}.zip"
 
                     # Fail if file already exists
                     totalFoundObjects=$(aws s3 ls ${OUTFILE} --summarize | grep "Total Objects: " | sed 's/[^0-9]*//g')
@@ -22,18 +22,19 @@ pipeline {
                     fi    
 
                     # Ensure correct rust env
-                    rustup default 1.68-x86_64-pc-windows-gnu
+                    rustup default 1.73-x86_64-pc-windows-gnu
 
                     # Build project
                     stack build --force-dirty
 
+                    # Zip the binaries
                     mkdir out
-
-                    # Find executable 
-                    cp $(find $PWD/.stack-work/install -type f -name "concordium-client.exe") out/
+                    binDir=$(stack path --local-install-root)/bin
+                    (cd $binDir && powershell -Command "Compress-Archive -Path concordium-client.exe,concordium_base.dll,sha_2.dll -DestinationPath concordium-client.zip")
+                    mv -f $binDir/concordium-client.zip out/concordium-client.zip
 
                     # Push to s3
-                    aws s3 cp out/concordium-client.exe ${OUTFILE} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
+                    aws s3 cp out/concordium-client.zip ${OUTFILE} --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers
                 '''.stripIndent()
             }
         }