@axonfi/sdk 0.8.0 → 0.10.0

package/dist/index.d.cts

@@ -499,10 +499,10 @@ interface PayInput {
  * Signed execute intent for DeFi protocol interactions.
  *
  * The bot signs this struct using EIP-712. The relayer submits it to
- * executeProtocol() on-chain. The contract approves `token` to `protocol`,
- * calls it with `callData`, then revokes the approval.
+ * executeProtocol() on-chain. The contract approves `tokens` to `protocol`,
+ * calls it with `callData`, then revokes the approvals.
  *
- * TypeHash: keccak256("ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address token,uint256 amount,uint256 value,address[] extraTokens,uint256[] extraAmounts,uint256 deadline,bytes32 ref)")
+ * TypeHash: keccak256("ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address[] tokens,uint256[] amounts,uint256 value,uint256 deadline,bytes32 ref)")
  */
 interface ExecuteIntent {
     /** Bot's own address. Must be registered in the vault. */
@@ -511,16 +511,12 @@ interface ExecuteIntent {
     protocol: Address;
     /** keccak256 of the callData bytes. Verified by relayer before submission. */
     calldataHash: Hex;
-    /** Token to approve to the protocol before calling. */
-    token: Address;
-    /** Amount to approve (in token base units). */
-    amount: bigint;
+    /** Tokens to approve to the protocol (e.g. [USDC, WETH] for GMX). Empty = no approvals. */
+    tokens: Address[];
+    /** Approval amounts for each token (must match tokens length). */
+    amounts: bigint[];
     /** Native ETH to send with the protocol call (e.g. WETH.deposit, Lido.submit). 0 = no ETH. */
     value: bigint;
-    /** Additional tokens to approve to the SAME protocol (e.g. WETH for GMX execution fee). Bot-signed. */
-    extraTokens: Address[];
-    /** Approval amounts for each extra token. Must match extraTokens length. */
-    extraAmounts: bigint[];
     /** Unix timestamp after which this intent is invalid. */
     deadline: bigint;
     /** keccak256 of the off-chain memo. Full memo text stored by relayer. */
@@ -555,16 +551,19 @@ interface ExecuteInput {
     protocol: Address;
     /** The actual calldata bytes to send to the protocol. */
     callData: Hex;
-    /** Token to approve to the protocol — an address, Token enum, or bare symbol string ('USDC'). */
-    token: TokenInput;
-    /** Amount to approve: bigint (raw base units), number (human-readable), or string (human-readable). */
-    amount: AmountInput;
+    /**
+     * Tokens to approve to the protocol. Each entry is an address, Token enum, or bare symbol string.
+     * Example: ['USDC'] for single token, ['USDC', 'WETH'] for multi-token (GMX).
+     * Empty or omitted = no token approvals (e.g. closing a position).
+     */
+    tokens?: TokenInput[];
+    /**
+     * Approval amounts for each token. Must match tokens length.
+     * Each entry: bigint (raw base units), number (human-readable), or string (human-readable).
+     */
+    amounts?: AmountInput[];
     /** Native ETH to send with the call (wei). Optional, defaults to 0. Used for payable functions like WETH.deposit() or Lido.submit(). */
     value?: bigint;
-    /** Additional tokens to approve to the protocol (e.g. WETH for GMX execution fee). Bot signs these. */
-    extraTokens?: Address[];
-    /** Approval amounts for each extra token (raw base units). Must match extraTokens length. */
-    extraAmounts?: bigint[];
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /**
@@ -580,10 +579,6 @@ interface ExecuteInput {
     deadline?: bigint;
     /** Arbitrary metadata stored off-chain. */
     metadata?: Record<string, string>;
-    /** Source token for pre-swap — an address, Token enum, or bare symbol string. */
-    fromToken?: TokenInput;
-    /** Max input for pre-swap: bigint (raw), number (human), or string (human). */
-    maxFromAmount?: AmountInput;
 }
 /**
  * Input for AxonClient.swap(). Signs a SwapIntent and submits to
@@ -621,6 +616,13 @@ interface PaymentResult {
     estimatedResolutionMs?: number;
     /** Rejection reason. Present when status === 'rejected'. */
     reason?: string;
+    /**
+     * Machine-readable error code. Present when status === 'rejected'.
+     * Notable values:
+     * - `'SWAP_REQUIRED'` — vault lacks the payment token. The SDK auto-handles
+     *   this by signing a SwapIntent and resubmitting.
+     */
+    errorCode?: string;
 }
 /** High-level vault info returned by AxonClient.getVaultInfo(). */
 interface VaultInfo {
@@ -798,6 +800,10 @@ declare class AxonClient {
      * - `"approved"`: fast path — txHash available immediately
      * - `"pending_review"`: AI scan or human review in progress — poll for status
      * - `"rejected"`: payment was rejected — reason field explains why
+     *
+     * If the vault doesn't hold enough of the payment token, the relayer returns
+     * `errorCode: 'SWAP_REQUIRED'`. The SDK automatically signs a SwapIntent and
+     * resubmits the payment with swap fields — no action needed from the caller.
      */
     pay(input: PayInput): Promise<PaymentResult>;
     /**
@@ -939,6 +945,7 @@ declare class AxonClient {
     private _buildPaymentIntent;
     private _buildExecuteIntent;
     private _buildSwapIntent;
+    private _submitPaymentWithSwap;
     private _submitPayment;
     private _submitExecute;
     private _submitSwap;
@@ -1681,25 +1688,17 @@ declare const AxonVaultAbi: readonly [{
             readonly type: "bytes32";
             readonly internalType: "bytes32";
         }, {
-            readonly name: "token";
-            readonly type: "address";
-            readonly internalType: "address";
-        }, {
-            readonly name: "amount";
-            readonly type: "uint256";
-            readonly internalType: "uint256";
-        }, {
-            readonly name: "value";
-            readonly type: "uint256";
-            readonly internalType: "uint256";
-        }, {
-            readonly name: "extraTokens";
+            readonly name: "tokens";
             readonly type: "address[]";
             readonly internalType: "address[]";
         }, {
-            readonly name: "extraAmounts";
+            readonly name: "amounts";
             readonly type: "uint256[]";
             readonly internalType: "uint256[]";
+        }, {
+            readonly name: "value";
+            readonly type: "uint256";
+            readonly internalType: "uint256";
         }, {
             readonly name: "deadline";
             readonly type: "uint256";
@@ -3142,6 +3141,10 @@ declare const AxonVaultAbi: readonly [{
     readonly type: "error";
     readonly name: "TooManySpendingLimits";
     readonly inputs: readonly [];
+}, {
+    readonly type: "error";
+    readonly name: "TooManyTokens";
+    readonly inputs: readonly [];
 }, {
     readonly type: "error";
     readonly name: "UnexpectedETH";

package/dist/index.d.ts

@@ -499,10 +499,10 @@ interface PayInput {
  * Signed execute intent for DeFi protocol interactions.
  *
  * The bot signs this struct using EIP-712. The relayer submits it to
- * executeProtocol() on-chain. The contract approves `token` to `protocol`,
- * calls it with `callData`, then revokes the approval.
+ * executeProtocol() on-chain. The contract approves `tokens` to `protocol`,
+ * calls it with `callData`, then revokes the approvals.
  *
- * TypeHash: keccak256("ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address token,uint256 amount,uint256 value,address[] extraTokens,uint256[] extraAmounts,uint256 deadline,bytes32 ref)")
+ * TypeHash: keccak256("ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address[] tokens,uint256[] amounts,uint256 value,uint256 deadline,bytes32 ref)")
  */
 interface ExecuteIntent {
     /** Bot's own address. Must be registered in the vault. */
@@ -511,16 +511,12 @@ interface ExecuteIntent {
     protocol: Address;
     /** keccak256 of the callData bytes. Verified by relayer before submission. */
     calldataHash: Hex;
-    /** Token to approve to the protocol before calling. */
-    token: Address;
-    /** Amount to approve (in token base units). */
-    amount: bigint;
+    /** Tokens to approve to the protocol (e.g. [USDC, WETH] for GMX). Empty = no approvals. */
+    tokens: Address[];
+    /** Approval amounts for each token (must match tokens length). */
+    amounts: bigint[];
     /** Native ETH to send with the protocol call (e.g. WETH.deposit, Lido.submit). 0 = no ETH. */
     value: bigint;
-    /** Additional tokens to approve to the SAME protocol (e.g. WETH for GMX execution fee). Bot-signed. */
-    extraTokens: Address[];
-    /** Approval amounts for each extra token. Must match extraTokens length. */
-    extraAmounts: bigint[];
     /** Unix timestamp after which this intent is invalid. */
     deadline: bigint;
     /** keccak256 of the off-chain memo. Full memo text stored by relayer. */
@@ -555,16 +551,19 @@ interface ExecuteInput {
     protocol: Address;
     /** The actual calldata bytes to send to the protocol. */
     callData: Hex;
-    /** Token to approve to the protocol — an address, Token enum, or bare symbol string ('USDC'). */
-    token: TokenInput;
-    /** Amount to approve: bigint (raw base units), number (human-readable), or string (human-readable). */
-    amount: AmountInput;
+    /**
+     * Tokens to approve to the protocol. Each entry is an address, Token enum, or bare symbol string.
+     * Example: ['USDC'] for single token, ['USDC', 'WETH'] for multi-token (GMX).
+     * Empty or omitted = no token approvals (e.g. closing a position).
+     */
+    tokens?: TokenInput[];
+    /**
+     * Approval amounts for each token. Must match tokens length.
+     * Each entry: bigint (raw base units), number (human-readable), or string (human-readable).
+     */
+    amounts?: AmountInput[];
     /** Native ETH to send with the call (wei). Optional, defaults to 0. Used for payable functions like WETH.deposit() or Lido.submit(). */
     value?: bigint;
-    /** Additional tokens to approve to the protocol (e.g. WETH for GMX execution fee). Bot signs these. */
-    extraTokens?: Address[];
-    /** Approval amounts for each extra token (raw base units). Must match extraTokens length. */
-    extraAmounts?: bigint[];
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /**
@@ -580,10 +579,6 @@ interface ExecuteInput {
     deadline?: bigint;
     /** Arbitrary metadata stored off-chain. */
     metadata?: Record<string, string>;
-    /** Source token for pre-swap — an address, Token enum, or bare symbol string. */
-    fromToken?: TokenInput;
-    /** Max input for pre-swap: bigint (raw), number (human), or string (human). */
-    maxFromAmount?: AmountInput;
 }
 /**
  * Input for AxonClient.swap(). Signs a SwapIntent and submits to
@@ -621,6 +616,13 @@ interface PaymentResult {
     estimatedResolutionMs?: number;
     /** Rejection reason. Present when status === 'rejected'. */
     reason?: string;
+    /**
+     * Machine-readable error code. Present when status === 'rejected'.
+     * Notable values:
+     * - `'SWAP_REQUIRED'` — vault lacks the payment token. The SDK auto-handles
+     *   this by signing a SwapIntent and resubmitting.
+     */
+    errorCode?: string;
 }
 /** High-level vault info returned by AxonClient.getVaultInfo(). */
 interface VaultInfo {
@@ -798,6 +800,10 @@ declare class AxonClient {
      * - `"approved"`: fast path — txHash available immediately
      * - `"pending_review"`: AI scan or human review in progress — poll for status
      * - `"rejected"`: payment was rejected — reason field explains why
+     *
+     * If the vault doesn't hold enough of the payment token, the relayer returns
+     * `errorCode: 'SWAP_REQUIRED'`. The SDK automatically signs a SwapIntent and
+     * resubmits the payment with swap fields — no action needed from the caller.
      */
     pay(input: PayInput): Promise<PaymentResult>;
     /**
@@ -939,6 +945,7 @@ declare class AxonClient {
     private _buildPaymentIntent;
     private _buildExecuteIntent;
     private _buildSwapIntent;
+    private _submitPaymentWithSwap;
     private _submitPayment;
     private _submitExecute;
     private _submitSwap;
@@ -1681,25 +1688,17 @@ declare const AxonVaultAbi: readonly [{
             readonly type: "bytes32";
             readonly internalType: "bytes32";
         }, {
-            readonly name: "token";
-            readonly type: "address";
-            readonly internalType: "address";
-        }, {
-            readonly name: "amount";
-            readonly type: "uint256";
-            readonly internalType: "uint256";
-        }, {
-            readonly name: "value";
-            readonly type: "uint256";
-            readonly internalType: "uint256";
-        }, {
-            readonly name: "extraTokens";
+            readonly name: "tokens";
             readonly type: "address[]";
             readonly internalType: "address[]";
         }, {
-            readonly name: "extraAmounts";
+            readonly name: "amounts";
             readonly type: "uint256[]";
             readonly internalType: "uint256[]";
+        }, {
+            readonly name: "value";
+            readonly type: "uint256";
+            readonly internalType: "uint256";
         }, {
             readonly name: "deadline";
             readonly type: "uint256";
@@ -3142,6 +3141,10 @@ declare const AxonVaultAbi: readonly [{
     readonly type: "error";
     readonly name: "TooManySpendingLimits";
     readonly inputs: readonly [];
+}, {
+    readonly type: "error";
+    readonly name: "TooManyTokens";
+    readonly inputs: readonly [];
 }, {
     readonly type: "error";
     readonly name: "UnexpectedETH";

package/dist/index.js

@@ -16,7 +16,7 @@ var PAYMENT_INTENT_TYPEHASH = keccak256(
 );
 var EXECUTE_INTENT_TYPEHASH = keccak256(
   stringToBytes(
-    "ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address token,uint256 amount,uint256 value,address[] extraTokens,uint256[] extraAmounts,uint256 deadline,bytes32 ref)"
+    "ExecuteIntent(address bot,address protocol,bytes32 calldataHash,address[] tokens,uint256[] amounts,uint256 value,uint256 deadline,bytes32 ref)"
   )
 );
 var SWAP_INTENT_TYPEHASH = keccak256(
@@ -151,11 +151,9 @@ var EXECUTE_INTENT_TYPES = {
     { name: "bot", type: "address" },
     { name: "protocol", type: "address" },
     { name: "calldataHash", type: "bytes32" },
-    { name: "token", type: "address" },
-    { name: "amount", type: "uint256" },
+    { name: "tokens", type: "address[]" },
+    { name: "amounts", type: "uint256[]" },
     { name: "value", type: "uint256" },
-    { name: "extraTokens", type: "address[]" },
-    { name: "extraAmounts", type: "uint256[]" },
     { name: "deadline", type: "uint256" },
     { name: "ref", type: "bytes32" }
   ]
@@ -209,11 +207,9 @@ async function signExecuteIntent(walletClient, vaultAddress, chainId, intent) {
       bot: intent.bot,
       protocol: intent.protocol,
       calldataHash: intent.calldataHash,
-      token: intent.token,
-      amount: intent.amount,
+      tokens: intent.tokens,
+      amounts: intent.amounts,
       value: intent.value,
-      extraTokens: intent.extraTokens,
-      extraAmounts: intent.extraAmounts,
       deadline: intent.deadline,
       ref: intent.ref
     }
@@ -724,30 +720,20 @@ var AxonVaultAbi = [
             "internalType": "bytes32"
           },
           {
-            "name": "token",
-            "type": "address",
-            "internalType": "address"
+            "name": "tokens",
+            "type": "address[]",
+            "internalType": "address[]"
           },
           {
-            "name": "amount",
-            "type": "uint256",
-            "internalType": "uint256"
+            "name": "amounts",
+            "type": "uint256[]",
+            "internalType": "uint256[]"
           },
           {
             "name": "value",
             "type": "uint256",
             "internalType": "uint256"
           },
-          {
-            "name": "extraTokens",
-            "type": "address[]",
-            "internalType": "address[]"
-          },
-          {
-            "name": "extraAmounts",
-            "type": "uint256[]",
-            "internalType": "uint256[]"
-          },
           {
             "name": "deadline",
             "type": "uint256",
@@ -2597,6 +2583,11 @@ var AxonVaultAbi = [
     "name": "TooManySpendingLimits",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "TooManyTokens",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "UnexpectedETH",
@@ -3982,11 +3973,30 @@ var AxonClient = class {
    * - `"approved"`: fast path — txHash available immediately
    * - `"pending_review"`: AI scan or human review in progress — poll for status
    * - `"rejected"`: payment was rejected — reason field explains why
+   *
+   * If the vault doesn't hold enough of the payment token, the relayer returns
+   * `errorCode: 'SWAP_REQUIRED'`. The SDK automatically signs a SwapIntent and
+   * resubmits the payment with swap fields — no action needed from the caller.
    */
   async pay(input) {
     const intent = this._buildPaymentIntent(input);
     const signature = await signPayment(this.walletClient, this.vaultAddress, this.chainId, intent);
-    return this._submitPayment(intent, signature, input);
+    const result = await this._submitPayment(intent, signature, input);
+    if (result.status === "rejected" && result.errorCode === "SWAP_REQUIRED") {
+      const swapIntent = {
+        bot: this.botAddress,
+        toToken: intent.token,
+        // swap TO the payment token
+        minToAmount: intent.amount,
+        // need at least the payment amount
+        deadline: intent.deadline,
+        // same deadline
+        ref: intent.ref
+      };
+      const swapSig = await signSwapIntent(this.walletClient, this.vaultAddress, this.chainId, swapIntent);
+      return this._submitPaymentWithSwap(intent, signature, input, swapIntent, swapSig);
+    }
+    return result;
   }
   // ============================================================================
   // execute()
@@ -4222,15 +4232,30 @@ Timestamp: ${timestamp}`;
   }
   _buildExecuteIntent(input) {
     _rejectBurnAddress(input.protocol, "Protocol address");
+    const inputTokens = input.tokens ?? [];
+    const inputAmounts = input.amounts ?? [];
+    if (inputTokens.length !== inputAmounts.length) {
+      throw new Error(`tokens length (${inputTokens.length}) must match amounts length (${inputAmounts.length})`);
+    }
+    if (inputTokens.length > 5) {
+      throw new Error(`Too many tokens (${inputTokens.length}): maximum 5 allowed. Contact Axon if you need more.`);
+    }
+    const resolvedTokens = inputTokens.map((t) => resolveToken(t, this.chainId));
+    const zeroAddr = "0x0000000000000000000000000000000000000000";
+    for (const t of resolvedTokens) {
+      if (t.toLowerCase() === zeroAddr) throw new Error("Zero address not allowed in tokens array");
+    }
+    const uniqueTokens = new Set(resolvedTokens.map((t) => t.toLowerCase()));
+    if (uniqueTokens.size !== resolvedTokens.length) {
+      throw new Error("Duplicate token addresses in tokens array");
+    }
     return {
       bot: this.botAddress,
       protocol: input.protocol,
       calldataHash: keccak256(input.callData),
-      token: resolveToken(input.token, this.chainId),
-      amount: parseAmount(input.amount, input.token, this.chainId),
+      tokens: resolvedTokens,
+      amounts: inputTokens.map((t, i) => parseAmount(inputAmounts[i], t, this.chainId)),
       value: input.value ?? 0n,
-      extraTokens: input.extraTokens ?? [],
-      extraAmounts: input.extraAmounts ?? [],
       deadline: input.deadline ?? this._defaultDeadline(),
       ref: this._resolveRef(input.memo, input.ref)
     };
@@ -4244,6 +4269,38 @@ Timestamp: ${timestamp}`;
       ref: this._resolveRef(input.memo, input.ref)
     };
   }
+  async _submitPaymentWithSwap(intent, signature, input, swapIntent, swapSignature) {
+    const idempotencyKey = generateUuid();
+    const body = {
+      // Routing
+      chainId: this.chainId,
+      vaultAddress: this.vaultAddress,
+      // Flat intent fields (matches relayer DTO)
+      bot: intent.bot,
+      to: intent.to,
+      token: intent.token,
+      amount: intent.amount.toString(),
+      deadline: intent.deadline.toString(),
+      ref: intent.ref,
+      signature,
+      // Swap fields
+      swapSignature,
+      swapToToken: swapIntent.toToken,
+      swapMinToAmount: swapIntent.minToAmount.toString(),
+      swapDeadline: swapIntent.deadline.toString(),
+      swapRef: swapIntent.ref,
+      // Off-chain metadata
+      idempotencyKey,
+      ...input.memo !== void 0 && { memo: input.memo },
+      ...input.resourceUrl !== void 0 && { resourceUrl: input.resourceUrl },
+      ...input.invoiceId !== void 0 && { invoiceId: input.invoiceId },
+      ...input.orderId !== void 0 && { orderId: input.orderId },
+      ...input.recipientLabel !== void 0 && { recipientLabel: input.recipientLabel },
+      ...input.metadata !== void 0 && { metadata: input.metadata },
+      ...input.x402Funding !== void 0 && { x402Funding: input.x402Funding }
+    };
+    return this._post(RELAYER_API.PAYMENTS, idempotencyKey, body);
+  }
   async _submitPayment(intent, signature, input) {
     const idempotencyKey = input.idempotencyKey ?? generateUuid();
     const body = {
@@ -4272,8 +4329,6 @@ Timestamp: ${timestamp}`;
   }
   async _submitExecute(intent, signature, input) {
     const idempotencyKey = input.idempotencyKey ?? generateUuid();
-    const fromToken = input.fromToken !== void 0 ? resolveToken(input.fromToken, this.chainId) : void 0;
-    const maxFromAmount = input.maxFromAmount !== void 0 ? parseAmount(input.maxFromAmount, input.fromToken ?? input.token, this.chainId) : void 0;
     const body = {
       chainId: this.chainId,
       vaultAddress: this.vaultAddress,
@@ -4281,17 +4336,14 @@ Timestamp: ${timestamp}`;
       bot: intent.bot,
       protocol: intent.protocol,
       calldataHash: intent.calldataHash,
-      token: intent.token,
-      amount: intent.amount.toString(),
+      tokens: intent.tokens,
+      amounts: intent.amounts.map((a) => a.toString()),
       value: intent.value.toString(),
       deadline: intent.deadline.toString(),
       ref: intent.ref,
       signature,
       // Protocol calldata
       callData: input.callData,
-      // Optional pre-swap
-      ...fromToken !== void 0 && { fromToken },
-      ...maxFromAmount !== void 0 && { maxFromAmount: maxFromAmount.toString() },
       // Off-chain metadata
       idempotencyKey,
       ...input.memo !== void 0 && { memo: input.memo },