@atxp/solana 0.8.3

package/README.md

@@ -0,0 +1,73 @@
+# ATXP Solana
+
+ATXP is a framework for building and running agents that can interact with the world. See [docs.atxp.ai](https://docs.atxp.ai) for documentation and examples.
+
+ATXP Solana provides Solana blockchain support for `@atxp/client`, enabling payments and authentication using Solana wallets.
+
+## Support
+
+For detailed API documentation, configuration options, and advanced usage patterns, please refer to our [complete documentation](https://docs.atxp.ai/).
+
+Have questions or need help? Join our [Discord community](https://discord.gg/FuJXHhe9aW) - we're happy to help!
+
+## Installation
+
+```bash
+npm install @atxp/solana @solana/web3.js @solana/pay bs58
+```
+
+## Usage
+
+```typescript
+import { SolanaAccount } from '@atxp/solana';
+import { atxpClient } from '@atxp/client';
+import { Keypair } from '@solana/web3.js';
+
+// Create or load a Solana keypair
+const keypair = Keypair.generate();
+
+// Create a Solana account
+const account = new SolanaAccount({
+  keypair,
+  solanaRpcUrl: 'https://api.mainnet-beta.solana.com'
+});
+
+// Use with atxpClient
+const client = await atxpClient({
+  account,
+  mcpServer: 'https://browse.mcp.atxp.ai/'
+});
+
+const res = await client.callTool({
+  name: 'atxp_browse',
+  arguments: { query: 'What is Solana?' }
+});
+```
+
+## SolanaAccount
+
+The `SolanaAccount` class provides Solana wallet integration for ATXP:
+
+- **Authentication**: Signs JWTs using Solana keypair for MCP server authentication
+- **Payments**: Makes USDC payments on Solana using SPL tokens
+- **Wallet Integration**: Works with any Solana wallet that provides a `Keypair`
+
+### Configuration
+
+```typescript
+const account = new SolanaAccount({
+  keypair: Keypair,           // Your Solana keypair
+  solanaRpcUrl: string,       // Solana RPC endpoint
+  logger?: Logger             // Optional logger instance
+});
+```
+
+## SolanaPaymentMaker
+
+The `SolanaPaymentMaker` class handles USDC payments on Solana:
+
+- Uses `@solana/pay` for payment transactions
+- Supports USDC SPL token transfers
+- Validates transactions before and after sending
+
+You generally don't need to use this directly - `SolanaAccount` uses it internally.

package/dist/index.cjs

@@ -0,0 +1,140 @@
+'use strict';
+
+var client = require('@atxp/client');
+var web3_js = require('@solana/web3.js');
+var pay = require('@solana/pay');
+var splToken = require('@solana/spl-token');
+var bs58 = require('bs58');
+var BigNumber = require('bignumber.js');
+var common = require('@atxp/common');
+var jose = require('jose');
+
+// 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 client.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 client.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 client.InsufficientFundsError || error instanceof client.PaymentNetworkError) {
+                    throw error;
+                }
+                // Wrap other errors in PaymentNetworkError
+                throw new client.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();
+    }
+}
+
+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'
+            }];
+    }
+}
+
+exports.SolanaAccount = SolanaAccount;
+exports.SolanaPaymentMaker = SolanaPaymentMaker;
+exports.ValidateTransferError = ValidateTransferError;
+//# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sources":["../src/solanaPaymentMaker.ts","../src/solanaAccount.ts"],"sourcesContent":[null,null],"names":["PublicKey","_ValidateTransferError","importJWK","generateJWT","PaymentNetworkError","getAssociatedTokenAddress","getAccount","InsufficientFundsError","ComputeBudgetProgram","createTransfer","sendAndConfirmTransaction","Connection","Keypair","ConsoleLogger"],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,37 @@
+import { Account, PaymentMaker } from '@atxp/client';
+import { AccountId, Source, Logger, Currency, Destination, PaymentIdentifier } from '@atxp/common';
+import { ValidateTransferError as ValidateTransferError$1 } from '@solana/pay';
+import BigNumber from 'bignumber.js';
+
+declare class SolanaAccount implements Account {
+    accountId: AccountId;
+    paymentMakers: PaymentMaker[];
+    private sourcePublicKey;
+    constructor(solanaEndpoint: string, sourceSecretKey: string);
+    /**
+     * Get sources for this account
+     */
+    getSources(): Promise<Source[]>;
+}
+
+declare const ValidateTransferError: typeof ValidateTransferError$1;
+declare class SolanaPaymentMaker implements PaymentMaker {
+    private connection;
+    private source;
+    private logger;
+    constructor(solanaEndpoint: string, sourceSecretKey: string, logger?: Logger);
+    getSourceAddress(_params: {
+        amount: BigNumber;
+        currency: Currency;
+        receiver: string;
+        memo: string;
+    }): string;
+    generateJWT: ({ paymentRequestId, codeChallenge, accountId }: {
+        paymentRequestId: string;
+        codeChallenge: string;
+        accountId?: AccountId | null;
+    }) => Promise<string>;
+    makePayment: (destinations: Destination[], memo: string, _paymentRequestId?: string) => Promise<PaymentIdentifier | null>;
+}
+
+export { SolanaAccount, SolanaPaymentMaker, ValidateTransferError };

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACd,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,yBAAyB,CAAC"}

package/dist/index.js

@@ -0,0 +1,136 @@
+import { PaymentNetworkError, InsufficientFundsError } from '@atxp/client';
+import { PublicKey, ComputeBudgetProgram, sendAndConfirmTransaction, Connection, Keypair } from '@solana/web3.js';
+import { ValidateTransferError as ValidateTransferError$1, createTransfer } from '@solana/pay';
+import { getAssociatedTokenAddress, getAccount } from '@solana/spl-token';
+import bs58 from 'bs58';
+import BigNumber from 'bignumber.js';
+import { generateJWT, ConsoleLogger } from '@atxp/common';
+import { importJWK } from 'jose';
+
+// this is a global public key for USDC on the solana mainnet
+const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
+const ValidateTransferError = ValidateTransferError$1;
+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 importJWK(jwk, 'EdDSA');
+            if (!(privateKey instanceof CryptoKey)) {
+                throw new Error('Expected CryptoKey from importJWK');
+            }
+            return 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 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 getAssociatedTokenAddress(USDC_MINT, this.source.publicKey);
+                const tokenAccount = await 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 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({
+                    units: 50000,
+                });
+                const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: 20000,
+                });
+                const transaction = await createTransfer(this.connection, this.source.publicKey, {
+                    amount: amount,
+                    recipient: receiverKey,
+                    splToken: USDC_MINT,
+                    memo,
+                });
+                transaction.add(modifyComputeUnits);
+                transaction.add(addPriorityFee);
+                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) {
+                    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 Connection(solanaEndpoint, { commitment: 'confirmed' });
+        this.source = Keypair.fromSecretKey(bs58.decode(sourceSecretKey));
+        this.logger = logger ?? new ConsoleLogger();
+    }
+    getSourceAddress(_params) {
+        return this.source.publicKey.toBase58();
+    }
+}
+
+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 = 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'
+            }];
+    }
+}
+
+export { SolanaAccount, SolanaPaymentMaker, ValidateTransferError };
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

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

package/dist/solanaAccount.d.ts

@@ -0,0 +1,13 @@
+import type { Account, PaymentMaker } from '@atxp/client';
+import type { AccountId, Source } from '@atxp/common';
+export declare class SolanaAccount implements Account {
+    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

@@ -0,0 +1 @@
+{"version":3,"file":"solanaAccount.d.ts","sourceRoot":"","sources":["../src/solanaAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,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

@@ -0,0 +1,34 @@
+import { SolanaPaymentMaker } from './solanaPaymentMaker.js';
+import { Keypair } from '@solana/web3.js';
+import bs58 from 'bs58';
+
+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 = 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'
+            }];
+    }
+}
+
+export { SolanaAccount };
+//# sourceMappingURL=solanaAccount.js.map

package/dist/solanaAccount.js.map

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,25 @@
+import type { PaymentMaker } from '@atxp/client';
+import { ValidateTransferError as _ValidateTransferError } from "@solana/pay";
+import BigNumber from "bignumber.js";
+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 {
+    private connection;
+    private source;
+    private logger;
+    constructor(solanaEndpoint: string, sourceSecretKey: string, logger?: Logger);
+    getSourceAddress(_params: {
+        amount: BigNumber;
+        currency: Currency;
+        receiver: string;
+        memo: string;
+    }): string;
+    generateJWT: ({ paymentRequestId, codeChallenge, accountId }: {
+        paymentRequestId: string;
+        codeChallenge: string;
+        accountId?: AccountId | null;
+    }) => Promise<string>;
+    makePayment: (destinations: Destination[], memo: string, _paymentRequestId?: string) => Promise<PaymentIdentifier | null>;
+}
+//# sourceMappingURL=solanaPaymentMaker.d.ts.map

package/dist/solanaPaymentMaker.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"solanaPaymentMaker.d.ts","sourceRoot":"","sources":["../src/solanaPaymentMaker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,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

@@ -0,0 +1,108 @@
+import { PaymentNetworkError, InsufficientFundsError } from '@atxp/client';
+import { PublicKey, ComputeBudgetProgram, sendAndConfirmTransaction, Connection, Keypair } from '@solana/web3.js';
+import { ValidateTransferError as ValidateTransferError$1, createTransfer } from '@solana/pay';
+import { getAssociatedTokenAddress, getAccount } from '@solana/spl-token';
+import bs58 from 'bs58';
+import BigNumber from 'bignumber.js';
+import { generateJWT, ConsoleLogger } from '@atxp/common';
+import { importJWK } from 'jose';
+
+// this is a global public key for USDC on the solana mainnet
+const USDC_MINT = new PublicKey("EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v");
+const ValidateTransferError = ValidateTransferError$1;
+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 importJWK(jwk, 'EdDSA');
+            if (!(privateKey instanceof CryptoKey)) {
+                throw new Error('Expected CryptoKey from importJWK');
+            }
+            return 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 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 getAssociatedTokenAddress(USDC_MINT, this.source.publicKey);
+                const tokenAccount = await 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 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({
+                    units: 50000,
+                });
+                const addPriorityFee = ComputeBudgetProgram.setComputeUnitPrice({
+                    microLamports: 20000,
+                });
+                const transaction = await createTransfer(this.connection, this.source.publicKey, {
+                    amount: amount,
+                    recipient: receiverKey,
+                    splToken: USDC_MINT,
+                    memo,
+                });
+                transaction.add(modifyComputeUnits);
+                transaction.add(addPriorityFee);
+                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) {
+                    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 Connection(solanaEndpoint, { commitment: 'confirmed' });
+        this.source = Keypair.fromSecretKey(bs58.decode(sourceSecretKey));
+        this.logger = logger ?? new ConsoleLogger();
+    }
+    getSourceAddress(_params) {
+        return this.source.publicKey.toBase58();
+    }
+}
+
+export { SolanaPaymentMaker, ValidateTransferError };
+//# sourceMappingURL=solanaPaymentMaker.js.map

package/dist/solanaPaymentMaker.js.map

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

package/package.json

@@ -0,0 +1,51 @@
+{
+  "name": "@atxp/solana",
+  "version": "0.8.3",
+  "description": "ATXP Solana - Solana blockchain support for ATXP",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/atxp-dev/sdk.git",
+    "directory": "packages/atxp-solana"
+  },
+  "type": "module",
+  "sideEffects": false,
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "rollup -c",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint . --ext .ts",
+    "lint:fix": "eslint . --ext .ts --fix",
+    "test": "vitest run",
+    "prepack": "npm run build && npm run typecheck",
+    "pack:dry": "npm pack --dry-run"
+  },
+  "dependencies": {
+    "@atxp/client": "0.8.3",
+    "@atxp/common": "0.8.3",
+    "@solana/pay": "^0.2.5",
+    "@solana/web3.js": "^1.98.1",
+    "bignumber.js": "^9.3.0",
+    "bs58": "^6.0.0"
+  },
+  "devDependencies": {
+    "@types/node": "^22.13.0",
+    "@typescript-eslint/eslint-plugin": "^8.38.0",
+    "@typescript-eslint/parser": "^8.38.0",
+    "eslint": "^9.32.0",
+    "typescript": "^5.7.3",
+    "vitest": "^3.0.9"
+  }
+}