@ampersend_ai/ampersend-sdk 0.0.16 → 0.0.21

package/dist/x402/wallets/account/wallet.js

@@ -1,59 +1,52 @@
+import { ExactEvmScheme, toClientEvmSigner } from "@x402/evm";
+import { ExactEvmSchemeV1 } from "@x402/evm/v1";
 import { privateKeyToAccount } from "viem/accounts";
-import { createPaymentHeader } from "x402/client";
+import { acceptedOf, buildAuthorization } from "../../envelopes.js";
 import { WalletError } from "../../wallet.js";
 /**
- * AccountWallet - EOA (Externally Owned Account) wallet implementation
- *
- * Creates payment payloads signed by an EOA private key.
- * Supports the "exact" payment scheme.
- *
- * @example
- * ```typescript
- * import { privateKeyToAccount } from "viem/accounts"
- *
- * // From viem Account
- * const account = privateKeyToAccount("0x...")
- * const wallet = new AccountWallet(account)
- *
- * // From private key directly
- * const wallet = AccountWallet.fromPrivateKey("0x...")
- * ```
+ * EOA wallet for x402 `exact` on EVM. A `LocalAccount` is sufficient for
+ * EIP-3009 and base Permit2; EIP-2612 permit enrichment is skipped because it
+ * needs `readContract`, which `LocalAccount` lacks.
  */
 export class AccountWallet {
     account;
+    signer;
+    schemeV1;
+    schemeV2;
     constructor(account) {
         this.account = account;
+        this.signer = toClientEvmSigner({
+            address: account.address,
+            signTypedData: (msg) => account.signTypedData(msg),
+        });
+        this.schemeV1 = new ExactEvmSchemeV1(this.signer);
+        this.schemeV2 = new ExactEvmScheme(this.signer);
     }
-    /**
-     * Creates an AccountWallet from a private key
-     */
     static fromPrivateKey(privateKey) {
         return new AccountWallet(privateKeyToAccount(privateKey));
     }
-    /**
-     * Creates a payment payload from requirements.
-     * Only supports "exact" payment scheme.
-     * Note: serverAuthorization parameter is ignored for EOA wallets (only used by SmartAccountWallet)
-     */
-    async createPayment(requirements, _serverAuthorization) {
-        if (requirements.scheme !== "exact") {
-            throw new WalletError(`Unsupported payment scheme: ${requirements.scheme}. AccountWallet only supports "exact".`);
+    async createPayment(instruction, serverAuthorization) {
+        if (serverAuthorization) {
+            throw new WalletError("AccountWallet received a co-signed authorization from the server, but EOA accounts " +
+                "cannot produce ERC-1271 co-signed payments. Use SmartAccountWallet for co-signed agent keys.");
         }
+        const accepted = acceptedOf(instruction);
+        if (accepted.scheme !== "exact") {
+            throw new WalletError(`Unsupported payment scheme: ${accepted.scheme}. AccountWallet only supports "exact".`);
+        }
+        // Zod-inferred shape → upstream v2-surface shape. Nominal mismatch only;
+        // each scheme re-narrows to the version it needs at runtime.
+        const requirements = accepted;
         try {
-            // Create payment header using x402 client utility
-            const paymentHeader = await createPaymentHeader(this.account, 1, requirements);
-            // Decode base64 payment header to PaymentPayload
-            const decoded = Buffer.from(paymentHeader, "base64").toString("utf-8");
-            const payment = JSON.parse(decoded);
-            return payment;
+            const result = instruction.protocol === "x402-v1"
+                ? await this.schemeV1.createPaymentPayload(1, requirements)
+                : await this.schemeV2.createPaymentPayload(2, requirements, instruction.request.extensions ? { extensions: instruction.request.extensions } : undefined);
+            return buildAuthorization(instruction, result.payload);
         }
         catch (error) {
             throw new WalletError(`Failed to create payment: ${error instanceof Error ? error.message : String(error)}`, error instanceof Error ? error : undefined);
         }
     }
-    /**
-     * Returns the account address
-     */
     get address() {
         return this.account.address;
     }

package/dist/x402/wallets/account/wallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../src/x402/wallets/account/wallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AAIjD,OAAO,EAAE,WAAW,EAAmB,MAAM,iBAAiB,CAAA;AAE9D;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,aAAa;IAChB,OAAO,CAAc;IAE7B,YAAY,OAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,cAAc,CAAC,UAAe;QACnC,OAAO,IAAI,aAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,aAAa,CACjB,YAAiC,EACjC,oBAA8C;QAE9C,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACpC,MAAM,IAAI,WAAW,CAAC,+BAA+B,YAAY,CAAC,MAAM,wCAAwC,CAAC,CAAA;QACnH,CAAC;QAED,IAAI,CAAC;YACH,kDAAkD;YAClD,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;YAE9E,iDAAiD;YACjD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAmB,CAAA;YAErD,OAAO,OAAO,CAAA;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,WAAW,CACnB,6BAA6B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACrF,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC3C,CAAA;QACH,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;IAC7B,CAAC;CACF"}
+{"version":3,"file":"wallet.js","sourceRoot":"","sources":["../../../../src/x402/wallets/account/wallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAwB,MAAM,WAAW,CAAA;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAE/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAsD,MAAM,oBAAoB,CAAA;AAEvH,OAAO,EAAE,WAAW,EAAmB,MAAM,iBAAiB,CAAA;AAE9D;;;;GAIG;AACH,MAAM,OAAO,aAAa;IAChB,OAAO,CAAc;IACrB,MAAM,CAAiB;IACvB,QAAQ,CAAkB;IAC1B,QAAQ,CAAgB;IAEhC,YAAY,OAAqB;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAAC;YAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC;SACnD,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACjD,IAAI,CAAC,QAAQ,GAAG,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,UAAe;QACnC,OAAO,IAAI,aAAa,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA;IAC3D,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,WAA+B,EAC/B,mBAA6C;QAE7C,IAAI,mBAAmB,EAAE,CAAC;YACxB,MAAM,IAAI,WAAW,CACnB,qFAAqF;gBACnF,8FAA8F,CACjG,CAAA;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;QACxC,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,WAAW,CAAC,+BAA+B,QAAQ,CAAC,MAAM,wCAAwC,CAAC,CAAA;QAC/G,CAAC;QAED,yEAAyE;QACzE,6DAA6D;QAC7D,MAAM,YAAY,GAAG,QAAuC,CAAA;QAC5D,IAAI,CAAC;YACH,MAAM,MAAM,GACV,WAAW,CAAC,QAAQ,KAAK,SAAS;gBAChC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,EAAE,YAAY,CAAC;gBAC3D,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CACtC,CAAC,EACD,YAAY,EACZ,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAC5F,CAAA;YACP,OAAO,kBAAkB,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,WAAW,CACnB,6BAA6B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EACrF,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC3C,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA;IAC7B,CAAC;CACF"}

package/dist/x402/wallets/index.d.ts

@@ -16,7 +16,6 @@ export interface SmartAccountWalletConfig {
     type: "smart-account";
     smartAccountAddress: Address;
     sessionKeyPrivateKey: Hex;
-    chainId: number;
     validatorAddress: Address;
     coSignerValidatorAddress?: Address;
 }

package/dist/x402/wallets/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/x402/wallets/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAI9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEvF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,eAAe,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,oBAAoB,EAAE,GAAG,CAAA;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,EAAE,OAAO,CAAA;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,wBAAwB,CAAA;AAErE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAYvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/x402/wallets/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAI9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAEvF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,KAAK,CAAA;IACX,UAAU,EAAE,GAAG,CAAA;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,eAAe,CAAA;IACrB,mBAAmB,EAAE,OAAO,CAAA;IAC5B,oBAAoB,EAAE,GAAG,CAAA;IACzB,gBAAgB,EAAE,OAAO,CAAA;IACzB,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,eAAe,GAAG,wBAAwB,CAAA;AAErE;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,GAAG,UAAU,CAWvE"}

package/dist/x402/wallets/index.js

@@ -16,7 +16,6 @@ export function createWalletFromConfig(config) {
     return new SmartAccountWallet({
         smartAccountAddress: config.smartAccountAddress,
         sessionKeyPrivateKey: config.sessionKeyPrivateKey,
-        chainId: config.chainId,
         validatorAddress: config.validatorAddress,
         ...(config.coSignerValidatorAddress != null && { coSignerValidatorAddress: config.coSignerValidatorAddress }),
     });

package/dist/x402/wallets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/x402/wallets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAA2B,MAAM,2BAA2B,CAAA;AA2BvF;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAoB;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,OAAO,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,IAAI,kBAAkB,CAAC;QAC5B,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;QACjD,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,GAAG,CAAC,MAAM,CAAC,wBAAwB,IAAI,IAAI,IAAI,EAAE,wBAAwB,EAAE,MAAM,CAAC,wBAAwB,EAAE,CAAC;KAC9G,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/x402/wallets/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,kBAAkB,EAA2B,MAAM,2BAA2B,CAAA;AA0BvF;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAoB;IACzD,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC1B,OAAO,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACxD,CAAC;IAED,OAAO,IAAI,kBAAkB,CAAC;QAC5B,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;QAC/C,oBAAoB,EAAE,MAAM,CAAC,oBAAoB;QACjD,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;QACzC,GAAG,CAAC,MAAM,CAAC,wBAAwB,IAAI,IAAI,IAAI,EAAE,wBAAwB,EAAE,MAAM,CAAC,wBAAwB,EAAE,CAAC;KAC9G,CAAC,CAAA;AACJ,CAAC"}

package/dist/x402/wallets/smart-account/chain.d.ts

@@ -0,0 +1,4 @@
+import { type PaymentInstruction } from "../../envelopes.ts";
+/** v1 looks up the network name; v2 parses `eip155:N`. Returns `null` for unsupported networks. */
+export declare function chainIdOf(instruction: PaymentInstruction): number | null;
+//# sourceMappingURL=chain.d.ts.map

package/dist/x402/wallets/smart-account/chain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/chain.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAExE,mGAAmG;AACnG,wBAAgB,SAAS,CAAC,WAAW,EAAE,kBAAkB,GAAG,MAAM,GAAG,IAAI,CAOxE"}

package/dist/x402/wallets/smart-account/chain.js

@@ -0,0 +1,12 @@
+import { EVM_NETWORK_CHAIN_ID_MAP } from "@x402/evm/v1";
+import { acceptedOf } from "../../envelopes.js";
+/** v1 looks up the network name; v2 parses `eip155:N`. Returns `null` for unsupported networks. */
+export function chainIdOf(instruction) {
+    const network = acceptedOf(instruction).network;
+    if (instruction.protocol === "x402-v1") {
+        return EVM_NETWORK_CHAIN_ID_MAP[network] ?? null;
+    }
+    const match = /^eip155:(\d+)$/.exec(network);
+    return match ? Number(match[1]) : null;
+}
+//# sourceMappingURL=chain.js.map

package/dist/x402/wallets/smart-account/chain.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AAEvD,OAAO,EAAE,UAAU,EAA2B,MAAM,oBAAoB,CAAA;AAExE,mGAAmG;AACnG,MAAM,UAAU,SAAS,CAAC,WAA+B;IACvD,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,CAAA;IAC/C,IAAI,WAAW,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACvC,OAAQ,wBAA6D,CAAC,OAAO,CAAC,IAAI,IAAI,CAAA;IACxF,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAC5C,OAAO,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;AACxC,CAAC"}

package/dist/x402/wallets/smart-account/cosigned.d.ts

@@ -1,46 +1,20 @@
 import { type Address, type Hex, type TypedDataDefinition } from "viem";
-import type { PaymentPayload, PaymentRequirements } from "x402/types";
+import { type PaymentAuthorization, type PaymentInstruction } from "../../envelopes.ts";
 import type { ServerAuthorizationData } from "../../types.ts";
-/**
- * Configuration for creating a co-signed payment
- */
 export interface CoSignedPaymentConfig {
-    /** Smart account address (payment sender) */
     smartAccountAddress: Address;
-    /** Session key private key for signing */
     sessionKeyPrivateKey: Hex;
-    /** Chain ID for the blockchain network */
-    chainId: number;
-    /** CoSignerValidator address */
     coSignerValidatorAddress: Address;
 }
 /**
- * Encode a co-signed ERC-1271 signature
- *
- * Combines agent signature + server signature according to CoSignerValidator format:
- * 1. Sign typed data with agent key (raw ECDSA)
- * 2. Combine: abi.encode(agentSig, serverSig)
- * 3. Wrap for ERC-1271: encodePacked(validatorAddress, combined)
- *
- * @param agentPrivateKey - Agent's session key private key
- * @param typedDataParams - EIP-712 typed data to sign
- * @param serverSignature - Server's ECDSA signature (65 bytes as hex)
- * @param coSignerValidatorAddress - CoSignerValidator contract address
- * @returns ERC-1271 formatted signature
+ * CoSignerValidator ERC-1271 signature: agent signs → `abi.encode(agentSig, serverSig)`
+ * → `encodePacked(validator, combined)`.
  */
 export declare function encodeCoSignedERC1271Signature(agentPrivateKey: Hex, typedDataParams: TypedDataDefinition, serverSignature: Hex, coSignerValidatorAddress: Address): Promise<Hex>;
 /**
- * Creates a payment payload using server co-signature
- *
- * This is used for co-signed agent keys where the server provides the ERC-3009
- * authorization data and co-signature. The agent key adds its signature and
- * combines them for ERC-1271 validation via CoSignerValidator.
- *
- * @param requirements - Payment requirements from the x402 server
- * @param config - Configuration for the smart account wallet
- * @param serverAuthorization - Server-provided authorization data and co-signature
- * @returns Payment payload ready to send to x402 server
- * @throws Error if requirements are invalid or signing fails
+ * Sign a co-signed `exact` instruction. Server supplies ERC-3009
+ * authorization data + its signature; agent adds its own and the pair is
+ * validated via CoSignerValidator under ERC-1271.
  */
-export declare function createCoSignedPayment(requirements: PaymentRequirements, config: CoSignedPaymentConfig, serverAuthorization: ServerAuthorizationData): Promise<PaymentPayload>;
+export declare function createCoSignedPayment(instruction: PaymentInstruction, config: CoSignedPaymentConfig, serverAuthorization: ServerAuthorizationData): Promise<PaymentAuthorization>;
 //# sourceMappingURL=cosigned.d.ts.map

package/dist/x402/wallets/smart-account/cosigned.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosigned.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/cosigned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAE1G,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAE7D;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,6CAA6C;IAC7C,mBAAmB,EAAE,OAAO,CAAA;IAC5B,0CAA0C;IAC1C,oBAAoB,EAAE,GAAG,CAAA;IACzB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,gCAAgC;IAChC,wBAAwB,EAAE,OAAO,CAAA;CAClC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,8BAA8B,CAClD,eAAe,EAAE,GAAG,EACpB,eAAe,EAAE,mBAAmB,EACpC,eAAe,EAAE,GAAG,EACpB,wBAAwB,EAAE,OAAO,GAChC,OAAO,CAAC,GAAG,CAAC,CAad;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,qBAAqB,EAC7B,mBAAmB,EAAE,uBAAuB,GAC3C,OAAO,CAAC,cAAc,CAAC,CA4DzB"}
+{"version":3,"file":"cosigned.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/cosigned.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,KAAK,mBAAmB,EAAE,MAAM,MAAM,CAAA;AAI1G,OAAO,EAAkC,KAAK,oBAAoB,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACvH,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAG7D,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,oBAAoB,EAAE,GAAG,CAAA;IACzB,wBAAwB,EAAE,OAAO,CAAA;CAClC;AAED;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,eAAe,EAAE,GAAG,EACpB,eAAe,EAAE,mBAAmB,EACpC,eAAe,EAAE,GAAG,EACpB,wBAAwB,EAAE,OAAO,GAChC,OAAO,CAAC,GAAG,CAAC,CAUd;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,kBAAkB,EAC/B,MAAM,EAAE,qBAAqB,EAC7B,mBAAmB,EAAE,uBAAuB,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAyD/B"}

package/dist/x402/wallets/smart-account/cosigned.js

@@ -1,57 +1,41 @@
 import { encodeAbiParameters, encodePacked } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { TRANSFER_WITH_AUTHORIZATION_TYPE } from "../../../smart-account/eip712-types.js";
+import { acceptedOf, buildAuthorization } from "../../envelopes.js";
+import { chainIdOf } from "./chain.js";
 /**
- * Encode a co-signed ERC-1271 signature
- *
- * Combines agent signature + server signature according to CoSignerValidator format:
- * 1. Sign typed data with agent key (raw ECDSA)
- * 2. Combine: abi.encode(agentSig, serverSig)
- * 3. Wrap for ERC-1271: encodePacked(validatorAddress, combined)
- *
- * @param agentPrivateKey - Agent's session key private key
- * @param typedDataParams - EIP-712 typed data to sign
- * @param serverSignature - Server's ECDSA signature (65 bytes as hex)
- * @param coSignerValidatorAddress - CoSignerValidator contract address
- * @returns ERC-1271 formatted signature
+ * CoSignerValidator ERC-1271 signature: agent signs → `abi.encode(agentSig, serverSig)`
+ * → `encodePacked(validator, combined)`.
  */
 export async function encodeCoSignedERC1271Signature(agentPrivateKey, typedDataParams, serverSignature, coSignerValidatorAddress) {
-    // 1. Sign with agent key
     const agentAccount = privateKeyToAccount(agentPrivateKey);
     const agentSignature = await agentAccount.signTypedData(typedDataParams);
-    // 2. Combine signatures: abi.encode(bytes agentSig, bytes serverSig)
     const combinedSignature = encodeAbiParameters([{ type: "bytes" }, { type: "bytes" }], [agentSignature, serverSignature]);
-    // 3. Encode for ERC-1271: encodePacked(address validator, bytes signature)
     return encodePacked(["address", "bytes"], [coSignerValidatorAddress, combinedSignature]);
 }
 /**
- * Creates a payment payload using server co-signature
- *
- * This is used for co-signed agent keys where the server provides the ERC-3009
- * authorization data and co-signature. The agent key adds its signature and
- * combines them for ERC-1271 validation via CoSignerValidator.
- *
- * @param requirements - Payment requirements from the x402 server
- * @param config - Configuration for the smart account wallet
- * @param serverAuthorization - Server-provided authorization data and co-signature
- * @returns Payment payload ready to send to x402 server
- * @throws Error if requirements are invalid or signing fails
+ * Sign a co-signed `exact` instruction. Server supplies ERC-3009
+ * authorization data + its signature; agent adds its own and the pair is
+ * validated via CoSignerValidator under ERC-1271.
  */
-export async function createCoSignedPayment(requirements, config, serverAuthorization) {
+export async function createCoSignedPayment(instruction, config, serverAuthorization) {
     const { authorizationData, serverSignature } = serverAuthorization;
-    // Get domain params from requirements.extra
-    const domainName = requirements.extra?.name;
-    const domainVersion = requirements.extra?.version;
+    const accepted = acceptedOf(instruction);
+    const domainName = accepted.extra?.name;
+    const domainVersion = accepted.extra?.version;
     if (!domainName || !domainVersion) {
-        throw new Error("requirements.extra must contain 'name' and 'version' for EIP-712 domain");
+        throw new Error("accepted.extra must contain 'name' and 'version' for EIP-712 domain");
+    }
+    const chainId = chainIdOf(instruction);
+    if (chainId === null) {
+        throw new Error(`Unsupported network "${accepted.network}" — use a known v1 name or CAIP-2 "eip155:N".`);
     }
-    // Construct EIP-712 typed data from server-provided authorization data
     const typedData = {
         domain: {
             name: domainName,
             version: domainVersion,
-            chainId: config.chainId,
-            verifyingContract: requirements.asset,
+            chainId,
+            verifyingContract: accepted.asset,
         },
         types: {
             TransferWithAuthorization: TRANSFER_WITH_AUTHORIZATION_TYPE,
@@ -66,25 +50,18 @@ export async function createCoSignedPayment(requirements, config, serverAuthoriz
             nonce: authorizationData.nonce,
         },
     };
-    // Encode co-signed signature
     const signature = await encodeCoSignedERC1271Signature(config.sessionKeyPrivateKey, typedData, serverSignature, config.coSignerValidatorAddress);
-    // Construct payment payload matching x402 exact scheme format
-    const paymentPayload = {
-        x402Version: 1,
-        scheme: "exact",
-        network: requirements.network,
-        payload: {
-            signature: signature,
-            authorization: {
-                from: authorizationData.from,
-                to: authorizationData.to,
-                value: authorizationData.value,
-                validAfter: authorizationData.validAfter,
-                validBefore: authorizationData.validBefore,
-                nonce: authorizationData.nonce,
-            },
+    const signedPayload = {
+        signature: signature,
+        authorization: {
+            from: authorizationData.from,
+            to: authorizationData.to,
+            value: authorizationData.value,
+            validAfter: authorizationData.validAfter,
+            validBefore: authorizationData.validBefore,
+            nonce: authorizationData.nonce,
         },
     };
-    return paymentPayload;
+    return buildAuthorization(instruction, signedPayload);
 }
 //# sourceMappingURL=cosigned.js.map

package/dist/x402/wallets/smart-account/cosigned.js.map

@@ -1 +1 @@
-{"version":3,"file":"cosigned.js","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/cosigned.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cosigned.js","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/cosigned.ts"],"names":[],"mappings":"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"}

package/dist/x402/wallets/smart-account/exact.d.ts

@@ -1,29 +1,15 @@
 import { type Address, type Hex } from "viem";
-import type { PaymentPayload, PaymentRequirements } from "x402/types";
-/**
- * Configuration for creating an exact payment with ERC-3009
- */
+import { type PaymentAuthorization, type PaymentInstruction } from "../../envelopes.ts";
 export interface ExactPaymentConfig {
-    /** Smart account address (payment sender) */
     smartAccountAddress: Address;
-    /** Session key private key for signing */
     sessionKeyPrivateKey: Hex;
-    /** Chain ID for the blockchain network */
-    chainId: number;
-    /** OwnableValidator address for ERC-1271 validation */
+    /** OwnableValidator address used for ERC-1271 validation. */
     validatorAddress: Address;
 }
 /**
- * Creates a payment payload using the "exact" scheme with ERC-3009 USDC authorization
- *
- * This implements the x402 "exact" payment scheme, which uses USDC's transferWithAuthorization
- * (ERC-3009) to create signed payment authorizations. The signature is created using ERC-1271
- * from a smart account via the OwnableValidator module.
- *
- * @param requirements - Payment requirements from the x402 server
- * @param config - Configuration for the smart account wallet
- * @returns Payment payload ready to send to x402 server
- * @throws Error if payment requirements are invalid or signing fails
+ * Sign an `exact` instruction: ERC-3009 `transferWithAuthorization` via
+ * ERC-1271 with OwnableValidator. {@link buildAuthorization} packages the
+ * signed body for v1 or v2.
  */
-export declare function createExactPayment(requirements: PaymentRequirements, config: ExactPaymentConfig): Promise<PaymentPayload>;
+export declare function createExactPayment(instruction: PaymentInstruction, config: ExactPaymentConfig): Promise<PaymentAuthorization>;
 //# sourceMappingURL=exact.d.ts.map

package/dist/x402/wallets/smart-account/exact.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exact.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/exact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAA;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAiBrE;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,6CAA6C;IAC7C,mBAAmB,EAAE,OAAO,CAAA;IAC5B,0CAA0C;IAC1C,oBAAoB,EAAE,GAAG,CAAA;IACzB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,uDAAuD;IACvD,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CACtC,YAAY,EAAE,mBAAmB,EACjC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,cAAc,CAAC,CAuDzB"}
+{"version":3,"file":"exact.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/exact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAA;AAGpD,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAA;AAa3B,MAAM,WAAW,kBAAkB;IACjC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,oBAAoB,EAAE,GAAG,CAAA;IACzB,6DAA6D;IAC7D,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,EAAE,kBAAkB,EAC/B,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,oBAAoB,CAAC,CAuD/B"}

package/dist/x402/wallets/smart-account/exact.js

@@ -1,67 +1,57 @@
 import { toHex } from "viem";
 import { signERC3009Authorization } from "../../../smart-account/index.js";
-/**
- * Generates a random 32-byte nonce for use in authorization signatures
- */
+import { acceptedOf, amountOf, buildAuthorization, } from "../../envelopes.js";
+import { chainIdOf } from "./chain.js";
 function createNonce() {
     const cryptoObj = typeof globalThis.crypto !== "undefined" && typeof globalThis.crypto.getRandomValues === "function"
         ? globalThis.crypto
-        : // Dynamic require is needed to support node.js
+        : // Dynamic require for node.js compatibility.
             // eslint-disable-next-line @typescript-eslint/no-require-imports
             require("crypto").webcrypto;
     return toHex(cryptoObj.getRandomValues(new Uint8Array(32)));
 }
 /**
- * Creates a payment payload using the "exact" scheme with ERC-3009 USDC authorization
- *
- * This implements the x402 "exact" payment scheme, which uses USDC's transferWithAuthorization
- * (ERC-3009) to create signed payment authorizations. The signature is created using ERC-1271
- * from a smart account via the OwnableValidator module.
- *
- * @param requirements - Payment requirements from the x402 server
- * @param config - Configuration for the smart account wallet
- * @returns Payment payload ready to send to x402 server
- * @throws Error if payment requirements are invalid or signing fails
+ * Sign an `exact` instruction: ERC-3009 `transferWithAuthorization` via
+ * ERC-1271 with OwnableValidator. {@link buildAuthorization} packages the
+ * signed body for v1 or v2.
  */
-export async function createExactPayment(requirements, config) {
-    // Generate nonce and validity timestamps
+export async function createExactPayment(instruction, config) {
+    const accepted = acceptedOf(instruction);
+    const payTo = accepted.payTo;
+    const asset = accepted.asset;
     const nonce = createNonce();
-    const validAfter = BigInt(Math.floor(Date.now() / 1000) - 600); // 10 minutes before
-    const validBefore = BigInt(Math.floor(Date.now() / 1000) + requirements.maxTimeoutSeconds);
-    // Prepare authorization data for ERC-3009 signing
+    const now = Math.floor(Date.now() / 1000);
+    const validAfter = BigInt(now - 600); // 10 minutes of clock-skew tolerance
+    const validBefore = BigInt(now + accepted.maxTimeoutSeconds);
     const authData = {
         from: config.smartAccountAddress,
-        to: requirements.payTo,
-        value: BigInt(requirements.maxAmountRequired),
+        to: payTo,
+        value: BigInt(amountOf(instruction)),
         validAfter,
         validBefore,
         nonce,
     };
-    // Get domain params from requirements.extra (provided by server)
-    const domainName = requirements.extra?.name;
-    const domainVersion = requirements.extra?.version;
+    const domainName = accepted.extra?.name;
+    const domainVersion = accepted.extra?.version;
     if (!domainName || !domainVersion) {
-        throw new Error("requirements.extra must contain 'name' and 'version' for EIP-712 domain");
+        throw new Error("accepted.extra must contain 'name' and 'version' for EIP-712 domain");
+    }
+    const chainId = chainIdOf(instruction);
+    if (chainId === null) {
+        throw new Error(`Unsupported network "${accepted.network}" — use a known v1 name or CAIP-2 "eip155:N".`);
     }
-    // Sign using ERC-1271 with OwnableValidator
-    const signature = await signERC3009Authorization(config.sessionKeyPrivateKey, config.smartAccountAddress, authData, requirements.asset, config.chainId, config.validatorAddress, domainName, domainVersion);
-    // Construct payment payload matching x402 exact scheme format
-    const paymentPayload = {
-        x402Version: 1,
-        scheme: "exact",
-        network: requirements.network,
-        payload: {
-            signature: signature,
-            authorization: {
-                from: config.smartAccountAddress,
-                to: requirements.payTo,
-                value: requirements.maxAmountRequired,
-                validAfter: validAfter.toString(),
-                validBefore: validBefore.toString(),
-                nonce: nonce,
-            },
+    const signature = await signERC3009Authorization(config.sessionKeyPrivateKey, config.smartAccountAddress, authData, asset, chainId, config.validatorAddress, domainName, domainVersion);
+    const signedPayload = {
+        signature: signature,
+        authorization: {
+            from: config.smartAccountAddress,
+            to: payTo,
+            value: amountOf(instruction),
+            validAfter: validAfter.toString(),
+            validBefore: validBefore.toString(),
+            nonce: nonce,
         },
     };
-    return paymentPayload;
+    return buildAuthorization(instruction, signedPayload);
 }
 //# sourceMappingURL=exact.js.map

package/dist/x402/wallets/smart-account/exact.js.map

@@ -1 +1 @@
-{"version":3,"file":"exact.js","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/exact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA0B,MAAM,MAAM,CAAA;AAGpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAA;AAE1E;;GAEG;AACH,SAAS,WAAW;IAClB,MAAM,SAAS,GACb,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,eAAe,KAAK,UAAU;QACjG,CAAC,CAAC,UAAU,CAAC,MAAM;QACnB,CAAC,CAAC,+CAA+C;YAC/C,iEAAiE;YACjE,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAA;IACjC,OAAO,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAC7D,CAAC;AAgBD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,YAAiC,EACjC,MAA0B;IAE1B,yCAAyC;IACzC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAA;IAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,CAAA,CAAC,oBAAoB;IACnF,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAE1F,kDAAkD;IAClD,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,MAAM,CAAC,mBAAmB;QAChC,EAAE,EAAE,YAAY,CAAC,KAAgB;QACjC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,iBAAiB,CAAC;QAC7C,UAAU;QACV,WAAW;QACX,KAAK;KACN,CAAA;IAED,iEAAiE;IACjE,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,EAAE,IAA0B,CAAA;IACjE,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,EAAE,OAA6B,CAAA;IAEvE,IAAI,CAAC,UAAU,IAAI,CAAC,aAAa,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,yEAAyE,CAAC,CAAA;IAC5F,CAAC;IAED,4CAA4C;IAC5C,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,mBAAmB,EAC1B,QAAQ,EACR,YAAY,CAAC,KAAgB,EAC7B,MAAM,CAAC,OAAO,EACd,MAAM,CAAC,gBAAgB,EACvB,UAAU,EACV,aAAa,CACd,CAAA;IAED,8DAA8D;IAC9D,MAAM,cAAc,GAAmB;QACrC,WAAW,EAAE,CAAC;QACd,MAAM,EAAE,OAAgB;QACxB,OAAO,EAAE,YAAY,CAAC,OAAO;QAC7B,OAAO,EAAE;YACP,SAAS,EAAE,SAAmB;YAC9B,aAAa,EAAE;gBACb,IAAI,EAAE,MAAM,CAAC,mBAA6B;gBAC1C,EAAE,EAAE,YAAY,CAAC,KAAK;gBACtB,KAAK,EAAE,YAAY,CAAC,iBAAiB;gBACrC,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;gBACjC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;gBACnC,KAAK,EAAE,KAAe;aACvB;SACF;KACF,CAAA;IAED,OAAO,cAAc,CAAA;AACvB,CAAC"}
+{"version":3,"file":"exact.js","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/exact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAA0B,MAAM,MAAM,CAAA;AAEpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAA;AAC1E,OAAO,EACL,UAAU,EACV,QAAQ,EACR,kBAAkB,GAGnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,SAAS,WAAW;IAClB,MAAM,SAAS,GACb,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,eAAe,KAAK,UAAU;QACjG,CAAC,CAAC,UAAU,CAAC,MAAM;QACnB,CAAC,CAAC,6CAA6C;YAC7C,iEAAiE;YACjE,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAA;IACjC,OAAO,KAAK,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AAC7D,CAAC;AASD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAA+B,EAC/B,MAA0B;IAE1B,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAA;IACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAgB,CAAA;IACvC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAgB,CAAA;IAEvC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAA;IAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;IACzC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA,CAAC,qCAAqC;IAC1E,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAA;IAE5D,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,MAAM,CAAC,mBAAmB;QAChC,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACpC,UAAU;QACV,WAAW;QACX,KAAK;KACN,CAAA;IAED,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,EAAE,IAA0B,CAAA;IAC7D,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,EAAE,OAA6B,CAAA;IAEnE,IAAI,CAAC,UAAU,IAAI,CAAC,aAAa,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,qEAAqE,CAAC,CAAA;IACxF,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,CAAC,WAAW,CAAC,CAAA;IACtC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,CAAC,OAAO,+CAA+C,CAAC,CAAA;IAC1G,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,wBAAwB,CAC9C,MAAM,CAAC,oBAAoB,EAC3B,MAAM,CAAC,mBAAmB,EAC1B,QAAQ,EACR,KAAK,EACL,OAAO,EACP,MAAM,CAAC,gBAAgB,EACvB,UAAU,EACV,aAAa,CACd,CAAA;IAED,MAAM,aAAa,GAAG;QACpB,SAAS,EAAE,SAAmB;QAC9B,aAAa,EAAE;YACb,IAAI,EAAE,MAAM,CAAC,mBAA6B;YAC1C,EAAE,EAAE,KAAe;YACnB,KAAK,EAAE,QAAQ,CAAC,WAAW,CAAC;YAC5B,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;YACjC,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;YACnC,KAAK,EAAE,KAAe;SACvB;KACF,CAAA;IAED,OAAO,kBAAkB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;AACvD,CAAC"}

package/dist/x402/wallets/smart-account/wallet.d.ts

@@ -1,56 +1,23 @@
 import { type Address, type Hex } from "viem";
-import type { PaymentPayload, PaymentRequirements } from "x402/types";
+import { type PaymentAuthorization, type PaymentInstruction } from "../../envelopes.ts";
 import type { ServerAuthorizationData } from "../../types.ts";
 import { type X402Wallet } from "../../wallet.ts";
-/**
- * Configuration for SmartAccountWallet
- */
 export interface SmartAccountConfig {
-    /** Smart account address */
     smartAccountAddress: Address;
-    /** Session key private key for signing */
     sessionKeyPrivateKey: Hex;
-    /** Chain ID for the blockchain network */
-    chainId: number;
-    /** OwnableValidator address (defaults to standard OwnableValidator) */
+    /** OwnableValidator address. Defaults to the standard OwnableValidator. */
     validatorAddress?: Address;
-    /** CoSignerValidator address (defaults to standard CoSignerValidator) */
+    /** CoSignerValidator address. Defaults to the standard CoSignerValidator. */
     coSignerValidatorAddress?: Address;
 }
 /**
- * SmartAccountWallet - Smart account wallet implementation using ERC-1271
- *
- * Creates payment payloads signed by a smart account using ERC-1271 standard.
- * Supports Safe accounts with OwnableValidator module.
- * Only supports the "exact" payment scheme with ERC-3009 (USDC) authorizations.
- *
- * @example
- * ```typescript
- * const wallet = new SmartAccountWallet({
- *   smartAccountAddress: "0x...",  // Smart account address
- *   sessionKeyPrivateKey: "0x...",  // Session key
- *   chainId: 84532,  // Base Sepolia
- *   validatorAddress: "0x..."  // OwnableValidator (optional, defaults to standard validator)
- * })
- *
- * const payment = await wallet.createPayment(requirements)
- * ```
+ * Smart account wallet using ERC-1271. Supports Safe accounts with the
+ * OwnableValidator module and only the `exact` scheme (ERC-3009 / USDC).
  */
 export declare class SmartAccountWallet implements X402Wallet {
     private readonly config;
     constructor(config: SmartAccountConfig);
-    /**
-     * Creates a payment payload from requirements.
-     * Only supports "exact" payment scheme with ERC-3009 authorizations.
-     *
-     * @param requirements Payment requirements from x402
-     * @param serverAuthorization Optional server co-signature data for co-signed keys
-     * @returns Payment payload ready to submit
-     */
-    createPayment(requirements: PaymentRequirements, serverAuthorization?: ServerAuthorizationData): Promise<PaymentPayload>;
-    /**
-     * Returns the smart account address
-     */
+    createPayment(instruction: PaymentInstruction, serverAuthorization?: ServerAuthorizationData): Promise<PaymentAuthorization>;
     get address(): Address;
 }
 //# sourceMappingURL=wallet.d.ts.map

package/dist/x402/wallets/smart-account/wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAGrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAI9D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,4BAA4B;IAC5B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,0CAA0C;IAC1C,oBAAoB,EAAE,GAAG,CAAA;IACzB,0CAA0C;IAC1C,OAAO,EAAE,MAAM,CAAA;IACf,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,yEAAyE;IACzE,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,kBAAmB,YAAW,UAAU;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuF;gBAElG,MAAM,EAAE,kBAAkB;IAStC;;;;;;;OAOG;IACG,aAAa,CACjB,YAAY,EAAE,mBAAmB,EACjC,mBAAmB,CAAC,EAAE,uBAAuB,GAC5C,OAAO,CAAC,cAAc,CAAC;IAuB1B;;OAEG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;CACF"}
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../../../../src/x402/wallets/smart-account/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAA;AAG7C,OAAO,EAAc,KAAK,oBAAoB,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACnG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,EAAe,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAI9D,MAAM,WAAW,kBAAkB;IACjC,mBAAmB,EAAE,OAAO,CAAA;IAC5B,oBAAoB,EAAE,GAAG,CAAA;IACzB,2EAA2E;IAC3E,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,6EAA6E;IAC7E,wBAAwB,CAAC,EAAE,OAAO,CAAA;CACnC;AAED;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,UAAU;IACnD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuF;gBAElG,MAAM,EAAE,kBAAkB;IAQhC,aAAa,CACjB,WAAW,EAAE,kBAAkB,EAC/B,mBAAmB,CAAC,EAAE,uBAAuB,GAC5C,OAAO,CAAC,oBAAoB,CAAC;IAmBhC,IAAI,OAAO,IAAI,OAAO,CAErB;CACF"}