@shapeshiftoss/swapper 18.1.0 → 20.0.0

package/dist/cjs/exactOutputFiltering.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cjs/exactOutputFiltering.test.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const constants_1 = require("./constants");
+const swapper_1 = require("./swapper");
+const types_1 = require("./types");
+const assets_1 = require("./utils/test-data/assets");
+// Exact-output support is structural - a swapper cannot claim it without implementing it
+(0, vitest_1.describe)('exact output capability', () => {
+    (0, vitest_1.it)('is implemented by the swappers whose upstream API can honour an exact buy amount', () => {
+        for (const swapperName of [types_1.SwapperName.NearIntents, types_1.SwapperName.Relay]) {
+            (0, vitest_1.expect)(constants_1.swappers[swapperName]?.getExactOutputTradeRate).toBeDefined();
+            (0, vitest_1.expect)(constants_1.swappers[swapperName]?.getExactOutputTradeQuote).toBeDefined();
+        }
+    });
+    (0, vitest_1.it)('is absent everywhere else', () => {
+        const exactOutputCapable = Object.values(types_1.SwapperName).filter(swapperName => constants_1.swappers[swapperName]?.getExactOutputTradeRate !== undefined);
+        (0, vitest_1.expect)(exactOutputCapable).toEqual([types_1.SwapperName.Relay, types_1.SwapperName.NearIntents]);
+    });
+});
+const exactOutputInput = {
+    sellAsset: assets_1.ETH,
+    buyAsset: assets_1.BTC,
+    buyAmountCryptoBaseUnit: '100000',
+    affiliateBps: '0',
+    allowMultiHop: true,
+    receiveAddress: undefined,
+    accountNumber: undefined,
+    quoteOrRate: 'rate',
+};
+const deps = {};
+(0, vitest_1.describe)('getTradeRates on an exact buy amount', () => {
+    // Silently omitting these would read as the swapper being unavailable rather than unable
+    (0, vitest_1.it)('reports an error for a swapper that cannot quote one', async () => {
+        const result = await (0, swapper_1.getTradeRates)(exactOutputInput, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeDefined();
+        (0, vitest_1.expect)(result?.isErr()).toBe(true);
+        (0, vitest_1.expect)(result?.unwrapErr().code).toEqual(types_1.TradeQuoteError.ExactOutputNotSupported);
+        (0, vitest_1.expect)(result?.swapperName).toEqual(types_1.SwapperName.Thorchain);
+    });
+    (0, vitest_1.it)('skips entirely on a zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeRates)({ ...exactOutputInput, buyAmountCryptoBaseUnit: '0' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+    // The base-unit regex upstream admits padded zeros, so the check can't be a string comparison
+    (0, vitest_1.it)('skips entirely on a padded zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeRates)({ ...exactOutputInput, buyAmountCryptoBaseUnit: '00' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+});
+// Quotes dispatch on the same input shape as rates, so they gate the same way
+(0, vitest_1.describe)('getTradeQuotes on an exact buy amount', () => {
+    const exactOutputQuoteInput = {
+        ...exactOutputInput,
+        receiveAddress: 'bc1qar0srrr7xfkvy5l643lydnw9re59gtzzwf5mdq',
+        accountNumber: 0,
+        quoteOrRate: 'quote',
+    };
+    (0, vitest_1.it)('reports an error for a swapper that cannot quote one', async () => {
+        const result = await (0, swapper_1.getTradeQuotes)(exactOutputQuoteInput, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeDefined();
+        (0, vitest_1.expect)(result?.isErr()).toBe(true);
+        (0, vitest_1.expect)(result?.unwrapErr().code).toEqual(types_1.TradeQuoteError.ExactOutputNotSupported);
+        (0, vitest_1.expect)(result?.swapperName).toEqual(types_1.SwapperName.Thorchain);
+    });
+    (0, vitest_1.it)('skips entirely on a zero buy amount', async () => {
+        const result = await (0, swapper_1.getTradeQuotes)({ ...exactOutputQuoteInput, buyAmountCryptoBaseUnit: '0' }, types_1.SwapperName.Thorchain, deps);
+        (0, vitest_1.expect)(result).toBeUndefined();
+    });
+});

package/dist/cjs/swapper.d.ts

@@ -1,3 +1,3 @@
-import type { GetTradeQuoteInput, GetTradeRateInput, QuoteResult, RateResult, SwapperDeps, SwapperName } from './types';
-export declare const getTradeQuotes: (getTradeQuoteInput: GetTradeQuoteInput, swapperName: SwapperName, deps: SwapperDeps) => Promise<QuoteResult | undefined>;
-export declare const getTradeRates: (getTradeRateInput: GetTradeRateInput, swapperName: SwapperName, deps: SwapperDeps, quoteTimeoutMs?: number) => Promise<RateResult | undefined>;
+import type { GetExactOutputTradeQuoteInput, GetExactOutputTradeRateInput, GetTradeQuoteInput, GetTradeRateInput, QuoteResult, RateResult, SwapperDeps, SwapperName } from './types';
+export declare const getTradeQuotes: (getTradeQuoteInput: GetTradeQuoteInput | GetExactOutputTradeQuoteInput, swapperName: SwapperName, deps: SwapperDeps) => Promise<QuoteResult | undefined>;
+export declare const getTradeRates: (getTradeRateInput: GetTradeRateInput | GetExactOutputTradeRateInput, swapperName: SwapperName, deps: SwapperDeps, quoteTimeoutMs?: number) => Promise<RateResult | undefined>;

package/dist/cjs/swapper.js

@@ -2,19 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeRates = exports.getTradeQuotes = void 0;
 const utils_1 = require("@shapeshiftoss/utils");
+const monads_1 = require("@sniptt/monads");
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const utils_2 = require("./utils");
+const EXACT_OUTPUT_NOT_SUPPORTED_ERROR = (0, utils_2.makeSwapErrorRight)({
+    code: types_1.TradeQuoteError.ExactOutputNotSupported,
+    message: 'This swapper cannot derive a sell amount from an exact buy amount',
+});
 const getTradeQuotes = async (getTradeQuoteInput, swapperName, deps) => {
     if ((0, utils_1.bnOrZero)(getTradeQuoteInput.affiliateBps).lt(0))
         return;
-    if (getTradeQuoteInput.sellAmountIncludingProtocolFeesCryptoBaseUnit === '0')
-        return;
     const swapper = constants_1.swappers[swapperName];
     if (swapper === undefined)
         return;
+    // Compared numerically so a padded zero can't slip through as an amount
+    const drivingAmount = 'buyAmountCryptoBaseUnit' in getTradeQuoteInput
+        ? getTradeQuoteInput.buyAmountCryptoBaseUnit
+        : getTradeQuoteInput.sellAmountIncludingProtocolFeesCryptoBaseUnit;
+    if ((0, utils_1.bnOrZero)(drivingAmount).isZero())
+        return;
+    const quotePromise = 'buyAmountCryptoBaseUnit' in getTradeQuoteInput
+        ? swapper.getExactOutputTradeQuote?.(getTradeQuoteInput, deps)
+        : swapper.getTradeQuote(getTradeQuoteInput, deps);
+    if (!quotePromise)
+        return { ...(0, monads_1.Err)(EXACT_OUTPUT_NOT_SUPPORTED_ERROR), swapperName };
     try {
-        const quote = await (0, utils_1.timeoutMonadic)(swapper.getTradeQuote(getTradeQuoteInput, deps), constants_1.QUOTE_TIMEOUT_MS, constants_1.QUOTE_TIMEOUT_ERROR);
+        const quote = await (0, utils_1.timeoutMonadic)(quotePromise, constants_1.QUOTE_TIMEOUT_MS, constants_1.QUOTE_TIMEOUT_ERROR);
         return {
             ...quote,
             swapperName,
@@ -30,13 +44,22 @@ exports.getTradeQuotes = getTradeQuotes;
 const getTradeRates = async (getTradeRateInput, swapperName, deps, quoteTimeoutMs = constants_1.QUOTE_TIMEOUT_MS) => {
     if ((0, utils_1.bnOrZero)(getTradeRateInput.affiliateBps).lt(0))
         return;
-    if (getTradeRateInput.sellAmountIncludingProtocolFeesCryptoBaseUnit === '0')
-        return;
     const swapper = constants_1.swappers[swapperName];
     if (swapper === undefined)
         return;
+    // Compared numerically so a padded zero can't slip through as an amount
+    const drivingAmount = 'buyAmountCryptoBaseUnit' in getTradeRateInput
+        ? getTradeRateInput.buyAmountCryptoBaseUnit
+        : getTradeRateInput.sellAmountIncludingProtocolFeesCryptoBaseUnit;
+    if ((0, utils_1.bnOrZero)(drivingAmount).isZero())
+        return;
+    const ratePromise = 'buyAmountCryptoBaseUnit' in getTradeRateInput
+        ? swapper.getExactOutputTradeRate?.(getTradeRateInput, deps)
+        : swapper.getTradeRate(getTradeRateInput, deps);
+    if (!ratePromise)
+        return { ...(0, monads_1.Err)(EXACT_OUTPUT_NOT_SUPPORTED_ERROR), swapperName };
     try {
-        const { timed, original } = (0, utils_1.timeoutMonadicWithOriginal)(swapper.getTradeRate(getTradeRateInput, deps), quoteTimeoutMs, (0, utils_2.makeSwapErrorRight)({
+        const { timed, original } = (0, utils_1.timeoutMonadicWithOriginal)(ratePromise, quoteTimeoutMs, (0, utils_2.makeSwapErrorRight)({
             code: types_1.TradeQuoteError.Timeout,
             message: `quote timed out after ${quoteTimeoutMs / 1000}s`,
         }));

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

@@ -31,7 +31,8 @@ exports.chainIdToAcrossChainId = {
     // Across uses a custom Solana chain ID
     [caip_1.solanaChainId]: 34268394551451,
     [caip_1.scrollChainId]: chains_1.scroll.id,
-    [caip_1.megaethChainId]: 4326,
+    [caip_1.megaethChainId]: chains_1.megaeth.id,
+    [caip_1.robinhoodChainId]: chains_1.robinhood.id,
 };
 exports.acrossChainIdToChainId = (0, invert_1.default)(exports.chainIdToAcrossChainId);
 exports.ACROSS_SUPPORTED_CHAIN_IDS = Object.keys(exports.chainIdToAcrossChainId);

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

@@ -36,7 +36,7 @@ exports.acrossApi = {
                 return sourceTxStatus;
             txHash = sourceTxStatus.buyTxHash ?? txHash;
         }
-        const maybeStatusResponse = await acrossService_1.acrossService.get(`${config.VITE_ACROSS_API_URL}/deposit/status?depositTxnRef=${txHash}`);
+        const maybeStatusResponse = await acrossService_1.acrossService.get(`${config.VITE_ACROSS_API_URL}/deposit/status?depositTxnRef=${txHash}`, (0, acrossService_1.getAcrossRequestConfig)(config));
         if (maybeStatusResponse.isErr()) {
             return {
                 buyTxHash: undefined,

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

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

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

@@ -1,5 +1,8 @@
+import type { AxiosRequestConfig } from 'axios';
+import type { SwapperConfig } from '../../../types';
 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("../../..").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("../../..").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("../../..").SwapErrorRight>>;
+    get: <T = any>(url: string, config?: AxiosRequestConfig<any> | undefined) => Promise<import("@sniptt/monads").Result<import("axios").AxiosResponse<T, any, {}>, import("../../../types").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").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").SwapErrorRight>>;
 };
+export declare const getAcrossRequestConfig: (config: SwapperConfig) => AxiosRequestConfig | undefined;

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

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.acrossService = void 0;
+exports.getAcrossRequestConfig = exports.acrossService = void 0;
 const axios_1 = __importDefault(require("axios"));
 const utils_1 = require("../../../utils");
 const axiosConfig = {
@@ -15,3 +15,7 @@ const axiosConfig = {
 };
 const acrossServiceBase = axios_1.default.create(axiosConfig);
 exports.acrossService = (0, utils_1.makeSwapperAxiosServiceMonadic)(acrossServiceBase);
+const getAcrossRequestConfig = (config) => config.VITE_ACROSS_API_KEY
+    ? { headers: { Authorization: `Bearer ${config.VITE_ACROSS_API_KEY}` } }
+    : undefined;
+exports.getAcrossRequestConfig = getAcrossRequestConfig;

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

@@ -22,6 +22,6 @@ 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_1.acrossService.get(url);
+    return acrossService_1.acrossService.get(url, (0, acrossService_1.getAcrossRequestConfig)(config));
 };
 exports.fetchAcrossTrade = fetchAcrossTrade;

package/dist/cjs/swappers/AcrossSwapper/utils/getAcrossStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { AcrossSwapTx } from './types';
 type BaseArgs = {
     swapTx: AcrossSwapTx;
+    sellAmountCryptoBaseUnit: string;
     spenderAddress: string;
     fallbackNetworkFeeCryptoBaseUnit: string;
 };

package/dist/cjs/swappers/AcrossSwapper/utils/getAcrossStepData.js

@@ -10,7 +10,7 @@ const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 const solana_1 = require("../../../utils/solana");
 async function getAcrossStepData(args) {
-    const { swapTx, sellAsset, spenderAddress, from, type, input, fallbackNetworkFeeCryptoBaseUnit, deps, } = args;
+    const { swapTx, sellAsset, sellAmountCryptoBaseUnit, spenderAddress, from, type, input, fallbackNetworkFeeCryptoBaseUnit, deps, } = args;
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     switch (swapTx.ecosystem) {
         case 'evm': {
@@ -25,7 +25,7 @@ async function getAcrossStepData(args) {
             };
             const stateOverride = {
                 sellAsset,
-                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 spenderAddress,
             };
             if (type === 'rate') {

package/dist/cjs/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/cjs/swappers/AcrossSwapper/utils/getAcrossTradeContext.js

@@ -173,11 +173,13 @@ const getAcrossTradeContext = async ({ input, deps, depositor, recipient, }) =>
         stepDataArgs: {
             swapTx: quote.swapTx,
             sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             from: depositor,
             spenderAddress: allowanceContract,
             fallbackNetworkFeeCryptoBaseUnit: quote.fees.originGas.amount,
             deps,
         },
+        deadline: (0, helpers_1.normalizeEpochToMs)(quote.quoteExpiryTimestamp),
     });
 };
 exports.getAcrossTradeContext = getAcrossTradeContext;

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

@@ -4,6 +4,7 @@ exports.getTradeQuote = exports.getTradeQuoteWithWallet = void 0;
 const hdwallet_core_1 = require("@shapeshiftoss/hdwallet-core");
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getArbitrumBridgeStepData_1 = require("../utils/getArbitrumBridgeStepData");
 const getArbitrumBridgeTradeContext_1 = require("../utils/getArbitrumBridgeTradeContext");
 const getTradeQuoteWithWallet = async (inputWithWallet, deps) => {
@@ -36,6 +37,7 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -5,6 +5,7 @@ const monads_1 = require("@sniptt/monads");
 const starknet_1 = require("starknet");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getAvnuTradeContext_1 = require("../utils/getAvnuTradeContext");
 const getTradeQuote = async (input, deps) => {
     const { sellAsset, accountNumber } = input;
@@ -20,7 +21,7 @@ const getTradeQuote = async (input, deps) => {
         const maybeContext = await (0, getAvnuTradeContext_1.getAvnuTradeContext)({ input, takerAddress: normalizedSendAddress });
         if (maybeContext.isErr())
             return (0, monads_1.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,
@@ -35,6 +36,7 @@ const getTradeQuote = async (input, deps) => {
             ...tradeCommon,
             receiveAddress: normalizedReceiveAddress,
             quoteOrRate: 'quote',
+            deadline: deadline ?? Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
             steps: [
                 {
                     ...stepCommon,

package/dist/cjs/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/cjs/swappers/AvnuSwapper/utils/getAvnuTradeContext.js

@@ -93,6 +93,7 @@ const getAvnuTradeContext = async ({ input, takerAddress, }) => {
             protocolFees,
             quoteId: bestQuote.quoteId,
             sellTokenAddress,
+            deadline: bestQuote.expiry ? (0, helpers_1.normalizeEpochToMs)(bestQuote.expiry) : undefined,
         });
     }
     catch (error) {

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

@@ -4,8 +4,9 @@ exports.getBebopSolanaTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getBebopSolanaTradeContext_1 = require("../utils/getBebopSolanaTradeContext");
-const helpers_1 = require("../utils/helpers");
+const helpers_2 = require("../utils/helpers");
 const getBebopSolanaTradeQuote = async (input, deps) => {
     const { accountNumber } = input;
     const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
@@ -21,7 +22,7 @@ const getBebopSolanaTradeQuote = async (input, deps) => {
     if (maybeContext.isErr())
         return (0, monads_1.Err)(maybeContext.unwrapErr());
     const { tradeCommon, stepCommon, response } = maybeContext.unwrap();
-    if (!(0, helpers_1.isBebopSolanaTxSafe)(response.solana_tx, sendAddress)) {
+    if (!(0, helpers_2.isBebopSolanaTxSafe)(response.solana_tx, sendAddress)) {
         return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
             message: 'Bebop signer index mismatch - taker not at expected position',
             code: types_1.TradeQuoteError.NoRouteFound,
@@ -30,6 +31,8 @@ const getBebopSolanaTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        // The sealed multi-signer tx is blockhash-pinned, so the provider expiry governs
+        deadline: (0, helpers_1.normalizeEpochToMs)(response.expiry),
         receiveAddress,
         steps: [
             {

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

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

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

@@ -3,8 +3,8 @@ import type { Address, Hex } from 'viem';
 import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetSolanaTradeQuoteInput, GetSolanaTradeRateInput } from '../../types';
 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/cjs/swappers/BebopSwapper/types.js

@@ -10,6 +10,7 @@ exports.bebopSupportedEvmChainIds = [
     types_1.KnownChainIds.AvalancheMainnet,
     types_1.KnownChainIds.OptimismMainnet,
     types_1.KnownChainIds.BnbSmartChainMainnet,
+    types_1.KnownChainIds.RobinhoodMainnet,
 ];
 exports.bebopSupportedChainIds = [
     ...exports.bebopSupportedEvmChainIds,
@@ -23,6 +24,7 @@ exports.chainIdToBebopChain = {
     [types_1.KnownChainIds.AvalancheMainnet]: 'avalanche',
     [types_1.KnownChainIds.OptimismMainnet]: 'optimism',
     [types_1.KnownChainIds.BnbSmartChainMainnet]: 'bsc',
+    [types_1.KnownChainIds.RobinhoodMainnet]: 'robinhood',
     [types_1.KnownChainIds.SolanaMainnet]: 'solana',
 };
 exports.BEBOP_NATIVE_MARKER = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';

package/dist/cjs/swappers/BebopSwapper/utils/getBebopStepData.d.ts

@@ -3,6 +3,7 @@ import type { StepDataArgs, SwapErrorRight, TxBuildData } from '../../../types';
 import type { BebopQuoteResponse } from '../types';
 type BaseArgs = {
     tx: BebopQuoteResponse['tx'];
+    sellAmountCryptoBaseUnit: string;
     spenderAddress: string;
 };
 export type GetBebopStepDataArgs = StepDataArgs<BaseArgs, {

package/dist/cjs/swappers/BebopSwapper/utils/getBebopStepData.js

@@ -8,7 +8,7 @@ const viem_1 = require("viem");
 const utils_2 = require("../../../utils");
 const evm_1 = require("../../../utils/evm");
 async function getBebopStepData(args) {
-    const { tx, spenderAddress, sellAsset, type, input, from, deps } = args;
+    const { tx, spenderAddress, sellAsset, sellAmountCryptoBaseUnit, type, input, from, deps } = args;
     const adapter = deps.assertGetEvmChainAdapter(sellAsset.chainId);
     const supportsEIP1559 = 'supportsEIP1559' in input ? input.supportsEIP1559 : false;
     if (type === 'rate') {
@@ -43,7 +43,7 @@ async function getBebopStepData(args) {
             supportsEIP1559,
             stateOverride: {
                 sellAsset,
-                sellAmountCryptoBaseUnit: input.sellAmountIncludingProtocolFeesCryptoBaseUnit,
+                sellAmountCryptoBaseUnit,
                 spenderAddress,
             },
         });

package/dist/cjs/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/cjs/swappers/BebopSwapper/utils/getBebopTradeContext.js

@@ -78,9 +78,11 @@ const getBebopTradeContext = async ({ input, deps, from, receiver, }) => {
             tx: quote.tx,
             spenderAddress: allowanceContract,
             sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
             from,
             deps,
         },
+        deadline: (0, helpers_1.normalizeEpochToMs)(quote.expiry),
     });
 };
 exports.getBebopTradeContext = getBebopTradeContext;

package/dist/cjs/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/cjs/swappers/BobGatewaySwapper/swapperApi/getTradeQuote.js

@@ -4,6 +4,7 @@ exports.getBobGatewayTradeQuote = void 0;
 const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getBobGatewayStepData_1 = require("../utils/getBobGatewayStepData");
 const getBobGatewayTradeContext_1 = require("../utils/getBobGatewayTradeContext");
 const getBobGatewayTradeQuote = async (input, deps) => {
@@ -36,6 +37,7 @@ const getBobGatewayTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -7,6 +7,7 @@ const monads_1 = require("@sniptt/monads");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
 const utils_2 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getButterSwapStepData_1 = require("../utils/getButterSwapStepData");
 const getButterSwapTradeContext_1 = require("../utils/getButterSwapTradeContext");
 const xhr_1 = require("../xhr");
@@ -62,6 +63,7 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -6,20 +6,22 @@ const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const types_1 = require("@shapeshiftoss/types");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
+const chains_1 = require("viem/chains");
 const types_2 = require("../../../types");
 const utils_2 = require("../../../utils");
 // 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: types_1.KnownChainIds.EthereumMainnet,
-    137: types_1.KnownChainIds.PolygonMainnet,
-    56: types_1.KnownChainIds.BnbSmartChainMainnet,
-    42161: types_1.KnownChainIds.ArbitrumMainnet,
-    10: types_1.KnownChainIds.OptimismMainnet,
-    8453: types_1.KnownChainIds.BaseMainnet,
-    43114: types_1.KnownChainIds.AvalancheMainnet,
+    [chains_1.mainnet.id]: types_1.KnownChainIds.EthereumMainnet,
+    [chains_1.polygon.id]: types_1.KnownChainIds.PolygonMainnet,
+    [chains_1.bsc.id]: types_1.KnownChainIds.BnbSmartChainMainnet,
+    [chains_1.arbitrum.id]: types_1.KnownChainIds.ArbitrumMainnet,
+    [chains_1.optimism.id]: types_1.KnownChainIds.OptimismMainnet,
+    [chains_1.base.id]: types_1.KnownChainIds.BaseMainnet,
+    [chains_1.avalanche.id]: types_1.KnownChainIds.AvalancheMainnet,
+    [chains_1.robinhood.id]: types_1.KnownChainIds.RobinhoodMainnet,
     1360108768460801: types_1.KnownChainIds.SolanaMainnet,
     1360095883558913: types_1.KnownChainIds.BitcoinMainnet,
-    728126428: types_1.KnownChainIds.TronMainnet,
+    [chains_1.tron.id]: types_1.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/cjs/swappers/CetusSwapper/swapperApi/getTradeQuote.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const getCetusStepData_1 = require("./getCetusStepData");
 const getCetusTradeContext_1 = require("./getCetusTradeContext");
 const getTradeQuote = async (input, deps) => {
@@ -27,6 +28,7 @@ const getTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
+        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
         receiveAddress,
         steps: [
             {

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

@@ -5,6 +5,7 @@ import type { SwapSource } from '../../types';
 import { ChainflipNetwork } from './types';
 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/cjs/swappers/ChainflipSwapper/constants.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChainflipStatusMessage = exports.usdcAsset = exports.CHAINFLIP_DCA_BOOST_SWAP_SOURCE = exports.CHAINFLIP_DCA_SWAP_SOURCE = exports.CHAINFLIP_BOOST_SWAP_SOURCE = exports.CHAINFLIP_SWAP_SOURCE = exports.chainIdToChainflipNetwork = exports.ChainflipSupportedAssetIdsByChainId = exports.ChainflipSupportedChainIds = exports.CHAINFLIP_DCA_QUOTE = exports.CHAINFLIP_REGULAR_QUOTE = void 0;
+exports.ChainflipStatusMessage = exports.usdcAsset = exports.CHAINFLIP_DCA_BOOST_SWAP_SOURCE = exports.CHAINFLIP_DCA_SWAP_SOURCE = exports.CHAINFLIP_BOOST_SWAP_SOURCE = exports.CHAINFLIP_SWAP_SOURCE = exports.chainIdToChainflipNetwork = exports.ChainflipSupportedAssetIdsByChainId = exports.ChainflipSupportedChainIds = exports.CHAINFLIP_CHANNEL_DEADLINE_MS = exports.CHAINFLIP_DCA_QUOTE = exports.CHAINFLIP_REGULAR_QUOTE = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
 const types_2 = require("../../types");
 const types_3 = require("./types");
 exports.CHAINFLIP_REGULAR_QUOTE = 'regular';
 exports.CHAINFLIP_DCA_QUOTE = 'dca';
+// Deposit channels stay open ~24h - 6h keeps a 4x margin against depositing to an expired channel
+exports.CHAINFLIP_CHANNEL_DEADLINE_MS = 6 * 60 * 60 * 1000;
 exports.ChainflipSupportedChainIds = [
     types_1.KnownChainIds.EthereumMainnet,
     types_1.KnownChainIds.ArbitrumMainnet,

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

@@ -4,6 +4,7 @@ exports.getTradeQuote = void 0;
 const monads_1 = require("@sniptt/monads");
 const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
+const constants_1 = require("../constants");
 const getChainflipStepData_1 = require("../utils/getChainflipStepData");
 const getChainflipTradeContexts_1 = require("../utils/getChainflipTradeContexts");
 const helpers_1 = require("../utils/helpers");
@@ -69,6 +70,7 @@ const getTradeQuote = async (input, deps) => {
         tradeQuotes.push({
             ...tradeCommon,
             quoteOrRate: 'quote',
+            deadline: Date.now() + constants_1.CHAINFLIP_CHANNEL_DEADLINE_MS,
             receiveAddress,
             steps: [
                 {

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

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