@shapeshiftoss/swapper 20.2.0 → 20.4.0

package/dist/cjs/swappers/SymbiosisSwapper/utils/helpers.test.js

@@ -0,0 +1,151 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const caip_1 = require("@shapeshiftoss/caip");
+const unchained_client_1 = require("@shapeshiftoss/unchained-client");
+const vitest_1 = require("vitest");
+const constants_1 = require("./constants");
+const helpers_1 = require("./helpers");
+const types_1 = require("./types");
+const BSC_USDC_ADDRESS = '0x8AC76a51cc950d9822D68b83fE1Ad97B32Cd580d';
+const BSC_USDC_ASSET_ID = 'eip155:56/erc20:0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d';
+// The fees array of a live Arbitrum USDC -> BSC quote: one host chain sToken entry, one destination entry
+const liveFees = [
+    {
+        provider: 'symbiosis',
+        description: 'Cross-chain fee',
+        value: {
+            symbol: 'sUSDC',
+            address: '0xc317169a336b484f65B0AB4A794bBe66a7491E83',
+            amount: '250000',
+            chainId: 13863860,
+            decimals: 6,
+        },
+    },
+    {
+        provider: 'symbiosis',
+        description: 'Cross-chain fee',
+        value: {
+            symbol: 'USDC',
+            address: BSC_USDC_ADDRESS,
+            amount: '250000000000000000',
+            chainId: 56,
+            decimals: 18,
+        },
+    },
+];
+(0, vitest_1.describe)('getSymbiosisSlippageBps', () => {
+    (0, vitest_1.it)('raises slippage below the Symbiosis minimum to 10 bps', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisSlippageBps)('0.0005')).toBe(10);
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisSlippageBps)('0')).toBe(10);
+    });
+    (0, vitest_1.it)('lowers slippage above the Symbiosis maximum to 1000 bps', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisSlippageBps)('0.25')).toBe(1000);
+    });
+});
+(0, vitest_1.describe)('getSymbiosisPartnerAddress', () => {
+    (0, vitest_1.it)('sends the partner address at the registered rate', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisPartnerAddress)('60').unwrap()).toBe(constants_1.SYMBIOSIS_PARTNER_ADDRESS);
+    });
+    (0, vitest_1.it)('omits the partner address for a fee-free swap', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisPartnerAddress)('0').unwrap()).toBeUndefined();
+    });
+    (0, vitest_1.it)('rejects any other rate instead of silently dropping the fee', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisPartnerAddress)('30').isErr()).toBe(true);
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisPartnerAddress)('80').isErr()).toBe(true);
+    });
+});
+(0, vitest_1.describe)('buildSymbiosisTronCallData', () => {
+    const functionSelector = 'metaRoute((bytes,bytes,address[],address,address,uint256,bool,address,bytes))';
+    (0, vitest_1.it)('prefixes the parameters with the 4-byte selector of the signature', () => {
+        const data = `0x${'00'.repeat(31)}20`;
+        (0, vitest_1.expect)((0, helpers_1.buildSymbiosisTronCallData)({ functionSelector, data })).toBe(`0xa11b1198${'00'.repeat(31)}20`);
+    });
+});
+(0, vitest_1.describe)('getSymbiosisFeeAssetId', () => {
+    (0, vitest_1.it)('maps a Tron hex address to its base58 trc20 asset id', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisFeeAssetId)({
+            chainId: 728126428,
+            address: '0xa614f803b6fd780986a42c78ec9c7f77e6ded13c',
+        })).toBe(caip_1.usdtOnTronAssetId);
+    });
+});
+(0, vitest_1.describe)('getSymbiosisProtocolFees', () => {
+    (0, vitest_1.it)('keeps resolvable fees and skips host chain sToken fees', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisProtocolFees)(liveFees)).toEqual({
+            [BSC_USDC_ASSET_ID]: {
+                amountCryptoBaseUnit: '250000000000000000',
+                asset: { symbol: 'USDC', chainId: 'eip155:56', precision: 18 },
+                requiresBalance: false,
+            },
+        });
+    });
+    (0, vitest_1.it)('sums fees charged in the same asset', () => {
+        const fees = (0, helpers_1.getSymbiosisProtocolFees)([liveFees[1], liveFees[1]]);
+        (0, vitest_1.expect)(fees[BSC_USDC_ASSET_ID]?.amountCryptoBaseUnit).toBe('500000000000000000');
+    });
+});
+(0, vitest_1.describe)('getSymbiosisTradeStatus', () => {
+    const buySymbiosisChainId = 56;
+    const makeResponse = (overrides) => ({
+        status: { code: types_1.SymbiosisStatusCode.Success, text: 'Success' },
+        txIn: { hash: '0xsell', chainId: 42161 },
+        tx: { hash: '0xbuy', chainId: 56 },
+        ...overrides,
+    });
+    (0, vitest_1.it)('confirms with the destination hash once the destination tx is on the buy chain', () => {
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response: makeResponse({}), buySymbiosisChainId })).toEqual({
+            status: unchained_client_1.TxStatus.Confirmed,
+            buyTxHash: '0xbuy',
+            message: undefined,
+        });
+    });
+    (0, vitest_1.it)('stays pending when Success describes the source transaction itself', () => {
+        const response = makeResponse({ tx: { hash: '0xsell', chainId: 42161 } });
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response, buySymbiosisChainId })).toEqual({
+            status: unchained_client_1.TxStatus.Pending,
+            buyTxHash: undefined,
+            message: undefined,
+        });
+    });
+    (0, vitest_1.it)('names the transit token when the destination swap did not complete', () => {
+        const response = makeResponse({
+            transitTokenSent: {
+                chainId: 56,
+                address: BSC_USDC_ADDRESS,
+                decimals: 18,
+                symbol: 'USDC',
+                amount: '250000000000000000',
+            },
+        });
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response, buySymbiosisChainId })).toEqual({
+            status: unchained_client_1.TxStatus.Confirmed,
+            buyTxHash: '0xbuy',
+            message: 'Received 0.25 USDC instead of the buy asset',
+        });
+    });
+    (0, vitest_1.it)('maps pending, stuck, reverted and not found', () => {
+        const pending = makeResponse({ status: { code: types_1.SymbiosisStatusCode.Pending, text: '' } });
+        const stuck = makeResponse({ status: { code: types_1.SymbiosisStatusCode.Stuck, text: '' } });
+        const reverted = makeResponse({ status: { code: types_1.SymbiosisStatusCode.Reverted, text: '' } });
+        const notFound = makeResponse({ status: { code: types_1.SymbiosisStatusCode.NotFound, text: '' } });
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response: pending, buySymbiosisChainId }).status).toBe(unchained_client_1.TxStatus.Pending);
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response: stuck, buySymbiosisChainId })).toEqual({
+            status: unchained_client_1.TxStatus.Pending,
+            buyTxHash: undefined,
+            message: 'Swap is stuck and is being reverted by Symbiosis',
+        });
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response: reverted, buySymbiosisChainId })).toEqual({
+            status: unchained_client_1.TxStatus.Failed,
+            buyTxHash: undefined,
+            message: 'Swap was reverted by Symbiosis',
+        });
+        (0, vitest_1.expect)((0, helpers_1.getSymbiosisTradeStatus)({ response: notFound, buySymbiosisChainId }).status).toBe(unchained_client_1.TxStatus.Unknown);
+    });
+});
+(0, vitest_1.describe)('isTronSourceTxFailed', () => {
+    (0, vitest_1.it)('is true for any contract result other than SUCCESS', () => {
+        (0, vitest_1.expect)((0, helpers_1.isTronSourceTxFailed)({ ret: [{ contractRet: 'REVERT' }] })).toBe(true);
+        (0, vitest_1.expect)((0, helpers_1.isTronSourceTxFailed)({ ret: [{ contractRet: 'OUT_OF_ENERGY' }] })).toBe(true);
+        (0, vitest_1.expect)((0, helpers_1.isTronSourceTxFailed)({ ret: [{ contractRet: 'SUCCESS' }] })).toBe(false);
+    });
+});

package/dist/cjs/swappers/SymbiosisSwapper/utils/symbiosisService.d.ts

@@ -0,0 +1,5 @@
+export declare const symbiosisService: {
+    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>>;
+};

package/dist/cjs/swappers/SymbiosisSwapper/utils/symbiosisService.js

@@ -0,0 +1,18 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.symbiosisService = void 0;
+const axios_1 = __importDefault(require("axios"));
+const utils_1 = require("../../../utils");
+const constants_1 = require("./constants");
+const symbiosisServiceBase = axios_1.default.create({
+    timeout: 10000,
+    headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+        'X-Partner-Id': constants_1.SYMBIOSIS_PARTNER_ID,
+    },
+});
+exports.symbiosisService = (0, utils_1.makeSwapperAxiosServiceMonadic)(symbiosisServiceBase);

package/dist/cjs/swappers/SymbiosisSwapper/utils/types.d.ts

@@ -0,0 +1,83 @@
+import type { GetEvmTradeQuoteInput, GetEvmTradeRateInput, GetTronTradeQuoteInput, GetTronTradeRateInput } from '../../../types';
+export type SymbiosisTradeQuoteInput = GetEvmTradeQuoteInput | GetTronTradeQuoteInput;
+export type SymbiosisTradeRateInput = GetEvmTradeRateInput | GetTronTradeRateInput;
+export type SymbiosisToken = {
+    chainId: number;
+    address: string;
+    decimals: number;
+    symbol: string;
+};
+export type SymbiosisTokenAmount = SymbiosisToken & {
+    amount: string;
+};
+export type SymbiosisQuoteRequest = {
+    tokenAmountIn: Omit<SymbiosisTokenAmount, 'symbol'>;
+    tokenOut: Omit<SymbiosisToken, 'symbol'>;
+    from: string;
+    to: string;
+    slippage: number;
+    disabledProviders: string;
+    partnerAddress?: string;
+};
+export type SymbiosisFee = {
+    provider: string;
+    description?: string;
+    value: SymbiosisTokenAmount;
+};
+export type SymbiosisEvmTx = {
+    chainId: number;
+    to: string;
+    data: string;
+    value?: string;
+};
+export type SymbiosisTronTx = {
+    chainId: number;
+    from: string;
+    to: string;
+    data: string;
+    value?: string;
+    feeLimit: number;
+    functionSelector?: string;
+};
+export type SymbiosisSwapTx = {
+    type: 'evm';
+    tx: SymbiosisEvmTx;
+} | {
+    type: 'tron';
+    tx: SymbiosisTronTx;
+};
+export type SymbiosisQuoteResponse = SymbiosisSwapTx & {
+    kind: string;
+    labels: string[];
+    approveTo?: string;
+    tokenAmountOut: SymbiosisTokenAmount;
+    tokenAmountOutMin: SymbiosisTokenAmount;
+    fees: SymbiosisFee[];
+    estimatedTime: number;
+};
+export type SymbiosisErrorResponse = {
+    code: number;
+    message: string;
+};
+export declare enum SymbiosisStatusCode {
+    NotFound = -1,
+    Success = 0,
+    Pending = 1,
+    Stuck = 2,
+    Reverted = 3
+}
+export type SymbiosisTxResponse = {
+    status: {
+        code: SymbiosisStatusCode;
+        text: string;
+    };
+    tx?: {
+        hash?: string;
+        chainId: number;
+    };
+    txIn?: {
+        hash?: string;
+        chainId: number;
+    };
+    transitTokenSent?: SymbiosisTokenAmount;
+};

package/dist/cjs/swappers/SymbiosisSwapper/utils/types.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SymbiosisStatusCode = void 0;
+var SymbiosisStatusCode;
+(function (SymbiosisStatusCode) {
+    SymbiosisStatusCode[SymbiosisStatusCode["NotFound"] = -1] = "NotFound";
+    SymbiosisStatusCode[SymbiosisStatusCode["Success"] = 0] = "Success";
+    SymbiosisStatusCode[SymbiosisStatusCode["Pending"] = 1] = "Pending";
+    SymbiosisStatusCode[SymbiosisStatusCode["Stuck"] = 2] = "Stuck";
+    SymbiosisStatusCode[SymbiosisStatusCode["Reverted"] = 3] = "Reverted";
+})(SymbiosisStatusCode || (exports.SymbiosisStatusCode = SymbiosisStatusCode = {}));

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

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.thorchainApi = void 0;
-const types_1 = require("../../types");
 const cosmossdk_1 = require("../../utils/cosmossdk");
 const evm_1 = require("../../utils/evm");
 const solana_1 = require("../../utils/solana");
 const thorchain_1 = require("../../utils/thorchain");
+const tron_1 = require("../../utils/tron");
 const utxo_1 = require("../../utils/utxo");
 const getTradeQuote_1 = require("./getTradeQuote/getTradeQuote");
 const getTradeRate_1 = require("./getTradeRate/getTradeRate");
-const swapperName = types_1.SwapperName.Thorchain;
 exports.thorchainApi = {
     getTradeRate: (input, deps) => (0, getTradeRate_1.getTradeRate)(input, deps),
     getTradeQuote: (input, deps) => (0, getTradeQuote_1.getTradeQuote)(input, deps),
@@ -21,8 +20,8 @@ exports.thorchainApi = {
     getCosmosSdkTransactionFees: cosmossdk_1.getCosmosSdkTransactionFees,
     getUnsignedSolanaTransaction: solana_1.getUnsignedSolanaTransaction,
     getSolanaTransactionFees: solana_1.getSolanaTransactionFees,
-    getUnsignedTronTransaction: input => thorchain_1.tron.getUnsignedTronTransaction(input, swapperName),
-    getTronTransactionFees: input => thorchain_1.tron.getTronTransactionFees(input, swapperName),
+    getUnsignedTronTransaction: tron_1.getUnsignedTronTransaction,
+    getTronTransactionFees: tron_1.getTronTransactionFees,
     checkTradeStatus: input => {
         const { config } = input;
         const nodeUrl = `${config.VITE_THORCHAIN_NODE_URL}/thorchain`;

package/dist/cjs/swappers/ThorchainSwapper/generated/generatedThorLongtailTokens.json

@@ -1017,6 +1017,7 @@
     "eip155:1/erc20:0x2c06ba9e7f0daccbc1f6a33ea67e85bb68fbee3a",
     "eip155:1/erc20:0xcbb8f1bda10b9696c57e13bc128fe674769dcec0",
     "eip155:1/erc20:0x72dfb2e44f59c5ad2bafe84314e5b99a7cd5075e",
+    "eip155:1/erc20:0xce682c89c63d2850cb2ca898e44d6c7c30d897a6",
     "eip155:43114/erc20:0xc891eb4cbdeff6e073e859e987815ed1505c2acd",
     "eip155:43114/erc20:0xd24c2ad096400b6fbcd2ad8b24e7acbc21a1da64",
     "eip155:43114/erc20:0x47c3118ad183712acd42648e9e522e13690f29a0",

package/dist/cjs/swappers/ThorchainSwapper/generated/generatedTradableAssetMap.json

@@ -41,5 +41,6 @@
     "THOR.TCY": "cosmos:thorchain-1/slip44:tcy",
     "TRON.TRX": "tron:0x2b6653dc/slip44:195",
     "TRON.USDT-TR7NHQJEKQXGTCI8Q8ZY4PL8OTSZGJLJ6T": "tron:0x2b6653dc/trc20:tr7nhqjekqxgtci8q8zy4pl8otszgjlj6t",
+    "ZEC.ZEC": "bip122:00040fe8ec8471911baa1db1266ea15d/slip44:133",
     "THOR.RUNE": "cosmos:thorchain-1/slip44:931"
 }

package/dist/cjs/swappers/ThorchainSwapper/utils/addL1ToLongtailPartsToMemo/addL1ToLongtailPartsToMemo.js

@@ -41,7 +41,12 @@ const addL1ToLongtailPartsToMemo = ({ sellAssetChainId, quotedMemo, aggregator,
         finalAssetAddress: finalAssetContractAddressShortened,
     });
     const [prefix, nativeAssetName, address, nativeAssetLimitWithManualSlippage, affiliate, affiliateBps, aggregatorLastTwoChars, finalAssetContract,] = quotedMemoWithAggregatorAndFinalAssetContract.split(thorchain_1.MEMO_PART_DELIMITER);
-    const shortenedNativeAssetName = longTailHelpers_1.shortenedNativeAssetNameByNativeAssetName[nativeAssetName];
+    // THORNode quote memos may already use the shortened native asset name
+    const shortenedNativeAssetNames = Object.values(longTailHelpers_1.shortenedNativeAssetNameByNativeAssetName);
+    const isAlreadyShortened = shortenedNativeAssetNames.includes(nativeAssetName);
+    const shortenedNativeAssetName = isAlreadyShortened
+        ? nativeAssetName
+        : longTailHelpers_1.shortenedNativeAssetNameByNativeAssetName[nativeAssetName];
     (0, assert_1.default)(shortenedNativeAssetName, 'cannot find shortened native asset name');
     const memoWithoutFinalAssetLimit = [
         prefix,

package/dist/cjs/swappers/ThorchainSwapper/utils/addL1ToLongtailPartsToMemo/addL1ToLongtailPartsToMemo.test.js

@@ -37,6 +37,21 @@ const slippageBps = 100; // 1%
         // The aggregator will turn the finalAssetAmountOut from 94136714201 to 9413671420 using the last 2 bytes as exponents
         `=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100:d2:a6df4741:94136714201`);
     });
+    (0, vitest_1.it)('should accept a quoted memo with an already shortened native asset name', () => {
+        const finalAssetAmountOut = '9508759019';
+        const quotedMemo = `=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100`;
+        const modifiedMemo = (0, addL1ToLongtailPartsToMemo_1.addL1ToLongtailPartsToMemo)({
+            sellAssetChainId: caip_1.ethChainId,
+            quotedMemo,
+            aggregator: AGGREGATOR_ADDRESS,
+            finalAssetAssetId: FINAL_ASSET_ASSETID,
+            finalAssetAmountOut,
+            slippageBps,
+            longtailTokens: THORCHAIN_ASSETIDS_ONE_COLLISION,
+            affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,
+        });
+        (0, vitest_1.expect)(modifiedMemo).toBe(`=:e:0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6:42:ss:100:d2:a6df4741:94136714201`);
+    });
     (0, vitest_1.it)('should throw if chainId is BCH and initial memo length is > 220', () => {
         const finalAssetAmountOut = '2083854765519275828179229';
         const memoOver220Bytes = `=:ETH.ETH:${REALLY_BIG_ADDRESS}:42:ss:100`;

package/dist/cjs/swappers/ThorchainSwapper/utils/assertValidLongtailTrade.js

@@ -94,6 +94,13 @@ const assertValidL1ToLongtailTrade = async ({ sellAsset, buyAsset, deps, }) => {
             details: { sellAssetChainId: sellAsset.chainId },
         }));
     }
+    if (sellAsset.assetId === buyAssetFeeAsset.assetId) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: `[getThorTradeQuote] - Cannot swap ${sellAsset.assetId} to itself before the aggregator.`,
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+            details: { buyAsset, sellAsset },
+        }));
+    }
     return (0, monads_1.Ok)({ buyAssetFeeAsset, longtailTokens });
 };
 exports.assertValidL1ToLongtailTrade = assertValidL1ToLongtailTrade;

package/dist/cjs/swappers/ThorchainSwapper/utils/getL1ToLongtailQuote.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailQuote = void 0;
-const contracts_1 = require("@shapeshiftoss/contracts");
 const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
 const constants_1 = require("../../../constants");
@@ -85,7 +84,6 @@ const getL1ToLongtailQuote = async (input, deps, streamingInterval, swapperName)
                 buyAmountAfterFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
-                allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
                 transactionData,
                 feeData: { ...s.feeData, networkFeeCryptoBaseUnit },
             })),

package/dist/cjs/swappers/ThorchainSwapper/utils/getL1ToLongtailRate.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getL1ToLongtailRate = void 0;
-const contracts_1 = require("@shapeshiftoss/contracts");
 const monads_1 = require("@sniptt/monads");
 const thorchain_1 = require("../../../utils/thorchain");
 const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
@@ -38,7 +37,6 @@ const getL1ToLongtailRate = async (input, deps, streamingInterval, swapperName)
                 buyAmountAfterFeesCryptoBaseUnit: quotedAmountOut.toString(),
                 // This is wrong, we should get the get the value before fees or display ETH value received after the thorchain bridge
                 buyAmountBeforeFeesCryptoBaseUnit: quotedAmountOut.toString(),
-                allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
             })),
             isLongtail: true,
         });

package/dist/cjs/swappers/ThorchainSwapper/utils/getLongtailQuote.js

@@ -77,7 +77,7 @@ const getLongtailToL1Quote = async (input, deps, streamingInterval, swapperName)
         return (0, monads_1.Ok)({
             ...quote,
             // The aggregator swapIn deadline is tighter than the daemon quote expiry
-            deadline: Math.min(quote.deadline, Number(deadline) * 1000),
+            deadline: Math.min(quote.deadline ?? Infinity, Number(deadline) * 1000),
             data: data ?? quote.data,
             // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
             steps: quote.steps.map(s => ({

package/dist/cjs/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.d.ts

@@ -1,2 +1,2 @@
 import type { AssetId } from '@shapeshiftoss/caip';
-export declare const getUniqueAddressSubstring: (destinationAssetId: AssetId, longTailAssetIds: AssetId[]) => AssetId;
+export declare const getUniqueAddressSubstring: (destinationAssetId: AssetId, longTailAssetIds: AssetId[]) => string;

package/dist/cjs/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.js

@@ -1,27 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUniqueAddressSubstring = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const MINIMUM_UNIQUE_SUBSTRING = 2;
+// Mirrors THORNode's externalAssetMatch: a case-insensitive suffix match against the target chain's token list only
 const getUniqueAddressSubstring = (destinationAssetId, longTailAssetIds) => {
-    const MINIMUM_UNIQUE_SUBSTRING = 2;
-    let maybeShortenedDestinationAddress = destinationAssetId;
-    const substringsCount = {};
-    for (let length = MINIMUM_UNIQUE_SUBSTRING; length <= destinationAssetId.length - 2; length++) {
-        const currentSubstring = destinationAssetId.slice(-length);
-        substringsCount[currentSubstring] = 0;
+    const { chainId, assetReference } = (0, caip_1.fromAssetId)(destinationAssetId);
+    const address = assetReference.toLowerCase();
+    const sameChainAddresses = longTailAssetIds
+        .map(assetId => (0, caip_1.fromAssetId)(assetId))
+        .filter(asset => asset.chainId === chainId)
+        .map(asset => asset.assetReference.toLowerCase());
+    if (!sameChainAddresses.includes(address))
+        return address;
+    for (let length = MINIMUM_UNIQUE_SUBSTRING; length < address.length; length++) {
+        const suffix = address.slice(-length);
+        const matchCount = sameChainAddresses.filter(sameChainAddress => sameChainAddress.endsWith(suffix)).length;
+        if (matchCount === 1)
+            return suffix;
     }
-    longTailAssetIds.forEach(assetId => {
-        Object.keys(substringsCount).forEach(substring => {
-            if (assetId.includes(substring)) {
-                substringsCount[substring] += 1;
-            }
-        });
-    });
-    for (const [substring, count] of Object.entries(substringsCount)) {
-        if (count === 1) {
-            maybeShortenedDestinationAddress = substring;
-            break;
-        }
-    }
-    return maybeShortenedDestinationAddress;
+    return address;
 };
 exports.getUniqueAddressSubstring = getUniqueAddressSubstring;

package/dist/cjs/swappers/ThorchainSwapper/utils/getUniqueAddressSubstring/getUniqueAddressSubstring.test.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const caip_1 = require("@shapeshiftoss/caip");
 const vitest_1 = require("vitest");
+const generatedThorLongtailTokens_json_1 = __importDefault(require("../../generated/generatedThorLongtailTokens.json"));
 const getUniqueAddressSubstring_1 = require("./getUniqueAddressSubstring");
 const FINAL_ASSET_ASSETID = (0, caip_1.toAssetId)({
     chainId: caip_1.ethChainId,
@@ -18,6 +22,16 @@ const BIGGER_COLLIDING_FINAL_ASSETID = (0, caip_1.toAssetId)({
     assetReference: '0xa0b86991c6218b36c1d19d4a2e9eb032a6dF4741',
     assetNamespace: 'erc20',
 });
+const SAME_ADDRESS_OTHER_CHAIN_ASSETID = (0, caip_1.toAssetId)({
+    chainId: caip_1.bscChainId,
+    assetReference: '0x8a65ac0E23F31979db06Ec62Af62b432a6dF4741',
+    assetNamespace: 'erc20',
+});
+const ONE_INCH_ASSETID = (0, caip_1.toAssetId)({
+    chainId: caip_1.ethChainId,
+    assetReference: '0x111111111117dc0aa78b770fa6a738034120c302',
+    assetNamespace: 'erc20',
+});
 const SHORTENED_FINAL_ASSET_ADDRESS = 'a6df4741';
 const BIGGER_SHORTENED_FINAL_ASSET_ADDRESS = '432a6df4741';
 const THORCHAIN_ASSETIDS_ONE_COLLISION = [FINAL_ASSET_ASSETID, COLLIDING_FINAL_ASSETID];
@@ -35,4 +49,21 @@ const THORCHAIN_ASSETIDS_TWO_COLLISION = [
         const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, THORCHAIN_ASSETIDS_TWO_COLLISION);
         (0, vitest_1.expect)(substring).toBe(BIGGER_SHORTENED_FINAL_ASSET_ADDRESS);
     });
+    (0, vitest_1.it)('should ignore the same address on other chains', () => {
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, [
+            ...THORCHAIN_ASSETIDS_ONE_COLLISION,
+            SAME_ADDRESS_OTHER_CHAIN_ASSETID,
+        ]);
+        (0, vitest_1.expect)(substring).toBe(SHORTENED_FINAL_ASSET_ADDRESS);
+    });
+    (0, vitest_1.it)('should return the full address when the asset is not in the list', () => {
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(FINAL_ASSET_ASSETID, [COLLIDING_FINAL_ASSETID]);
+        (0, vitest_1.expect)(substring).toBe('0x8a65ac0e23f31979db06ec62af62b432a6df4741');
+    });
+    (0, vitest_1.it)('should return a hex suffix for an address listed on multiple chains', () => {
+        (0, vitest_1.expect)(generatedThorLongtailTokens_json_1.default).toContain(ONE_INCH_ASSETID);
+        const substring = (0, getUniqueAddressSubstring_1.getUniqueAddressSubstring)(ONE_INCH_ASSETID, generatedThorLongtailTokens_json_1.default);
+        (0, vitest_1.expect)(substring).toMatch(/^[0-9a-f]+$/);
+        (0, vitest_1.expect)('0x111111111117dc0aa78b770fa6a738034120c302'.endsWith(substring)).toBe(true);
+    });
 });

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.js

@@ -7,9 +7,11 @@ const types_1 = require("../../../types");
 const utils_1 = require("../../../utils");
 const helpers_1 = require("../../../utils/helpers");
 const fetchFromZrx_1 = require("../utils/fetchFromZrx");
+const getZrxNativeCheckDeadline_1 = require("../utils/getZrxNativeCheckDeadline");
 const getZrxStepData_1 = require("../utils/getZrxStepData");
 const getZrxTradeContext_1 = require("../utils/getZrxTradeContext");
 const helpers_2 = require("../utils/helpers");
+const isValidDeadlineSeconds = (deadline) => Number.isSafeInteger(deadline) && deadline > 0 && Number.isSafeInteger(deadline * 1000);
 const getZrxTradeQuote = async (input, deps) => {
     const { sellAsset, buyAsset, accountNumber, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
     const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
@@ -42,6 +44,16 @@ const getZrxTradeQuote = async (input, deps) => {
         return (0, monads_1.Err)(maybeZrxQuoteResponse.unwrapErr());
     const { sellAmount, buyAmount, fees, permit2, transaction, route } = maybeZrxQuoteResponse.unwrap();
     const permit2Eip712 = permit2?.eip712;
+    const permit2Deadline = permit2Eip712 ? Number(permit2Eip712.message.deadline) : undefined;
+    if (permit2Deadline !== undefined &&
+        ((typeof permit2Eip712?.message.deadline !== 'string' &&
+            typeof permit2Eip712?.message.deadline !== 'number') ||
+            !isValidDeadlineSeconds(permit2Deadline))) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Invalid Permit2 deadline from 0x response',
+            code: types_1.TradeQuoteError.InvalidResponse,
+        }));
+    }
     if (!(0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) && !(0, helpers_2.isWrappedNativeSell)(route) && !permit2Eip712) {
         return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
             message: 'Missing required Permit2 metadata from 0x response',
@@ -56,6 +68,17 @@ const getZrxTradeQuote = async (input, deps) => {
             details: { transaction, permit2Eip712 },
         }));
     }
+    // Permit2 calldata is not decodable until the signature is spliced in, so only native sells are read
+    const nativeCheckDeadline = permit2Eip712
+        ? undefined
+        : (0, getZrxNativeCheckDeadline_1.getZrxNativeCheckDeadline)(transaction.data);
+    if (nativeCheckDeadline !== undefined && !isValidDeadlineSeconds(nativeCheckDeadline)) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Invalid NATIVE_CHECK deadline in 0x calldata',
+            code: types_1.TradeQuoteError.InvalidResponse,
+        }));
+    }
+    const deadlineSeconds = permit2Deadline ?? nativeCheckDeadline;
     const maybeContext = (0, getZrxTradeContext_1.getZrxTradeContext)({
         input,
         deps,
@@ -79,7 +102,7 @@ const getZrxTradeQuote = async (input, deps) => {
     const tradeQuote = {
         ...tradeCommon,
         quoteOrRate: 'quote',
-        deadline: Date.now() + helpers_1.FALLBACK_QUOTE_DEADLINE_MS,
+        deadline: deadlineSeconds === undefined ? undefined : deadlineSeconds * 1000,
         receiveAddress,
         steps: [
             {

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeQuote/getZrxTradeQuote.test.d.ts

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