@shapeshiftoss/swapper 4.0.2 → 4.1.0

package/dist/api.d.ts

@@ -1,9 +1,20 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { ApprovalNeededOutput, Asset, chainAdapters, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, ChainSpecific, ExecQuoteOutput, GetMinMaxInput, MinMaxOutput, SupportedChainIds, SwapperType } from '@shapeshiftoss/types';
 export declare type SupportedAssetInput = {
     assetIds: AssetId[];
 };
+declare type ChainSpecificQuoteFeeData<T1> = ChainSpecific<T1, {
+    'eip155:1': {
+        estimatedGas?: string;
+        gasPrice?: string;
+        approvalFee?: string;
+        totalFee?: string;
+    };
+}>;
+export declare type QuoteFeeData<T1 extends SupportedChainIds> = {
+    fee: string;
+} & ChainSpecificQuoteFeeData<T1>;
 export declare type ByPairInput = {
     sellAssetId: AssetId;
     buyAssetId: AssetId;
@@ -18,8 +29,7 @@ export declare type SupportedSellAssetsInput = {
 export declare type CommonTradeInput = {
     sellAsset: Asset;
     buyAsset: Asset;
-    sellAmount?: string;
-    buyAmount?: string;
+    sellAmount: string;
     sendMax: boolean;
     sellAssetAccountId: string;
 };
@@ -29,12 +39,12 @@ export declare type BuildTradeInput = CommonTradeInput & {
     slippage?: string;
     wallet: HDWallet;
 };
-interface TradeBase<C extends ChainTypes> {
+interface TradeBase<C extends SupportedChainIds> {
     success: boolean;
     statusReason: string;
     buyAmount: string;
     sellAmount: string;
-    feeData: chainAdapters.QuoteFeeData<C>;
+    feeData: QuoteFeeData<C>;
     rate: string;
     allowanceContract: string;
     sources: Array<SwapSource>;
@@ -42,16 +52,16 @@ interface TradeBase<C extends ChainTypes> {
     sellAsset: Asset;
     sellAssetAccountId: string;
 }
-export interface TradeQuote<C extends ChainTypes> extends TradeBase<C> {
+export interface TradeQuote<C extends SupportedChainIds> extends TradeBase<C> {
     minimum: string;
     maximum: string;
 }
-export interface Trade<C extends ChainTypes> extends TradeBase<C> {
+export interface Trade<C extends SupportedChainIds> extends TradeBase<C> {
     txData: string;
     depositAddress: string;
     receiveAddress: string;
 }
-export declare type ExecuteTradeInput<C extends ChainTypes> = {
+export declare type ExecuteTradeInput<C extends SupportedChainIds> = {
     trade: Trade<C>;
     wallet: HDWallet;
 };
@@ -62,12 +72,12 @@ export declare type SwapSource = {
     name: string;
     proportion: string;
 };
-export declare type ApproveInfiniteInput<C extends ChainTypes> = {
-    quote: Quote<C> | TradeQuote<C>;
+export declare type ApproveInfiniteInput<C extends SupportedChainIds> = {
+    quote: TradeQuote<C>;
     wallet: HDWallet;
 };
-export declare type ApprovalNeededInput<C extends ChainTypes> = {
-    quote: Quote<C> | TradeQuote<C>;
+export declare type ApprovalNeededInput<C extends SupportedChainIds> = {
+    quote: TradeQuote<C>;
     wallet: HDWallet;
 };
 export declare class SwapError extends Error {
@@ -78,11 +88,11 @@ export interface Swapper {
     /**
      * Get builds a trade with definitive rate & txData that can be executed with executeTrade
      **/
-    buildTrade(args: BuildTradeInput): Promise<Trade<ChainTypes>>;
+    buildTrade(args: BuildTradeInput): Promise<Trade<SupportedChainIds>>;
     /**
      * Get a trade quote
      */
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainTypes>>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     /**
      * Get the usd rate from either the assets symbol or tokenId
      */
@@ -90,19 +100,19 @@ export interface Swapper {
     /**
      * Get the minimum and maximum trade value of the sellAsset and buyAsset
      */
-    getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
+    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     /**
      * Execute a trade built with buildTrade by signing and broadcasting
      */
-    executeTrade(args: ExecuteTradeInput<ChainTypes>): Promise<ExecQuoteOutput>;
+    executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<ExecQuoteOutput>;
     /**
      * Get a boolean if a quote needs approval
      */
-    approvalNeeded(args: ApprovalNeededInput<ChainTypes>): Promise<ApprovalNeededOutput>;
+    approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
     /**
      * Get the txid of an approve infinite transaction
      */
-    approveInfinite(args: ApproveInfiniteInput<ChainTypes>): Promise<string>;
+    approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
     /**
      * Get supported buyAssetId's by sellAssetId
      */

package/dist/swappers/test/TestSwapper.d.ts

@@ -1,5 +1,5 @@
 import { AssetId } from '@shapeshiftoss/caip';
-import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, ExecQuoteOutput, GetMinMaxInput, MinMaxOutput, SupportedChainIds, SwapperType } from '@shapeshiftoss/types';
 import { BuyAssetBySellIdInput, Swapper, Trade, TradeQuote } from '../../api';
 /**
  * Playground for testing different scenarios of multiple swappers in the manager.
@@ -10,12 +10,12 @@ export declare class TestSwapper implements Swapper {
     getType(): SwapperType;
     constructor();
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
+    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
-    buildTrade(): Promise<Trade<ChainTypes>>;
-    getTradeQuote(): Promise<TradeQuote<ChainTypes>>;
+    buildTrade(): Promise<Trade<SupportedChainIds>>;
+    getTradeQuote(): Promise<TradeQuote<SupportedChainIds>>;
     executeTrade(): Promise<ExecQuoteOutput>;
 }

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

@@ -1,15 +1,15 @@
 import { AssetId } from '@shapeshiftoss/caip';
-import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, ExecQuoteOutput, GetMinMaxInput, MinMaxOutput, SupportedChainIds, SwapperType } from '@shapeshiftoss/types';
 import { Swapper, Trade, TradeQuote } from '../../api';
 export declare class ThorchainSwapper implements Swapper {
     getType(): SwapperType;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
+    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(): AssetId[];
     filterAssetIdsBySellable(): AssetId[];
-    buildTrade(): Promise<Trade<ChainTypes>>;
-    getTradeQuote(): Promise<TradeQuote<ChainTypes>>;
+    buildTrade(): Promise<Trade<SupportedChainIds>>;
+    getTradeQuote(): Promise<TradeQuote<SupportedChainIds>>;
     executeTrade(): Promise<ExecQuoteOutput>;
 }

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

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

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApprovalNeeded = void 0;
-const types_1 = require("@shapeshiftoss/types");
 const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const bignumber_1 = require("../utils/bignumber");
@@ -10,14 +9,14 @@ const helpers_1 = require("../utils/helpers/helpers");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
     var _a, _b;
     const { sellAsset } = quote;
+    if (sellAsset.chainId !== 'eip155:1') {
+        throw new api_1.SwapError('ZrxSwapper:ZrxApprovalNeeded only Ethereum chain type is supported');
+    }
     if (sellAsset.symbol === 'ETH') {
         return { approvalNeeded: false };
     }
-    if (sellAsset.chain !== types_1.ChainTypes.Ethereum) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxApprovalNeeded only Ethereum chain type is supported');
-    }
     const accountNumber = quote.sellAssetAccountId ? Number(quote.sellAssetAccountId) : 0;
-    const adapter = adapterManager.byChain(sellAsset.chain);
+    const adapter = await adapterManager.byChainId(sellAsset.chainId);
     const bip44Params = adapter.buildBIP44Params({ accountNumber });
     const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
     if (!quote.sellAsset.tokenId || !quote.allowanceContract) {

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

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

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApproveInfinite = void 0;
-const types_1 = require("@shapeshiftoss/types");
 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 }) {
-    const adapter = adapterManager.byChain(types_1.ChainTypes.Ethereum);
     const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
         quote: {
             ...quote,
@@ -14,7 +12,7 @@ async function ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
             sellAmount: constants_1.MAX_ALLOWANCE
         },
         wallet,
-        adapter,
+        adapterManager,
         erc20Abi: erc20_abi_1.erc20Abi,
         web3
     });

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

@@ -1,6 +1,6 @@
 import { AssetId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, ExecQuoteOutput, GetMinMaxInput, MinMaxOutput, SupportedChainIds, SwapperType } from '@shapeshiftoss/types';
 import Web3 from 'web3';
 import { ApprovalNeededInput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote } from '../../api';
 export declare type ZrxSwapperDeps = {
@@ -15,13 +15,13 @@ export declare class ZrxSwapper implements Swapper {
     deps: ZrxSwapperDeps;
     constructor(deps: ZrxSwapperDeps);
     getType(): SwapperType;
-    buildTrade(args: BuildTradeInput): Promise<Trade<ChainTypes>>;
-    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainTypes>>;
+    buildTrade(args: BuildTradeInput): Promise<Trade<SupportedChainIds>>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<SupportedChainIds>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    executeTrade(args: ExecuteTradeInput<ChainTypes>): Promise<ExecQuoteOutput>;
-    approvalNeeded(args: ApprovalNeededInput<ChainTypes>): Promise<ApprovalNeededOutput>;
-    approveInfinite(args: ApproveInfiniteInput<ChainTypes>): Promise<string>;
+    getMinMax(input: GetMinMaxInput): Promise<MinMaxOutput>;
+    executeTrade(args: ExecuteTradeInput<SupportedChainIds>): Promise<ExecQuoteOutput>;
+    approvalNeeded(args: ApprovalNeededInput<SupportedChainIds>): Promise<ApprovalNeededOutput>;
+    approveInfinite(args: ApproveInfiniteInput<SupportedChainIds>): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     filterAssetIdsBySellable(assetIds?: AssetId[]): AssetId[];
 }

package/dist/swappers/zrx/ZrxSwapper.js

@@ -33,7 +33,7 @@ class ZrxSwapper {
         return (0, helpers_1.getUsdRate)(input);
     }
     async getMinMax(input) {
-        return (0, getZrxMinMax_1.getZrxMinMax)(input);
+        return (0, getZrxMinMax_1.getZrxMinMax)(input.sellAsset, input.buyAsset);
     }
     async executeTrade(args) {
         return (0, zrxExecuteTrade_1.zrxExecuteTrade)(this.deps, args);

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

@@ -1,2 +1,2 @@
-import { GetQuoteInput, MinMaxOutput } from '@shapeshiftoss/types';
-export declare const getZrxMinMax: (input: Pick<GetQuoteInput, 'sellAsset' | 'buyAsset'>) => Promise<MinMaxOutput>;
+import { Asset, MinMaxOutput } from '@shapeshiftoss/types';
+export declare const getZrxMinMax: (sellAsset: Asset, buyAsset: Asset) => Promise<MinMaxOutput>;

package/dist/swappers/zrx/getZrxMinMax/getZrxMinMax.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxMinMax = void 0;
-const types_1 = require("@shapeshiftoss/types");
 const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const ZrxSwapper_1 = require("../ZrxSwapper");
-const getZrxMinMax = async (input) => {
-    const { sellAsset, buyAsset } = input;
-    if (sellAsset.chain !== types_1.ChainTypes.Ethereum || buyAsset.chain !== types_1.ChainTypes.Ethereum) {
+const getZrxMinMax = async (sellAsset, buyAsset) => {
+    if (sellAsset.chainId !== 'eip155:1' || buyAsset.chainId !== 'eip155:1') {
         throw new ZrxSwapper_1.ZrxError('getZrxMinMax - must be eth assets');
     }
     const usdRate = await (0, helpers_1.getUsdRate)({
         symbol: sellAsset.symbol,
         tokenId: sellAsset.tokenId
     });
-    const minimum = (0, bignumber_1.bnOrZero)(1).dividedBy((0, bignumber_1.bnOrZero)(usdRate)).toString();
+    const minimum = (0, bignumber_1.bn)(1).dividedBy((0, bignumber_1.bnOrZero)(usdRate)).toString();
     return {
         minimum,
         maximum: constants_1.MAX_ZRX_TRADE // Arbitrarily large value. 10e+28 here.

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

@@ -1,3 +1,2 @@
-import { ChainTypes } from '@shapeshiftoss/types';
 import { GetTradeQuoteInput, TradeQuote } from '../../../api';
-export declare function getZrxTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainTypes.Ethereum>>;
+export declare function getZrxTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<'eip155:1'>>;

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxTradeQuote = void 0;
-const types_1 = require("@shapeshiftoss/types");
 const getZrxMinMax_1 = require("../getZrxMinMax/getZrxMinMax");
 const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
@@ -10,34 +9,22 @@ const zrxService_1 = require("../utils/zrxService");
 const ZrxSwapper_1 = require("../ZrxSwapper");
 async function getZrxTradeQuote(input) {
     var _a, _b, _c, _d, _e, _f, _g;
-    const { sellAsset, buyAsset, sellAmount, buyAmount, sellAssetAccountId } = input;
+    const { sellAsset, buyAsset, sellAmount, sellAssetAccountId } = input;
     if (!buyAsset) {
         throw new ZrxSwapper_1.ZrxError('getQuote - Missing buyAsset');
     }
     if (!sellAsset) {
         throw new ZrxSwapper_1.ZrxError('getQuote - Missing sellAsset');
     }
-    if (buyAsset.chain !== types_1.ChainTypes.Ethereum || sellAsset.chain !== types_1.ChainTypes.Ethereum) {
+    if (buyAsset.chainId !== 'eip155:1' || sellAsset.chainId !== 'eip155:1') {
         throw new ZrxSwapper_1.ZrxError('getQuote - Both assets need to be on the Ethereum chain to use Zrx');
     }
-    if (!sellAmount && !buyAmount) {
-        throw new ZrxSwapper_1.ZrxError('getQuote - sellAmount or buyAmount amount is required');
-    }
     const useSellAmount = !!sellAmount;
     const buyToken = buyAsset.tokenId || buyAsset.symbol;
     const sellToken = sellAsset.tokenId || sellAsset.symbol;
-    const { minimum: minQuoteSellAmount, maximum: maxSellAmount } = await (0, getZrxMinMax_1.getZrxMinMax)(input);
-    const minQuoteSellAmountWei = (0, bignumber_1.bnOrZero)(minQuoteSellAmount).times((0, bignumber_1.bnOrZero)(10).exponentiatedBy(sellAsset.precision));
-    const amount = useSellAmount ? { sellAmount } : { buyAmount };
-    const amountKey = Object.keys(amount)[0];
-    const amountValue = Object.values(amount)[0];
-    let normalizedAmount = (0, helpers_1.normalizeAmount)(amountValue);
-    if (!normalizedAmount || normalizedAmount === '0') {
-        normalizedAmount = (0, helpers_1.normalizeAmount)(minQuoteSellAmountWei === null || minQuoteSellAmountWei === void 0 ? void 0 : minQuoteSellAmountWei.toString());
-    }
-    if (!normalizedAmount || normalizedAmount === '0') {
-        throw new ZrxSwapper_1.ZrxError('getQuote - Must have valid sellAmount, buyAmount or minimum amount');
-    }
+    const { minimum, maximum } = await (0, getZrxMinMax_1.getZrxMinMax)(buyAsset, sellAsset);
+    const minQuoteSellAmount = (0, bignumber_1.bnOrZero)(minimum).times((0, bignumber_1.bn)(10).exponentiatedBy(sellAsset.precision));
+    const normalizedSellAmount = (0, helpers_1.normalizeAmount)((0, bignumber_1.bnOrZero)(minimum).lt(minQuoteSellAmount) ? minQuoteSellAmount.toString() : sellAmount);
     try {
         /**
          * /swap/v1/price
@@ -52,18 +39,18 @@ async function getZrxTradeQuote(input) {
             params: {
                 sellToken,
                 buyToken,
-                [amountKey]: normalizedAmount
+                sellAmount: normalizedSellAmount
             }
         });
         const { data } = quoteResponse;
         const estimatedGas = (0, bignumber_1.bnOrZero)(data.estimatedGas).times(1.5);
-        const rate = useSellAmount ? data.price : (0, bignumber_1.bnOrZero)(1).div(data.price).toString();
+        const rate = useSellAmount ? data.price : (0, bignumber_1.bn)(1).div(data.price).toString();
         return {
             success: true,
             statusReason: '',
             rate,
-            minimum: minQuoteSellAmount,
-            maximum: maxSellAmount,
+            minimum,
+            maximum,
             feeData: {
                 fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
                 chainSpecific: {

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

@@ -1,9 +1,10 @@
-import { ChainAdapter } from '@shapeshiftoss/chain-adapters';
+import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { Asset, ChainTypes, Quote } from '@shapeshiftoss/types';
+import { Asset, SupportedChainIds } from '@shapeshiftoss/types';
 import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
+import { TradeQuote } from '../../../../api';
 export declare type GetAllowanceRequiredArgs = {
     receiveAddress: string;
     allowanceContract: string;
@@ -20,9 +21,9 @@ export declare type GetERC20AllowanceArgs = {
     spenderAddress: string;
 };
 declare type GrantAllowanceArgs = {
-    quote: Quote<ChainTypes>;
+    quote: TradeQuote<SupportedChainIds>;
     wallet: HDWallet;
-    adapter: ChainAdapter<ChainTypes.Ethereum>;
+    adapterManager: ChainAdapterManager;
     erc20Abi: AbiItem[];
     web3: Web3;
 };
@@ -38,5 +39,5 @@ export declare const normalizeAmount: (amount: string | undefined) => string | u
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, tokenId, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
 export declare const getAllowanceRequired: ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
 export declare const getUsdRate: (input: Pick<Asset, 'symbol' | 'tokenId'>) => Promise<string>;
-export declare const grantAllowance: ({ quote, wallet, adapter, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
+export declare const grantAllowance: ({ quote, wallet, adapterManager, erc20Abi, web3 }: GrantAllowanceArgs) => Promise<string>;
 export {};

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

@@ -27,7 +27,7 @@ const getERC20Allowance = async ({ erc20AllowanceAbi, web3, tokenId, ownerAddres
 exports.getERC20Allowance = getERC20Allowance;
 const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
     if (sellAsset.symbol === 'ETH') {
-        return (0, bignumber_1.bnOrZero)(0);
+        return (0, bignumber_1.bn)(0);
     }
     const ownerAddress = receiveAddress;
     const spenderAddress = allowanceContract;
@@ -49,7 +49,7 @@ const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAss
         throw new api_1.SwapError(`No allowance data for ${allowanceContract} to ${receiveAddress}`);
     }
     const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmount).minus(allowanceOnChain);
-    return allowanceRequired.lt(0) ? (0, bignumber_1.bnOrZero)(0) : allowanceRequired;
+    return allowanceRequired.lt(0) ? (0, bignumber_1.bn)(0) : allowanceRequired;
 };
 exports.getAllowanceRequired = getAllowanceRequired;
 const getUsdRate = async (input) => {
@@ -66,14 +66,15 @@ const getUsdRate = async (input) => {
     const price = (0, bignumber_1.bnOrZero)(rateResponse.data.price);
     if (!price.gt(0))
         throw new ZrxSwapper_1.ZrxError('getUsdRate - Failed to get price data');
-    return (0, bignumber_1.bnOrZero)(1).dividedBy(price).toString();
+    return (0, bignumber_1.bn)(1).dividedBy(price).toString();
 };
 exports.getUsdRate = getUsdRate;
-const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {
+const grantAllowance = async ({ quote, wallet, adapterManager, erc20Abi, web3 }) => {
     var _a, _b, _c, _d, _e;
     if (!quote.sellAsset.tokenId) {
         throw new Error('sellAsset.tokenId is required');
     }
+    const adapter = await adapterManager.byChainId('eip155:1');
     const erc20Contract = new web3.eth.Contract(erc20Abi, quote.sellAsset.tokenId);
     const approveTx = erc20Contract.methods
         .approve(quote.allowanceContract, quote.sellAmount)

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

@@ -1,18 +1,9 @@
 import { Asset } from '@shapeshiftoss/types';
+import { TradeQuote } from '../../../../api';
 import { ZrxQuoteResponse } from '../../types';
 export declare const setupQuote: () => {
-    quoteInput: {
-        sellAsset: Asset;
-        buyAsset: Asset;
-        success: boolean;
-        sellAmount: string;
-        allowanceContract: string;
-        allowanceTarget: string;
-        receiveAddress: string;
-        sellAssetAccountId: string;
-        buyAssetAccountId: string;
-        sendMax: boolean;
-    };
+    quoteInput: import("../../../../api").CommonTradeInput;
+    tradeQuote: TradeQuote<"eip155:1" | "bip122:000000000019d6689c085ae165831e93" | "cosmos:cosmoshub-4" | "cosmos:osmosis-1">;
     buyAsset: Asset;
     sellAsset: Asset;
 };

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

@@ -5,19 +5,29 @@ const assets_1 = require("./assets");
 const setupQuote = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
-    const quoteInput = {
-        sellAsset,
-        buyAsset,
+    const tradeQuote = {
         success: true,
+        statusReason: '',
+        buyAmount: '',
         sellAmount: '1000000000000000000',
+        sellAsset,
+        buyAsset,
         allowanceContract: 'allowanceContractAddress',
-        allowanceTarget: 'allowanceTargetAddress',
-        receiveAddress: 'receiveAddress',
         sellAssetAccountId: '0',
-        buyAssetAccountId: '0',
+        minimum: '0',
+        maximum: '999999999999',
+        feeData: { fee: '0' },
+        rate: '1',
+        sources: []
+    };
+    const quoteInput = {
+        sellAmount: '1000000000000000000',
+        sellAsset,
+        buyAsset,
+        sellAssetAccountId: '0',
         sendMax: false
     };
-    return { quoteInput, buyAsset, sellAsset };
+    return { quoteInput, tradeQuote, buyAsset, sellAsset };
 };
 exports.setupQuote = setupQuote;
 const setupZrxTradeQuoteResponse = () => {

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

@@ -24,7 +24,8 @@ exports.chainAdapterMockFuncs = {
 };
 // @ts-ignore
 chain_adapters_1.ChainAdapterManager.mockImplementation(() => ({
-    byChain: jest.fn(() => exports.chainAdapterMockFuncs)
+    byChain: jest.fn(() => exports.chainAdapterMockFuncs),
+    byChainId: jest.fn(() => exports.chainAdapterMockFuncs)
 }));
 const setupZrxDeps = () => {
     const unchainedUrls = {

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

@@ -1,4 +1,4 @@
-import { ChainTypes } from '@shapeshiftoss/types';
+import { SupportedChainIds } from '@shapeshiftoss/types';
 import { BuildTradeInput, Trade } from '../../..';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function zrxBuildTrade({ adapterManager, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<Trade<ChainTypes>>;
+export declare function zrxBuildTrade({ adapterManager, web3 }: ZrxSwapperDeps, input: BuildTradeInput): Promise<Trade<SupportedChainIds>>;

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

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zrxBuildTrade = void 0;
-const types_1 = require("@shapeshiftoss/types");
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
@@ -35,10 +34,7 @@ const helpers_1 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
 async function zrxBuildTrade({ adapterManager, web3 }, input) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    const { sellAsset, buyAsset, sellAmount, buyAmount, slippage, sellAssetAccountId, buyAssetAccountId, wallet } = input;
-    if ((buyAmount && sellAmount) || (!buyAmount && !sellAmount)) {
-        throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade Exactly one of buyAmount or sellAmount is required');
-    }
+    const { sellAsset, buyAsset, sellAmount, slippage, sellAssetAccountId, buyAssetAccountId, wallet } = input;
     if (!sellAssetAccountId || !buyAssetAccountId) {
         throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade Both sellAssetAccountId and buyAssetAccountId are required');
     }
@@ -50,8 +46,8 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
     if (!sellToken) {
         throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade One of sellAssetContract or sellAssetSymbol or sellAssetNetwork are required');
     }
-    if (buyAsset.chain !== types_1.ChainTypes.Ethereum) {
-        throw new __1.SwapError(`ZrxSwapper:ZrxBuildTrade buyAsset must be on chain [${types_1.ChainTypes.Ethereum}]`);
+    if (buyAsset.chainId !== 'eip155:1') {
+        throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade buyAsset must be on chainId eip155:1');
     }
     const adapter = adapterManager.byChain(buyAsset.chain);
     const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountId) });
@@ -67,7 +63,6 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
          *   sellToken: contract address (or symbol) of token to sell
          *   buyToken: contractAddress (or symbol) of token to buy
          *   sellAmount?: integer string value of the smallest increment of the sell token
-         *   buyAmount?: integer string value of the smallest incremtent of the buy token
          * }
          */
         const zrxRetry = (0, applyAxiosRetry_1.applyAxiosRetry)(zrxService_1.zrxService, {
@@ -92,7 +87,6 @@ async function zrxBuildTrade({ adapterManager, web3 }, input) {
                 buyToken,
                 sellToken,
                 sellAmount: (0, helpers_1.normalizeAmount)(sellAmount === null || sellAmount === void 0 ? void 0 : sellAmount.toString()),
-                buyAmount: (0, helpers_1.normalizeAmount)(buyAmount === null || buyAmount === void 0 ? void 0 : buyAmount.toString()),
                 takerAddress: receiveAddress,
                 slippagePercentage,
                 skipValidation: false,

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

@@ -1,4 +1,3 @@
-import { ChainTypes } from '@shapeshiftoss/types';
 import { ExecuteTradeInput, TradeResult } from '../../../api';
 import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function zrxExecuteTrade({ adapterManager }: ZrxSwapperDeps, { trade, wallet }: ExecuteTradeInput<ChainTypes.Ethereum>): Promise<TradeResult>;
+export declare function zrxExecuteTrade({ adapterManager }: ZrxSwapperDeps, { trade, wallet }: ExecuteTradeInput<'eip155:1'>): Promise<TradeResult>;

package/package.json

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