@blockrun/clawrouter 0.12.0 → 0.12.2

package/dist/index.d.ts

@@ -1124,12 +1124,16 @@ type SweepError = {
 /**
  * Sweep all USDC from old (legacy secp256k1) wallet to new (SLIP-10) wallet.
  *
+ * The NEW wallet pays gas fees (not the old one). Users can't access the old
+ * wallet from Phantom/Solflare, so they can't send SOL to it. Instead they
+ * fund the new (Phantom-compatible) wallet with a tiny bit of SOL for gas.
+ *
  * @param oldKeyBytes - 32-byte private key from legacy derivation
- * @param newAddress - Solana address of the new (correct) wallet
+ * @param newKeyBytes - 32-byte private key from SLIP-10 derivation (pays gas)
  * @param rpcUrl - Optional RPC URL override
  * @returns SweepResult on success, SweepError on failure
  */
-declare function sweepSolanaWallet(oldKeyBytes: Uint8Array, newAddress: string, rpcUrl?: string): Promise<SweepResult | SweepError>;
+declare function sweepSolanaWallet(oldKeyBytes: Uint8Array, newKeyBytes: Uint8Array, rpcUrl?: string): Promise<SweepResult | SweepError>;
 
 /**
  * Typed Error Classes for ClawRouter

package/dist/index.js

@@ -821,17 +821,20 @@ function buildTokenTransferInstruction(source, destination, authority, amount) {
     data
   };
 }
-async function sweepSolanaWallet(oldKeyBytes, newAddress, rpcUrl) {
+async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
   const url = rpcUrl || process["env"].CLAWROUTER_SOLANA_RPC_URL || SOLANA_DEFAULT_RPC2;
   const rpc = createSolanaRpc2(url);
-  const oldSigner = await createKeyPairSignerFromPrivateKeyBytes(oldKeyBytes);
+  const [oldSigner, newSigner] = await Promise.all([
+    createKeyPairSignerFromPrivateKeyBytes(oldKeyBytes),
+    createKeyPairSignerFromPrivateKeyBytes(newKeyBytes)
+  ]);
   const oldAddress = oldSigner.address;
+  const newAddress = newSigner.address;
   const mint = solAddress2(SOLANA_USDC_MINT2);
-  const newOwner = solAddress2(newAddress);
-  let solBalance;
+  let newSolBalance;
   try {
-    const solResp = await rpc.getBalance(solAddress2(oldAddress)).send();
-    solBalance = solResp.value;
+    const solResp = await rpc.getBalance(solAddress2(newAddress)).send();
+    newSolBalance = solResp.value;
   } catch (err) {
     return {
       error: `Failed to check SOL balance: ${err instanceof Error ? err.message : String(err)}`,
@@ -869,18 +872,18 @@ async function sweepSolanaWallet(oldKeyBytes, newAddress, rpcUrl) {
       error: "No USDC found in old wallet. Nothing to sweep.",
       oldAddress,
       newAddress,
-      solBalance,
+      solBalance: newSolBalance,
       usdcBalance: 0n
     };
   }
   const MIN_SOL_FOR_GAS = 5000000n;
-  if (solBalance < MIN_SOL_FOR_GAS) {
-    const needed = Number(MIN_SOL_FOR_GAS - solBalance) / 1e9;
+  if (newSolBalance < MIN_SOL_FOR_GAS) {
+    const needed = Number(MIN_SOL_FOR_GAS - newSolBalance) / 1e9;
     return {
-      error: `Insufficient SOL for transaction fees. Send ~${needed.toFixed(4)} SOL to ${oldAddress} to cover gas. Current SOL balance: ${(Number(solBalance) / 1e9).toFixed(6)} SOL`,
+      error: `Insufficient SOL for transaction fees in your new wallet. Send ~${needed.toFixed(4)} SOL to ${newAddress} (your new Phantom-compatible address) to cover gas. Current SOL balance: ${(Number(newSolBalance) / 1e9).toFixed(6)} SOL`,
       oldAddress,
       newAddress,
-      solBalance,
+      solBalance: newSolBalance,
       usdcBalance
     };
   }
@@ -892,23 +895,26 @@ async function sweepSolanaWallet(oldKeyBytes, newAddress, rpcUrl) {
     };
   }
   try {
-    const newAta = await getAssociatedTokenAddress(newOwner, mint);
+    const newAta = await getAssociatedTokenAddress(solAddress2(newAddress), mint);
     const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
     const createAtaIx = buildCreateAtaIdempotentInstruction(
-      oldSigner.address,
+      newSigner.address,
+      // new wallet pays for ATA creation
       newAta,
-      newOwner,
+      solAddress2(newAddress),
       mint
     );
     const transferIx = buildTokenTransferInstruction(
       solAddress2(oldTokenAccount),
       newAta,
       oldSigner.address,
+      // old wallet authorizes the token transfer
       usdcBalance
     );
     const txMessage = pipe(
       createTransactionMessage({ version: 0 }),
-      (msg) => setTransactionMessageFeePayer(oldSigner.address, msg),
+      (msg) => setTransactionMessageFeePayer(newSigner.address, msg),
+      // new wallet pays gas
       (msg) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, msg),
       (msg) => appendTransactionMessageInstructions([createAtaIx, transferIx], msg)
     );
@@ -931,7 +937,7 @@ async function sweepSolanaWallet(oldKeyBytes, newAddress, rpcUrl) {
       error: `Transaction failed: ${err instanceof Error ? err.message : String(err)}`,
       oldAddress,
       newAddress,
-      solBalance,
+      solBalance: newSolBalance,
       usdcBalance
     };
   }
@@ -942,7 +948,7 @@ var init_solana_sweep = __esm({
     "use strict";
     SOLANA_USDC_MINT2 = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
     SOLANA_DEFAULT_RPC2 = "https://api.mainnet-beta.solana.com";
-    TOKEN_PROGRAM = "TokenkegQfeN4jV6bme4LphiJbfPe2VopRsimuVSoZ5K";
+    TOKEN_PROGRAM = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
     ASSOCIATED_TOKEN_PROGRAM = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
     SYSTEM_PROGRAM = "11111111111111111111111111111111";
   }
@@ -4133,6 +4139,9 @@ async function logMigrationWarning(legacyKeyBytes, newKeyBytes) {
     console.log(`[ClawRouter]`);
     console.log(`[ClawRouter]   If you had funds in the old wallet, run:`);
     console.log(`[ClawRouter]     /wallet migrate-solana`);
+    console.log(`[ClawRouter]`);
+    console.log(`[ClawRouter]   The new wallet pays gas. Send ~0.005 SOL to:`);
+    console.log(`[ClawRouter]     ${newSigner.address}`);
     console.log(`[ClawRouter] \u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550`);
     console.log(`[ClawRouter]`);
   } catch {
@@ -8408,7 +8417,7 @@ Run \`openclaw plugins install @blockrun/clawrouter\` to generate a wallet.`,
           } catch {
           }
           const { sweepSolanaWallet: sweepSolanaWallet2 } = await Promise.resolve().then(() => (init_solana_sweep(), solana_sweep_exports));
-          const result = await sweepSolanaWallet2(legacyKeyBytes, newSigner.address);
+          const result = await sweepSolanaWallet2(legacyKeyBytes, newKeyBytes);
           if ("error" in result) {
             return {
               text: [