@atxp/client 0.7.4 → 0.8.1

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Currency, AuthorizationServerUrl, Network, OAuthDb, FetchLike, Logger, OAuthResourceClient, ClientCredentials, PKCEValues, AccessToken } from '@atxp/common';
+import { Account, Network, DestinationMaker, AuthorizationServerUrl, AccountId, Currency, OAuthDb, FetchLike, Logger, OAuthResourceClient, ClientCredentials, PKCEValues, AccessToken, PaymentMaker, Destination, PaymentIdentifier, Source, PaymentRequestOption } from '@atxp/common';
+export { ATXPAccount, Account, PaymentMaker } from '@atxp/common';
 import { ClientOptions, Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { Implementation } from '@modelcontextprotocol/sdk/types.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
@@ -10,17 +11,10 @@ import { WalletClient, PublicActions, LocalAccount, Address, TypedData, Hex as H
 type Hex = `0x${string}`;
 type AccountPrefix = Network;
 type AccountIdString = `${AccountPrefix}${string}`;
-type Account = {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
-    };
-};
 type ProspectivePayment = {
-    accountId: string;
+    accountId: AccountId;
     resourceUrl: string;
     resourceName: string;
-    network: Network;
     currency: Currency;
     amount: BigNumber;
     iss: string;
@@ -28,6 +22,8 @@ type ProspectivePayment = {
 type ClientConfig = {
     mcpServer: string;
     account: Account;
+    atxpAccountsServer: string;
+    destinationMakers: Map<Network, DestinationMaker>;
     allowedAuthorizationServers: AuthorizationServerUrl[];
     approvePayment: (payment: ProspectivePayment) => Promise<boolean>;
     oAuthDb: OAuthDb;
@@ -70,23 +66,10 @@ declare class PaymentNetworkError extends Error {
     readonly originalError?: Error | undefined;
     constructor(message: string, originalError?: Error | undefined);
 }
-interface PaymentMaker {
-    makePayment: (amount: BigNumber, currency: Currency, receiver: string, memo: string) => Promise<string>;
-    generateJWT: (params: {
-        paymentRequestId: string;
-        codeChallenge: string;
-    }) => Promise<string>;
-    getSourceAddress: (params: {
-        amount: BigNumber;
-        currency: Currency;
-        receiver: string;
-        memo: string;
-    }) => string | Promise<string>;
-}
 
 type RequiredClientConfigFields = 'mcpServer' | 'account';
 type OptionalClientConfig = Omit<ClientConfig, RequiredClientConfigFields>;
-type BuildableClientConfigFields = 'oAuthDb' | 'logger';
+type BuildableClientConfigFields = 'oAuthDb' | 'logger' | 'destinationMakers';
 declare const DEFAULT_CLIENT_CONFIG: Required<Omit<OptionalClientConfig, BuildableClientConfigFields>>;
 declare function buildClientConfig(args: ClientArgs): ClientConfig;
 declare function buildStreamableTransport(args: ClientArgs): StreamableHTTPClientTransport;
@@ -154,11 +137,12 @@ declare class SolanaPaymentMaker implements PaymentMaker {
         receiver: string;
         memo: string;
     }): string;
-    generateJWT: ({ paymentRequestId, codeChallenge }: {
+    generateJWT: ({ paymentRequestId, codeChallenge, accountId }: {
         paymentRequestId: string;
         codeChallenge: string;
+        accountId?: AccountId | null;
     }) => Promise<string>;
-    makePayment: (amount: BigNumber$1, currency: Currency, receiver: string, memo: string) => Promise<string>;
+    makePayment: (destinations: Destination[], memo: string, _paymentRequestId?: string) => Promise<PaymentIdentifier | null>;
 }
 
 type ExtendedWalletClient = WalletClient & PublicActions;
@@ -172,34 +156,23 @@ declare class BasePaymentMaker implements PaymentMaker {
         receiver: string;
         memo: string;
     }): string;
-    generateJWT({ paymentRequestId, codeChallenge }: {
+    generateJWT({ paymentRequestId, codeChallenge, accountId }: {
         paymentRequestId: string;
         codeChallenge: string;
+        accountId?: AccountId | null;
     }): Promise<string>;
-    makePayment(amount: BigNumber, currency: Currency, receiver: string): Promise<string>;
+    makePayment(destinations: Destination[], _memo: string, _paymentRequestId?: string): Promise<PaymentIdentifier | null>;
 }
 
 declare class SolanaAccount implements Account {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
-    };
+    accountId: AccountId;
+    paymentMakers: PaymentMaker[];
+    private sourcePublicKey;
     constructor(solanaEndpoint: string, sourceSecretKey: string);
-}
-
-declare class ATXPAccount implements Account {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
-    };
-    origin: string;
-    token: string;
-    fetchFn: FetchLike;
-    constructor(connectionString: string, opts?: {
-        fetchFn?: FetchLike;
-        network?: Network;
-    });
-    getSigner(): Promise<LocalAccount>;
+    /**
+     * Get sources for this account
+     */
+    getSources(): Promise<Source[]>;
 }
 
 declare const USDC_CONTRACT_ADDRESS_BASE = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913";
@@ -265,19 +238,74 @@ declare const getWorldChainByChainId: (chainId: number) => WorldChain;
  */
 declare const getWorldChainUSDCAddress: (chainId: number) => string;
 
-declare class BaseAccount implements Account {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
+/**
+ * Polygon Chain configuration type, compatible with viem's Chain interface
+ */
+type PolygonChain = {
+    readonly id: number;
+    readonly name: string;
+    readonly nativeCurrency: {
+        readonly name: string;
+        readonly symbol: string;
+        readonly decimals: number;
+    };
+    readonly rpcUrls: {
+        readonly default: {
+            readonly http: readonly string[];
+        };
     };
+    readonly blockExplorers: {
+        readonly default: {
+            readonly name: string;
+            readonly url: string;
+        };
+    };
+    readonly testnet?: boolean;
+};
+declare const USDC_CONTRACT_ADDRESS_POLYGON_MAINNET = "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359";
+declare const USDC_CONTRACT_ADDRESS_POLYGON_AMOY = "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582";
+declare const POLYGON_MAINNET: PolygonChain;
+declare const POLYGON_AMOY: PolygonChain;
+/**
+ * Get Polygon Mainnet configuration with custom RPC URL (e.g., with API key)
+ * @param rpcUrl - Custom RPC URL, e.g., 'https://polygon-mainnet.g.alchemy.com/v2/YOUR_API_KEY'
+ */
+declare const getPolygonMainnetWithRPC: (rpcUrl: string) => PolygonChain;
+/**
+ * Get Polygon Amoy Testnet configuration with custom RPC URL (e.g., with API key)
+ * @param rpcUrl - Custom RPC URL, e.g., 'https://polygon-amoy.g.alchemy.com/v2/YOUR_API_KEY'
+ */
+declare const getPolygonAmoyWithRPC: (rpcUrl: string) => PolygonChain;
+/**
+ * Get Polygon Chain configuration by chain ID
+ * @param chainId - Chain ID (137 for mainnet, 80002 for Amoy testnet)
+ * @returns Polygon Chain configuration
+ * @throws Error if chain ID is not supported
+ */
+declare const getPolygonByChainId: (chainId: number) => PolygonChain;
+/**
+ * Get USDC contract address for Polygon by chain ID
+ * @param chainId - Chain ID (137 for mainnet, 80002 for Amoy testnet)
+ * @returns USDC contract address
+ * @throws Error if chain ID is not supported
+ */
+declare const getPolygonUSDCAddress: (chainId: number) => string;
+
+declare class BaseAccount implements Account {
+    accountId: AccountId;
+    paymentMakers: PaymentMaker[];
     private walletClient;
     private account;
     constructor(baseRPCUrl: string, sourceSecretKey: string);
     /**
-     * Get a signer that can be used with the x402 library
-     * This is only available for EVM-based accounts
+     * Get the LocalAccount (signer) for this account.
+     * This can be used with the x402 library or other signing operations.
+     */
+    getLocalAccount(): LocalAccount;
+    /**
+     * Get sources for this account
      */
-    getSigner(): LocalAccount;
+    getSources(): Promise<Source[]>;
 }
 
 /**
@@ -328,5 +356,24 @@ declare class ATXPLocalAccount implements LocalAccount {
     readonly source: "custom";
 }
 
-export { ATXPAccount, ATXPLocalAccount, BaseAccount, BasePaymentMaker, DEFAULT_CLIENT_CONFIG, InsufficientFundsError, OAuthAuthenticationRequiredError, OAuthClient, PaymentNetworkError, SolanaAccount, SolanaPaymentMaker, USDC_CONTRACT_ADDRESS_BASE, USDC_CONTRACT_ADDRESS_BASE_SEPOLIA, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, ValidateTransferError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, atxpClient, atxpFetch, buildClientConfig, buildStreamableTransport, getBaseUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
-export type { Account, AccountIdString, ClientArgs, ClientConfig, FetchWrapper, Hex, OAuthClientConfig, PaymentMaker, ProspectivePayment, WorldChain };
+/**
+ * Destination mapper for ATXP network destinations.
+ * Converts destinations with network='atxp' to actual blockchain network destinations
+ * by resolving the account ID to its associated blockchain addresses.
+ */
+declare class ATXPDestinationMaker implements DestinationMaker {
+    private accountsServiceUrl;
+    private fetchFn;
+    constructor(accountsServiceUrl: string, fetchFn?: FetchLike);
+    makeDestinations(option: PaymentRequestOption, logger: Logger, paymentRequestId: string, sources: Source[]): Promise<Destination[]>;
+    private getDestinations;
+}
+
+declare class PassthroughDestinationMaker implements DestinationMaker {
+    private network;
+    constructor(network: Network);
+    makeDestinations(option: PaymentRequestOption, _logger: Logger, _paymentRequestId: string, _sources: Source[]): Promise<Destination[]>;
+}
+
+export { ATXPDestinationMaker, ATXPLocalAccount, BaseAccount, BasePaymentMaker, DEFAULT_CLIENT_CONFIG, InsufficientFundsError, OAuthAuthenticationRequiredError, OAuthClient, POLYGON_AMOY, POLYGON_MAINNET, PassthroughDestinationMaker, PaymentNetworkError, SolanaAccount, SolanaPaymentMaker, USDC_CONTRACT_ADDRESS_BASE, USDC_CONTRACT_ADDRESS_BASE_SEPOLIA, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_MAINNET, USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA, ValidateTransferError, WORLD_CHAIN_MAINNET, WORLD_CHAIN_SEPOLIA, atxpClient, atxpFetch, buildClientConfig, buildStreamableTransport, getBaseUSDCAddress, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress, getWorldChainByChainId, getWorldChainMainnetWithRPC, getWorldChainSepoliaWithRPC, getWorldChainUSDCAddress };
+export type { AccountIdString, ClientArgs, ClientConfig, FetchWrapper, Hex, OAuthClientConfig, PolygonChain, ProspectivePayment, WorldChain };

package/dist/index.d.ts.map

@@ -1 +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"}
+{"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,cAAc,CAAC;AAEtB,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,qCAAqC,EACrC,kCAAkC,EAClC,eAAe,EACf,YAAY,EACZ,wBAAwB,EACxB,qBAAqB,EACrB,mBAAmB,EACnB,qBAAqB,EACrB,KAAK,YAAY,EAClB,MAAM,uBAAuB,CAAC;AAE/B,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;AAG/B,OAAO,EACL,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC"}