Merge pull request #1137 from Concordium/update-rust-1.73

Support Rust 1.73 on Windows.

.github/workflows/build-test.yaml

@@ -125,7 +125,7 @@ jobs:
     strategy:
       matrix:
         plan:
-        - rust: 1.68
+        - rust: 1.73
           ghc: 9.6.4
 
     steps:

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Add support for new `invoke` calls from smart contracts in protocol version 7:
   - query the contract module reference for a given contract address
   - query the contract name for a given contract address
+- Update Rust version to 1.73.
 
 ## 6.3.0
 

README.md

@@ -103,7 +103,7 @@ issues.
 
 ## Rust workflow
 
-We use **stable version** of rust, 1.68, to compile the code.
+We use **stable version** of rust, 1.73, 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

concordium-consensus/Setup.hs

@@ -27,7 +27,10 @@ makeRust args flags = do
         Windows -> do
             notice verbosity "Copying concordium_smart_contract_engine library"
             rawSystemExit verbosity "cp" ["-u", smartContractRoot ++ "/wasm-chain-integration/target/release/concordium_smart_contract_engine.dll", smartContractRoot ++ "/lib/"]
-            rawSystemExit verbosity "cp" ["-u", smartContractRoot ++ "/wasm-chain-integration/target/release/libconcordium_smart_contract_engine.a", smartContractRoot ++ "/lib/"]
+            -- We remove the static library if it exists. Previously, it would have been copied
+            -- over, but now we want to just link with the dynamic library, so we ensure it is
+            -- removed.
+            rawSystemExit verbosity "rm" ["-f", smartContractRoot ++ "/lib/libconcordium_smart_contract_engine.a"]
         _ -> do
             rawSystemExit verbosity "ln" ["-s", "-f", "../wasm-chain-integration/target/release/libconcordium_smart_contract_engine.a", smartContractRoot ++ "/lib/"]
             case buildOS of
@@ -37,8 +40,25 @@ makeRust args flags = do
                     rawSystemExit verbosity "ln" ["-s", "-f", "../wasm-chain-integration/target/release/libconcordium_smart_contract_engine.so", smartContractRoot ++ "/lib/libconcordium_smart_contract_engine.so"]
     return emptyHookedBuildInfo
 
+-- | On Windows, copy the DLL files to the binary install directory. This is to ensure that they
+-- are accessible when running the binaries, tests and benchmarks.
+copyDlls :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+copyDlls _ flags pkgDescr lbi = case buildOS of
+    Windows -> do
+        let installDirs = absoluteComponentInstallDirs pkgDescr lbi (localUnitId lbi) copydest
+        let copyLib lib = do
+                rawSystemExit verbosity "cp" ["-u", smartContractRoot ++ "/lib/" ++ lib ++ ".dll", bindir installDirs]
+                notice verbosity $ "Copy " ++ lib ++ " to " ++ bindir installDirs
+        copyLib "concordium_smart_contract_engine"
+    _ -> return ()
+  where
+    distPref = fromFlag (copyDistPref flags)
+    verbosity = fromFlag (copyVerbosity flags)
+    copydest = fromFlag (copyDest flags)
+
 main =
     defaultMainWithHooks $
         simpleUserHooks
-            { preConf = makeRust
+            { preConf = makeRust,
+              postCopy = copyDlls
             }