@atxp/client 0.7.4 → 0.8.1

package/dist/polygonConstants.d.ts

@@ -0,0 +1,53 @@
+/**
+ * Polygon Chain configuration type, compatible with viem's Chain interface
+ */
+export 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;
+};
+export declare const USDC_CONTRACT_ADDRESS_POLYGON_MAINNET = "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359";
+export declare const USDC_CONTRACT_ADDRESS_POLYGON_AMOY = "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582";
+export declare const POLYGON_MAINNET: PolygonChain;
+export 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'
+ */
+export 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'
+ */
+export 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
+ */
+export 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
+ */
+export declare const getPolygonUSDCAddress: (chainId: number) => string;
+//# sourceMappingURL=polygonConstants.d.ts.map

package/dist/polygonConstants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"polygonConstants.d.ts","sourceRoot":"","sources":["../src/polygonConstants.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,cAAc,EAAE;QACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC3B,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE;QAChB,QAAQ,CAAC,OAAO,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAA;SAAE,CAAC;KACxD,CAAC;IACF,QAAQ,CAAC,cAAc,EAAE;QACvB,QAAQ,CAAC,OAAO,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAC;KACnE,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,qCAAqC,+CAA+C,CAAC;AAClG,eAAO,MAAM,kCAAkC,+CAA+C,CAAC;AAI/F,eAAO,MAAM,eAAe,EAAE,YAUpB,CAAC;AAIX,eAAO,MAAM,YAAY,EAAE,YAWjB,CAAC;AAEX;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GAAI,QAAQ,MAAM,KAAG,YAKxD,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,KAAG,YAKrD,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,KAAG,YASrD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAAI,SAAS,MAAM,KAAG,MASvD,CAAC"}

package/dist/polygonConstants.js

@@ -0,0 +1,84 @@
+const USDC_CONTRACT_ADDRESS_POLYGON_MAINNET = "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359"; // Native USDC on Polygon mainnet
+const USDC_CONTRACT_ADDRESS_POLYGON_AMOY = "0x41E94Eb019C0762f9Bfcf9Fb1E58725BfB0e7582"; // USDC on Polygon Amoy testnet
+// Polygon Mainnet (Chain ID: 137)
+// Note: Native currency upgraded from MATIC to POL on September 4, 2024
+const POLYGON_MAINNET = {
+    id: 137,
+    name: 'Polygon',
+    nativeCurrency: { name: 'POL', symbol: 'POL', decimals: 18 },
+    rpcUrls: {
+        default: { http: ['https://polygon-rpc.com'] }
+    },
+    blockExplorers: {
+        default: { name: 'PolygonScan', url: 'https://polygonscan.com' }
+    }
+};
+// Polygon Amoy Testnet (Chain ID: 80002)
+// Note: Amoy testnet also uses POL as native currency (following mainnet upgrade)
+const POLYGON_AMOY = {
+    id: 80002,
+    name: 'Polygon Amoy',
+    nativeCurrency: { name: 'POL', symbol: 'POL', decimals: 18 },
+    rpcUrls: {
+        default: { http: ['https://rpc-amoy.polygon.technology'] }
+    },
+    blockExplorers: {
+        default: { name: 'PolygonScan Amoy', url: 'https://amoy.polygonscan.com' }
+    },
+    testnet: true
+};
+/**
+ * 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'
+ */
+const getPolygonMainnetWithRPC = (rpcUrl) => ({
+    ...POLYGON_MAINNET,
+    rpcUrls: {
+        default: { http: [rpcUrl] }
+    }
+});
+/**
+ * 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'
+ */
+const getPolygonAmoyWithRPC = (rpcUrl) => ({
+    ...POLYGON_AMOY,
+    rpcUrls: {
+        default: { http: [rpcUrl] }
+    }
+});
+/**
+ * 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
+ */
+const getPolygonByChainId = (chainId) => {
+    switch (chainId) {
+        case 137:
+            return POLYGON_MAINNET;
+        case 80002:
+            return POLYGON_AMOY;
+        default:
+            throw new Error(`Unsupported Polygon Chain ID: ${chainId}. Supported chains: 137 (mainnet), 80002 (Amoy testnet)`);
+    }
+};
+/**
+ * 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
+ */
+const getPolygonUSDCAddress = (chainId) => {
+    switch (chainId) {
+        case 137:
+            return USDC_CONTRACT_ADDRESS_POLYGON_MAINNET;
+        case 80002:
+            return USDC_CONTRACT_ADDRESS_POLYGON_AMOY;
+        default:
+            throw new Error(`Unsupported Polygon Chain ID: ${chainId}. Supported chains: 137 (mainnet), 80002 (Amoy testnet)`);
+    }
+};
+
+export { POLYGON_AMOY, POLYGON_MAINNET, USDC_CONTRACT_ADDRESS_POLYGON_AMOY, USDC_CONTRACT_ADDRESS_POLYGON_MAINNET, getPolygonAmoyWithRPC, getPolygonByChainId, getPolygonMainnetWithRPC, getPolygonUSDCAddress };
+//# sourceMappingURL=polygonConstants.js.map

package/dist/polygonConstants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"polygonConstants.js","sources":["../src/polygonConstants.ts"],"sourcesContent":[null],"names":[],"mappings":"AAoBO,MAAM,qCAAqC,GAAG,6CAA6C;AAC3F,MAAM,kCAAkC,GAAG,6CAA6C;AAE/F;AACA;AACO,MAAM,eAAe,GAAiB;AAC3C,IAAA,EAAE,EAAE,GAAG;AACP,IAAA,IAAI,EAAE,SAAS;AACf,IAAA,cAAc,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;AAC5D,IAAA,OAAO,EAAE;AACP,QAAA,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,yBAAyB,CAAC;AAC7C,KAAA;AACD,IAAA,cAAc,EAAE;QACd,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,yBAAyB;AAC/D;;AAGH;AACA;AACO,MAAM,YAAY,GAAiB;AACxC,IAAA,EAAE,EAAE,KAAK;AACT,IAAA,IAAI,EAAE,cAAc;AACpB,IAAA,cAAc,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;AAC5D,IAAA,OAAO,EAAE;AACP,QAAA,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,qCAAqC,CAAC;AACzD,KAAA;AACD,IAAA,cAAc,EAAE;QACd,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,8BAA8B;AACzE,KAAA;AACD,IAAA,OAAO,EAAE;;AAGX;;;AAGG;MACU,wBAAwB,GAAG,CAAC,MAAc,MAAoB;AACzE,IAAA,GAAG,eAAe;AAClB,IAAA,OAAO,EAAE;AACP,QAAA,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC;AAC1B;AACF,CAAA;AAED;;;AAGG;MACU,qBAAqB,GAAG,CAAC,MAAc,MAAoB;AACtE,IAAA,GAAG,YAAY;AACf,IAAA,OAAO,EAAE;AACP,QAAA,OAAO,EAAE,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC;AAC1B;AACF,CAAA;AAED;;;;;AAKG;AACI,MAAM,mBAAmB,GAAG,CAAC,OAAe,KAAkB;IACnE,QAAQ,OAAO;AACb,QAAA,KAAK,GAAG;AACN,YAAA,OAAO,eAAe;AACxB,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,YAAY;AACrB,QAAA;AACE,YAAA,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,CAAA,uDAAA,CAAyD,CAAC;;AAExH;AAEA;;;;;AAKG;AACI,MAAM,qBAAqB,GAAG,CAAC,OAAe,KAAY;IAC/D,QAAQ,OAAO;AACb,QAAA,KAAK,GAAG;AACN,YAAA,OAAO,qCAAqC;AAC9C,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,kCAAkC;AAC3C,QAAA;AACE,YAAA,MAAM,IAAI,KAAK,CAAC,iCAAiC,OAAO,CAAA,uDAAA,CAAyD,CAAC;;AAExH;;;;"}

package/dist/solanaAccount.d.ts

@@ -1,9 +1,13 @@
 import type { Account, PaymentMaker } from './types.js';
+import type { AccountId, Source } from '@atxp/common';
 export declare class SolanaAccount implements Account {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
-    };
+    accountId: AccountId;
+    paymentMakers: PaymentMaker[];
+    private sourcePublicKey;
     constructor(solanaEndpoint: string, sourceSecretKey: string);
+    /**
+     * Get sources for this account
+     */
+    getSources(): Promise<Source[]>;
 }
 //# sourceMappingURL=solanaAccount.d.ts.map

package/dist/solanaAccount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solanaAccount.d.ts","sourceRoot":"","sources":["../src/solanaAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAKxD,qBAAa,aAAc,YAAW,OAAO;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;gBAEnC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;CAc5D"}
+{"version":3,"file":"solanaAccount.d.ts","sourceRoot":"","sources":["../src/solanaAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKtD,qBAAa,aAAc,YAAW,OAAO;IAC3C,SAAS,EAAE,SAAS,CAAC;IACrB,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,eAAe,CAAS;gBAEpB,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAiB3D;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAOtC"}

package/dist/solanaAccount.js

@@ -11,10 +11,22 @@ class SolanaAccount {
             throw new Error('Source secret key is required');
         }
         const source = Keypair.fromSecretKey(bs58.decode(sourceSecretKey));
-        this.accountId = source.publicKey.toBase58();
-        this.paymentMakers = {
-            'solana': new SolanaPaymentMaker(solanaEndpoint, sourceSecretKey),
-        };
+        this.sourcePublicKey = source.publicKey.toBase58();
+        // Format accountId as network:address
+        this.accountId = `solana:${this.sourcePublicKey}`;
+        this.paymentMakers = [
+            new SolanaPaymentMaker(solanaEndpoint, sourceSecretKey)
+        ];
+    }
+    /**
+     * Get sources for this account
+     */
+    async getSources() {
+        return [{
+                address: this.sourcePublicKey,
+                chain: 'solana',
+                walletType: 'eoa'
+            }];
     }
 }
 

package/dist/solanaAccount.js.map

@@ -1 +1 @@
-{"version":3,"file":"solanaAccount.js","sources":["../src/solanaAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;MAKa,aAAa,CAAA;IAIxB,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAA;QACzD,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAElE,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;QAC5C,IAAI,CAAC,aAAa,GAAG;AACnB,YAAA,QAAQ,EAAE,IAAI,kBAAkB,CAAC,cAAc,EAAE,eAAe,CAAC;SAClE;IACH;AACD;;;;"}
+{"version":3,"file":"solanaAccount.js","sources":["../src/solanaAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;MAMa,aAAa,CAAA;IAKxB,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAA;QACzD,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;;QAGlD,IAAI,CAAC,SAAS,GAAG,CAAA,OAAA,EAAU,IAAI,CAAC,eAAe,EAAe;QAC9D,IAAI,CAAC,aAAa,GAAG;AACnB,YAAA,IAAI,kBAAkB,CAAC,cAAc,EAAE,eAAe;SACvD;IACH;AAEA;;AAEG;AACH,IAAA,MAAM,UAAU,GAAA;AACd,QAAA,OAAO,CAAC;gBACN,OAAO,EAAE,IAAI,CAAC,eAAe;AAC7B,gBAAA,KAAK,EAAE,QAAQ;AACf,gBAAA,UAAU,EAAE;AACb,aAAA,CAAC;IACJ;AACD;;;;"}

package/dist/solanaPaymentMaker.d.ts

@@ -1,7 +1,7 @@
 import type { PaymentMaker } from './types.js';
 import { ValidateTransferError as _ValidateTransferError } from "@solana/pay";
 import BigNumber from "bignumber.js";
-import { Currency } from '@atxp/common';
+import { Currency, AccountId, PaymentIdentifier, Destination } from '@atxp/common';
 import { Logger } from '@atxp/common';
 export declare const ValidateTransferError: typeof _ValidateTransferError;
 export declare class SolanaPaymentMaker implements PaymentMaker {
@@ -15,10 +15,11 @@ export 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, currency: Currency, receiver: string, memo: string) => Promise<string>;
+    makePayment: (destinations: Destination[], memo: string, _paymentRequestId?: string) => Promise<PaymentIdentifier | null>;
 }
 //# sourceMappingURL=solanaPaymentMaker.d.ts.map

package/dist/solanaPaymentMaker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"solanaPaymentMaker.d.ts","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAkB,qBAAqB,IAAI,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG9F,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAe,QAAQ,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,eAAO,MAAM,qBAAqB,+BAAyB,CAAC;AAE5D,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAS;gBAEX,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAY5E,gBAAgB,CAAC,OAAO,EAAE;QAAC,MAAM,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM;IAI1G,WAAW,GAAS,qCAAmC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC,KAAG,OAAO,CAAC,MAAM,CAAC,CAezH;IAED,WAAW,GAAU,QAAQ,SAAS,EAAE,UAAU,QAAQ,EAAE,UAAU,MAAM,EAAE,MAAM,MAAM,KAAG,OAAO,CAAC,MAAM,CAAC,CA8D3G;CACF"}
+{"version":3,"file":"solanaPaymentMaker.d.ts","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG/C,OAAO,EAAkB,qBAAqB,IAAI,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAG9F,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAe,QAAQ,EAAE,SAAS,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAMtC,eAAO,MAAM,qBAAqB,+BAAyB,CAAC;AAE5D,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,MAAM,CAAS;gBAEX,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAY5E,gBAAgB,CAAC,OAAO,EAAE;QAAC,MAAM,EAAE,SAAS,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAC,GAAG,MAAM;IAI1G,WAAW,GAAS,gDAA8C;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,SAAS,GAAG,IAAI,CAAA;KAAC,KAAG,OAAO,CAAC,MAAM,CAAC,CAelK;IAED,WAAW,GAAU,cAAc,WAAW,EAAE,EAAE,MAAM,MAAM,EAAE,oBAAoB,MAAM,KAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAyF7H;CACF"}

package/dist/solanaPaymentMaker.js

@@ -12,7 +12,7 @@ const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
 const ValidateTransferError = ValidateTransferError$1;
 class SolanaPaymentMaker {
     constructor(solanaEndpoint, sourceSecretKey, logger) {
-        this.generateJWT = async ({ paymentRequestId, codeChallenge }) => {
+        this.generateJWT = async ({ paymentRequestId, codeChallenge, accountId }) => {
             // Solana/Web3.js secretKey is 64 bytes:
             // first 32 bytes are the private scalar, last 32 are the public key.
             // JWK expects only the 32-byte private scalar for 'd'
@@ -26,9 +26,20 @@ class SolanaPaymentMaker {
             if (!(privateKey instanceof CryptoKey)) {
                 throw new Error('Expected CryptoKey from importJWK');
             }
-            return generateJWT(this.source.publicKey.toBase58(), privateKey, paymentRequestId || '', codeChallenge || '');
+            return generateJWT(this.source.publicKey.toBase58(), privateKey, paymentRequestId || '', codeChallenge || '', accountId);
         };
-        this.makePayment = async (amount, currency, receiver, memo) => {
+        this.makePayment = async (destinations, memo, _paymentRequestId) => {
+            // Filter to solana chain destinations
+            const solanaDestinations = destinations.filter(d => d.chain === 'solana');
+            if (solanaDestinations.length === 0) {
+                this.logger.debug('SolanaPaymentMaker: No solana destinations found, cannot handle payment');
+                return null; // Cannot handle these destinations
+            }
+            // Pick first solana destination
+            const dest = solanaDestinations[0];
+            const amount = dest.amount;
+            const currency = dest.currency;
+            const receiver = dest.address;
             if (currency.toUpperCase() !== 'USDC') {
                 throw new PaymentNetworkError('Only USDC currency is supported; received ' + currency);
             }
@@ -43,6 +54,8 @@ class SolanaPaymentMaker {
                     this.logger.warn(`Insufficient ${currency} balance for payment. Required: ${amount}, Available: ${balance}`);
                     throw new InsufficientFundsError(currency, amount, balance, 'solana');
                 }
+                // Get the destination token account address (this will be the transactionId)
+                const destinationTokenAccount = await getAssociatedTokenAddress(USDC_MINT, receiverKey);
                 // Increase compute units to handle both memo and token transfer
                 // Memo uses ~6000 CUs, token transfer needs ~6500 CUs
                 const modifyComputeUnits = ComputeBudgetProgram.setComputeUnitLimit({
@@ -59,8 +72,14 @@ class SolanaPaymentMaker {
                 });
                 transaction.add(modifyComputeUnits);
                 transaction.add(addPriorityFee);
-                const transactionHash = await sendAndConfirmTransaction(this.connection, transaction, [this.source]);
-                return transactionHash;
+                const transactionSignature = await sendAndConfirmTransaction(this.connection, transaction, [this.source]);
+                // Return transaction signature as transactionId and token account address as transactionSubId
+                return {
+                    transactionId: transactionSignature,
+                    transactionSubId: destinationTokenAccount.toBase58(),
+                    chain: 'solana',
+                    currency: 'USDC'
+                };
             }
             catch (error) {
                 if (error instanceof InsufficientFundsError || error instanceof PaymentNetworkError) {

package/dist/solanaPaymentMaker.js.map

@@ -1 +1 @@
-{"version":3,"file":"solanaPaymentMaker.js","sources":["../src/solanaPaymentMaker.ts"],"sourcesContent":[null],"names":["_ValidateTransferError"],"mappings":";;;;;;;;;AAYA;AACA,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC;AAExE,MAAM,qBAAqB,GAAGA;MAExB,kBAAkB,CAAA;AAK7B,IAAA,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAE,MAAe,EAAA;QAgB5E,IAAA,CAAA,WAAW,GAAG,OAAM,EAAC,gBAAgB,EAAE,aAAa,EAAoD,KAAqB;;;;AAI3H,YAAA,MAAM,GAAG,GAAG;AACV,gBAAA,GAAG,EAAE,KAAK;AACV,gBAAA,GAAG,EAAE,SAAS;gBACd,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;AACxE,gBAAA,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;aACtE;YACD,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;AAChD,YAAA,IAAI,EAAE,UAAU,YAAY,SAAS,CAAC,EAAE;AACtC,gBAAA,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC;YACtD;YACA,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,gBAAgB,IAAI,EAAE,EAAE,aAAa,IAAI,EAAE,CAAC;AAC/G,QAAA,CAAC;QAED,IAAA,CAAA,WAAW,GAAG,OAAO,MAAiB,EAAE,QAAkB,EAAE,QAAgB,EAAE,IAAY,KAAqB;AAC7G,YAAA,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;AACrC,gBAAA,MAAM,IAAI,mBAAmB,CAAC,4CAA4C,GAAG,QAAQ,CAAC;YACxF;AAEA,YAAA,MAAM,WAAW,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC;YAE3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,kBAAA,EAAqB,MAAM,CAAA,CAAA,EAAI,QAAQ,CAAA,IAAA,EAAO,QAAQ,mBAAmB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA,CAAE,CAAC;AAE7H,YAAA,IAAI;;AAEF,gBAAA,MAAM,mBAAmB,GAAG,MAAM,yBAAyB,CACzD,SAAS,EACT,IAAI,CAAC,MAAM,CAAC,SAAS,CACtB;gBAED,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC;gBAC3E,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAEjF,gBAAA,IAAI,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;AACtB,oBAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,aAAA,EAAgB,QAAQ,CAAA,gCAAA,EAAmC,MAAM,CAAA,aAAA,EAAgB,OAAO,CAAA,CAAE,CAAC;oBAC5G,MAAM,IAAI,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;gBACvE;;;AAIA,gBAAA,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,mBAAmB,CAAC;AAClE,oBAAA,KAAK,EAAE,KAAK;AACb,iBAAA,CAAC;AAEF,gBAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,mBAAmB,CAAC;AAC9D,oBAAA,aAAa,EAAE,KAAK;AACrB,iBAAA,CAAC;AAEF,gBAAA,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CAAC,SAAS,EACrB;AACE,oBAAA,MAAM,EAAE,MAAM;AACd,oBAAA,SAAS,EAAE,WAAW;AACtB,oBAAA,QAAQ,EAAE,SAAS;oBACnB,IAAI;AACL,iBAAA,CACF;AAED,gBAAA,WAAW,CAAC,GAAG,CAAC,kBAAkB,CAAC;AACnC,gBAAA,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC;AAE/B,gBAAA,MAAM,eAAe,GAAG,MAAM,yBAAyB,CACrD,IAAI,CAAC,UAAU,EACf,WAAW,EACX,CAAC,IAAI,CAAC,MAAM,CAAC,CACd;AACD,gBAAA,OAAO,eAAe;YACxB;YAAE,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,sBAAsB,IAAI,KAAK,YAAY,mBAAmB,EAAE;AACnF,oBAAA,MAAM,KAAK;gBACb;;gBAGA,MAAM,IAAI,mBAAmB,CAAC,CAAA,kCAAA,EAAsC,KAAe,CAAC,OAAO,CAAA,CAAE,EAAE,KAAc,CAAC;YAChH;AACF,QAAA,CAAC;QA9FC,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AAC7E,QAAA,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,aAAa,EAAE;IAC7C;AAEA,IAAA,gBAAgB,CAAC,OAAgF,EAAA;QAC/F,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;IACzC;AAkFD;;;;"}
+{"version":3,"file":"solanaPaymentMaker.js","sources":["../src/solanaPaymentMaker.ts"],"sourcesContent":[null],"names":["_ValidateTransferError"],"mappings":";;;;;;;;;AAYA;AACA,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC;AAExE,MAAM,qBAAqB,GAAGA;MAExB,kBAAkB,CAAA;AAK7B,IAAA,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAE,MAAe,EAAA;QAgB5E,IAAA,CAAA,WAAW,GAAG,OAAM,EAAC,gBAAgB,EAAE,aAAa,EAAE,SAAS,EAAkF,KAAqB;;;;AAIpK,YAAA,MAAM,GAAG,GAAG;AACV,gBAAA,GAAG,EAAE,KAAK;AACV,gBAAA,GAAG,EAAE,SAAS;gBACd,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;AACxE,gBAAA,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;aACtE;YACD,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;AAChD,YAAA,IAAI,EAAE,UAAU,YAAY,SAAS,CAAC,EAAE;AACtC,gBAAA,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC;YACtD;YACA,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,gBAAgB,IAAI,EAAE,EAAE,aAAa,IAAI,EAAE,EAAE,SAAkC,CAAC;AACnJ,QAAA,CAAC;QAED,IAAA,CAAA,WAAW,GAAG,OAAO,YAA2B,EAAE,IAAY,EAAE,iBAA0B,KAAuC;;AAE/H,YAAA,MAAM,kBAAkB,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC;AAEzE,YAAA,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;AACnC,gBAAA,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,CAAC;gBAC5F,OAAO,IAAI,CAAC;YACd;;AAGA,YAAA,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC;AAClC,YAAA,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM;AAC1B,YAAA,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ;AAC9B,YAAA,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO;AAE7B,YAAA,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;AACrC,gBAAA,MAAM,IAAI,mBAAmB,CAAC,4CAA4C,GAAG,QAAQ,CAAC;YACxF;AAEA,YAAA,MAAM,WAAW,GAAG,IAAI,SAAS,CAAC,QAAQ,CAAC;YAE3C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,kBAAA,EAAqB,MAAM,CAAA,CAAA,EAAI,QAAQ,CAAA,IAAA,EAAO,QAAQ,mBAAmB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAA,CAAE,CAAC;AAE7H,YAAA,IAAI;;AAEF,gBAAA,MAAM,mBAAmB,GAAG,MAAM,yBAAyB,CACzD,SAAS,EACT,IAAI,CAAC,MAAM,CAAC,SAAS,CACtB;gBAED,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,mBAAmB,CAAC;gBAC3E,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAEjF,gBAAA,IAAI,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;AACtB,oBAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA,aAAA,EAAgB,QAAQ,CAAA,gCAAA,EAAmC,MAAM,CAAA,aAAA,EAAgB,OAAO,CAAA,CAAE,CAAC;oBAC5G,MAAM,IAAI,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;gBACvE;;gBAGA,MAAM,uBAAuB,GAAG,MAAM,yBAAyB,CAC7D,SAAS,EACT,WAAW,CACZ;;;AAID,gBAAA,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,mBAAmB,CAAC;AAClE,oBAAA,KAAK,EAAE,KAAK;AACb,iBAAA,CAAC;AAEF,gBAAA,MAAM,cAAc,GAAG,oBAAoB,CAAC,mBAAmB,CAAC;AAC9D,oBAAA,aAAa,EAAE,KAAK;AACrB,iBAAA,CAAC;AAEF,gBAAA,MAAM,WAAW,GAAG,MAAM,cAAc,CACtC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,MAAM,CAAC,SAAS,EACrB;AACE,oBAAA,MAAM,EAAE,MAAM;AACd,oBAAA,SAAS,EAAE,WAAW;AACtB,oBAAA,QAAQ,EAAE,SAAS;oBACnB,IAAI;AACL,iBAAA,CACF;AAED,gBAAA,WAAW,CAAC,GAAG,CAAC,kBAAkB,CAAC;AACnC,gBAAA,WAAW,CAAC,GAAG,CAAC,cAAc,CAAC;AAE/B,gBAAA,MAAM,oBAAoB,GAAG,MAAM,yBAAyB,CAC1D,IAAI,CAAC,UAAU,EACf,WAAW,EACX,CAAC,IAAI,CAAC,MAAM,CAAC,CACd;;gBAGD,OAAO;AACL,oBAAA,aAAa,EAAE,oBAAoB;AACnC,oBAAA,gBAAgB,EAAE,uBAAuB,CAAC,QAAQ,EAAE;AACpD,oBAAA,KAAK,EAAE,QAAQ;AACf,oBAAA,QAAQ,EAAE;iBACX;YACH;YAAE,OAAO,KAAK,EAAE;gBACd,IAAI,KAAK,YAAY,sBAAsB,IAAI,KAAK,YAAY,mBAAmB,EAAE;AACnF,oBAAA,MAAM,KAAK;gBACb;;gBAGA,MAAM,IAAI,mBAAmB,CAAC,CAAA,kCAAA,EAAsC,KAAe,CAAC,OAAO,CAAA,CAAE,EAAE,KAAc,CAAC;YAChH;AACF,QAAA,CAAC;QAzHC,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,IAAI,CAAC,UAAU,GAAG,IAAI,UAAU,CAAC,cAAc,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AAC7E,QAAA,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,IAAI,aAAa,EAAE;IAC7C;AAEA,IAAA,gBAAgB,CAAC,OAAgF,EAAA;QAC/F,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;IACzC;AA6GD;;;;"}

package/dist/types.d.ts

@@ -1,20 +1,13 @@
-import { AuthorizationServerUrl, Currency, Logger, Network, OAuthDb, FetchLike } from "@atxp/common";
+import { AuthorizationServerUrl, Currency, Logger, Network, OAuthDb, FetchLike, Account, PaymentMaker, AccountId, DestinationMaker } from "@atxp/common";
 import { ClientOptions } from "@modelcontextprotocol/sdk/client/index.js";
 import { Implementation } from "@modelcontextprotocol/sdk/types.js";
 export type Hex = `0x${string}`;
 type AccountPrefix = Network;
 export type AccountIdString = `${AccountPrefix}${string}`;
-export type Account = {
-    accountId: string;
-    paymentMakers: {
-        [key: string]: PaymentMaker;
-    };
-};
 export type ProspectivePayment = {
-    accountId: string;
+    accountId: AccountId;
     resourceUrl: string;
     resourceName: string;
-    network: Network;
     currency: Currency;
     amount: BigNumber;
     iss: string;
@@ -22,6 +15,8 @@ export type ProspectivePayment = {
 export type ClientConfig = {
     mcpServer: string;
     account: Account;
+    atxpAccountsServer: string;
+    destinationMakers: Map<Network, DestinationMaker>;
     allowedAuthorizationServers: AuthorizationServerUrl[];
     approvePayment: (payment: ProspectivePayment) => Promise<boolean>;
     oAuthDb: OAuthDb;
@@ -64,18 +59,5 @@ export declare class PaymentNetworkError extends Error {
     readonly originalError?: Error | undefined;
     constructor(message: string, originalError?: Error | undefined);
 }
-export 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>;
-}
-export {};
+export type { Account, PaymentMaker };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

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

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sources":["../src/types.ts"],"sourcesContent":[null],"names":[],"mappings":"AAqDM,MAAO,sBAAuB,SAAQ,KAAK,CAAA;AAC/C,IAAA,WAAA,CACkB,QAAkB,EAClB,QAAmB,EACnB,SAAqB,EACrB,OAAgB,EAAA;AAEhC,QAAA,MAAM,aAAa,GAAG,SAAS,GAAG,CAAA,aAAA,EAAgB,SAAS,CAAA,CAAE,GAAG,EAAE;AAClE,QAAA,MAAM,WAAW,GAAG,OAAO,GAAG,CAAA,IAAA,EAAO,OAAO,CAAA,CAAE,GAAG,EAAE;AACnD,QAAA,KAAK,CACH,CAAA,mCAAA,EAAsC,QAAQ,CAAA,MAAA,EAAS,WAAW,CAAA,EAAA,CAAI;YACtE,CAAA,UAAA,EAAa,QAAQ,CAAA,EAAG,aAAa,CAAA,EAAA,CAAI;AACzC,YAAA,CAAA,gEAAA,CAAkE,CACnE;QAXe,IAAA,CAAA,QAAQ,GAAR,QAAQ;QACR,IAAA,CAAA,QAAQ,GAAR,QAAQ;QACR,IAAA,CAAA,SAAS,GAAT,SAAS;QACT,IAAA,CAAA,OAAO,GAAP,OAAO;AASvB,QAAA,IAAI,CAAC,IAAI,GAAG,wBAAwB;IACtC;AACD;AAEK,MAAO,mBAAoB,SAAQ,KAAK,CAAA;IAC5C,WAAA,CAAY,OAAe,EAAkB,aAAqB,EAAA;AAChE,QAAA,KAAK,CAAC,CAAA,qCAAA,EAAwC,OAAO,CAAA,CAAE,CAAC;QADb,IAAA,CAAA,aAAa,GAAb,aAAa;AAExD,QAAA,IAAI,CAAC,IAAI,GAAG,qBAAqB;IACnC;AACD;;;;"}
+{"version":3,"file":"types.js","sources":["../src/types.ts"],"sourcesContent":[null],"names":[],"mappings":"AAiDM,MAAO,sBAAuB,SAAQ,KAAK,CAAA;AAC/C,IAAA,WAAA,CACkB,QAAkB,EAClB,QAAmB,EACnB,SAAqB,EACrB,OAAgB,EAAA;AAEhC,QAAA,MAAM,aAAa,GAAG,SAAS,GAAG,CAAA,aAAA,EAAgB,SAAS,CAAA,CAAE,GAAG,EAAE;AAClE,QAAA,MAAM,WAAW,GAAG,OAAO,GAAG,CAAA,IAAA,EAAO,OAAO,CAAA,CAAE,GAAG,EAAE;AACnD,QAAA,KAAK,CACH,CAAA,mCAAA,EAAsC,QAAQ,CAAA,MAAA,EAAS,WAAW,CAAA,EAAA,CAAI;YACtE,CAAA,UAAA,EAAa,QAAQ,CAAA,EAAG,aAAa,CAAA,EAAA,CAAI;AACzC,YAAA,CAAA,gEAAA,CAAkE,CACnE;QAXe,IAAA,CAAA,QAAQ,GAAR,QAAQ;QACR,IAAA,CAAA,QAAQ,GAAR,QAAQ;QACR,IAAA,CAAA,SAAS,GAAT,SAAS;QACT,IAAA,CAAA,OAAO,GAAP,OAAO;AASvB,QAAA,IAAI,CAAC,IAAI,GAAG,wBAAwB;IACtC;AACD;AAEK,MAAO,mBAAoB,SAAQ,KAAK,CAAA;IAC5C,WAAA,CAAY,OAAe,EAAkB,aAAqB,EAAA;AAChE,QAAA,KAAK,CAAC,CAAA,qCAAA,EAAwC,OAAO,CAAA,CAAE,CAAC;QADb,IAAA,CAAA,aAAa,GAAb,aAAa;AAExD,QAAA,IAAI,CAAC,IAAI,GAAG,qBAAqB;IACnC;AACD;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atxp/client",
-  "version": "0.7.4",
+  "version": "0.8.1",
   "description": "ATXP Client - MCP client with OAuth authentication and payment processing",
   "license": "MIT",
   "repository": {
@@ -33,7 +33,7 @@
     "pack:dry": "npm pack --dry-run"
   },
   "dependencies": {
-    "@atxp/common": "0.7.4",
+    "@atxp/common": "0.8.1",
     "@modelcontextprotocol/sdk": "^1.15.0",
     "bignumber.js": "^9.3.0",
     "oauth4webapi": "^3.5.0"

package/dist/atxpAccount.d.ts

@@ -1,18 +0,0 @@
-import type { Account, PaymentMaker } from './types.js';
-import type { FetchLike, Network } from '@atxp/common';
-import { LocalAccount } from 'viem';
-export 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>;
-}
-//# sourceMappingURL=atxpAccount.d.ts.map

package/dist/atxpAccount.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"atxpAccount.d.ts","sourceRoot":"","sources":["../src/atxpAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAY,MAAM,cAAc,CAAA;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AA+GpC,qBAAa,WAAY,YAAW,OAAO;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,SAAS,CAAC;gBAEP,gBAAgB,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,SAAS,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE;IAoBjF,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;CAOzC"}

package/dist/atxpAccount.js

@@ -1,123 +0,0 @@
-import { crypto } from '@atxp/common';
-import { ATXPLocalAccount } from './atxpLocalAccount.js';
-
-function toBasicAuth(token) {
-    // Basic auth is base64("username:password"), password is blank
-    const b64 = Buffer.from(`${token}:`).toString('base64');
-    return `Basic ${b64}`;
-}
-function parseConnectionString(connectionString) {
-    const url = new URL(connectionString);
-    const origin = url.origin;
-    const token = url.searchParams.get('connection_token') || '';
-    const accountId = url.searchParams.get('account_id');
-    if (!token) {
-        throw new Error('ATXPAccount: connection string missing connection token');
-    }
-    return { origin, token, accountId };
-}
-class ATXPHttpPaymentMaker {
-    constructor(origin, token, fetchFn = fetch) {
-        this.origin = origin;
-        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`, {
-            method: 'POST',
-            headers: {
-                'Authorization': toBasicAuth(this.token),
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                amount: amount.toString(),
-                currency,
-                receiver,
-                memo,
-            }),
-        });
-        if (!response.ok) {
-            const text = await response.text();
-            throw new Error(`ATXPAccount: /pay failed: ${response.status} ${response.statusText} ${text}`);
-        }
-        const json = await response.json();
-        if (!json?.txHash) {
-            throw new Error('ATXPAccount: /pay did not return txHash');
-        }
-        return json.txHash;
-    }
-    async generateJWT(params) {
-        const response = await this.fetchFn(`${this.origin}/sign`, {
-            method: 'POST',
-            headers: {
-                'Authorization': toBasicAuth(this.token),
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                paymentRequestId: params.paymentRequestId,
-                codeChallenge: params.codeChallenge,
-            }),
-        });
-        if (!response.ok) {
-            const text = await response.text();
-            throw new Error(`ATXPAccount: /sign failed: ${response.status} ${response.statusText} ${text}`);
-        }
-        const json = await response.json();
-        if (!json?.jwt) {
-            throw new Error('ATXPAccount: /sign did not return jwt');
-        }
-        return json.jwt;
-    }
-}
-class ATXPAccount {
-    constructor(connectionString, opts) {
-        const { origin, token, accountId } = parseConnectionString(connectionString);
-        const fetchFn = opts?.fetchFn ?? fetch;
-        const network = opts?.network ?? 'base';
-        // Store for use in X402 payment creation
-        this.origin = origin;
-        this.token = token;
-        this.fetchFn = fetchFn;
-        if (accountId) {
-            this.accountId = `atxp:${accountId}`;
-        }
-        else {
-            this.accountId = `atxp:${crypto.randomUUID()}`;
-        }
-        this.paymentMakers = {
-            [network]: new ATXPHttpPaymentMaker(origin, token, fetchFn),
-        };
-    }
-    async getSigner() {
-        return ATXPLocalAccount.create(this.origin, this.token, this.fetchFn);
-    }
-}
-
-export { ATXPAccount };
-//# sourceMappingURL=atxpAccount.js.map

package/dist/atxpAccount.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"atxpAccount.js","sources":["../src/atxpAccount.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}