Merge pull request #1433 from Concordium/plt-ghc-9.10.2

Update to LTS 24.0, GHC 9.10.2

Author: td202

.github/workflows/build-test.yaml

@@ -68,9 +68,9 @@ jobs:
     - name: Download fourmolu
       uses: supplypike/setup-bin@v1
       with:
-        uri: 'https://github.com/fourmolu/fourmolu/releases/download/v0.13.1.0/fourmolu-0.13.1.0-linux-x86_64'
+        uri: 'https://github.com/fourmolu/fourmolu/releases/download/v0.18.0.0/fourmolu-0.18.0.0-linux-x86_64'
         name: 'fourmolu'
-        version: '0.13.1.0'
+        version: '0.18.0.0'
 
     - name: Download hpack
       run: |
@@ -137,7 +137,7 @@ jobs:
       matrix:
         plan:
         - rust: 1.82
-          ghc: 9.6.6
+          ghc: 9.10.2
 
     steps:
     - name: Remove unnecessary files

.github/workflows/release.yaml

@@ -21,11 +21,11 @@ on:
 
 env:
   UBUNTU_VERSION: '20.04'
-  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.6.6-0'
+  STATIC_LIBRARIES_IMAGE_TAG: 'rust-1.82_ghc-9.10.2'
   RUST_VERSION: '1.82'
-  STACK_VERSION: '3.1.1'
+  STACK_VERSION: '3.7.1'
   FLATBUFFERS_VERSION: '23.5.26'
-  GHC_VERSION: '9.6.6'
+  GHC_VERSION: '9.10.2'
   PROTOC_VERSION: '28.3'
   STATIC_NODE_BINARY_IMAGE_NAME: 'static-node-binaries'
   ARTIFACT_FILE_NAME: 'image'

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Unreleased changes
 - Add P8 -> P9 update.
 
+- Update GHC version to 9.10.2 (lts-24.0).
+
 ## 9.0.6 (DevNet)
 
 - Protocol-level tokens:

README.md

@@ -74,7 +74,7 @@ dependencies must be pre-build, which is done automatically by the cabal setup
 script.
 
 Code should be formatted using [`fourmolu`](https://github.com/fourmolu/fourmolu)
-version `0.13.1.0` and using the config `fourmolu.yaml` found in the project root.
+version `0.18.0.0` and using the config `fourmolu.yaml` found in the project root.
 The CI is setup to ensure the code follows this style.
 
 To check the formatting locally run the following command from the project root:

concordium-base

@@ -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.6\mingw\bin\libwinpthread-1.dll` to `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.6.6\mingw\bin\pthread.dll`.
+Copy `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.10.2\mingw\bin\libwinpthread-1.dll` to `%LOCALAPPDATA%\Programs\stack\x86_64-windows\ghc-9.10.2\mingw\bin\pthread.dll`.
 
 # The library and dependencies
 

concordium-consensus/README.md

@@ -3,6 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeAbstractions #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 
@@ -238,7 +239,8 @@ runWithEBlockStateContext mvr (EBlockStateContextV1 vc1 drs) operation = do
         mvr
 
 -- | Handle that identifies a particular dry-run session.
-data DryRunHandle = forall finconf.
+data DryRunHandle
+    = forall finconf.
       DryRunHandle
     { -- | Wrap the multi-version runner from the consensus runner.
       drhMVR :: !(MultiVersionRunner finconf),
@@ -686,7 +688,9 @@ dryRunTransaction dryRunPtr senderPtr energyLimit payloadPtr payloadLen sigPairs
                                 key <- KeyIndex <$> peekByteOff sigPairs (2 * i + 1)
                                 addSigs (i + 1) $!
                                     m
-                                        & at' cred . nonEmpty . at' key
+                                        & at' cred
+                                            . nonEmpty
+                                            . at' key
                                             ?~ Sig.dummySignatureEd25519
                             | otherwise = return m
                     addSigs 0 Map.empty

concordium-consensus/src-lib/Concordium/External/DryRun.hs

@@ -106,7 +106,6 @@ module Concordium.Afgjort.CSS (
 
 import Control.Monad
 import Control.Monad.RWS.Strict
-import Data.List (foldl')
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
 import Data.Maybe

concordium-consensus/src/Concordium/Afgjort/CSS.hs

@@ -682,8 +682,8 @@ receiveFinalizationMessage msg@FinalizationMessage{msgHeader = FinalizationMessa
     FinalizationState{..} <- use finState
     -- Check this is the right session
     if _finsSessionId == msgSessionId
-        then -- Check the finalization index is not out of date
-        case compare msgFinalizationIndex _finsIndex of
+        -- Check the finalization index is not out of date
+        then case compare msgFinalizationIndex _finsIndex of
             LT -> tryAddQueuedWitness msg
             GT ->
                 -- Message is from the future; consider it invalid if it's not the index after the current one.

concordium-consensus/src/Concordium/Afgjort/Finalize.hs

@@ -11,7 +11,6 @@
 module Concordium.GlobalState.Account where
 
 import Data.Bits
-import Data.Foldable
 import qualified Data.Map.Strict as Map
 import Data.Maybe
 import qualified Data.Sequence as Seq