@pay-skill/sdk 0.1.1 → 0.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/client.js CHANGED
@@ -4,7 +4,8 @@
4
4
  import { PayNetworkError, PayServerError, PayValidationError, } from "./errors.js";
5
5
  import { createSigner } from "./signer.js";
6
6
  import { buildAuthHeaders, buildAuthHeadersWithSigner, } from "./auth.js";
7
- import { sign as viemSign, serializeSignature } from "viem/accounts";
7
+ import { sign as viemSign, serializeSignature, privateKeyToAccount } from "viem/accounts";
8
+ import { signTransferAuthorization, combinedSignature, } from "./eip3009.js";
8
9
  const ADDRESS_RE = /^0x[0-9a-fA-F]{40}$/;
9
10
  const DIRECT_MIN = 1_000_000; // $1.00 USDC
10
11
  const TAB_MIN = 5_000_000; // $5.00 USDC
@@ -27,6 +28,8 @@ export class PayClient {
27
28
  signer;
28
29
  _privateKey;
29
30
  _authConfig;
31
+ _chainId;
32
+ _address;
30
33
  constructor(options = {}) {
31
34
  this.apiUrl = (options.apiUrl ?? DEFAULT_API_URL).replace(/\/+$/, "");
32
35
  // Extract the URL path to prepend to auth signing paths.
@@ -52,6 +55,10 @@ export class PayClient {
52
55
  ? options.privateKey
53
56
  : "0x" + options.privateKey)
54
57
  : null;
58
+ this._chainId = options.chainId ?? 8453;
59
+ this._address = this._privateKey
60
+ ? privateKeyToAccount(this._privateKey).address
61
+ : (options.signerOptions?.address ?? "");
55
62
  // Auth config for EIP-712 domain
56
63
  if (options.chainId && options.routerAddress) {
57
64
  this._authConfig = {
@@ -63,6 +70,9 @@ export class PayClient {
63
70
  this._authConfig = null;
64
71
  }
65
72
  }
73
+ async getContracts() {
74
+ return this.get("/contracts");
75
+ }
66
76
  // ── Direct Payment ──────────────────────────────────────────────
67
77
  async payDirect(to, amount, options = {}) {
68
78
  validateAddress(to, "to");
@@ -97,9 +107,6 @@ export class PayClient {
97
107
  async closeTab(tabId) {
98
108
  return this.post(`/tabs/${tabId}/close`, {});
99
109
  }
100
- async withdrawTab(tabId) {
101
- return this.post(`/tabs/${tabId}/withdraw`, {});
102
- }
103
110
  async topUpTab(tabId, amount) {
104
111
  validateAmount(amount, 1, "amount");
105
112
  const contracts = await this.get("/contracts");
@@ -127,93 +134,115 @@ export class PayClient {
127
134
  * Parse x402 V2 payment requirements from a 402 response.
128
135
  *
129
136
  * Checks PAYMENT-REQUIRED header first (base64-encoded JSON),
130
- * falls back to response body. Requires x402Version 2 with
131
- * a non-empty `accepts` array.
137
+ * falls back to response body for requirements.
132
138
  */
133
139
  async parse402Requirements(resp) {
140
+ // Try PAYMENT-REQUIRED header (base64-encoded JSON)
134
141
  const prHeader = resp.headers.get("payment-required");
135
142
  if (prHeader) {
136
- const parsed = this.tryParseV2(prHeader);
137
- if (parsed)
138
- return parsed;
143
+ try {
144
+ const decoded = JSON.parse(atob(prHeader));
145
+ return PayClient.extractRequirements(decoded);
146
+ }
147
+ catch {
148
+ // Fall through to body parsing
149
+ }
139
150
  }
140
- // Fallback: try v2 format in response body
151
+ // Fallback: parse from response body
141
152
  const body = (await resp.json());
142
- if (body.x402Version === 2 && Array.isArray(body.accepts) && body.accepts.length > 0) {
143
- const accepted = body.accepts[0];
144
- return this.extractFromAccepted(accepted);
145
- }
146
- throw new PayServerError("Unrecognized 402 format — expected x402 v2", 402);
153
+ const requirements = (body.requirements ?? body);
154
+ return PayClient.extractRequirements(requirements);
147
155
  }
148
- /** Decode a base64 header and extract v2 requirements, or null if not v2. */
149
- tryParseV2(header) {
150
- try {
151
- const decoded = JSON.parse(atob(header));
152
- if (decoded.x402Version !== 2 || !Array.isArray(decoded.accepts) || decoded.accepts.length === 0) {
153
- return null;
154
- }
155
- return this.extractFromAccepted(decoded.accepts[0]);
156
- }
157
- catch {
158
- return null;
156
+ static extractRequirements(obj) {
157
+ // x402 v2 format: { accepts: [{ payTo, amount, extra: { settlement } }] }
158
+ const accepts = obj.accepts;
159
+ if (Array.isArray(accepts) && accepts.length > 0) {
160
+ const offer = accepts[0];
161
+ const extra = (offer.extra ?? {});
162
+ return {
163
+ settlement: String(extra.settlement ?? "direct"),
164
+ amount: Number(offer.amount ?? 0),
165
+ to: String(offer.payTo ?? ""),
166
+ accepted: offer,
167
+ };
159
168
  }
160
- }
161
- extractFromAccepted(accepted) {
169
+ // Legacy v1 format
162
170
  return {
163
- settlement: accepted.extra?.settlement ?? "direct",
164
- amount: Number(accepted.amount ?? 0),
165
- to: accepted.payTo,
166
- accepted,
171
+ settlement: String(obj.settlement ?? "direct"),
172
+ amount: Number(obj.amount ?? 0),
173
+ to: String(obj.to ?? ""),
167
174
  };
168
175
  }
169
176
  async handle402(resp, url, method, body, headers) {
170
- const { settlement, amount, to: provider, accepted } = await this.parse402Requirements(resp);
171
- if (settlement === "tab") {
172
- return this.settleViaTab(url, method, body, headers, provider, amount, accepted);
177
+ const reqs = await this.parse402Requirements(resp);
178
+ if (reqs.settlement === "tab") {
179
+ return this.settleViaTab(url, method, body, headers, reqs);
173
180
  }
174
- return this.settleViaDirect(url, method, body, headers, provider, amount, accepted);
181
+ return this.settleViaDirect(url, method, body, headers, reqs);
175
182
  }
176
- async settleViaDirect(url, method, body, headers, provider, amount, accepted) {
177
- const result = await this.payDirect(provider, amount);
178
- const txHash = result.txHash ??
179
- result.tx_hash ??
180
- "";
183
+ async settleViaDirect(url, method, body, headers, reqs) {
184
+ if (!this._privateKey) {
185
+ throw new PayValidationError("privateKey required for x402 direct settlement", "privateKey");
186
+ }
187
+ const contracts = await this.getContracts();
188
+ const auth = await signTransferAuthorization(this._privateKey, reqs.to, reqs.amount, this._chainId, contracts.usdc);
181
189
  const paymentPayload = {
182
190
  x402Version: 2,
183
- accepted,
184
- payload: { txHash },
185
- extensions: {
186
- pay: { settlement: "direct", status: result.status },
191
+ accepted: reqs.accepted ?? {
192
+ scheme: "exact",
193
+ network: `eip155:${this._chainId}`,
194
+ amount: String(reqs.amount),
195
+ payTo: reqs.to,
187
196
  },
197
+ payload: {
198
+ signature: combinedSignature(auth),
199
+ authorization: {
200
+ from: auth.from,
201
+ to: auth.to,
202
+ value: String(reqs.amount),
203
+ validAfter: "0",
204
+ validBefore: "0",
205
+ nonce: auth.nonce,
206
+ },
207
+ },
208
+ extensions: {},
188
209
  };
189
210
  return fetch(url, {
190
211
  method,
191
212
  body,
192
213
  headers: {
193
214
  ...headers,
215
+ "Content-Type": "application/json",
194
216
  "PAYMENT-SIGNATURE": btoa(JSON.stringify(paymentPayload)),
195
217
  },
196
218
  });
197
219
  }
198
- async settleViaTab(url, method, body, headers, provider, amount, accepted) {
220
+ async settleViaTab(url, method, body, headers, reqs) {
199
221
  const tabs = await this.listTabs();
200
- let tab = tabs.find((t) => t.provider === provider && t.status === "open");
222
+ let tab = tabs.find((t) => t.provider === reqs.to && t.status === "open");
201
223
  if (!tab) {
202
- const tabAmount = Math.max(amount * PayClient.X402_TAB_MULTIPLIER, TAB_MIN);
203
- tab = await this.openTab(provider, tabAmount, {
204
- maxChargePerCall: amount,
224
+ const tabAmount = Math.max(reqs.amount * PayClient.X402_TAB_MULTIPLIER, TAB_MIN);
225
+ tab = await this.openTab(reqs.to, tabAmount, {
226
+ maxChargePerCall: reqs.amount,
205
227
  });
206
228
  }
207
- const chargeData = await this.post(`/tabs/${tab.tabId}/charge`, { amount });
229
+ const chargeData = await this.post(`/tabs/${tab.tabId}/charge`, { amount: reqs.amount });
208
230
  const paymentPayload = {
209
231
  x402Version: 2,
210
- accepted,
211
- payload: {},
232
+ accepted: reqs.accepted ?? {
233
+ scheme: "exact",
234
+ network: `eip155:${this._chainId}`,
235
+ amount: String(reqs.amount),
236
+ payTo: reqs.to,
237
+ },
238
+ payload: {
239
+ authorization: { from: this._address },
240
+ },
212
241
  extensions: {
213
242
  pay: {
214
243
  settlement: "tab",
215
244
  tabId: tab.tabId,
216
- chargeId: chargeData.chargeId ?? "",
245
+ chargeId: chargeData.charge_id ?? "",
217
246
  },
218
247
  },
219
248
  };
@@ -222,6 +251,7 @@ export class PayClient {
222
251
  body,
223
252
  headers: {
224
253
  ...headers,
254
+ "Content-Type": "application/json",
225
255
  "PAYMENT-SIGNATURE": btoa(JSON.stringify(paymentPayload)),
226
256
  },
227
257
  });
@@ -269,6 +299,28 @@ export class PayClient {
269
299
  });
270
300
  return data.url;
271
301
  }
302
+ // ── Discovery ──────────────────────────────────────────────────
303
+ /** Search for discoverable paid API services. Public, no auth required. */
304
+ async discover(options) {
305
+ const params = new URLSearchParams();
306
+ if (options?.query)
307
+ params.set("q", options.query);
308
+ if (options?.sort)
309
+ params.set("sort", options.sort);
310
+ if (options?.category)
311
+ params.set("category", options.category);
312
+ if (options?.settlement)
313
+ params.set("settlement", options.settlement);
314
+ const qs = params.toString();
315
+ const url = `${this.apiUrl}/discover${qs ? `?${qs}` : ""}`;
316
+ const resp = await fetch(url);
317
+ if (!resp.ok) {
318
+ const body = await resp.text().catch(() => "");
319
+ throw new PayServerError(`discover failed: ${body}`, resp.status);
320
+ }
321
+ const data = (await resp.json());
322
+ return data.services;
323
+ }
272
324
  // ── Permit signing ────────────────────────────────────────────
273
325
  /**
274
326
  * Prepare and sign a USDC EIP-2612 permit.
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,24 @@
1
+ /**
2
+ * EIP-3009 TransferWithAuthorization signing for x402 direct settlement.
3
+ *
4
+ * Unlike EIP-2612 permits (which need a nonce from the USDC contract),
5
+ * EIP-3009 uses a random nonce chosen by the signer. Fully local — no
6
+ * server round-trip needed.
7
+ *
8
+ * Domain: { name: "USD Coin", version: "2", chainId, verifyingContract: usdcAddress }
9
+ * Type: TransferWithAuthorization(address from, address to, uint256 value,
10
+ * uint256 validAfter, uint256 validBefore, bytes32 nonce)
11
+ */
12
+ import { type Hex, type Address } from "viem";
13
+ export interface TransferAuthorization {
14
+ from: string;
15
+ to: string;
16
+ amount: number;
17
+ nonce: string;
18
+ v: number;
19
+ r: string;
20
+ s: string;
21
+ }
22
+ export declare function signTransferAuthorization(privateKey: Hex, to: Address, amount: number, chainId: number, usdcAddress: Address): Promise<TransferAuthorization>;
23
+ export declare function combinedSignature(auth: TransferAuthorization): string;
24
+ //# sourceMappingURL=eip3009.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"eip3009.d.ts","sourceRoot":"","sources":["../src/eip3009.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAI9C,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;CACX;AAaD,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,GAAG,EACf,EAAE,EAAE,OAAO,EACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,OAAO,GACnB,OAAO,CAAC,qBAAqB,CAAC,CA6BhC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,MAAM,CAIrE"}
@@ -0,0 +1,56 @@
1
+ /**
2
+ * EIP-3009 TransferWithAuthorization signing for x402 direct settlement.
3
+ *
4
+ * Unlike EIP-2612 permits (which need a nonce from the USDC contract),
5
+ * EIP-3009 uses a random nonce chosen by the signer. Fully local — no
6
+ * server round-trip needed.
7
+ *
8
+ * Domain: { name: "USD Coin", version: "2", chainId, verifyingContract: usdcAddress }
9
+ * Type: TransferWithAuthorization(address from, address to, uint256 value,
10
+ * uint256 validAfter, uint256 validBefore, bytes32 nonce)
11
+ */
12
+ import { privateKeyToAccount } from "viem/accounts";
13
+ import { randomBytes } from "node:crypto";
14
+ const TRANSFER_AUTH_TYPES = {
15
+ TransferWithAuthorization: [
16
+ { name: "from", type: "address" },
17
+ { name: "to", type: "address" },
18
+ { name: "value", type: "uint256" },
19
+ { name: "validAfter", type: "uint256" },
20
+ { name: "validBefore", type: "uint256" },
21
+ { name: "nonce", type: "bytes32" },
22
+ ],
23
+ };
24
+ export async function signTransferAuthorization(privateKey, to, amount, chainId, usdcAddress) {
25
+ const account = privateKeyToAccount(privateKey);
26
+ const nonce = ("0x" + randomBytes(32).toString("hex"));
27
+ const signature = await account.signTypedData({
28
+ domain: {
29
+ name: "USD Coin",
30
+ version: "2",
31
+ chainId,
32
+ verifyingContract: usdcAddress,
33
+ },
34
+ types: TRANSFER_AUTH_TYPES,
35
+ primaryType: "TransferWithAuthorization",
36
+ message: {
37
+ from: account.address,
38
+ to,
39
+ value: BigInt(amount),
40
+ validAfter: 0n,
41
+ validBefore: 0n,
42
+ nonce,
43
+ },
44
+ });
45
+ const sigHex = signature.slice(2);
46
+ const r = `0x${sigHex.slice(0, 64)}`;
47
+ const s = `0x${sigHex.slice(64, 128)}`;
48
+ const v = parseInt(sigHex.slice(128, 130), 16);
49
+ return { from: account.address, to, amount, nonce, v, r, s };
50
+ }
51
+ export function combinedSignature(auth) {
52
+ const r = auth.r.startsWith("0x") ? auth.r.slice(2) : auth.r;
53
+ const s = auth.s.startsWith("0x") ? auth.s.slice(2) : auth.s;
54
+ return `0x${r}${s}${auth.v.toString(16).padStart(2, "0")}`;
55
+ }
56
+ //# sourceMappingURL=eip3009.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"eip3009.js","sourceRoot":"","sources":["../src/eip3009.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAGH,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAY1C,MAAM,mBAAmB,GAAG;IAC1B,yBAAyB,EAAE;QACzB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;QACjC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE;QAC/B,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;QAClC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE;QACvC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE;QACxC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE;KACnC;CACO,CAAC;AAEX,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,UAAe,EACf,EAAW,EACX,MAAc,EACd,OAAe,EACf,WAAoB;IAEpB,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,CAAC,IAAI,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAQ,CAAC;IAE9D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC;QAC5C,MAAM,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,GAAG;YACZ,OAAO;YACP,iBAAiB,EAAE,WAAW;SAC/B;QACD,KAAK,EAAE,mBAAmB;QAC1B,WAAW,EAAE,2BAA2B;QACxC,OAAO,EAAE;YACP,IAAI,EAAE,OAAO,CAAC,OAAO;YACrB,EAAE;YACF,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC;YACrB,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,EAAE;YACf,KAAK;SACN;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,CAAC;IACvC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;IAE/C,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,IAA2B;IAC3D,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;AAC7D,CAAC"}
package/dist/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export { PayClient, DEFAULT_API_URL } from "./client.js";
2
2
  export type { PayClientOptions } from "./client.js";
3
3
  export { PayError, PayValidationError, PayNetworkError, PayServerError, PayInsufficientFundsError, } from "./errors.js";
4
- export type { DirectPaymentResult, PaymentRequired, PaymentRequirementsV2, Tab, TabStatus, StatusResponse, WebhookRegistration, } from "./models.js";
4
+ export type { DirectPaymentResult, DiscoverOptions, DiscoverService, Tab, TabStatus, StatusResponse, WebhookRegistration, } from "./models.js";
5
5
  export type { Signer } from "./signer.js";
6
6
  export { CliSigner, RawKeySigner, CallbackSigner, createSigner, } from "./signer.js";
7
7
  export { OwsSigner } from "./ows-signer.js";
@@ -10,4 +10,6 @@ export { Wallet, PrivateKeySigner } from "./wallet.js";
10
10
  export type { WalletOptions, FundLinkOptions, PermitResult, } from "./wallet.js";
11
11
  export { buildAuthHeaders, buildAuthHeadersWithSigner, computeEip712Hash, } from "./auth.js";
12
12
  export type { AuthConfig, AuthHeaders } from "./auth.js";
13
+ export { signTransferAuthorization, combinedSignature, } from "./eip3009.js";
14
+ export type { TransferAuthorization } from "./eip3009.js";
13
15
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,qBAAqB,EACrB,GAAG,EACH,SAAS,EACT,cAAc,EACd,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAErB,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACvD,YAAY,EACV,aAAa,EACb,eAAe,EACf,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACzD,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,GAAG,EACH,SAAS,EACT,cAAc,EACd,mBAAmB,GACpB,MAAM,aAAa,CAAC;AAErB,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACvD,YAAY,EACV,aAAa,EACb,eAAe,EACf,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,EACL,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC"}
package/dist/index.js CHANGED
@@ -4,4 +4,5 @@ export { CliSigner, RawKeySigner, CallbackSigner, createSigner, } from "./signer
4
4
  export { OwsSigner } from "./ows-signer.js";
5
5
  export { Wallet, PrivateKeySigner } from "./wallet.js";
6
6
  export { buildAuthHeaders, buildAuthHeadersWithSigner, computeEip712Hash, } from "./auth.js";
7
+ export { signTransferAuthorization, combinedSignature, } from "./eip3009.js";
7
8
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGzD,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAarB,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOvD,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGzD,OAAO,EACL,QAAQ,EACR,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,yBAAyB,GAC1B,MAAM,aAAa,CAAC;AAarB,OAAO,EACL,SAAS,EACT,YAAY,EACZ,cAAc,EACd,YAAY,GACb,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAOvD,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,iBAAiB,GAClB,MAAM,WAAW,CAAC;AAGnB,OAAO,EACL,yBAAyB,EACzB,iBAAiB,GAClB,MAAM,cAAc,CAAC"}
package/dist/models.d.ts CHANGED
@@ -26,6 +26,12 @@ export interface Tab {
26
26
  /** Total withdrawn so far in USDC micro-units. */
27
27
  totalWithdrawn: number;
28
28
  status: TabStatus;
29
+ /** Number of charges buffered awaiting batch settlement. */
30
+ pendingChargeCount: number;
31
+ /** Total amount of pending charges in USDC micro-units. */
32
+ pendingChargeTotal: number;
33
+ /** balance_remaining minus pending charges — the true available balance. */
34
+ effectiveBalance: number;
29
35
  }
30
36
  /** Wallet status. */
31
37
  export interface StatusResponse {
@@ -34,36 +40,39 @@ export interface StatusResponse {
34
40
  balance: number;
35
41
  openTabs: Tab[];
36
42
  }
43
+ /** Discoverable service from the facilitator catalog. */
44
+ export interface DiscoverService {
45
+ name: string;
46
+ description: string;
47
+ /** Public base URL for pay request (e.g. "https://weather.example.com"). */
48
+ baseUrl: string;
49
+ category: string;
50
+ keywords: string[];
51
+ routes: {
52
+ path: string;
53
+ method?: string;
54
+ price?: string;
55
+ settlement?: string;
56
+ free?: boolean;
57
+ }[];
58
+ /** URL to API documentation (OpenAPI spec, docs page, etc). */
59
+ docsUrl?: string;
60
+ }
61
+ /** Options for discover search. */
62
+ export interface DiscoverOptions {
63
+ /** Search query (matches keywords and description). */
64
+ query?: string;
65
+ /** Sort order: "volume" (default), "newest", "price_asc", "price_desc". */
66
+ sort?: string;
67
+ /** Filter by category. */
68
+ category?: string;
69
+ /** Filter by settlement mode: "direct" or "tab". */
70
+ settlement?: string;
71
+ }
37
72
  /** Registered webhook. */
38
73
  export interface WebhookRegistration {
39
74
  webhookId: string;
40
75
  url: string;
41
76
  events: string[];
42
77
  }
43
- /** A single payment option in a v2 402 response. */
44
- export interface PaymentRequirementsV2 {
45
- scheme: string;
46
- network: string;
47
- amount: string;
48
- asset: string;
49
- payTo: string;
50
- maxTimeoutSeconds: number;
51
- extra?: {
52
- name?: string;
53
- version?: string;
54
- facilitator?: string;
55
- settlement?: string;
56
- };
57
- }
58
- /** Top-level v2 PAYMENT-REQUIRED header (base64-encoded). */
59
- export interface PaymentRequired {
60
- x402Version: number;
61
- resource: {
62
- url: string;
63
- description?: string;
64
- mimeType?: string;
65
- };
66
- accepts: PaymentRequirementsV2[];
67
- extensions: Record<string, unknown>;
68
- }
69
78
  //# sourceMappingURL=models.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE1C,kCAAkC;AAClC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,iBAAiB;AACjB,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,gBAAgB,EAAE,MAAM,CAAC;IACzB,gDAAgD;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,qBAAqB;AACrB,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,EAAE,CAAC;CACjB;AAED,0BAA0B;AAC1B,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAID,oDAAoD;AACpD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE;QACN,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,6DAA6D;AAC7D,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,OAAO,EAAE,qBAAqB,EAAE,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC"}
1
+ {"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../src/models.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,QAAQ,CAAC;AAE1C,kCAAkC;AAClC,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,iBAAiB;AACjB,MAAM,WAAW,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,+CAA+C;IAC/C,MAAM,EAAE,MAAM,CAAC;IACf,6CAA6C;IAC7C,gBAAgB,EAAE,MAAM,CAAC;IACzB,gDAAgD;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,SAAS,CAAC;IAClB,4DAA4D;IAC5D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2DAA2D;IAC3D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,4EAA4E;IAC5E,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,qBAAqB;AACrB,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,mCAAmC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,EAAE,CAAC;CACjB;AAED,yDAAyD;AACzD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,4EAA4E;IAC5E,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;IACjG,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,mCAAmC;AACnC,MAAM,WAAW,eAAe;IAC9B,uDAAuD;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0BAA0B;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,0BAA0B;AAC1B,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB"}
package/dist/signer.d.ts CHANGED
@@ -25,7 +25,7 @@ export declare class RawKeySigner implements Signer {
25
25
  private readonly _key;
26
26
  readonly address: string;
27
27
  constructor(key?: string);
28
- sign(hash: Uint8Array): Uint8Array;
28
+ sign(_hash: Uint8Array): Uint8Array;
29
29
  /** Async sign — preferred over sync sign(). */
30
30
  signAsync(hash: Uint8Array): Promise<Uint8Array>;
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,iCAAiC;AACjC,MAAM,WAAW,MAAM;IACrB,oEAAoE;IACpE,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IACnC,gEAAgE;IAChE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,+CAA+C;AAC/C,qBAAa,SAAU,YAAW,MAAM;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,OAAO,SAAQ,EAAE,OAAO,SAAK;IAgBzC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;CASnC;AAED,iEAAiE;AACjE,qBAAa,YAAa,YAAW,MAAM;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,GAAG,CAAC,EAAE,MAAM;IAYxB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;IAelC,+CAA+C;IACzC,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAMvD;AAED,qDAAqD;AACrD,qBAAa,cAAe,YAAW,MAAM;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAGvB,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,EAC1C,OAAO,SAAK;IAMd,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;CAGnC;AAED,oCAAoC;AACpC,wBAAgB,YAAY,CAC1B,IAAI,GAAE,KAAK,GAAG,KAAK,GAAG,QAAgB,EACtC,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC;CACxC,GACL,MAAM,CAcR"}
1
+ {"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAUH,iCAAiC;AACjC,MAAM,WAAW,MAAM;IACrB,oEAAoE;IACpE,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IACnC,gEAAgE;IAChE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED,+CAA+C;AAC/C,qBAAa,SAAU,YAAW,MAAM;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,OAAO,SAAQ,EAAE,OAAO,SAAK;IAgBzC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;CASnC;AAED,iEAAiE;AACjE,qBAAa,YAAa,YAAW,MAAM;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAM;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAEb,GAAG,CAAC,EAAE,MAAM;IAYxB,IAAI,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAanC,+CAA+C;IACzC,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;CAMvD;AAED,qDAAqD;AACrD,qBAAa,cAAe,YAAW,MAAM;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAC5D,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;gBAGvB,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,EAC1C,OAAO,SAAK;IAMd,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU;CAGnC;AAED,oCAAoC;AACpC,wBAAgB,YAAY,CAC1B,IAAI,GAAE,KAAK,GAAG,KAAK,GAAG,QAAgB,EACtC,OAAO,GAAE;IACP,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,UAAU,CAAC;CACxC,GACL,MAAM,CAcR"}
package/dist/signer.js CHANGED
@@ -54,9 +54,8 @@ export class RawKeySigner {
54
54
  const account = privateKeyToAccount(this._key);
55
55
  this.address = account.address;
56
56
  }
57
- sign(hash) {
57
+ sign(_hash) {
58
58
  // viem's sign() does raw ECDSA signing (no EIP-191 prefix)
59
- const hashHex = ("0x" + Buffer.from(hash).toString("hex"));
60
59
  // sign() is async but Signer interface is sync — we use the sync internal
61
60
  // For the sync interface, we need a workaround. Since RawKeySigner is
62
61
  // dev/testing only, we'll do a sync computation via signSync.
@@ -1 +1 @@
1
- {"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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"}
package/dist/wallet.js CHANGED
@@ -94,9 +94,9 @@ export class Wallet {
94
94
  throw new Error(err.error ?? `permit/prepare failed: ${prepResp.status}`);
95
95
  }
96
96
  const prep = (await prepResp.json());
97
- // Sign the pre-computed hash locally
98
- const signature = await this._account.signMessage({
99
- message: { raw: prep.hash },
97
+ // Sign the pre-computed EIP-712 hash locally (raw ECDSA, no EIP-191 prefix)
98
+ const signature = await this._account.sign({
99
+ hash: prep.hash,
100
100
  });
101
101
  // Parse 65-byte signature into v, r, s
102
102
  const sigClean = signature.startsWith("0x") ? signature.slice(2) : signature;
@@ -180,6 +180,9 @@ export class Wallet {
180
180
  let maxCharge;
181
181
  let permit;
182
182
  if (typeof providerOrOpts === "string") {
183
+ if (amount === undefined || maxChargePerCall === undefined) {
184
+ throw new Error("amount and maxChargePerCall are required when provider is a string");
185
+ }
183
186
  provider = providerOrOpts;
184
187
  amt = amount;
185
188
  maxCharge = maxChargePerCall;