@shapeshiftoss/swapper 6.1.0 → 6.3.0

package/dist/api.d.ts

@@ -58,11 +58,12 @@ export declare type CommonTradeInput = {
     buyAsset: Asset;
     sellAmount: string;
     sendMax: boolean;
-    sellAssetAccountId: string;
+    sellAssetAccountNumber: number;
+    wallet?: HDWallet;
 };
 export declare type GetTradeQuoteInput = CommonTradeInput;
 export declare type BuildTradeInput = CommonTradeInput & {
-    buyAssetAccountId: string;
+    buyAssetAccountNumber: number;
     slippage?: string;
     wallet: HDWallet;
 };
@@ -74,7 +75,7 @@ interface TradeBase<C extends SupportedChainIds> {
     sources: Array<SwapSource>;
     buyAsset: Asset;
     sellAsset: Asset;
-    sellAssetAccountId: string;
+    sellAssetAccountNumber: number;
 }
 export interface TradeQuote<C extends SupportedChainIds> extends TradeBase<C> {
     allowanceContract: string;
@@ -155,7 +156,8 @@ export declare enum SwapErrorTypes {
     UNSUPPORTED_CHAIN = "UNSUPPORTED_CHAIN",
     VALIDATION_FAILED = "VALIDATION_FAILED",
     MAKE_MEMO_FAILED = "MAKE_MEMO_FAILED",
-    PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED"
+    PRICE_RATIO_FAILED = "PRICE_RATIO_FAILED",
+    POOL_NOT_FOUND = "POOL_NOT_FOUND"
 }
 export interface Swapper {
     /** perform any necessary async initialization */

package/dist/api.js

@@ -31,4 +31,5 @@ var SwapErrorTypes;
     SwapErrorTypes["VALIDATION_FAILED"] = "VALIDATION_FAILED";
     SwapErrorTypes["MAKE_MEMO_FAILED"] = "MAKE_MEMO_FAILED";
     SwapErrorTypes["PRICE_RATIO_FAILED"] = "PRICE_RATIO_FAILED";
+    SwapErrorTypes["POOL_NOT_FOUND"] = "POOL_NOT_FOUND";
 })(SwapErrorTypes = exports.SwapErrorTypes || (exports.SwapErrorTypes = {}));

package/dist/manager/SwapperManager.d.ts

@@ -30,6 +30,6 @@ export declare class SwapperManager {
      * @returns {SwapperType}
      */
     getSwappersByPair(pair: ByPairInput): Swapper[];
-    getSupportedBuyAssetIdsFromSellId(args: BuyAssetBySellIdInput): string[];
-    getSupportedSellableAssetIds(args: SupportedSellAssetsInput): string[];
+    getSupportedBuyAssetIdsFromSellId(args: BuyAssetBySellIdInput): import("@shapeshiftoss/caip").AssetId[];
+    getSupportedSellableAssetIds(args: SupportedSellAssetsInput): import("@shapeshiftoss/caip").AssetId[];
 }

package/dist/swappercli.js

@@ -74,7 +74,7 @@ const main = async () => {
     const zrxSwapperDeps = { wallet, adapterManager, web3 };
     const thorchainSwapperDeps = {
         midgardUrl: 'https://midgard.thorchain.info/v2',
-        adapterManager: {}
+        adapterManager
     };
     const manager = new SwapperManager_1.SwapperManager();
     const zrxSwapper = new ZrxSwapper_1.ZrxSwapper(zrxSwapperDeps);
@@ -95,7 +95,8 @@ const main = async () => {
             sellAsset,
             buyAsset,
             sellAmount: sellAmountBase,
-            sellAssetAccountId: '0',
+            sellAssetAccountNumber: 0,
+            wallet,
             sendMax: false
         });
     }
@@ -115,8 +116,8 @@ const main = async () => {
             sendMax: false,
             sellAmount: sellAmountBase,
             sellAsset,
-            sellAssetAccountId: '0',
-            buyAssetAccountId: '0'
+            sellAssetAccountNumber: 0,
+            buyAssetAccountNumber: 0
         });
         const txid = await swapper.executeTrade({ trade, wallet });
         console.info('broadcast tx with id: ', txid);

package/dist/swappers/thorchain/ThorchainSwapper.d.ts

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import { ApprovalNeededOutput, BuyAssetBySellIdInput, ExecuteTradeInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
+import { ApprovalNeededOutput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, Trade, TradeQuote, TradeResult, TradeTxs } from '../../api';
 import { ThorchainSwapperDeps } from './types';
 export declare class ThorchainSwapper implements Swapper {
     private swapSupportedChainIds;
@@ -15,7 +15,7 @@ export declare class ThorchainSwapper implements Swapper {
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
     buildTrade(): Promise<Trade<SupportedChainIds>>;
-    getTradeQuote(): Promise<TradeQuote<SupportedChainIds>>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<TradeResult>;
     getTradeTxs(): Promise<TradeTxs>;
 }

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThorchainSwapper = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../api");
+const getTradeQuote_1 = require("./getThorTradeQuote/getTradeQuote");
 const getUsdRate_1 = require("./utils/getUsdRate/getUsdRate");
 const thorService_1 = require("./utils/thorService");
 class ThorchainSwapper {
@@ -55,8 +56,8 @@ class ThorchainSwapper {
     async buildTrade() {
         throw new Error('ThorchainSwapper: buildTrade unimplemented');
     }
-    async getTradeQuote() {
-        throw new Error('ThorchainSwapper: getTradeQuote unimplemented');
+    async getTradeQuote(input) {
+        return (0, getTradeQuote_1.getThorTradeQuote)({ deps: this.deps, input });
     }
     async executeTrade(args) {
         const { trade, wallet } = args;

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.d.ts

@@ -0,0 +1,7 @@
+import { SupportedChainIds } from '@shapeshiftoss/types';
+import { GetTradeQuoteInput, TradeQuote } from '../../../api';
+import { ThorchainSwapperDeps } from '../types';
+export declare const getThorTradeQuote: ({ deps, input }: {
+    deps: ThorchainSwapperDeps;
+    input: GetTradeQuoteInput;
+}) => Promise<TradeQuote<SupportedChainIds>>;

package/dist/swappers/thorchain/getThorTradeQuote/getTradeQuote.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThorTradeQuote = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../api");
+const bignumber_1 = require("../../utils/bignumber");
+const bignumber_2 = require("../../utils/bignumber");
+const constants_1 = require("../../utils/constants");
+const helpers_1 = require("../../utils/helpers/helpers");
+const constants_2 = require("../utils/constants");
+const getThorTxData_1 = require("../utils/ethereum/utils/getThorTxData");
+const getPriceRatio_1 = require("../utils/getPriceRatio/getPriceRatio");
+const getEthTxFees_1 = require("../utils/txFeeHelpers/ethTxFees/getEthTxFees");
+const getThorTradeQuote = async ({ deps, input }) => {
+    const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
+    if (!wallet)
+        throw new api_1.SwapError('[getTradeQuote] - wallet is required', {
+            code: api_1.SwapErrorTypes.VALIDATION_FAILED
+        });
+    try {
+        const { assetReference: sellAssetErc20Address, chainReference, chainNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const isErc20Trade = sellAssetErc20Address.startsWith('0x');
+        const sellAssetChainId = (0, caip_1.toChainId)({ chainReference, chainNamespace });
+        const adapter = deps.adapterManager.byChainId(sellAssetChainId);
+        const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(sellAssetAccountNumber) });
+        const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
+        const { data, router } = await (0, getThorTxData_1.getThorTxInfo)({
+            deps,
+            sellAsset,
+            buyAsset,
+            sellAmount,
+            slippageTolerance: constants_1.DEFAULT_SLIPPAGE,
+            destinationAddress: receiveAddress,
+            isErc20Trade
+        });
+        const feeData = await (async () => {
+            switch (sellAssetChainId) {
+                case 'eip155:1':
+                    return await (0, getEthTxFees_1.getEthTxFees)({
+                        deps,
+                        data,
+                        router,
+                        buyAsset,
+                        sellAmount,
+                        adapterManager: deps.adapterManager,
+                        receiveAddress,
+                        sellAssetReference: sellAssetErc20Address
+                    });
+                default:
+                    throw new api_1.SwapError('[getThorTxInfo] - Asset chainId is not supported.', {
+                        code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
+                        details: { sellAssetChainId }
+                    });
+            }
+        })();
+        const sellAssetId = sellAsset.assetId;
+        const buyAssetId = buyAsset.assetId;
+        const feeAssetId = (0, caip_1.getFeeAssetIdFromAssetId)(buyAssetId);
+        if (!feeAssetId)
+            throw new api_1.SwapError(`[getThorTxInfo] - No feeAssetId found for ${buyAssetId}.`, {
+                code: api_1.SwapErrorTypes.VALIDATION_FAILED,
+                details: { buyAssetId }
+            });
+        const feeAssetRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, { sellAssetId, buyAssetId: feeAssetId });
+        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, { sellAssetId, buyAssetId });
+        const rate = (0, bignumber_2.bnOrZero)(1).div(priceRatio).toString();
+        const buyAmount = (0, helpers_1.normalizeAmount)((0, bignumber_2.bnOrZero)(sellAmount).times(rate));
+        const sellAssetTradeFee = (0, bignumber_2.bnOrZero)(feeData.tradeFee).times((0, bignumber_2.bnOrZero)(feeAssetRatio));
+        // padding minimum by 1.5 the trade fee to avoid thorchain "not enough to cover fee" errors.
+        const minimum = (0, bignumber_1.fromBaseUnit)(sellAssetTradeFee.times(1.5).toString(), sellAsset.precision);
+        return {
+            rate,
+            minimum,
+            maximum: constants_2.MAX_THORCHAIN_TRADE,
+            feeData,
+            sellAmount,
+            buyAmount,
+            sources: [{ name: 'thorchain', proportion: '1' }],
+            allowanceContract: router,
+            buyAsset,
+            sellAsset,
+            sellAssetAccountNumber
+        };
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getThorTradeQuote]', {
+            cause: e,
+            code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED
+        });
+    }
+};
+exports.getThorTradeQuote = getThorTradeQuote;

package/dist/swappers/thorchain/utils/constants.d.ts

@@ -0,0 +1 @@
+export declare const MAX_THORCHAIN_TRADE = "100000000000000000000000000";

package/dist/swappers/thorchain/utils/constants.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MAX_THORCHAIN_TRADE = void 0;
+exports.MAX_THORCHAIN_TRADE = '100000000000000000000000000';

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.d.ts

@@ -1,10 +1,7 @@
 import { ethereum } from '@shapeshiftoss/chain-adapters';
 import { ETHSignTx, HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset, BIP44Params } from '@shapeshiftoss/types';
-import BigNumber from 'bignumber.js';
 import { ThorchainSwapperDeps } from '../../types';
-export declare const fromBaseUnit: (value: BigNumber.Value, decimals: number, displayDecimals?: number) => string;
-export declare const toBaseUnit: (amount: BigNumber.Value | undefined, precision: number) => string;
 export declare const makeTradeTx: ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }: {
     wallet: HDWallet;
     bip44Params: BIP44Params;

package/dist/swappers/thorchain/utils/ethereum/makeTradeTx.js

@@ -1,63 +1,22 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeTradeTx = exports.toBaseUnit = exports.fromBaseUnit = void 0;
+exports.makeTradeTx = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const api_1 = require("../../../../api");
-const bignumber_1 = require("../../../utils/bignumber");
-const getPriceRatio_1 = require("../getPriceRatio/getPriceRatio");
-const makeSwapMemo_1 = require("../makeSwapMemo/makeSwapMemo");
-const thorService_1 = require("../thorService");
-const routerCalldata_1 = require("./routerCalldata");
-const fromBaseUnit = (value, decimals, displayDecimals = 6) => {
-    return (0, bignumber_1.bnOrZero)(value)
-        .div(`1e+${decimals}`)
-        .decimalPlaces(displayDecimals, bignumber_js_1.default.ROUND_DOWN)
-        .toString();
-};
-exports.fromBaseUnit = fromBaseUnit;
-const toBaseUnit = (amount, precision) => {
-    return (0, bignumber_1.bnOrZero)(amount)
-        .times(new bignumber_js_1.default(10).exponentiatedBy((0, bignumber_1.bnOrZero)(precision)))
-        .toFixed(0);
-};
-exports.toBaseUnit = toBaseUnit;
+const getThorTxData_1 = require("../ethereum/utils/getThorTxData");
 const makeTradeTx = async ({ wallet, bip44Params, sellAmount, buyAsset, sellAsset, destinationAddress, adapter, maxFeePerGas, maxPriorityFeePerGas, slippageTolerance, deps, gasLimit }) => {
     try {
         const { assetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
         const isErc20Trade = assetReference.startsWith('0x');
-        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
-        const ethInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'ETH');
-        const vault = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.address;
-        const router = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.router;
-        if (!vault || !router)
-            throw new api_1.SwapError(`[getPriceRatio]: router or vault found for ETH`, {
-                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
-                details: { inboundAddresses }
-            });
-        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
-            buyAssetId: buyAsset.assetId,
-            sellAssetId: sellAsset.assetId
-        });
-        const expectedBuyAmount = (0, exports.toBaseUnit)((0, exports.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
-        if (!(0, bignumber_1.bnOrZero)(expectedBuyAmount).gte(0) ||
-            !((0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1)))
-            throw new api_1.SwapError('[makeTradeTx]: bad expected buy amount or bad slippage tolerance', {
-                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
-            });
-        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
-            .times(new bignumber_js_1.default(1).minus(slippageTolerance))
-            .decimalPlaces(0)
-            .toString();
-        const memo = (0, makeSwapMemo_1.makeSwapMemo)({
-            buyAssetId: buyAsset.assetId,
+        const { data, router } = await (0, getThorTxData_1.getThorTxInfo)({
+            deps,
+            sellAsset,
+            buyAsset,
+            sellAmount,
+            slippageTolerance,
             destinationAddress,
-            limit
+            isErc20Trade
         });
-        const data = await (0, routerCalldata_1.deposit)(vault, router, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmount, memo);
         return adapter.buildCustomTx({
             wallet,
             bip44Params,

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.d.ts

@@ -0,0 +1,15 @@
+import { Asset } from '@shapeshiftoss/types';
+import { ThorchainSwapperDeps } from '../../../types';
+export declare const getThorTxInfo: ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, isErc20Trade }: {
+    deps: ThorchainSwapperDeps;
+    sellAsset: Asset;
+    buyAsset: Asset;
+    sellAmount: string;
+    slippageTolerance: string;
+    destinationAddress: string;
+    isErc20Trade: boolean;
+}) => Promise<{
+    data: any;
+    memo: string;
+    router: string;
+}>;

package/dist/swappers/thorchain/utils/ethereum/utils/getThorTxData.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThorTxInfo = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../../api");
+const bignumber_1 = require("../../../../utils/bignumber");
+const getPriceRatio_1 = require("../../getPriceRatio/getPriceRatio");
+const makeSwapMemo_1 = require("../../makeSwapMemo/makeSwapMemo");
+const thorService_1 = require("../../thorService");
+const routerCalldata_1 = require("../routerCalldata");
+const getThorTxInfo = async ({ deps, sellAsset, buyAsset, sellAmount, slippageTolerance, destinationAddress, isErc20Trade }) => {
+    try {
+        const { assetReference } = (0, caip_1.fromAssetId)(sellAsset.assetId);
+        const { data: inboundAddresses } = await thorService_1.thorService.get(`${deps.midgardUrl}/thorchain/inbound_addresses`);
+        const ethInboundAddresses = inboundAddresses.find((inbound) => inbound.chain === 'ETH');
+        const vault = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.address;
+        const router = ethInboundAddresses === null || ethInboundAddresses === void 0 ? void 0 : ethInboundAddresses.router;
+        if (!vault || !router)
+            throw new api_1.SwapError(`[getPriceRatio]: router or vault found for ETH`, {
+                code: api_1.SwapErrorTypes.RESPONSE_ERROR,
+                details: { inboundAddresses }
+            });
+        const priceRatio = await (0, getPriceRatio_1.getPriceRatio)(deps, {
+            buyAssetId: buyAsset.assetId,
+            sellAssetId: sellAsset.assetId
+        });
+        const expectedBuyAmount = (0, bignumber_1.toBaseUnit)((0, bignumber_1.fromBaseUnit)((0, bignumber_1.bnOrZero)(sellAmount).dividedBy(priceRatio), sellAsset.precision), buyAsset.precision);
+        if (!(0, bignumber_1.bnOrZero)(expectedBuyAmount).gte(0) ||
+            !((0, bignumber_1.bnOrZero)(slippageTolerance).gte(0) && (0, bignumber_1.bnOrZero)(slippageTolerance).lte(1)))
+            throw new api_1.SwapError('[makeTradeTx]: bad expected buy amount or bad slippage tolerance', {
+                code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
+            });
+        const limit = (0, bignumber_1.bnOrZero)(expectedBuyAmount)
+            .times((0, bignumber_1.bn)(1).minus(slippageTolerance))
+            .decimalPlaces(0)
+            .toString();
+        const memo = (0, makeSwapMemo_1.makeSwapMemo)({
+            buyAssetId: buyAsset.assetId,
+            destinationAddress,
+            limit
+        });
+        const data = await (0, routerCalldata_1.deposit)(router, vault, isErc20Trade ? assetReference : '0x0000000000000000000000000000000000000000', sellAmount, memo);
+        return {
+            data,
+            memo,
+            router
+        };
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getThorTxInfo]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+    }
+};
+exports.getThorTxInfo = getThorTxInfo;

package/dist/swappers/thorchain/utils/getTradeRate/getTradeRate.d.ts

@@ -0,0 +1,4 @@
+import { AssetId } from '@shapeshiftoss/caip';
+import { Asset } from '@shapeshiftoss/types';
+import { ThorchainSwapperDeps } from '../../types';
+export declare const getTradeRate: (sellAsset: Asset, buyAssetId: AssetId, sellAmount: string, deps: ThorchainSwapperDeps) => Promise<string>;

package/dist/swappers/thorchain/utils/getTradeRate/getTradeRate.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTradeRate = void 0;
+const caip_1 = require("@shapeshiftoss/caip");
+const api_1 = require("../../../../api");
+const bignumber_1 = require("../../../utils/bignumber");
+const bignumber_2 = require("../../../utils/bignumber");
+const thorService_1 = require("../thorService");
+const THOR_PRECISION = 8;
+const getSwapOutput = (inputAmount, poolData, toRune) => {
+    const x = inputAmount;
+    const X = toRune ? poolData.assetBalance : poolData.runeBalance;
+    const Y = toRune ? poolData.runeBalance : poolData.assetBalance;
+    const numerator = x.times(X).times(Y);
+    const denominator = x.plus(X).pow(2);
+    return numerator.div(denominator);
+};
+const getDoubleSwapOutput = (input, inputPool, outputPool) => {
+    const runeToOutput = getSwapOutput(input, inputPool, true);
+    return getSwapOutput(runeToOutput, outputPool, false);
+};
+// https://docs.thorchain.org/how-it-works/prices
+// TODO this does not support swaps between native "RUNE"
+// Rune swaps use a different calculation because its 1 hop between pools instead of 2
+const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
+    const buyPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: buyAssetId });
+    const sellPoolId = caip_1.adapters.assetIdToPoolAssetId({ assetId: sellAsset.assetId });
+    if (!buyPoolId || !sellPoolId)
+        throw new api_1.SwapError(`[getPriceRatio]: No thorchain pool found`, {
+            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+            fn: 'getPriceRatio',
+            details: { buyPoolId, sellPoolId }
+        });
+    const { data: responseData } = await thorService_1.thorService.get(`${deps.midgardUrl}/pools`);
+    const buyPool = responseData.find((response) => response.asset === buyPoolId);
+    const sellPool = responseData.find((response) => response.asset === sellPoolId);
+    if (!buyPool || !sellPool)
+        throw new api_1.SwapError(`[getPriceRatio]: no pools found for`, {
+            code: api_1.SwapErrorTypes.POOL_NOT_FOUND,
+            fn: 'getPriceRatio',
+            details: { buyPoolId, sellPoolId }
+        });
+    // All thorchain pool amounts are base 8 regardless of token precision
+    const sellBaseAmount = (0, bignumber_1.bn)((0, bignumber_2.toBaseUnit)((0, bignumber_2.fromBaseUnit)(sellAmount, sellAsset.precision), THOR_PRECISION));
+    const sellAssetPoolData = {
+        assetBalance: (0, bignumber_1.bn)(sellPool.assetDepth),
+        runeBalance: (0, bignumber_1.bn)(sellPool.runeDepth)
+    };
+    const buyAssetPoolData = {
+        assetBalance: (0, bignumber_1.bn)(buyPool.assetDepth),
+        runeBalance: (0, bignumber_1.bn)(buyPool.runeDepth)
+    };
+    const outputAmountBase8 = getDoubleSwapOutput(sellBaseAmount, sellAssetPoolData, buyAssetPoolData);
+    const outputAmount = (0, bignumber_2.fromBaseUnit)(outputAmountBase8, THOR_PRECISION);
+    return (0, bignumber_1.bn)(outputAmount).div((0, bignumber_2.fromBaseUnit)(sellAmount, sellAsset.precision)).toString();
+};
+exports.getTradeRate = getTradeRate;

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.d.ts

@@ -0,0 +1,15 @@
+import { AssetReference } from '@shapeshiftoss/caip';
+import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
+import { Asset } from '@shapeshiftoss/types';
+import { QuoteFeeData } from '../../../../../api';
+import { ThorchainSwapperDeps } from '../../../types';
+export declare const getEthTxFees: ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }: {
+    deps: ThorchainSwapperDeps;
+    data: string;
+    router: string;
+    buyAsset: Asset;
+    sellAmount: string;
+    sellAssetReference: AssetReference | string;
+    adapterManager: ChainAdapterManager;
+    receiveAddress: string;
+}) => Promise<QuoteFeeData<'eip155:1'>>;

package/dist/swappers/thorchain/utils/txFeeHelpers/ethTxFees/getEthTxFees.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEthTxFees = void 0;
+const api_1 = require("../../../../../api");
+const bignumber_1 = require("../../../../utils/bignumber");
+const constants_1 = require("../../../../utils/constants");
+const estimateTradeFee_1 = require("../../estimateTradeFee/estimateTradeFee");
+const getEthTxFees = async ({ deps, data, router, buyAsset, sellAmount, adapterManager, receiveAddress, sellAssetReference }) => {
+    try {
+        const adapter = adapterManager.byChainId('eip155:1');
+        // TODO(ryankk): add falling back on hard coded gas Limit * new chain adapter method if it fails
+        const feeDataOptions = await adapter.getFeeData({
+            to: router,
+            value: sellAmount,
+            chainSpecific: { from: receiveAddress, contractData: data }
+        });
+        const feeData = feeDataOptions['fast'];
+        const tradeFee = await (0, estimateTradeFee_1.estimateTradeFee)(deps, buyAsset.assetId);
+        return {
+            fee: feeData.txFee,
+            chainSpecific: {
+                estimatedGas: feeData.chainSpecific.gasLimit,
+                gasPrice: feeData.chainSpecific.gasPrice,
+                approvalFee: sellAssetReference &&
+                    (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT)
+                        .multipliedBy((0, bignumber_1.bnOrZero)(feeData.chainSpecific.gasPrice))
+                        .toString()
+            },
+            tradeFee
+        };
+    }
+    catch (e) {
+        if (e instanceof api_1.SwapError)
+            throw e;
+        throw new api_1.SwapError('[getThorTxInfo]', { cause: e, code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED });
+    }
+};
+exports.getEthTxFees = getEthTxFees;

package/dist/swappers/utils/bignumber.d.ts

@@ -2,3 +2,5 @@ import BigNumber from 'bignumber.js';
 export declare type BN = BigNumber;
 export declare const bn: (n: BigNumber.Value, base?: number) => BN;
 export declare const bnOrZero: (n: BigNumber.Value | null | undefined) => BN;
+export declare const fromBaseUnit: (value: BigNumber.Value, decimals: number, displayDecimals?: number) => string;
+export declare const toBaseUnit: (amount: BigNumber.Value | undefined, precision: number) => string;

package/dist/swappers/utils/bignumber.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.bnOrZero = exports.bn = void 0;
+exports.toBaseUnit = exports.fromBaseUnit = exports.bnOrZero = exports.bn = void 0;
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const bn = (n, base = 10) => new bignumber_js_1.default(n, base);
 exports.bn = bn;
@@ -12,3 +12,16 @@ const bnOrZero = (n) => {
     return value.isNaN() ? (0, exports.bn)(0) : value;
 };
 exports.bnOrZero = bnOrZero;
+const fromBaseUnit = (value, decimals, displayDecimals = 6) => {
+    return (0, exports.bnOrZero)(value)
+        .div(`1e+${decimals}`)
+        .decimalPlaces(displayDecimals, bignumber_js_1.default.ROUND_DOWN)
+        .toString();
+};
+exports.fromBaseUnit = fromBaseUnit;
+const toBaseUnit = (amount, precision) => {
+    return (0, exports.bnOrZero)(amount)
+        .times(new bignumber_js_1.default(10).exponentiatedBy((0, exports.bnOrZero)(precision)))
+        .toFixed(0);
+};
+exports.toBaseUnit = toBaseUnit;

package/dist/swappers/utils/constants.d.ts

@@ -0,0 +1,2 @@
+export declare const APPROVAL_GAS_LIMIT = "100000";
+export declare const DEFAULT_SLIPPAGE = "0.03";

package/dist/swappers/utils/constants.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SLIPPAGE = exports.APPROVAL_GAS_LIMIT = void 0;
+exports.APPROVAL_GAS_LIMIT = '100000'; // Most approvals are around 40k, we've seen 72k in the wild, so 100000 for safety.
+exports.DEFAULT_SLIPPAGE = '0.03'; // 3%

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

@@ -0,0 +1,7 @@
+import { BN } from '../bignumber';
+/**
+ * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
+ * ETH or ERC20, we still keep 7 decimal places.
+ * @param amount
+ */
+export declare const normalizeAmount: (amount: string | number | BN) => string;

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

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeAmount = void 0;
+const bignumber_1 = require("../bignumber");
+/**
+ * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
+ * ETH or ERC20, we still keep 7 decimal places.
+ * @param amount
+ */
+const normalizeAmount = (amount) => {
+    return (0, bignumber_1.bnOrZero)(amount).toNumber().toLocaleString('fullwide', { useGrouping: false });
+};
+exports.normalizeAmount = normalizeAmount;

package/dist/swappers/utils/test-data/assets.d.ts

@@ -4,3 +4,4 @@ export declare const WETH: Asset;
 export declare const FOX: Asset;
 export declare const WBTC: Asset;
 export declare const ETH: Asset;
+export declare const UNSUPPORTED: Asset;

package/dist/swappers/utils/test-data/assets.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
+exports.UNSUPPORTED = exports.ETH = exports.WBTC = exports.FOX = exports.WETH = exports.BTC = void 0;
 const types_1 = require("@shapeshiftoss/types");
 exports.BTC = {
     assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
@@ -72,3 +72,17 @@ exports.ETH = {
     explorerTxLink: 'https://etherscan.io/tx/',
     explorerAddressLink: 'https://etherscan.io/address/'
 };
+exports.UNSUPPORTED = {
+    assetId: 'eip155:1/slip44:420',
+    chainId: 'eip155:1',
+    chain: types_1.ChainTypes.Ethereum,
+    network: types_1.NetworkTypes.MAINNET,
+    symbol: 'ETH',
+    name: 'Ethereum',
+    precision: 18,
+    color: '#FFFFFF',
+    icon: 'https://assets.coincap.io/assets/icons/eth@2x.png',
+    explorer: 'https://etherscan.io',
+    explorerTxLink: 'https://etherscan.io/tx/',
+    explorerAddressLink: 'https://etherscan.io/address/'
+};

package/dist/swappers/zrx/ZrxApprovalNeeded/ZrxApprovalNeeded.js

@@ -21,7 +21,7 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
         if (sellAsset.assetId === (0, caip_1.getFeeAssetIdFromAssetId)(sellAsset.assetId)) {
             return { approvalNeeded: false };
         }
-        const accountNumber = (0, bignumber_1.bnOrZero)(quote.sellAssetAccountId).toNumber();
+        const accountNumber = quote.sellAssetAccountNumber;
         const adapter = await adapterManager.byChainId(sellAsset.chainId);
         const bip44Params = adapter.buildBIP44Params({ accountNumber });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });

package/dist/swappers/zrx/getZrxTradeQuote/getZrxTradeQuote.js

@@ -4,14 +4,15 @@ exports.getZrxTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
+const constants_1 = require("../../utils/constants");
+const helpers_1 = require("../../utils/helpers/helpers");
 const getZrxMinMax_1 = require("../getZrxMinMax/getZrxMinMax");
-const constants_1 = require("../utils/constants");
-const helpers_1 = require("../utils/helpers/helpers");
+const constants_2 = require("../utils/constants");
 const zrxService_1 = require("../utils/zrxService");
 async function getZrxTradeQuote(input) {
     var _a;
     try {
-        const { sellAsset, buyAsset, sellAmount, sellAssetAccountId } = input;
+        const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber } = input;
         if (buyAsset.chainId !== 'eip155:1' || sellAsset.chainId !== 'eip155:1') {
             throw new api_1.SwapError('[getZrxTradeQuote] - Both assets need to be on the Ethereum chain to use Zrx', {
                 code: api_1.SwapErrorTypes.UNSUPPORTED_PAIR,
@@ -61,11 +62,11 @@ async function getZrxTradeQuote(input) {
             },
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE,
+            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_2.DEFAULT_SOURCE,
             allowanceContract: data.allowanceTarget,
             buyAsset,
             sellAsset,
-            sellAssetAccountId
+            sellAssetAccountNumber
         };
     }
     catch (e) {

package/dist/swappers/zrx/utils/constants.d.ts

@@ -5,7 +5,6 @@ export declare const FOX_TOKEN_CONTRACT_ADDRESS = "0xc770EEfAd204B5180dF6a14Ee19
 export declare const WETH_TOKEN_CONTRACT_ADDRESS = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2";
 export declare const UNISWAP_WETH_FOX_POOL_ADDRESS = "0x470e8de2ebaef52014a47cb5e6af86884947f08c";
 export declare const MAX_ALLOWANCE = "100000000000000000000000000";
-export declare const APPROVAL_GAS_LIMIT = "100000";
 export declare const LIQUIDITY_GAS_LIMIT = "350000";
 export declare const MAX_GAS_PRICE = "1000000000000";
 export declare const MAX_ZRX_TRADE = "100000000000000000000000000";
@@ -13,8 +12,5 @@ export declare const DEFAULT_SOURCE: {
     name: string;
     proportion: string;
 }[];
-export declare const DEFAULT_SLIPPAGE = "0.03";
-export declare const MAX_SLIPPAGE = "0.3";
-export declare const ETH_FEE_ESTIMATE_PADDING = "1.2";
 export declare const AFFILIATE_ADDRESS = "0xc770eefad204b5180df6a14ee197d99d808ee52d";
 export declare const APPROVAL_BUY_AMOUNT = "100000000000000000";

package/dist/swappers/zrx/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APPROVAL_BUY_AMOUNT = exports.AFFILIATE_ADDRESS = exports.ETH_FEE_ESTIMATE_PADDING = exports.MAX_SLIPPAGE = exports.DEFAULT_SLIPPAGE = exports.DEFAULT_SOURCE = exports.MAX_ZRX_TRADE = exports.MAX_GAS_PRICE = exports.LIQUIDITY_GAS_LIMIT = exports.APPROVAL_GAS_LIMIT = exports.MAX_ALLOWANCE = exports.UNISWAP_WETH_FOX_POOL_ADDRESS = exports.WETH_TOKEN_CONTRACT_ADDRESS = exports.FOX_TOKEN_CONTRACT_ADDRESS = exports.ZERO_ADDRESS = exports.UNISWAP_FACTORY_ADDRESS = exports.UNISWAP_ROUTER_ADDRESS = void 0;
+exports.APPROVAL_BUY_AMOUNT = exports.AFFILIATE_ADDRESS = exports.DEFAULT_SOURCE = exports.MAX_ZRX_TRADE = exports.MAX_GAS_PRICE = exports.LIQUIDITY_GAS_LIMIT = exports.MAX_ALLOWANCE = exports.UNISWAP_WETH_FOX_POOL_ADDRESS = exports.WETH_TOKEN_CONTRACT_ADDRESS = exports.FOX_TOKEN_CONTRACT_ADDRESS = exports.ZERO_ADDRESS = exports.UNISWAP_FACTORY_ADDRESS = exports.UNISWAP_ROUTER_ADDRESS = void 0;
 exports.UNISWAP_ROUTER_ADDRESS = '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D';
 exports.UNISWAP_FACTORY_ADDRESS = '0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f';
 exports.ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
@@ -8,13 +8,9 @@ exports.FOX_TOKEN_CONTRACT_ADDRESS = '0xc770EEfAd204B5180dF6a14Ee197D99d808ee52d
 exports.WETH_TOKEN_CONTRACT_ADDRESS = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
 exports.UNISWAP_WETH_FOX_POOL_ADDRESS = '0x470e8de2ebaef52014a47cb5e6af86884947f08c';
 exports.MAX_ALLOWANCE = '100000000000000000000000000';
-exports.APPROVAL_GAS_LIMIT = '100000'; // Most approvals are around 40k, we've seen 72k in the wild, so 100000 for safety.
 exports.LIQUIDITY_GAS_LIMIT = '350000'; // Most Liquidity txs are around 150000
 exports.MAX_GAS_PRICE = '1000000000000'; // 1000 GWei
 exports.MAX_ZRX_TRADE = '100000000000000000000000000';
 exports.DEFAULT_SOURCE = [{ name: '0x', proportion: '1' }];
-exports.DEFAULT_SLIPPAGE = '0.03'; // 3%
-exports.MAX_SLIPPAGE = '0.3'; // 30%
-exports.ETH_FEE_ESTIMATE_PADDING = '1.2'; // Padding the fee estimate by 20% to avoid trade errors.
 exports.AFFILIATE_ADDRESS = '0xc770eefad204b5180df6a14ee197d99d808ee52d';
 exports.APPROVAL_BUY_AMOUNT = '100000000000000000'; // A valid buy amount - 0.1 ETH

package/dist/swappers/zrx/utils/helpers/helpers.d.ts

@@ -1,10 +1,10 @@
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
 import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
 import { TradeQuote } from '../../../../api';
+import { BN } from '../../../utils/bignumber';
 export declare type GetAllowanceRequiredArgs = {
     receiveAddress: string;
     allowanceContract: string;
@@ -27,17 +27,8 @@ declare type GrantAllowanceArgs = {
     erc20Abi: AbiItem[];
     web3: Web3;
 };
-/**
- * Very large amounts like those found in ERC20s with a precision of 18 get converted
- * to exponential notation ('1.6e+21') in javascript. The 0x api doesn't play well with
- * exponential notation so we need to ensure that it is represented as an integer string.
- * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
- * ETH or ERC20, we still keep 7 decimal places.
- * @param amount
- */
-export declare const normalizeAmount: (amount: string | number | BigNumber) => string;
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
-export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
+export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BN>;
 export declare const getUsdRate: (asset: Asset) => Promise<string>;
 export declare const grantAllowance: ({ quote, wallet, adapterManager, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
 export {};

package/dist/swappers/zrx/utils/helpers/helpers.js

@@ -1,23 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.grantAllowance = exports.getUsdRate = exports.getAllowanceRequired = exports.getERC20Allowance = exports.normalizeAmount = void 0;
+exports.grantAllowance = exports.getUsdRate = exports.getAllowanceRequired = exports.getERC20Allowance = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
 const zrxService_1 = require("../zrxService");
-/**
- * Very large amounts like those found in ERC20s with a precision of 18 get converted
- * to exponential notation ('1.6e+21') in javascript. The 0x api doesn't play well with
- * exponential notation so we need to ensure that it is represented as an integer string.
- * This function keeps 17 significant digits, so even if we try to trade 1 Billion of an
- * ETH or ERC20, we still keep 7 decimal places.
- * @param amount
- */
-const normalizeAmount = (amount) => {
-    return (0, bignumber_1.bnOrZero)(amount).toNumber().toLocaleString('fullwide', { useGrouping: false });
-};
-exports.normalizeAmount = normalizeAmount;
 const getERC20Allowance = async ({ erc20AllowanceAbi, web3, sellAssetErc20Address, ownerAddress, spenderAddress }) => {
     const erc20Contract = new web3.eth.Contract(erc20AllowanceAbi, sellAssetErc20Address);
     return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
@@ -99,7 +87,7 @@ const grantAllowance = async ({ quote, wallet, adapterManager, erc20Abi, web3 })
         const approveTx = erc20Contract.methods
             .approve(quote.allowanceContract, quote.sellAmount)
             .encodeABI();
-        const accountNumber = (0, bignumber_1.bnOrZero)(quote.sellAssetAccountId).toNumber();
+        const accountNumber = quote.sellAssetAccountNumber;
         const bip44Params = adapter.buildBIP44Params({ accountNumber });
         const { txToSign } = await adapter.buildSendTransaction({
             wallet,

package/dist/swappers/zrx/utils/test-data/setupSwapQuote.d.ts

@@ -21,8 +21,8 @@ export declare const setupBuildTrade: () => {
         buyAmount: string;
         buyAsset: Asset;
         sendMax: boolean;
-        sellAssetAccountId: string;
-        buyAssetAccountId: string;
+        sellAssetAccountNumber: number;
+        buyAssetAccountNumber: number;
         sellAsset: Asset;
     };
     buyAsset: Asset;
@@ -40,7 +40,7 @@ export declare const setupExecuteTrade: () => {
         buyAsset: Asset;
         sellAsset: Asset;
         sendMax: boolean;
-        sellAssetAccountId: string;
+        sellAssetAccountNumber: number;
         txData: string;
         depositAddress: string;
         receiveAddress: string;

package/dist/swappers/zrx/utils/test-data/setupSwapQuote.js

@@ -11,7 +11,7 @@ const setupQuote = () => {
         sellAsset,
         buyAsset,
         allowanceContract: 'allowanceContractAddress',
-        sellAssetAccountId: '0',
+        sellAssetAccountNumber: 0,
         minimum: '0',
         maximum: '999999999999',
         feeData: { fee: '0', tradeFee: '0', chainSpecific: {} },
@@ -22,7 +22,7 @@ const setupQuote = () => {
         sellAmount: '1000000000000000000',
         sellAsset,
         buyAsset,
-        sellAssetAccountId: '0',
+        sellAssetAccountNumber: 0,
         sendMax: false
     };
     return { quoteInput, tradeQuote, buyAsset, sellAsset };
@@ -56,8 +56,8 @@ const setupBuildTrade = () => {
         buyAmount: '',
         buyAsset,
         sendMax: false,
-        sellAssetAccountId: '0',
-        buyAssetAccountId: '0',
+        sellAssetAccountNumber: 0,
+        buyAssetAccountNumber: 0,
         sellAsset
     };
     return { buildTradeInput, buyAsset, sellAsset };
@@ -77,7 +77,7 @@ const setupExecuteTrade = () => {
         buyAsset,
         sellAsset,
         sendMax: false,
-        sellAssetAccountId: '0',
+        sellAssetAccountNumber: 0,
         txData: '0x0',
         depositAddress: '0x0',
         receiveAddress: '0x0',

package/dist/swappers/zrx/zrxBuildTrade/zrxBuildTrade.js

@@ -28,14 +28,17 @@ const caip_1 = require("@shapeshiftoss/caip");
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
 const bignumber_1 = require("../../utils/bignumber");
+const constants_1 = require("../../utils/constants");
+const constants_2 = require("../../utils/constants");
+const helpers_1 = require("../../utils/helpers/helpers");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
-const constants_1 = require("../utils/constants");
-const helpers_1 = require("../utils/helpers/helpers");
+const constants_3 = require("../utils/constants");
+const helpers_2 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapterManager, web3 }, input) {
     var _a, _b, _c;
-    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountId, buyAssetAccountId, wallet } = input;
+    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountNumber, buyAssetAccountNumber, wallet } = input;
     try {
         const { assetReference: buyAssetErc20Address, assetNamespace: buyAssetNamespace } = (0, caip_1.fromAssetId)(buyAsset.assetId);
         const { assetReference: sellAssetErc20Address, assetNamespace: sellAssetNamespace } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -48,7 +51,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
             });
         }
         const adapter = await adapterManager.byChainId(buyAsset.chainId);
-        const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountId) });
+        const bip44Params = adapter.buildBIP44Params({ accountNumber: buyAssetAccountNumber });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
         /**
@@ -84,7 +87,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,
-                affiliateAddress: constants_1.AFFILIATE_ADDRESS
+                affiliateAddress: constants_3.AFFILIATE_ADDRESS
             }
         });
         const { data } = quoteResponse;
@@ -92,7 +95,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
         const trade = {
             sellAsset,
             buyAsset,
-            sellAssetAccountId,
+            sellAssetAccountNumber,
             receiveAddress,
             rate: data.price,
             depositAddress: data.to,
@@ -107,9 +110,9 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
             txData: data.data,
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
+            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_3.DEFAULT_SOURCE
         };
-        const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
+        const allowanceRequired = await (0, helpers_2.getAllowanceRequired)({
             sellAsset,
             allowanceContract: data.allowanceTarget,
             receiveAddress,
@@ -122,7 +125,7 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 fee: ((_b = trade.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
                 chainSpecific: {
                     ...(_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific,
-                    approvalFee: (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
+                    approvalFee: (0, bignumber_1.bnOrZero)(constants_2.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
                 },
                 tradeFee: '0'
             };

package/dist/swappers/zrx/zrxExecuteTrade/zrxExecuteTrade.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxExecuteTrade = void 0;
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../api");
-const bignumber_1 = require("../../utils/bignumber");
 async function zrxExecuteTrade({ adapterManager }, { trade, wallet }) {
     var _a, _b, _c, _d, _e, _f;
     const zrxTrade = trade;
@@ -13,7 +12,7 @@ async function zrxExecuteTrade({ adapterManager }, { trade, wallet }) {
         const value = sellAsset.assetId === 'eip155:1/slip44:60' ? trade.sellAmount : '0';
         const adapter = await adapterManager.byChainId(sellAsset.chainId);
         const bip44Params = adapter.buildBIP44Params({
-            accountNumber: (0, bignumber_1.bnOrZero)(trade.sellAssetAccountId).toNumber()
+            accountNumber: trade.sellAssetAccountNumber
         });
         const buildTxResponse = await adapter.buildSendTransaction({
             value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "6.1.0",
+  "version": "6.3.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",