@faremeter/payment-solana 0.17.0 → 0.18.0

package/dist/src/exact/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAYjE,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,sBAAsB,EAAE,EACtC,eAAe,EAAE,MAAM,KACpB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,wBAAwB,CAAC,EAAE,CACzB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,iBAAiB,CAAC,EAAE,CAClB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjE,CAAC;AAEF,UAAU,oCAAoC;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,wBAAwB,CAAC,EAAE,SAAS,CAAC;CACtC;AAiFD,UAAU,2BAA2B;IACnC,KAAK,CAAC,EAAE,oCAAoC,CAAC;IAC7C,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;CACH;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CA2LhB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAajE,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAKzB,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,sBAAsB,EAAE,EACtC,eAAe,EAAE,MAAM,KACpB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,wBAAwB,CAAC,EAAE,CACzB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,iBAAiB,CAAC,EAAE,CAClB,EAAE,EAAE,oBAAoB,KACrB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACjE,CAAC;AAEF,UAAU,oCAAoC;IAC5C,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,wBAAwB,CAAC,EAAE,SAAS,CAAC;CACtC;AAsFD,UAAU,2BAA2B;IACnC,KAAK,CAAC,EAAE,oCAAoC,CAAC;IAC7C,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;KACpC,CAAC;CACH;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CAuMhB"}

package/dist/src/exact/client.js

@@ -1,5 +1,5 @@
 import { isValidationError, throwValidationError } from "@faremeter/types";
-import { createAssociatedTokenAccountIdempotentInstruction, createTransferCheckedInstruction, getAssociatedTokenAddressSync, getMint, } from "@solana/spl-token";
+import { createAssociatedTokenAccountIdempotentInstruction, createTransferCheckedInstruction, getAssociatedTokenAddressSync, getMint, TOKEN_PROGRAM_ID, } from "@solana/spl-token";
 import { getBase64EncodedWireTransaction, } from "@solana/transactions";
 import { ComputeBudgetProgram, Connection, PublicKey, TransactionInstruction, TransactionMessage, VersionedTransaction, Keypair, } from "@solana/web3.js";
 import { PaymentRequirementsExtra } from "./facilitator.js";
@@ -53,6 +53,9 @@ async function extractMetadata(args) {
         wallet.sendTransaction) {
         paymentMode = PaymentMode.SettlementAccount;
     }
+    const tokenProgramId = extra.tokenProgram
+        ? new PublicKey(extra.tokenProgram)
+        : (options?.token?.programId ?? TOKEN_PROGRAM_ID);
     return {
         recentBlockhash,
         decimals,
@@ -60,6 +63,7 @@ async function extractMetadata(args) {
         amount,
         payerKey,
         paymentMode,
+        tokenProgramId,
     };
 }
 /**
@@ -75,7 +79,7 @@ async function extractMetadata(args) {
  * @returns A PaymentHandler function for use with the x402 client
  */
 export function createPaymentHandler(wallet, mint, connection, options) {
-    const getAssociatedTokenAddressSyncRest = generateGetAssociatedTokenAddressSyncRest(options?.token ?? {});
+    const tokenConfig = options?.token ?? {};
     let hasWarnedAboutDeprecation = false;
     const signTransaction = async (tx) => {
         if (wallet.partiallySignTransaction) {
@@ -95,13 +99,17 @@ export function createPaymentHandler(wallet, mint, connection, options) {
         const compatibleRequirements = accepts.filter(isMatchingRequirement);
         const res = compatibleRequirements.map((requirements) => {
             const exec = async () => {
-                const { recentBlockhash, decimals, payTo, amount, payerKey, paymentMode, } = await extractMetadata({
+                const { recentBlockhash, decimals, payTo, amount, payerKey, paymentMode, tokenProgramId, } = await extractMetadata({
                     connection,
                     mint,
                     requirements,
                     wallet,
                     options,
                 });
+                const getAssociatedTokenAddressSyncRest = generateGetAssociatedTokenAddressSyncRest({
+                    ...tokenConfig,
+                    programId: tokenProgramId,
+                });
                 const instructions = [
                     ComputeBudgetProgram.setComputeUnitLimit({
                         units: 50_000,
@@ -114,7 +122,7 @@ export function createPaymentHandler(wallet, mint, connection, options) {
                 switch (paymentMode) {
                     case PaymentMode.ToSpec: {
                         const receiverAccount = getAssociatedTokenAddressSync(mint, payTo, ...getAssociatedTokenAddressSyncRest);
-                        instructions.push(createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, amount, decimals));
+                        instructions.push(createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, amount, decimals, undefined, tokenProgramId));
                         let tx;
                         if (wallet.buildTransaction) {
                             tx = await wallet.buildTransaction(instructions, recentBlockhash);
@@ -140,7 +148,7 @@ export function createPaymentHandler(wallet, mint, connection, options) {
                     case PaymentMode.SettlementAccount: {
                         const settleKeypair = Keypair.generate();
                         const settleATA = getAssociatedTokenAddressSync(mint, settleKeypair.publicKey, ...getAssociatedTokenAddressSyncRest);
-                        instructions.push(createAssociatedTokenAccountIdempotentInstruction(wallet.publicKey, settleATA, settleKeypair.publicKey, mint), createTransferCheckedInstruction(sourceAccount, mint, settleATA, wallet.publicKey, amount, decimals));
+                        instructions.push(createAssociatedTokenAccountIdempotentInstruction(wallet.publicKey, settleATA, settleKeypair.publicKey, mint, tokenProgramId, tokenConfig.associatedTokenProgramId), createTransferCheckedInstruction(sourceAccount, mint, settleATA, wallet.publicKey, amount, decimals, undefined, tokenProgramId));
                         let tx;
                         if (wallet.buildTransaction) {
                             tx = await wallet.buildTransaction(instructions, recentBlockhash);

package/dist/src/exact/facilitator.d.ts

@@ -32,6 +32,7 @@ export declare const PaymentRequirementsExtra: import("arktype/internal/methods/
     feePayer: string;
     decimals?: number;
     recentBlockhash?: string;
+    tokenProgram?: string;
     features?: {
         xSettlementAccountSupported?: boolean;
     };

package/dist/src/exact/facilitator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAML,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAYL,KAAK,GAAG,EACR,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAalC,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAChD,YAAY,EAAE,uBAAuB,CAAC;IACtC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,OAAO,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,iBAAiB,CAAC,QAAQ,IAAI,CACxC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gCAAgC;;MAE3C,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAC1C,OAAO,gCAAgC,CAAC,KAAK,CAAC;AAEhD,eAAO,MAAM,wBAAwB;;;;;;;MAKnC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,KAAK,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACrC;AASD,eAAO,MAAM,yBAAyB;;;;;MAEpC,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAC,KAAK,CAAC;AAE/E,eAAO,MAAM,+BAA+B;;;;MAM1C,CAAC;AACH,MAAM,MAAM,+BAA+B,GACzC,OAAO,+BAA+B,CAAC,KAAK,CAAC;AAE/C,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,GAAG,kBAAkB,EACpC,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,OAAO,CAAC,kBAAkB,CAub5B,CAAC"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EAExB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAML,KAAK,kBAAkB,EACxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,SAAS,EAIV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAYL,KAAK,GAAG,EACR,KAAK,YAAY,EAElB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAKlC,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,GAAG,kBAAkB,CAAC;IACrC,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;IACzB,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC;IAChD,YAAY,EAAE,uBAAuB,CAAC;IACtC,OAAO,EAAE,kBAAkB,CAAC;IAC5B,MAAM,EAAE,OAAO,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,gBAAgB,CAAC,QAAQ,IAAI,YAAY,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE/E,MAAM,MAAM,iBAAiB,CAAC,QAAQ,IAAI,CACxC,IAAI,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAC7B,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACpD,WAAW,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CACrD;AAED,eAAO,MAAM,gCAAgC;;MAE3C,CAAC;AAEH,MAAM,MAAM,gCAAgC,GAC1C,OAAO,gCAAgC,CAAC,KAAK,CAAC;AAEhD,eAAO,MAAM,wBAAwB;;;;;;;;MAMnC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE;QACT,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,oBAAoB,CAAC,EAAE,OAAO,CAAC;KAChC,CAAC;IACF,KAAK,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;CACrC;AASD,eAAO,MAAM,yBAAyB;;;;;MAEpC,CAAC;AACH,MAAM,MAAM,yBAAyB,GAAG,OAAO,yBAAyB,CAAC,KAAK,CAAC;AAE/E,eAAO,MAAM,+BAA+B;;;;MAM1C,CAAC;AACH,MAAM,MAAM,+BAA+B,GACzC,OAAO,+BAA+B,CAAC,KAAK,CAAC;AAE/C,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,GAAG,kBAAkB,EACpC,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,OAAO,CAAC,kBAAkB,CAmc5B,CAAC"}

package/dist/src/exact/facilitator.js

@@ -1,7 +1,7 @@
 import {} from "@faremeter/types/x402v2";
 import { isValidationError } from "@faremeter/types";
 import { clusterToCAIP2, isKnownCluster, caip2ToCluster, isSolanaCAIP2Network, } from "@faremeter/info/solana";
-import { fetchMint } from "@solana-program/token";
+import { fetchMint, findAssociatedTokenPda, getTransferCheckedInstruction, getCloseAccountInstruction, } from "@solana-program/token";
 import { address, createKeyPairSignerFromBytes, decompileTransactionMessage, getBase64Encoder, getCompiledTransactionMessageDecoder, createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, signTransactionMessageWithSigners, pipe, } from "@solana/kit";
 import { getBase64EncodedWireTransaction, getSignatureFromTransaction, getTransactionDecoder, partiallySignTransaction, } from "@solana/transactions";
 import { Keypair, PublicKey } from "@solana/web3.js";
@@ -9,7 +9,6 @@ import { type } from "arktype";
 import { isValidTransaction } from "./verify.js";
 import { logger } from "./logger.js";
 import { x402Scheme, generateMatcher } from "./common.js";
-import { TOKEN_PROGRAM_ADDRESS, findAssociatedTokenPda, getTransferCheckedInstruction, getCloseAccountInstruction, } from "@solana-program/token";
 import { getAddMemoInstruction } from "@solana-program/memo";
 import { TransactionStore } from "./cache.js";
 export const PaymentRequirementsExtraFeatures = type({
@@ -19,6 +18,7 @@ export const PaymentRequirementsExtra = type({
     feePayer: "string",
     decimals: "number?",
     recentBlockhash: "string?",
+    "tokenProgram?": "string",
     features: PaymentRequirementsExtraFeatures.optional(),
 });
 const TransactionString = type("string").pipe.try((tx) => {
@@ -93,6 +93,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
     const { isMatchingRequirement } = generateMatcher(network, mint.toBase58());
     const { maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, maxTransactionAge = 150, } = config ?? {};
     const mintInfo = await fetchMint(rpc, address(mint.toBase58()));
+    const tokenProgram = mintInfo.programAddress;
     const hookArgs = {
         network,
         rpc,
@@ -120,7 +121,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
         const [settleATA] = await findAssociatedTokenPda({
             mint: address(mint.toBase58()),
             owner: settleOwner,
-            tokenProgram: TOKEN_PROGRAM_ADDRESS,
+            tokenProgram,
         });
         const { value: accountBalance } = await rpc
             .getTokenAccountBalance(settleATA, { commitment: "confirmed" })
@@ -138,11 +139,12 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
             const [payToATA] = await findAssociatedTokenPda({
                 mint: address(mint.toBase58()),
                 owner: address(requirements.payTo),
-                tokenProgram: TOKEN_PROGRAM_ADDRESS,
+                tokenProgram,
             });
             const closeDestination = paymentPayload.settlementRentDestination
                 ? address(paymentPayload.settlementRentDestination)
                 : feePayerSigner.address;
+            const programAddress = tokenProgram;
             const instructions = [
                 getAddMemoInstruction({ memo: crypto.randomUUID() }),
                 getTransferCheckedInstruction({
@@ -152,12 +154,12 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
                     authority: settleSigner,
                     amount: BigInt(requirements.amount),
                     decimals: mintInfo.data.decimals,
-                }),
+                }, { programAddress }),
                 getCloseAccountInstruction({
                     account: settleATA,
                     destination: closeDestination,
                     owner: settleSigner,
-                }),
+                }, { programAddress }),
             ];
             const { value: latestBlockhash } = await rpc.getLatestBlockhash().send();
             // Build the transaction message
@@ -192,7 +194,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
         }
         let validResult;
         try {
-            validResult = await isValidTransaction(transactionMessage, requirements, feePayerKeypair.publicKey.toBase58(), maxPriorityFee);
+            validResult = await isValidTransaction(transactionMessage, requirements, feePayerKeypair.publicKey.toBase58(), tokenProgram, maxPriorityFee);
             if (!validResult) {
                 logger.error("Invalid transaction");
                 return errorResponse("Invalid transaction");
@@ -264,6 +266,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
                 network: clusterToCAIP2(resolveCluster()).caip2,
                 extra: {
                     feePayer: feePayerKeypair.publicKey.toString(),
+                    tokenProgram,
                     features,
                 },
             }),
@@ -280,6 +283,7 @@ export const createFacilitatorHandler = async (network, rpc, feePayerKeypair, mi
                     feePayer: feePayerKeypair.publicKey.toString(),
                     decimals: mintInfo.data.decimals,
                     recentBlockhash,
+                    tokenProgram,
                     features,
                 },
             };

package/dist/src/exact/verify.d.ts

@@ -1,6 +1,6 @@
 import type { x402PaymentRequirements } from "@faremeter/types/x402v2";
-import { type CompilableTransactionMessage } from "@solana/kit";
-export declare function isValidTransaction(transactionMessage: CompilableTransactionMessage, paymentRequirements: x402PaymentRequirements, facilitatorAddress: string, maxPriorityFee?: number): Promise<{
+import { type Address, type CompilableTransactionMessage } from "@solana/kit";
+export declare function isValidTransaction(transactionMessage: CompilableTransactionMessage, paymentRequirements: x402PaymentRequirements, facilitatorAddress: string, tokenProgram: Address, maxPriorityFee?: number): Promise<{
     payer: string;
 } | false>;
 //# sourceMappingURL=verify.d.ts.map

package/dist/src/exact/verify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/exact/verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAWvE,OAAO,EAEL,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;AAuGrB,wBAAsB,kBAAkB,CACtC,kBAAkB,EAAE,4BAA4B,EAChD,mBAAmB,EAAE,uBAAuB,EAC5C,kBAAkB,EAAE,MAAM,EAC1B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,CAkEpC"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/exact/verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAUvE,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;AAwGrB,wBAAsB,kBAAkB,CACtC,kBAAkB,EAAE,4BAA4B,EAChD,mBAAmB,EAAE,uBAAuB,EAC5C,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,OAAO,EACrB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,KAAK,CAAC,CAmEpC"}

package/dist/src/exact/verify.js

@@ -1,6 +1,6 @@
 import { isValidationError } from "@faremeter/types";
 import { parseSetComputeUnitLimitInstruction, parseSetComputeUnitPriceInstruction, } from "@solana-program/compute-budget";
-import { findAssociatedTokenPda, parseTransferCheckedInstruction, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
+import { findAssociatedTokenPda, parseTransferCheckedInstruction, } from "@solana-program/token";
 import { address, } from "@solana/kit";
 import { PaymentRequirementsExtra } from "./facilitator.js";
 import { logger } from "./logger.js";
@@ -41,7 +41,7 @@ function verifyComputeUnitPriceInstruction(instruction) {
 function calculatePriorityFee(units, microLamports) {
     return (units * Number(microLamports)) / 1_000_000;
 }
-async function verifyTransferInstruction(instruction, paymentRequirements, destination, facilitatorAddress) {
+async function verifyTransferInstruction(instruction, paymentRequirements, destination, facilitatorAddress, tokenProgram) {
     if (!instruction.data || !instruction.accounts) {
         return false;
     }
@@ -63,7 +63,7 @@ async function verifyTransferInstruction(instruction, paymentRequirements, desti
     const [facilitatorATA] = await findAssociatedTokenPda({
         mint: address(paymentRequirements.asset),
         owner: address(facilitatorAddress),
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram,
     });
     if (transfer.accounts.source.address === facilitatorATA) {
         logger.error("Dropping transfer where the source is the facilitator");
@@ -76,7 +76,7 @@ async function verifyTransferInstruction(instruction, paymentRequirements, desti
     }
     return false;
 }
-export async function isValidTransaction(transactionMessage, paymentRequirements, facilitatorAddress, maxPriorityFee) {
+export async function isValidTransaction(transactionMessage, paymentRequirements, facilitatorAddress, tokenProgram, maxPriorityFee) {
     const extra = PaymentRequirementsExtra(paymentRequirements.extra);
     if (isValidationError(extra)) {
         throw new Error("feePayer is required");
@@ -87,7 +87,7 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
     const [destination] = await findAssociatedTokenPda({
         mint: address(paymentRequirements.asset),
         owner: address(paymentRequirements.payTo),
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram,
     });
     const instructions = transactionMessage.instructions;
     if (instructions.length < 3 || instructions.length > 5) {
@@ -115,7 +115,7 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
         logger.error("Dropping transaction with non-Lighthouse trailing instructions");
         return false;
     }
-    const payer = await verifyTransferInstruction(ix2, paymentRequirements, destination, facilitatorAddress);
+    const payer = await verifyTransferInstruction(ix2, paymentRequirements, destination, facilitatorAddress, tokenProgram);
     if (!payer)
         return false;
     return { payer };

package/dist/src/exact/verify.test.js

@@ -3,6 +3,7 @@ import t from "tap";
 import { isValidTransaction } from "./verify.js";
 import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction, } from "@solana-program/compute-budget";
 import { findAssociatedTokenPda, getTransferCheckedInstruction, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
+import { TOKEN_2022_PROGRAM_ADDRESS } from "../splToken.js";
 import { address, appendTransactionMessageInstructions, createTransactionMessage, generateKeyPairSigner, pipe, setTransactionMessageFeePayer, setTransactionMessageLifetimeUsingBlockhash, } from "@solana/kit";
 function createRequirements(overrides) {
     return {
@@ -17,7 +18,7 @@ const FAKE_BLOCKHASH = "EETubP46DHLkT9hAFKy4x2BoFUqUFvKjiiNVY3CaYRi3";
 function buildTxMessage(instructions, feePayer) {
     return pipe(createTransactionMessage({ version: 0 }), (msg) => setTransactionMessageFeePayer(feePayer.address, msg), (msg) => setTransactionMessageLifetimeUsingBlockhash({ blockhash: FAKE_BLOCKHASH, lastValidBlockHeight: 1000n }, msg), (msg) => appendTransactionMessageInstructions(instructions, msg));
 }
-async function createFixtures() {
+async function createFixtures({ tokenProgram = TOKEN_PROGRAM_ADDRESS, } = {}) {
     const facilitator = await generateKeyPairSigner();
     const sender = await generateKeyPairSigner();
     const receiver = await generateKeyPairSigner();
@@ -25,17 +26,17 @@ async function createFixtures() {
     const [senderATA] = await findAssociatedTokenPda({
         mint: mint.address,
         owner: sender.address,
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram,
     });
     const [receiverATA] = await findAssociatedTokenPda({
         mint: mint.address,
         owner: receiver.address,
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram,
     });
     const [facilitatorATA] = await findAssociatedTokenPda({
         mint: mint.address,
         owner: facilitator.address,
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram,
     });
     const amount = 1000000n;
     const decimals = 6;
@@ -60,8 +61,9 @@ async function createFixtures() {
         authority: sender.address,
         amount,
         decimals,
-    });
+    }, { programAddress: tokenProgram });
     return {
+        tokenProgram,
         facilitator,
         sender,
         receiver,
@@ -87,7 +89,7 @@ await t.test("isValidTransaction", async (t) => {
     await t.test("accepts valid 3-instruction transaction", async (t) => {
         const f = await createFixtures();
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx], f.facilitator);
-        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address);
+        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram);
         t.ok(result);
         t.equal(result && result.payer, f.sender.address);
         t.end();
@@ -95,7 +97,7 @@ await t.test("isValidTransaction", async (t) => {
     await t.test("accepts valid 4-instruction transaction with one lighthouse ix", async (t) => {
         const f = await createFixtures();
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx, makeLighthouseIx()], f.facilitator);
-        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address);
+        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram);
         t.ok(result);
         t.equal(result && result.payer, f.sender.address);
         t.end();
@@ -109,7 +111,7 @@ await t.test("isValidTransaction", async (t) => {
             makeLighthouseIx([1]),
             makeLighthouseIx([2]),
         ], f.facilitator);
-        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address);
+        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram);
         t.ok(result);
         t.equal(result && result.payer, f.sender.address);
         t.end();
@@ -117,21 +119,21 @@ await t.test("isValidTransaction", async (t) => {
     await t.test("rejects transaction with fewer than 3 instructions", async (t) => {
         const f = await createFixtures();
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction with more than 5 instructions", async (t) => {
         const f = await createFixtures();
         const extras = Array.from({ length: 3 }, (_, i) => makeLighthouseIx([i]));
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx, ...extras], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction with wrong fee payer", async (t) => {
         const f = await createFixtures();
         const wrongPayer = await generateKeyPairSigner();
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx], wrongPayer);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("throws when extra is missing feePayer", async (t) => {
@@ -141,19 +143,19 @@ await t.test("isValidTransaction", async (t) => {
             extra: {},
         };
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx], f.facilitator);
-        await t.rejects(isValidTransaction(txMsg, badRequirements, f.facilitator.address));
+        await t.rejects(isValidTransaction(txMsg, badRequirements, f.facilitator.address, f.tokenProgram));
         t.end();
     });
     await t.test("rejects transaction with swapped compute budget instructions", async (t) => {
         const f = await createFixtures();
         const txMsg = buildTxMessage([f.computePriceIx, f.computeLimitIx, f.transferIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("accepts transaction within priority fee limit", async (t) => {
         const f = await createFixtures();
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx], f.facilitator);
-        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, 100_000);
+        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram, 100_000);
         t.ok(result);
         t.equal(result && result.payer, f.sender.address);
         t.end();
@@ -167,7 +169,7 @@ await t.test("isValidTransaction", async (t) => {
             microLamports: 10000000n,
         });
         const txMsg = buildTxMessage([highLimitIx, highPriceIx, f.transferIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, 100), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram, 100), false);
         t.end();
     });
     await t.test("rejects transaction exceeding priority fee limit with lighthouse ixs", async (t) => {
@@ -179,7 +181,7 @@ await t.test("isValidTransaction", async (t) => {
             microLamports: 10000000n,
         });
         const txMsg = buildTxMessage([highLimitIx, highPriceIx, f.transferIx, makeLighthouseIx()], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, 100), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram, 100), false);
         t.end();
     });
     await t.test("rejects trailing non-lighthouse instruction", async (t) => {
@@ -190,7 +192,7 @@ await t.test("isValidTransaction", async (t) => {
             data: new Uint8Array([0]),
         };
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx, fakeIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects mixed lighthouse and non-lighthouse trailing instructions", async (t) => {
@@ -207,7 +209,7 @@ await t.test("isValidTransaction", async (t) => {
             makeLighthouseIx(),
             fakeIx,
         ], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction with wrong transfer amount", async (t) => {
@@ -221,7 +223,7 @@ await t.test("isValidTransaction", async (t) => {
             decimals: f.decimals,
         });
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, wrongAmountIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction with wrong mint", async (t) => {
@@ -246,7 +248,7 @@ await t.test("isValidTransaction", async (t) => {
             decimals: f.decimals,
         });
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, wrongMintIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction with wrong destination", async (t) => {
@@ -266,7 +268,7 @@ await t.test("isValidTransaction", async (t) => {
             decimals: f.decimals,
         });
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, wrongDestIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction where facilitator is transfer authority", async (t) => {
@@ -280,7 +282,7 @@ await t.test("isValidTransaction", async (t) => {
             decimals: f.decimals,
         });
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, badIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
         t.end();
     });
     await t.test("rejects transaction where source is facilitator ATA", async (t) => {
@@ -294,7 +296,17 @@ await t.test("isValidTransaction", async (t) => {
             decimals: f.decimals,
         });
         const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, badIx], f.facilitator);
-        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address), false);
+        t.equal(await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram), false);
+        t.end();
+    });
+    await t.test("accepts valid transaction with Token-2022 program", async (t) => {
+        const f = await createFixtures({
+            tokenProgram: TOKEN_2022_PROGRAM_ADDRESS,
+        });
+        const txMsg = buildTxMessage([f.computeLimitIx, f.computePriceIx, f.transferIx], f.facilitator);
+        const result = await isValidTransaction(txMsg, f.requirements, f.facilitator.address, f.tokenProgram);
+        t.ok(result);
+        t.equal(result && result.payer, f.sender.address);
         t.end();
     });
     t.end();

package/dist/src/splToken.d.ts

@@ -1,6 +1,8 @@
 import type { Rpc } from "@solana/rpc";
 import type { GetTokenAccountBalanceApi } from "@solana/rpc-api";
+import { type Address } from "@solana/kit";
 import { Base58Address } from "@faremeter/types/solana";
+export declare const TOKEN_2022_PROGRAM_ADDRESS: Address<"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb">;
 /**
  * Arguments for retrieving an SPL token balance.
  */
@@ -11,6 +13,8 @@ export interface GetTokenBalanceArgs {
     account: Base58Address;
     /** Solana RPC client with token balance API support */
     rpcClient: Rpc<GetTokenAccountBalanceApi>;
+    /** The token program address (defaults to TOKEN_PROGRAM_ADDRESS) */
+    tokenProgram?: Address;
 }
 /**
  * Checks if an error indicates a token account was not found.

package/dist/src/splToken.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"splToken.d.ts","sourceRoot":"","sources":["../../src/splToken.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,iCAAiC;IACjC,KAAK,EAAE,aAAa,CAAC;IACrB,kDAAkD;IAClD,OAAO,EAAE,aAAa,CAAC;IACvB,uDAAuD;IACvD,SAAS,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC;CAC3C;AAED;;;;;;;;;GASG;AAEH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,WAkBhD;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB;;;UA4B9D"}
+{"version":3,"file":"splToken.d.ts","sourceRoot":"","sources":["../../src/splToken.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAQxD,eAAO,MAAM,0BAA0B,wDAEtC,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,iCAAiC;IACjC,KAAK,EAAE,aAAa,CAAC;IACrB,kDAAkD;IAClD,OAAO,EAAE,aAAa,CAAC;IACvB,uDAAuD;IACvD,SAAS,EAAE,GAAG,CAAC,yBAAyB,CAAC,CAAC;IAC1C,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;GASG;AAEH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,OAAO,WAkBhD;AAED;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB;;;UA4B9D"}

package/dist/src/splToken.js

@@ -1,6 +1,9 @@
-import { address } from "@solana/addresses";
+import { address } from "@solana/kit";
 import { Base58Address } from "@faremeter/types/solana";
 import { findAssociatedTokenPda, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
+// XXX - @solana-program/token doesn't export this, and @solana-program/token-2022
+// is 4MB for one constant. Define it here as a kit-native Address.
+export const TOKEN_2022_PROGRAM_ADDRESS = address("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
 /**
  * Checks if an error indicates a token account was not found.
  *
@@ -37,13 +40,13 @@ export function isAccountNotFoundError(e) {
  * @returns The balance amount and decimals, or null if the account does not exist
  */
 export async function getTokenBalance(args) {
-    const { asset, account, rpcClient } = args;
+    const { asset, account, rpcClient, tokenProgram } = args;
     const owner = address(account);
     const mint = address(asset);
     const [ata] = await findAssociatedTokenPda({
         mint,
         owner,
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram: tokenProgram ?? TOKEN_PROGRAM_ADDRESS,
     });
     let balanceInfo;
     try {