tollkit-wallet 0.2.2 → 0.3.1

package/dist/solconfirm.js

@@ -0,0 +1,21 @@
+export async function sendAndConfirm(conn, tx, signers, o = {}) {
+    const { blockhash, lastValidBlockHeight } = await conn.getLatestBlockhash("confirmed");
+    tx.recentBlockhash = blockhash;
+    if (!tx.feePayer)
+        tx.feePayer = signers[0].publicKey;
+    tx.sign(...signers);
+    const sig = await conn.sendRawTransaction(tx.serialize(), { preflightCommitment: "confirmed", maxRetries: 3 });
+    const until = Date.now() + (o.maxMs ?? 90_000);
+    for (;;) {
+        const st = (await conn.getSignatureStatuses([sig])).value[0];
+        if (st?.err)
+            throw new Error(`Solana transaction ${sig} failed: ${JSON.stringify(st.err)}`);
+        if (st && (st.confirmationStatus === "confirmed" || st.confirmationStatus === "finalized"))
+            return sig;
+        if (Date.now() > until || (await conn.getBlockHeight("confirmed")) > lastValidBlockHeight) {
+            throw new Error(`Solana transaction ${sig} wasn't confirmed in time. Check it on an explorer before trying again.`);
+        }
+        await new Promise((r) => setTimeout(r, o.pollMs ?? 1500));
+    }
+}
+//# sourceMappingURL=solconfirm.js.map

package/dist/solconfirm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"solconfirm.js","sourceRoot":"","sources":["../src/solconfirm.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAgB,EAAE,EAAe,EAAE,OAAkB,EAAE,IAAyC,EAAE;IACrI,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;IACvF,EAAE,CAAC,eAAe,GAAG,SAAS,CAAC;IAC/B,IAAI,CAAC,EAAE,CAAC,QAAQ;QAAE,EAAE,CAAC,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAE,CAAC,SAAS,CAAC;IACtD,EAAE,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;IACpB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,EAAE,mBAAmB,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;IAC/G,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,CAAC;IAC/C,SAAS,CAAC;QACR,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7D,IAAI,EAAE,EAAE,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,YAAY,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5F,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,kBAAkB,KAAK,WAAW,IAAI,EAAE,CAAC,kBAAkB,KAAK,WAAW,CAAC;YAAE,OAAO,GAAG,CAAC;QACvG,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,GAAG,oBAAoB,EAAE,CAAC;YAC1F,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,yEAAyE,CAAC,CAAC;QACtH,CAAC;QACD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC;IAC5D,CAAC;AACH,CAAC"}

package/dist/stake.js

@@ -13,7 +13,8 @@
  * Staking moves no money out of the wallet's control, so it isn't counted against spending limits,
  * but it needs the password every time and agents can't reach it.
  */
-import { Authorized, Connection, Lockup, PublicKey, StakeProgram, Transaction, ValidatorInfo, sendAndConfirmTransaction } from "@solana/web3.js";
+import { Authorized, Connection, Lockup, PublicKey, StakeProgram, Transaction, ValidatorInfo } from "@solana/web3.js";
+import { sendAndConfirm } from "./solconfirm.js";
 export const CONFIG_PROGRAM = new PublicKey("Config1111111111111111111111111111111111111");
 const U64_MAX = "18446744073709551615";
 const LAMPORTS = 1_000_000_000;
@@ -152,7 +153,7 @@ export class Staking {
     send(tx, kp) {
         if (this.o.send)
             return this.o.send(tx, kp);
-        return sendAndConfirmTransaction(new Connection(this.o.rpc, "confirmed"), tx, [kp]);
+        return sendAndConfirm(new Connection(this.o.rpc, "confirmed"), tx, [kp]);
     }
 }
 //# sourceMappingURL=stake.js.map

package/dist/stake.js.map

@@ -1 +1 @@
-{"version":3,"file":"stake.js","sourceRoot":"","sources":["../src/stake.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,yBAAyB,EAAgB,MAAM,iBAAiB,CAAC;AAE/J,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC3F,MAAM,OAAO,GAAG,sBAAsB,CAAC;AACvC,MAAM,QAAQ,GAAG,aAAa,CAAC;AAkB/B,0HAA0H;AAC1H,MAAM,UAAU,WAAW,CAAC,UAAkC,EAAE,YAAoC,EAAE,KAAa;IACjH,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,UAAU,CAAC;IACvE,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/B,IAAI,MAAM,CAAC,YAAY,CAAC,KAAK,OAAO,IAAI,YAAY,KAAK,IAAI;QAAE,OAAO,GAAG,IAAI,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC7G,MAAM,EAAE,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAChC,IAAI,EAAE,KAAK,GAAG;QAAE,OAAO,UAAU,CAAC,CAAC,iDAAiD;IACpF,OAAO,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC;AACnD,CAAC;AAED,yFAAyF;AACzF,MAAM,YAAY,GAAG,IAAI,CAAC;AAM1B,MAAM,OAAO,OAAO;IAIE;IAHZ,IAAI,CAAO;IACX,KAAK,GAAoD,IAAI,CAAC;IAC9D,IAAI,GAA6C,IAAI,CAAC;IAC9D,YAAoB,CAAiB;QAAjB,MAAC,GAAD,CAAC,CAAgB;QACnC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QACzC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC,EAAE,CAAC;IAC9J,CAAC;IAED,yEAAyE;IACzE,KAAK,CAAC,QAAQ;QACZ,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3I,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC;IAC9D,CAAC;IAED,iFAAiF;IACjF,KAAK,CAAC,IAAI,CAAC,QAAiB;QAC1B,MAAM,KAAK,GAAG,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAe,CAAC;QACpC,KAAK,MAAM,MAAM,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;YAC9B,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACzK,KAAK,MAAM,CAAC,IAAI,CAAC;gBAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9G,MAAM,GAAG,GAAmB,EAAE,CAAC;QAC/B,KAAK,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;YACnC,MAAM,IAAI,GAAI,IAAI,CAAC,IAAY,EAAE,MAAM,EAAE,IAAI,CAAC;YAC9C,IAAI,CAAC,IAAI,EAAE,IAAI;gBAAE,SAAS;YAC1B,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC;gBACP,OAAO;gBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClC,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC;gBACjD,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU;gBACnF,KAAK,EAAE,CAAC,EAAE,KAAK,IAAI,IAAI;gBACvB,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI;gBACjD,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI;gBACtD,kBAAkB,EAAE,CAAC,IAAI,CAAC,CAAC,iBAAiB,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;aAC9F,CAAC,CAAC;QACL,CAAC;QACD,MAAM,KAAK,GAAkB,CAAC,YAAY,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAClF,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1G,CAAC;IAED,mFAAmF;IACnF,KAAK,CAAC,cAAc;QAClB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,QAAQ;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;QAC/E,MAAM,GAAG,GAAG,IAAI,GAAG,EAAkB,CAAC;QACtC,KAAK,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC;gBAAC,MAAM,CAAC,GAAG,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI;oBAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACpL,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uGAAuG;IACvG,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QAC5E,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAAkB,CAAC,CAAC,CAAC,CAAC;QACnI,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO;aACpB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;aACzJ,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC;QAC7C,IAAI,CAAC,IAAI,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,uFAAuF;IACvF,KAAK,CAAC,KAAK,CAAC,EAAW,EAAE,QAAgB,EAAE,IAAY;QACrD,MAAM,KAAK,GAAG,EAAE,CAAC,SAAS,CAAC;QAC3B,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACrC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC7H,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/D,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,cAAc,GAAG,QAAQ,OAAO,CAAC,CAAC;QAC7I,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/C,IAAI,QAAQ,GAAG,YAAY,GAAG,MAAM,GAAG,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,2BAA2B,QAAQ,GAAG,QAAQ,cAAc,CAAC,QAAQ,GAAG,YAAY,CAAC,GAAG,QAAQ,+CAA+C,IAAI,GAAG,QAAQ,GAAG,CAAC,CAAC;QAChO,MAAM,IAAI,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QACrF,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;QACpF,MAAM,EAAE,GAAG,IAAI,WAAW,EAAE;aACzB,GAAG,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,YAAY,EAAE,CAAC,CAAC;aAClN,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACrG,OAAO,EAAE,EAAE,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;IACtE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAW,EAAE,OAAe;QACxC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU,IAAI,CAAC,CAAC,MAAM,KAAK,cAAc;YAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QAC/G,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACzH,CAAC;IAED,gFAAgF;IAChF,KAAK,CAAC,QAAQ,CAAC,EAAW,EAAE,OAAe;QACzC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,IAAI,CAAC,CAAC,MAAM,KAAK,UAAU;YAAE,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,cAAc,CAAC,CAAC,CAAC,oEAAoE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QACvK,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,IAAI,SAAS,CAAC,OAAO,CAAC,EAAE,gBAAgB,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC7K,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtC,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,OAAe;QAChC,MAAM,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;QACjE,IAAI,CAAC,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QACnE,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,IAAI,CAAC,EAAe,EAAE,EAAW;QACvC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5C,OAAO,yBAAyB,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC;CACF"}
+{"version":3,"file":"stake.js","sourceRoot":"","sources":["../src/stake.ts"],"names":[],"mappings":"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"}

package/dist/swap.d.ts

@@ -4,11 +4,16 @@
  * quote proxy (api.tollkit.dev/wallet/...), which holds the 0x and Jupiter API
  * keys and adds the flat 0.5% fee; it only ever sees public data and signed
  * transactions, never keys. The wallet checks every quote before signing:
- * fee not above 0.5%, the only approval ever given is to 0x AllowanceHolder,
- * the transaction goes to AllowanceHolder, and the minimum output is set.
+ * fee not above 0.5%, the only approval ever given is to 0x AllowanceHolder
+ * (exact amount), and the minimum output is set. It doesn't trust the quote
+ * server with what it signs (0.2.3): verifySwapTx decodes 0x calldata (exact
+ * token, amount and ETH value; the Settler call must pay this wallet the buy
+ * token with the minimum shown; Settler must be listed by 0x's on-chain
+ * registry, github.com/0xProject/0x-settler README), and simulates Solana
+ * swaps, refusing any that take more than the coin being sold.
  */
-import { Connection, Keypair } from "@solana/web3.js";
-import { type Wallet, type HDNodeWallet } from "ethers";
+import { Connection, Keypair, PublicKey, VersionedTransaction } from "@solana/web3.js";
+import { JsonRpcProvider, type Wallet, type HDNodeWallet } from "ethers";
 import { type Chain } from "./chains.js";
 type Fetch = typeof fetch;
 export declare const DEFAULT_PROXY = "https://api.tollkit.dev/wallet";
@@ -31,21 +36,69 @@ export interface SwapQuote {
     venue_fee_bps: number;
     usd_value: number | null;
     fee_usd: number | null;
+    /** Solana only: Jupiter's route doesn't carry Tollkit's fee, so the wallet sends it on its own, in SOL, after the swap. */
+    fee_separate?: boolean;
+    /** Solana only: built from Jupiter's instructions with Tollkit's fee (in SOL) inside the same transaction. */
+    fee_inline?: boolean;
     raw: any;
 }
+/**
+ * Jupiter pays Tollkit's 0.5% out of the route only when Tollkit has a fee account for the token Jupiter picks to
+ * take the fee in (it prefers SOL, then stablecoins, then other tokens). For any other token the order comes back
+ * with Jupiter's own default fee instead (developers.jup.ag/docs/swap/fees: "the order still returns but executes
+ * without your fees"), and Tollkit's fee is sent separately.
+ */
+export declare function jupiterFeeInRoute(raw: any): boolean;
+/** The coin Tollkit's fee is taken in on Base and Ethereum: a stablecoin side first, then ETH or WETH, else the coin sold. */
+export declare function feeTokenFor(chain: Chain, sell: string, buy: string): string;
+/** Tollkit's 0.5% in lamports: straight from the SOL side when there is one, else the trade's dollar value at SOL's price. */
+export declare function solFeeLamports(q: Pick<SwapQuote, "sell_token" | "buy_token" | "sell_amount" | "buy_amount">, usd: number | null, solUsd: number | null): bigint;
 /** Dollar value of the sell side when either side is a stablecoin; else null (caller prices it). */
 export declare function stableValue(q: Pick<SwapQuote, "chain" | "sell_token" | "buy_token" | "sell_amount" | "buy_amount">): number | null;
 export declare function getQuote(req: SwapRequest, taker: string, opts?: {
     fetch?: Fetch;
     proxy?: string;
+    build?: boolean;
 }): Promise<SwapQuote>;
 /** Everything the wallet refuses to sign. Returns a reason, or null if the quote is safe. */
-export declare function vetQuote(q: SwapQuote, req: SwapRequest): string | null;
+export declare function vetQuote(q: SwapQuote, req: SwapRequest, taker?: string): string | null;
+/** 0x Settler registry, the same address on every chain; feature 2 = taker-submitted swaps. */
+export declare const SETTLER_REGISTRY = "0x00000000000004533Fe15556B1E086BB1A72cEae";
+/** Decode a 0x quote's transaction and check it does only the swap shown. Returns the Settler address it uses. */
+export declare function checkZeroExTx(q: SwapQuote, taker: string): string;
+/** Programs a Solana swap may call directly. JUP6…: Jupiter's router (Metis), as seen in live Ultra orders. */
+export declare const SWAP_PROGRAMS: Set<string>;
+export interface VerifyDeps {
+    /** A Solana transaction the wallet assembled itself (Jupiter's router path), and the SOL it adds for Tollkit's fee. */ vtx?: VersionedTransaction;
+    extraLamports?: bigint;
+    /** eth_call on the swap's chain; returns the hex result. */ evmCall?: (chain: Chain, to: string, data: string) => Promise<string>;
+    /** Solana connection (tests pass a fake). */ conn?: Pick<Connection, "getBalance" | "getParsedTokenAccountsByOwner" | "simulateTransaction"> & {
+        getAddressLookupTable?: Connection["getAddressLookupTable"];
+    };
+}
+/** Before signing: check the quote server's transaction does only the swap that was shown. Throws if not. */
+export declare function verifySwapTx(q: SwapQuote, me: {
+    evm: string;
+    solana: PublicKey;
+}, d?: VerifyDeps & ExecDeps): Promise<void>;
 export interface ExecDeps {
     rpc?: Partial<Record<Chain, string>>;
     fetch?: Fetch;
     proxy?: string;
+    verify?: VerifyDeps; /** tests: the EVM provider to send with */
+    provider?: JsonRpcProvider; /** tests: how often to check a Solana send */
+    pollMs?: number;
 }
+/**
+ * Jupiter's router instructions (Swap API v2 /build) plus Tollkit's fee as a plain SOL transfer, in one v0
+ * transaction: compute-unit limit from a simulation (x1.2, at most 1.4M), Jupiter's priority price, a fresh
+ * blockhash. Checked with the same rules as any swap, then sent and confirmed by polling.
+ */
+export declare function assembleBuilt(q: SwapQuote, payer: PublicKey, conn: Pick<Connection, "getLatestBlockhash" | "simulateTransaction">): Promise<{
+    tx: VersionedTransaction;
+    lastValidBlockHeight: number;
+    feeLamports: bigint;
+}>;
 /** Sign and send. Returns the transaction hash / signature. */
 export declare function executeSwap(q: SwapQuote, keys: {
     evm: Wallet | HDNodeWallet;

package/dist/swap.js

@@ -4,13 +4,53 @@
  * quote proxy (api.tollkit.dev/wallet/...), which holds the 0x and Jupiter API
  * keys and adds the flat 0.5% fee; it only ever sees public data and signed
  * transactions, never keys. The wallet checks every quote before signing:
- * fee not above 0.5%, the only approval ever given is to 0x AllowanceHolder,
- * the transaction goes to AllowanceHolder, and the minimum output is set.
+ * fee not above 0.5%, the only approval ever given is to 0x AllowanceHolder
+ * (exact amount), and the minimum output is set. It doesn't trust the quote
+ * server with what it signs (0.2.3): verifySwapTx decodes 0x calldata (exact
+ * token, amount and ETH value; the Settler call must pay this wallet the buy
+ * token with the minimum shown; Settler must be listed by 0x's on-chain
+ * registry, github.com/0xProject/0x-settler README), and simulates Solana
+ * swaps, refusing any that take more than the coin being sold.
  */
-import { Connection, VersionedTransaction } from "@solana/web3.js";
-import { Contract, JsonRpcProvider } from "ethers";
-import { ALLOWANCE_HOLDER, DEFAULT_RPC, EVM_CHAIN_ID, STABLES, SWAP_FEE_BPS, isStable } from "./chains.js";
+import { AddressLookupTableAccount, ComputeBudgetProgram, Connection, PublicKey, SystemProgram, TransactionInstruction, TransactionMessage, VersionedTransaction } from "@solana/web3.js";
+import { AbiCoder, Contract, Interface, JsonRpcProvider, ZeroAddress } from "ethers";
+import { KNOWN } from "./tokens.js";
+import { sendingProvider, waitMined } from "./evmsend.js";
+import { ALLOWANCE_HOLDER, DEFAULT_RPC, EVM_CHAIN_ID, NATIVE_EVM, STABLES, SWAP_FEE_BPS, WSOL, isStable } from "./chains.js";
 export const DEFAULT_PROXY = "https://api.tollkit.dev/wallet";
+/**
+ * Jupiter pays Tollkit's 0.5% out of the route only when Tollkit has a fee account for the token Jupiter picks to
+ * take the fee in (it prefers SOL, then stablecoins, then other tokens). For any other token the order comes back
+ * with Jupiter's own default fee instead (developers.jup.ag/docs/swap/fees: "the order still returns but executes
+ * without your fees"), and Tollkit's fee is sent separately.
+ */
+export function jupiterFeeInRoute(raw) {
+    return !!raw?.referralAccount && Number(raw?.platformFee?.feeBps ?? raw?.feeBps) === SWAP_FEE_BPS;
+}
+/** The coin Tollkit's fee is taken in on Base and Ethereum: a stablecoin side first, then ETH or WETH, else the coin sold. */
+export function feeTokenFor(chain, sell, buy) {
+    const eth = (t) => t.toLowerCase() === NATIVE_EVM.toLowerCase() || t.toLowerCase() === KNOWN[chain]?.WETH?.address?.toLowerCase();
+    if (isStable(chain, sell))
+        return sell;
+    if (isStable(chain, buy))
+        return buy;
+    if (eth(sell))
+        return sell;
+    if (eth(buy))
+        return buy;
+    return sell;
+}
+/** Tollkit's 0.5% in lamports: straight from the SOL side when there is one, else the trade's dollar value at SOL's price. */
+export function solFeeLamports(q, usd, solUsd) {
+    const bps = BigInt(SWAP_FEE_BPS);
+    if (q.sell_token === WSOL)
+        return (BigInt(q.sell_amount) * bps) / 10000n;
+    if (q.buy_token === WSOL)
+        return (BigInt(q.buy_amount) * bps) / 10000n;
+    if (!(usd && usd > 0) || !(solUsd && solUsd > 0))
+        throw new Error("No SOL price right now to work out Tollkit's fee. Try again in a minute.");
+    return BigInt(Math.ceil(((usd * SWAP_FEE_BPS) / 10000 / solUsd) * 1e9));
+}
 const decimalsOf = (chain, token) => (chain === "solana" ? STABLES.solana[token] : STABLES[chain][token.toLowerCase()])?.decimals;
 async function getJson(f, url, init) {
     const r = await f(url, { ...init, signal: AbortSignal.timeout(20_000) });
@@ -33,23 +73,48 @@ export async function getQuote(req, taker, opts = {}) {
         const u = new URL(`${proxy}/swap/solana/order`);
         u.search = new URLSearchParams({ inputMint: req.sell_token, outputMint: req.buy_token, amount: req.sell_amount, taker, slippageBps: String(req.slippage_bps) }).toString();
         const j = await getJson(f, u.toString());
+        const inRoute = jupiterFeeInRoute(j);
+        if (!inRoute && opts.build !== false) {
+            // No Tollkit fee account for the coin Jupiter would take the fee in: build the swap from Jupiter's router
+            // instructions instead, so Tollkit's 0.5% (in SOL) goes in the same transaction. If that path isn't
+            // available, fall back to the order with the fee sent right after (below).
+            try {
+                const bu = new URL(`${proxy}/swap/solana/build`);
+                bu.search = new URLSearchParams({ inputMint: req.sell_token, outputMint: req.buy_token, amount: req.sell_amount, taker, slippageBps: String(req.slippage_bps) }).toString();
+                const b = await getJson(f, bu.toString());
+                if (b?.swapInstruction && b?.tollkit_fee && typeof b.tollkit_fee.recipient === "string") {
+                    return withUsd({
+                        chain: "solana", venue: "jupiter", sell_token: req.sell_token, buy_token: req.buy_token,
+                        sell_amount: String(b.inAmount ?? req.sell_amount), buy_amount: String(b.outAmount), min_buy_amount: String(b.otherAmountThreshold ?? b.outAmount),
+                        fee_bps: Number(b.tollkit_fee.bps) === 0 ? 0 : SWAP_FEE_BPS, venue_fee_bps: 0, usd_value: null, fee_usd: null,
+                        raw: { build: b, swapUsdValue: j.swapUsdValue, inUsdValue: j.inUsdValue }, fee_inline: true,
+                    });
+                }
+            }
+            catch { /* the order below, with the fee sent separately */ }
+        }
         const q = {
             chain: "solana", venue: "jupiter", sell_token: req.sell_token, buy_token: req.buy_token,
             sell_amount: String(j.inAmount ?? req.sell_amount), buy_amount: String(j.outAmount), min_buy_amount: String(j.otherAmountThreshold ?? j.outAmount),
-            fee_bps: Number(j.feeBps ?? SWAP_FEE_BPS), venue_fee_bps: 0, usd_value: null, fee_usd: null, raw: j,
+            // Tollkit's fee is always 0.5%; when the route doesn't carry it, whatever the route does carry is Jupiter's own.
+            fee_bps: SWAP_FEE_BPS, venue_fee_bps: inRoute ? 0 : Math.max(0, Number(j.platformFee?.feeBps ?? j.feeBps ?? 0) || 0),
+            usd_value: null, fee_usd: null, raw: j, ...(inRoute ? {} : { fee_separate: true }),
         };
         return withUsd(q);
     }
     const u = new URL(`${proxy}/swap/evm/quote`);
-    u.search = new URLSearchParams({ chainId: String(EVM_CHAIN_ID[req.chain]), sellToken: req.sell_token, buyToken: req.buy_token, sellAmount: req.sell_amount, taker, slippageBps: String(req.slippage_bps) }).toString();
+    u.search = new URLSearchParams({ chainId: String(EVM_CHAIN_ID[req.chain]), sellToken: req.sell_token, buyToken: req.buy_token, sellAmount: req.sell_amount, taker, slippageBps: String(req.slippage_bps), feeToken: feeTokenFor(req.chain, req.sell_token, req.buy_token) }).toString();
     const j = await getJson(f, u.toString());
-    const feeAmt = BigInt(j?.fees?.integratorFee?.amount ?? "0");
-    const sell = BigInt(j.sellAmount ?? req.sell_amount);
-    const feeBps = sell > 0n ? Number((feeAmt * 10000n) / sell) : 0;
+    const sell = BigInt(j.sellAmount ?? req.sell_amount), buy = BigInt(j.buyAmount ?? "0");
+    // A fee is a share of the side it's taken from: the amount sold, or what was bought before the fee came off.
+    const share = (fee) => {
+        const amt = BigInt(fee?.amount ?? "0"), tok = String(fee?.token ?? req.sell_token).toLowerCase();
+        const base = tok === req.buy_token.toLowerCase() ? buy + amt : tok === req.sell_token.toLowerCase() ? sell : 0n;
+        return base > 0n ? Number((amt * 20000n / base + 1n) / 2n) : 0;
+    };
+    const feeBps = share(j?.fees?.integratorFee);
     // 0x's own fee (0.15% on select pairs on the Standard plan), shown to the user too.
-    const zx = BigInt(j?.fees?.zeroExFee?.amount ?? "0");
-    const zxToken = String(j?.fees?.zeroExFee?.token ?? "").toLowerCase();
-    const venueBps = sell > 0n && zxToken === req.sell_token.toLowerCase() ? Number((zx * 10000n) / sell) : 0;
+    const venueBps = j?.fees?.zeroExFee ? share(j.fees.zeroExFee) : 0;
     return withUsd({
         chain: req.chain, venue: "0x", sell_token: req.sell_token, buy_token: req.buy_token,
         sell_amount: String(j.sellAmount ?? req.sell_amount), buy_amount: String(j.buyAmount), min_buy_amount: String(j.minBuyAmount ?? j.buyAmount),
@@ -61,7 +126,9 @@ function withUsd(q) {
     return { ...q, usd_value: usd, fee_usd: usd === null ? null : (usd * q.fee_bps) / 10000 };
 }
 /** Everything the wallet refuses to sign. Returns a reason, or null if the quote is safe. */
-export function vetQuote(q, req) {
+export function vetQuote(q, req, taker) {
+    if (q.sell_amount !== req.sell_amount)
+        return "The quote is for a different amount than requested.";
     if (q.fee_bps > SWAP_FEE_BPS)
         return `The quote carries a ${q.fee_bps / 100}% fee; Tollkit's fee is ${SWAP_FEE_BPS / 100}%.`;
     if (!(BigInt(q.min_buy_amount) > 0n))
@@ -75,18 +142,256 @@ export function vetQuote(q, req) {
         const spender = q.raw?.issues?.allowance?.spender;
         if (spender && String(spender).toLowerCase() !== ALLOWANCE_HOLDER.toLowerCase())
             return `The quote asks to approve ${spender}; only 0x AllowanceHolder is ever approved.`;
-        if (q.sell_amount !== req.sell_amount)
-            return "The quote is for a different amount than requested.";
+        if (taker && tx.data !== undefined) {
+            try {
+                checkZeroExTx(q, taker);
+            }
+            catch (e) {
+                return e.message;
+            }
+        }
     }
     else {
-        if (!q.raw?.transaction || !q.raw?.requestId)
+        if (q.raw?.build) {
+            if (!q.raw.build.swapInstruction)
+                return "The quote has no swap instruction.";
+        }
+        else if (!q.raw?.transaction || !q.raw?.requestId)
             return "The quote has no transaction.";
     }
     return null;
 }
 const ERC20 = ["function approve(address spender, uint256 amount) returns (bool)", "function allowance(address owner, address spender) view returns (uint256)"];
+/** 0x Settler registry, the same address on every chain; feature 2 = taker-submitted swaps. */
+export const SETTLER_REGISTRY = "0x00000000000004533Fe15556B1E086BB1A72cEae";
+const ALLOWANCE_EXEC = new Interface(["function exec(address operator, address token, uint256 amount, address target, bytes data)"]);
+const SETTLER_EXECUTE = "0x1fff991f"; // execute((address recipient, address buyToken, uint256 minAmountOut), bytes[], bytes32)
+/** Decode a 0x quote's transaction and check it does only the swap shown. Returns the Settler address it uses. */
+export function checkZeroExTx(q, taker) {
+    const t = q.raw?.transaction ?? {};
+    const native = q.sell_token.toLowerCase() === NATIVE_EVM.toLowerCase();
+    const value = BigInt(t.value ?? "0"), sell = BigInt(q.sell_amount);
+    if (String(t.to ?? "").toLowerCase() !== ALLOWANCE_HOLDER.toLowerCase())
+        throw new Error("The swap isn't sent to 0x AllowanceHolder.");
+    if (value !== (native ? sell : 0n))
+        throw new Error("The swap would send a different amount of ETH than you're selling.");
+    let p = null;
+    try {
+        p = ALLOWANCE_EXEC.parseTransaction({ data: String(t.data ?? "") });
+    }
+    catch {
+        p = null;
+    }
+    if (!p || p.name !== "exec")
+        throw new Error("The swap transaction isn't a 0x swap.");
+    const [operator, token, amount, target, inner] = p.args;
+    if (token.toLowerCase() !== (native ? ZeroAddress : q.sell_token).toLowerCase() || amount !== sell)
+        throw new Error("The swap would take a different coin or amount than you're selling.");
+    if (operator.toLowerCase() !== target.toLowerCase())
+        throw new Error("The swap transaction isn't a 0x swap.");
+    if (!inner.startsWith(SETTLER_EXECUTE) || inner.length < 10 + 64 * 3)
+        throw new Error("The swap transaction isn't a 0x swap.");
+    const [recipient, buyToken, minOut] = AbiCoder.defaultAbiCoder().decode(["address", "address", "uint256"], "0x" + inner.slice(10, 10 + 64 * 3));
+    if (recipient.toLowerCase() !== taker.toLowerCase())
+        throw new Error("The swap would pay someone other than this wallet.");
+    if (buyToken.toLowerCase() !== q.buy_token.toLowerCase())
+        throw new Error("The swap would buy a different coin.");
+    if (minOut !== BigInt(q.min_buy_amount))
+        throw new Error("The swap's minimum doesn't match the quote shown.");
+    return target;
+}
+const TOKEN_PROGRAMS = ["TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA", "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"];
+const ATA_PROGRAM = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
+/** Programs a Solana swap may call directly. JUP6…: Jupiter's router (Metis), as seen in live Ultra orders. */
+export const SWAP_PROGRAMS = new Set(["ComputeBudget111111111111111111111111111111", "11111111111111111111111111111111", ...TOKEN_PROGRAMS, ATA_PROGRAM, "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"]);
+/** Before signing: check the quote server's transaction does only the swap that was shown. Throws if not. */
+export async function verifySwapTx(q, me, d = {}) {
+    if (q.venue === "0x") {
+        const settler = checkZeroExTx(q, me.evm).toLowerCase();
+        const call = d.evmCall ?? ((chain, to, data) => new JsonRpcProvider(d.rpc?.[chain] ?? DEFAULT_RPC[chain], EVM_CHAIN_ID[chain], { staticNetwork: true }).call({ to, data }));
+        const reg = async (sel) => { try {
+            return String(AbiCoder.defaultAbiCoder().decode(["address"], await call(q.chain, SETTLER_REGISTRY, sel + "0".repeat(63) + "2"))[0]).toLowerCase();
+        }
+        catch {
+            return "";
+        } };
+        // ownerOf(2) is the current Settler; prev(2) the one before, still used while 0x's API catches up.
+        if ((await reg("0x6352211e")) !== settler && (await reg("0xe2603dc2")) !== settler)
+            throw new Error("The swap goes through a contract 0x's registry doesn't list. Not signing it.");
+        return;
+    }
+    let vtx;
+    if (d.vtx)
+        vtx = d.vtx;
+    else
+        try {
+            vtx = VersionedTransaction.deserialize(Buffer.from(String(q.raw?.transaction ?? ""), "base64"));
+        }
+        catch {
+            throw new Error("The quote's transaction can't be read.");
+        }
+    const signers = vtx.message.staticAccountKeys.slice(0, vtx.message.header.numRequiredSignatures);
+    if (!signers.some((k) => k.equals(me.solana)))
+        throw new Error("The quote's transaction isn't for this wallet.");
+    const conn = d.conn ?? new Connection(d.rpc?.solana ?? DEFAULT_RPC.solana, "confirmed");
+    const fail = () => new Error("Couldn't check this swap before signing. Try again in a moment.");
+    // Only programs whose behaviour is known: Jupiter's own router (Metis, seen in live orders 2026-10-14) and the
+    // Solana programs a swap needs. A route through anything else is refused rather than trusted.
+    const statics = vtx.message.staticAccountKeys;
+    for (const ix of vtx.message.compiledInstructions) {
+        const prog = statics[ix.programIdIndex]?.toBase58();
+        if (!prog || !SWAP_PROGRAMS.has(prog))
+            throw new Error("This swap route goes through a program Tollkit doesn't sign for. Try again in a moment or change the amount.");
+        if (prog === "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" || prog === "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb") {
+            // Approve, ApproveChecked, SetAuthority: never part of a swap.
+            if ([4, 6, 13].includes(ix.data[0]))
+                throw new Error("This swap would change who controls your tokens. Not signing it.");
+        }
+    }
+    const held = new Map();
+    try {
+        for (const prog of TOKEN_PROGRAMS) {
+            const r = await conn.getParsedTokenAccountsByOwner(me.solana, { programId: new PublicKey(prog) });
+            for (const a of r.value) {
+                const i = a.account.data.parsed?.info;
+                if (i)
+                    held.set(a.pubkey.toBase58(), { mint: i.mint, amount: BigInt(i.tokenAmount.amount), delegate: i.delegate ?? null, close: i.closeAuthority ?? null });
+            }
+        }
+    }
+    catch {
+        throw fail();
+    }
+    const luts = [];
+    for (const l of vtx.message.addressTableLookups ?? []) {
+        const t = await conn.getAddressLookupTable?.(l.accountKey).catch(() => null);
+        if (!t?.value)
+            throw fail();
+        luts.push(t.value);
+    }
+    const keys = vtx.message.getAccountKeys({ addressLookupTableAccounts: luts });
+    const watch = [];
+    for (let i = 0; i < keys.length; i++) {
+        const k = keys.get(i).toBase58();
+        if (held.has(k) && vtx.message.isAccountWritable(i))
+            watch.push(k);
+    }
+    // The account the bought coin lands in, even if it doesn't exist yet (then it starts at 0).
+    const buyAtas = q.buy_token === WSOL ? [] : TOKEN_PROGRAMS.map((p) => ataOf(me.solana, new PublicKey(q.buy_token), new PublicKey(p))).filter((a) => !watch.includes(a));
+    const addresses = [me.solana.toBase58(), ...watch, ...buyAtas];
+    if (addresses.length > 128)
+        throw fail();
+    let sim;
+    try {
+        sim = await conn.simulateTransaction(vtx, { sigVerify: false, replaceRecentBlockhash: true, accounts: { encoding: "base64", addresses } });
+    }
+    catch {
+        throw fail();
+    }
+    const accs = sim?.value?.accounts;
+    if (sim?.value?.err || !accs?.[0])
+        throw fail();
+    const before = await conn.getBalance(me.solana);
+    if (accs[0].owner && accs[0].owner !== "11111111111111111111111111111111")
+        throw new Error("This swap would hand your wallet account to another program. Not signing it.");
+    const tokens = new Map();
+    const readTok = (a) => { const b = Buffer.from(String(a?.data?.[0] ?? ""), "base64"); return b.length >= 165 ? b : null; };
+    watch.forEach((addr, i) => {
+        const w = held.get(addr), a = accs[i + 1];
+        if (!a) {
+            tokens.set(w.mint, (tokens.get(w.mint) ?? 0n) - w.amount);
+            return;
+        }
+        const b = readTok(a);
+        if (!b)
+            return;
+        if (!b.subarray(32, 64).equals(me.solana.toBuffer()))
+            throw new Error("This swap would give one of your token accounts to someone else. Not signing it.");
+        const delegate = b.readUInt32LE(72) === 1 ? new PublicKey(b.subarray(76, 108)).toBase58() : null;
+        if (delegate && delegate !== w.delegate)
+            throw new Error("This swap would let another account spend your tokens later. Not signing it.");
+        const close = b.readUInt32LE(129) === 1 ? new PublicKey(b.subarray(133, 165)).toBase58() : null;
+        if (close && close !== w.close)
+            throw new Error("This swap would let another account close one of your token accounts. Not signing it.");
+        tokens.set(w.mint, (tokens.get(w.mint) ?? 0n) + b.readBigUInt64LE(64) - w.amount);
+    });
+    buyAtas.forEach((_addr, i) => {
+        const b = readTok(accs[watch.length + 1 + i]);
+        if (!b || !b.subarray(32, 64).equals(me.solana.toBuffer()) || new PublicKey(b.subarray(0, 32)).toBase58() !== q.buy_token)
+            return;
+        tokens.set(q.buy_token, (tokens.get(q.buy_token) ?? 0n) + b.readBigUInt64LE(64));
+    });
+    const sell = BigInt(q.sell_amount), sellingSol = q.sell_token === WSOL, buyingSol = q.buy_token === WSOL;
+    const solDelta = BigInt(accs[0].lamports) - BigInt(before) + (tokens.get(WSOL) ?? 0n);
+    // Network fees, priority fees and a new token account's deposit stay under 0.01 SOL.
+    // Plus Tollkit's fee when the wallet put it in this transaction itself.
+    const FEES = 10000000n + (d.extraLamports ?? 0n);
+    if (sellingSol && -solDelta > sell + FEES)
+        throw new Error("This swap would take more SOL than you're selling. Not signing it.");
+    if (!sellingSol && !buyingSol && -solDelta > FEES)
+        throw new Error("This swap would take more SOL than network fees. Not signing it.");
+    for (const [mint, delta] of tokens) {
+        if (delta >= 0n || mint === WSOL)
+            continue;
+        if (mint !== q.sell_token || -delta > sell)
+            throw new Error("This swap would take a coin you aren't selling, or more of it. Not signing it.");
+    }
+    const min = BigInt(q.min_buy_amount);
+    const got = buyingSol ? solDelta + FEES : (tokens.get(q.buy_token) ?? 0n);
+    if (got < min)
+        throw new Error("The checked swap pays less than the minimum shown. Not signing it.");
+}
+/** Associated token account address (the ATA program's seeds: owner, token program, mint). */
+function ataOf(owner, mint, tokenProgram) {
+    return PublicKey.findProgramAddressSync([owner.toBuffer(), tokenProgram.toBuffer(), mint.toBuffer()], new PublicKey(ATA_PROGRAM))[0].toBase58();
+}
+const toIx = (i) => new TransactionInstruction({ programId: new PublicKey(i.programId), keys: (i.accounts ?? []).map((a) => ({ pubkey: new PublicKey(a.pubkey), isSigner: !!a.isSigner, isWritable: !!a.isWritable })), data: Buffer.from(String(i.data ?? ""), "base64") });
+const COMPUTE_BUDGET = "ComputeBudget111111111111111111111111111111";
+/**
+ * Jupiter's router instructions (Swap API v2 /build) plus Tollkit's fee as a plain SOL transfer, in one v0
+ * transaction: compute-unit limit from a simulation (x1.2, at most 1.4M), Jupiter's priority price, a fresh
+ * blockhash. Checked with the same rules as any swap, then sent and confirmed by polling.
+ */
+export async function assembleBuilt(q, payer, conn) {
+    const b = q.raw.build, fee = q.raw.fee;
+    const feeLamports = fee ? BigInt(fee.lamports) : 0n;
+    const price = (b.computeBudgetInstructions ?? []).map(toIx).filter((ix) => !(ix.programId.toBase58() === COMPUTE_BUDGET && ix.data[0] === 2));
+    const body = [...(b.setupInstructions ?? []).map(toIx), toIx(b.swapInstruction), ...(b.cleanupInstruction ? [toIx(b.cleanupInstruction)] : []), ...(b.otherInstructions ?? []).map(toIx)];
+    if (feeLamports > 0n)
+        body.push(SystemProgram.transfer({ fromPubkey: payer, toPubkey: new PublicKey(fee.to), lamports: feeLamports }));
+    const luts = Object.entries(b.addressesByLookupTableAddress ?? {}).map(([key, addrs]) => new AddressLookupTableAccount({ key: new PublicKey(key), state: { deactivationSlot: 18446744073709551615n, lastExtendedSlot: 0, lastExtendedSlotStartIndex: 0, addresses: addrs.map((a) => new PublicKey(a)) } }));
+    const { blockhash, lastValidBlockHeight } = await conn.getLatestBlockhash("confirmed");
+    const compile = (units) => new VersionedTransaction(new TransactionMessage({ payerKey: payer, recentBlockhash: blockhash, instructions: [ComputeBudgetProgram.setComputeUnitLimit({ units }), ...price, ...body] }).compileToV0Message(luts));
+    const sim = await conn.simulateTransaction(compile(1_400_000), { sigVerify: false, replaceRecentBlockhash: true });
+    if (sim.value.err)
+        throw new Error(`This swap would fail right now (${JSON.stringify(sim.value.err)}). Try again in a moment.`);
+    const units = Math.min(1_400_000, Math.ceil((sim.value.unitsConsumed ?? 1_200_000) * 1.2));
+    return { tx: compile(units), lastValidBlockHeight, feeLamports };
+}
+async function executeBuilt(q, keys, deps) {
+    const conn = deps.verify?.conn ?? new Connection(deps.rpc?.solana ?? DEFAULT_RPC.solana, "confirmed");
+    const { tx, lastValidBlockHeight, feeLamports } = await assembleBuilt(q, keys.solana.publicKey, conn);
+    await verifySwapTx(q, { evm: "", solana: keys.solana.publicKey }, { ...deps, ...deps.verify, vtx: tx, extraLamports: feeLamports });
+    tx.sign([keys.solana]);
+    const sig = await conn.sendRawTransaction(tx.serialize(), { preflightCommitment: "confirmed", maxRetries: 3 });
+    const until = Date.now() + 90_000;
+    for (;;) {
+        const st = (await conn.getSignatureStatuses([sig])).value[0];
+        if (st?.err)
+            throw new Error(`swap ${sig} failed: ${JSON.stringify(st.err)}`);
+        if (st && (st.confirmationStatus === "confirmed" || st.confirmationStatus === "finalized"))
+            return sig;
+        if (Date.now() > until || (await conn.getBlockHeight("confirmed")) > lastValidBlockHeight)
+            throw new Error(`Solana swap ${sig} wasn't confirmed in time. Check it on an explorer before trying again.`);
+        await new Promise((r) => setTimeout(r, deps.pollMs ?? 1500));
+    }
+}
 /** Sign and send. Returns the transaction hash / signature. */
 export async function executeSwap(q, keys, deps = {}) {
+    // A built Solana swap is assembled first, then checked as the exact transaction that will be signed.
+    if (q.venue === "jupiter" && q.raw?.build)
+        return executeBuilt(q, keys, deps);
+    await verifySwapTx(q, { evm: keys.evm.address, solana: keys.solana.publicKey }, { ...deps, ...deps.verify });
     if (q.venue === "jupiter") {
         const tx = VersionedTransaction.deserialize(Buffer.from(q.raw.transaction, "base64"));
         tx.sign([keys.solana]);
@@ -99,19 +404,20 @@ export async function executeSwap(q, keys, deps = {}) {
             throw new Error(`swap failed: ${j.error ?? j.status}`);
         return String(j.signature);
     }
-    const provider = new JsonRpcProvider(deps.rpc?.[q.chain] ?? DEFAULT_RPC[q.chain], EVM_CHAIN_ID[q.chain]);
+    // On Ethereum mainnet the approval and the swap go through Flashbots Protect (src/evmsend.ts).
+    const provider = deps.provider ?? sendingProvider(q.chain, { rpc: deps.rpc, proxy: deps.proxy, fetch: deps.fetch });
     const signer = keys.evm.connect(provider);
     if (q.raw?.issues?.allowance) {
         const token = new Contract(q.sell_token, ERC20, signer);
-        const a = await token.approve(ALLOWANCE_HOLDER, BigInt(q.sell_amount)); // exact amount, never unlimited
-        await a.wait();
+        const a = await token.getFunction("approve")(ALLOWANCE_HOLDER, BigInt(q.sell_amount)); // exact amount, never unlimited
+        await waitMined(a, "approval");
     }
     const t = q.raw.transaction;
     const sent = await signer.sendTransaction({
         to: t.to, data: t.data, value: BigInt(t.value ?? "0"),
         ...(t.gas ? { gasLimit: BigInt(t.gas) } : {}),
     });
-    const r = await sent.wait();
+    const r = await waitMined(sent, "swap");
     if (!r || r.status !== 1)
         throw new Error(`swap transaction ${sent.hash} reverted`);
     return sent.hash;