@circle-fin/provider-cctp-v2 1.0.5 → 1.2.0

package/index.mjs

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2025, Circle Internet Group, Inc. All rights reserved.
+ * Copyright (c) 2026, Circle Internet Group, Inc. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -379,8 +379,11 @@ const ArcTestnet = defineChain({
     name: 'Arc Testnet',
     title: 'ArcTestnet',
     nativeCurrency: {
-        name: 'Arc',
-        symbol: 'Arc',
+        name: 'USDC',
+        symbol: 'USDC',
+        // Arc uses native USDC with 18 decimals for gas payments (EVM standard).
+        // Note: The ERC-20 USDC contract at usdcAddress uses 6 decimals.
+        // See: https://docs.arc.network/arc/references/contract-addresses
         decimals: 18,
     },
     chainId: 5042002,
@@ -3014,7 +3017,9 @@ const makeApiRequest = async (url, method, isValidType, config, body) => {
             signal: controller.signal,
         };
         // Add body for methods that support it
-        if (body !== undefined && ['POST', 'PUT', 'PATCH'].includes(method)) ;
+        if (body !== undefined && ['POST', 'PUT', 'PATCH'].includes(method)) {
+            requestInit.body = JSON.stringify(body);
+        }
         const response = await fetch(url, requestInit);
         clearTimeout(timeoutId);
         if (!response.ok) {
@@ -3192,6 +3197,30 @@ const pollApiWithValidation = async (url, method, isValidType, config = {}, body
 const pollApiGet = async (url, isValidType, config) => {
     return pollApiWithValidation(url, 'GET', isValidType, config);
 };
+/**
+ * Convenience function for making POST requests with validation.
+ *
+ * @typeParam TResponseType - The expected response type after validation
+ * @typeParam TBody - The type of the request body
+ * @param url - The API endpoint URL
+ * @param body - The request body
+ * @param isValidType - Type guard function to validate the response
+ * @param config - Optional configuration overrides
+ * @returns Promise resolving to the validated response
+ *
+ * @example
+ * ```typescript
+ * const result = await pollApiPost(
+ *   'https://api.example.com/submit',
+ *   { name: 'John', email: 'john@example.com' },
+ *   isSubmissionResponse,
+ *   { maxRetries: 3 }
+ * )
+ * ```
+ */
+const pollApiPost = async (url, body, isValidType, config) => {
+    return pollApiWithValidation(url, 'POST', isValidType, config, body);
+};
 
 /**
  * Valid recoverability values for error handling strategies.
@@ -3399,6 +3428,24 @@ function validateErrorDetails(details) {
  * stays within KitError's constraints.
  */
 const MAX_MESSAGE_LENGTH = 950;
+/**
+ * Standard error message for invalid amount format.
+ *
+ * The SDK enforces strict dot-decimal notation for amount values. This constant
+ * provides a consistent error message when users provide amounts with:
+ * - Comma decimals (e.g., "1,5")
+ * - Thousand separators (e.g., "1,000.50")
+ * - Non-numeric characters
+ * - Invalid format
+ */
+const AMOUNT_FORMAT_ERROR_MESSAGE = 'Amount must be a numeric string with dot (.) as decimal separator (e.g., "10.5", "100"), with no thousand separators or comma decimals';
+/**
+ * Error message for invalid maxFee format.
+ *
+ * Used when validating the maxFee configuration parameter. The maxFee can be zero
+ * or positive and must follow strict dot-decimal notation.
+ */
+const MAX_FEE_FORMAT_ERROR_MESSAGE = 'maxFee must be a numeric string with dot (.) as decimal separator (e.g., "1", "0.5", ".5", "1.5"), with no thousand separators or comma decimals';
 
 /**
  * Structured error class for Stablecoin Kit operations.
@@ -3594,6 +3641,12 @@ const BalanceError = {
         code: 9001,
         name: 'BALANCE_INSUFFICIENT_TOKEN',
         type: 'BALANCE',
+    },
+    /** Insufficient native token (ETH/SOL/etc) for gas fees */
+    INSUFFICIENT_GAS: {
+        code: 9002,
+        name: 'BALANCE_INSUFFICIENT_GAS',
+        type: 'BALANCE',
     }};
 
 /**
@@ -3816,7 +3869,7 @@ function createValidationErrorFromZod(zodError, context) {
  *
  * @param chain - The blockchain network where the balance check failed
  * @param token - The token symbol (e.g., 'USDC', 'ETH')
- * @param rawError - The original error from the underlying system (optional)
+ * @param trace - Optional trace context to include in error (can include rawError and additional debugging data)
  * @returns KitError with insufficient token balance details
  *
  * @example
@@ -3829,24 +3882,71 @@ function createValidationErrorFromZod(zodError, context) {
  *
  * @example
  * ```typescript
- * // With raw error for debugging
+ * // With trace context for debugging
  * try {
  *   await transfer(...)
  * } catch (error) {
- *   throw createInsufficientTokenBalanceError('Base', 'USDC', error)
+ *   throw createInsufficientTokenBalanceError('Base', 'USDC', {
+ *     rawError: error,
+ *     balance: '1000000',
+ *     amount: '5000000',
+ *   })
  * }
  * ```
  */
-function createInsufficientTokenBalanceError(chain, token, rawError) {
+function createInsufficientTokenBalanceError(chain, token, trace) {
     return new KitError({
         ...BalanceError.INSUFFICIENT_TOKEN,
         recoverability: 'FATAL',
         message: `Insufficient ${token} balance on ${chain}`,
         cause: {
             trace: {
+                ...trace,
                 chain,
                 token,
-                rawError,
+            },
+        },
+    });
+}
+/**
+ * Creates error for insufficient gas funds.
+ *
+ * This error is thrown when a wallet does not have enough native tokens
+ * (ETH, SOL, etc.) to pay for transaction gas fees. The error is FATAL
+ * as it requires user intervention to add gas funds.
+ *
+ * @param chain - The blockchain network where the gas check failed
+ * @param trace - Optional trace context to include in error (can include rawError and additional debugging data)
+ * @returns KitError with insufficient gas details
+ *
+ * @example
+ * ```typescript
+ * import { createInsufficientGasError } from '@core/errors'
+ *
+ * throw createInsufficientGasError('Ethereum')
+ * // Message: "Insufficient gas funds on Ethereum"
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // With trace context for debugging
+ * throw createInsufficientGasError('Ethereum', {
+ *   rawError: error,
+ *   gasRequired: '21000',
+ *   gasAvailable: '10000',
+ *   walletAddress: '0x742d35Cc6634C0532925a3b844Bc9e7595f0bEb',
+ * })
+ * ```
+ */
+function createInsufficientGasError(chain, trace) {
+    return new KitError({
+        ...BalanceError.INSUFFICIENT_GAS,
+        recoverability: 'FATAL',
+        message: `Insufficient gas funds on ${chain}`,
+        cause: {
+            trace: {
+                ...trace,
+                chain,
             },
         },
     });
@@ -3908,6 +4008,38 @@ function isKitError(error) {
 function isFatalError(error) {
     return isKitError(error) && error.recoverability === 'FATAL';
 }
+/**
+ * Safely extracts error message from any error type.
+ *
+ * This utility handles different error types gracefully, extracting
+ * meaningful messages from Error instances, string errors, or providing
+ * a fallback for unknown error types. Never throws.
+ *
+ * @param error - Unknown error to extract message from
+ * @returns Error message string, or fallback message
+ *
+ * @example
+ * ```typescript
+ * import { getErrorMessage } from '@core/errors'
+ *
+ * try {
+ *   await riskyOperation()
+ * } catch (error) {
+ *   const message = getErrorMessage(error)
+ *   console.log('Error occurred:', message)
+ *   // Works with Error, KitError, string, or any other type
+ * }
+ * ```
+ */
+function getErrorMessage(error) {
+    if (error instanceof Error) {
+        return error.message;
+    }
+    if (typeof error === 'string') {
+        return error;
+    }
+    return 'An unknown error occurred';
+}
 
 /**
  * Validates data against a Zod schema with enhanced error reporting.
@@ -4405,41 +4537,46 @@ var TransferSpeed;
  * - regexMessage: error message when the basic numeric format fails.
  * - maxDecimals: maximum number of decimal places allowed (e.g., 6 for USDC).
  */
-const createDecimalStringValidator = (options) => (schema) => schema
-    .regex(/^-?(?:\d+(?:\.\d+)?|\.\d+)$/, options.regexMessage)
-    .superRefine((val, ctx) => {
-    const amount = Number.parseFloat(val);
-    if (Number.isNaN(amount)) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: options.regexMessage,
-        });
-        return;
-    }
-    // Check decimal precision if maxDecimals is specified
-    if (options.maxDecimals !== undefined) {
-        const decimalPart = val.split('.')[1];
-        if (decimalPart && decimalPart.length > options.maxDecimals) {
+const createDecimalStringValidator = (options) => (schema) => {
+    // Capitalize first letter of attribute name for error messages
+    const capitalizedAttributeName = options.attributeName.charAt(0).toUpperCase() +
+        options.attributeName.slice(1);
+    return schema
+        .regex(/^-?(?:\d+(?:\.\d+)?|\.\d+)$/, options.regexMessage)
+        .superRefine((val, ctx) => {
+        const amount = Number.parseFloat(val);
+        if (Number.isNaN(amount)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `Maximum supported decimal places: ${options.maxDecimals.toString()}`,
+                message: options.regexMessage,
             });
             return;
         }
-    }
-    if (options.allowZero && amount < 0) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `${options.attributeName} must be non-negative`,
-        });
-    }
-    else if (!options.allowZero && amount <= 0) {
-        ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `${options.attributeName} must be greater than 0`,
-        });
-    }
-});
+        // Check decimal precision if maxDecimals is specified
+        if (options.maxDecimals !== undefined) {
+            const decimalPart = val.split('.')[1];
+            if (decimalPart && decimalPart.length > options.maxDecimals) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    message: `Maximum supported decimal places: ${options.maxDecimals.toString()}`,
+                });
+                return;
+            }
+        }
+        if (options.allowZero && amount < 0) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `${capitalizedAttributeName} must be non-negative`,
+            });
+        }
+        else if (!options.allowZero && amount <= 0) {
+            ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `${capitalizedAttributeName} must be greater than 0`,
+            });
+        }
+    });
+};
 /**
  * Schema for validating chain definitions.
  * This ensures the basic structure of a chain definition is valid.
@@ -4599,7 +4736,7 @@ const bridgeParamsSchema = z.object({
         .min(1, 'Required')
         .pipe(createDecimalStringValidator({
         allowZero: false,
-        regexMessage: 'Amount must be a numeric string with dot (.) as decimal separator (e.g., "0.1", ".1", "10.5", "1000.50"), with no thousand separators or comma decimals.',
+        regexMessage: AMOUNT_FORMAT_ERROR_MESSAGE,
         attributeName: 'amount',
         maxDecimals: 6,
     })(z.string())),
@@ -4612,7 +4749,7 @@ const bridgeParamsSchema = z.object({
             .string()
             .pipe(createDecimalStringValidator({
             allowZero: true,
-            regexMessage: 'maxFee must be a numeric string with dot (.) as decimal separator (e.g., "1", "0.5", ".5", "1.5"), with no thousand separators or comma decimals.',
+            regexMessage: MAX_FEE_FORMAT_ERROR_MESSAGE,
             attributeName: 'maxFee',
             maxDecimals: 6,
         })(z.string()))
@@ -4621,6 +4758,19 @@ const bridgeParamsSchema = z.object({
     }),
 });
 
+/**
+ * Base URL for Circle's IRIS API (mainnet/production).
+ *
+ * The IRIS API provides attestation services for CCTP cross-chain transfers.
+ */
+const IRIS_API_BASE_URL = 'https://iris-api.circle.com';
+/**
+ * Base URL for Circle's IRIS API (testnet/sandbox).
+ *
+ * Used for development and testing on testnet chains.
+ */
+const IRIS_API_SANDBOX_BASE_URL = 'https://iris-api-sandbox.circle.com';
+
 /**
  * Type guard to validate the API response structure.
  *
@@ -4669,9 +4819,7 @@ const isFastBurnFeeResponse = (data) => {
  * @returns The complete API URL
  */
 function buildFastBurnFeeUrl(sourceDomain, destinationDomain, isTestnet) {
-    const baseUrl = isTestnet
-        ? 'https://iris-api-sandbox.circle.com'
-        : 'https://iris-api.circle.com';
+    const baseUrl = isTestnet ? IRIS_API_SANDBOX_BASE_URL : IRIS_API_BASE_URL;
     return `${baseUrl}/v2/burn/USDC/fees/${sourceDomain.toString()}/${destinationDomain.toString()}`;
 }
 const FAST_TIER_FINALITY_THRESHOLD = 1000;
@@ -4687,15 +4835,24 @@ const FAST_TIER_FINALITY_THRESHOLD = 1000;
  * - Retry delays: 9 × 200 ms = 1 800 ms
  * - Total max time: 2 000 ms + 1 800 ms = 3 800 ms
  *
+ * @remarks
+ * The API returns basis points as a decimal (e.g., "1.3" for 1.3 bps = 0.013%).
+ * This function scales the value by 100 to preserve 2 decimal places of precision.
+ * Callers must divide by 1,000,000 (instead of 10,000) when calculating fees.
+ *
  * @param sourceDomain - The source domain
  * @param destinationDomain - The destination domain
  * @param isTestnet - Whether the request is for a testnet chain
- * @returns The minimum fee for a USDC fast burn operation
+ * @returns The minimum fee in scaled basis points (bps × 100)
  * @throws Error if the input domains are invalid, the API request fails, returns invalid data, or network errors occur
  * @example
  * ```typescript
- * const minimumFee = await fetchUsdcFastBurnFee(0, 6, false) // Ethereum -> Base
- * console.log(minimumFee) // 1000n
+ * const scaledBps = await fetchUsdcFastBurnFee(0, 6, false) // Ethereum -> Base
+ * console.log(scaledBps) // 130n (representing 1.3 bps)
+ *
+ * // To calculate fee for an amount:
+ * const amount = 1_000_000n // 1 USDC
+ * const fee = (scaledBps * amount) / 1_000_000n // 130n (0.00013 USDC)
  * ```
  */
 async function fetchUsdcFastBurnFee(sourceDomain, destinationDomain, isTestnet) {
@@ -4721,14 +4878,16 @@ async function fetchUsdcFastBurnFee(sourceDomain, destinationDomain, isTestnet)
     if (!fastTier) {
         throw new Error(`No fast tier (finalityThreshold: ${FAST_TIER_FINALITY_THRESHOLD.toString()}) available in API response`);
     }
-    // Convert minimumFee to bigint
-    let minimumFee;
-    try {
-        minimumFee = BigInt(fastTier.minimumFee);
-    }
-    catch {
-        throw new Error(`Invalid minimumFee value: cannot convert "${String(fastTier.minimumFee)}" to bigint`);
+    // Convert minimumFee to scaled basis points (bigint)
+    // The API returns basis points as a decimal (e.g., "1.3" for 1.3 bps = 0.013%).
+    // We scale by 100 to preserve 2 decimal places of precision.
+    // The caller (getMaxFee) must divide by 1,000,000 instead of 10,000.
+    const feeValue = Number.parseFloat(String(fastTier.minimumFee));
+    if (Number.isNaN(feeValue) || !Number.isFinite(feeValue)) {
+        throw new Error(`Invalid minimumFee value: cannot parse "${String(fastTier.minimumFee)}" as a number`);
     }
+    // Scale by 100 and round to get integer representation
+    const minimumFee = BigInt(Math.round(feeValue * 100));
     // Validate that minimumFee is non-negative
     if (minimumFee < 0n) {
         throw new Error('Invalid minimumFee: value must be non-negative');
@@ -4903,9 +5062,7 @@ const isAttestationResponse = (obj) => {
  * ```
  */
 const buildIrisUrl = (sourceDomainId, transactionHash, isTestnet) => {
-    const baseUrl = isTestnet
-        ? 'https://iris-api-sandbox.circle.com'
-        : 'https://iris-api.circle.com';
+    const baseUrl = isTestnet ? IRIS_API_SANDBOX_BASE_URL : IRIS_API_BASE_URL;
     const url = new URL(`${baseUrl}/v2/messages/${String(sourceDomainId)}`);
     url.searchParams.set('transactionHash', transactionHash);
     return url.toString();
@@ -4950,6 +5107,133 @@ const fetchAttestation = async (sourceDomainId, transactionHash, isTestnet, conf
     const effectiveConfig = { ...DEFAULT_CONFIG, ...config };
     return await pollApiGet(url, isAttestationResponse, effectiveConfig);
 };
+/**
+ * Type guard that validates attestation response structure without requiring completion status.
+ *
+ * This is used by `fetchAttestationWithoutStatusCheck` to extract the nonce from an existing
+ * attestation, even if the attestation is expired or pending. Unlike `isAttestationResponse`,
+ * this function does not throw if no complete attestation is found.
+ *
+ * @param obj - The value to check, typically a parsed JSON response
+ * @returns True if the object has valid attestation structure
+ * @throws {Error} With "Invalid attestation response structure" if structure is invalid
+ * @internal
+ */
+const isAttestationResponseWithoutStatusCheck = (obj) => {
+    if (!hasValidAttestationStructure(obj)) {
+        throw new Error('Invalid attestation response structure');
+    }
+    return true;
+};
+/**
+ * Fetches attestation data without requiring the attestation to be complete.
+ *
+ * This function is useful for retrieving attestation data (particularly the nonce)
+ * from an existing transaction, even if the attestation has expired or is pending.
+ * It uses minimal retries since we're fetching existing data, not waiting for completion.
+ *
+ * @param sourceDomainId - The CCTP domain ID of the source chain
+ * @param transactionHash - The transaction hash to fetch attestation for
+ * @param isTestnet - Whether this is for a testnet chain (true) or mainnet chain (false)
+ * @param config - Optional configuration overrides
+ * @returns The attestation response data (may contain incomplete/expired attestations)
+ * @throws If the request fails, times out, or returns invalid data
+ *
+ * @example
+ * ```typescript
+ * // Fetch existing attestation to extract nonce for re-attestation
+ * const response = await fetchAttestationWithoutStatusCheck(1, '0xabc...', true)
+ * const nonce = response.messages[0]?.eventNonce
+ * ```
+ */
+const fetchAttestationWithoutStatusCheck = async (sourceDomainId, transactionHash, isTestnet, config = {}) => {
+    const url = buildIrisUrl(sourceDomainId, transactionHash, isTestnet);
+    // Use minimal retries since we're just fetching existing data
+    const effectiveConfig = {
+        ...DEFAULT_CONFIG,
+        maxRetries: 3,
+        ...config,
+    };
+    return await pollApiGet(url, isAttestationResponseWithoutStatusCheck, effectiveConfig);
+};
+/**
+ * Builds the IRIS API URL for re-attestation requests.
+ *
+ * Constructs the URL for Circle's re-attestation endpoint that allows
+ * requesting a fresh attestation for an expired nonce.
+ *
+ * @param nonce - The nonce from the original attestation
+ * @param isTestnet - Whether this is for a testnet chain (true) or mainnet chain (false)
+ * @returns A fully qualified URL string for the re-attestation endpoint
+ *
+ * @example
+ * ```typescript
+ * // Mainnet URL
+ * const mainnetUrl = buildReAttestUrl('0xabc', false)
+ * // => 'https://iris-api.circle.com/v2/reattest/0xabc'
+ *
+ * // Testnet URL
+ * const testnetUrl = buildReAttestUrl('0xabc', true)
+ * // => 'https://iris-api-sandbox.circle.com/v2/reattest/0xabc'
+ * ```
+ */
+const buildReAttestUrl = (nonce, isTestnet) => {
+    const baseUrl = isTestnet ? IRIS_API_SANDBOX_BASE_URL : IRIS_API_BASE_URL;
+    const url = new URL(`${baseUrl}/v2/reattest/${nonce}`);
+    return url.toString();
+};
+/**
+ * Type guard that validates the re-attestation API response structure.
+ *
+ * @param obj - The value to check, typically a parsed JSON response
+ * @returns True if the object matches the ReAttestationResponse shape
+ * @throws {Error} With "Invalid re-attestation response structure" if structure is invalid
+ * @internal
+ */
+const isReAttestationResponse = (obj) => {
+    if (typeof obj !== 'object' ||
+        obj === null ||
+        !('message' in obj) ||
+        !('nonce' in obj) ||
+        typeof obj.message !== 'string' ||
+        typeof obj.nonce !== 'string') {
+        throw new Error('Invalid re-attestation response structure');
+    }
+    return true;
+};
+/**
+ * Requests re-attestation for an expired attestation nonce.
+ *
+ * This function calls Circle's re-attestation API endpoint to request a fresh
+ * attestation for a previously issued nonce. After calling this function,
+ * you should poll `fetchAttestation` to retrieve the new attestation.
+ *
+ * @param nonce - The nonce from the original (expired) attestation
+ * @param isTestnet - Whether this is for a testnet chain (true) or mainnet chain (false)
+ * @param config - Optional configuration overrides for the request
+ * @returns The re-attestation response confirming the request was accepted
+ * @throws If the request fails, times out, or returns invalid data
+ *
+ * @example
+ * ```typescript
+ * // Request re-attestation for an expired nonce
+ * const response = await requestReAttestation('0xabc', true)
+ * console.log(response.message) // "Re-attestation successfully requested for nonce."
+ *
+ * // After requesting re-attestation, poll for the new attestation
+ * const attestation = await fetchAttestation(domainId, txHash, true)
+ * ```
+ */
+const requestReAttestation = async (nonce, isTestnet, config = {}) => {
+    const url = buildReAttestUrl(nonce, isTestnet);
+    // Use minimal retries since we're just submitting a request, not polling for state
+    const effectiveConfig = {
+        ...DEFAULT_CONFIG,
+        maxRetries: 3,
+        ...config,
+    };
+    return await pollApiPost(url, {}, isReAttestationResponse, effectiveConfig);
+};
 
 const assertCCTPv2WalletContextSymbol = Symbol('assertCCTPv2WalletContext');
 /**
@@ -5187,6 +5471,170 @@ mintAddress) => {
     }
 };
 
+/**
+ * Converts a block number to bigint with validation.
+ *
+ * @param value - The block number value to convert (bigint, number, or string)
+ * @returns The validated block number as a bigint
+ * @throws KitError If the value is invalid (empty string, non-integer, negative, etc.)
+ * @internal
+ */
+const toBlockNumber = (value) => {
+    if (value === null || value === undefined) {
+        throw createValidationFailedError('blockNumber', value, 'cannot be null or undefined');
+    }
+    // Empty string edge case - BigInt('') === 0n which is misleading
+    if (value === '') {
+        throw createValidationFailedError('blockNumber', value, 'cannot be empty string');
+    }
+    // For numbers, validate before BigInt conversion
+    if (typeof value === 'number') {
+        if (!Number.isFinite(value) || !Number.isInteger(value)) {
+            throw createValidationFailedError('blockNumber', value, 'must be a finite integer');
+        }
+    }
+    let result;
+    try {
+        result = BigInt(value);
+    }
+    catch {
+        throw createValidationFailedError('blockNumber', value, 'cannot be converted to BigInt');
+    }
+    if (result < 0n) {
+        throw createValidationFailedError('blockNumber', result.toString(), 'must be non-negative');
+    }
+    return result;
+};
+/**
+ * Determines whether an attestation has expired based on the current block number.
+ *
+ * An attestation expires when the destination chain's current block number is greater
+ * than or equal to the expiration block specified in the attestation message.
+ * Slow transfers and re-attested messages have `expirationBlock: '0'` and never expire.
+ *
+ * @param attestation - The attestation message containing expiration block information
+ * @param currentBlockNumber - The current block number on the destination chain (bigint, number, or string)
+ * @returns `true` if the attestation has expired, `false` if still valid or never expires
+ * @throws KitError If currentBlockNumber or expirationBlock is invalid
+ *
+ * @example
+ * ```typescript
+ * import { isAttestationExpired } from '@circle-fin/cctp-v2-provider'
+ *
+ * // Check if attestation is expired on EVM chain
+ * const publicClient = await adapter.getPublicClient(destinationChain)
+ * const currentBlock = await publicClient.getBlockNumber()
+ * const expired = isAttestationExpired(attestation, currentBlock)
+ *
+ * if (expired) {
+ *   const freshAttestation = await provider.reAttest(source, burnTxHash)
+ * }
+ * ```
+ *
+ * @example
+ * ```typescript
+ * // Check on Solana
+ * const slot = await adapter.getConnection(destinationChain).getSlot()
+ * const expired = isAttestationExpired(attestation, slot)
+ * ```
+ */
+const isAttestationExpired = (attestation, currentBlockNumber) => {
+    const currentBlock = toBlockNumber(currentBlockNumber);
+    const expiration = toBlockNumber(attestation.decodedMessage.decodedMessageBody.expirationBlock);
+    // 0n means it never expires (re-attested messages and slow transfers)
+    if (expiration === 0n) {
+        return false;
+    }
+    // Attestation is expired if current block >= expiration block
+    return currentBlock >= expiration;
+};
+/**
+ * Calculates the number of blocks remaining until an attestation expires.
+ *
+ * Returns the difference between the expiration block and the current block number.
+ * Returns `null` if the attestation has `expirationBlock: '0'` (never expires).
+ * Returns `0n` or a negative bigint if the attestation has already expired.
+ *
+ * @param attestation - The attestation message containing expiration block information
+ * @param currentBlockNumber - The current block number on the destination chain (bigint, number, or string)
+ * @returns The number of blocks until expiry as a bigint, or `null` if the attestation never expires
+ * @throws KitError If currentBlockNumber or expirationBlock is invalid
+ *
+ * @example
+ * ```typescript
+ * import { getBlocksUntilExpiry } from '@circle-fin/cctp-v2-provider'
+ *
+ * const publicClient = await adapter.getPublicClient(destinationChain)
+ * const currentBlock = await publicClient.getBlockNumber()
+ * const blocksRemaining = getBlocksUntilExpiry(attestation, currentBlock)
+ *
+ * if (blocksRemaining === null) {
+ *   console.log('Attestation never expires')
+ * } else if (blocksRemaining <= 0n) {
+ *   console.log('Attestation has expired')
+ * } else {
+ *   console.log(`${blocksRemaining} blocks until expiry`)
+ * }
+ * ```
+ */
+const getBlocksUntilExpiry = (attestation, currentBlockNumber) => {
+    const currentBlock = toBlockNumber(currentBlockNumber);
+    const expiration = toBlockNumber(attestation.decodedMessage.decodedMessageBody.expirationBlock);
+    // 0n means it never expires (re-attested messages and slow transfers)
+    if (expiration === 0n) {
+        return null;
+    }
+    // Return the difference (can be negative if expired)
+    return expiration - currentBlock;
+};
+/**
+ * Determines whether a mint failure was caused by an expired attestation.
+ *
+ * This function inspects the error thrown during a mint operation to detect
+ * if the failure is due to the attestation's expiration block being exceeded.
+ * When this returns `true`, the caller should use `reAttest()` to obtain a
+ * fresh attestation before retrying the mint.
+ *
+ * @param error - The error thrown during the mint operation
+ * @returns `true` if the error indicates the attestation has expired, `false` otherwise
+ *
+ * @example
+ * ```typescript
+ * import { isMintFailureRelatedToAttestation } from '@circle-fin/cctp-v2-provider'
+ *
+ * try {
+ *   await mintRequest.execute()
+ * } catch (error) {
+ *   if (isMintFailureRelatedToAttestation(error)) {
+ *     // Attestation expired - get a fresh one
+ *     const freshAttestation = await provider.reAttest(source, burnTxHash)
+ *     const newMintRequest = await provider.mint(source, destination, freshAttestation)
+ *     await newMintRequest.execute()
+ *   } else {
+ *     throw error
+ *   }
+ * }
+ * ```
+ */
+const isMintFailureRelatedToAttestation = (error) => {
+    if (error === null || error === undefined) {
+        return false;
+    }
+    const errorString = getErrorMessage(error).toLowerCase();
+    // Check for Solana "MessageExpired" error pattern
+    // Full error: "AnchorError thrown in ...handle_receive_finalized_message.rs:169.
+    //              Error Code: MessageExpired. Error Number: 6016. Error Message: Message has expired."
+    if (errorString.includes('messageexpired')) {
+        return true;
+    }
+    // Check for EVM attestation expiry errors
+    // Contract reverts with: "Message expired and must be re-signed"
+    if (errorString.includes('message') && errorString.includes('expired')) {
+        return true;
+    }
+    return false;
+};
+
 /**
  * Checks if a decoded attestation field matches the corresponding transfer parameter.
  * If the values do not match, appends a descriptive error message to the errors array.
@@ -6030,21 +6478,64 @@ const validateBalanceForTransaction = async (params) => {
         // Extract chain name from operationContext
         const chainName = extractChainInfo(operationContext.chain).name;
         // Create KitError with rich context in trace
-        const error = createInsufficientTokenBalanceError(chainName, token);
-        // Enhance error with additional context for debugging
-        if (error.cause) {
-            const existingTrace = typeof error.cause.trace === 'object' && error.cause.trace
-                ? error.cause.trace
-                : {};
-            error.cause.trace = {
-                ...existingTrace,
-                balance: balance.toString(),
-                amount,
-                tokenAddress,
-                walletAddress: operationContext.address,
-            };
-        }
-        throw error;
+        throw createInsufficientTokenBalanceError(chainName, token, {
+            balance: balance.toString(),
+            amount,
+            tokenAddress,
+            walletAddress: operationContext.address,
+        });
+    }
+};
+
+/**
+ * Validate that the adapter has sufficient native token balance for transaction fees.
+ *
+ * This function checks if the adapter's current native token balance (ETH, SOL, etc.)
+ * is greater than zero. It throws a KitError with code 9002 (BALANCE_INSUFFICIENT_GAS)
+ * if the balance is zero, indicating the wallet cannot pay for transaction fees.
+ *
+ * @param params - The validation parameters containing adapter and operation context.
+ * @returns A promise that resolves to void if validation passes.
+ * @throws {KitError} When the adapter's native balance is zero (code: 9002).
+ *
+ * @example
+ * ```typescript
+ * import { validateNativeBalanceForTransaction } from '@core/adapter'
+ * import { createViemAdapterFromPrivateKey } from '@circle-fin/adapter-viem-v2'
+ * import { isKitError, ERROR_TYPES } from '@core/errors'
+ *
+ * const adapter = createViemAdapterFromPrivateKey({
+ *   privateKey: '0x...',
+ *   chain: 'Ethereum',
+ * })
+ *
+ * try {
+ *   await validateNativeBalanceForTransaction({
+ *     adapter,
+ *     operationContext: { chain: 'Ethereum' },
+ *   })
+ *   console.log('Native balance validation passed')
+ * } catch (error) {
+ *   if (isKitError(error) && error.type === ERROR_TYPES.BALANCE) {
+ *     console.error('Insufficient gas funds:', error.message)
+ *   }
+ * }
+ * ```
+ */
+const validateNativeBalanceForTransaction = async (params) => {
+    const { adapter, operationContext } = params;
+    const balancePrepared = await adapter.prepareAction('native.balanceOf', {
+        walletAddress: operationContext.address,
+    }, operationContext);
+    const balance = await balancePrepared.execute();
+    if (BigInt(balance) === 0n) {
+        // Extract chain name from operationContext
+        const chainName = extractChainInfo(operationContext.chain).name;
+        // Create KitError with rich context in trace
+        throw createInsufficientGasError(chainName, {
+            balance: '0',
+            walletAddress: operationContext.address,
+        });
     }
 };
 
@@ -6921,16 +7412,28 @@ class CCTPV2BridgingProvider extends BridgingProvider {
     async bridge(params) {
         // CCTP-specific bridge params validation (includes base validation)
         assertCCTPv2BridgeParams(params);
-        const { source, amount, token } = params;
+        const { source, destination, amount, token } = params;
         // Extract operation context from source wallet context for balance validation
-        const operationContext = this.extractOperationContext(source);
-        // Validate balance for transaction
+        const sourceOperationContext = this.extractOperationContext(source);
+        // Validate USDC balance for transaction on source chain
         await validateBalanceForTransaction({
             adapter: source.adapter,
             amount,
             token,
             tokenAddress: source.chain.usdcAddress,
-            operationContext,
+            operationContext: sourceOperationContext,
+        });
+        // Validate native balance > 0 for gas fees on source chain
+        await validateNativeBalanceForTransaction({
+            adapter: source.adapter,
+            operationContext: sourceOperationContext,
+        });
+        // Extract operation context from destination wallet context
+        const destinationOperationContext = this.extractOperationContext(destination);
+        // Validate native balance > 0 for gas fees on destination chain
+        await validateNativeBalanceForTransaction({
+            adapter: destination.adapter,
+            operationContext: destinationOperationContext,
         });
         return bridge(params, this);
     }
@@ -7011,6 +7514,19 @@ class CCTPV2BridgingProvider extends BridgingProvider {
                 : Promise.resolve(0n),
         ]);
         const estimateResult = {
+            token: params.token,
+            amount: params.amount,
+            source: {
+                address: source.address,
+                chain: source.chain.chain,
+            },
+            destination: {
+                address: destination.address,
+                chain: destination.chain.chain,
+                ...(destination.recipientAddress && {
+                    recipientAddress: destination.recipientAddress,
+                }),
+            },
             gasFees: [],
             fees: [],
         };
@@ -7296,6 +7812,93 @@ class CCTPV2BridgingProvider extends BridgingProvider {
             throw error;
         }
     }
+    /**
+     * Requests a fresh attestation for an expired attestation.
+     *
+     * This method is used when the original attestation has expired before the mint
+     * transaction could be completed. It performs three steps:
+     * 1. Fetches the existing attestation data to extract the nonce
+     * 2. Requests re-attestation from Circle's API using the nonce
+     * 3. Polls for the fresh attestation and returns it
+     *
+     * @typeParam TFromAdapterCapabilities - The type representing the capabilities of the source adapter
+     * @param source - The source wallet context containing the chain definition and wallet address
+     * @param transactionHash - The transaction hash of the original burn transaction
+     * @param config - Optional polling configuration overrides for timeout, retries, and delay
+     * @returns A promise that resolves to the fresh attestation message
+     * @throws {Error} With "Failed to re-attest: No nonce found for transaction" if the original
+     *   attestation cannot be found or has no nonce
+     * @throws {Error} With "Failed to re-attest: No attestation found after re-attestation request"
+     *   if the fresh attestation cannot be retrieved
+     * @throws {Error} With "Failed to re-attest: {details}" for other errors
+     *
+     * @example
+     * ```typescript
+     * import { CCTPV2BridgingProvider } from '@circle-fin/provider-cctp-v2'
+     * import { Chains } from '@core/chains'
+     *
+     * const provider = new CCTPV2BridgingProvider()
+     *
+     * // After a mint fails due to expired attestation, request a fresh one
+     * const source = {
+     *   adapter: viemAdapter,
+     *   chain: Chains.EthereumSepolia,
+     *   address: '0x1234...'
+     * }
+     *
+     * try {
+     *   const freshAttestation = await provider.reAttest(
+     *     source,
+     *     '0xabc123...', // Original burn transaction hash
+     *     { timeout: 10000, maxRetries: 5 }
+     *   )
+     *
+     *   // Use the fresh attestation to retry the mint
+     *   const mintRequest = await provider.mint(source, destination, freshAttestation)
+     *   const result = await mintRequest.execute()
+     * } catch (error) {
+     *   console.error('Re-attestation failed:', error.message)
+     * }
+     * ```
+     */
+    async reAttest(source, transactionHash, config) {
+        assertCCTPv2WalletContext(source);
+        if (!transactionHash ||
+            typeof transactionHash !== 'string' ||
+            transactionHash.trim() === '') {
+            throw new Error('Failed to re-attest: Invalid transaction hash');
+        }
+        try {
+            // Merge configs: defaults <- global config <- per-call config
+            const effectiveConfig = {
+                ...this.config?.attestation,
+                ...config,
+            };
+            // Step 1: Get existing attestation data to extract nonce
+            const existingAttestation = await fetchAttestationWithoutStatusCheck(source.chain.cctp.domain, transactionHash, source.chain.isTestnet, effectiveConfig);
+            const nonce = existingAttestation.messages[0]?.eventNonce;
+            if (!nonce || typeof nonce !== 'string') {
+                throw new Error('Failed to re-attest: No nonce found for transaction');
+            }
+            // Step 2: Request re-attestation
+            await requestReAttestation(nonce, source.chain.isTestnet, effectiveConfig);
+            // Step 3: Poll for fresh attestation
+            const response = await fetchAttestation(source.chain.cctp.domain, transactionHash, source.chain.isTestnet, effectiveConfig);
+            const message = response.messages[0];
+            if (!message) {
+                throw new Error('Failed to re-attest: No attestation found after re-attestation request');
+            }
+            return message;
+        }
+        catch (err) {
+            const error = err instanceof Error ? err : new Error(String(err));
+            // Always prefix with 'Failed to re-attest'
+            if (!error.message.startsWith('Failed to re-attest')) {
+                throw new Error(`Failed to re-attest: ${error.message}`);
+            }
+            throw error;
+        }
+    }
     /**
      * Checks if both source and destination chains support CCTP v2 transfers.
      *
@@ -7375,15 +7978,17 @@ class CCTPV2BridgingProvider extends BridgingProvider {
         }
         else if (config?.maxFee === undefined) {
             // If the max fee is not provided and the transfer speed is fast, dynamically calculate the max fee
-            const baseFeeInBps = await fetchUsdcFastBurnFee(source.chain.cctp.domain, destination.chain.cctp.domain, source.chain.isTestnet);
+            const scaledBps = await fetchUsdcFastBurnFee(source.chain.cctp.domain, destination.chain.cctp.domain, source.chain.isTestnet);
             // Calculate fee proportional to the transfer amount
             // Convert amount to minor units
             const amountInMinorUnits = BigInt(amount);
             // Calculate base fee proportional to the transfer amount
-            // Formula: (baseFeeInBps * amountInMinorUnits) / 10_000
+            // The API returns basis points as a decimal (e.g., "1.3" for 1.3 bps).
+            // fetchUsdcFastBurnFee scales by 100 to preserve precision, so we divide by 1,000,000.
+            // Formula: (scaledBps * amountInMinorUnits) / 1_000_000
             // We use ceiling division (round up) to ensure sufficient fees and avoid failover to slow burn
-            // Ceiling division: (a + b - 1) / b, where b = 10_000, so (b - 1) = 9_999n
-            const baseFee = (baseFeeInBps * amountInMinorUnits + 9999n) / 10000n;
+            // Ceiling division: (a + b - 1) / b, where b = 1_000_000, so (b - 1) = 999_999n
+            const baseFee = (scaledBps * amountInMinorUnits + 999999n) / 1000000n;
             // Add 10% buffer to account for fee fluctuations: fee + (fee * 10 / 100) = fee + (fee / 10)
             maxFee = baseFee + baseFee / 10n;
         }
@@ -7487,5 +8092,5 @@ class CCTPV2BridgingProvider extends BridgingProvider {
     }
 }
 
-export { CCTPV2BridgingProvider, getMintRecipientAccount };
+export { CCTPV2BridgingProvider, getBlocksUntilExpiry, getMintRecipientAccount, isAttestationExpired, isMintFailureRelatedToAttestation };
 //# sourceMappingURL=index.mjs.map