@faremeter/payment-solana 0.10.0 → 0.10.2

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

@@ -7,6 +7,11 @@ export declare const PaymentRequirementsExtra: import("arktype/internal/methods/
     decimals?: number;
     recentBlockhash?: string;
 }, {}>;
+interface FacilitatorOptions {
+    maxRetries?: number;
+    retryDelayMs?: number;
+    maxPriorityFee?: number;
+}
 export declare const PaymentPayload: import("arktype/internal/methods/object.ts").ObjectType<{
     transaction: (In: string) => import("arktype").Out<Readonly<{
         messageBytes: import("@solana/transactions").TransactionMessageBytes;
@@ -14,5 +19,6 @@ export declare const PaymentPayload: import("arktype/internal/methods/object.ts"
     }>>;
 }, {}>;
 export declare function transactionErrorToString(t: TransactionError): string;
-export declare const createFacilitatorHandler: (network: string, rpc: Rpc<SolanaRpcApi>, feePayerKeypair: Keypair, mint: PublicKey, maxRetries?: number, retryDelayMs?: number) => FacilitatorHandler;
+export declare const createFacilitatorHandler: (network: string, rpc: Rpc<SolanaRpcApi>, feePayerKeypair: Keypair, mint: PublicKey, config?: FacilitatorOptions) => FacilitatorHandler;
+export {};
 //# sourceMappingURL=facilitator.d.ts.map

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;AAmBH,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,mBAAe,EACf,qBAAmB,KAClB,kBAkHF,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,kBA+HF,CAAC"}

package/dist/src/exact/facilitator.js

@@ -72,8 +72,9 @@ const sendTransaction = async (rpc, signedTransaction, maxRetries, retryDelayMs)
     }
     return { success: false, error: "Transaction confirmation timeout" };
 };
-export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, maxRetries = 30, retryDelayMs = 1000) => {
+export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, config) => {
     const { matchTuple, matchTupleAndAsset } = generateMatcher(network, mint.toBase58());
+    const { maxRetries = 30, retryDelayMs = 1000, maxPriorityFee = 100_000, } = config ?? {};
     const getSupported = () => {
         return lookupX402Network(network).map((network) => Promise.resolve({
             x402Version: 1,
@@ -120,7 +121,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, ma
             throw new Error("Failed to get compiled transaction message", { cause });
         }
         try {
-            if (!(await isValidTransaction(transactionMessage, requirements))) {
+            if (!(await isValidTransaction(transactionMessage, requirements, feePayerKeypair.publicKey, maxPriorityFee))) {
                 logger.error("Invalid transaction");
                 return errorResponse("Invalid transaction");
             }

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

@@ -1,4 +1,5 @@
 import type { x402PaymentRequirements } from "@faremeter/types/x402";
 import { type CompilableTransactionMessage } from "@solana/kit";
-export declare function isValidTransaction(transactionMessage: CompilableTransactionMessage, paymentRequirements: x402PaymentRequirements): Promise<boolean>;
+import type { PublicKey } from "@solana/web3.js";
+export declare function isValidTransaction(transactionMessage: CompilableTransactionMessage, paymentRequirements: x402PaymentRequirements, facilitatorAddress: PublicKey, maxPriorityFee?: number): Promise<boolean>;
 //# 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,uBAAuB,CAAC;AAYrE,OAAO,EAEL,KAAK,4BAA4B,EAElC,MAAM,aAAa,CAAC;AA+ErB,wBAAsB,kBAAkB,CACtC,kBAAkB,EAAE,4BAA4B,EAChD,mBAAmB,EAAE,uBAAuB,GAC3C,OAAO,CAAC,OAAO,CAAC,CA4ClB"}
+{"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"}

package/dist/src/exact/verify.js

@@ -3,37 +3,41 @@ import { parseSetComputeUnitLimitInstruction, parseSetComputeUnitPriceInstructio
 import { findAssociatedTokenPda, parseCreateAssociatedTokenInstruction, parseTransferCheckedInstruction, TOKEN_PROGRAM_ADDRESS, } from "@solana-program/token";
 import { address, } from "@solana/kit";
 import { PaymentRequirementsExtra } from "./facilitator.js";
+import { logger } from "./logger.js";
 function verifyComputeUnitLimitInstruction(instruction) {
     if (!instruction.data) {
-        return false;
+        return { valid: false };
     }
     try {
-        parseSetComputeUnitLimitInstruction({
+        const parsed = parseSetComputeUnitLimitInstruction({
             programAddress: instruction.programAddress,
             data: new Uint8Array(instruction.data),
         });
-        return true;
+        return { valid: true, units: parsed.data.units };
     }
     catch {
-        return false;
+        return { valid: false };
     }
 }
 function verifyComputeUnitPriceInstruction(instruction) {
     if (!instruction.data) {
-        return false;
+        return { valid: false };
     }
     try {
-        parseSetComputeUnitPriceInstruction({
+        const parsed = parseSetComputeUnitPriceInstruction({
             programAddress: instruction.programAddress,
             data: new Uint8Array(instruction.data),
         });
-        return true;
+        return { valid: true, microLamports: parsed.data.microLamports };
     }
     catch {
-        return false;
+        return { valid: false };
     }
 }
-async function verifyTransferInstruction(instruction, paymentRequirements, destination) {
+function calculatePriorityFee(units, microLamports) {
+    return (units * Number(microLamports)) / 1_000_000;
+}
+async function verifyTransferInstruction(instruction, paymentRequirements, destination, facilitatorAddress) {
     if (!instruction.data || !instruction.accounts) {
         return false;
     }
@@ -48,6 +52,19 @@ async function verifyTransferInstruction(instruction, paymentRequirements, desti
     catch {
         return false;
     }
+    if (transfer.accounts.authority.address === facilitatorAddress) {
+        logger.error("Dropping transfer where the transfer authority is the facilitator");
+        return false;
+    }
+    const [facilitatorATA] = await findAssociatedTokenPda({
+        mint: address(paymentRequirements.asset),
+        owner: address(facilitatorAddress),
+        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+    });
+    if (transfer.accounts.source.address === facilitatorATA) {
+        logger.error("Dropping transfer where the source is the facilitator");
+        return false;
+    }
     return (transfer.data.amount === BigInt(paymentRequirements.maxAmountRequired) &&
         transfer.accounts.mint.address === paymentRequirements.asset &&
         transfer.accounts.destination.address === destination);
@@ -68,7 +85,7 @@ function verifyCreateATAInstruction(instruction) {
         return false;
     }
 }
-export async function isValidTransaction(transactionMessage, paymentRequirements) {
+export async function isValidTransaction(transactionMessage, paymentRequirements, facilitatorAddress, maxPriorityFee) {
     const extra = PaymentRequirementsExtra(paymentRequirements.extra);
     if (isValidationError(extra)) {
         throw new Error("feePayer is required");
@@ -88,19 +105,43 @@ export async function isValidTransaction(transactionMessage, paymentRequirements
         if (!ix0 || !ix1 || !ix2) {
             return false;
         }
-        return (verifyComputeUnitLimitInstruction(ix0) &&
-            verifyComputeUnitPriceInstruction(ix1) &&
-            (await verifyTransferInstruction(ix2, paymentRequirements, destination)));
+        const limitResult = verifyComputeUnitLimitInstruction(ix0);
+        const priceResult = verifyComputeUnitPriceInstruction(ix1);
+        if (!limitResult.valid || !priceResult.valid) {
+            return false;
+        }
+        if (maxPriorityFee !== undefined &&
+            limitResult.units !== undefined &&
+            priceResult.microLamports !== undefined) {
+            const priorityFee = calculatePriorityFee(limitResult.units, priceResult.microLamports);
+            if (priorityFee > maxPriorityFee) {
+                logger.error(`Priority fee ${priorityFee} exceeds maximum ${maxPriorityFee}`);
+                return false;
+            }
+        }
+        return await verifyTransferInstruction(ix2, paymentRequirements, destination, facilitatorAddress.toBase58());
     }
     else if (instructions.length === 4) {
         const [ix0, ix1, ix2, ix3] = instructions;
         if (!ix0 || !ix1 || !ix2 || !ix3) {
             return false;
         }
-        return (verifyComputeUnitLimitInstruction(ix0) &&
-            verifyComputeUnitPriceInstruction(ix1) &&
-            verifyCreateATAInstruction(ix2) &&
-            (await verifyTransferInstruction(ix3, paymentRequirements, destination)));
+        const limitResult = verifyComputeUnitLimitInstruction(ix0);
+        const priceResult = verifyComputeUnitPriceInstruction(ix1);
+        if (!limitResult.valid || !priceResult.valid) {
+            return false;
+        }
+        if (maxPriorityFee !== undefined &&
+            limitResult.units !== undefined &&
+            priceResult.microLamports !== undefined) {
+            const priorityFee = calculatePriorityFee(limitResult.units, priceResult.microLamports);
+            if (priorityFee > maxPriorityFee) {
+                logger.error(`Priority fee ${priorityFee} exceeds maximum ${maxPriorityFee}`);
+                return false;
+            }
+        }
+        return (verifyCreateATAInstruction(ix2) &&
+            (await verifyTransferInstruction(ix3, paymentRequirements, destination, facilitatorAddress.toBase58())));
     }
     return false;
 }