Skip to content

Fix: Use iss field for payment memo instead of payeeName #134

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

Closed
robdimarco-atxp wants to merge 2 commits into from
+12,284 −9,178
Closed

Fix: Use iss field for payment memo instead of payeeName #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c321847
chore: upgrade dependencies and fix security vulnerabilities
robdimarco-atxp Dec 30, 2025
d5ba921
Fix: Use iss field for payment memo instead of payeeName
robdimarco-atxp Jan 12, 2026
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
21,297 changes: 12,193 additions & 9,104 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@
"prepack:all": "npm run prepack --workspaces --if-present"
},
"dependencies": {
"dotenv": "^16.5.0"
"dotenv": "^17.2.3"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^28.0.6",
"@rollup/plugin-commonjs": "^29.0.0",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.1",
"@rollup/plugin-typescript": "^12.1.4",
"@types/better-sqlite3": "^7.6.13",
"@types/content-type": "^1.1.9",
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
Expand All @@ -74,15 +74,21 @@
"tslib": "^2.8.1",
"tsx": "^4.19.2",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
},
"optionalDependencies": {
"@rollup/rollup-darwin-arm64": "4.40.2",
"@rollup/rollup-darwin-x64": "4.40.2",
"@rollup/rollup-linux-arm64-gnu": "4.40.2",
"@rollup/rollup-linux-arm64-musl": "4.40.2",
"@rollup/rollup-linux-x64-gnu": "4.40.2",
"@rollup/rollup-linux-x64-musl": "4.40.2",
"@rollup/rollup-win32-x64-msvc": "4.40.2"
"@rollup/rollup-darwin-arm64": "4.54.0",
"@rollup/rollup-darwin-x64": "4.54.0",
"@rollup/rollup-linux-arm64-gnu": "4.54.0",
"@rollup/rollup-linux-arm64-musl": "4.54.0",
"@rollup/rollup-linux-x64-gnu": "4.54.0",
"@rollup/rollup-linux-x64-musl": "4.54.0",
"@rollup/rollup-win32-x64-msvc": "4.54.0"
},
"overrides": {
"agents": {
"@modelcontextprotocol/sdk": "^1.25.1"
},
"@solana/web3.js": "1.95.8"
}
}
10 changes: 5 additions & 5 deletions packages/atxp-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"viem": "^2.34.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"fetch-mock": "^12.5.2",
"happy-dom": "^20.0.11",
"jsdom": "^25.0.1",
"jsdom": "^27.4.0",
"supertest": "^7.1.4",
"typescript": "^5.7.3",
"viem": "^2.34.0",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
14 changes: 7 additions & 7 deletions packages/atxp-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
},
"peerDependencies": {
"expo-crypto": ">=14.0.0",
"react-native-url-polyfill": "^2.0.0"
"react-native-url-polyfill": "^3.0.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"fetch-mock": "^12.5.2",
"happy-dom": "^20.0.11",
"jsdom": "^25.0.1",
"react-native-url-polyfill": "^2.0.0",
"jsdom": "^27.4.0",
"react-native-url-polyfill": "^3.0.0",
"supertest": "^7.1.4",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
5 changes: 3 additions & 2 deletions packages/atxp-client/src/atxpFetcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export class ATXPFetcher {
resourceName: paymentRequest.payeeName ?? '',
currency: firstDest.currency,
amount: firstDest.amount,
iss: paymentRequest.payeeName ?? '',
iss: paymentRequest.iss ?? paymentRequest.payeeName ?? '',
};

// Ask for approval once for all payment attempts
Expand All @@ -246,7 +246,8 @@ export 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, paymentRequest.payeeName ?? '', paymentRequestId);
const memo = paymentRequest.iss ?? paymentRequest.payeeName ?? '';
const result = await paymentMaker.makePayment(mappedDestinations, memo, paymentRequestId);

if (result === null) {
this.logger.debug(`ATXP: payment maker cannot handle these destinations, trying next`);
Expand Down
12 changes: 6 additions & 6 deletions packages/atxp-cloudflare/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
"@atxp/server": "0.10.3"
},
"peerDependencies": {
"agents": "^0.1.2"
"agents": "^0.3.3"
},
"devDependencies": {
"@cloudflare/workers-types": "^4.20241022.0",
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@vitest/coverage-v8": "^3.2.4",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"@vitest/coverage-v8": "^4.0.16",
"bignumber.js": "^9.1.2",
"eslint": "^9.32.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
10 changes: 5 additions & 5 deletions packages/atxp-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@
"tweetnacl-util": "^0.15.1"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"jsdom": "^25.0.1",
"jsdom": "^27.4.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
1 change: 1 addition & 0 deletions packages/atxp-common/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ export type PaymentRequest = {
destinationAccountId: AccountId;
resource: URL;
payeeName: string | null;
iss?: string;
}

export type CustomJWTPayload = {
Expand Down
8 changes: 4 additions & 4 deletions packages/atxp-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
},
"devDependencies": {
"@types/express": "^5.0.0",
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"express": "^5.0.0",
"supertest": "^7.1.4",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
10 changes: 5 additions & 5 deletions packages/atxp-polygon/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
"viem": "^2.34.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"fetch-mock": "^12.5.2",
"happy-dom": "^20.0.11",
"jsdom": "^25.0.1",
"jsdom": "^27.4.0",
"supertest": "^7.1.4",
"typescript": "^5.7.3",
"viem": "^2.34.0",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
8 changes: 4 additions & 4 deletions packages/atxp-redis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
"ioredis": "^5.7.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
8 changes: 4 additions & 4 deletions packages/atxp-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
"content-type": "^1.0.5"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"node-mocks-http": "^1.17.2",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
8 changes: 4 additions & 4 deletions packages/atxp-solana/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"bs58": "^6.0.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
9 changes: 6 additions & 3 deletions packages/atxp-solana/src/solanaPaymentMaker.insufficientFunds.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ vi.mock('@solana/web3.js', () => ({
secretKey: new Uint8Array(64),
})),
},
Connection: vi.fn(() => ({
Connection: vi.fn(function(this: any) {
// Mock connection methods if needed
})),
PublicKey: vi.fn((key) => ({ toString: () => key })),
}),
PublicKey: vi.fn(function(this: any, key: any) {
this.toString = () => key;
this.toBase58 = () => key;
}),
ComputeBudgetProgram: {
setComputeUnitLimit: vi.fn(),
setComputeUnitPrice: vi.fn(),
Expand Down
6 changes: 6 additions & 0 deletions packages/atxp-solana/vitest.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,10 @@ export default defineConfig({
environment: 'node',
globals: true,
},
resolve: {
conditions: ['node', 'import'],
},
ssr: {
noExternal: ['@solana/web3.js', '@solana/pay', '@solana/spl-token'],
},
});
8 changes: 4 additions & 4 deletions packages/atxp-sqlite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.13",
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
10 changes: 5 additions & 5 deletions packages/atxp-worldchain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@
"viem": "^2.34.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@types/node": "^25.0.3",
"@types/supertest": "^6.0.3",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"fetch-mock": "^12.5.2",
"happy-dom": "^20.0.11",
"jsdom": "^25.0.1",
"jsdom": "^27.4.0",
"supertest": "^7.1.4",
"typescript": "^5.7.3",
"viem": "^2.34.0",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}
10 changes: 5 additions & 5 deletions packages/atxp-x402/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"@atxp/common": "0.10.3",
"bignumber.js": "^9.1.2",
"viem": "^2.21.54",
"x402": "^0.6.1"
"x402": "^1.1.0"
},
"devDependencies": {
"@types/node": "^22.13.0",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@types/node": "^25.0.3",
"@typescript-eslint/eslint-plugin": "^8.51.0",
"@typescript-eslint/parser": "^8.51.0",
"eslint": "^9.32.0",
"typescript": "^5.7.3",
"vitest": "^3.0.9"
"vitest": "^4.0.16"
}
}