@shapeshiftoss/swapper 17.7.3 → 18.1.0

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

@@ -1,73 +1,94 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLongtailToL1Quote = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
+const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const assert_1 = __importDefault(require("assert"));
-const thorchain_utils_1 = require("../../../thorchain-utils");
 const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
+const utils_2 = require("../../../utils");
+const thorchain_1 = require("../../../utils/thorchain");
+const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
 const getBestAggregator_1 = require("./getBestAggregator");
 const longTailHelpers_1 = require("./longTailHelpers");
+const LONGTAIL_TO_L1_DEADLINE_SECONDS = 600n;
 // This just uses UniswapV3 to get the longtail quote for now.
 const getLongtailToL1Quote = async (input, deps, streamingInterval, swapperName) => {
     const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
-    /*
-      We only support ethereum longtail -> L1 swaps for now.
-      We can later add BSC via UniV3, or Avalanche (e.g. via PancakeSwap)
-    */
-    if (sellAsset.chainId !== caip_1.ethChainId) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported chainId ${sellAsset.chainId}.`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { sellAssetChainId: sellAsset.chainId },
-        }));
-    }
-    const sellChainId = sellAsset.chainId;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(sellChainId)?.getFeeAssetId();
-    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
-    if (!buyAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${sellChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId: sellChainId },
-        }));
-    }
-    // TODO: use more than just UniswapV3, and also consider trianglar routes.
-    const publicClient = contracts_1.viemClientByChainId[sellChainId];
-    (0, assert_1.default)(publicClient !== undefined, `no public client found for chainId '${sellChainId}'`);
+    const addresses = (0, utils_2.assertQuoteAddresses)(input);
+    if (addresses.isErr())
+        return (0, monads_1.Err)(addresses.unwrapErr());
+    const { sendAddress: from } = addresses.unwrap();
+    const assertion = (0, assertValidLongtailTrade_1.assertValidLongtailToL1Trade)({ sellAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset } = assertion.unwrap();
     const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getTokenFromAsset)(sellAsset), (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), sellAmountIncludingProtocolFeesCryptoBaseUnit);
-    if (maybeBestAggregator.isErr()) {
+    if (maybeBestAggregator.isErr())
         return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
-    }
     const { bestAggregator, quotedAmountOut } = maybeBestAggregator.unwrap();
+    // Paranoia - a zero expected amount out would likely lead to a loss of funds
+    if (quotedAmountOut <= 0n) {
+        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+            message: '[getLongtailToL1Quote] - expected a positive amount out',
+            code: types_1.TradeQuoteError.InternalError,
+        }));
+    }
     const l1Tol1QuoteInput = {
         ...input,
         sellAsset: buyAssetFeeAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: quotedAmountOut.toString(),
     };
-    const thorchainQuotes = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_utils_1.TradeType.LongTailToL1, swapperName);
-    return thorchainQuotes.andThen(quotes => {
-        const updatedQuotes = quotes.map(q => ({
-            ...q,
-            aggregator: bestAggregator,
+    // The sell side is asserted to be ethereum above, so these are always evm quotes
+    const maybeL1Quotes = await (0, thorchain_1.getThorL1TradeQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_1.TradeType.LongTailToL1, swapperName);
+    if (maybeL1Quotes.isErr())
+        return (0, monads_1.Err)(maybeL1Quotes.unwrapErr());
+    const maybeQuotes = await Promise.allSettled(maybeL1Quotes.unwrap().map(async (quote) => {
+        const amountOutMin = BigInt((0, utils_1.bnOrZero)(quotedAmountOut.toString())
+            .times((0, utils_1.bn)(1).minus(quote.slippageTolerancePercentageDecimal ?? 0))
+            .toFixed(0, utils_1.BigNumber.ROUND_UP));
+        // Paranoia: ensure we have this to prevent sandwich attacks on the first step of a LongtailToL1 trade
+        if (amountOutMin <= 0n) {
+            return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+                message: '[getLongtailToL1Quote] - expected amountOutMin to be a positive amount',
+                code: types_1.TradeQuoteError.InternalError,
+            }));
+        }
+        // The deadline doubles as the THORChain deposit expiry, so it stays pinned to quote time rather
+        // than being refreshed at execution - a stale quote reverts instead of executing on newer terms
+        const deadline = BigInt(Math.floor(Date.now() / 1000)) + LONGTAIL_TO_L1_DEADLINE_SECONDS;
+        // Swap the direct deposit built by getThorL1TradeQuote for the aggregator swapIn we execute
+        const maybeStepData = await (0, thorchain_1.getThorStepData)({
+            type: 'quote',
+            input,
+            from,
+            deps,
+            swapperName,
+            tradeType: thorchain_1.TradeType.LongTailToL1,
+            sellAsset,
+            sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            memo: quote.memo,
+            expiry: quote.expiry,
+            rawMemo: quote.memo,
+            longtail: { aggregator: bestAggregator, amountOutMin, deadline },
+        });
+        if (maybeStepData.isErr())
+            return (0, monads_1.Err)(maybeStepData.unwrapErr());
+        const { data, transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+        return (0, monads_1.Ok)({
+            ...quote,
+            data: data ?? quote.data,
             // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
-            steps: q.steps.map(s => ({
+            steps: quote.steps.map(s => ({
                 ...s,
                 sellAmountIncludingProtocolFeesCryptoBaseUnit,
                 sellAsset,
                 allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
+                transactionData,
+                feeData: { ...s.feeData, networkFeeCryptoBaseUnit },
             })),
             isLongtail: true,
-            longtailData: {
-                longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),
-            },
-        }));
-        return (0, monads_1.Ok)(updatedQuotes);
-    });
+        });
+    }));
+    return (0, thorchain_1.getSuccessfulTrades)(maybeQuotes);
 };
 exports.getLongtailToL1Quote = getLongtailToL1Quote;

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

@@ -1,4 +1,4 @@
 import type { Result } from '@sniptt/monads';
-import type { ThorTradeRate } from '../../../thorchain-utils';
-import type { GetTradeRateInput, SwapErrorRight, SwapperDeps, SwapperName } from '../../../types';
-export declare const getLongtailToL1Rate: (input: GetTradeRateInput, deps: SwapperDeps, streamingInterval: number, swapperName: SwapperName) => Promise<Result<ThorTradeRate[], SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, SwapperName } from '../../../types';
+import type { ThorTradeRate, ThorTradeRateInput } from '../../../utils/thorchain';
+export declare const getLongtailToL1Rate: (input: ThorTradeRateInput, deps: SwapperDeps, streamingInterval: number, swapperName: SwapperName) => Promise<Result<ThorTradeRate[], SwapErrorRight>>;

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

@@ -1,73 +1,40 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLongtailToL1Rate = void 0;
-const caip_1 = require("@shapeshiftoss/caip");
 const contracts_1 = require("@shapeshiftoss/contracts");
 const monads_1 = require("@sniptt/monads");
-const assert_1 = __importDefault(require("assert"));
-const thorchain_utils_1 = require("../../../thorchain-utils");
-const types_1 = require("../../../types");
-const utils_1 = require("../../../utils");
+const thorchain_1 = require("../../../utils/thorchain");
+const assertValidLongtailTrade_1 = require("./assertValidLongtailTrade");
 const getBestAggregator_1 = require("./getBestAggregator");
 const longTailHelpers_1 = require("./longTailHelpers");
 // This just uses UniswapV3 to get the longtail quote for now.
 const getLongtailToL1Rate = async (input, deps, streamingInterval, swapperName) => {
     const { sellAsset, sellAmountIncludingProtocolFeesCryptoBaseUnit } = input;
-    /*
-      We only support ethereum longtail -> L1 swaps for now.
-      We can later add BSC via UniV3, or Avalanche (e.g. via PancakeSwap)
-    */
-    if (sellAsset.chainId !== caip_1.ethChainId) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - Unsupported chainId ${sellAsset.chainId}.`,
-            code: types_1.TradeQuoteError.UnsupportedChain,
-            details: { sellAssetChainId: sellAsset.chainId },
-        }));
-    }
-    const sellChainId = sellAsset.chainId;
-    const buyAssetFeeAssetId = deps.assertGetChainAdapter(sellChainId)?.getFeeAssetId();
-    const buyAssetFeeAsset = buyAssetFeeAssetId ? deps.assetsById[buyAssetFeeAssetId] : undefined;
-    if (!buyAssetFeeAsset) {
-        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
-            message: `[getThorTradeQuote] - No native buy asset found for ${sellChainId}.`,
-            code: types_1.TradeQuoteError.InternalError,
-            details: { sellAssetChainId: sellChainId },
-        }));
-    }
-    // TODO: use more than just UniswapV3, and also consider trianglar routes.
-    const publicClient = contracts_1.viemClientByChainId[sellChainId];
-    (0, assert_1.default)(publicClient !== undefined, `no public client found for chainId '${sellChainId}'`);
+    const assertion = (0, assertValidLongtailTrade_1.assertValidLongtailToL1Trade)({ sellAsset, deps });
+    if (assertion.isErr())
+        return (0, monads_1.Err)(assertion.unwrapErr());
+    const { buyAssetFeeAsset } = assertion.unwrap();
     const maybeBestAggregator = await (0, getBestAggregator_1.getBestAggregator)(buyAssetFeeAsset, (0, longTailHelpers_1.getTokenFromAsset)(sellAsset), (0, longTailHelpers_1.getWrappedToken)(buyAssetFeeAsset), sellAmountIncludingProtocolFeesCryptoBaseUnit);
     if (maybeBestAggregator.isErr()) {
         return (0, monads_1.Err)(maybeBestAggregator.unwrapErr());
     }
-    const { bestAggregator, quotedAmountOut } = maybeBestAggregator.unwrap();
+    const { quotedAmountOut } = maybeBestAggregator.unwrap();
     const l1Tol1QuoteInput = {
         ...input,
         sellAsset: buyAssetFeeAsset,
         sellAmountIncludingProtocolFeesCryptoBaseUnit: quotedAmountOut.toString(),
     };
-    const thorchainRates = await (0, thorchain_utils_1.getL1RateOrQuote)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_utils_1.TradeType.LongTailToL1, swapperName);
-    return thorchainRates.andThen(rates => {
-        const updatedRates = rates.map(q => ({
-            ...q,
-            aggregator: bestAggregator,
-            // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
-            steps: q.steps.map(s => ({
-                ...s,
-                sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                sellAsset,
-                allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
-            })),
-            isLongtail: true,
-            longtailData: {
-                longtailToL1ExpectedAmountOut: quotedAmountOut.toString(),
-            },
-        }));
-        return (0, monads_1.Ok)(updatedRates);
-    });
+    const maybeL1Rates = await (0, thorchain_1.getThorL1TradeRate)(l1Tol1QuoteInput, deps, streamingInterval, thorchain_1.TradeType.LongTailToL1, swapperName);
+    return maybeL1Rates.map(rates => rates.map(rate => ({
+        ...rate,
+        // This logic will need to be updated to support multi-hop, if that's ever implemented for THORChain
+        steps: rate.steps.map(s => ({
+            ...s,
+            sellAmountIncludingProtocolFeesCryptoBaseUnit,
+            sellAsset,
+            allowanceContract: contracts_1.TS_AGGREGATOR_TOKEN_TRANSFER_PROXY_CONTRACT_MAINNET,
+        })),
+        isLongtail: true,
+    })));
 };
 exports.getLongtailToL1Rate = getLongtailToL1Rate;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
-const thorchain_utils_1 = require("../../../../thorchain-utils");
+const thorchain_1 = require("../../../../utils/thorchain");
 const constants_1 = require("../../constants");
 const getShortenedFinalAssetLimit_1 = require("./getShortenedFinalAssetLimit");
 const RECEIVE_ADDRESS = '0x32DBc9Cf9E8FbCebE1e0a2ecF05Ed86Ca3096Cb6';
@@ -21,7 +21,7 @@ const expectedL1AmountOut = '42';
             memoWithoutFinalAssetLimit: quotedMemo,
             finalAssetLimitWithManualSlippage: '950875902132134123',
         });
-        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_utils_1.addFinalAssetLimitToMemo)({
+        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_1.addFinalAssetLimitToMemo)({
             memo: quotedMemo,
             finalAssetLimit,
             affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,
@@ -78,7 +78,7 @@ const expectedL1AmountOut = '42';
             memoWithoutFinalAssetLimit: quotedMemo,
             finalAssetLimitWithManualSlippage: '950875902132134123',
         });
-        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_utils_1.addFinalAssetLimitToMemo)({
+        const modifiedMemoWithfinalAssetLimitOut = (0, thorchain_1.addFinalAssetLimitToMemo)({
             memo: quotedMemo,
             finalAssetLimit,
             affiliate: constants_1.THORCHAIN_AFFILIATE_NAME,

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

@@ -3,8 +3,8 @@ import type { Asset } from '@shapeshiftoss/types';
 import { Token } from '@uniswap/sdk-core';
 import { FeeAmount } from '@uniswap/v3-sdk';
 import type { Address, GetContractReturnType, PublicClient } from 'viem';
-import type { ThornodePoolResponse } from '../../../thorchain-utils';
-import { TradeType } from '../../../thorchain-utils';
+import type { ThornodePoolResponse } from '../../../utils/thorchain';
+import { TradeType } from '../../../utils/thorchain';
 export declare const getWrappedToken: (nativeAsset: Asset) => Token;
 export declare const getTokenFromAsset: (asset: Asset) => Token;
 export declare function getTradeType(sellAssetPool: ThornodePoolResponse | undefined, buyAssetPool: ThornodePoolResponse | undefined, sellPoolId: string | undefined, buyPoolId: string | undefined): TradeType | undefined;

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

@@ -6,7 +6,7 @@ const contracts_1 = require("@shapeshiftoss/contracts");
 const sdk_core_1 = require("@uniswap/sdk-core");
 const v3_sdk_1 = require("@uniswap/v3-sdk");
 const viem_1 = require("viem");
-const thorchain_utils_1 = require("../../../thorchain-utils");
+const thorchain_1 = require("../../../utils/thorchain");
 const constants_1 = require("./constants");
 const getWrappedToken = (nativeAsset) => {
     switch (nativeAsset.chainId) {
@@ -33,15 +33,15 @@ function getTradeType(sellAssetPool, buyAssetPool, sellPoolId, buyPoolId) {
         case !!sellAssetPool && !!buyAssetPool:
         case !!buyAssetPool && !sellAssetPool && ['THOR.RUNE', 'THOR.TCY'].includes(sellPoolId ?? ''):
         case !!sellAssetPool && !buyAssetPool && ['THOR.RUNE', 'THOR.TCY'].includes(buyPoolId ?? ''):
-            return thorchain_utils_1.TradeType.L1ToL1;
+            return thorchain_1.TradeType.L1ToL1;
         case ['THOR.RUNE', 'THOR.TCY'].includes(sellPoolId ?? '') && !buyAssetPool:
-            return thorchain_utils_1.TradeType.L1ToLongTail;
+            return thorchain_1.TradeType.L1ToLongTail;
         case !!sellAssetPool && !buyAssetPool:
-            return thorchain_utils_1.TradeType.L1ToLongTail;
+            return thorchain_1.TradeType.L1ToLongTail;
         case !sellAssetPool && !buyAssetPool:
-            return thorchain_utils_1.TradeType.LongTailToLongTail;
+            return thorchain_1.TradeType.LongTailToLongTail;
         case !sellAssetPool && !!buyAssetPool:
-            return thorchain_utils_1.TradeType.LongTailToL1;
+            return thorchain_1.TradeType.LongTailToL1;
         default:
             return undefined;
     }

package/dist/cjs/swappers/ThorchainSwapper/utils/test-data/responses.d.ts

@@ -1,4 +1,4 @@
-import type { InboundAddressResponse, ThornodePoolResponse } from '../../../../thorchain-utils';
+import type { InboundAddressResponse, ThornodePoolResponse } from '../../../../utils/thorchain';
 export declare const btcThornodePool: ThornodePoolResponse;
 export declare const ethThornodePool: ThornodePoolResponse;
 export declare const foxThornodePool: ThornodePoolResponse;

package/dist/cjs/swappers/ThorchainSwapper/utils/test-data/setupThorswapDeps.js

@@ -11,6 +11,10 @@ const feeData = {
         chainSpecific: { approvalFeeCryptoBaseUnit: '1', gasLimit: '1', gasPrice: '1' },
         tradeFee: '2',
     },
+    average: {
+        txFee: '400000',
+        chainSpecific: { gasLimit: '100000', gasPrice: '4' },
+    },
 };
 exports.mockEvmChainAdapter = {
     getAddress: vitest_1.vi.fn(() => Promise.resolve('0xthisIsMyAddress')),

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

@@ -1,78 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxApi = void 0;
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
-const viem_1 = require("viem");
 const utils_1 = require("../../utils");
+const evm_1 = require("../../utils/evm");
 const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
 const getZrxTradeRate_1 = require("./getZrxTradeRate/getZrxTradeRate");
 exports.zrxApi = {
-    getTradeQuote: async (input, { assertGetEvmChainAdapter, assetsById, config }) => {
-        const tradeQuoteResult = await (0, getZrxTradeQuote_1.getZrxTradeQuote)(input, assertGetEvmChainAdapter, assetsById, config.VITE_ZRX_BASE_URL);
-        return tradeQuoteResult.map(tradeQuote => [tradeQuote]);
-    },
-    getTradeRate: async (input, { assetsById, config }) => {
-        const tradeRateResult = await (0, getZrxTradeRate_1.getZrxTradeRate)(input, assetsById, config.VITE_ZRX_BASE_URL);
-        return tradeRateResult.map(tradeRate => [tradeRate]);
-    },
-    getUnsignedEvmTransaction: async ({ from, stepIndex, tradeQuote, permit2Signature, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { accountNumber, sellAsset, zrxTransactionMetadata } = step;
-        if (!zrxTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { value, to } = zrxTransactionMetadata;
-        const data = (() => {
-            if (!permit2Signature)
-                return zrxTransactionMetadata.data;
-            // Append the signature to the calldata
-            // https://0x.org/docs/0x-swap-api/guides/swap-tokens-with-0x-swap-api#5-append-signature-length-and-signature-data-to-transactiondata
-            const signatureLengthInHex = (0, viem_1.numberToHex)((0, viem_1.size)(permit2Signature), {
-                signed: false,
-                size: 32,
-            });
-            return (0, viem_1.concat)([zrxTransactionMetadata.data, signatureLengthInHex, permit2Signature]);
-        })();
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        return adapter.buildCustomApiTx({
-            accountNumber,
-            data,
-            from,
-            to,
-            value,
-            ...feeData,
-            // Use the higher amount of the node or the API, as the node doesn't always provide enough gas padding for total gas used.
-            gasLimit: bignumber_js_1.default.max(feeData.gasLimit, zrxTransactionMetadata.gas ?? '0').toFixed(),
-        });
-    },
-    getEvmTransactionFees: async ({ from, stepIndex, tradeQuote, permit2Signature, supportsEIP1559, assertGetEvmChainAdapter, }) => {
-        if (!(0, utils_1.isExecutableTradeQuote)(tradeQuote))
-            throw new Error('Unable to execute a trade rate quote');
-        const step = (0, utils_1.getExecutableTradeStep)(tradeQuote, stepIndex);
-        const { sellAsset, zrxTransactionMetadata } = step;
-        if (!zrxTransactionMetadata)
-            throw new Error('Transaction metadata is required');
-        const { value, to } = zrxTransactionMetadata;
-        const data = (() => {
-            if (!permit2Signature)
-                return zrxTransactionMetadata.data;
-            // Append the signature to the calldata
-            // https://0x.org/docs/0x-swap-api/guides/swap-tokens-with-0x-swap-api#5-append-signature-length-and-signature-data-to-transactiondata
-            const signatureLengthInHex = (0, viem_1.numberToHex)((0, viem_1.size)(permit2Signature), {
-                signed: false,
-                size: 32,
-            });
-            return (0, viem_1.concat)([zrxTransactionMetadata.data, signatureLengthInHex, permit2Signature]);
-        })();
-        const adapter = assertGetEvmChainAdapter(sellAsset.chainId);
-        const feeData = await chain_adapters_1.evm.getFees({ adapter, data, to, value, from, supportsEIP1559 });
-        return feeData.networkFeeCryptoBaseUnit;
-    },
+    getTradeQuote: (input, deps) => (0, getZrxTradeQuote_1.getZrxTradeQuote)(input, deps),
+    getTradeRate: (input, deps) => (0, getZrxTradeRate_1.getZrxTradeRate)(input, deps),
+    getUnsignedEvmTransaction: evm_1.getUnsignedEvmTransaction,
+    getEvmTransactionFees: evm_1.getEvmTransactionFees,
     checkTradeStatus: utils_1.checkEvmSwapStatus,
 };

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

@@ -1,6 +1,4 @@
-import type { ChainId } from '@shapeshiftoss/caip';
-import type { EvmChainAdapter } from '@shapeshiftoss/chain-adapters';
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetEvmTradeQuoteInputBase, SwapErrorRight, TradeQuote } from '../../../types';
-export declare function getZrxTradeQuote(input: GetEvmTradeQuoteInputBase, assertGetEvmChainAdapter: (chainId: ChainId) => EvmChainAdapter, assetsById: AssetsByIdPartial, zrxBaseUrl: string): Promise<Result<TradeQuote, SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeQuote } from '../../../types';
+import type { ZrxTradeQuoteInput } from '../types';
+export declare const getZrxTradeQuote: (input: ZrxTradeQuoteInput, deps: SwapperDeps) => Promise<Result<TradeQuote[], SwapErrorRight>>;

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

@@ -1,20 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxTradeQuote = void 0;
-const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
-const contracts_1 = require("@shapeshiftoss/contracts");
-const utils_1 = require("@shapeshiftoss/utils");
 const monads_1 = require("@sniptt/monads");
-const uuid_1 = require("uuid");
 const constants_1 = require("../../../constants");
 const types_1 = require("../../../types");
-const utils_2 = require("../../../utils");
-const affiliateFee_1 = require("../../utils/affiliateFee");
-const helpers_1 = require("../../utils/helpers/helpers");
+const utils_1 = require("../../../utils");
+const helpers_1 = require("../../../utils/helpers");
 const fetchFromZrx_1 = require("../utils/fetchFromZrx");
-const helpers_2 = require("../utils/helpers/helpers");
-async function getZrxTradeQuote(input, assertGetEvmChainAdapter, assetsById, zrxBaseUrl) {
-    const { sellAsset, buyAsset, accountNumber, receiveAddress, affiliateBps, chainId, supportsEIP1559, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
+const getZrxStepData_1 = require("../utils/getZrxStepData");
+const getZrxTradeContext_1 = require("../utils/getZrxTradeContext");
+const helpers_2 = require("../utils/helpers");
+const getZrxTradeQuote = async (input, deps) => {
+    const { sellAsset, buyAsset, accountNumber, affiliateBps, sellAmountIncludingProtocolFeesCryptoBaseUnit, } = input;
+    const maybeAddresses = (0, utils_1.assertQuoteAddresses)(input);
+    if (maybeAddresses.isErr())
+        return (0, monads_1.Err)(maybeAddresses.unwrapErr());
+    const { sendAddress, receiveAddress } = maybeAddresses.unwrap();
+    // The 0x order binds taker, so a quote for a different receive address is not executable by the sender
+    if (sendAddress !== receiveAddress) {
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
+            message: 'Cross-account trade not supported for ZRX',
+            code: types_1.TradeQuoteError.UnsupportedTradePair,
+        }));
+    }
     const assertion = (0, helpers_2.assertValidTrade)({ buyAsset, sellAsset });
     if (assertion.isErr())
         return (0, monads_1.Err)(assertion.unwrapErr());
@@ -28,98 +36,59 @@ async function getZrxTradeQuote(input, assertGetEvmChainAdapter, assetsById, zrx
         sellAddress: receiveAddress,
         affiliateBps,
         slippageTolerancePercentageDecimal,
-        zrxBaseUrl,
+        zrxBaseUrl: deps.config.VITE_ZRX_BASE_URL,
     });
     if (maybeZrxQuoteResponse.isErr())
         return (0, monads_1.Err)(maybeZrxQuoteResponse.unwrapErr());
-    const zrxQuoteResponse = maybeZrxQuoteResponse.unwrap();
-    const { sellAmount, buyAmount, fees, permit2, transaction, route } = zrxQuoteResponse;
+    const { sellAmount, buyAmount, fees, permit2, transaction, route } = maybeZrxQuoteResponse.unwrap();
     const permit2Eip712 = permit2?.eip712;
-    const isWrappedNative = route.fills.some(fill => fill.source === 'Wrapped_Native' && fill.proportionBps === '10000');
-    if (!(0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) && !isWrappedNative && !permit2Eip712) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+    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',
             code: types_1.TradeQuoteError.InvalidResponse,
             details: { transaction, permit2Eip712 },
         }));
     }
     if (!transaction) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
+        return (0, monads_1.Err)((0, utils_1.makeSwapErrorRight)({
             message: 'Missing required transaction metadata from 0x response',
             code: types_1.TradeQuoteError.InvalidResponse,
             details: { transaction, permit2Eip712 },
         }));
     }
-    const transactionMetadata = {
-        to: transaction.to,
-        data: transaction.data,
-        gasPrice: transaction.gasPrice || undefined,
-        gas: transaction.gas || undefined,
-        value: transaction.value,
-    };
-    const rate = (0, helpers_2.calculateRate)({ buyAmount, sellAmount, buyAsset, sellAsset });
-    const buyAmountBeforeFeesCryptoBaseUnit = (0, helpers_2.calculateBuyAmountBeforeFeesCryptoBaseUnit)({
-        buyAmount,
-        fees,
-        buyAsset,
-        sellAsset,
+    const maybeContext = (0, getZrxTradeContext_1.getZrxTradeContext)({
+        input,
+        deps,
+        slippageTolerancePercentageDecimal,
+        normalizedQuote: { buyAmount, sellAmount, fees, route },
     });
-    try {
-        const adapter = assertGetEvmChainAdapter(chainId);
-        const { average } = await adapter.getGasFeeData();
-        const networkFeeCryptoBaseUnit = chain_adapters_1.evm.calcNetworkFeeCryptoBaseUnit({
-            ...average,
-            supportsEIP1559: Boolean(supportsEIP1559),
-            // add gas limit buffer to account for the fact we perform all of our validation on the trade quote estimations
-            // which are inaccurate and not what we use for the tx to broadcast
-            gasLimit: (0, utils_1.bnOrZero)(transaction.gas).times(1.2).toFixed(),
-        });
-        return (0, monads_1.Ok)({
-            id: (0, uuid_1.v4)(),
-            quoteOrRate: 'quote',
-            receiveAddress,
-            affiliateBps,
-            // Slippage protection is always enabled for 0x api v2 unlike api v1 which was only supported on specific pairs.
-            slippageTolerancePercentageDecimal,
-            rate,
-            swapperName: types_1.SwapperName.Zrx,
-            steps: [
-                {
-                    // Assume instant execution since this is a same-chain AMM Tx which will happen within the same block
-                    estimatedExecutionTimeMs: 0,
-                    allowanceContract: (0, helpers_1.isNativeEvmAsset)(sellAsset.assetId) || isWrappedNative ? undefined : contracts_1.PERMIT2_CONTRACT,
-                    buyAsset,
-                    sellAsset,
-                    accountNumber,
-                    rate,
-                    feeData: {
-                        protocolFees: (0, helpers_2.getProtocolFees)({ fees, sellAsset, assetsById }),
-                        networkFeeCryptoBaseUnit,
-                    },
-                    buyAmountBeforeFeesCryptoBaseUnit,
-                    buyAmountAfterFeesCryptoBaseUnit: buyAmount,
-                    sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                    source: types_1.SwapperName.Zrx,
-                    affiliateFee: (0, affiliateFee_1.buildAffiliateFee)({
-                        strategy: 'buy_asset',
-                        affiliateBps,
-                        sellAsset,
-                        buyAsset,
-                        sellAmountCryptoBaseUnit: sellAmountIncludingProtocolFeesCryptoBaseUnit,
-                        buyAmountCryptoBaseUnit: buyAmount,
-                    }),
-                    permit2Eip712: permit2Eip712,
-                    zrxTransactionMetadata: transactionMetadata,
-                },
-            ],
-        });
-    }
-    catch (err) {
-        return (0, monads_1.Err)((0, utils_2.makeSwapErrorRight)({
-            message: 'failed to get fee data',
-            cause: err,
-            code: types_1.TradeQuoteError.NetworkFeeEstimationFailed,
-        }));
-    }
-}
+    if (maybeContext.isErr())
+        return (0, monads_1.Err)(maybeContext.unwrapErr());
+    const { tradeCommon, stepCommon, protocolFees, stepDataArgs } = maybeContext.unwrap();
+    const maybeStepData = await (0, getZrxStepData_1.getZrxStepData)({
+        ...stepDataArgs,
+        type: 'quote',
+        input,
+        transaction,
+        permit2Eip712,
+        from: receiveAddress,
+    });
+    if (maybeStepData.isErr())
+        return (0, monads_1.Err)(maybeStepData.unwrapErr());
+    const { transactionData, networkFeeCryptoBaseUnit } = maybeStepData.unwrap();
+    const tradeQuote = {
+        ...tradeCommon,
+        quoteOrRate: 'quote',
+        receiveAddress,
+        steps: [
+            {
+                ...stepCommon,
+                accountNumber,
+                transactionData,
+                feeData: { networkFeeCryptoBaseUnit, protocolFees },
+            },
+        ],
+    };
+    return (0, monads_1.Ok)([tradeQuote]);
+};
 exports.getZrxTradeQuote = getZrxTradeQuote;

package/dist/cjs/swappers/ZrxSwapper/getZrxTradeRate/getZrxTradeRate.d.ts

@@ -1,4 +1,4 @@
-import type { AssetsByIdPartial } from '@shapeshiftoss/types';
 import type { Result } from '@sniptt/monads';
-import type { GetEvmTradeRateInput, SwapErrorRight, TradeRate } from '../../../types';
-export declare function getZrxTradeRate(input: GetEvmTradeRateInput, assetsById: AssetsByIdPartial, zrxBaseUrl: string): Promise<Result<TradeRate, SwapErrorRight>>;
+import type { SwapErrorRight, SwapperDeps, TradeRate } from '../../../types';
+import type { ZrxTradeRateInput } from '../types';
+export declare const getZrxTradeRate: (input: ZrxTradeRateInput, deps: SwapperDeps) => Promise<Result<TradeRate[], SwapErrorRight>>;