@blockrun/clawrouter 0.12.2 → 0.12.4

package/dist/index.js

@@ -742,6 +742,7 @@ import {
   setTransactionMessageLifetimeUsingBlockhash,
   appendTransactionMessageInstructions,
   signTransactionMessageWithSigners,
+  addSignersToTransactionMessage,
   getSignatureFromTransaction,
   sendAndConfirmTransactionFactory,
   getProgramDerivedAddress,
@@ -843,7 +844,7 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
     };
   }
   let usdcBalance = 0n;
-  let oldTokenAccount;
+  const oldTokenAccounts = [];
   try {
     const response = await rpc.getTokenAccountsByOwner(
       solAddress2(oldAddress),
@@ -856,7 +857,7 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
         const amount = BigInt(parsed.parsed.info.tokenAmount.amount);
         if (amount > 0n) {
           usdcBalance += amount;
-          oldTokenAccount = account.pubkey;
+          oldTokenAccounts.push({ pubkey: account.pubkey, amount });
         }
       }
     }
@@ -887,13 +888,6 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
       usdcBalance
     };
   }
-  if (!oldTokenAccount) {
-    return {
-      error: "Could not find USDC token account in old wallet.",
-      oldAddress,
-      newAddress
-    };
-  }
   try {
     const newAta = await getAssociatedTokenAddress(solAddress2(newAddress), mint);
     const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
@@ -904,21 +898,27 @@ async function sweepSolanaWallet(oldKeyBytes, newKeyBytes, rpcUrl) {
       solAddress2(newAddress),
       mint
     );
-    const transferIx = buildTokenTransferInstruction(
-      solAddress2(oldTokenAccount),
-      newAta,
-      oldSigner.address,
-      // old wallet authorizes the token transfer
-      usdcBalance
+    const transferIxs = oldTokenAccounts.map(
+      (acct) => buildTokenTransferInstruction(
+        solAddress2(acct.pubkey),
+        newAta,
+        oldSigner.address,
+        // old wallet authorizes the token transfer
+        acct.amount
+      )
     );
     const txMessage = pipe(
       createTransactionMessage({ version: 0 }),
       (msg) => setTransactionMessageFeePayer(newSigner.address, msg),
       // new wallet pays gas
       (msg) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, msg),
-      (msg) => appendTransactionMessageInstructions([createAtaIx, transferIx], msg)
+      (msg) => appendTransactionMessageInstructions([createAtaIx, ...transferIxs], msg)
+    );
+    const txMessageWithSigners = addSignersToTransactionMessage(
+      [newSigner, oldSigner],
+      txMessage
     );
-    const signedTx = await signTransactionMessageWithSigners(txMessage);
+    const signedTx = await signTransactionMessageWithSigners(txMessageWithSigners);
     const txSignature = getSignatureFromTransaction(signedTx);
     const wsUrl = url.replace("https://", "wss://").replace("http://", "ws://");
     const rpcSubscriptions = createSolanaRpcSubscriptions(wsUrl);
@@ -3289,9 +3289,15 @@ import { openSync, readSync, closeSync, fstatSync } from "fs";
 async function readTextFile(filePath) {
   const fh = await open(filePath, "r");
   try {
-    const buf = Buffer.alloc((await fh.stat()).size);
-    await fh.read(buf, 0, buf.length, 0);
-    return buf.toString("utf-8");
+    const size = (await fh.stat()).size;
+    const buf = Buffer.alloc(size);
+    let offset = 0;
+    while (offset < size) {
+      const { bytesRead } = await fh.read(buf, offset, size - offset, offset);
+      if (bytesRead === 0) break;
+      offset += bytesRead;
+    }
+    return buf.subarray(0, offset).toString("utf-8");
   } finally {
     await fh.close();
   }
@@ -3299,9 +3305,15 @@ async function readTextFile(filePath) {
 function readTextFileSync(filePath) {
   const fd = openSync(filePath, "r");
   try {
-    const buf = Buffer.alloc(fstatSync(fd).size);
-    readSync(fd, buf);
-    return buf.toString("utf-8");
+    const size = fstatSync(fd).size;
+    const buf = Buffer.alloc(size);
+    let offset = 0;
+    while (offset < size) {
+      const bytesRead = readSync(fd, buf, offset, size - offset, offset);
+      if (bytesRead === 0) break;
+      offset += bytesRead;
+    }
+    return buf.subarray(0, offset).toString("utf-8");
   } finally {
     closeSync(fd);
   }
@@ -3328,18 +3340,23 @@ async function parseLogFile(filePath) {
   try {
     const content = await readTextFile(filePath);
     const lines = content.trim().split("\n").filter(Boolean);
-    return lines.map((line) => {
-      const entry = JSON.parse(line);
-      return {
-        timestamp: entry.timestamp || (/* @__PURE__ */ new Date()).toISOString(),
-        model: entry.model || "unknown",
-        tier: entry.tier || "UNKNOWN",
-        cost: entry.cost || 0,
-        baselineCost: entry.baselineCost || entry.cost || 0,
-        savings: entry.savings || 0,
-        latencyMs: entry.latencyMs || 0
-      };
-    });
+    const entries = [];
+    for (const line of lines) {
+      try {
+        const entry = JSON.parse(line);
+        entries.push({
+          timestamp: entry.timestamp || (/* @__PURE__ */ new Date()).toISOString(),
+          model: entry.model || "unknown",
+          tier: entry.tier || "UNKNOWN",
+          cost: entry.cost || 0,
+          baselineCost: entry.baselineCost || entry.cost || 0,
+          savings: entry.savings || 0,
+          latencyMs: entry.latencyMs || 0
+        });
+      } catch {
+      }
+    }
+    return entries;
   } catch {
     return [];
   }