@atxp/client 0.8.2 → 0.9.0

package/dist/index.cjs

@@ -2,15 +2,7 @@
 
 var common = require('@atxp/common');
 var oauth = require('oauth4webapi');
-var BigNumber = require('bignumber.js');
-var web3_js = require('@solana/web3.js');
-var pay = require('@solana/pay');
-var splToken = require('@solana/spl-token');
-var bs58 = require('bs58');
-var jose = require('jose');
-var viem = require('viem');
-var chains = require('viem/chains');
-var accounts = require('viem/accounts');
+var bignumber_js = require('bignumber.js');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -73,7 +65,8 @@ class OAuthClient extends common.OAuthResourceClient {
             strict,
             allowInsecureRequests,
             clientName,
-            logger
+            logger,
+            registrationType: 'client'
         });
         this.extractResourceUrl = (response) => {
             if (response.status !== 401) {
@@ -368,16 +361,16 @@ class ATXPFetcher {
                 this.logger.info(`PAYMENT FAILED: ${error.message}`);
             }
         };
-        this.handleMultiDestinationPayment = async (paymentRequestData, paymentRequestUrl, paymentRequestId) => {
-            if (!paymentRequestData.destinations || paymentRequestData.destinations.length === 0) {
+        this.handleMultiDestinationPayment = async (paymentRequest, paymentRequestUrl, paymentRequestId) => {
+            if (!paymentRequest.options || paymentRequest.options.length === 0) {
                 return false;
             }
             // Get sources from the account
             const sources = await this.account.getSources();
-            // Apply destination mappers to transform destinations
-            // Convert PaymentRequestDestination[] to Destination[] for mapper compatibility
+            // Apply destination mappers to transform options
+            // Convert PaymentRequestOption[] to Destination[] for mapper compatibility
             const mappedDestinations = [];
-            for (const option of paymentRequestData.destinations) {
+            for (const option of paymentRequest.options) {
                 const destinationMaker = this.destinationMakers.get(option.network);
                 if (!destinationMaker) {
                     this.logger.debug(`ATXP: destination maker for network '${option.network}' not available, trying next destination`);
@@ -399,11 +392,11 @@ class ATXPFetcher {
             const firstDest = mappedDestinations[0];
             const prospectivePayment = {
                 accountId: this.account.accountId,
-                resourceUrl: paymentRequestData.resource?.toString() ?? '',
-                resourceName: paymentRequestData.resourceName ?? '',
+                resourceUrl: paymentRequest.resource?.toString() ?? '',
+                resourceName: paymentRequest.payeeName ?? '',
                 currency: firstDest.currency,
                 amount: firstDest.amount,
-                iss: paymentRequestData.iss ?? '',
+                iss: paymentRequest.payeeName ?? '',
             };
             // Ask for approval once for all payment attempts
             if (!await this.approvePayment(prospectivePayment)) {
@@ -416,7 +409,7 @@ class ATXPFetcher {
             for (const paymentMaker of this.account.paymentMakers) {
                 try {
                     // 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);
+                    const result = await paymentMaker.makePayment(mappedDestinations, paymentRequest.payeeName ?? '', paymentRequestId);
                     if (result === null) {
                         this.logger.debug(`ATXP: payment maker cannot handle these destinations, trying next`);
                         continue; // Try next payment maker
@@ -480,28 +473,28 @@ class ATXPFetcher {
                 this.logger.info(`ATXP: payment requirement is not allowed on this server`);
                 return false;
             }
-            const paymentRequestData = await this.getPaymentRequestData(paymentRequestUrl);
-            if (!paymentRequestData) {
+            const paymentRequest = await this.getPaymentRequest(paymentRequestUrl);
+            if (!paymentRequest) {
                 throw new Error(`ATXP: payment request ${paymentRequestId} not found on server ${paymentRequestUrl}`);
             }
-            // Handle multi-destination format
-            if (paymentRequestData.destinations && paymentRequestData.destinations.length > 0) {
-                return this.handleMultiDestinationPayment(paymentRequestData, paymentRequestUrl, paymentRequestId);
+            // Handle multi-option format
+            if (paymentRequest.options && paymentRequest.options.length > 0) {
+                return this.handleMultiDestinationPayment(paymentRequest, paymentRequestUrl, paymentRequestId);
             }
-            // Payment request doesn't have destinations - this shouldn't happen with new SDK
-            throw new Error(`ATXP: payment request does not contain destinations array`);
+            // Payment request doesn't have options - this shouldn't happen with new SDK
+            throw new Error(`ATXP: payment request does not contain options array`);
         };
-        this.getPaymentRequestData = async (paymentRequestUrl) => {
+        this.getPaymentRequest = async (paymentRequestUrl) => {
             const prRequest = await this.sideChannelFetch(paymentRequestUrl);
             if (!prRequest.ok) {
                 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.BigNumber(dest.amount);
+            if (paymentRequest.options) {
+                for (const option of paymentRequest.options) {
+                    if (typeof option.amount === 'string' || typeof option.amount === 'number') {
+                        option.amount = new bignumber_js.BigNumber(option.amount);
                     }
                 }
             }
@@ -15861,7 +15854,7 @@ function parseDestinationsResponse(data) {
             throw new Error(`Invalid destination at index ${index}: currency "${dest.currency}" is not a valid currency. Valid currencies are: ${validCurrencies}`);
         }
         // Validate amount is a valid number
-        const amount = new BigNumber.BigNumber(dest.amount);
+        const amount = new bignumber_js.BigNumber(dest.amount);
         if (amount.isNaN()) {
             throw new Error(`Invalid destination at index ${index}: amount "${dest.amount}" is not a valid number`);
         }
@@ -16077,310 +16070,6 @@ async function atxpClient(args) {
     return client;
 }
 
-// this is a global public key for USDC on the solana mainnet
-const USDC_MINT = new web3_js.PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
-const ValidateTransferError = pay.ValidateTransferError;
-class SolanaPaymentMaker {
-    constructor(solanaEndpoint, sourceSecretKey, logger) {
-        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'
-            const jwk = {
-                kty: 'OKP',
-                crv: 'Ed25519',
-                d: Buffer.from(this.source.secretKey.slice(0, 32)).toString('base64url'),
-                x: Buffer.from(this.source.publicKey.toBytes()).toString('base64url'),
-            };
-            const privateKey = await jose.importJWK(jwk, 'EdDSA');
-            if (!(privateKey instanceof CryptoKey)) {
-                throw new Error('Expected CryptoKey from importJWK');
-            }
-            return common.generateJWT(this.source.publicKey.toBase58(), privateKey, paymentRequestId || '', codeChallenge || '', accountId);
-        };
-        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);
-            }
-            const receiverKey = new web3_js.PublicKey(receiver);
-            this.logger.info(`Making payment of ${amount} ${currency} to ${receiver} on Solana from ${this.source.publicKey.toBase58()}`);
-            try {
-                // Check balance before attempting payment
-                const tokenAccountAddress = await splToken.getAssociatedTokenAddress(USDC_MINT, this.source.publicKey);
-                const tokenAccount = await splToken.getAccount(this.connection, tokenAccountAddress);
-                const balance = new BigNumber(tokenAccount.amount.toString()).dividedBy(10 ** 6); // USDC has 6 decimals
-                if (balance.lt(amount)) {
-                    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 splToken.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 = web3_js.ComputeBudgetProgram.setComputeUnitLimit({
-                    units: 50000,
-                });
-                const addPriorityFee = web3_js.ComputeBudgetProgram.setComputeUnitPrice({
-                    microLamports: 20000,
-                });
-                const transaction = await pay.createTransfer(this.connection, this.source.publicKey, {
-                    amount: amount,
-                    recipient: receiverKey,
-                    splToken: USDC_MINT,
-                    memo,
-                });
-                transaction.add(modifyComputeUnits);
-                transaction.add(addPriorityFee);
-                const transactionSignature = await web3_js.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) {
-                    throw error;
-                }
-                // Wrap other errors in PaymentNetworkError
-                throw new PaymentNetworkError(`Payment failed on Solana network: ${error.message}`, error);
-            }
-        };
-        if (!solanaEndpoint) {
-            throw new Error('Solana endpoint is required');
-        }
-        if (!sourceSecretKey) {
-            throw new Error('Source secret key is required');
-        }
-        this.connection = new web3_js.Connection(solanaEndpoint, { commitment: 'confirmed' });
-        this.source = web3_js.Keypair.fromSecretKey(bs58.decode(sourceSecretKey));
-        this.logger = logger ?? new common.ConsoleLogger();
-    }
-    getSourceAddress(_params) {
-        return this.source.publicKey.toBase58();
-    }
-}
-
-const USDC_CONTRACT_ADDRESS_BASE = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"; // USDC on Base mainnet
-const USDC_CONTRACT_ADDRESS_BASE_SEPOLIA = "0x036CbD53842c5426634e7929541eC2318f3dCF7e"; // USDC on Base Sepolia testnet
-/**
- * Get USDC contract address for Base chain by chain ID
- * @param chainId - Chain ID (8453 for mainnet, 84532 for sepolia)
- * @returns USDC contract address
- * @throws Error if chain ID is not supported
- */
-const getBaseUSDCAddress = (chainId) => {
-    switch (chainId) {
-        case 8453: // Base mainnet
-            return USDC_CONTRACT_ADDRESS_BASE;
-        case 84532: // Base Sepolia
-            return USDC_CONTRACT_ADDRESS_BASE_SEPOLIA;
-        default:
-            throw new Error(`Unsupported Base Chain ID: ${chainId}. Supported chains: 8453 (mainnet), 84532 (sepolia)`);
-    }
-};
-
-// Helper function to convert to base64url that works in both Node.js and browsers
-function toBase64Url(data) {
-    // Convert string to base64
-    const base64 = typeof Buffer !== 'undefined'
-        ? Buffer.from(data).toString('base64')
-        : btoa(data);
-    // Convert base64 to base64url
-    return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-}
-const USDC_DECIMALS = 6;
-const ERC20_ABI = [
-    {
-        constant: false,
-        inputs: [
-            { name: "_to", type: "address" },
-            { name: "_value", type: "uint256" },
-        ],
-        name: "transfer",
-        outputs: [{ name: "", type: "bool" }],
-        type: "function",
-    },
-    {
-        "constant": true,
-        "inputs": [
-            {
-                "name": "_owner",
-                "type": "address"
-            }
-        ],
-        "name": "balanceOf",
-        "outputs": [
-            {
-                "name": "balance",
-                "type": "uint256"
-            }
-        ],
-        "payable": false,
-        "stateMutability": "view",
-        "type": "function"
-    }
-];
-class BasePaymentMaker {
-    constructor(baseRPCUrl, walletClient, logger) {
-        if (!baseRPCUrl) {
-            throw new Error('baseRPCUrl was empty');
-        }
-        if (!walletClient) {
-            throw new Error('walletClient was empty');
-        }
-        if (!walletClient.account) {
-            throw new Error('walletClient.account was empty');
-        }
-        this.signingClient = walletClient.extend(viem.publicActions);
-        this.logger = logger ?? new common.ConsoleLogger();
-    }
-    getSourceAddress(_params) {
-        return this.signingClient.account.address;
-    }
-    async generateJWT({ paymentRequestId, codeChallenge, accountId }) {
-        const headerObj = { alg: 'ES256K' };
-        const payloadObj = {
-            sub: this.signingClient.account.address,
-            iss: 'accounts.atxp.ai',
-            aud: 'https://auth.atxp.ai',
-            iat: Math.floor(Date.now() / 1000),
-            exp: Math.floor(Date.now() / 1000) + 60 * 60,
-            ...(codeChallenge ? { code_challenge: codeChallenge } : {}),
-            ...(paymentRequestId ? { payment_request_id: paymentRequestId } : {}),
-            ...(accountId ? { account_id: accountId } : {}),
-        };
-        const header = toBase64Url(JSON.stringify(headerObj));
-        const payload = toBase64Url(JSON.stringify(payloadObj));
-        const message = `${header}.${payload}`;
-        const messageBytes = typeof Buffer !== 'undefined'
-            ? Buffer.from(message, 'utf8')
-            : new TextEncoder().encode(message);
-        const signResult = await this.signingClient.signMessage({
-            account: this.signingClient.account,
-            message: { raw: messageBytes },
-        });
-        // For ES256K, signature is typically 65 bytes (r,s,v)
-        // Server expects the hex signature string (with 0x prefix) to be base64url encoded
-        // This creates: base64url("0x6eb2565...") not base64url(rawBytes)
-        // Pass the hex string directly to toBase64Url which will UTF-8 encode and base64url it
-        const signature = toBase64Url(signResult);
-        const jwt = `${header}.${payload}.${signature}`;
-        this.logger.info(`Generated ES256K JWT: ${jwt}`);
-        return jwt;
-    }
-    async makePayment(destinations, _memo, _paymentRequestId) {
-        // Filter to base chain destinations
-        const baseDestinations = destinations.filter(d => d.chain === 'base');
-        if (baseDestinations.length === 0) {
-            this.logger.debug('BasePaymentMaker: No base destinations found, cannot handle payment');
-            return null; // Cannot handle these destinations
-        }
-        // Pick first base destination
-        const dest = baseDestinations[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);
-        }
-        this.logger.info(`Making payment of ${amount} ${currency} to ${receiver} on Base from ${this.signingClient.account.address}`);
-        try {
-            // Check balance before attempting payment
-            const balanceRaw = await this.signingClient.readContract({
-                address: USDC_CONTRACT_ADDRESS_BASE,
-                abi: ERC20_ABI,
-                functionName: 'balanceOf',
-                args: [this.signingClient.account.address],
-            });
-            const balance = new BigNumber.BigNumber(balanceRaw.toString()).dividedBy(10 ** USDC_DECIMALS);
-            if (balance.lt(amount)) {
-                this.logger.warn(`Insufficient ${currency} balance for payment. Required: ${amount}, Available: ${balance}`);
-                throw new InsufficientFundsError(currency, amount, balance, 'base');
-            }
-            // Convert amount to USDC units (6 decimals) as BigInt
-            const amountInUSDCUnits = BigInt(amount.multipliedBy(10 ** USDC_DECIMALS).toFixed(0));
-            const data = viem.encodeFunctionData({
-                abi: ERC20_ABI,
-                functionName: "transfer",
-                args: [receiver, amountInUSDCUnits],
-            });
-            const hash = await this.signingClient.sendTransaction({
-                chain: chains.base,
-                account: this.signingClient.account,
-                to: USDC_CONTRACT_ADDRESS_BASE,
-                data: data,
-                value: viem.parseEther('0'),
-                maxPriorityFeePerGas: viem.parseEther('0.000000001')
-            });
-            // Wait for transaction confirmation with more blocks to ensure propagation
-            this.logger.info(`Waiting for transaction confirmation: ${hash}`);
-            const receipt = await this.signingClient.waitForTransactionReceipt({
-                hash: hash,
-                confirmations: 1
-            });
-            if (receipt.status === 'reverted') {
-                throw new PaymentNetworkError(`Transaction reverted: ${hash}`, new Error('Transaction reverted on chain'));
-            }
-            this.logger.info(`Transaction confirmed: ${hash} in block ${receipt.blockNumber}`);
-            // Return payment result with chain and currency
-            return {
-                transactionId: hash,
-                chain: 'base',
-                currency: 'USDC'
-            };
-        }
-        catch (error) {
-            if (error instanceof InsufficientFundsError || error instanceof PaymentNetworkError) {
-                throw error;
-            }
-            // Wrap other errors in PaymentNetworkError
-            throw new PaymentNetworkError(`Payment failed on Base network: ${error.message}`, error);
-        }
-    }
-}
-
-class SolanaAccount {
-    constructor(solanaEndpoint, sourceSecretKey) {
-        if (!solanaEndpoint) {
-            throw new Error('Solana endpoint is required');
-        }
-        if (!sourceSecretKey) {
-            throw new Error('Source secret key is required');
-        }
-        const source = web3_js.Keypair.fromSecretKey(bs58.decode(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'
-            }];
-    }
-}
-
 const USDC_CONTRACT_ADDRESS_WORLD_MAINNET = "0x79A02482A880bCE3F13e09Da970dC34db4CD24d1"; // USDC.e on World Chain mainnet
 const USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA = "0x79A02482A880bCE3F13e09Da970dC34db4CD24d1"; // USDC.e on World Chain Sepolia (placeholder - update with actual address)
 // World Chain Mainnet (Chain ID: 480)
@@ -16543,45 +16232,6 @@ const getPolygonUSDCAddress = (chainId) => {
     }
 };
 
-class BaseAccount {
-    constructor(baseRPCUrl, sourceSecretKey) {
-        if (!baseRPCUrl) {
-            throw new Error('Base RPC URL is required');
-        }
-        if (!sourceSecretKey) {
-            throw new Error('Source secret key is required');
-        }
-        this.account = accounts.privateKeyToAccount(sourceSecretKey);
-        // Format accountId as network:address
-        this.accountId = `base:${this.account.address}`;
-        this.walletClient = viem.createWalletClient({
-            account: this.account,
-            chain: chains.base,
-            transport: viem.http(baseRPCUrl),
-        });
-        this.paymentMakers = [
-            new BasePaymentMaker(baseRPCUrl, this.walletClient)
-        ];
-    }
-    /**
-     * Get the LocalAccount (signer) for this account.
-     * This can be used with the x402 library or other signing operations.
-     */
-    getLocalAccount() {
-        return this.account;
-    }
-    /**
-     * Get sources for this account
-     */
-    async getSources() {
-        return [{
-                address: this.account.address,
-                chain: 'base',
-                walletType: 'eoa'
-            }];
-    }
-}
-
 function toBasicAuth(token) {
     // Basic auth is base64("username:password"), password is blank
     const b64 = Buffer.from(`${token}:`).toString('base64');
@@ -16688,8 +16338,6 @@ Object.defineProperty(exports, "ATXPAccount", {
 });
 exports.ATXPDestinationMaker = ATXPDestinationMaker;
 exports.ATXPLocalAccount = ATXPLocalAccount;
-exports.BaseAccount = BaseAccount;
-exports.BasePaymentMaker = BasePaymentMaker;
 exports.DEFAULT_CLIENT_CONFIG = DEFAULT_CLIENT_CONFIG;
 exports.InsufficientFundsError = InsufficientFundsError;
 exports.OAuthAuthenticationRequiredError = OAuthAuthenticationRequiredError;
@@ -16698,22 +16346,16 @@ exports.POLYGON_AMOY = POLYGON_AMOY;
 exports.POLYGON_MAINNET = POLYGON_MAINNET;
 exports.PassthroughDestinationMaker = PassthroughDestinationMaker;
 exports.PaymentNetworkError = PaymentNetworkError;
-exports.SolanaAccount = SolanaAccount;
-exports.SolanaPaymentMaker = SolanaPaymentMaker;
-exports.USDC_CONTRACT_ADDRESS_BASE = USDC_CONTRACT_ADDRESS_BASE;
-exports.USDC_CONTRACT_ADDRESS_BASE_SEPOLIA = USDC_CONTRACT_ADDRESS_BASE_SEPOLIA;
 exports.USDC_CONTRACT_ADDRESS_POLYGON_AMOY = USDC_CONTRACT_ADDRESS_POLYGON_AMOY;
 exports.USDC_CONTRACT_ADDRESS_POLYGON_MAINNET = USDC_CONTRACT_ADDRESS_POLYGON_MAINNET;
 exports.USDC_CONTRACT_ADDRESS_WORLD_MAINNET = USDC_CONTRACT_ADDRESS_WORLD_MAINNET;
 exports.USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA = USDC_CONTRACT_ADDRESS_WORLD_SEPOLIA;
-exports.ValidateTransferError = ValidateTransferError;
 exports.WORLD_CHAIN_MAINNET = WORLD_CHAIN_MAINNET;
 exports.WORLD_CHAIN_SEPOLIA = WORLD_CHAIN_SEPOLIA;
 exports.atxpClient = atxpClient;
 exports.atxpFetch = atxpFetch;
 exports.buildClientConfig = buildClientConfig;
 exports.buildStreamableTransport = buildStreamableTransport;
-exports.getBaseUSDCAddress = getBaseUSDCAddress;
 exports.getPolygonAmoyWithRPC = getPolygonAmoyWithRPC;
 exports.getPolygonByChainId = getPolygonByChainId;
 exports.getPolygonMainnetWithRPC = getPolygonMainnetWithRPC;