@axonfi/sdk 0.1.2 → 0.2.0

package/dist/index.d.cts

@@ -210,7 +210,7 @@ declare function getTokenSymbolByAddress(address: string): string | null;
  *
  * @throws if the symbol has no address on the given chain.
  */
-declare function resolveToken(token: Address | Token, chainId: number): Address;
+declare function resolveToken(token: Address | Token | KnownTokenSymbol, chainId: number): Address;
 
 /**
  * keccak256 of the PaymentIntent type string — used for manual digest
@@ -321,6 +321,20 @@ declare const RELAYER_API: {
     readonly TOS_ACCEPT: "/v1/tos/accept";
 };
 
+/**
+ * Accepts any way to identify a token:
+ * - `Address` ('0x...') — raw contract address
+ * - `Token` enum (Token.USDC) — type-safe symbol
+ * - `KnownTokenSymbol` string ('USDC') — bare string shorthand
+ */
+type TokenInput = Address | Token | KnownTokenSymbol;
+/**
+ * Accepts amounts in any format:
+ * - `bigint` — raw base units (e.g. 5_000_000n for 5 USDC). Passed through as-is.
+ * - `number` — human-readable (e.g. 5.2 for 5.2 USDC). SDK converts using token decimals.
+ * - `string` — human-readable string (e.g. '5.2'). Recommended for computed values to avoid float precision issues.
+ */
+type AmountInput = bigint | number | string;
 /** Rolling window spending limit. Stored on-chain, enforced by relayer. */
 interface SpendingLimit {
     /** Max spend in this window (token base units, e.g. USDC has 6 decimals). */
@@ -398,10 +412,10 @@ interface PaymentIntent {
 interface PayInput {
     /** Payment recipient. */
     to: Address;
-    /** Desired output token — an address or a Token enum symbol (e.g. Token.USDC). */
-    token: Address | Token;
-    /** Amount in token base units. For USDC: 1 USDC = 1_000_000n. */
-    amount: bigint;
+    /** Desired output token — an address, Token enum, or bare symbol string ('USDC'). */
+    token: TokenInput;
+    /** Amount: bigint (raw base units), number (human-readable), or string (human-readable). */
+    amount: AmountInput;
     /**
      * Human-readable payment description. Stored in relayer's PostgreSQL.
      * Gets keccak256-hashed to populate the on-chain `ref` field.
@@ -497,10 +511,10 @@ interface ExecuteInput {
     protocol: Address;
     /** The actual calldata bytes to send to the protocol. */
     callData: Hex;
-    /** Token to approve to the protocol — an address or a Token enum symbol. */
-    token: Address | Token;
-    /** Amount to approve (in token base units). */
-    amount: bigint;
+    /** 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;
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /**
@@ -516,20 +530,20 @@ interface ExecuteInput {
     deadline?: bigint;
     /** Arbitrary metadata stored off-chain. */
     metadata?: Record<string, string>;
-    /** Source token for pre-swap (relayer resolves automatically if omitted). */
-    fromToken?: Address;
-    /** Max input for pre-swap. */
-    maxFromAmount?: bigint;
+    /** 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
  * the relayer's POST /v1/swap endpoint.
  */
 interface SwapInput {
-    /** Desired output token — an address or a Token enum symbol. */
-    toToken: Address | Token;
-    /** Minimum output amount (slippage floor). */
-    minToAmount: bigint;
+    /** Desired output token — an address, Token enum, or bare symbol string ('WETH'). */
+    toToken: TokenInput;
+    /** Minimum output amount (slippage floor): bigint (raw), number (human), or string (human). */
+    minToAmount: AmountInput;
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /** Override ref bytes32 directly. */
@@ -538,10 +552,10 @@ interface SwapInput {
     idempotencyKey?: string;
     /** Intent expiry (defaults to 5 min). */
     deadline?: bigint;
-    /** Source token to swap from. */
-    fromToken?: Address;
-    /** Max input amount for swap. */
-    maxFromAmount?: bigint;
+    /** Source token to swap from — an address, Token enum, or bare symbol string. */
+    fromToken?: TokenInput;
+    /** Max input amount for swap: bigint (raw), number (human), or string (human). */
+    maxFromAmount?: AmountInput;
 }
 /** Possible statuses returned by the relayer. */
 type PaymentStatus = 'approved' | 'pending_review' | 'rejected';
@@ -627,8 +641,8 @@ interface AxonClientConfig {
  *
  * const result = await client.pay({
  *   to: '0x...recipient...',
- *   token: USDC[84532],
- *   amount: 5_000_000n,       // 5 USDC
+ *   token: 'USDC',
+ *   amount: 5,                // 5 USDC — SDK handles decimals
  *   memo: 'API call #1234 — weather data',
  * })
  *
@@ -901,6 +915,40 @@ declare function encryptKeystore(privateKey: Hex, passphrase: string): Promise<K
  */
 declare function decryptKeystore(keystore: KeystoreV3 | string, passphrase: string): Promise<Hex>;
 
+/**
+ * Look up decimals for a token by symbol, Token enum, or address.
+ *
+ * @param token - A KnownTokenSymbol ('USDC'), Token enum (Token.USDC), or address ('0x...')
+ * @param chainId - Optional chain ID (unused for decimal lookup, but reserved for future use)
+ * @returns The number of decimals for the token
+ * @throws If the token is an unknown address with no entry in KNOWN_TOKENS
+ */
+declare function resolveTokenDecimals(token: Address | Token | KnownTokenSymbol, chainId?: number): number;
+/**
+ * Convert a human-friendly amount to raw base units (bigint).
+ *
+ * - **bigint** → passed through as-is (already in base units)
+ * - **number** → converted to string, then parsed via `parseUnits(str, decimals)`
+ * - **string** → parsed directly via `parseUnits(str, decimals)`
+ *
+ * @param amount - The amount as bigint (raw), number (human), or string (human)
+ * @param token - Token identifier used to look up decimals (symbol, enum, or address)
+ * @param chainId - Optional chain ID (passed to resolveTokenDecimals)
+ * @returns The amount in token base units as bigint
+ *
+ * @example
+ * ```ts
+ * parseAmount(5_000_000n, 'USDC')     // 5000000n (passthrough)
+ * parseAmount(5.2, 'USDC')            // 5200000n
+ * parseAmount('5.2', 'USDC')          // 5200000n
+ * parseAmount(0.001, 'WETH')          // 1000000000000000n
+ * ```
+ *
+ * @throws If the amount has more decimal places than the token supports
+ * @throws If the token is unknown and amount is not bigint
+ */
+declare function parseAmount(amount: bigint | number | string, token: Address | Token | KnownTokenSymbol, chainId?: number): bigint;
+
 declare const AxonVaultAbi: readonly [{
     readonly type: "constructor";
     readonly inputs: readonly [{
@@ -2998,4 +3046,4 @@ declare const AxonRegistryAbi: readonly [{
     readonly inputs: readonly [];
 }];
 
-export { AxonClient, type AxonClientConfig, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, type BotConfig, type BotConfigParams, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, type DestinationCheckResult, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, type ExecuteInput, type ExecuteIntent, KNOWN_TOKENS, type KeystoreV3, type KnownToken, type KnownTokenSymbol, NATIVE_ETH, type OperatorCeilings, PAYMENT_INTENT_TYPEHASH, type PayInput, PaymentErrorCode, type PaymentIntent, type PaymentResult, type PaymentStatus, RELAYER_API, type RebalanceTokensResult, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, type SpendingLimit, type SupportedChainId, type SwapInput, type SwapIntent, Token, type TosStatus, USDC, type VaultInfo, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, resolveToken, signExecuteIntent, signPayment, signSwapIntent };
+export { type AmountInput, AxonClient, type AxonClientConfig, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, type BotConfig, type BotConfigParams, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, type DestinationCheckResult, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, type ExecuteInput, type ExecuteIntent, KNOWN_TOKENS, type KeystoreV3, type KnownToken, type KnownTokenSymbol, NATIVE_ETH, type OperatorCeilings, PAYMENT_INTENT_TYPEHASH, type PayInput, PaymentErrorCode, type PaymentIntent, type PaymentResult, type PaymentStatus, RELAYER_API, type RebalanceTokensResult, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, type SpendingLimit, type SupportedChainId, type SwapInput, type SwapIntent, Token, type TokenInput, type TosStatus, USDC, type VaultInfo, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, parseAmount, resolveToken, resolveTokenDecimals, signExecuteIntent, signPayment, signSwapIntent };

package/dist/index.d.ts

@@ -210,7 +210,7 @@ declare function getTokenSymbolByAddress(address: string): string | null;
  *
  * @throws if the symbol has no address on the given chain.
  */
-declare function resolveToken(token: Address | Token, chainId: number): Address;
+declare function resolveToken(token: Address | Token | KnownTokenSymbol, chainId: number): Address;
 
 /**
  * keccak256 of the PaymentIntent type string — used for manual digest
@@ -321,6 +321,20 @@ declare const RELAYER_API: {
     readonly TOS_ACCEPT: "/v1/tos/accept";
 };
 
+/**
+ * Accepts any way to identify a token:
+ * - `Address` ('0x...') — raw contract address
+ * - `Token` enum (Token.USDC) — type-safe symbol
+ * - `KnownTokenSymbol` string ('USDC') — bare string shorthand
+ */
+type TokenInput = Address | Token | KnownTokenSymbol;
+/**
+ * Accepts amounts in any format:
+ * - `bigint` — raw base units (e.g. 5_000_000n for 5 USDC). Passed through as-is.
+ * - `number` — human-readable (e.g. 5.2 for 5.2 USDC). SDK converts using token decimals.
+ * - `string` — human-readable string (e.g. '5.2'). Recommended for computed values to avoid float precision issues.
+ */
+type AmountInput = bigint | number | string;
 /** Rolling window spending limit. Stored on-chain, enforced by relayer. */
 interface SpendingLimit {
     /** Max spend in this window (token base units, e.g. USDC has 6 decimals). */
@@ -398,10 +412,10 @@ interface PaymentIntent {
 interface PayInput {
     /** Payment recipient. */
     to: Address;
-    /** Desired output token — an address or a Token enum symbol (e.g. Token.USDC). */
-    token: Address | Token;
-    /** Amount in token base units. For USDC: 1 USDC = 1_000_000n. */
-    amount: bigint;
+    /** Desired output token — an address, Token enum, or bare symbol string ('USDC'). */
+    token: TokenInput;
+    /** Amount: bigint (raw base units), number (human-readable), or string (human-readable). */
+    amount: AmountInput;
     /**
      * Human-readable payment description. Stored in relayer's PostgreSQL.
      * Gets keccak256-hashed to populate the on-chain `ref` field.
@@ -497,10 +511,10 @@ interface ExecuteInput {
     protocol: Address;
     /** The actual calldata bytes to send to the protocol. */
     callData: Hex;
-    /** Token to approve to the protocol — an address or a Token enum symbol. */
-    token: Address | Token;
-    /** Amount to approve (in token base units). */
-    amount: bigint;
+    /** 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;
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /**
@@ -516,20 +530,20 @@ interface ExecuteInput {
     deadline?: bigint;
     /** Arbitrary metadata stored off-chain. */
     metadata?: Record<string, string>;
-    /** Source token for pre-swap (relayer resolves automatically if omitted). */
-    fromToken?: Address;
-    /** Max input for pre-swap. */
-    maxFromAmount?: bigint;
+    /** 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
  * the relayer's POST /v1/swap endpoint.
  */
 interface SwapInput {
-    /** Desired output token — an address or a Token enum symbol. */
-    toToken: Address | Token;
-    /** Minimum output amount (slippage floor). */
-    minToAmount: bigint;
+    /** Desired output token — an address, Token enum, or bare symbol string ('WETH'). */
+    toToken: TokenInput;
+    /** Minimum output amount (slippage floor): bigint (raw), number (human), or string (human). */
+    minToAmount: AmountInput;
     /** Human-readable description. Gets keccak256-hashed to ref. */
     memo?: string;
     /** Override ref bytes32 directly. */
@@ -538,10 +552,10 @@ interface SwapInput {
     idempotencyKey?: string;
     /** Intent expiry (defaults to 5 min). */
     deadline?: bigint;
-    /** Source token to swap from. */
-    fromToken?: Address;
-    /** Max input amount for swap. */
-    maxFromAmount?: bigint;
+    /** Source token to swap from — an address, Token enum, or bare symbol string. */
+    fromToken?: TokenInput;
+    /** Max input amount for swap: bigint (raw), number (human), or string (human). */
+    maxFromAmount?: AmountInput;
 }
 /** Possible statuses returned by the relayer. */
 type PaymentStatus = 'approved' | 'pending_review' | 'rejected';
@@ -627,8 +641,8 @@ interface AxonClientConfig {
  *
  * const result = await client.pay({
  *   to: '0x...recipient...',
- *   token: USDC[84532],
- *   amount: 5_000_000n,       // 5 USDC
+ *   token: 'USDC',
+ *   amount: 5,                // 5 USDC — SDK handles decimals
  *   memo: 'API call #1234 — weather data',
  * })
  *
@@ -901,6 +915,40 @@ declare function encryptKeystore(privateKey: Hex, passphrase: string): Promise<K
  */
 declare function decryptKeystore(keystore: KeystoreV3 | string, passphrase: string): Promise<Hex>;
 
+/**
+ * Look up decimals for a token by symbol, Token enum, or address.
+ *
+ * @param token - A KnownTokenSymbol ('USDC'), Token enum (Token.USDC), or address ('0x...')
+ * @param chainId - Optional chain ID (unused for decimal lookup, but reserved for future use)
+ * @returns The number of decimals for the token
+ * @throws If the token is an unknown address with no entry in KNOWN_TOKENS
+ */
+declare function resolveTokenDecimals(token: Address | Token | KnownTokenSymbol, chainId?: number): number;
+/**
+ * Convert a human-friendly amount to raw base units (bigint).
+ *
+ * - **bigint** → passed through as-is (already in base units)
+ * - **number** → converted to string, then parsed via `parseUnits(str, decimals)`
+ * - **string** → parsed directly via `parseUnits(str, decimals)`
+ *
+ * @param amount - The amount as bigint (raw), number (human), or string (human)
+ * @param token - Token identifier used to look up decimals (symbol, enum, or address)
+ * @param chainId - Optional chain ID (passed to resolveTokenDecimals)
+ * @returns The amount in token base units as bigint
+ *
+ * @example
+ * ```ts
+ * parseAmount(5_000_000n, 'USDC')     // 5000000n (passthrough)
+ * parseAmount(5.2, 'USDC')            // 5200000n
+ * parseAmount('5.2', 'USDC')          // 5200000n
+ * parseAmount(0.001, 'WETH')          // 1000000000000000n
+ * ```
+ *
+ * @throws If the amount has more decimal places than the token supports
+ * @throws If the token is unknown and amount is not bigint
+ */
+declare function parseAmount(amount: bigint | number | string, token: Address | Token | KnownTokenSymbol, chainId?: number): bigint;
+
 declare const AxonVaultAbi: readonly [{
     readonly type: "constructor";
     readonly inputs: readonly [{
@@ -2998,4 +3046,4 @@ declare const AxonRegistryAbi: readonly [{
     readonly inputs: readonly [];
 }];
 
-export { AxonClient, type AxonClientConfig, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, type BotConfig, type BotConfigParams, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, type DestinationCheckResult, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, type ExecuteInput, type ExecuteIntent, KNOWN_TOKENS, type KeystoreV3, type KnownToken, type KnownTokenSymbol, NATIVE_ETH, type OperatorCeilings, PAYMENT_INTENT_TYPEHASH, type PayInput, PaymentErrorCode, type PaymentIntent, type PaymentResult, type PaymentStatus, RELAYER_API, type RebalanceTokensResult, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, type SpendingLimit, type SupportedChainId, type SwapInput, type SwapIntent, Token, type TosStatus, USDC, type VaultInfo, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, resolveToken, signExecuteIntent, signPayment, signSwapIntent };
+export { type AmountInput, AxonClient, type AxonClientConfig, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, type BotConfig, type BotConfigParams, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, type DestinationCheckResult, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, type ExecuteInput, type ExecuteIntent, KNOWN_TOKENS, type KeystoreV3, type KnownToken, type KnownTokenSymbol, NATIVE_ETH, type OperatorCeilings, PAYMENT_INTENT_TYPEHASH, type PayInput, PaymentErrorCode, type PaymentIntent, type PaymentResult, type PaymentStatus, RELAYER_API, type RebalanceTokensResult, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, type SpendingLimit, type SupportedChainId, type SwapInput, type SwapIntent, Token, type TokenInput, type TosStatus, USDC, type VaultInfo, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, parseAmount, resolveToken, resolveTokenDecimals, signExecuteIntent, signPayment, signSwapIntent };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { keccak256, stringToBytes, createPublicClient, http, createWalletClient } from 'viem';
+import { keccak256, stringToBytes, createPublicClient, http, createWalletClient, parseUnits } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { arbitrumSepolia, arbitrum, baseSepolia, base } from 'viem/chains';
 import { scryptAsync } from '@noble/hashes/scrypt';
@@ -3005,6 +3005,42 @@ function resolveToken(token, chainId) {
   }
   return addr;
 }
+function resolveTokenDecimals(token, chainId) {
+  if (typeof token === "string" && token.startsWith("0x")) {
+    const symbol = getTokenSymbolByAddress(token);
+    if (!symbol) {
+      throw new Error(
+        `Unknown token address ${token} \u2014 cannot determine decimals. Use a bigint amount instead, or pass a known token symbol.`
+      );
+    }
+    const entry2 = KNOWN_TOKENS[symbol];
+    return entry2.decimals;
+  }
+  const entry = KNOWN_TOKENS[token];
+  if (!entry) {
+    throw new Error(
+      `Unknown token symbol "${token}" \u2014 cannot determine decimals. Use a bigint amount instead, or use a known symbol (${Object.keys(KNOWN_TOKENS).join(", ")}).`
+    );
+  }
+  return entry.decimals;
+}
+function parseAmount(amount, token, chainId) {
+  if (typeof amount === "bigint") {
+    return amount;
+  }
+  const decimals = resolveTokenDecimals(token);
+  const str = typeof amount === "number" ? amount.toString() : amount;
+  const dotIndex = str.indexOf(".");
+  if (dotIndex !== -1) {
+    const decimalPlaces = str.length - dotIndex - 1;
+    if (decimalPlaces > decimals) {
+      throw new Error(
+        `Amount "${str}" has ${decimalPlaces} decimal places, but ${typeof token === "string" && token.startsWith("0x") ? "this token" : token} only supports ${decimals}. Truncate or round your amount.`
+      );
+    }
+  }
+  return parseUnits(str, decimals);
+}
 
 // src/utils.ts
 function generateUuid() {
@@ -3282,7 +3318,7 @@ Timestamp: ${timestamp}`;
       bot: this.botAddress,
       to: input.to,
       token: resolveToken(input.token, this.chainId),
-      amount: input.amount,
+      amount: parseAmount(input.amount, input.token, this.chainId),
       deadline: input.deadline ?? this._defaultDeadline(),
       ref: this._resolveRef(input.memo, input.ref)
     };
@@ -3293,7 +3329,7 @@ Timestamp: ${timestamp}`;
       protocol: input.protocol,
       calldataHash: keccak256(input.callData),
       token: resolveToken(input.token, this.chainId),
-      amount: input.amount,
+      amount: parseAmount(input.amount, input.token, this.chainId),
       deadline: input.deadline ?? this._defaultDeadline(),
       ref: this._resolveRef(input.memo, input.ref)
     };
@@ -3302,7 +3338,7 @@ Timestamp: ${timestamp}`;
     return {
       bot: this.botAddress,
       toToken: resolveToken(input.toToken, this.chainId),
-      minToAmount: input.minToAmount,
+      minToAmount: parseAmount(input.minToAmount, input.toToken, this.chainId),
       deadline: input.deadline ?? this._defaultDeadline(),
       ref: this._resolveRef(input.memo, input.ref)
     };
@@ -3334,6 +3370,8 @@ 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,
@@ -3349,8 +3387,8 @@ Timestamp: ${timestamp}`;
       // Protocol calldata
       callData: input.callData,
       // Optional pre-swap
-      ...input.fromToken !== void 0 && { fromToken: input.fromToken },
-      ...input.maxFromAmount !== void 0 && { maxFromAmount: input.maxFromAmount.toString() },
+      ...fromToken !== void 0 && { fromToken },
+      ...maxFromAmount !== void 0 && { maxFromAmount: maxFromAmount.toString() },
       // Off-chain metadata
       idempotencyKey,
       ...input.memo !== void 0 && { memo: input.memo },
@@ -3361,6 +3399,8 @@ Timestamp: ${timestamp}`;
   }
   async _submitSwap(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.toToken, this.chainId) : void 0;
     const body = {
       chainId: this.chainId,
       vaultAddress: this.vaultAddress,
@@ -3372,8 +3412,8 @@ Timestamp: ${timestamp}`;
       ref: intent.ref,
       signature,
       // Optional source token
-      ...input.fromToken !== void 0 && { fromToken: input.fromToken },
-      ...input.maxFromAmount !== void 0 && { maxFromAmount: input.maxFromAmount.toString() },
+      ...fromToken !== void 0 && { fromToken },
+      ...maxFromAmount !== void 0 && { maxFromAmount: maxFromAmount.toString() },
       // Off-chain metadata
       idempotencyKey,
       ...input.memo !== void 0 && { memo: input.memo }
@@ -3883,6 +3923,6 @@ var AxonRegistryAbi = [
   }
 ];
 
-export { AxonClient, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, KNOWN_TOKENS, NATIVE_ETH, PAYMENT_INTENT_TYPEHASH, PaymentErrorCode, RELAYER_API, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, Token, USDC, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, resolveToken, signExecuteIntent, signPayment, signSwapIntent };
+export { AxonClient, AxonRegistryAbi, AxonVaultAbi, AxonVaultFactoryAbi, CHAIN_NAMES, Chain, DEFAULT_DEADLINE_SECONDS, EIP712_DOMAIN_NAME, EIP712_DOMAIN_VERSION, EXECUTE_INTENT_TYPEHASH, EXPLORER_ADDR, EXPLORER_TX, KNOWN_TOKENS, NATIVE_ETH, PAYMENT_INTENT_TYPEHASH, PaymentErrorCode, RELAYER_API, SUPPORTED_CHAIN_IDS, SWAP_INTENT_TYPEHASH, Token, USDC, WINDOW, createAxonPublicClient, createAxonWalletClient, decryptKeystore, deployVault, encodeRef, encryptKeystore, getBotConfig, getChain, getDomainSeparator, getKnownTokensForChain, getOperatorCeilings, getRebalanceTokenCount, getTokenSymbolByAddress, getTrackUsedIntents, getVaultOperator, getVaultOwner, getVaultVersion, isBotActive, isDestinationAllowed, isRebalanceTokenWhitelisted, isVaultPaused, operatorMaxDrainPerDay, parseAmount, resolveToken, resolveTokenDecimals, signExecuteIntent, signPayment, signSwapIntent };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map