feat: multi domain passkeys (#124)

Author: jackpooleyml

.github/workflows/ci-swift.yml

@@ -3,6 +3,7 @@ name: Swift CI
 on:
   push:
     paths:
+      - 'packages/contracts/**'
       - 'packages/sdk-platforms/**'
 
 jobs:
@@ -17,12 +18,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - name: Checkout specific contracts submodule version
-        run: |
-          cd packages/contracts
-          git fetch origin debug-logs:refs/remotes/origin/debug-logs
-          git checkout origin/debug-logs  # Rust/Swift SDK depends on an old version of contracts
-          cd ../..
 
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.4
@@ -78,12 +73,12 @@ jobs:
         run: cargo run --bin cli -- deploy-contracts
         working-directory: packages/sdk-platforms/rust/zksync-sso
 
-      - name: Select Xcode 16.1
-        run: sudo xcode-select -s /Applications/Xcode_16.1.app
+      - name: Select Xcode 16.3
+        run: sudo xcode-select -s /Applications/Xcode_16.3.app
 
       - name: Select Simulator
         run: |
-          UDID=$(xcrun simctl list devices | awk '/-- iOS 18.1 --/{flag=1; next} /--/{flag=0} flag' | grep "iPhone 16 Pro" | awk -F '[()]' '{print $2}' | head -1)
+          UDID=$(xcrun simctl list devices | awk '/-- iOS 18.4 --/{flag=1; next} /--/{flag=0} flag' | grep "iPhone 16 Pro" | awk -F '[()]' '{print $2}' | head -1)
           if [ -z "$UDID" ]; then
             echo "Simulator not found!" >&2
             exit 1

packages/sdk-platforms/rust/zksync-sso/Cargo.toml

@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.package]
 version = "0.1.0"
 edition = "2024"
-rust-version = "1.85"
+rust-version = "1.86"
 license = "Apache-2.0"
 
 [workspace.dependencies]

packages/sdk-platforms/rust/zksync-sso/crates/cli/src/deploy_contracts.rs

@@ -1,5 +1,8 @@
 use eyre::Result;
-use sdk::{api::utils::deploy_contracts, config::Config};
+use sdk::{
+    api::utils::deploy_contracts,
+    config::{Config, deploy_wallet::DeployWallet},
+};
 use std::{fs, path::PathBuf};
 use url::Url;
 
@@ -15,12 +18,15 @@ pub async fn deploy_contracts_and_update_swift_config(
     println!("  WebAuthValidator: {}", contracts.passkey);
     println!("  SessionKeyValidator: {}", contracts.session);
     println!("  ExampleAuthServerPaymaster: {}", contracts.account_paymaster);
+    println!("  Recovery: {}", contracts.recovery);
 
     let config_path =
         config_path.unwrap_or_else(Config::get_default_swift_config_path);
     println!("\nWriting config to path: {:?}", config_path);
 
-    let config = Config::new(contracts, node_url);
+    let deploy_wallet = DeployWallet::random();
+
+    let config = Config::new(contracts, node_url, deploy_wallet);
     config.write_json(&config_path)?;
 
     println!("\nVerifying written config:");
@@ -37,6 +43,7 @@ pub async fn deploy_contracts_and_update_swift_config(
         "  ExampleAuthServerPaymaster: {}",
         written_config.contracts.account_paymaster
     );
+    println!("  Recovery: {}", written_config.contracts.recovery);
 
     println!("\nSuccessfully updated and verified Swift config values");
     Ok(())

packages/sdk-platforms/rust/zksync-sso/crates/ffi/build-swift-framework-ios-ci.sh

@@ -120,4 +120,5 @@ cat <<EOT >> "$WRAPPER_PATH/$FRAMEWORK_LIBRARY_NAME.swift"
 
 extension Config: Codable {}
 extension PasskeyContracts: Codable {}
+extension DeployWallet: Codable {}
 EOT

packages/sdk-platforms/rust/zksync-sso/crates/ffi/src/account/deployment.rs

@@ -67,13 +67,11 @@ pub async fn deploy_account(
 pub async fn deploy_account_with_unique_id(
     passkey_parameters: PasskeyParameters,
     unique_account_id: String,
-    secret_account_salt: String,
     config: config::Config,
 ) -> Result<super::Account, DeployAccountError> {
     sdk::api::account::deployment::deploy_account_with_unique_id(
         passkey_parameters.into(),
         unique_account_id,
-        secret_account_salt,
         &(config.try_into()
             as Result<sdk::config::Config, config::ConfigError>)
             .map_err(|e: config::ConfigError| {

packages/sdk-platforms/rust/zksync-sso/crates/ffi/src/account/fetch.rs

@@ -47,12 +47,10 @@ pub async fn fetch_account(
 #[uniffi::export(async_runtime = "tokio")]
 pub async fn get_account_by_user_id(
     unique_account_id: String,
-    secret_account_salt: String,
     config: config::Config,
 ) -> Result<super::Account, FetchAccountError> {
     sdk::api::account::fetch::get_account_by_user_id(
         unique_account_id,
-        secret_account_salt,
         &(config.try_into()
             as Result<sdk::config::Config, config::ConfigError>)
             .map_err(|e: config::ConfigError| {

packages/sdk-platforms/rust/zksync-sso/crates/ffi/src/account/send.rs

@@ -58,7 +58,7 @@ impl From<sdk::api::account::send::SendTransactionResult>
 }
 
 type SignFn = Box<
-    dyn Fn(&[u8]) -> BoxFuture<'static, Result<Vec<u8>, ()>>
+    dyn Fn(&[u8]) -> BoxFuture<'static, Result<Vec<u8>, String>>
         + Send
         + Sync
         + 'static,
@@ -70,17 +70,27 @@ pub async fn send_transaction(
     authenticator: Arc<dyn PasskeyAuthenticator + 'static>,
     config: config::Config,
 ) -> Result<SendTransactionResult, SendTransactionError> {
+    println!("XDB send_transaction - transaction: {:?}", transaction);
     let tx: sdk::api::account::transaction::Transaction =
         transaction.try_into()?;
 
+    println!("XDB send_transaction - tx: {:?}", tx);
+
     let authenticator = authenticator.clone();
     let sign_message: SignFn = Box::new(
-        move |message: &[u8]| -> BoxFuture<'static, Result<Vec<u8>, ()>> {
+        move |message: &[u8]| -> BoxFuture<'static, Result<Vec<u8>, String>> {
             let message_owned = message.to_vec();
             let auth = authenticator.clone();
-            Box::pin(
-                async move { auth.sign_message(message_owned).map_err(|_| ()) },
-            )
+            println!(
+                "XDB send_transaction - sign_message - message_owned: {:?}",
+                message_owned
+            );
+            Box::pin(async move {
+                println!(
+                    "XDB send_transaction - sign_message - sign_message closure"
+                );
+                auth.sign_message(message_owned).map_err(|e| e.to_string())
+            })
         },
     );
 
@@ -104,16 +114,24 @@ pub async fn send_transaction_async_signer(
     authenticator: Arc<dyn PasskeyAuthenticatorAsync + 'static>,
     config: config::Config,
 ) -> Result<SendTransactionResult, SendTransactionError> {
+    println!(
+        "XDB send_transaction_async_signer - transaction: {:?}",
+        transaction
+    );
     let tx: sdk::api::account::transaction::Transaction =
         transaction.try_into()?;
 
+    println!("XDB send_transaction_async_signer - tx: {:?}", tx);
+
     let authenticator = authenticator.clone();
     let sign_message: SignFn = Box::new(
-        move |message: &[u8]| -> BoxFuture<'static, Result<Vec<u8>, ()>> {
+        move |message: &[u8]| -> BoxFuture<'static, Result<Vec<u8>, String>> {
             let message_owned = message.to_vec();
             let auth = authenticator.clone();
             Box::pin(async move {
-                auth.sign_message(message_owned).await.map_err(|_| ())
+                auth.sign_message(message_owned)
+                    .await
+                    .map_err(|e| e.to_string())
             })
         },
     );

packages/sdk-platforms/rust/zksync-sso/crates/ffi/src/config.rs

@@ -1,9 +1,13 @@
-use sdk::config::{self, Config as SdkConfig};
+use sdk::config::{
+    self, Config as SdkConfig, deploy_wallet::DeployWallet as SdkDeployWallet,
+};
 
 #[derive(Debug, thiserror::Error, uniffi::Error)]
 pub enum ConfigError {
     #[error("Invalid contract address: {0}")]
     InvalidContractAddress(String),
+    #[error("Invalid deploy wallet: {0}")]
+    InvalidDeployWallet(String),
     #[error("Invalid node URL: {0}")]
     InvalidNodeUrl(String),
     #[error("Failed to write config file: {0}")]
@@ -16,12 +20,19 @@ pub struct PasskeyContracts {
     pub passkey: String,
     pub session: String,
     pub account_paymaster: String,
+    pub recovery: String,
+}
+
+#[derive(Debug, uniffi::Record)]
+pub struct DeployWallet {
+    pub private_key_hex: String,
 }
 
 #[derive(Debug, uniffi::Record)]
 pub struct Config {
     pub contracts: PasskeyContracts,
     pub node_url: String,
+    pub deploy_wallet: DeployWallet,
 }
 
 impl TryFrom<Config> for SdkConfig {
@@ -34,9 +45,14 @@ impl TryFrom<Config> for SdkConfig {
                 &config.contracts.passkey,
                 &config.contracts.session,
                 &config.contracts.account_paymaster,
+                &config.contracts.recovery,
             )
             .map_err(|e| ConfigError::InvalidContractAddress(e.to_string()))?,
             &config.node_url,
+            SdkDeployWallet::try_from(
+                config.deploy_wallet.private_key_hex.clone(),
+            )
+            .map_err(|e| ConfigError::InvalidDeployWallet(e.to_string()))?,
         )
         .map_err(|e| ConfigError::InvalidNodeUrl(e.to_string()))
     }
@@ -56,8 +72,15 @@ impl From<SdkConfig> for Config {
                     .contracts
                     .account_paymaster
                     .to_string(),
+                recovery: sdk_config.contracts.recovery.to_string(),
             },
             node_url: sdk_config.node_url.to_string(),
+            deploy_wallet: DeployWallet {
+                private_key_hex: sdk_config
+                    .deploy_wallet
+                    .private_key_hex
+                    .to_string(),
+            },
         }
     }
 }

packages/sdk-platforms/rust/zksync-sso/crates/sdk/Cargo.toml

@@ -53,6 +53,7 @@ public-suffix = { git = "https://github.com/jackpooleyml/passkey-rs", branch = "
 # URL handling
 url = { workspace = true, features = ["serde"] }
 
+# CBOR
 serde_cbor = "0.11"
 ciborium = { version = "^0.2.1", default-features = false }
 ciborium-io = { version = "^0.2.0", features = ["alloc"] }

packages/sdk-platforms/rust/zksync-sso/crates/sdk/src/api/account/balance.rs

@@ -17,10 +17,12 @@ pub async fn get_balance(
     let provider = zksync_provider().on_http(config.node_url.clone());
 
     let balance_uint = provider.get_balance(address).await?;
+    println!("XDB get_balance - balance_uint: {:?}", balance_uint);
 
     let money = Money::eth(balance_uint);
 
     let formatter = MoneyFormatter::default().with_display_decimals(6);
+
     let balance = formatter.format(&money);
 
     let balance = GetAccountBalanceResult { balance };