@faremeter/payment-solana 0.8.0 → 0.9.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":"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,CAAC,EAAE,UAAU,GACtB,cAAc,CAyHhB"}

package/dist/src/exact/client.js

@@ -19,6 +19,27 @@ export function createPaymentHandler(wallet, mint, connection) {
                 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 +47,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 +54,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/facilitator.d.ts

@@ -5,6 +5,8 @@ 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<{

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;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;;;;MAInC,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,kBAqHF,CAAC"}

package/dist/src/exact/facilitator.js

@@ -9,6 +9,8 @@ import { logger } from "./logger.js";
 export const x402Scheme = "exact";
 export const PaymentRequirementsExtra = type({
     feePayer: "string",
+    decimals: "number?",
+    recentBlockhash: "string?",
 });
 function errorResponse(msg) {
     logger.error(msg);
@@ -80,6 +82,18 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, ma
     const checkTupleAndAsset = checkTuple.and({
         asset: caseInsensitiveLiteral(mint.toBase58()),
     });
+    const getSupported = () => {
+        return [
+            Promise.resolve({
+                x402Version: 1,
+                scheme: x402Scheme,
+                network: lookupX402Network(network),
+                extra: {
+                    feePayer: feePayerKeypair.publicKey.toString(),
+                },
+            }),
+        ];
+    };
     const getRequirements = async (req) => {
         const recentBlockhash = (await rpc.getLatestBlockhash().send()).value
             .blockhash;
@@ -150,6 +164,7 @@ export const createFacilitatorHandler = (network, rpc, feePayerKeypair, mint, ma
         };
     };
     return {
+        getSupported,
         getRequirements,
         handleSettle,
     };