@4mica/sdk 0.5.4 → 0.5.6

package/dist/models.js

@@ -1,16 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RecipientPaymentInfo = exports.AssetBalanceInfo = exports.CollateralEventInfo = exports.PendingRemunerationInfo = exports.GuaranteeInfo = exports.TabInfo = exports.AdminApiKeySecret = exports.AdminApiKeyInfo = exports.UserSuspensionStatus = exports.PaymentGuaranteeRequestClaims = exports.ADMIN_SCOPE_MANAGE_KEYS = exports.ADMIN_SCOPE_SUSPEND_USERS = exports.ADMIN_API_KEY_PREFIX = exports.ADMIN_API_KEY_HEADER = exports.SigningScheme = void 0;
+exports.RecipientPaymentInfo = exports.AssetBalanceInfo = exports.CollateralEventInfo = exports.PendingRemunerationInfo = exports.GuaranteeInfo = exports.TabInfo = exports.AdminApiKeySecret = exports.AdminApiKeyInfo = exports.UserSuspensionStatus = exports.PaymentGuaranteeRequestClaims = exports.SigningScheme = exports.ADMIN_SCOPE_SUSPEND_USERS = exports.ADMIN_SCOPE_MANAGE_KEYS = exports.ADMIN_API_KEY_PREFIX = exports.ADMIN_API_KEY_HEADER = void 0;
+const serde_1 = require("./serde");
 const utils_1 = require("./utils");
+var constants_1 = require("./constants");
+Object.defineProperty(exports, "ADMIN_API_KEY_HEADER", { enumerable: true, get: function () { return constants_1.ADMIN_API_KEY_HEADER; } });
+Object.defineProperty(exports, "ADMIN_API_KEY_PREFIX", { enumerable: true, get: function () { return constants_1.ADMIN_API_KEY_PREFIX; } });
+Object.defineProperty(exports, "ADMIN_SCOPE_MANAGE_KEYS", { enumerable: true, get: function () { return constants_1.ADMIN_SCOPE_MANAGE_KEYS; } });
+Object.defineProperty(exports, "ADMIN_SCOPE_SUSPEND_USERS", { enumerable: true, get: function () { return constants_1.ADMIN_SCOPE_SUSPEND_USERS; } });
 var SigningScheme;
 (function (SigningScheme) {
     SigningScheme["EIP712"] = "eip712";
     SigningScheme["EIP191"] = "eip191";
 })(SigningScheme || (exports.SigningScheme = SigningScheme = {}));
-exports.ADMIN_API_KEY_HEADER = 'x-api-key';
-exports.ADMIN_API_KEY_PREFIX = 'ak_';
-exports.ADMIN_SCOPE_SUSPEND_USERS = 'user_suspension:write';
-exports.ADMIN_SCOPE_MANAGE_KEYS = 'admin_api_keys:manage';
 class PaymentGuaranteeRequestClaims {
     userAddress;
     recipientAddress;
@@ -52,7 +54,7 @@ class UserSuspensionStatus {
         this.updatedAt = updatedAt;
     }
     static fromRpc(raw) {
-        return new UserSuspensionStatus((getAny(raw, 'user_address', 'userAddress') ?? ''), Boolean(getAny(raw, 'suspended')), Number(getAny(raw, 'updated_at', 'updatedAt') ?? 0));
+        return new UserSuspensionStatus(((0, serde_1.getAny)(raw, 'user_address', 'userAddress') ?? ''), Boolean((0, serde_1.getAny)(raw, 'suspended')), Number((0, serde_1.getAny)(raw, 'updated_at', 'updatedAt') ?? 0));
     }
 }
 exports.UserSuspensionStatus = UserSuspensionStatus;
@@ -70,8 +72,8 @@ class AdminApiKeyInfo {
         this.revokedAt = revokedAt;
     }
     static fromRpc(raw) {
-        const revoked = getAny(raw, 'revoked_at', 'revokedAt');
-        return new AdminApiKeyInfo((getAny(raw, 'id') ?? ''), (getAny(raw, 'name') ?? ''), (getAny(raw, 'scopes') ?? []).map(String), Number(getAny(raw, 'created_at', 'createdAt') ?? 0), revoked === undefined || revoked === null ? null : Number(revoked));
+        const revoked = (0, serde_1.getAny)(raw, 'revoked_at', 'revokedAt');
+        return new AdminApiKeyInfo(((0, serde_1.getAny)(raw, 'id') ?? ''), ((0, serde_1.getAny)(raw, 'name') ?? ''), ((0, serde_1.getAny)(raw, 'scopes') ?? []).map(String), Number((0, serde_1.getAny)(raw, 'created_at', 'createdAt') ?? 0), revoked === undefined || revoked === null ? null : Number(revoked));
     }
 }
 exports.AdminApiKeyInfo = AdminApiKeyInfo;
@@ -89,17 +91,10 @@ class AdminApiKeySecret {
         this.apiKey = apiKey;
     }
     static fromRpc(raw) {
-        return new AdminApiKeySecret((getAny(raw, 'id') ?? ''), (getAny(raw, 'name') ?? ''), (getAny(raw, 'scopes') ?? []).map(String), Number(getAny(raw, 'created_at', 'createdAt') ?? 0), (getAny(raw, 'api_key', 'apiKey') ?? ''));
+        return new AdminApiKeySecret(((0, serde_1.getAny)(raw, 'id') ?? ''), ((0, serde_1.getAny)(raw, 'name') ?? ''), ((0, serde_1.getAny)(raw, 'scopes') ?? []).map(String), Number((0, serde_1.getAny)(raw, 'created_at', 'createdAt') ?? 0), ((0, serde_1.getAny)(raw, 'api_key', 'apiKey') ?? ''));
     }
 }
 exports.AdminApiKeySecret = AdminApiKeySecret;
-function getAny(raw, ...keys) {
-    for (const key of keys) {
-        if (key in raw)
-            return raw[key];
-    }
-    return undefined;
-}
 class TabInfo {
     tabId;
     userAddress;
@@ -124,7 +119,7 @@ class TabInfo {
         this.updatedAt = updatedAt;
     }
     static fromRpc(raw) {
-        return new TabInfo((0, utils_1.parseU256)((getAny(raw, 'tab_id', 'tabId') ?? 0)), (getAny(raw, 'user_address', 'userAddress') ?? ''), (getAny(raw, 'recipient_address', 'recipientAddress') ?? ''), (getAny(raw, 'asset_address', 'assetAddress') ?? ''), Number(getAny(raw, 'start_timestamp', 'startTimestamp')), Number(getAny(raw, 'ttl_seconds', 'ttlSeconds')), (getAny(raw, 'status') ?? ''), (getAny(raw, 'settlement_status', 'settlementStatus') ?? ''), Number(getAny(raw, 'created_at', 'createdAt')), Number(getAny(raw, 'updated_at', 'updatedAt')));
+        return new TabInfo((0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'tab_id', 'tabId') ?? 0)), ((0, serde_1.getAny)(raw, 'user_address', 'userAddress') ?? ''), ((0, serde_1.getAny)(raw, 'recipient_address', 'recipientAddress') ?? ''), ((0, serde_1.getAny)(raw, 'asset_address', 'assetAddress') ?? ''), Number((0, serde_1.getAny)(raw, 'start_timestamp', 'startTimestamp')), Number((0, serde_1.getAny)(raw, 'ttl_seconds', 'ttlSeconds')), ((0, serde_1.getAny)(raw, 'status') ?? ''), ((0, serde_1.getAny)(raw, 'settlement_status', 'settlementStatus') ?? ''), Number((0, serde_1.getAny)(raw, 'created_at', 'createdAt')), Number((0, serde_1.getAny)(raw, 'updated_at', 'updatedAt')));
     }
 }
 exports.TabInfo = TabInfo;
@@ -148,7 +143,7 @@ class GuaranteeInfo {
         this.certificate = certificate;
     }
     static fromRpc(raw) {
-        return new GuaranteeInfo((0, utils_1.parseU256)((getAny(raw, 'tab_id', 'tabId') ?? 0)), (0, utils_1.parseU256)((getAny(raw, 'req_id', 'reqId') ?? 0)), (getAny(raw, 'from_address', 'fromAddress') ?? ''), (getAny(raw, 'to_address', 'toAddress') ?? ''), (getAny(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)((getAny(raw, 'amount') ?? 0)), Number(getAny(raw, 'start_timestamp', 'startTimestamp', 'timestamp') ?? 0), getAny(raw, 'certificate'));
+        return new GuaranteeInfo((0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'tab_id', 'tabId') ?? 0)), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'req_id', 'reqId') ?? 0)), ((0, serde_1.getAny)(raw, 'from_address', 'fromAddress') ?? ''), ((0, serde_1.getAny)(raw, 'to_address', 'toAddress') ?? ''), ((0, serde_1.getAny)(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'amount') ?? 0)), Number((0, serde_1.getAny)(raw, 'start_timestamp', 'startTimestamp', 'timestamp') ?? 0), (0, serde_1.getAny)(raw, 'certificate'));
     }
 }
 exports.GuaranteeInfo = GuaranteeInfo;
@@ -160,8 +155,8 @@ class PendingRemunerationInfo {
         this.latestGuarantee = latestGuarantee;
     }
     static fromRpc(raw) {
-        const latest = getAny(raw, 'latest_guarantee', 'latestGuarantee');
-        return new PendingRemunerationInfo(TabInfo.fromRpc(getAny(raw, 'tab') ?? {}), latest ? GuaranteeInfo.fromRpc(latest) : null);
+        const latest = (0, serde_1.getAny)(raw, 'latest_guarantee', 'latestGuarantee');
+        return new PendingRemunerationInfo(TabInfo.fromRpc((0, serde_1.getAny)(raw, 'tab') ?? {}), latest ? GuaranteeInfo.fromRpc(latest) : null);
     }
 }
 exports.PendingRemunerationInfo = PendingRemunerationInfo;
@@ -187,9 +182,9 @@ class CollateralEventInfo {
         this.createdAt = createdAt;
     }
     static fromRpc(raw) {
-        const tabId = getAny(raw, 'tab_id', 'tabId');
-        const reqId = getAny(raw, 'req_id', 'reqId');
-        return new CollateralEventInfo((getAny(raw, 'id') ?? ''), (getAny(raw, 'user_address', 'userAddress') ?? ''), (getAny(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)((getAny(raw, 'amount') ?? 0)), (getAny(raw, 'event_type', 'eventType') ?? ''), tabId !== undefined && tabId !== null ? (0, utils_1.parseU256)(tabId) : null, reqId !== undefined && reqId !== null ? (0, utils_1.parseU256)(reqId) : null, getAny(raw, 'tx_id', 'txId'), Number(getAny(raw, 'created_at', 'createdAt') ?? 0));
+        const tabId = (0, serde_1.getAny)(raw, 'tab_id', 'tabId');
+        const reqId = (0, serde_1.getAny)(raw, 'req_id', 'reqId');
+        return new CollateralEventInfo(((0, serde_1.getAny)(raw, 'id') ?? ''), ((0, serde_1.getAny)(raw, 'user_address', 'userAddress') ?? ''), ((0, serde_1.getAny)(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'amount') ?? 0)), ((0, serde_1.getAny)(raw, 'event_type', 'eventType') ?? ''), tabId !== undefined && tabId !== null ? (0, utils_1.parseU256)(tabId) : null, reqId !== undefined && reqId !== null ? (0, utils_1.parseU256)(reqId) : null, (0, serde_1.getAny)(raw, 'tx_id', 'txId'), Number((0, serde_1.getAny)(raw, 'created_at', 'createdAt') ?? 0));
     }
 }
 exports.CollateralEventInfo = CollateralEventInfo;
@@ -209,7 +204,7 @@ class AssetBalanceInfo {
         this.updatedAt = updatedAt;
     }
     static fromRpc(raw) {
-        return new AssetBalanceInfo((getAny(raw, 'user_address', 'userAddress') ?? ''), (getAny(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)((getAny(raw, 'total') ?? 0)), (0, utils_1.parseU256)((getAny(raw, 'locked') ?? 0)), Number(getAny(raw, 'version') ?? 0), Number(getAny(raw, 'updated_at', 'updatedAt') ?? 0));
+        return new AssetBalanceInfo(((0, serde_1.getAny)(raw, 'user_address', 'userAddress') ?? ''), ((0, serde_1.getAny)(raw, 'asset_address', 'assetAddress') ?? ''), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'total') ?? 0)), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'locked') ?? 0)), Number((0, serde_1.getAny)(raw, 'version') ?? 0), Number((0, serde_1.getAny)(raw, 'updated_at', 'updatedAt') ?? 0));
     }
 }
 exports.AssetBalanceInfo = AssetBalanceInfo;
@@ -233,7 +228,7 @@ class RecipientPaymentInfo {
         this.createdAt = createdAt;
     }
     static fromRpc(raw) {
-        return new RecipientPaymentInfo((getAny(raw, 'user_address', 'userAddress') ?? ''), (getAny(raw, 'recipient_address', 'recipientAddress') ?? ''), (getAny(raw, 'tx_hash', 'txHash') ?? ''), (0, utils_1.parseU256)((getAny(raw, 'amount') ?? 0)), Boolean(getAny(raw, 'verified')), Boolean(getAny(raw, 'finalized')), Boolean(getAny(raw, 'failed')), Number(getAny(raw, 'created_at', 'createdAt') ?? 0));
+        return new RecipientPaymentInfo(((0, serde_1.getAny)(raw, 'user_address', 'userAddress') ?? ''), ((0, serde_1.getAny)(raw, 'recipient_address', 'recipientAddress') ?? ''), ((0, serde_1.getAny)(raw, 'tx_hash', 'txHash') ?? ''), (0, utils_1.parseU256)(((0, serde_1.getAny)(raw, 'amount') ?? 0)), Boolean((0, serde_1.getAny)(raw, 'verified')), Boolean((0, serde_1.getAny)(raw, 'finalized')), Boolean((0, serde_1.getAny)(raw, 'failed')), Number((0, serde_1.getAny)(raw, 'created_at', 'createdAt') ?? 0));
     }
 }
 exports.RecipientPaymentInfo = RecipientPaymentInfo;

package/dist/payment.d.ts

@@ -0,0 +1,19 @@
+import { PaymentGuaranteeRequestClaims, PaymentSignature, SigningScheme } from './models';
+export interface PaymentPayloadClaims {
+    version: string;
+    user_address: string;
+    recipient_address: string;
+    tab_id: string;
+    req_id: string;
+    amount: string;
+    timestamp: number;
+    asset_address: string;
+}
+export interface PaymentPayload {
+    claims: PaymentPayloadClaims;
+    signature: string;
+    scheme: SigningScheme;
+}
+export declare function serializePaymentClaims(claims: PaymentGuaranteeRequestClaims): PaymentPayloadClaims;
+export declare function buildPaymentPayload(claims: PaymentGuaranteeRequestClaims, signature: PaymentSignature): PaymentPayload;
+export declare function buildPaymentPayload(claims: PaymentGuaranteeRequestClaims, signature: string, scheme: SigningScheme): PaymentPayload;

package/dist/payment.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializePaymentClaims = serializePaymentClaims;
+exports.buildPaymentPayload = buildPaymentPayload;
+const utils_1 = require("./utils");
+function serializePaymentClaims(claims) {
+    return {
+        version: 'v1',
+        user_address: claims.userAddress,
+        recipient_address: claims.recipientAddress,
+        tab_id: (0, utils_1.serializeU256)(claims.tabId),
+        req_id: (0, utils_1.serializeU256)(claims.reqId),
+        amount: (0, utils_1.serializeU256)(claims.amount),
+        asset_address: claims.assetAddress,
+        timestamp: claims.timestamp,
+    };
+}
+function buildPaymentPayload(claims, signature, scheme) {
+    const signed = typeof signature === 'string'
+        ? (() => {
+            if (!scheme) {
+                throw new Error('scheme is required when providing a signature string');
+            }
+            return { signature, scheme };
+        })()
+        : signature;
+    return {
+        claims: serializePaymentClaims(claims),
+        signature: signed.signature,
+        scheme: signed.scheme,
+    };
+}

package/dist/rpc.d.ts

@@ -1,6 +1,7 @@
 import { AdminApiKeyInfo, AdminApiKeySecret, UserSuspensionStatus } from './models';
 import { CorePublicParameters } from './signing';
-export type FetchFn = (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
+import { type FetchFn as HttpFetchFn } from './http';
+export type FetchFn = HttpFetchFn;
 export type BearerTokenProvider = () => string | Promise<string>;
 export declare class RpcProxy {
     private baseUrl;
@@ -14,12 +15,11 @@ export declare class RpcProxy {
     withTokenProvider(provider: BearerTokenProvider): RpcProxy;
     private headers;
     private resolveBearerToken;
-    private decode;
     private get;
     private post;
     getPublicParams(): Promise<CorePublicParameters>;
-    issueGuarantee(body: Record<string, unknown>): Promise<Record<string, unknown>>;
-    createPaymentTab(body: Record<string, unknown>): Promise<Record<string, unknown>>;
+    issueGuarantee(body: unknown): Promise<Record<string, unknown>>;
+    createPaymentTab(body: unknown): Promise<Record<string, unknown>>;
     listSettledTabs(recipientAddress: string): Promise<Record<string, unknown>[]>;
     listPendingRemunerations(recipientAddress: string): Promise<Record<string, unknown>[]>;
     getTab(tabId: number | bigint): Promise<Record<string, unknown> | null>;
@@ -31,7 +31,7 @@ export declare class RpcProxy {
     getCollateralEventsForTab(tabId: number | bigint): Promise<Record<string, unknown>[]>;
     getUserAssetBalance(userAddress: string, assetAddress: string): Promise<Record<string, unknown> | null>;
     updateUserSuspension(userAddress: string, suspended: boolean): Promise<UserSuspensionStatus>;
-    createAdminApiKey(body: Record<string, unknown>): Promise<AdminApiKeySecret>;
+    createAdminApiKey(body: unknown): Promise<AdminApiKeySecret>;
     listAdminApiKeys(): Promise<AdminApiKeyInfo[]>;
     revokeAdminApiKey(keyId: string): Promise<AdminApiKeyInfo>;
 }

package/dist/rpc.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RpcProxy = void 0;
+const constants_1 = require("./constants");
 const models_1 = require("./models");
 const signing_1 = require("./signing");
 const errors_1 = require("./errors");
+const http_1 = require("./http");
 function serializeTabId(tabId) {
     return `0x${BigInt(tabId).toString(16)}`;
 }
@@ -14,7 +16,7 @@ class RpcProxy {
     bearerTokenProvider;
     fetchFn;
     constructor(endpoint, adminApiKey, fetchFn = fetch) {
-        this.baseUrl = endpoint.endsWith('/') ? endpoint.slice(0, -1) : endpoint;
+        this.baseUrl = (0, http_1.normalizeBaseUrl)(endpoint);
         this.adminApiKey = adminApiKey;
         this.fetchFn = fetchFn;
     }
@@ -32,7 +34,7 @@ class RpcProxy {
     async headers() {
         const headers = {};
         if (this.adminApiKey) {
-            headers[models_1.ADMIN_API_KEY_HEADER] = this.adminApiKey;
+            headers[constants_1.ADMIN_API_KEY_HEADER] = this.adminApiKey;
         }
         const token = await this.resolveBearerToken();
         if (token) {
@@ -54,52 +56,30 @@ class RpcProxy {
         }
         return `Bearer ${trimmed}`;
     }
-    async decode(response) {
-        let payload;
-        try {
-            payload = await response.json();
-        }
-        catch (err) {
-            if (response.ok) {
-                throw new errors_1.RpcError(`invalid JSON response from ${response.url}: ${String(err)}`);
-            }
-            payload = await response.text();
-        }
-        if (response.ok) {
-            return payload;
-        }
-        let message = 'unknown error';
-        if (payload && typeof payload === 'object') {
-            const record = payload;
-            const error = record.error;
-            const msg = record.message;
-            message =
-                (typeof error === 'string' && error) ||
-                    (typeof msg === 'string' && msg) ||
-                    JSON.stringify(record, (_k, v) => v);
-        }
-        else if (typeof payload === 'string' && payload.trim()) {
-            message = payload.trim();
-        }
-        throw new errors_1.RpcError(`${response.status}: ${message}`, {
-            status: response.status,
-            body: payload,
-        });
-    }
     async get(path) {
-        const resp = await this.fetchFn(`${this.baseUrl}${path}`, {
+        return (0, http_1.requestJson)(this.fetchFn, `${this.baseUrl}${path}`, {
             headers: await this.headers(),
             method: 'GET',
+        }, {
+            decodeError: (message) => new errors_1.RpcError(message),
+            httpError: (message, response, body) => new errors_1.RpcError(message, {
+                status: response.status,
+                body,
+            }),
         });
-        return this.decode(resp);
     }
     async post(path, body) {
-        const resp = await this.fetchFn(`${this.baseUrl}${path}`, {
+        return (0, http_1.requestJson)(this.fetchFn, `${this.baseUrl}${path}`, {
             headers: { 'content-type': 'application/json', ...(await this.headers()) },
             method: 'POST',
             body: JSON.stringify(body),
+        }, {
+            decodeError: (message) => new errors_1.RpcError(message),
+            httpError: (message, response, body) => new errors_1.RpcError(message, {
+                status: response.status,
+                body,
+            }),
         });
-        return this.decode(resp);
     }
     async getPublicParams() {
         const data = await this.get('/core/public-params');

package/dist/serde.d.ts

@@ -0,0 +1,5 @@
+export type RecordValue = Record<string, unknown>;
+export declare const isRecord: (value: unknown) => value is RecordValue;
+export declare function getAny<T>(raw: RecordValue, ...keys: string[]): T | undefined;
+export declare function readString(value: unknown, label: string, onError: (label: string) => Error): string;
+export declare function readNumber(value: unknown, label: string, onError: (label: string) => Error): number;

package/dist/serde.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRecord = void 0;
+exports.getAny = getAny;
+exports.readString = readString;
+exports.readNumber = readNumber;
+const isRecord = (value) => Boolean(value) && typeof value === 'object' && !Array.isArray(value);
+exports.isRecord = isRecord;
+function getAny(raw, ...keys) {
+    for (const key of keys) {
+        if (key in raw)
+            return raw[key];
+    }
+    return undefined;
+}
+function readString(value, label, onError) {
+    if (typeof value === 'string' && value.trim()) {
+        return value;
+    }
+    throw onError(label);
+}
+function readNumber(value, label, onError) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value;
+    }
+    if (typeof value === 'string' && value.trim()) {
+        const parsed = Number(value);
+        if (Number.isFinite(parsed)) {
+            return parsed;
+        }
+    }
+    throw onError(label);
+}

package/dist/signing.js

@@ -9,6 +9,7 @@ const viem_1 = require("viem");
 const errors_1 = require("./errors");
 const models_1 = require("./models");
 const utils_1 = require("./utils");
+const serde_1 = require("./serde");
 class CorePublicParameters {
     publicKey;
     contractAddress;
@@ -53,7 +54,6 @@ exports.GUARANTEE_EIP712_TYPES = {
         { name: 'timestamp', type: 'uint64' },
     ],
 };
-const isRecord = (value) => Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 const fieldsMatch = (actual, expected) => {
     if (!Array.isArray(actual) || actual.length !== expected.length)
         return false;
@@ -79,16 +79,16 @@ const ensureBigIntish = (value, label) => {
     }
 };
 function validateGuaranteeTypedData(payload, options = {}) {
-    if (!isRecord(payload)) {
+    if (!(0, serde_1.isRecord)(payload)) {
         throw new utils_1.ValidationError('typed data payload is required');
     }
-    if (!isRecord(payload.domain)) {
+    if (!(0, serde_1.isRecord)(payload.domain)) {
         throw new utils_1.ValidationError('domain is required');
     }
-    if (!isRecord(payload.types)) {
+    if (!(0, serde_1.isRecord)(payload.types)) {
         throw new utils_1.ValidationError('types are required');
     }
-    if (!isRecord(payload.message)) {
+    if (!(0, serde_1.isRecord)(payload.message)) {
         throw new utils_1.ValidationError('message is required');
     }
     const types = payload.types;

package/dist/x402/index.d.ts

@@ -18,5 +18,5 @@ export declare class X402Flow {
     protected requestTab(x402Version: number, paymentRequirements: PaymentRequirementsV1 | PaymentRequirementsV2, userAddress: string, resource?: X402ResourceInfo): Promise<TabResponse>;
     protected buildClaims(requirements: PaymentRequirementsV1 | PaymentRequirementsV2, tab: TabResponse, userAddress: string): PaymentGuaranteeRequestClaims;
     private static validateScheme;
-    private static buildPaymentPayload;
+    private static decodePaymentHeader;
 }

package/dist/x402/index.js

@@ -18,6 +18,7 @@ exports.X402Flow = void 0;
 const models_1 = require("../models");
 const utils_1 = require("../utils");
 const errors_1 = require("../errors");
+const payment_1 = require("../payment");
 __exportStar(require("./models"), exports);
 class X402Flow {
     signer;
@@ -34,7 +35,7 @@ class X402Flow {
         const tab = await this.requestTab(1, paymentRequirements, userAddress);
         const claims = this.buildClaims(paymentRequirements, tab, userAddress);
         const signature = await this.signer.signPayment(claims, models_1.SigningScheme.EIP712);
-        const paymentPayload = X402Flow.buildPaymentPayload(claims, signature);
+        const paymentPayload = (0, payment_1.buildPaymentPayload)(claims, signature);
         const envelope = {
             x402Version: 1,
             scheme: paymentRequirements.scheme,
@@ -49,7 +50,7 @@ class X402Flow {
         const tab = await this.requestTab(2, accepted, userAddress, paymentRequired.resource);
         const claims = this.buildClaims(accepted, tab, userAddress);
         const signature = await this.signer.signPayment(claims, models_1.SigningScheme.EIP712);
-        const paymentPayload = X402Flow.buildPaymentPayload(claims, signature);
+        const paymentPayload = (0, payment_1.buildPaymentPayload)(claims, signature);
         const envelope = {
             x402Version: 2,
             accepted: accepted,
@@ -61,12 +62,17 @@ class X402Flow {
     }
     async settlePayment(payment, paymentRequirements, facilitatorUrl) {
         const url = `${facilitatorUrl.replace(/\/$/, '')}/settle`;
+        const paymentPayload = X402Flow.decodePaymentHeader(payment.header);
+        const x402Version = typeof paymentPayload === 'object' && paymentPayload && 'x402Version' in paymentPayload
+            ? paymentPayload.x402Version
+            : undefined;
         const response = await this.fetchFn(url, {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
             body: JSON.stringify({
-                x402Version: 1,
+                ...(x402Version ? { x402Version } : {}),
                 paymentHeader: payment.header,
+                paymentPayload,
                 paymentRequirements,
             }),
         });
@@ -118,21 +124,17 @@ class X402Flow {
             throw new errors_1.X402Error(`invalid scheme: ${scheme}`);
         }
     }
-    static buildPaymentPayload(claims, signature) {
-        return {
-            claims: {
-                version: 'v1',
-                user_address: claims.userAddress,
-                recipient_address: claims.recipientAddress,
-                tab_id: `0x${claims.tabId.toString(16)}`,
-                req_id: `0x${claims.reqId.toString(16)}`,
-                amount: `0x${claims.amount.toString(16)}`,
-                asset_address: claims.assetAddress,
-                timestamp: claims.timestamp,
-            },
-            signature: signature.signature,
-            scheme: signature.scheme,
-        };
+    static decodePaymentHeader(header) {
+        if (!header || typeof header !== 'string') {
+            throw new errors_1.X402Error('missing payment header');
+        }
+        try {
+            const decoded = Buffer.from(header, 'base64').toString('utf8');
+            return JSON.parse(decoded);
+        }
+        catch (err) {
+            throw new errors_1.X402Error(`invalid payment header: ${String(err)}`);
+        }
     }
 }
 exports.X402Flow = X402Flow;

package/dist/x402/models.d.ts

@@ -1,4 +1,5 @@
-import { PaymentSignature, SigningScheme } from '../models';
+import { PaymentSignature } from '../models';
+import type { PaymentPayload, PaymentPayloadClaims } from '../payment';
 export interface PaymentRequirementsV1 {
     scheme: string;
     network: string;
@@ -30,21 +31,8 @@ export interface TabResponse {
     userAddress: string;
     nextReqId?: string;
 }
-export interface X402PaymentPayloadClaims {
-    version: string;
-    user_address: string;
-    recipient_address: string;
-    tab_id: string;
-    req_id: string;
-    amount: string;
-    timestamp: number;
-    asset_address: string;
-}
-export interface X402PaymentPayload {
-    claims: X402PaymentPayloadClaims;
-    signature: string;
-    scheme: SigningScheme;
-}
+export type X402PaymentPayloadClaims = PaymentPayloadClaims;
+export type X402PaymentPayload = PaymentPayload;
 export interface X402PaymentEnvelopeV1 {
     x402Version: number;
     scheme: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4mica/sdk",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "TypeScript SDK for interacting with the 4Mica payment network",
   "license": "MIT",
   "repository": {
@@ -45,6 +45,7 @@
     "fmt": "prettier --check \"{src,tests}/**/*.{ts,js,json}\""
   },
   "dependencies": {
+    "@noble/curves": "^2.0.1",
     "viem": "^2.45.1"
   },
   "devDependencies": {
@@ -57,6 +58,7 @@
     "eslint-plugin-react": "^7.37.5",
     "globals": "^17.3.0",
     "prettier": "^3.8.1",
+    "tsx": "^4.21.0",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.54.0",
     "vitest": "^4.0.17"