@bounded-sh/server 0.0.66 → 0.0.68

package/dist/index.js

@@ -53,6 +53,20 @@ async function getIdToken() {
     throw new Error('getIdToken is not available as a tarobase-server top-level auth operation. Use createWalletClient({ keypair }) and call the returned client methods.');
 }
 
+/**
+ * DS3-0414: does the transaction already carry a REAL signer signature? A Solana
+ * signature is computed over the compiled message, which INCLUDES recentBlockhash, so
+ * the blockhash must not be rewritten once any signer (sponsor / multisig / co-signer)
+ * has signed - a rewrite silently invalidates their signature. Legacy signatures are
+ * `{ signature: Buffer | null }` entries; versioned signatures are 64-byte arrays that
+ * stay all-zero placeholders until a signer fills them. Mirrors turnkey-signer-bridge.ts.
+ */
+function transactionHasSignature(transaction) {
+    if ('serializeMessage' in transaction) {
+        return transaction.signatures.some((s) => s.signature != null);
+    }
+    return transaction.signatures.some((sig) => sig.some((b) => b !== 0));
+}
 class SolanaKeypairProvider {
     constructor(rpcUrl, serverKeypair) {
         this.rpcUrl = rpcUrl;
@@ -109,25 +123,34 @@ class SolanaKeypairProvider {
         // 1. Get RPC URL and create connection
         const rpcUrl = this.getRpcUrl();
         const connection = new web3_js.Connection(rpcUrl, 'confirmed');
-        // 2. Get fresh blockhash and set it on the transaction before signing
-        const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
-        // Use duck typing instead of instanceof to handle multiple @solana/web3.js versions
-        const isLegacyTransaction = 'recentBlockhash' in transaction && !('message' in transaction && 'staticAccountKeys' in transaction.message);
-        if (isLegacyTransaction) {
-            const legacyTx = transaction;
-            legacyTx.recentBlockhash = blockhash;
-            legacyTx.lastValidBlockHeight = lastValidBlockHeight;
-            // Set feePayer if not already set
-            if (!legacyTx.feePayer) {
-                legacyTx.feePayer = feePayer !== null && feePayer !== void 0 ? feePayer : this.keypair.publicKey;
+        // 2. Get fresh blockhash and set it on the transaction before signing.
+        // DS3-0414: a Solana signature covers the compiled message (recentBlockhash included),
+        // so refreshing the blockhash after a sponsor / co-signer has already signed silently
+        // invalidates their signature - and this is the sponsored/fee-payer submit path, where a
+        // co-signed transaction is exactly what arrives. signTransaction only ADDS this keypair's
+        // signature (partialSign), it never re-signs the others. So only refresh the blockhash
+        // while the transaction is still unsigned; once a real signature is present, sign and
+        // submit the caller's message verbatim.
+        if (!transactionHasSignature(transaction)) {
+            const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash('confirmed');
+            // Use duck typing instead of instanceof to handle multiple @solana/web3.js versions
+            const isLegacyTransaction = 'recentBlockhash' in transaction && !('message' in transaction && 'staticAccountKeys' in transaction.message);
+            if (isLegacyTransaction) {
+                const legacyTx = transaction;
+                legacyTx.recentBlockhash = blockhash;
+                legacyTx.lastValidBlockHeight = lastValidBlockHeight;
+                // Set feePayer if not already set
+                if (!legacyTx.feePayer) {
+                    legacyTx.feePayer = feePayer !== null && feePayer !== void 0 ? feePayer : this.keypair.publicKey;
+                }
+            }
+            else {
+                // VersionedTransaction
+                const versionedTx = transaction;
+                versionedTx.message.recentBlockhash = blockhash;
+                // Note: VersionedTransaction feePayer is set in the message at creation time
+                // and cannot be modified after creation
             }
-        }
-        else {
-            // VersionedTransaction
-            const versionedTx = transaction;
-            versionedTx.message.recentBlockhash = blockhash;
-            // Note: VersionedTransaction feePayer is set in the message at creation time
-            // and cannot be modified after creation
         }
         // 3. Sign the transaction
         const signedTx = await this.signTransaction(transaction);
@@ -333,6 +356,8 @@ class EvmKeypairProvider {
         this.defaultChainId = defaultChainId;
     }
     user() {
+        // @user.address (the Solana wallet) is null for an EVM keypair login: this
+        // principal has only an EVM address. User.address is typed `string | null`.
         return { id: this.address, address: null, evmAddress: this.address, provider: this };
     }
     async createBoundedSession(sessionConfig) {