@faremeter/payment-solana 0.10.2 → 0.11.0

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

@@ -7,5 +7,14 @@ export type Wallet = {
     updateTransaction?: (tx: VersionedTransaction) => Promise<VersionedTransaction>;
     sendTransaction?: (tx: VersionedTransaction) => Promise<string>;
 };
-export declare function createPaymentHandler(wallet: Wallet, mint: PublicKey, connection?: Connection): PaymentHandler;
+interface GetAssociatedTokenAddressSyncOptions {
+    allowOwnerOffCurve?: boolean;
+    programId?: PublicKey;
+    associatedTokenProgramId?: PublicKey;
+}
+interface CreatePaymentHandlerOptions {
+    token?: GetAssociatedTokenAddressSyncOptions;
+}
+export declare function createPaymentHandler(wallet: Wallet, mint: PublicKey, connection?: Connection, options?: CreatePaymentHandlerOptions): PaymentHandler;
+export {};
 //# sourceMappingURL=client.d.ts.map

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;AAWjC,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,sBAAsB,EAAE,EACtC,eAAe,EAAE,MAAM,KACpB,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,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,CAAC,EAAE,UAAU,GACtB,cAAc,CAwHhB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/exact/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AAWjC,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAIzB,MAAM,MAAM,MAAM,GAAG;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,CAAC,EAAE,CACjB,YAAY,EAAE,sBAAsB,EAAE,EACtC,eAAe,EAAE,MAAM,KACpB,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;AAgBD,UAAU,2BAA2B;IACnC,KAAK,CAAC,EAAE,oCAAoC,CAAC;CAC9C;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,CAAC,EAAE,UAAU,EACvB,OAAO,CAAC,EAAE,2BAA2B,GACpC,cAAc,CAuHhB"}

package/dist/src/exact/client.js

@@ -4,12 +4,19 @@ import { getBase64EncodedWireTransaction, } from "@solana/transactions";
 import { ComputeBudgetProgram, Connection, PublicKey, TransactionInstruction, TransactionMessage, VersionedTransaction, } from "@solana/web3.js";
 import { PaymentRequirementsExtra } from "./facilitator.js";
 import { generateMatcher } from "./common.js";
-export function createPaymentHandler(wallet, mint, connection) {
-    const { matchTupleAndAsset } = generateMatcher(wallet.network, mint ? mint.toBase58() : "sol");
+function generateGetAssociatedTokenAddressSyncRest(tokenConfig) {
+    const { allowOwnerOffCurve, programId, associatedTokenProgramId } = tokenConfig;
+    // NOTE: These map to the trailing default args of
+    // getAssociatedTokenAddressSync, so order matters. If things are
+    // refactored, they should be updated to match the reality of the
+    // implementation.
+    return [allowOwnerOffCurve, programId, associatedTokenProgramId];
+}
+export function createPaymentHandler(wallet, mint, connection, options) {
+    const getAssociatedTokenAddressSyncRest = generateGetAssociatedTokenAddressSyncRest(options?.token ?? {});
+    const { isMatchingRequirement } = generateMatcher(wallet.network, mint ? mint.toBase58() : "sol");
     return async (context, accepts) => {
-        const res = accepts
-            .filter((r) => !isValidationError(matchTupleAndAsset(r)))
-            .map((requirements) => {
+        const res = accepts.filter(isMatchingRequirement).map((requirements) => {
             const extra = PaymentRequirementsExtra(requirements.extra);
             if (isValidationError(extra)) {
                 throwValidationError("couldn't validate requirements extra field", extra);
@@ -41,8 +48,8 @@ export function createPaymentHandler(wallet, mint, connection) {
                     amount: Number(requirements.maxAmountRequired),
                     receiver: new PublicKey(requirements.payTo),
                 };
-                const sourceAccount = getAssociatedTokenAddressSync(mint, wallet.publicKey);
-                const receiverAccount = getAssociatedTokenAddressSync(mint, paymentRequirements.receiver);
+                const sourceAccount = getAssociatedTokenAddressSync(mint, wallet.publicKey, ...getAssociatedTokenAddressSyncRest);
+                const receiverAccount = getAssociatedTokenAddressSync(mint, paymentRequirements.receiver, ...getAssociatedTokenAddressSyncRest);
                 const instructions = [
                     ComputeBudgetProgram.setComputeUnitLimit({
                         units: 50_000,

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

@@ -1,13 +1,14 @@
 export declare const x402Scheme = "exact";
 export declare function generateMatcher(network: string, asset: string): {
     matchTuple: import("arktype/internal/methods/object.ts").ObjectType<{
-        scheme: (In: string) => import("arktype/internal/attributes.ts").To<"exact">;
-        network: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
-    }, {}>;
-    matchTupleAndAsset: import("arktype/internal/methods/object.ts").ObjectType<{
-        scheme: (In: string) => import("arktype/internal/attributes.ts").To<"exact">;
+        scheme: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
         network: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
         asset: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
     }, {}>;
+    isMatchingRequirement: (req: {
+        scheme: string;
+        network: string;
+        asset: string;
+    }) => boolean;
 };
 //# sourceMappingURL=common.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/exact/common.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;EAa7D"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/exact/common.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;;;;;;;;;;;EAI7D"}

package/dist/src/exact/common.js

@@ -1,17 +1,8 @@
-import { type } from "arktype";
-import { caseInsensitiveLiteral } from "@faremeter/types";
+import { generateRequirementsMatcher } from "@faremeter/types/x402";
 import { lookupX402Network } from "@faremeter/info/solana";
 export const x402Scheme = "exact";
 export function generateMatcher(network, asset) {
-    const matchTuple = type({
-        scheme: caseInsensitiveLiteral(x402Scheme),
-        network: caseInsensitiveLiteral(...lookupX402Network(network)),
-    });
-    const matchTupleAndAsset = matchTuple.and({
-        asset: caseInsensitiveLiteral(asset),
-    });
-    return {
-        matchTuple,
-        matchTupleAndAsset,
-    };
+    return generateRequirementsMatcher([x402Scheme], lookupX402Network(network), [
+        asset,
+    ]);
 }

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

@@ -10,15 +10,14 @@ await t.test("testBasicMatching", async (t) => {
             t.bailout("couldn't find SPL token");
             return;
         }
-        const { matchTuple, matchTupleAndAsset } = generateMatcher("mainnet-beta", tokenInfo.address);
+        const { matchTuple } = generateMatcher("mainnet-beta", tokenInfo.address);
         const req = {
             network: "solana-mainnet-beta",
             scheme: "exact",
             asset: tokenInfo.address,
         };
         t.ok(!iVE(matchTuple(req)));
-        t.ok(!iVE(matchTupleAndAsset(req)));
-        t.ok(!iVE(matchTupleAndAsset({
+        t.ok(!iVE(matchTuple({
             ...req,
             network: "solana",
         })));

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

@@ -1 +1 @@
-{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAML,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM1D,eAAO,MAAM,wBAAwB;;;;MAInC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAmBD,eAAO,MAAM,cAAc;;;;;MAEzB,CAAC;AAEH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,kBA+HF,CAAC"}
+{"version":3,"file":"facilitator.d.ts","sourceRoot":"","sources":["../../../src/exact/facilitator.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAML,KAAK,GAAG,EACR,KAAK,YAAY,EAClB,MAAM,aAAa,CAAC;AAOrB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAM1D,eAAO,MAAM,wBAAwB;;;;MAInC,CAAC;AAEH,UAAU,kBAAkB;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IAGtB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAmBD,eAAO,MAAM,cAAc;;;;;MAEzB,CAAC;AAEH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,gBAAgB,UAY3D;AAiDD,eAAO,MAAM,wBAAwB,GACnC,SAAS,MAAM,EACf,KAAK,GAAG,CAAC,YAAY,CAAC,EACtB,iBAAiB,OAAO,EACxB,MAAM,SAAS,EACf,SAAS,kBAAkB,KAC1B,kBA0HF,CAAC"}

package/dist/src/exact/facilitator.js

@@ -73,7 +73,7 @@ const sendTransaction = async (rpc, signedTransaction, maxRetries, retryDelayMs)
     return { success: false, error: "Transaction confirmation timeout" };
 };
 export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, config) => {
-    const { matchTuple, matchTupleAndAsset } = generateMatcher(network, mint.toBase58());
+    const { isMatchingRequirement } = generateMatcher(network, mint.toBase58());
     const { maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = config ?? {};
     const getSupported = () => {
         return lookupX402Network(network).map((network) => Promise.resolve({
@@ -89,9 +89,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, co
         const recentBlockhash = (await rpc.getLatestBlockhash().send()).value
             .blockhash;
         const mintInfo = await fetchMint(rpc, address(mint.toBase58()));
-        return req
-            .filter((x) => !isValidationError(matchTupleAndAsset(x)))
-            .map((x) => {
+        return req.filter(isMatchingRequirement).map((x) => {
             return {
                 ...x,
                 asset: mint.toBase58(),
@@ -104,7 +102,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, co
         });
     };
     const handleSettle = async (requirements, payment) => {
-        if (isValidationError(matchTuple(payment))) {
+        if (!isMatchingRequirement(requirements)) {
             return null;
         }
         const paymentPayload = PaymentPayload(payment.payload);

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,uBAAuB,CAAC;AAYrE,OAAO,EAEL,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AA2GjD,wBAAsB,kBAAkB,CACtC,kBAAkB,EAAE,4BAA4B,EAChD,mBAAmB,EAAE,uBAAuB,EAC5C,kBAAkB,EAAE,SAAS,EAC7B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAiGlB"}
+{"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../src/exact/verify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAYrE,OAAO,EAEL,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;AAGrB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAqHjD,wBAAsB,kBAAkB,CACtC,kBAAkB,EAAE,4BAA4B,EAChD,mBAAmB,EAAE,uBAAuB,EAC5C,kBAAkB,EAAE,SAAS,EAC7B,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAkGlB"}

package/dist/src/exact/verify.js

@@ -69,16 +69,20 @@ async function verifyTransferInstruction(instruction, paymentRequirements, desti
         transfer.accounts.mint.address === paymentRequirements.asset &&
         transfer.accounts.destination.address === destination);
 }
-function verifyCreateATAInstruction(instruction) {
+function verifyCreateATAInstruction(instruction, facilitatorAddress) {
     if (!instruction.data || !instruction.accounts) {
         return false;
     }
     try {
-        parseCreateAssociatedTokenInstruction({
+        const createInstruction = parseCreateAssociatedTokenInstruction({
             accounts: instruction.accounts,
             programAddress: instruction.programAddress,
             data: new Uint8Array(instruction.data),
         });
+        if (createInstruction.accounts.payer.address === facilitatorAddress) {
+            logger.error("Dropping transaction where the facilitator pays for a token account creation");
+            return false;
+        }
         return true;
     }
     catch {
@@ -99,6 +103,7 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
         tokenProgram: TOKEN_PROGRAM_ADDRESS,
     });
     const instructions = transactionMessage.instructions;
+    const facilitatorBase58 = facilitatorAddress.toBase58();
     if (instructions.length === 3) {
         // Make typescript happy...
         const [ix0, ix1, ix2] = instructions;
@@ -119,7 +124,7 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
                 return false;
             }
         }
-        return await verifyTransferInstruction(ix2, paymentRequirements, destination, facilitatorAddress.toBase58());
+        return await verifyTransferInstruction(ix2, paymentRequirements, destination, facilitatorBase58);
     }
     else if (instructions.length === 4) {
         const [ix0, ix1, ix2, ix3] = instructions;
@@ -140,8 +145,8 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
                 return false;
             }
         }
-        return (verifyCreateATAInstruction(ix2) &&
-            (await verifyTransferInstruction(ix3, paymentRequirements, destination, facilitatorAddress.toBase58())));
+        return (verifyCreateATAInstruction(ix2, facilitatorBase58) &&
+            (await verifyTransferInstruction(ix3, paymentRequirements, destination, facilitatorBase58)));
     }
     return false;
 }