@faremeter/payment-solana 0.8.0 → 0.10.0

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

@@ -7,5 +7,5 @@ export type Wallet = {
     updateTransaction?: (tx: VersionedTransaction) => Promise<VersionedTransaction>;
     sendTransaction?: (tx: VersionedTransaction) => Promise<string>;
 };
-export declare function createPaymentHandler(wallet: Wallet, mint: PublicKey, connection: Connection): PaymentHandler;
+export declare function createPaymentHandler(wallet: Wallet, mint: PublicKey, connection?: Connection): PaymentHandler;
 //# 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":"AAMA,OAAO,KAAK,EAEV,cAAc,EAEf,MAAM,yBAAyB,CAAC;AAWjC,OAAO,EAEL,UAAU,EACV,SAAS,EACT,sBAAsB,EAEtB,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAQzB,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,EAAE,UAAU,GACrB,cAAc,CAqGhB"}
+{"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"}

package/dist/src/exact/client.js

@@ -1,24 +1,41 @@
-import { isValidationError, throwValidationError, caseInsensitiveLiteral, } from "@faremeter/types";
+import { isValidationError, throwValidationError } from "@faremeter/types";
 import { createTransferCheckedInstruction, getAssociatedTokenAddressSync, getMint, } from "@solana/spl-token";
 import { getBase64EncodedWireTransaction, } from "@solana/transactions";
 import { ComputeBudgetProgram, Connection, PublicKey, TransactionInstruction, TransactionMessage, VersionedTransaction, } from "@solana/web3.js";
-import { type } from "arktype";
-import { PaymentRequirementsExtra, x402Scheme, lookupX402Network, } from "./facilitator.js";
+import { PaymentRequirementsExtra } from "./facilitator.js";
+import { generateMatcher } from "./common.js";
 export function createPaymentHandler(wallet, mint, connection) {
-    const matcher = type({
-        scheme: caseInsensitiveLiteral(x402Scheme),
-        network: caseInsensitiveLiteral(lookupX402Network(wallet.network)),
-        asset: caseInsensitiveLiteral(mint ? mint.toBase58() : "sol"),
-    });
+    const { matchTupleAndAsset } = generateMatcher(wallet.network, mint ? mint.toBase58() : "sol");
     return async (context, accepts) => {
         const res = accepts
-            .filter((r) => !isValidationError(matcher(r)))
+            .filter((r) => !isValidationError(matchTupleAndAsset(r)))
             .map((requirements) => {
             const extra = PaymentRequirementsExtra(requirements.extra);
             if (isValidationError(extra)) {
                 throwValidationError("couldn't validate requirements extra field", extra);
             }
             const exec = async () => {
+                let recentBlockhash;
+                if (extra.recentBlockhash !== undefined) {
+                    recentBlockhash = extra.recentBlockhash;
+                }
+                else if (connection !== undefined) {
+                    recentBlockhash = (await connection.getLatestBlockhash()).blockhash;
+                }
+                else {
+                    throw new Error("couldn't get the latest Solana network block hash");
+                }
+                let decimals;
+                if (extra.decimals !== undefined) {
+                    decimals = extra.decimals;
+                }
+                else if (connection !== undefined) {
+                    const mintInfo = await getMint(connection, mint);
+                    decimals = mintInfo.decimals;
+                }
+                else {
+                    throw new Error("couldn't get the decimal information for the mint");
+                }
                 const paymentRequirements = {
                     ...extra,
                     amount: Number(requirements.maxAmountRequired),
@@ -26,7 +43,6 @@ export function createPaymentHandler(wallet, mint, connection) {
                 };
                 const sourceAccount = getAssociatedTokenAddressSync(mint, wallet.publicKey);
                 const receiverAccount = getAssociatedTokenAddressSync(mint, paymentRequirements.receiver);
-                const mintInfo = await getMint(connection, mint);
                 const instructions = [
                     ComputeBudgetProgram.setComputeUnitLimit({
                         units: 50_000,
@@ -34,10 +50,8 @@ export function createPaymentHandler(wallet, mint, connection) {
                     ComputeBudgetProgram.setComputeUnitPrice({
                         microLamports: 1,
                     }),
-                    createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, paymentRequirements.amount, mintInfo.decimals),
+                    createTransferCheckedInstruction(sourceAccount, mint, receiverAccount, wallet.publicKey, paymentRequirements.amount, decimals),
                 ];
-                const recentBlockhash = (await connection.getLatestBlockhash())
-                    .blockhash;
                 let tx;
                 if (wallet.buildTransaction) {
                     tx = await wallet.buildTransaction(instructions, recentBlockhash);

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

@@ -0,0 +1,13 @@
+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">;
+        network: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
+        asset: (In: string) => import("arktype/internal/attributes.ts").To<Lowercase<string>>;
+    }, {}>;
+};
+//# sourceMappingURL=common.d.ts.map

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

@@ -0,0 +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"}

package/dist/src/exact/common.js

@@ -0,0 +1,17 @@
+import { type } from "arktype";
+import { caseInsensitiveLiteral } from "@faremeter/types";
+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,
+    };
+}

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

@@ -0,0 +1,3 @@
+#!/usr/bin/env pnpm tsx
+export {};
+//# sourceMappingURL=common.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"common.test.d.ts","sourceRoot":"","sources":["../../../src/exact/common.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,35 @@
+#!/usr/bin/env pnpm tsx
+import t from "tap";
+import { isValidationError as iVE } from "@faremeter/types";
+import { lookupKnownSPLToken } from "@faremeter/info/solana";
+import { generateMatcher } from "./common.js";
+await t.test("testBasicMatching", async (t) => {
+    {
+        const tokenInfo = lookupKnownSPLToken("mainnet-beta", "USDC");
+        if (tokenInfo === undefined) {
+            t.bailout("couldn't find SPL token");
+            return;
+        }
+        const { matchTuple, matchTupleAndAsset } = 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({
+            ...req,
+            network: "solana",
+        })));
+        t.ok(iVE(matchTuple({
+            ...req,
+            network: "foobar",
+        })));
+        t.ok(iVE(matchTuple({
+            ...req,
+            scheme: "fner",
+        })));
+    }
+    t.end();
+});

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

@@ -2,9 +2,10 @@ import type { FacilitatorHandler } from "@faremeter/types/facilitator";
 import { type Rpc, type SolanaRpcApi } from "@solana/kit";
 import type { TransactionError } from "@solana/rpc-types";
 import { Keypair, type PublicKey } from "@solana/web3.js";
-export declare const x402Scheme = "exact";
 export declare const PaymentRequirementsExtra: import("arktype/internal/methods/object.ts").ObjectType<{
     feePayer: string;
+    decimals?: number;
+    recentBlockhash?: string;
 }, {}>;
 export declare const PaymentPayload: import("arktype/internal/methods/object.ts").ObjectType<{
     transaction: (In: string) => import("arktype").Out<Readonly<{
@@ -12,7 +13,6 @@ export declare const PaymentPayload: import("arktype/internal/methods/object.ts"
         signatures: import("@solana/transactions").SignaturesMap;
     }>>;
 }, {}>;
-export declare const lookupX402Network: (network: string) => string;
 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;
 //# 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":"AAMA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAEvE,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;AAK1D,eAAO,MAAM,UAAU,UAAU,CAAC;AAElC,eAAO,MAAM,wBAAwB;;MAEnC,CAAC;AAmBH,eAAO,MAAM,cAAc;;;;;MAEzB,CAAC;AAEH,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,WAEhD,CAAC;AAEF,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,kBAuGF,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;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"}

package/dist/src/exact/facilitator.js

@@ -1,4 +1,5 @@
-import { isValidationError, caseInsensitiveLiteral } from "@faremeter/types";
+import { isValidationError } from "@faremeter/types";
+import { lookupX402Network } from "@faremeter/info/solana";
 import { fetchMint } from "@solana-program/token";
 import { address, createKeyPairSignerFromBytes, decompileTransactionMessage, getBase64Encoder, getCompiledTransactionMessageDecoder, } from "@solana/kit";
 import { getBase64EncodedWireTransaction, getTransactionDecoder, partiallySignTransaction, } from "@solana/transactions";
@@ -6,9 +7,11 @@ import { Keypair } from "@solana/web3.js";
 import { type } from "arktype";
 import { isValidTransaction } from "./verify.js";
 import { logger } from "./logger.js";
-export const x402Scheme = "exact";
+import { x402Scheme, generateMatcher } from "./common.js";
 export const PaymentRequirementsExtra = type({
     feePayer: "string",
+    decimals: "number?",
+    recentBlockhash: "string?",
 });
 function errorResponse(msg) {
     logger.error(msg);
@@ -28,9 +31,6 @@ const TransactionString = type("string").pipe.try((tx) => {
 export const PaymentPayload = type({
     transaction: TransactionString,
 });
-export const lookupX402Network = (network) => {
-    return `solana-${network}`;
-};
 export function transactionErrorToString(t) {
     if (typeof t == "string") {
         return t;
@@ -73,19 +73,23 @@ 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) => {
-    const checkTuple = type({
-        scheme: caseInsensitiveLiteral(x402Scheme),
-        network: caseInsensitiveLiteral(lookupX402Network(network)),
-    });
-    const checkTupleAndAsset = checkTuple.and({
-        asset: caseInsensitiveLiteral(mint.toBase58()),
-    });
+    const { matchTuple, matchTupleAndAsset } = generateMatcher(network, mint.toBase58());
+    const getSupported = () => {
+        return lookupX402Network(network).map((network) => Promise.resolve({
+            x402Version: 1,
+            scheme: x402Scheme,
+            network,
+            extra: {
+                feePayer: feePayerKeypair.publicKey.toString(),
+            },
+        }));
+    };
     const getRequirements = async (req) => {
         const recentBlockhash = (await rpc.getLatestBlockhash().send()).value
             .blockhash;
         const mintInfo = await fetchMint(rpc, address(mint.toBase58()));
         return req
-            .filter((x) => !isValidationError(checkTupleAndAsset(x)))
+            .filter((x) => !isValidationError(matchTupleAndAsset(x)))
             .map((x) => {
             return {
                 ...x,
@@ -99,7 +103,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, ma
         });
     };
     const handleSettle = async (requirements, payment) => {
-        if (isValidationError(checkTuple(payment))) {
+        if (isValidationError(matchTuple(payment))) {
             return null;
         }
         const paymentPayload = PaymentPayload(payment.payload);
@@ -150,6 +154,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, ma
         };
     };
     return {
+        getSupported,
         getRequirements,
         handleSettle,
     };

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

@@ -1,3 +1,3 @@
 export { createPaymentHandler } from "./client.js";
-export { createFacilitatorHandler, lookupX402Network } from "./facilitator.js";
+export { createFacilitatorHandler } from "./facilitator.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exact/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/exact/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC"}

package/dist/src/exact/index.js

@@ -1,2 +1,2 @@
 export { createPaymentHandler } from "./client.js";
-export { createFacilitatorHandler, lookupX402Network } from "./facilitator.js";
+export { createFacilitatorHandler } from "./facilitator.js";