@shapeshiftoss/swapper 18.1.0 → 19.0.0

package/dist/esm/swappers/AcrossSwapper/constant.js

@@ -1,7 +1,7 @@
-import { arbitrumChainId, baseChainId, blastChainId, bscChainId, ethChainId, hyperEvmChainId, inkChainId, lineaChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, polygonChainId, scrollChainId, solanaChainId, soneiumChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
+import { arbitrumChainId, baseChainId, blastChainId, bscChainId, ethChainId, hyperEvmChainId, inkChainId, lineaChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, polygonChainId, robinhoodChainId, scrollChainId, solanaChainId, soneiumChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
 import invert from 'lodash/invert';
 import { zeroAddress } from 'viem';
-import { arbitrum, base, blast, bsc, hyperEvm, ink, linea, mainnet as ethereum, mode, monad, optimism, plasma, polygon, scroll, soneium, unichain, worldchain, zksync, } from 'viem/chains';
+import { arbitrum, base, blast, bsc, hyperEvm, ink, linea, mainnet as ethereum, megaeth, mode, monad, optimism, plasma, polygon, robinhood, scroll, soneium, unichain, worldchain, zksync, } from 'viem/chains';
 import { TradeQuoteError } from '../../types.js';
 import { AcrossErrorCode } from './utils/types.js';
 export const chainIdToAcrossChainId = {
@@ -25,7 +25,8 @@ export const chainIdToAcrossChainId = {
     // Across uses a custom Solana chain ID
     [solanaChainId]: 34268394551451,
     [scrollChainId]: scroll.id,
-    [megaethChainId]: 4326,
+    [megaethChainId]: megaeth.id,
+    [robinhoodChainId]: robinhood.id,
 };
 export const acrossChainIdToChainId = invert(chainIdToAcrossChainId);
 export const ACROSS_SUPPORTED_CHAIN_IDS = Object.keys(chainIdToAcrossChainId);

package/dist/esm/swappers/AcrossSwapper/endpoints.js

@@ -4,7 +4,7 @@ import { checkEvmSwapStatus, getExecutableTradeStep, isExecutableTradeQuote } fr
 import { getEvmTransactionFees, getUnsignedEvmTransaction } from '../../utils/evm/index.js';
 import { getTradeQuote } from './getTradeQuote/getTradeQuote.js';
 import { getTradeRate } from './getTradeRate/getTradeRate.js';
-import { acrossService } from './utils/acrossService.js';
+import { acrossService, getAcrossRequestConfig } from './utils/acrossService.js';
 export const acrossApi = {
     getTradeQuote: (input, deps) => getTradeQuote(input, deps),
     getTradeRate: (input, deps) => getTradeRate(input, deps),
@@ -33,7 +33,7 @@ export const acrossApi = {
                 return sourceTxStatus;
             txHash = sourceTxStatus.buyTxHash ?? txHash;
         }
-        const maybeStatusResponse = await acrossService.get(`${config.VITE_ACROSS_API_URL}/deposit/status?depositTxnRef=${txHash}`);
+        const maybeStatusResponse = await acrossService.get(`${config.VITE_ACROSS_API_URL}/deposit/status?depositTxnRef=${txHash}`, getAcrossRequestConfig(config));
         if (maybeStatusResponse.isErr()) {
             return {
                 buyTxHash: undefined,

package/dist/esm/swappers/AcrossSwapper/getTradeQuote/getTradeQuote.js

@@ -16,7 +16,7 @@ export const getTradeQuote = async (input, deps) => {
     });
     if (maybeContext.isErr())
         return Err(maybeContext.unwrapErr());
-    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs, deadline } = maybeContext.unwrap();
     const maybeStepData = await getAcrossStepData({ ...stepDataArgs, type: 'quote', input });
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
@@ -24,6 +24,7 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/AcrossSwapper/utils/acrossService.d.ts

@@ -1,5 +1,8 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { SwapperConfig } from '../../../types.js';
 export declare const acrossService: {
-    get: <T = any>(url: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../../index.js").SwapErrorRight>>;
-    post: <T_1 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../../../index.js").SwapErrorRight>>;
-    delete: <T_2 = any>(url: string, data: any, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../../../index.js").SwapErrorRight>>;
+    get: <T = any>(url: string, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../../types.js").SwapErrorRight>>;
+    post: <T_1 = any>(url: string, data: any, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_1, any, {}>, import("../../../types.js").SwapErrorRight>>;
+    delete: <T_2 = any>(url: string, data: any, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T_2, any, {}>, import("../../../types.js").SwapErrorRight>>;
 };
+export declare const getAcrossRequestConfig: (config: SwapperConfig) => AxiosRequestConfig | undefined;

package/dist/esm/swappers/AcrossSwapper/utils/acrossService.js

@@ -9,3 +9,6 @@ const axiosConfig = {
 };
 const acrossServiceBase = axios.create(axiosConfig);
 export const acrossService = makeSwapperAxiosServiceMonadic(acrossServiceBase);
+export const getAcrossRequestConfig = (config) => config.VITE_ACROSS_API_KEY
+    ? { headers: { Authorization: `Bearer ${config.VITE_ACROSS_API_KEY}` } }
+    : undefined;

package/dist/esm/swappers/AcrossSwapper/utils/fetchAcrossTrade.js

@@ -1,4 +1,4 @@
-import { acrossService } from './acrossService.js';
+import { acrossService, getAcrossRequestConfig } from './acrossService.js';
 export const fetchAcrossTrade = (params, config) => {
     const searchParams = new URLSearchParams();
     searchParams.set('tradeType', params.tradeType);
@@ -19,5 +19,5 @@ export const fetchAcrossTrade = (params, config) => {
     if (params.slippage)
         searchParams.set('slippage', params.slippage);
     const url = `${config.VITE_ACROSS_API_URL}/swap/approval?${searchParams.toString()}`;
-    return acrossService.get(url);
+    return acrossService.get(url, getAcrossRequestConfig(config));
 };

package/dist/esm/swappers/AcrossSwapper/utils/getAcrossTradeContext.d.ts

@@ -7,6 +7,7 @@ type AcrossTradeContext = {
     stepCommon: Omit<TradeStepCommon, 'feeData'>;
     protocolFees: QuoteFeeData['protocolFees'];
     stepDataArgs: Omit<GetAcrossStepDataArgs, 'type' | 'input'>;
+    deadline: number;
 };
 export declare const getAcrossTradeContext: ({ input, deps, depositor, recipient, }: {
     input: AcrossTradeQuoteInput | AcrossTradeRateInput;

package/dist/esm/swappers/AcrossSwapper/utils/getAcrossTradeContext.js

@@ -7,7 +7,7 @@ import { zeroAddress } from 'viem';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
-import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
+import { getTreasuryAddressFromChainId, normalizeEpochToMs } from '../../../utils/helpers.js';
 import { acrossChainIdToChainId, acrossErrorCodeToTradeQuoteError } from '../constant.js';
 import { fetchAcrossTrade } from './fetchAcrossTrade.js';
 import { assertValidTrade, getAcrossAssetAddress } from './helpers.js';
@@ -172,5 +172,6 @@ export const getAcrossTradeContext = async ({ input, deps, depositor, recipient,
             fallbackNetworkFeeCryptoBaseUnit: quote.fees.originGas.amount,
             deps,
         },
+        deadline: normalizeEpochToMs(quote.quoteExpiryTimestamp),
     });
 };

package/dist/esm/swappers/ArbitrumBridgeSwapper/getTradeQuote/getTradeQuote.js

@@ -1,6 +1,7 @@
 import { supportsETH } from '@shapeshiftoss/hdwallet-core';
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getArbitrumBridgeStepData } from '../utils/getArbitrumBridgeStepData.js';
 import { getArbitrumBridgeTradeContext } from '../utils/getArbitrumBridgeTradeContext.js';
 export const getTradeQuoteWithWallet = async (inputWithWallet, deps) => {
@@ -32,6 +33,7 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/AvnuSwapper/swapperApi/getTradeQuote.js

@@ -2,6 +2,7 @@ import { Err, Ok } from '@sniptt/monads';
 import { validateAndParseAddress } from 'starknet';
 import { TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getAvnuTradeContext } from '../utils/getAvnuTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
     const { sellAsset, accountNumber } = input;
@@ -17,7 +18,7 @@ export const getTradeQuote = async (input, deps) => {
         const maybeContext = await getAvnuTradeContext({ input, takerAddress: normalizedSendAddress });
         if (maybeContext.isErr())
             return Err(maybeContext.unwrapErr());
-        const { tradeCommon, stepCommon, protocolFees, quoteId, sellTokenAddress } = maybeContext.unwrap();
+        const { tradeCommon, stepCommon, protocolFees, quoteId, sellTokenAddress, deadline } = maybeContext.unwrap();
         const adapter = deps.assertGetStarknetChainAdapter(sellAsset.chainId);
         const feeData = await adapter.getFeeData({
             to: normalizedReceiveAddress,
@@ -32,6 +33,7 @@ export const getTradeQuote = async (input, deps) => {
             ...tradeCommon,
             receiveAddress: normalizedReceiveAddress,
             quoteOrRate: 'quote',
+            deadline: deadline ?? Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
             steps: [
                 {
                     ...stepCommon,

package/dist/esm/swappers/AvnuSwapper/utils/getAvnuTradeContext.d.ts

@@ -6,6 +6,7 @@ type AvnuTradeContext = {
     protocolFees: QuoteFeeData['protocolFees'];
     quoteId: string;
     sellTokenAddress: string;
+    deadline: number | undefined;
 };
 export declare const getAvnuTradeContext: ({ input, takerAddress, }: {
     input: GetStarknetTradeQuoteInput | GetStarknetTradeRateInput;

package/dist/esm/swappers/AvnuSwapper/utils/getAvnuTradeContext.js

@@ -7,7 +7,7 @@ import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constant
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { getInputOutputRate, makeSwapErrorRight } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
-import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
+import { getTreasuryAddressFromChainId, normalizeEpochToMs } from '../../../utils/helpers.js';
 import { assertValidTrade, getTokenAddress } from './helpers.js';
 export const getAvnuTradeContext = async ({ input, takerAddress, }) => {
     const { sellAsset, buyAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit: sellAmount, slippageTolerancePercentageDecimal, affiliateBps, } = input;
@@ -90,6 +90,7 @@ export const getAvnuTradeContext = async ({ input, takerAddress, }) => {
             protocolFees,
             quoteId: bestQuote.quoteId,
             sellTokenAddress,
+            deadline: bestQuote.expiry ? normalizeEpochToMs(bestQuote.expiry) : undefined,
         });
     }
     catch (error) {

package/dist/esm/swappers/BebopSwapper/getBebopSolanaTradeQuote/getBebopSolanaTradeQuote.js

@@ -1,6 +1,7 @@
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { normalizeEpochToMs } from '../../../utils/helpers.js';
 import { getBebopSolanaTradeContext } from '../utils/getBebopSolanaTradeContext.js';
 import { isBebopSolanaTxSafe } from '../utils/helpers.js';
 export const getBebopSolanaTradeQuote = async (input, deps) => {
@@ -27,6 +28,8 @@ export const getBebopSolanaTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        // The sealed multi-signer tx is blockhash-pinned, so the provider expiry governs
+        deadline: normalizeEpochToMs(response.expiry),
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/BebopSwapper/getBebopTradeQuote/getBebopTradeQuote.js

@@ -17,7 +17,7 @@ export const getBebopTradeQuote = async (input, deps) => {
     });
     if (maybeContext.isErr())
         return Err(maybeContext.unwrapErr());
-    const { tradeCommon, stepCommon, stepDataArgs } = maybeContext.unwrap();
+    const { tradeCommon, stepCommon, stepDataArgs, deadline } = maybeContext.unwrap();
     const maybeStepData = await getBebopStepData({ ...stepDataArgs, type: 'quote', input });
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
@@ -25,6 +25,7 @@ export const getBebopTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/BebopSwapper/types.d.ts

@@ -3,8 +3,8 @@ import type { Address, Hex } from 'viem';
 import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput } from '../../types.js';
 export type BebopTradeQuoteInput = GetEvmTradeQuoteInput | GetSolanaTradeQuoteInput;
 export type BebopTradeRateInput = GetEvmTradeRateInput | GetSolanaTradeRateInput;
-export declare const bebopSupportedEvmChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet];
-export declare const bebopSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.SolanaMainnet];
+export declare const bebopSupportedEvmChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.RobinhoodMainnet];
+export declare const bebopSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.PolygonMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BaseMainnet, KnownChainIds.AvalancheMainnet, KnownChainIds.OptimismMainnet, KnownChainIds.BnbSmartChainMainnet, KnownChainIds.RobinhoodMainnet, KnownChainIds.SolanaMainnet];
 export type BebopSupportedChainId = (typeof bebopSupportedChainIds)[number];
 export type BebopMetadata = {
     name: 'bebop';

package/dist/esm/swappers/BebopSwapper/types.js

@@ -7,6 +7,7 @@ export const bebopSupportedEvmChainIds = [
     KnownChainIds.AvalancheMainnet,
     KnownChainIds.OptimismMainnet,
     KnownChainIds.BnbSmartChainMainnet,
+    KnownChainIds.RobinhoodMainnet,
 ];
 export const bebopSupportedChainIds = [
     ...bebopSupportedEvmChainIds,
@@ -20,6 +21,7 @@ export const chainIdToBebopChain = {
     [KnownChainIds.AvalancheMainnet]: 'avalanche',
     [KnownChainIds.OptimismMainnet]: 'optimism',
     [KnownChainIds.BnbSmartChainMainnet]: 'bsc',
+    [KnownChainIds.RobinhoodMainnet]: 'robinhood',
     [KnownChainIds.SolanaMainnet]: 'solana',
 };
 export const BEBOP_NATIVE_MARKER = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';

package/dist/esm/swappers/BebopSwapper/utils/getBebopTradeContext.d.ts

@@ -6,6 +6,7 @@ type BebopTradeContext = {
     tradeCommon: TradeCommon;
     stepCommon: Omit<TradeStepCommon, 'feeData'>;
     stepDataArgs: Omit<GetBebopStepDataArgs, 'type' | 'input'>;
+    deadline: number;
 };
 export declare const getBebopTradeContext: ({ input, deps, from, receiver, }: {
     input: GetEvmTradeQuoteInput | GetEvmTradeRateInput;

package/dist/esm/swappers/BebopSwapper/utils/getBebopTradeContext.js

@@ -5,7 +5,7 @@ import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constant
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { makeSwapErrorRight } from '../../../utils/index.js';
 import { buildAffiliateFee } from '../../../utils/affiliateFee.js';
-import { isNativeEvmAsset } from '../../../utils/helpers.js';
+import { isNativeEvmAsset, normalizeEpochToMs } from '../../../utils/helpers.js';
 import { fetchBebopQuote } from './fetchFromBebop.js';
 import { assertValidTrade, calculateRate } from './helpers.js';
 export const getBebopTradeContext = async ({ input, deps, from, receiver, }) => {
@@ -78,5 +78,6 @@ export const getBebopTradeContext = async ({ input, deps, from, receiver, }) =>
             from,
             deps,
         },
+        deadline: normalizeEpochToMs(quote.expiry),
     });
 };

package/dist/esm/swappers/BebopSwapper/utils/helpers.d.ts

@@ -2,7 +2,7 @@ import type { AssetId, ChainId } from '@shapeshiftoss/caip';
 import type { Asset } from '@shapeshiftoss/types';
 export declare const assetIdToBebopToken: (assetId: AssetId) => string;
 export declare const assetIdToBebopSolanaToken: (assetId: AssetId) => string;
-export declare const isSupportedChainId: (chainId: ChainId) => chainId is import("@shapeshiftoss/types").KnownChainIds.EthereumMainnet | import("@shapeshiftoss/types").KnownChainIds.AvalancheMainnet | import("@shapeshiftoss/types").KnownChainIds.OptimismMainnet | import("@shapeshiftoss/types").KnownChainIds.BnbSmartChainMainnet | import("@shapeshiftoss/types").KnownChainIds.PolygonMainnet | import("@shapeshiftoss/types").KnownChainIds.ArbitrumMainnet | import("@shapeshiftoss/types").KnownChainIds.BaseMainnet | import("@shapeshiftoss/types").KnownChainIds.SolanaMainnet;
+export declare const isSupportedChainId: (chainId: ChainId) => chainId is import("@shapeshiftoss/types").KnownChainIds.EthereumMainnet | import("@shapeshiftoss/types").KnownChainIds.AvalancheMainnet | import("@shapeshiftoss/types").KnownChainIds.OptimismMainnet | import("@shapeshiftoss/types").KnownChainIds.BnbSmartChainMainnet | import("@shapeshiftoss/types").KnownChainIds.PolygonMainnet | import("@shapeshiftoss/types").KnownChainIds.ArbitrumMainnet | import("@shapeshiftoss/types").KnownChainIds.BaseMainnet | import("@shapeshiftoss/types").KnownChainIds.SolanaMainnet | import("@shapeshiftoss/types").KnownChainIds.RobinhoodMainnet;
 export declare const assertValidTrade: ({ buyAsset, sellAsset, }: {
     buyAsset: Asset;
     sellAsset: Asset;

package/dist/esm/swappers/BobGatewaySwapper/swapperApi/getTradeQuote.js

@@ -1,6 +1,7 @@
 import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getBobGatewayStepData } from '../utils/getBobGatewayStepData.js';
 import { getBobGatewayTradeContext } from '../utils/getBobGatewayTradeContext.js';
 export const getBobGatewayTradeQuote = async (input, deps) => {
@@ -33,6 +34,7 @@ export const getBobGatewayTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/ButterSwap/swapperApi/getTradeQuote.js

@@ -4,6 +4,7 @@ import { Err, Ok } from '@sniptt/monads';
 import { getDefaultSlippageDecimalPercentageForSwapper } from '../../../constants.js';
 import { SwapperName, TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getButterSwapStepData } from '../utils/getButterSwapStepData.js';
 import { getButterSwapTradeContext } from '../utils/getButterSwapTradeContext.js';
 import { fetchTxData, isBuildTxSuccess } from '../xhr.js';
@@ -59,6 +60,7 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/ButterSwap/utils/helpers.js

@@ -3,20 +3,22 @@ import { isEvmChainId } from '@shapeshiftoss/chain-adapters';
 import { KnownChainIds } from '@shapeshiftoss/types';
 import { BigAmount, bnOrZero } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
+import { arbitrum, avalanche, base, bsc, mainnet as ethereum, optimism, polygon, robinhood, tron, } from 'viem/chains';
 import { TradeQuoteError } from '../../../types.js';
 import { makeSwapErrorRight } from '../../../utils/index.js';
 // https://docs.butternetwork.io/butter-swap-integration/butter-api-for-routing/get-supportedchainlist#butter-chain-id-explanation
 const BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID = {
-    1: KnownChainIds.EthereumMainnet,
-    137: KnownChainIds.PolygonMainnet,
-    56: KnownChainIds.BnbSmartChainMainnet,
-    42161: KnownChainIds.ArbitrumMainnet,
-    10: KnownChainIds.OptimismMainnet,
-    8453: KnownChainIds.BaseMainnet,
-    43114: KnownChainIds.AvalancheMainnet,
+    [ethereum.id]: KnownChainIds.EthereumMainnet,
+    [polygon.id]: KnownChainIds.PolygonMainnet,
+    [bsc.id]: KnownChainIds.BnbSmartChainMainnet,
+    [arbitrum.id]: KnownChainIds.ArbitrumMainnet,
+    [optimism.id]: KnownChainIds.OptimismMainnet,
+    [base.id]: KnownChainIds.BaseMainnet,
+    [avalanche.id]: KnownChainIds.AvalancheMainnet,
+    [robinhood.id]: KnownChainIds.RobinhoodMainnet,
     1360108768460801: KnownChainIds.SolanaMainnet,
     1360095883558913: KnownChainIds.BitcoinMainnet,
-    728126428: KnownChainIds.TronMainnet,
+    [tron.id]: KnownChainIds.TronMainnet,
 };
 const CHAIN_ID_TO_BUTTERSWAP_CHAIN_ID = Object.entries(BUTTERSWAP_CHAIN_ID_TO_CHAIN_ID).reduce((acc, [butterSwapChainId, chainId]) => {
     acc[chainId] = Number(butterSwapChainId);

package/dist/esm/swappers/CetusSwapper/swapperApi/getTradeQuote.js

@@ -1,5 +1,6 @@
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getCetusStepData } from './getCetusStepData.js';
 import { getCetusTradeContext } from './getCetusTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
@@ -24,6 +25,7 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/ChainflipSwapper/constants.d.ts

@@ -5,6 +5,7 @@ import type { SwapSource } from '../../types.js';
 import { ChainflipNetwork } from './types.js';
 export declare const CHAINFLIP_REGULAR_QUOTE: "regular";
 export declare const CHAINFLIP_DCA_QUOTE: "dca";
+export declare const CHAINFLIP_CHANNEL_DEADLINE_MS: number;
 export declare const ChainflipSupportedChainIds: readonly [KnownChainIds.EthereumMainnet, KnownChainIds.ArbitrumMainnet, KnownChainIds.BitcoinMainnet, KnownChainIds.SolanaMainnet, KnownChainIds.TronMainnet];
 export type ChainflipSupportedChainId = (typeof ChainflipSupportedChainIds)[number];
 export declare const ChainflipSupportedAssetIdsByChainId: Partial<Record<KnownChainIds, AssetId[]>>;

package/dist/esm/swappers/ChainflipSwapper/constants.js

@@ -4,6 +4,8 @@ import { SwapperName } from '../../types.js';
 import { ChainflipNetwork } from './types.js';
 export const CHAINFLIP_REGULAR_QUOTE = 'regular';
 export const CHAINFLIP_DCA_QUOTE = 'dca';
+// Deposit channels stay open ~24h - 6h keeps a 4x margin against depositing to an expired channel
+export const CHAINFLIP_CHANNEL_DEADLINE_MS = 6 * 60 * 60 * 1000;
 export const ChainflipSupportedChainIds = [
     KnownChainIds.EthereumMainnet,
     KnownChainIds.ArbitrumMainnet,

package/dist/esm/swappers/ChainflipSwapper/swapperApi/getTradeQuote.js

@@ -1,6 +1,7 @@
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight } from '../../../utils/index.js';
+import { CHAINFLIP_CHANNEL_DEADLINE_MS } from '../constants.js';
 import { getChainflipStepData } from '../utils/getChainflipStepData.js';
 import { getChainflipTradeContexts } from '../utils/getChainflipTradeContexts.js';
 import { calculateChainflipMinPrice, getChainFlipSwap } from '../utils/helpers.js';
@@ -66,6 +67,7 @@ export const getTradeQuote = async (input, deps) => {
         tradeQuotes.push({
             ...tradeCommon,
             quoteOrRate: 'quote',
+            deadline: Date.now() + CHAINFLIP_CHANNEL_DEADLINE_MS,
             receiveAddress,
             steps: [
                 {

package/dist/esm/swappers/CowSwapper/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -29,6 +29,7 @@ export const getCowSwapTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: stepDataArgs.cowswapQuoteResponse.quote.validTo * 1000,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/DebridgeSwapper/constant.js

@@ -1,28 +1,30 @@
-import { arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, bobChainId, bscChainId, cronosChainId, ethChainId, flowEvmChainId, gnosisChainId, hyperEvmChainId, lineaChainId, mantleChainId, megaethChainId, monadChainId, optimismChainId, plasmaChainId, polygonChainId, seiChainId, sonicChainId, storyChainId, } from '@shapeshiftoss/caip';
+import { arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, bobChainId, bscChainId, cronosChainId, ethChainId, flowEvmChainId, gnosisChainId, hyperEvmChainId, lineaChainId, mantleChainId, megaethChainId, monadChainId, optimismChainId, plasmaChainId, polygonChainId, robinhoodChainId, seiChainId, sonicChainId, storyChainId, } from '@shapeshiftoss/caip';
 import invert from 'lodash/invert';
 import { zeroAddress } from 'viem';
+import { arbitrum, avalanche, base, bsc, linea, mainnet as ethereum, optimism, polygon, robinhood, } from 'viem/chains';
 export const chainIdToDebridgeChainId = {
-    [ethChainId]: 1,
-    [optimismChainId]: 10,
-    [bscChainId]: 56,
+    [ethChainId]: ethereum.id,
+    [optimismChainId]: optimism.id,
+    [bscChainId]: bsc.id,
     [gnosisChainId]: 100000002,
-    [polygonChainId]: 137,
+    [polygonChainId]: polygon.id,
     [monadChainId]: 100000030,
     [hyperEvmChainId]: 100000022,
     [seiChainId]: 100000027,
-    [baseChainId]: 8453,
+    [baseChainId]: base.id,
     [plasmaChainId]: 100000028,
-    [arbitrumChainId]: 42161,
-    [avalancheChainId]: 43114,
+    [arbitrumChainId]: arbitrum.id,
+    [avalancheChainId]: avalanche.id,
     [mantleChainId]: 100000023,
     [cronosChainId]: 100000019,
     [berachainChainId]: 100000020,
-    [lineaChainId]: 59144,
+    [lineaChainId]: linea.id,
     [bobChainId]: 100000021,
     [sonicChainId]: 100000014,
     [storyChainId]: 100000013,
     [flowEvmChainId]: 100000009,
     [megaethChainId]: 100000031,
+    [robinhoodChainId]: robinhood.id,
 };
 export const debridgeChainIdToChainId = invert(chainIdToDebridgeChainId);
 export const DEBRIDGE_SUPPORTED_CHAIN_IDS = Object.keys(chainIdToDebridgeChainId);

package/dist/esm/swappers/DebridgeSwapper/getTradeQuote/getTradeQuote.js

@@ -1,5 +1,6 @@
 import { Err, Ok } from '@sniptt/monads';
 import { assertQuoteAddresses } from '../../../utils/index.js';
+import { FALLBACK_QUOTE_DEADLINE_MS } from '../../../utils/helpers.js';
 import { getDebridgeStepData } from '../utils/getDebridgeStepData.js';
 import { getDebridgeTradeContext } from '../utils/getDebridgeTradeContext.js';
 export const getTradeQuote = async (input, deps) => {
@@ -23,6 +24,7 @@ export const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/NearIntentsSwapper/endpoints.js

@@ -163,7 +163,9 @@ export const nearIntentsApi = {
             const message = getNearIntentsStatusMessage(statusResponse.status);
             // Extract buyTxHash from destination chain transactions
             const buyTxHash = statusResponse.swapDetails?.destinationChainTxHashes?.[0]?.hash;
-            const actualBuyAmountCryptoBaseUnit = statusResponse.swapDetails?.amountOut;
+            // amountOut is only meaningful destination-denominated on terminal success - in-flight and
+            // refund states may carry settlement-internal or refund values
+            const actualBuyAmountCryptoBaseUnit = statusResponse.status === 'SUCCESS' ? statusResponse.swapDetails?.amountOut : undefined;
             return {
                 status: txStatus,
                 buyTxHash,

package/dist/esm/swappers/NearIntentsSwapper/swapperApi/getTradeQuote.js

@@ -45,9 +45,16 @@ export const getTradeQuote = async (input, deps) => {
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
     const { transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const requestDeadlineMs = Date.parse(quoteRequest.deadline);
+    const responseDeadlineMs = Date.parse(quote.deadline ?? '');
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        // Deposits mined after our requested refund deadline refund instead of executing as quoted;
+        // the response deadline (when the deposit address goes inactive, ~72h) only binds if tighter
+        deadline: Number.isFinite(responseDeadlineMs)
+            ? Math.min(requestDeadlineMs, responseDeadlineMs)
+            : requestDeadlineMs,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/PortalsSwapper/getPortalsTradeQuote/getPortalsTradeQuote.js

@@ -2,7 +2,7 @@ import { BigNumber, bn } from '@shapeshiftoss/utils';
 import { Err, Ok } from '@sniptt/monads';
 import { TradeQuoteError } from '../../../types.js';
 import { assertQuoteAddresses, makeSwapErrorRight, makeTradeStepBuildFailedErr, } from '../../../utils/index.js';
-import { getTreasuryAddressFromChainId } from '../../../utils/helpers.js';
+import { FALLBACK_QUOTE_DEADLINE_MS, getTreasuryAddressFromChainId, normalizeEpochToMs, } from '../../../utils/helpers.js';
 import { fetchPortalsTradeOrder, PortalsError } from '../utils/fetchPortalsTradeOrder.js';
 import { getPortalsStepData } from '../utils/getPortalsStepData.js';
 import { getPortalsTradeContext } from '../utils/getPortalsTradeContext.js';
@@ -125,9 +125,20 @@ export const getPortalsTradeQuote = async (input, deps) => {
     if (maybeStepData.isErr())
         return Err(maybeStepData.unwrapErr());
     const { transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    // Nullable in practice (live validated orders return null) - numeric or ISO when supplied
+    const expiryMs = (() => {
+        if (!orderContext.expiry)
+            return undefined;
+        const numeric = Number(orderContext.expiry);
+        if (Number.isFinite(numeric))
+            return normalizeEpochToMs(numeric);
+        const parsed = Date.parse(orderContext.expiry);
+        return Number.isNaN(parsed) ? undefined : parsed;
+    })();
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: expiryMs ?? Date.now() + FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

package/dist/esm/swappers/RelaySwapper/constant.js

@@ -1,7 +1,7 @@
-import { abstractChainId, arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, blastChainId, bobChainId, bscChainId, btcChainId, celoChainId, cronosChainId, ethChainId, etherealChainId, flowEvmChainId, gnosisChainId, hemiChainId, hyperEvmChainId, inkChainId, katanaChainId, lineaChainId, mantleChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, plumeChainId, polygonChainId, scrollChainId, seiChainId, solanaChainId, soneiumChainId, sonicChainId, storyChainId, tronChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
+import { abstractChainId, arbitrumChainId, avalancheChainId, baseChainId, berachainChainId, blastChainId, bobChainId, bscChainId, btcChainId, celoChainId, cronosChainId, ethChainId, etherealChainId, flowEvmChainId, gnosisChainId, hemiChainId, hyperEvmChainId, inkChainId, katanaChainId, lineaChainId, mantleChainId, megaethChainId, modeChainId, monadChainId, optimismChainId, plasmaChainId, plumeChainId, polygonChainId, robinhoodChainId, scrollChainId, seiChainId, solanaChainId, soneiumChainId, sonicChainId, storyChainId, tronChainId, unichainChainId, worldChainChainId, zkSyncEraChainId, } from '@shapeshiftoss/caip';
 import invert from 'lodash/invert';
 import { zeroAddress } from 'viem';
-import { arbitrum, avalanche, base, berachain, blast, bob, bsc, celo, cronos, flowMainnet, gnosis, hemi, hyperEvm, ink, katana, linea, mainnet as ethereum, mantle, mode, monad, optimism, plasma, plumeMainnet, polygon, scroll, sei, soneium, sonic, story, unichain, worldchain, zksync, } from 'viem/chains';
+import { abstract, arbitrum, avalanche, base, berachain, blast, bob, bsc, celo, cronos, flowMainnet, gnosis, hemi, hyperEvm, ink, katana, linea, mainnet as ethereum, mantle, megaeth, mode, monad, optimism, plasma, plumeMainnet, polygon, robinhood, scroll, sei, soneium, sonic, story, tron, unichain, worldchain, zksync, } from 'viem/chains';
 import { TradeQuoteError } from '../../types.js';
 import { RelayErrorCode } from './utils/types.js';
 // https://docs.relay.link/resources/supported-chains
@@ -16,12 +16,12 @@ export const chainIdToRelayChainId = {
     [gnosisChainId]: gnosis.id,
     [avalancheChainId]: avalanche.id,
     [bscChainId]: bsc.id,
-    [tronChainId]: 728126428,
+    [tronChainId]: tron.id,
     [monadChainId]: monad.id,
     [hyperEvmChainId]: hyperEvm.id,
     [mantleChainId]: mantle.id,
     [inkChainId]: ink.id,
-    [megaethChainId]: 4326,
+    [megaethChainId]: megaeth.id,
     [plasmaChainId]: plasma.id,
     [katanaChainId]: katana.id,
     [etherealChainId]: 5064014,
@@ -43,7 +43,8 @@ export const chainIdToRelayChainId = {
     [modeChainId]: mode.id,
     [soneiumChainId]: soneium.id,
     [seiChainId]: sei.id,
-    [abstractChainId]: 2741,
+    [abstractChainId]: abstract.id,
+    [robinhoodChainId]: robinhood.id,
 };
 export var RelayStatusMessage;
 (function (RelayStatusMessage) {

package/dist/esm/swappers/RelaySwapper/endpoints.js

@@ -10,7 +10,7 @@ import { getTradeQuote } from './getTradeQuote/getTradeQuote.js';
 import { getTradeRate } from './getTradeRate/getTradeRate.js';
 import { getLatestRelayStatusMessage } from './utils/getLatestRelayStatusMessage.js';
 import { notifyTransactionIndexing } from './utils/notifyTransactionIndexing.js';
-import { relayService } from './utils/relayService.js';
+import { getRelayRequestConfig, relayService } from './utils/relayService.js';
 // Keep track of the trades we already notified the relay indexer about
 const txIndexingMap = new Map();
 export const relayApi = {
@@ -61,7 +61,7 @@ export const relayApi = {
         // relay.link tracks the swap by its origin chain transaction
         const swapperTxId = txHash;
         const swapperTxLink = `https://relay.link/transaction/${txHash}`;
-        const maybeStatusResponse = await relayService.get(`${config.VITE_RELAY_API_URL}/intents/status/v2?requestId=${relayMetadata.relayId}`);
+        const maybeStatusResponse = await relayService.get(`${config.VITE_RELAY_API_URL}/intents/status/v3?requestId=${relayMetadata.relayId}`, getRelayRequestConfig(config));
         if (maybeStatusResponse.isErr()) {
             return {
                 buyTxHash: undefined,
@@ -76,9 +76,13 @@ export const relayApi = {
             switch (statusResponse.status) {
                 case 'success':
                     return TxStatus.Confirmed;
+                case 'waiting':
+                case 'delayed':
                 case 'pending':
+                case 'depositing':
+                case 'submitted':
                     return TxStatus.Pending;
-                case 'failed':
+                case 'failure':
                 case 'refund':
                     return TxStatus.Failed;
                 default: