@atxp/client 0.7.4 → 0.8.1

package/dist/atxpClient.d.ts

@@ -3,7 +3,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 type RequiredClientConfigFields = 'mcpServer' | 'account';
 type OptionalClientConfig = Omit<ClientConfig, RequiredClientConfigFields>;
-type BuildableClientConfigFields = 'oAuthDb' | 'logger';
+type BuildableClientConfigFields = 'oAuthDb' | 'logger' | 'destinationMakers';
 export declare const DEFAULT_CLIENT_CONFIG: Required<Omit<OptionalClientConfig, BuildableClientConfigFields>>;
 export declare function buildClientConfig(args: ClientArgs): ClientConfig;
 export declare function buildStreamableTransport(args: ClientArgs): StreamableHTTPClientTransport;

package/dist/atxpClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atxpClient.d.ts","sourceRoot":"","sources":["../src/atxpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAEnG,KAAK,0BAA0B,GAAG,WAAW,GAAG,SAAS,CAAC;AAC1D,KAAK,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;AAC3E,KAAK,2BAA2B,GAAG,SAAS,GAAG,QAAQ,CAAC;AAYxD,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,2BAA2B,CAAC,CAiBnG,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,YAAY,CAehE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,6BAA6B,CAQxF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlE"}
+{"version":3,"file":"atxpClient.d.ts","sourceRoot":"","sources":["../src/atxpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAGtD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,oDAAoD,CAAC;AAInG,KAAK,0BAA0B,GAAG,WAAW,GAAG,SAAS,CAAC;AAC1D,KAAK,oBAAoB,GAAG,IAAI,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;AAC3E,KAAK,2BAA2B,GAAG,SAAS,GAAG,QAAQ,GAAG,mBAAmB,CAAC;AAY9E,eAAO,MAAM,qBAAqB,EAAE,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,2BAA2B,CAAC,CAkBnG,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG,YAAY,CA8BhE;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,6BAA6B,CAQxF;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlE"}

package/dist/atxpClient.js

@@ -1,7 +1,8 @@
-import { DEFAULT_AUTHORIZATION_SERVER, ConsoleLogger, MemoryOAuthDb } from '@atxp/common';
+import { DEFAULT_ATXP_ACCOUNTS_SERVER, DEFAULT_AUTHORIZATION_SERVER, ConsoleLogger, MemoryOAuthDb, ATXPAccount } from '@atxp/common';
 import { atxpFetch } from './atxpFetcher.js';
 import { Client } from './node_modules/@modelcontextprotocol/sdk/dist/esm/client/index.js';
 import { StreamableHTTPClientTransport } from './node_modules/@modelcontextprotocol/sdk/dist/esm/client/streamableHttp.js';
+import { createDestinationMakers } from './destinationMakers/index.js';
 
 // Detect if we're in a browser environment and bind fetch appropriately
 const getFetch = () => {
@@ -14,6 +15,7 @@ const getFetch = () => {
 };
 const DEFAULT_CLIENT_CONFIG = {
     allowedAuthorizationServers: [DEFAULT_AUTHORIZATION_SERVER],
+    atxpAccountsServer: DEFAULT_ATXP_ACCOUNTS_SERVER,
     approvePayment: async (_p) => true,
     fetchFn: getFetch(),
     oAuthChannelFetch: getFetch(),
@@ -43,7 +45,20 @@ function buildClientConfig(args) {
     const withDefaults = { ...envDefaults, ...args };
     const logger = withDefaults.logger ?? new ConsoleLogger();
     const oAuthDb = withDefaults.oAuthDb ?? new MemoryOAuthDb({ logger });
-    const built = { oAuthDb, logger };
+    const fetchFn = withDefaults.fetchFn;
+    // Build destination makers if not provided
+    let accountsServer = withDefaults.atxpAccountsServer;
+    // QoL hack for unspecified accounts server - if the caller is passing an atxpAccount, then assume the origin for that
+    // is what we should use for the accounts server. In practice, the only option is accounts.atxp.ai,
+    // but this supports staging environment
+    if (args.atxpAccountsServer === undefined && withDefaults.account && withDefaults.account instanceof ATXPAccount) {
+        accountsServer = withDefaults.account.origin;
+    }
+    const destinationMakers = withDefaults.destinationMakers ?? createDestinationMakers({
+        atxpAccountsServer: accountsServer,
+        fetchFn
+    });
+    const built = { oAuthDb, logger, destinationMakers };
     return Object.freeze({ ...withDefaults, ...built });
 }
 function buildStreamableTransport(args) {

package/dist/atxpClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"atxpClient.js","sources":["../src/atxpClient.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAUA;AACA,MAAM,QAAQ,GAAG,MAAmB;AAClC,IAAA,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,UAAU,EAAE;;AAEvE,QAAA,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3B;;AAEA,IAAA,OAAO,KAAK;AACd,CAAC;AAEM,MAAM,qBAAqB,GAAsE;IACtG,2BAA2B,EAAE,CAAC,4BAA4B,CAAC;AAC3D,IAAA,cAAc,EAAE,OAAO,EAAE,KAAK,IAAI;IAClC,OAAO,EAAE,QAAQ,EAAE;IACnB,iBAAiB,EAAE,QAAQ,EAAE;IAC7B,SAAS,EAAE,KAAK;AAChB,IAAA,UAAU,EAAE;AACV,QAAA,IAAI,EAAE,YAAY;AAClB,QAAA,OAAO,EAAE;AACV,KAAA;AACD,IAAA,aAAa,EAAE;AACb,QAAA,YAAY,EAAE;AACf,KAAA;AACD,IAAA,WAAW,EAAE,cAAa,CAAC;AAC3B,IAAA,kBAAkB,EAAE,cAAa,CAAC;AAClC,IAAA,SAAS,EAAE,cAAa,CAAC;AACzB,IAAA,gBAAgB,EAAE,cAAa;;AAG3B,SAAU,iBAAiB,CAAC,IAAgB,EAAA;;IAEhD,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;AAC3C,QAAA,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,OAAO;IACvC;;AAEA,IAAA,MAAM,WAAW,GAAG;AAClB,QAAA,GAAG,qBAAqB;AACxB,QAAA,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;KAClD;IACD,MAAM,YAAY,GAAG,EAAE,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,IAAI,IAAI,aAAa,EAAE;AACzD,IAAA,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI,IAAI,aAAa,CAAC,EAAC,MAAM,EAAC,CAAC;AACnE,IAAA,MAAM,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,EAAC;AAChC,IAAA,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,KAAK,EAAE,CAAC;AACrD;AAEM,SAAU,wBAAwB,CAAC,IAAgB,EAAA;AACvD,IAAA,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC;;AAGtC,IAAA,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC;AAEtC,IAAA,MAAM,SAAS,GAAG,IAAI,6BAA6B,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAC,KAAK,EAAE,YAAY,EAAC,CAAC;AACnG,IAAA,OAAO,SAAS;AAClB;AAEO,eAAe,UAAU,CAAC,IAAgB,EAAA;AAC/C,IAAA,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC;AACtC,IAAA,MAAM,SAAS,GAAG,wBAAwB,CAAC,MAAM,CAAC;AAElD,IAAA,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,aAAa,CAAC;AAClE,IAAA,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;AAE/B,IAAA,OAAO,MAAM;AACf;;;;"}
+{"version":3,"file":"atxpClient.js","sources":["../src/atxpClient.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/dist/atxpFetcher.d.ts

@@ -1,5 +1,5 @@
 import { OAuthAuthenticationRequiredError, OAuthClient } from './oAuth.js';
-import { AccessToken, AuthorizationServerUrl, FetchLike, OAuthDb, PaymentRequestData, Logger, Network, Currency } from '@atxp/common';
+import { AccessToken, AuthorizationServerUrl, FetchLike, OAuthDb, PaymentRequestData, Logger, Network, DestinationMaker, Account } from '@atxp/common';
 import type { PaymentMaker, ProspectivePayment, ClientConfig } from './types.js';
 import { McpError } from '@modelcontextprotocol/sdk/types.js';
 /**
@@ -12,10 +12,10 @@ import { McpError } from '@modelcontextprotocol/sdk/types.js';
 export declare function atxpFetch(config: ClientConfig): FetchLike;
 export declare class ATXPFetcher {
     protected oauthClient: OAuthClient;
-    protected paymentMakers: Map<string, PaymentMaker>;
+    protected account: Account;
+    protected destinationMakers: Map<Network, DestinationMaker>;
     protected sideChannelFetch: FetchLike;
     protected db: OAuthDb;
-    protected accountId: string;
     protected allowedAuthorizationServers: AuthorizationServerUrl[];
     protected approvePayment: (payment: ProspectivePayment) => Promise<boolean>;
     protected logger: Logger;
@@ -36,11 +36,9 @@ export declare class ATXPFetcher {
         error: Error;
     }) => Promise<void>;
     constructor(config: {
-        accountId: string;
+        account: Account;
         db: OAuthDb;
-        paymentMakers: {
-            [key: string]: PaymentMaker;
-        };
+        destinationMakers: Map<Network, DestinationMaker>;
         fetchFn?: FetchLike;
         sideChannelFetch?: FetchLike;
         strict?: boolean;
@@ -66,14 +64,6 @@ export declare class ATXPFetcher {
         }) => Promise<void>;
     });
     private 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
-     */
-    protected resolveAtxpBaseDestination(network: string, paymentInfoUrl: string, paymentRequestId: string, amount: BigNumber, currency: Currency, receiver: string, memo: string): Promise<{
-        destinationAddress: string;
-        network: Network;
-    } | null>;
     protected handleMultiDestinationPayment: (paymentRequestData: PaymentRequestData, paymentRequestUrl: string, paymentRequestId: string) => Promise<boolean>;
     protected handlePaymentRequestError: (paymentRequestError: McpError) => Promise<boolean>;
     protected getPaymentRequestData: (paymentRequestUrl: string) => Promise<PaymentRequestData | null>;

package/dist/atxpFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"atxpFetcher.d.ts","sourceRoot":"","sources":["../src/atxpFetcher.ts"],"names":[],"mappings":"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"}

package/dist/atxpFetcher.js

@@ -1,7 +1,7 @@
-import { BigNumber } from 'bignumber.js';
 import { OAuthAuthenticationRequiredError, OAuthClient } from './oAuth.js';
 import { PAYMENT_REQUIRED_ERROR_CODE, isSSEResponse, parseMcpMessages, parsePaymentRequests, paymentRequiredError, DEFAULT_AUTHORIZATION_SERVER, ConsoleLogger, getIsReactNative, createReactNativeSafeFetch } from '@atxp/common';
 import { InsufficientFundsError, PaymentNetworkError } from './types.js';
+import { BigNumber } from 'bignumber.js';
 
 /**
  * Creates an ATXP fetch wrapper that handles OAuth authentication and payments.
@@ -12,9 +12,9 @@ import { InsufficientFundsError, PaymentNetworkError } from './types.js';
  */
 function atxpFetch(config) {
     const fetcher = new ATXPFetcher({
-        accountId: config.account.accountId,
+        account: config.account,
         db: config.oAuthDb,
-        paymentMakers: config.account.paymentMakers,
+        destinationMakers: config.destinationMakers,
         fetchFn: config.fetchFn,
         sideChannelFetch: config.oAuthChannelFetch,
         allowInsecureRequests: config.allowHttp,
@@ -32,7 +32,8 @@ class ATXPFetcher {
     constructor(config) {
         this.defaultPaymentFailureHandler = async ({ payment, error }) => {
             if (error instanceof InsufficientFundsError) {
-                this.logger.info(`PAYMENT FAILED: Insufficient ${error.currency} funds on ${payment.network}`);
+                const networkText = error.network ? ` on ${error.network}` : '';
+                this.logger.info(`PAYMENT FAILED: Insufficient ${error.currency} funds${networkText}`);
                 this.logger.info(`Required: ${error.required} ${error.currency}`);
                 if (error.available) {
                     this.logger.info(`Available: ${error.available} ${error.currency}`);
@@ -40,7 +41,7 @@ class ATXPFetcher {
                 this.logger.info(`Account: ${payment.accountId}`);
             }
             else if (error instanceof PaymentNetworkError) {
-                this.logger.info(`PAYMENT FAILED: Network error on ${payment.network}: ${error.message}`);
+                this.logger.info(`PAYMENT FAILED: Network error: ${error.message}`);
             }
             else {
                 this.logger.info(`PAYMENT FAILED: ${error.message}`);
@@ -50,43 +51,61 @@ class ATXPFetcher {
             if (!paymentRequestData.destinations || paymentRequestData.destinations.length === 0) {
                 return false;
             }
-            // Try each destination in order
-            for (const dest of paymentRequestData.destinations) {
-                // 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 '${destinationNetwork}' not available, trying next destination`);
+            // Get sources from the account
+            const sources = await this.account.getSources();
+            // Apply destination mappers to transform destinations
+            // Convert PaymentRequestDestination[] to Destination[] for mapper compatibility
+            const mappedDestinations = [];
+            for (const option of paymentRequestData.destinations) {
+                const destinationMaker = this.destinationMakers.get(option.network);
+                if (!destinationMaker) {
+                    this.logger.debug(`ATXP: destination maker for network '${option.network}' not available, trying next destination`);
                     continue;
                 }
-                const prospectivePayment = {
-                    accountId: this.accountId,
-                    resourceUrl: paymentRequestData.resource?.toString() ?? '',
-                    resourceName: paymentRequestData.resourceName ?? '',
-                    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 ${destinationNetwork}`);
-                    continue;
+                mappedDestinations.push(...(await destinationMaker.makeDestinations(option, this.logger, paymentRequestId, sources)));
+            }
+            if (mappedDestinations.length === 0) {
+                this.logger.info(`ATXP: no destinations found after mapping`);
+                return false;
+            }
+            // Validate amounts are not negative
+            for (const dest of mappedDestinations) {
+                if (dest.amount.isLessThan(0)) {
+                    throw new Error(`ATXP: payment amount cannot be negative: ${dest.amount.toString()} ${dest.currency}`);
                 }
-                let paymentId;
+            }
+            // Create prospective payment for approval (using first destination for display)
+            const firstDest = mappedDestinations[0];
+            const prospectivePayment = {
+                accountId: this.account.accountId,
+                resourceUrl: paymentRequestData.resource?.toString() ?? '',
+                resourceName: paymentRequestData.resourceName ?? '',
+                currency: firstDest.currency,
+                amount: firstDest.amount,
+                iss: paymentRequestData.iss ?? '',
+            };
+            // Ask for approval once for all payment attempts
+            if (!await this.approvePayment(prospectivePayment)) {
+                this.logger.info(`ATXP: payment request denied by callback function`);
+                return false;
+            }
+            // Try each payment maker in order
+            let lastPaymentError = null;
+            let paymentAttempted = false;
+            for (const paymentMaker of this.account.paymentMakers) {
                 try {
-                    paymentId = await paymentMaker.makePayment(amount, dest.currency, destinationAddress, paymentRequestData.iss);
-                    this.logger.info(`ATXP: made payment of ${amount.toString()} ${dest.currency} on ${destinationNetwork}: ${paymentId}`);
+                    // Pass all destinations to payment maker - it will filter and pick the one it can handle
+                    const result = await paymentMaker.makePayment(mappedDestinations, paymentRequestData.iss, paymentRequestId);
+                    if (result === null) {
+                        this.logger.debug(`ATXP: payment maker cannot handle these destinations, trying next`);
+                        continue; // Try next payment maker
+                    }
+                    paymentAttempted = true;
+                    // Payment was successful
+                    this.logger.info(`ATXP: made payment of ${firstDest.amount.toString()} ${firstDest.currency} on ${result.chain}: ${result.transactionId}`);
                     await this.onPayment({ payment: prospectivePayment });
                     // Submit payment to the server
-                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '' });
+                    const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '', accountId: this.account.accountId });
                     const response = await this.sideChannelFetch(paymentRequestUrl.toString(), {
                         method: 'PUT',
                         headers: {
@@ -94,9 +113,10 @@ class ATXPFetcher {
                             'Content-Type': 'application/json'
                         },
                         body: JSON.stringify({
-                            transactionId: paymentId,
-                            network: destinationNetwork,
-                            currency: dest.currency
+                            transactionId: result.transactionId,
+                            ...(result.transactionSubId ? { transactionSubId: result.transactionSubId } : {}),
+                            chain: result.chain,
+                            currency: result.currency
                         })
                     });
                     this.logger.debug(`ATXP: payment was ${response.ok ? 'successfully' : 'not successfully'} PUT to ${paymentRequestUrl} : status ${response.status} ${response.statusText}`);
@@ -109,13 +129,18 @@ class ATXPFetcher {
                 }
                 catch (error) {
                     const typedError = error;
-                    this.logger.warn(`ATXP: payment failed on ${destinationNetwork}: ${typedError.message}`);
+                    paymentAttempted = true;
+                    lastPaymentError = typedError;
+                    this.logger.warn(`ATXP: payment maker failed: ${typedError.message}`);
                     await this.onPaymentFailure({ payment: prospectivePayment, error: typedError });
-                    // Try next destination
-                    continue;
+                    // Continue to next payment maker
                 }
             }
-            this.logger.info(`ATXP: no suitable payment destination found among ${paymentRequestData.destinations.length} options`);
+            // If payment was attempted but all failed, rethrow the last error
+            if (paymentAttempted && lastPaymentError) {
+                throw lastPaymentError;
+            }
+            this.logger.info(`ATXP: no payment maker could handle these destinations`);
             return false;
         };
         this.handlePaymentRequestError = async (paymentRequestError) => {
@@ -142,102 +167,8 @@ class ATXPFetcher {
             if (paymentRequestData.destinations && paymentRequestData.destinations.length > 0) {
                 return this.handleMultiDestinationPayment(paymentRequestData, paymentRequestUrl, paymentRequestId);
             }
-            // Handle legacy single destination format
-            const requestedNetwork = paymentRequestData.network;
-            if (!requestedNetwork) {
-                throw new Error(`Payment network not provided`);
-            }
-            const destination = paymentRequestData.destination;
-            if (!destination) {
-                throw new Error(`destination not provided`);
-            }
-            let amount = new BigNumber(0);
-            if (!paymentRequestData.amount) {
-                throw new Error(`amount not provided`);
-            }
-            try {
-                amount = new BigNumber(paymentRequestData.amount);
-            }
-            catch {
-                throw new Error(`Invalid amount ${paymentRequestData.amount}`);
-            }
-            if (amount.lte(0)) {
-                throw new Error(`Invalid amount ${paymentRequestData.amount}`);
-            }
-            const currency = paymentRequestData.currency;
-            if (!currency) {
-                throw new Error(`Currency not provided`);
-            }
-            // 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 '${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: destinationNetwork,
-                currency,
-                amount,
-                iss: paymentRequestData.iss ?? '',
-            };
-            if (!await this.approvePayment(prospectivePayment)) {
-                this.logger.info(`ATXP: payment request denied by callback function`);
-                return false;
-            }
-            let paymentId;
-            try {
-                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 });
-            }
-            catch (paymentError) {
-                // Call onPaymentFailure callback if payment fails
-                await this.onPaymentFailure({
-                    payment: prospectivePayment,
-                    error: paymentError
-                });
-                throw paymentError;
-            }
-            const jwt = await paymentMaker.generateJWT({ paymentRequestId, codeChallenge: '' });
-            // Make a fetch call to the authorization URL with the payment ID
-            // redirect=false is a hack
-            // The OAuth spec calls for the authorization url to return with a redirect, but fetch
-            // on mobile will automatically follow the redirect (it doesn't support the redirect=manual option)
-            // We want the redirect URL so we can extract the code from it, not the contents of the 
-            // redirect URL (which might not even exist for agentic ATXP clients)
-            //   So ATXP servers are set up to instead return a 200 with the redirect URL in the body
-            // if we pass redirect=false.
-            // TODO: Remove the redirect=false hack once we have a way to handle the redirect on mobile
-            const response = await this.sideChannelFetch(paymentRequestUrl.toString(), {
-                method: 'PUT',
-                headers: {
-                    'Authorization': `Bearer ${jwt}`,
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify({
-                    transactionId: paymentId,
-                    network: destinationNetwork,
-                    currency: currency
-                })
-            });
-            this.logger.debug(`ATXP: payment was ${response.ok ? 'successfully' : 'not successfully'} PUT to ${paymentRequestUrl} : status ${response.status} ${response.statusText}`);
-            if (!response.ok) {
-                const msg = `ATXP: payment to ${paymentRequestUrl} failed: HTTP ${response.status} ${await response.text()}`;
-                this.logger.info(msg);
-                throw new Error(msg);
-            }
-            return true;
+            // Payment request doesn't have destinations - this shouldn't happen with new SDK
+            throw new Error(`ATXP: payment request does not contain destinations array`);
         };
         this.getPaymentRequestData = async (paymentRequestUrl) => {
             const prRequest = await this.sideChannelFetch(paymentRequestUrl);
@@ -245,6 +176,14 @@ class ATXPFetcher {
                 throw new Error(`ATXP: GET ${paymentRequestUrl} failed: ${prRequest.status} ${prRequest.statusText}`);
             }
             const paymentRequest = await prRequest.json();
+            // Parse amount strings to BigNumber objects
+            if (paymentRequest.destinations) {
+                for (const dest of paymentRequest.destinations) {
+                    if (typeof dest.amount === 'string' || typeof dest.amount === 'number') {
+                        dest.amount = new BigNumber(dest.amount);
+                    }
+                }
+            }
             return paymentRequest;
         };
         this.isAllowedAuthServer = (url) => {
@@ -258,15 +197,15 @@ class ATXPFetcher {
                 throw new Error(`Code challenge not provided`);
             }
             if (!paymentMaker) {
-                const availableNetworks = Array.from(this.paymentMakers.keys()).join(', ');
-                throw new Error(`Payment maker is null/undefined. Available payment makers: [${availableNetworks}]. This usually indicates a payment maker object was not properly instantiated.`);
+                const paymentMakerCount = this.account.paymentMakers.length;
+                throw new Error(`Payment maker is null/undefined. Available payment maker count: ${paymentMakerCount}. This usually indicates a payment maker object was not properly instantiated.`);
             }
             // TypeScript should prevent this, but add runtime check for edge cases (untyped JS, version mismatches, etc.)
             if (!paymentMaker.generateJWT) {
-                const availableNetworks = Array.from(this.paymentMakers.keys()).join(', ');
-                throw new Error(`Payment maker is missing generateJWT method. Available payment makers: [${availableNetworks}]. This indicates the payment maker object does not implement the PaymentMaker interface. If using TypeScript, ensure your payment maker properly implements the PaymentMaker interface.`);
+                const paymentMakerCount = this.account.paymentMakers.length;
+                throw new Error(`Payment maker is missing generateJWT method. Available payment maker count: ${paymentMakerCount}. This indicates the payment maker object does not implement the PaymentMaker interface. If using TypeScript, ensure your payment maker properly implements the PaymentMaker interface.`);
             }
-            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge });
+            const authToken = await paymentMaker.generateJWT({ paymentRequestId: '', codeChallenge: codeChallenge, accountId: this.account.accountId });
             // Make a fetch call to the authorization URL with the payment ID
             // redirect=false is a hack
             // The OAuth spec calls for the authorization url to return with a redirect, but fetch
@@ -312,11 +251,11 @@ class ATXPFetcher {
             throw new Error(`Expected redirect response from authorization URL, got ${response.status}`);
         };
         this.authToService = async (error) => {
-            // TODO: We need to generalize this - we can't assume that there's a single paymentMaker for the auth flow. 
-            if (this.paymentMakers.size > 1) {
+            // TODO: We need to generalize this - we can't assume that there's a single paymentMaker for the auth flow.
+            if (this.account.paymentMakers.length > 1) {
                 throw new Error(`ATXP: multiple payment makers found - cannot determine which one to use for auth`);
             }
-            const paymentMaker = Array.from(this.paymentMakers.values())[0];
+            const paymentMaker = this.account.paymentMakers[0];
             if (paymentMaker) {
                 // We can do the full OAuth flow - we'll generate a signed JWT and call /authorize on the
                 // AS to get a code, then exchange the code for an access token
@@ -331,14 +270,14 @@ class ATXPFetcher {
                     // Call onAuthorize callback after successful authorization
                     await this.onAuthorize({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.accountId
+                        userId: this.account.accountId
                     });
                 }
                 catch (authError) {
                     // Call onAuthorizeFailure callback if authorization fails
                     await this.onAuthorizeFailure({
                         authorizationServer: authorizationUrl.origin,
-                        userId: this.accountId,
+                        userId: this.account.accountId,
                         error: authError
                     });
                     throw authError;
@@ -349,13 +288,13 @@ class ATXPFetcher {
                 // If we do, we'll use it to auth to the downstream resource
                 // (In pass-through scenarios, the atxpServer() middleware stores the incoming
                 // token in the DB under the '' resource URL).
-                const existingToken = await this.db.getAccessToken(this.accountId, '');
+                const existingToken = await this.db.getAccessToken(this.account.accountId, '');
                 if (!existingToken) {
                     this.logger.info(`ATXP: no token found for the current server - we can't exchange a token if we don't have one`);
                     throw error;
                 }
                 const newToken = await this.exchangeToken(existingToken, error.resourceServerUrl);
-                this.db.saveAccessToken(this.accountId, error.resourceServerUrl, newToken);
+                this.db.saveAccessToken(this.account.accountId, error.resourceServerUrl, newToken);
             }
         };
         this.exchangeToken = async (myToken, newResourceUrl) => {
@@ -446,15 +385,15 @@ class ATXPFetcher {
                 throw error;
             }
         };
-        const { accountId, db, paymentMakers, fetchFn = fetch, sideChannelFetch = fetchFn, strict = true, allowInsecureRequests = process.env.NODE_ENV === 'development', allowedAuthorizationServers = [DEFAULT_AUTHORIZATION_SERVER], approvePayment = async () => true, logger = new ConsoleLogger(), onAuthorize = async () => { }, onAuthorizeFailure = async () => { }, onPayment = async () => { }, onPaymentFailure = async () => { } } = config;
+        const { account, db, destinationMakers, fetchFn = fetch, sideChannelFetch = fetchFn, strict = true, allowInsecureRequests = process.env.NODE_ENV === 'development', allowedAuthorizationServers = [DEFAULT_AUTHORIZATION_SERVER], approvePayment = async () => true, logger = new ConsoleLogger(), onAuthorize = async () => { }, onAuthorizeFailure = async () => { }, onPayment = async () => { }, onPaymentFailure = async () => { } } = config;
         // Use React Native safe fetch if in React Native environment
         const safeFetchFn = getIsReactNative() ? createReactNativeSafeFetch(fetchFn) : fetchFn;
         const safeSideChannelFetch = getIsReactNative() ? createReactNativeSafeFetch(sideChannelFetch) : sideChannelFetch;
-        // ATXPClient should never actually use the callback url - instead of redirecting the user to 
+        // ATXPClient should never actually use the callback url - instead of redirecting the user to
         // an authorization url which redirects back to the callback url, ATXPClient posts the payment
         // directly to the authorization server, then does the token exchange itself
         this.oauthClient = new OAuthClient({
-            userId: accountId,
+            userId: account.accountId,
             db,
             callbackUrl: 'http://localhost:3000/unused-dummy-atxp-callback',
             isPublic: false,
@@ -464,10 +403,10 @@ class ATXPFetcher {
             allowInsecureRequests,
             logger: logger
         });
-        this.paymentMakers = new Map(Object.entries(paymentMakers));
+        this.account = account;
+        this.destinationMakers = destinationMakers;
         this.sideChannelFetch = safeSideChannelFetch;
         this.db = db;
-        this.accountId = accountId;
         this.allowedAuthorizationServers = allowedAuthorizationServers;
         this.approvePayment = approvePayment;
         this.logger = logger;
@@ -476,79 +415,6 @@ 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;
-        }
-    }
 }
 
 export { ATXPFetcher, atxpFetch };