Merge pull request #56 from Concordium/fix-windows-build

Update Rust SDK and fix Windows build issue.

Author: td202

deps/concordium-rust-sdk

@@ -2,6 +2,8 @@
 
 ## Unreleased changes
 
+- Fix an error caused by the Rust SDK incorrectly handling protocol versions, causing blocks on P6 to fail processing.
+
 ## [0.15.0] - 2025-09-19
 
 Database schema version: 2

wallet-proxy-indexer/CHANGELOG.md

@@ -252,7 +252,7 @@ pub async fn set_shutdown(shutdown_sender: tokio::sync::watch::Sender<()>) -> an
         let ctrl_break = Box::pin(ctrl_break_stream.recv());
         let ctrl_c = Box::pin(ctrl_c_stream.recv());
 
-        futures::future::select(ctrl_break, ctrl_c).await;
+        futures_util::future::select(ctrl_break, ctrl_c).await;
     }
 
     shutdown_sender.send(())?;

wallet-proxy-indexer/src/lib.rs

@@ -9,7 +9,7 @@ use concordium_rust_sdk::{
         AccountTransactionEffects, BlockItemSummary, BlockItemSummaryDetails, ContractAddress,
         SpecialTransactionOutcome,
     },
-    v2::{self, BlockIdentifier, FinalizedBlockInfo, Upward},
+    v2::{self, upward::UnknownDataError, BlockIdentifier, FinalizedBlockInfo, Upward},
 };
 use futures_util::{StreamExt, TryStreamExt};
 use std::{
@@ -718,16 +718,23 @@ async fn parse_key_updates(
         .buffer_unordered(MAX_NODE_REQUESTS)
         .try_collect()
         .await?;
-    let bindings = account_info_to_bindings(account_infos);
+    let bindings = account_info_to_bindings(account_infos).map_err(|e| {
+        tonic::Status::invalid_argument(format!(
+            "Error parsing account info to get public key bindings: {}",
+            e
+        ))
+    })?;
     Ok(bindings)
 }
 
-fn account_info_to_bindings(infos: Vec<AccountInfo>) -> AccountPublicKeyBindings {
+fn account_info_to_bindings(
+    infos: Vec<AccountInfo>,
+) -> Result<AccountPublicKeyBindings, UnknownDataError> {
     let mut res = AccountPublicKeyBindings::new();
     for info in infos {
         let address = info.account_address;
 
-        let access_structure: AccountAccessStructure = (&info).into();
+        let access_structure: AccountAccessStructure = Upward::from(&info).known_or_err()?;
         let account_keys_num = access_structure.num_keys();
         let mut bindings = Vec::with_capacity(account_keys_num as usize);
         let is_simple_account = account_keys_num == 1;
@@ -747,7 +754,7 @@ fn account_info_to_bindings(infos: Vec<AccountInfo>) -> AccountPublicKeyBindings
         }
         res.entry(address).or_insert(bindings);
     }
-    res
+    Ok(res)
 }
 
 /// Holds a set of canonical account addresses already discovered while

wallet-proxy-indexer/src/main.rs

@@ -81,7 +81,8 @@ pub async fn run(tx: &mut Transaction<'_>, endpoints: &[v2::Endpoint]) -> anyhow
     // For all our account info's we need to find the credentials and keys in the access structure and build them into a pending row to be inserted. Once we have reached the batch size for pending rows, they will get inserted together
     for account_info in account_infos.into_iter() {
         let address: Vec<u8> = account_info.account_address.0.clone().to_vec();
-        let access_structure: AccountAccessStructure = (&account_info).into();
+        let access_structure: AccountAccessStructure = v2::Upward::from(&account_info)
+            .known_or(anyhow::anyhow!("Unknown account access structure"))?;
         let is_simple_account = access_structure.num_keys() == 1;
 
         for (cred_index, credential_keys) in access_structure.keys {