@stablecoin.xyz/swap-intent 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,10 +1,18 @@
 // ../../mcp/shared/intent-check.ts
 import { formatUnits, getAddress as getAddress2, toHex } from "viem";
-import { PublicKey as PublicKey3 } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID, getAssociatedTokenAddressSync } from "@solana/spl-token";
+import { PublicKey as PublicKey4 } from "@solana/web3.js";
 
-// ../../engine/svm.js
+// ../../mcp/shared/spl.ts
 import { PublicKey } from "@solana/web3.js";
+var TOKEN_PROGRAM_ID = new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+var TOKEN_2022_PROGRAM_ID = new PublicKey("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+var ASSOCIATED_TOKEN_PROGRAM_ID = new PublicKey("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+function getAssociatedTokenAddressSync(mint, owner, programId = TOKEN_PROGRAM_ID) {
+  return PublicKey.findProgramAddressSync([owner.toBuffer(), programId.toBuffer(), mint.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID)[0];
+}
+
+// ../../engine/svm.js
+import { PublicKey as PublicKey2 } from "@solana/web3.js";
 import { getAddress } from "viem";
 var SETTLE_DISC = {
   open: Buffer.from([228, 220, 155, 71, 199, 189, 60, 45]),
@@ -86,8 +94,7 @@ function hydrateTypedData(td) {
 }
 
 // ../../mcp/shared/sol-decode.ts
-import { ComputeBudgetProgram, PublicKey as PublicKey2, SystemProgram, VersionedTransaction } from "@solana/web3.js";
-import { TOKEN_2022_PROGRAM_ID, TOKEN_PROGRAM_ID } from "@solana/spl-token";
+import { ComputeBudgetProgram, PublicKey as PublicKey3, SystemProgram, VersionedTransaction } from "@solana/web3.js";
 var TOKEN_PROGRAMS = /* @__PURE__ */ new Set([TOKEN_PROGRAM_ID.toBase58(), TOKEN_2022_PROGRAM_ID.toBase58()]);
 var SYSTEM = SystemProgram.programId.toBase58();
 var COMPUTE_BUDGET = ComputeBudgetProgram.programId.toBase58();
@@ -120,7 +127,7 @@ function decodeIx(program, accounts, data, signers) {
       inputMint: accounts[1],
       userAta: accounts[3],
       tokenProgram: accounts[6],
-      solver: new PublicKey2(data.subarray(40, 72)).toBase58(),
+      solver: new PublicKey3(data.subarray(40, 72)).toBase58(),
       inputAmount: u64(data, 72),
       outputToken: "0x" + hex(data.subarray(80, 112)),
       outputAmount: u64(data, 112) + (u64(data, 120) << 64n),
@@ -215,7 +222,7 @@ function userInstructions(s, me) {
 }
 var sourceChain = (req) => req.kind === "sol-tx" ? "solana" : req.chain;
 function ata(mint, owner, program) {
-  return getAssociatedTokenAddressSync(new PublicKey3(mint), new PublicKey3(owner), true, new PublicKey3(program)).toBase58();
+  return getAssociatedTokenAddressSync(new PublicKey4(mint), new PublicKey4(owner), new PublicKey4(program)).toBase58();
 }
 function quotedOutOf(req) {
   try {
@@ -259,7 +266,7 @@ function evmChecks(p, e) {
     if (e.recipientVm === "svm") {
       need(e.destinationChainId === BigInt(m.solana.dstChainId), "wrong-chain");
       const outT = token(req.net, req.outSym, "solana");
-      need(outT?.mint && e.outputToken === toHex(new PublicKey3(outT.mint).toBytes()), "unknown-token");
+      need(outT?.mint && e.outputToken === toHex(new PublicKey4(outT.mint).toBytes()), "unknown-token");
       outDec = outT.decimals;
       destChain = "solana";
     } else {
@@ -357,7 +364,7 @@ function checkIntent(p) {
 
 // ../../mcp/shared/evm-decode.ts
 import { decodeAbiParameters, decodeFunctionData, getAddress as getAddress4, hexToBytes } from "viem";
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey5 } from "@solana/web3.js";
 
 // ../../ui-app/src/core/evm.ts
 var PERMIT_TYPES = {
@@ -535,7 +542,7 @@ function decodeTxs(req) {
     target: escrow,
     inputToken: addr(od.inputToken),
     inputAmount: BigInt(od.inputAmount),
-    recipient: toSolana ? new PublicKey4(recipientBytes).toBase58() : evmFrom32(recipientBytes),
+    recipient: toSolana ? new PublicKey5(recipientBytes).toBase58() : evmFrom32(recipientBytes),
     recipientVm: toSolana ? "svm" : "evm",
     outputToken: od.outputToken,
     destinationChainId: BigInt(od.destinationChainId),
@@ -956,7 +963,7 @@ async function evmOrigin(d, a, engine) {
     uiAmount: a.uiAmount,
     user,
     recipient,
-    orderId: open.orderId,
+    orderId: orderIdOf(open.orderId),
     rail,
     legacyGas: src === "radius",
     txs: [
@@ -965,6 +972,10 @@ async function evmOrigin(d, a, engine) {
     ]
   };
 }
+function orderIdOf(id) {
+  if (typeof id !== "string" || !/^(0x)?[0-9a-fA-F]{64}$/.test(id)) throw new Error("refused: the server returned an order id that is not 32 bytes of hex");
+  return id;
+}
 async function solOrigin(d, a, engine) {
   const user = solUser(a.user);
   const recipient = getAddress5(a.recipient);
@@ -980,7 +991,7 @@ async function solOrigin(d, a, engine) {
     uiAmount: a.uiAmount,
     user,
     recipient,
-    orderId: open.orderId,
+    orderId: orderIdOf(open.orderId),
     rail: RAIL[engine],
     txBase64: open.txB64,
     versioned: false

package/dist/types/mcp/shared/spl.d.ts

@@ -0,0 +1,5 @@
+import { PublicKey } from "@solana/web3.js";
+export declare const TOKEN_PROGRAM_ID: PublicKey;
+export declare const TOKEN_2022_PROGRAM_ID: PublicKey;
+export declare const ASSOCIATED_TOKEN_PROGRAM_ID: PublicKey;
+export declare function getAssociatedTokenAddressSync(mint: PublicKey, owner: PublicKey, programId?: PublicKey): PublicKey;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@stablecoin.xyz/swap-intent",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Build an SBC Swap API transaction and check it against what the user asked for before signing",
   "type": "module",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/stablecoinxyz/better-intents",
+    "url": "git+https://github.com/stablecoinxyz/better-intents.git",
     "directory": "packages/swap-intent"
   },
   "publishConfig": {
@@ -29,10 +29,9 @@
   },
   "scripts": {
     "build": "node ../../scripts/build-swap-intent.mjs",
-    "prepublishOnly": "node ../../scripts/build-swap-intent.mjs"
+    "prepublishOnly": "node ../../scripts/build-swap-intent.mjs --publish"
   },
   "dependencies": {
-    "@solana/spl-token": "^0.4.14",
     "@solana/web3.js": "^1.98.4",
     "viem": "^2.51.3",
     "zod": "^4.6.7"