@shapeshiftoss/swapper 6.2.0 → 7.0.0

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.js

@@ -4,7 +4,7 @@ exports.getTradeRate = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const api_1 = require("../../../../api");
 const bignumber_1 = require("../../../utils/bignumber");
-const makeTradeTx_1 = require("../ethereum/makeTradeTx");
+const bignumber_2 = require("../../../utils/bignumber");
 const thorService_1 = require("../thorService");
 const THOR_PRECISION = 8;
 const getSwapOutput = (inputAmount, poolData, toRune) => {
@@ -41,7 +41,7 @@ const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
             details: { buyPoolId, sellPoolId }
         });
     // All thorchain pool amounts are base 8 regardless of token precision
-    const sellBaseAmount = (0, bignumber_1.bn)((0, makeTradeTx_1.toBaseUnit)((0, makeTradeTx_1.fromBaseUnit)(sellAmount, sellAsset.precision), THOR_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)
@@ -51,7 +51,7 @@ const getTradeRate = async (sellAsset, buyAssetId, sellAmount, deps) => {
         runeBalance: (0, bignumber_1.bn)(buyPool.runeDepth)
     };
     const outputAmountBase8 = getDoubleSwapOutput(sellBaseAmount, sellAssetPoolData, buyAssetPoolData);
-    const outputAmount = (0, makeTradeTx_1.fromBaseUnit)(outputAmountBase8, THOR_PRECISION);
-    return (0, bignumber_1.bn)(outputAmount).div((0, makeTradeTx_1.fromBaseUnit)(sellAmount, sellAsset.precision)).toString();
+    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,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEthTxFees = void 0;
+const types_1 = require("@shapeshiftoss/types");
+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.get(types_1.KnownChainIds.EthereumMainnet);
+        if (!adapter)
+            throw new api_1.SwapError(`[getThorTxInfo] - No chain adapter found for ${types_1.KnownChainIds.EthereumMainnet}.`, {
+                code: api_1.SwapErrorTypes.UNSUPPORTED_CHAIN,
+                details: { chainId: types_1.KnownChainIds.EthereumMainnet }
+            });
+        // 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.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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',
     chainId: 'bip122:000000000019d6689c085ae165831e93',
     name: 'bitcoin',
-    chain: types_1.ChainTypes.Bitcoin,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 8,
     color: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/btc@2x.png',
@@ -20,8 +17,6 @@ exports.WETH = {
     assetId: 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     chainId: 'eip155:1',
     name: 'WETH',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 18,
     color: '#FFFFFF',
     icon: 'https://assets.coingecko.com/coins/images/2518/thumb/weth.png?1628852295',
@@ -34,8 +29,6 @@ exports.FOX = {
     assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
     chainId: 'eip155:1',
     name: 'FOX',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     precision: 18,
     color: '#FFFFFF',
     icon: 'https://assets.coincap.io/assets/icons/fox@2x.png',
@@ -48,21 +41,17 @@ exports.WBTC = {
     assetId: 'eip155:1/erc20:0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
     chainId: 'eip155:1',
     color: '#FFFFFF',
-    chain: types_1.ChainTypes.Ethereum,
     explorer: 'https://etherscan.io',
     explorerAddressLink: 'https://etherscan.io/address/',
     explorerTxLink: 'https://etherscan.io/tx/',
     icon: 'https://rawcdn.githack.com/trustwallet/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
     name: 'Wrapped Bitcoin',
-    network: types_1.NetworkTypes.MAINNET,
     precision: 8,
     symbol: 'WBTC'
 };
 exports.ETH = {
     assetId: 'eip155:1/slip44:60',
     chainId: 'eip155:1',
-    chain: types_1.ChainTypes.Ethereum,
-    network: types_1.NetworkTypes.MAINNET,
     symbol: 'ETH',
     name: 'Ethereum',
     precision: 18,
@@ -75,8 +64,6 @@ exports.ETH = {
 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,

package/dist/swappers/zrx/ZrxApprovalNeeded/ZrxApprovalNeeded.d.ts

@@ -1,3 +1,3 @@
 import { ApprovalNeededInput, ApprovalNeededOutput } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxApprovalNeeded({ adapterManager, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
+export declare function ZrxApprovalNeeded({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;

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

@@ -6,7 +6,7 @@ const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const helpers_1 = require("../utils/helpers/helpers");
-async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
+async function ZrxApprovalNeeded({ adapter, web3 }, { quote, wallet }) {
     var _a;
     const { sellAsset } = quote;
     const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(sellAsset.assetId);
@@ -21,8 +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 adapter = await adapterManager.byChainId(sellAsset.chainId);
+        const accountNumber = quote.sellAssetAccountNumber;
         const bip44Params = adapter.buildBIP44Params({ accountNumber });
         const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
         if (!quote.allowanceContract) {

package/dist/swappers/zrx/ZrxApproveInfinite/ZrxApproveInfinite.d.ts

@@ -1,4 +1,3 @@
-import { SupportedChainIds } from '@shapeshiftoss/types';
 import { ApproveInfiniteInput } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxApproveInfinite({ adapterManager, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
+export declare function ZrxApproveInfinite({ adapter, web3 }: ZrxSwapperDeps, { quote, wallet }: ApproveInfiniteInput<'eip155:1'>): Promise<string>;

package/dist/swappers/zrx/ZrxApproveInfinite/ZrxApproveInfinite.js

@@ -5,7 +5,7 @@ const api_1 = require("../../../api");
 const erc20_abi_1 = require("../utils/abi/erc20-abi");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
-async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
+async function ZrxApproveInfinite({ adapter, web3 }, { quote, wallet }) {
     try {
         const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
             quote: {
@@ -13,7 +13,7 @@ async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
                 sellAmount: constants_1.MAX_ALLOWANCE
             },
             wallet,
-            adapterManager,
+            adapter,
             erc20Abi: erc20_abi_1.erc20Abi,
             web3
         });

package/dist/swappers/zrx/ZrxSwapper.d.ts

@@ -1,24 +1,24 @@
 import { AssetId } from '@shapeshiftoss/caip';
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
+import { ethereum } from '@shapeshiftoss/chain-adapters';
+import { Asset } from '@shapeshiftoss/types';
 import Web3 from 'web3';
 import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, SwapperType, TradeQuote, TradeResult, TradeTxs, ZrxTrade } from '../../api';
 export declare type ZrxSwapperDeps = {
-    adapterManager: ChainAdapterManager;
+    adapter: ethereum.ChainAdapter;
     web3: Web3;
 };
-export declare class ZrxSwapper implements Swapper {
+export declare class ZrxSwapper implements Swapper<'eip155:1'> {
     static swapperName: string;
     deps: ZrxSwapperDeps;
     constructor(deps: ZrxSwapperDeps);
     initialize(): Promise<void>;
     getType(): SwapperType;
-    buildTrade(args: BuildTradeInput): Promise<ZrxTrade<SupportedChainIds>>;
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
+    buildTrade(args: BuildTradeInput): Promise<ZrxTrade>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;
     getUsdRate(input: Asset): Promise<string>;
     executeTrade(args: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;
     approvalNeeded(args: ApprovalNeededInput<'eip155:1'>): Promise<ApprovalNeededOutput>;
-    approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
+    approveInfinite(args: ApproveInfiniteInput<'eip155:1'>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds?: AssetId[]): AssetId[];
     getTradeTxs(tradeResult: TradeResult): Promise<TradeTxs>;

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 { ethereum } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
-import BigNumber from 'bignumber.js';
+import { Asset } from '@shapeshiftoss/types';
 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;
@@ -21,23 +21,14 @@ export declare type GetERC20AllowanceArgs = {
     spenderAddress: string;
 };
 declare type GrantAllowanceArgs = {
-    quote: TradeQuote<SupportedChainIds>;
+    quote: TradeQuote<'eip155:1'>;
     wallet: HDWallet;
-    adapterManager: ChainAdapterManager;
+    adapter: ethereum.ChainAdapter;
     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 declare const grantAllowance: ({ quote, wallet, adapter, 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();
@@ -90,16 +78,15 @@ const getUsdRate = async (asset) => {
     }
 };
 exports.getUsdRate = getUsdRate;
-const grantAllowance = async ({ quote, wallet, adapterManager, erc20Abi, web3 }) => {
+const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
     var _a, _b, _c, _d, _e;
     try {
         const { assetReference: sellAssetErc20Address } = (0, caip_1.fromAssetId)(quote.sellAsset.assetId);
-        const adapter = await adapterManager.byChainId('eip155:1');
         const erc20Contract = new web3.eth.Contract(erc20Abi, sellAssetErc20Address);
         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/utils/test-data/setupZrxDeps.d.ts

@@ -1,32 +1,6 @@
-import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
+import { ethereum } from '@shapeshiftoss/chain-adapters';
 import Web3 from 'web3';
-export declare const chainAdapterMockFuncs: {
-    buildBIP44Params: jest.Mock<{
-        purpose: number;
-        coinType: number;
-        accountNumber: number;
-    }, []>;
-    buildSendTransaction: jest.Mock<Promise<{
-        txToSign: {};
-    }>, []>;
-    signTransaction: jest.Mock<Promise<string>, []>;
-    broadcastTransaction: jest.Mock<Promise<string>, []>;
-    getAddress: jest.Mock<Promise<string>, []>;
-    getAccount: jest.Mock<Promise<{
-        chainSpecific: {
-            tokens: {
-                assetId: string;
-                balance: string;
-            }[];
-        };
-    }>, []>;
-    getFeeData: jest.Mock<Promise<{
-        average: {
-            txFee: string;
-        };
-    }>, []>;
-};
 export declare const setupZrxDeps: () => {
-    web3Instance: Web3;
-    adapterManager: ChainAdapterManager;
+    web3: Web3;
+    adapter: ethereum.ChainAdapter;
 };