Skip to content

Default to base for ATXPAccount, better logging #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badjer merged 1 commit into from
Aug 19, 2025
Merged

Default to base for ATXPAccount, better logging #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/atxp-client/src/atxpAccount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Account, PaymentMaker } from './types.js';
import type { FetchLike } from '@atxp/common'
import type { FetchLike, Network } from '@atxp/common'
import BigNumber from 'bignumber.js';

function toBasicAuth(token: string): string {
Expand Down Expand Up @@ -83,17 +83,15 @@ export class ATXPAccount implements Account {
accountId: string;
paymentMakers: { [key: string]: PaymentMaker };

constructor(connectionString: string, opts?: { fetchFn?: FetchLike; network?: string }) {
constructor(connectionString: string, opts?: { fetchFn?: FetchLike; network?: Network }) {
const { origin, token } = parseConnectionString(connectionString);
const fetchFn = opts?.fetchFn ?? fetch;
const network = opts?.network ?? 'solana';
const network = opts?.network ?? 'base';

// Use token as a stable accountId namespace to keep OAuth/ATXP state per-connection
this.accountId = `atxp:${token}`;
this.paymentMakers = {
[network]: new ATXPHttpPaymentMaker(origin, token, fetchFn),
};
}
}


}
2 changes: 1 addition & 1 deletion packages/atxp-client/src/atxpFetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ export class ATXPFetcher {

const paymentMaker = this.paymentMakers.get(requestedNetwork);
if (!paymentMaker) {
this.logger.info(`ATXP: payment network ${requestedNetwork} not set up for this server (available networks: ${Array.from(this.paymentMakers.keys()).join(', ')})`);
this.logger.info(`ATXP: payment network '${requestedNetwork}' not set up for this client (available networks: ${Array.from(this.paymentMakers.keys()).join(', ')})`);
return false;
}

Expand Down
6 changes: 3 additions & 3 deletions src/dev/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable no-console */
import { atxpClient, BaseAccount } from '@atxp/client';
import { atxpClient, ATXPAccount } from '@atxp/client';
import { ConsoleLogger, LogLevel } from '@atxp/common';
import 'dotenv/config';

Expand Down Expand Up @@ -47,8 +47,8 @@ async function main() {
validateEnv();

//const account = new SolanaAccount(process.env.SOLANA_ENDPOINT!, process.env.SOLANA_PRIVATE_KEY!);
//const account = new ATXPAccount(process.env.ATXP_CONNECTION_STRING!);
const account = new BaseAccount(process.env.BASE_RPC!, process.env.BASE_PRIVATE_KEY! as `0x${string}`);
const account = new ATXPAccount(process.env.ATXP_CONNECTION_STRING!);
//const account = new BaseAccount(process.env.BASE_RPC!, process.env.BASE_PRIVATE_KEY! as `0x${string}`);
const mcpClient = await atxpClient({
mcpServer: url,
account,
Expand Down