Merge pull request open-wallet-standard#118 from open-wallet-standard/nj/sol

fix: Solana broadcast encoding, sign_transaction extraction, and compact-u16 parsing

Author: njdawn

bindings/node/__test__/index.spec.mjs

@@ -210,9 +210,14 @@ describe('@open-wallet-standard/core', () => {
   it('signs transactions on all chains', () => {
     createWallet('tx-signer', undefined, 12, vaultDir);
     const txHex = 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
+    // Solana extract_signable_bytes expects a valid wire format:
+    // [compact-u16 sig count][64-byte sig slots...][message...]
+    // Build a minimal tx with 1 sig slot (0x01) + 64 zero bytes + a message.
+    const solTxHex = '01' + '00'.repeat(64) + 'deadbeefdeadbeef';
 
     for (const chain of ['evm', 'solana', 'sui', 'bitcoin', 'cosmos', 'tron', 'ton', 'filecoin']) {
-      const result = signTransaction('tx-signer', chain, txHex, undefined, undefined, vaultDir);
+      const hex = chain === 'solana' ? solTxHex : txHex;
+      const result = signTransaction('tx-signer', chain, hex, undefined, undefined, vaultDir);
       assert.ok(result.signature.length > 0, `signature should be non-empty for ${chain}`);
     }
 

bindings/node/package-lock.json

@@ -1,19 +1,34 @@
 use crate::CliError;
+use ows_lib::types::AccountInfo;
+
+/// Returns the wallet account matching the target funding chain.
+fn find_account_for_chain<'a>(
+    accounts: &'a [AccountInfo],
+    chain: &str,
+) -> Result<&'a AccountInfo, CliError> {
+    let chain_prefix = match chain {
+        "solana" => "solana:",
+        _ => "eip155:",
+    };
+
+    accounts
+        .iter()
+        .find(|a| a.chain_id.starts_with(chain_prefix))
+        .ok_or_else(|| {
+            CliError::InvalidArgs(format!("wallet has no account for chain \"{chain}\""))
+        })
+}
 
 /// `ows fund buy --wallet <name> [--chain base] [--token USDC]`
 ///
 /// Creates a MoonPay deposit that generates multi-chain deposit addresses.
 /// Anyone can send crypto from any chain — it auto-converts to the target token.
 pub fn run(wallet_name: &str, chain: Option<&str>, token: Option<&str>) -> Result<(), CliError> {
     let wallet = ows_lib::get_wallet(wallet_name, None)?;
-    let evm_account = wallet
-        .accounts
-        .iter()
-        .find(|a| a.chain_id.starts_with("eip155:"))
-        .ok_or_else(|| CliError::InvalidArgs("wallet has no EVM account".into()))?;
-
-    let address = &evm_account.address;
     let chain_name = chain.unwrap_or("base");
+
+    let account = find_account_for_chain(&wallet.accounts, chain_name)?;
+    let address = &account.address;
     let token_name = token.unwrap_or("USDC");
 
     eprintln!("Creating deposit for wallet \"{wallet_name}\" ({address})");
@@ -69,15 +84,11 @@ pub fn run(wallet_name: &str, chain: Option<&str>, token: Option<&str>) -> Resul
 /// Check token balances via MoonPay.
 pub fn balance(wallet_name: &str, chain: Option<&str>) -> Result<(), CliError> {
     let wallet = ows_lib::get_wallet(wallet_name, None)?;
-    let evm_account = wallet
-        .accounts
-        .iter()
-        .find(|a| a.chain_id.starts_with("eip155:"))
-        .ok_or_else(|| CliError::InvalidArgs("wallet has no EVM account".into()))?;
-
-    let address = &evm_account.address;
     let chain_name = chain.unwrap_or("base");
 
+    let account = find_account_for_chain(&wallet.accounts, chain_name)?;
+    let address = &account.address;
+
     let rt =
         tokio::runtime::Runtime::new().map_err(|e| CliError::InvalidArgs(format!("tokio: {e}")))?;
 

ows/Cargo.lock

@@ -35,7 +35,8 @@ pub fn run(
         .map_err(|e| CliError::InvalidArgs(format!("invalid hex transaction: {e}")))?;
 
     let signer = signer_for_chain(chain.chain_type);
-    let output = signer.sign_transaction(key.expose(), &tx_bytes)?;
+    let signable = signer.extract_signable_bytes(&tx_bytes)?;
+    let output = signer.sign_transaction(key.expose(), signable)?;
 
     print_result(
         &hex::encode(&output.signature),

ows/crates/ows-cli/src/commands/fund.rs

@@ -174,7 +174,10 @@ pub fn list() -> Result<(), CliError> {
         println!("Name:    {}", w.name);
         println!("Secured: ✓ (encrypted)");
         for acct in &w.accounts {
-            println!("  {} → {}", acct.chain_id, acct.address);
+            let label = ows_core::parse_chain(&acct.chain_id)
+                .map(|c| format!(" ({})", c.name))
+                .unwrap_or_default();
+            println!("  {}{} → {}", acct.chain_id, label, acct.address);
         }
         println!("Created: {}", w.created_at);
         println!();

ows/crates/ows-cli/src/commands/sign_transaction.rs

@@ -34,4 +34,5 @@ tempfile = "3"
 sha3 = "0.10"
 k256 = { version = "0.13", features = ["ecdsa"] }
 ed25519-dalek = "2"
+bs58 = "0.5"
 ows-signer = { path = "../ows-signer", version = "=1.0.0", features = ["fast-kdf"] }

ows/crates/ows-cli/src/commands/wallet.rs

@@ -136,9 +136,10 @@ pub fn sign_with_api_key(
     // 6. Decrypt mnemonic from key file using HKDF(token)
     let key = decrypt_key_from_api_key(&key_file, &wallet.id, token, chain.chain_type, index)?;
 
-    // 7. Sign
+    // 7. Sign (extract signable portion first — e.g. strips Solana sig-slot headers)
     let signer = signer_for_chain(chain.chain_type);
-    let output = signer.sign_transaction(key.expose(), tx_bytes)?;
+    let signable = signer.extract_signable_bytes(tx_bytes)?;
+    let output = signer.sign_transaction(key.expose(), signable)?;
 
     Ok(crate::types::SignResult {
         signature: hex::encode(&output.signature),