@atxp/client 0.7.3 → 0.7.4

package/dist/index.d.ts

@@ -76,6 +76,12 @@ interface PaymentMaker {
         paymentRequestId: string;
         codeChallenge: string;
     }) => Promise<string>;
+    getSourceAddress: (params: {
+        amount: BigNumber;
+        currency: Currency;
+        receiver: string;
+        memo: string;
+    }) => string | Promise<string>;
 }
 
 type RequiredClientConfigFields = 'mcpServer' | 'account';
@@ -142,6 +148,12 @@ declare class SolanaPaymentMaker implements PaymentMaker {
     private source;
     private logger;
     constructor(solanaEndpoint: string, sourceSecretKey: string, logger?: Logger);
+    getSourceAddress(_params: {
+        amount: BigNumber$1;
+        currency: Currency;
+        receiver: string;
+        memo: string;
+    }): string;
     generateJWT: ({ paymentRequestId, codeChallenge }: {
         paymentRequestId: string;
         codeChallenge: string;
@@ -154,6 +166,12 @@ declare class BasePaymentMaker implements PaymentMaker {
     protected signingClient: ExtendedWalletClient;
     protected logger: Logger;
     constructor(baseRPCUrl: string, walletClient: WalletClient, logger?: Logger);
+    getSourceAddress(_params: {
+        amount: BigNumber;
+        currency: Currency;
+        receiver: string;
+        memo: string;
+    }): string;
     generateJWT({ paymentRequestId, codeChallenge }: {
         paymentRequestId: string;
         codeChallenge: string;

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,wBAAwB,EACxB,UAAU,EACX,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,KAAK,iBAAiB,EACtB,WAAW,EACZ,MAAM,YAAY,CAAC;AAGpB,OAAO,EACL,SAAS,EACV,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EACL,aAAa,EACd,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,0BAA0B,EAC1B,kCAAkC,EAClC,kBAAkB,EACnB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACnC,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,2BAA2B,EAC3B,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,UAAU,EAChB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,WAAW,EACZ,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,KAAK,GAAG,EACR,KAAK,eAAe,EACpB,KAAK,OAAO,EACZ,KAAK,kBAAkB,EACvB,KAAK,YAAY,EACjB,KAAK,UAAU,EACf,KAAK,YAAY,EACjB,sBAAsB,EACtB,mBAAmB,EACnB,KAAK,YAAY,EAClB,MAAM,YAAY,CAAC;AAEpB,OAAO,EACL,gBAAgB,EACjB,MAAM,uBAAuB,CAAC"}

package/dist/index.js

@@ -352,30 +352,38 @@ class ATXPFetcher {
             }
             // Try each destination in order
             for (const dest of paymentRequestData.destinations) {
-                const paymentMaker = this.paymentMakers.get(dest.network);
+                // Convert amount to BigNumber since it comes as a string from JSON
+                const amount = new BigNumber(dest.amount);
+                // Resolve atxp_base destinations to real base network destinations
+                let destinationAddress = dest.address;
+                let destinationNetwork = dest.network;
+                const resolved = await this.resolveAtxpBaseDestination(dest.network, dest.address, paymentRequestId, amount, dest.currency, dest.address, paymentRequestData.iss);
+                if (resolved) {
+                    destinationAddress = resolved.destinationAddress;
+                    destinationNetwork = resolved.network;
+                }
+                const paymentMaker = this.paymentMakers.get(destinationNetwork);
                 if (!paymentMaker) {
-                    this.logger.debug(`ATXP: payment network '${dest.network}' not available, trying next destination`);
+                    this.logger.debug(`ATXP: payment network '${destinationNetwork}' not available, trying next destination`);
                     continue;
                 }
-                // Convert amount to BigNumber since it comes as a string from JSON
-                const amount = new BigNumber(dest.amount);
                 const prospectivePayment = {
                     accountId: this.accountId,
                     resourceUrl: paymentRequestData.resource?.toString() ?? '',
                     resourceName: paymentRequestData.resourceName ?? '',
-                    network: dest.network,
+                    network: destinationNetwork,
                     currency: dest.currency,
                     amount: amount,
                     iss: paymentRequestData.iss ?? '',
                 };
                 if (!await this.approvePayment(prospectivePayment)) {
-                    this.logger.info(`ATXP: payment request denied by callback function for destination on ${dest.network}`);
+                    this.logger.info(`ATXP: payment request denied by callback function for destination on ${destinationNetwork}`);
                     continue;
                 }
                 let paymentId;
                 try {
-                    paymentId = await paymentMaker.makePayment(amount, dest.currency, dest.address, paymentRequestData.iss);
-                    this.logger.info(`ATXP: made payment of ${amount.toString()} ${dest.currency} on ${dest.network}: ${paymentId}`);
+                    paymentId = await paymentMaker.makePayment(amount, dest.currency, destinationAddress, paymentRequestData.iss);
+                    this.logger.info(`ATXP: made payment of ${amount.toString()} ${dest.currency} on ${destinationNetwork}: ${paymentId}`);
                     await this.onPayment({ payment: prospectivePayment });
                     // Submit payment to the server
                     const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '' });
@@ -387,7 +395,7 @@ class ATXPFetcher {
                         },
                         body: JSON.stringify({
                             transactionId: paymentId,
-                            network: dest.network,
+                            network: destinationNetwork,
                             currency: dest.currency
                         })
                     });
@@ -401,7 +409,7 @@ class ATXPFetcher {
                 }
                 catch (error) {
                     const typedError = error;
-                    this.logger.warn(`ATXP: payment failed on ${dest.network}: ${typedError.message}`);
+                    this.logger.warn(`ATXP: payment failed on ${destinationNetwork}: ${typedError.message}`);
                     await this.onPaymentFailure({ payment: prospectivePayment, error: typedError });
                     // Try next destination
                     continue;
@@ -460,16 +468,24 @@ class ATXPFetcher {
             if (!currency) {
                 throw new Error(`Currency not provided`);
             }
-            const paymentMaker = this.paymentMakers.get(requestedNetwork);
+            // Resolve atxp_base destinations to real base network destinations
+            let destinationAddress = destination;
+            let destinationNetwork = requestedNetwork;
+            const resolved = await this.resolveAtxpBaseDestination(requestedNetwork, destination, paymentRequestId, amount, currency, destination, paymentRequestData.iss);
+            if (resolved) {
+                destinationAddress = resolved.destinationAddress;
+                destinationNetwork = resolved.network;
+            }
+            const paymentMaker = this.paymentMakers.get(destinationNetwork);
             if (!paymentMaker) {
-                this.logger.info(`ATXP: payment network '${requestedNetwork}' not set up for this client (available networks: ${Array.from(this.paymentMakers.keys()).join(', ')})`);
+                this.logger.info(`ATXP: payment network '${destinationNetwork}' not set up for this client (available networks: ${Array.from(this.paymentMakers.keys()).join(', ')})`);
                 return false;
             }
             const prospectivePayment = {
                 accountId: this.accountId,
                 resourceUrl: paymentRequestData.resource?.toString() ?? '',
                 resourceName: paymentRequestData.resourceName ?? '',
-                network: requestedNetwork,
+                network: destinationNetwork,
                 currency,
                 amount,
                 iss: paymentRequestData.iss ?? '',
@@ -480,8 +496,8 @@ class ATXPFetcher {
             }
             let paymentId;
             try {
-                paymentId = await paymentMaker.makePayment(amount, currency, destination, paymentRequestData.iss);
-                this.logger.info(`ATXP: made payment of ${amount} ${currency} on ${requestedNetwork}: ${paymentId}`);
+                paymentId = await paymentMaker.makePayment(amount, currency, destinationAddress, paymentRequestData.iss);
+                this.logger.info(`ATXP: made payment of ${amount} ${currency} on ${destinationNetwork}: ${paymentId}`);
                 // Call onPayment callback after successful payment
                 await this.onPayment({ payment: prospectivePayment });
             }
@@ -511,7 +527,7 @@ class ATXPFetcher {
                 },
                 body: JSON.stringify({
                     transactionId: paymentId,
-                    network: requestedNetwork,
+                    network: destinationNetwork,
                     currency: currency
                 })
             });
@@ -760,6 +776,79 @@ class ATXPFetcher {
         this.onPayment = onPayment;
         this.onPaymentFailure = onPaymentFailure || this.defaultPaymentFailureHandler;
     }
+    /**
+     * Resolves atxp_base or atxp_base_sepolia destinations to real base network destinations
+     * by calling the payment_info endpoint to get the destination address and network
+     */
+    async resolveAtxpBaseDestination(network, paymentInfoUrl, paymentRequestId, amount, currency, receiver, memo) {
+        // Check if this is an atxp_base network that needs resolution
+        if (network !== 'atxp_base' && network !== 'atxp_base_sepolia') {
+            return null;
+        }
+        // Map atxp_base networks to their real counterparts
+        const realNetwork = network === 'atxp_base' ? 'base' : 'base_sepolia';
+        // Get the payment maker for the real network
+        const paymentMaker = this.paymentMakers.get(realNetwork);
+        if (!paymentMaker) {
+            this.logger.debug(`ATXP: payment network '${realNetwork}' not available for atxp_base resolution`);
+            return null;
+        }
+        // Get the buyer address (source address) from the payment maker
+        let buyerAddress;
+        try {
+            buyerAddress = await paymentMaker.getSourceAddress({
+                amount,
+                currency,
+                receiver,
+                memo
+            });
+        }
+        catch (error) {
+            this.logger.warn(`ATXP: failed to get source address from payment maker for ${realNetwork}: ${error.message}`);
+            return null;
+        }
+        // Call the payment_info endpoint
+        this.logger.debug(`ATXP: resolving ${network} destination via ${paymentInfoUrl}`);
+        try {
+            const response = await this.sideChannelFetch(paymentInfoUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({
+                    paymentRequestId,
+                    buyerAddress,
+                }),
+            });
+            if (!response.ok) {
+                const text = await response.text();
+                this.logger.warn(`ATXP: payment_info endpoint failed: ${response.status} ${response.statusText} ${text}`);
+                return null;
+            }
+            const data = await response.json();
+            if (data.status !== 'success') {
+                this.logger.warn(`ATXP: payment_info endpoint returned non-success status: ${JSON.stringify(data)}`);
+                return null;
+            }
+            if (!data.destinationAddress) {
+                this.logger.warn(`ATXP: payment_info endpoint did not return destinationAddress`);
+                return null;
+            }
+            if (!data.network) {
+                this.logger.warn(`ATXP: payment_info endpoint did not return network`);
+                return null;
+            }
+            this.logger.info(`ATXP: resolved ${network} destination to ${data.destinationAddress} on ${data.network}`);
+            return {
+                destinationAddress: data.destinationAddress,
+                network: data.network,
+            };
+        }
+        catch (error) {
+            this.logger.warn(`ATXP: failed to resolve ${network} destination: ${error.message}`);
+            return null;
+        }
+    }
 }
 
 var util$1;
@@ -15975,6 +16064,9 @@ class SolanaPaymentMaker {
         this.source = Keypair.fromSecretKey(bs58.decode(sourceSecretKey));
         this.logger = logger ?? new ConsoleLogger();
     }
+    getSourceAddress(_params) {
+        return this.source.publicKey.toBase58();
+    }
 }
 
 const USDC_CONTRACT_ADDRESS_BASE = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"; // USDC on Base mainnet
@@ -16051,6 +16143,9 @@ class BasePaymentMaker {
         this.signingClient = walletClient.extend(publicActions);
         this.logger = logger ?? new ConsoleLogger();
     }
+    getSourceAddress(_params) {
+        return this.signingClient.account.address;
+    }
     async generateJWT({ paymentRequestId, codeChallenge }) {
         const headerObj = { alg: 'ES256K' };
         const payloadObj = {
@@ -16273,6 +16368,31 @@ class ATXPHttpPaymentMaker {
         this.token = token;
         this.fetchFn = fetchFn;
     }
+    async getSourceAddress(params) {
+        // Call the /address_for_payment endpoint to get the source address for this account
+        const response = await this.fetchFn(`${this.origin}/address_for_payment`, {
+            method: 'POST',
+            headers: {
+                'Authorization': toBasicAuth(this.token),
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({
+                amount: params.amount.toString(),
+                currency: params.currency,
+                receiver: params.receiver,
+                memo: params.memo,
+            }),
+        });
+        if (!response.ok) {
+            const text = await response.text();
+            throw new Error(`ATXPAccount: /address_for_payment failed: ${response.status} ${response.statusText} ${text}`);
+        }
+        const json = await response.json();
+        if (!json?.sourceAddress) {
+            throw new Error('ATXPAccount: /address_for_payment did not return sourceAddress');
+        }
+        return json.sourceAddress;
+    }
     async makePayment(amount, currency, receiver, memo) {
         // Make a regular payment via the /pay endpoint
         const response = await this.fetchFn(`${this.origin}/pay`, {