@shapeshiftoss/swapper 3.0.5 → 4.0.0

package/dist/api.d.ts

@@ -1,31 +1,96 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, BuildQuoteTxInput, chainAdapters, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
 export declare type SupportedAssetInput = {
-    assetIds: CAIP19[];
+    assetIds: AssetId[];
 };
 export declare type ByPairInput = {
-    sellAssetId: CAIP19;
-    buyAssetId: CAIP19;
+    sellAssetId: AssetId;
+    buyAssetId: AssetId;
 };
 export declare type BuyAssetBySellIdInput = {
-    sellAssetId: CAIP19;
-    assetIds: CAIP19[];
+    sellAssetId: AssetId;
+    assetIds: AssetId[];
 };
 export declare type SupportedSellAssetsInput = {
-    assetIds: CAIP19[];
+    assetIds: AssetId[];
+};
+export declare type CommonTradeInput = {
+    sellAsset: Asset;
+    buyAsset: Asset;
+    sellAmount?: string;
+    buyAmount?: string;
+    sendMax: boolean;
+    sellAssetAccountId: string;
+};
+export declare type GetTradeQuoteInput = CommonTradeInput;
+export declare type BuildTradeInput = CommonTradeInput & {
+    buyAssetAccountId: string;
+    slippage?: string;
+    wallet: HDWallet;
+};
+interface TradeBase<C extends ChainTypes> {
+    success: boolean;
+    statusReason: string;
+    buyAmount: string;
+    sellAmount: string;
+    feeData: chainAdapters.QuoteFeeData<C>;
+    rate: string;
+    allowanceContract: string;
+    sources: Array<SwapSource>;
+    buyAsset: Asset;
+    sellAsset: Asset;
+    sellAssetAccountId: string;
+}
+export interface TradeQuote<C extends ChainTypes> extends TradeBase<C> {
+    minimum: string;
+    maximum: string;
+}
+export interface Trade<C extends ChainTypes> extends TradeBase<C> {
+    txData: string;
+    depositAddress: string;
+    receiveAddress: string;
+}
+export declare type ExecuteTradeInput<C extends ChainTypes> = {
+    trade: Trade<C>;
+    wallet: HDWallet;
+};
+export declare type TradeResult = {
+    txid: string;
+};
+export declare type SwapSource = {
+    name: string;
+    proportion: string;
+};
+export declare type ApproveInfiniteInput<C extends ChainTypes> = {
+    quote: Quote<C> | TradeQuote<C>;
+    wallet: HDWallet;
+};
+export declare type ApprovalNeededInput<C extends ChainTypes> = {
+    quote: Quote<C> | TradeQuote<C>;
+    wallet: HDWallet;
 };
 export declare class SwapError extends Error {
 }
 export interface Swapper {
     /** Returns the swapper type */
     getType(): SwapperType;
+    /**
+     * Get builds a trade with definitive rate & txData that can be executed with executeTrade
+     **/
+    buildTrade(args: BuildTradeInput): Promise<Trade<ChainTypes>>;
+    /**
+     * Get a trade quote
+     */
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainTypes>>;
     /**
      * Get a Quote along with an unsigned transaction that can be signed and broadcast to execute the swap
+     * @deprecated The method is going away soon.
      **/
     buildQuoteTx(args: BuildQuoteTxInput): Promise<Quote<ChainTypes>>;
     /**
      * Get a basic quote (rate) for a trading pair
+     * @deprecated The method is going away soon.
      */
     getQuote(input: GetQuoteInput, wallet?: HDWallet): Promise<Quote<ChainTypes>>;
     /**
@@ -40,6 +105,10 @@ export interface Swapper {
      * Execute a quote built with buildQuoteTx by signing and broadcasting
      */
     executeQuote(args: ExecQuoteInput<ChainTypes>): Promise<ExecQuoteOutput>;
+    /**
+     * Execute a trade built with buildTrade by signing and broadcasting
+     */
+    executeTrade(args: ExecuteTradeInput<ChainTypes>): Promise<ExecQuoteOutput>;
     /**
      * Get a boolean if a quote needs approval
      */
@@ -51,9 +120,10 @@ export interface Swapper {
     /**
      * Get supported buyAssetId's by sellAssetId
      */
-    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): CAIP19[];
+    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
     /**
      * Get supported sell assetIds
      */
-    filterAssetIdsBySellable(assetIds: CAIP19[]): CAIP19[];
+    filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
 }
+export {};

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

@@ -1,6 +1,6 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
-import { BuyAssetBySellIdInput, Swapper } from '../../api';
+import { BuyAssetBySellIdInput, Swapper, Trade, TradeQuote } from '../../api';
 /**
  * Playground for testing different scenarios of multiple swappers in the manager.
  * Meant for local testing only
@@ -16,6 +16,9 @@ export declare class TestSwapper implements Swapper {
     executeQuote(): Promise<ExecQuoteOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
-    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): CAIP19[];
-    filterAssetIdsBySellable(): CAIP19[];
+    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
+    filterAssetIdsBySellable(): AssetId[];
+    buildTrade(): Promise<Trade<ChainTypes>>;
+    getTradeQuote(): Promise<TradeQuote<ChainTypes>>;
+    executeTrade(): Promise<ExecQuoteOutput>;
 }

package/dist/swappers/test/TestSwapper.js

@@ -49,5 +49,14 @@ class TestSwapper {
     filterAssetIdsBySellable() {
         return this.supportAssets;
     }
+    async buildTrade() {
+        throw new Error('TestSwapper: buildTrade unimplemented');
+    }
+    async getTradeQuote() {
+        throw new Error('TestSwapper: getTradeQuote unimplemented');
+    }
+    async executeTrade() {
+        throw new Error('TestSwapper: executeTrade unimplemented');
+    }
 }
 exports.TestSwapper = TestSwapper;

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

@@ -1,6 +1,6 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
-import { Swapper } from '../../api';
+import { Swapper, Trade, TradeQuote } from '../../api';
 export declare class ThorchainSwapper implements Swapper {
     getType(): SwapperType;
     getQuote(): Promise<Quote<ChainTypes>>;
@@ -10,6 +10,9 @@ export declare class ThorchainSwapper implements Swapper {
     executeQuote(): Promise<ExecQuoteOutput>;
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
-    filterBuyAssetsBySellAssetId(): CAIP19[];
-    filterAssetIdsBySellable(): CAIP19[];
+    filterBuyAssetsBySellAssetId(): AssetId[];
+    filterAssetIdsBySellable(): AssetId[];
+    buildTrade(): Promise<Trade<ChainTypes>>;
+    getTradeQuote(): Promise<TradeQuote<ChainTypes>>;
+    executeTrade(): Promise<ExecQuoteOutput>;
 }

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -35,5 +35,14 @@ class ThorchainSwapper {
     filterAssetIdsBySellable() {
         return [];
     }
+    async buildTrade() {
+        throw new Error('ThorchainSwapper: buildTrade unimplemented');
+    }
+    async getTradeQuote() {
+        throw new Error('ThorchainSwapper: getTradeQuote unimplemented');
+    }
+    async executeTrade() {
+        throw new Error('ThorchainSwapper: executeTrade unimplemented');
+    }
 }
 exports.ThorchainSwapper = ThorchainSwapper;

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

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

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApprovalNeeded = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const bignumber_js_1 = require("bignumber.js");
 const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
+const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
@@ -30,9 +30,9 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
         spenderAddress: quote.allowanceContract,
         ownerAddress: receiveAddress
     });
-    const allowanceOnChain = new bignumber_js_1.BigNumber(allowanceResult || '0');
+    const allowanceOnChain = (0, bignumber_1.bnOrZero)(allowanceResult);
     return {
-        approvalNeeded: allowanceOnChain.lt(new bignumber_js_1.BigNumber(quote.sellAmount || 1)),
+        approvalNeeded: allowanceOnChain.lte((0, bignumber_1.bnOrZero)(quote.sellAmount)),
         gas: constants_1.APPROVAL_GAS_LIMIT,
         gasPrice: (_b = (_a = quote === null || quote === void 0 ? void 0 : quote.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice
     };

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

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

package/dist/swappers/zrx/ZrxBuildQuoteTx/ZrxBuildQuoteTx.js

@@ -22,17 +22,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxBuildQuoteTx = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const rax = __importStar(require("retry-axios"));
 const __1 = require("../../..");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
+const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const zrxService_1 = require("../utils/zrxService");
@@ -59,12 +56,10 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
     const adapter = adapterManager.byChain(buyAsset.chain);
     const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountId) });
     const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-    if (new bignumber_js_1.default(slippage || 0).gt(constants_1.MAX_SLIPPAGE)) {
+    if ((0, bignumber_1.bnOrZero)(slippage).gt(constants_1.MAX_SLIPPAGE)) {
         throw new __1.SwapError(`ZrxSwapper:ZrxBuildQuoteTx slippage value of ${slippage} is greater than max slippage value of ${constants_1.MAX_SLIPPAGE}`);
     }
-    const slippagePercentage = slippage
-        ? new bignumber_js_1.default(slippage).div(100).toString()
-        : constants_1.DEFAULT_SLIPPAGE;
+    const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
     try {
         /**
          * /swap/v1/quote
@@ -105,7 +100,7 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
             }
         });
         const { data } = quoteResponse;
-        const estimatedGas = new bignumber_js_1.default(data.gas || 0);
+        const estimatedGas = (0, bignumber_1.bnOrZero)(data.gas);
         const quote = {
             sellAsset,
             buyAsset,
@@ -116,9 +111,7 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
             rate: data.price,
             depositAddress: data.to,
             feeData: {
-                fee: new bignumber_js_1.default(estimatedGas || 0)
-                    .multipliedBy(new bignumber_js_1.default(data.gasPrice || 0))
-                    .toString(),
+                fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
                 chainSpecific: {
                     estimatedGas: estimatedGas.toString(),
                     gasPrice: data.gasPrice
@@ -130,8 +123,15 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
             allowanceContract: data.allowanceTarget,
             sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
         };
+        if (!data.allowanceTarget)
+            throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx no allowance target');
+        if (!data.sellAmount)
+            throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx no sell amount');
         const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
-            quote,
+            sellAsset,
+            allowanceContract: data.allowanceTarget,
+            receiveAddress,
+            sellAmount: data.sellAmount,
             web3,
             erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi
         });
@@ -140,7 +140,7 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
                 fee: ((_b = quote.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
                 chainSpecific: {
                     ...(_c = quote.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific,
-                    approvalFee: new bignumber_js_1.default(constants_1.APPROVAL_GAS_LIMIT).multipliedBy(data.gasPrice || 0).toString()
+                    approvalFee: (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
                 }
             };
         }

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

@@ -1,8 +1,8 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { ApprovalNeededInput, ApprovalNeededOutput, ApproveInfiniteInput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
 import Web3 from 'web3';
-import { BuyAssetBySellIdInput, Swapper } from '../../api';
+import { ApprovalNeededInput, ApproveInfiniteInput, BuildTradeInput, BuyAssetBySellIdInput, ExecuteTradeInput, GetTradeQuoteInput, Swapper, Trade, TradeQuote } from '../../api';
 export declare type ZrxSwapperDeps = {
     adapterManager: ChainAdapterManager;
     web3: Web3;
@@ -17,11 +17,14 @@ export declare class ZrxSwapper implements Swapper {
     getType(): SwapperType;
     buildQuoteTx(args: BuildQuoteTxInput): Promise<Quote<ChainTypes>>;
     getQuote(input: GetQuoteInput): Promise<Quote<ChainTypes>>;
+    buildTrade(args: BuildTradeInput): Promise<Trade<ChainTypes>>;
+    getTradeQuote(input: GetTradeQuoteInput): Promise<TradeQuote<ChainTypes>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     executeQuote(args: ExecQuoteInput<ChainTypes>): Promise<ExecQuoteOutput>;
+    executeTrade(args: ExecuteTradeInput<ChainTypes>): Promise<ExecQuoteOutput>;
     approvalNeeded(args: ApprovalNeededInput<ChainTypes>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<ChainTypes>): Promise<string>;
-    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): CAIP19[];
-    filterAssetIdsBySellable(assetIds: CAIP19[]): CAIP19[];
+    filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): AssetId[];
+    filterAssetIdsBySellable(assetIds: AssetId[]): AssetId[];
 }

package/dist/swappers/zrx/ZrxSwapper.js

@@ -4,11 +4,14 @@ exports.ZrxSwapper = exports.ZrxError = void 0;
 const types_1 = require("@shapeshiftoss/types");
 const getZrxMinMax_1 = require("./getZrxMinMax/getZrxMinMax");
 const getZrxQuote_1 = require("./getZrxQuote/getZrxQuote");
+const getZrxTradeQuote_1 = require("./getZrxTradeQuote/getZrxTradeQuote");
 const helpers_1 = require("./utils/helpers/helpers");
 const ZrxApprovalNeeded_1 = require("./ZrxApprovalNeeded/ZrxApprovalNeeded");
 const ZrxApproveInfinite_1 = require("./ZrxApproveInfinite/ZrxApproveInfinite");
 const ZrxBuildQuoteTx_1 = require("./ZrxBuildQuoteTx/ZrxBuildQuoteTx");
+const zrxBuildTrade_1 = require("./zrxBuildTrade/zrxBuildTrade");
 const ZrxExecuteQuote_1 = require("./ZrxExecuteQuote/ZrxExecuteQuote");
+const zrxExecuteTrade_1 = require("./zrxExecuteTrade/zrxExecuteTrade");
 class ZrxError extends Error {
     constructor(message) {
         super(message);
@@ -29,6 +32,12 @@ class ZrxSwapper {
     async getQuote(input) {
         return (0, getZrxQuote_1.getZrxQuote)(input);
     }
+    async buildTrade(args) {
+        return (0, zrxBuildTrade_1.zrxBuildTrade)(this.deps, args);
+    }
+    async getTradeQuote(input) {
+        return (0, getZrxTradeQuote_1.getZrxTradeQuote)(input);
+    }
     async getUsdRate(input) {
         return (0, helpers_1.getUsdRate)(input);
     }
@@ -38,6 +47,9 @@ class ZrxSwapper {
     async executeQuote(args) {
         return (0, ZrxExecuteQuote_1.ZrxExecuteQuote)(this.deps, args);
     }
+    async executeTrade(args) {
+        return (0, zrxExecuteTrade_1.zrxExecuteTrade)(this.deps, args);
+    }
     async approvalNeeded(args) {
         return (0, ZrxApprovalNeeded_1.ZrxApprovalNeeded)(this.deps, args);
     }
@@ -46,7 +58,6 @@ class ZrxSwapper {
     }
     filterBuyAssetsBySellAssetId(args) {
         const { assetIds, sellAssetId } = args;
-        // TODO: pending changes to caip lib, we may want to import caip2 value instead.
         return assetIds.filter((id) => id.startsWith('eip155:1') && sellAssetId.startsWith('eip155:1'));
     }
     filterAssetIdsBySellable(assetIds) {

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

@@ -1,11 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxMinMax = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
+const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
 const ZrxSwapper_1 = require("../ZrxSwapper");
@@ -18,7 +15,7 @@ const getZrxMinMax = async (input) => {
         symbol: sellAsset.symbol,
         tokenId: sellAsset.tokenId
     });
-    const minimum = new bignumber_js_1.default(1).dividedBy(new bignumber_js_1.default(usdRate)).toString();
+    const minimum = (0, bignumber_1.bnOrZero)(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/getZrxQuote/getZrxQuote.js

@@ -1,11 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getZrxQuote = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const getZrxMinMax_1 = require("../getZrxMinMax/getZrxMinMax");
 const bignumber_1 = require("../utils/bignumber");
 const constants_1 = require("../utils/constants");
@@ -60,10 +56,8 @@ async function getZrxQuote(input) {
             }
         });
         const { data } = quoteResponse;
-        const estimatedGas = data.estimatedGas
-            ? new bignumber_js_1.default(data.estimatedGas).times(1.5)
-            : new bignumber_js_1.default(0);
-        const rate = useSellAmount ? data.price : new bignumber_js_1.default(1).div(data.price).toString();
+        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();
         return {
             sellAsset,
             buyAsset,
@@ -72,14 +66,12 @@ async function getZrxQuote(input) {
             minimum: minQuoteSellAmount,
             maximum: maxSellAmount,
             feeData: {
-                fee: new bignumber_js_1.default(estimatedGas || 0)
-                    .multipliedBy(new bignumber_js_1.default(data.gasPrice || 0))
-                    .toString(),
+                fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
                 chainSpecific: {
                     estimatedGas: estimatedGas.toString(),
                     gasPrice: data.gasPrice,
                     approvalFee: sellAsset.tokenId &&
-                        new bignumber_js_1.default(constants_1.APPROVAL_GAS_LIMIT).multipliedBy(data.gasPrice || 0).toString()
+                        (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
                 }
             },
             sellAmount: data.sellAmount,

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

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

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

@@ -0,0 +1,107 @@
+"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");
+const helpers_1 = require("../utils/helpers/helpers");
+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;
+    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) {
+        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');
+    }
+    try {
+        /**
+         * /swap/v1/price
+         * params: {
+         *   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 quoteResponse = await zrxService_1.zrxService.get('/swap/v1/price', {
+            params: {
+                sellToken,
+                buyToken,
+                [amountKey]: normalizedAmount
+            }
+        });
+        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();
+        return {
+            success: true,
+            statusReason: '',
+            rate,
+            minimum: minQuoteSellAmount,
+            maximum: maxSellAmount,
+            feeData: {
+                fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
+                chainSpecific: {
+                    estimatedGas: estimatedGas.toString(),
+                    gasPrice: data.gasPrice,
+                    approvalFee: sellAsset.tokenId &&
+                        (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
+                }
+            },
+            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,
+            allowanceContract: data.allowanceTarget,
+            buyAsset,
+            sellAsset,
+            sellAssetAccountId
+        };
+    }
+    catch (e) {
+        const statusReason = ((_e = (_d = (_c = (_b = e === null || e === void 0 ? void 0 : e.response) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.validationErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.reason) ||
+            ((_g = (_f = e === null || e === void 0 ? void 0 : e.response) === null || _f === void 0 ? void 0 : _f.data) === null || _g === void 0 ? void 0 : _g.reason) ||
+            'Unknown Error';
+        // This hackyness will go away when we correctly handle errors
+        return {
+            success: false,
+            statusReason,
+            maximum: '0',
+            minimum: '0',
+            rate: '0',
+            feeData: { fee: '0', chainSpecific: {} },
+            buyAmount: '0',
+            sellAmount: '0',
+            sources: [],
+            allowanceContract: '0',
+            buyAsset,
+            sellAsset,
+            sellAssetAccountId
+        };
+    }
+}
+exports.getZrxTradeQuote = getZrxTradeQuote;

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

@@ -0,0 +1,17 @@
+import { SwapSource } from '../../api';
+export declare type ZrxCommonResponse = {
+    price: string;
+    gasPrice: string;
+    buyAmount: string;
+    sellAmount: string;
+    allowanceTarget: string;
+    sources: Array<SwapSource>;
+};
+export declare type ZrxPriceResponse = ZrxCommonResponse & {
+    estimatedGas: string;
+};
+export declare type ZrxQuoteResponse = ZrxCommonResponse & {
+    to: string;
+    data: string;
+    gas: string;
+};

package/dist/swappers/zrx/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -5,7 +5,10 @@ import BigNumber from 'bignumber.js';
 import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
 export declare type GetAllowanceRequiredArgs = {
-    quote: Quote<ChainTypes>;
+    receiveAddress: string;
+    allowanceContract: string;
+    sellAsset: Asset;
+    sellAmount: string;
     web3: Web3;
     erc20AllowanceAbi: AbiItem[];
 };
@@ -33,7 +36,7 @@ declare type GrantAllowanceArgs = {
  */
 export declare const normalizeAmount: (amount: string | undefined) => string | undefined;
 export declare const getERC20Allowance: ({ erc20AllowanceAbi, web3, tokenId, ownerAddress, spenderAddress }: GetERC20AllowanceArgs) => Promise<any>;
-export declare const getAllowanceRequired: ({ quote, web3, erc20AllowanceAbi }: GetAllowanceRequiredArgs) => Promise<BigNumber>;
+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 {};

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

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grantAllowance = exports.getUsdRate = exports.getAllowanceRequired = exports.getERC20Allowance = exports.normalizeAmount = void 0;
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../../api");
 const ZrxSwapper_1 = require("../../ZrxSwapper");
+const bignumber_1 = require("../bignumber");
 const zrxService_1 = require("../zrxService");
 /**
  * Very large amounts like those found in ERC20s with a precision of 18 get converted
@@ -20,7 +17,7 @@ const zrxService_1 = require("../zrxService");
 const normalizeAmount = (amount) => {
     if (!amount)
         return;
-    return new bignumber_js_1.default(amount).toNumber().toLocaleString('fullwide', { useGrouping: false });
+    return (0, bignumber_1.bnOrZero)(amount).toNumber().toLocaleString('fullwide', { useGrouping: false });
 };
 exports.normalizeAmount = normalizeAmount;
 const getERC20Allowance = async ({ erc20AllowanceAbi, web3, tokenId, ownerAddress, spenderAddress }) => {
@@ -28,13 +25,13 @@ const getERC20Allowance = async ({ erc20AllowanceAbi, web3, tokenId, ownerAddres
     return erc20Contract.methods.allowance(ownerAddress, spenderAddress).call();
 };
 exports.getERC20Allowance = getERC20Allowance;
-const getAllowanceRequired = async ({ quote, web3, erc20AllowanceAbi }) => {
-    if (quote.sellAsset.symbol === 'ETH') {
-        return new bignumber_js_1.default(0);
+const getAllowanceRequired = async ({ receiveAddress, allowanceContract, sellAsset, sellAmount, web3, erc20AllowanceAbi }) => {
+    if (sellAsset.symbol === 'ETH') {
+        return (0, bignumber_1.bnOrZero)(0);
     }
-    const ownerAddress = quote.receiveAddress;
-    const spenderAddress = quote.allowanceContract;
-    const tokenId = quote.sellAsset.tokenId;
+    const ownerAddress = receiveAddress;
+    const spenderAddress = allowanceContract;
+    const tokenId = sellAsset.tokenId;
     if (!ownerAddress || !spenderAddress || !tokenId) {
         throw new api_1.SwapError('getAllowanceRequired - receiveAddress, allowanceContract and tokenId are required');
     }
@@ -46,13 +43,13 @@ const getAllowanceRequired = async ({ quote, web3, erc20AllowanceAbi }) => {
         tokenId
     });
     if (allowanceOnChain === '0') {
-        return new bignumber_js_1.default(quote.sellAmount || 0);
+        return (0, bignumber_1.bnOrZero)(sellAmount);
     }
     if (!allowanceOnChain) {
-        throw new api_1.SwapError(`No allowance data for ${quote.allowanceContract} to ${quote.receiveAddress}`);
+        throw new api_1.SwapError(`No allowance data for ${allowanceContract} to ${receiveAddress}`);
     }
-    const allowanceRequired = new bignumber_js_1.default(quote.sellAmount || 0).minus(allowanceOnChain);
-    return allowanceRequired.lt(0) ? new bignumber_js_1.default(0) : allowanceRequired;
+    const allowanceRequired = (0, bignumber_1.bnOrZero)(sellAmount).minus(allowanceOnChain);
+    return allowanceRequired.lt(0) ? (0, bignumber_1.bnOrZero)(0) : allowanceRequired;
 };
 exports.getAllowanceRequired = getAllowanceRequired;
 const getUsdRate = async (input) => {
@@ -66,10 +63,10 @@ const getUsdRate = async (input) => {
             sellToken: tokenId || symbol
         }
     });
-    const price = new bignumber_js_1.default(rateResponse.data.price);
+    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 new bignumber_js_1.default(1).dividedBy(price).toString();
+    return (0, bignumber_1.bnOrZero)(1).dividedBy(price).toString();
 };
 exports.getUsdRate = getUsdRate;
 const grantAllowance = async ({ quote, wallet, adapter, erc20Abi, web3 }) => {

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

@@ -6,8 +6,6 @@ const types_1 = require("@shapeshiftoss/types");
 exports.BTC = {
     assetId: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
     chainId: 'bip122:000000000019d6689c085ae165831e93',
-    caip19: 'bip122:000000000019d6689c085ae165831e93/slip44:0',
-    caip2: 'bip122:000000000019d6689c085ae165831e93',
     name: 'bitcoin',
     chain: types_1.ChainTypes.Bitcoin,
     dataSource: types_1.AssetDataSource.CoinGecko,
@@ -28,8 +26,6 @@ exports.BTC = {
 exports.WETH = {
     assetId: 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
     chainId: 'eip155:1',
-    caip19: 'eip155:1/erc20:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-    caip2: 'eip155:1',
     name: 'WETH',
     chain: types_1.ChainTypes.Ethereum,
     dataSource: types_1.AssetDataSource.CoinGecko,
@@ -51,8 +47,6 @@ exports.WETH = {
 exports.FOX = {
     assetId: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
     chainId: 'eip155:1',
-    caip19: 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d',
-    caip2: 'eip155:1',
     name: 'FOX',
     chain: types_1.ChainTypes.Ethereum,
     dataSource: types_1.AssetDataSource.CoinGecko,

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

@@ -1,4 +1,5 @@
 import { Asset } from '@shapeshiftoss/types';
+import { ZrxQuoteResponse } from '../../types';
 export declare const setupQuote: () => {
     quoteInput: {
         sellAsset: Asset;
@@ -15,3 +16,8 @@ export declare const setupQuote: () => {
     buyAsset: Asset;
     sellAsset: Asset;
 };
+export declare const setupZrxQuoteResponse: () => {
+    quoteResponse: ZrxQuoteResponse;
+    buyAsset: Asset;
+    sellAsset: Asset;
+};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupQuote = void 0;
+exports.setupZrxQuoteResponse = exports.setupQuote = void 0;
 const constants_1 = require("../constants");
 const assets_1 = require("./assets");
 const setupQuote = () => {
@@ -21,3 +21,20 @@ const setupQuote = () => {
     return { quoteInput, buyAsset, sellAsset };
 };
 exports.setupQuote = setupQuote;
+const setupZrxQuoteResponse = () => {
+    const sellAsset = { ...assets_1.FOX };
+    const buyAsset = { ...assets_1.WETH };
+    const quoteResponse = {
+        sellAmount: '1000000000000000000',
+        allowanceTarget: 'allowanceTargetAddress',
+        price: '1',
+        to: '0x123',
+        data: '0x1234',
+        gas: '1235',
+        gasPrice: '1236',
+        sources: [],
+        buyAmount: ''
+    };
+    return { quoteResponse, buyAsset, sellAsset };
+};
+exports.setupZrxQuoteResponse = setupZrxQuoteResponse;

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

@@ -20,7 +20,7 @@ export declare const chainAdapterMockFuncs: {
     getAccount: jest.Mock<Promise<{
         chainSpecific: {
             tokens: {
-                caip19: string;
+                assetId: string;
                 balance: string;
             }[];
         };

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

@@ -16,7 +16,7 @@ exports.chainAdapterMockFuncs = {
     getInfo: jest.fn(() => Promise.resolve({ data: { network: 'mainnet' } })),
     getAddress: jest.fn(() => Promise.resolve('address')),
     getAccount: jest.fn(() => Promise.resolve({
-        chainSpecific: { tokens: [{ caip19: 'eip155:1/erc20:contractAddress', balance: '1000000' }] }
+        chainSpecific: { tokens: [{ assetId: 'eip155:1/erc20:contractAddress', balance: '1000000' }] }
     })),
     getFeeData: jest.fn(() => Promise.resolve({
         [types_1.chainAdapters.FeeDataKey.Average]: { txFee: '10000' }

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

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

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

@@ -0,0 +1,169 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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");
+const applyAxiosRetry_1 = require("../utils/applyAxiosRetry");
+const bignumber_1 = require("../utils/bignumber");
+const constants_1 = require("../utils/constants");
+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');
+    }
+    if (!sellAssetAccountId || !buyAssetAccountId) {
+        throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade Both sellAssetAccountId and buyAssetAccountId are required');
+    }
+    const buyToken = buyAsset.tokenId || buyAsset.symbol || buyAsset.network;
+    const sellToken = sellAsset.tokenId || sellAsset.symbol || sellAsset.network;
+    if (!buyToken) {
+        throw new __1.SwapError('ZrxSwapper:ZrxBuildTrade One of buyAssetContract or buyAssetSymbol or buyAssetNetwork are required');
+    }
+    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}]`);
+    }
+    const adapter = adapterManager.byChain(buyAsset.chain);
+    const bip44Params = adapter.buildBIP44Params({ accountNumber: Number(buyAssetAccountId) });
+    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
+    if ((0, bignumber_1.bnOrZero)(slippage).gt(constants_1.MAX_SLIPPAGE)) {
+        throw new __1.SwapError(`ZrxSwapper:ZrxBuildTrade slippage value of ${slippage} is greater than max slippage value of ${constants_1.MAX_SLIPPAGE}`);
+    }
+    const slippagePercentage = slippage ? (0, bignumber_1.bnOrZero)(slippage).div(100).toString() : constants_1.DEFAULT_SLIPPAGE;
+    try {
+        /**
+         * /swap/v1/quote
+         * params: {
+         *   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, {
+            statusCodesToRetry: [[400, 400]],
+            shouldRetry: (err) => {
+                var _a, _b, _c, _d;
+                const cfg = rax.getConfig(err);
+                const retryAttempt = (_a = cfg === null || cfg === void 0 ? void 0 : cfg.currentRetryAttempt) !== null && _a !== void 0 ? _a : 0;
+                const retry = (_b = cfg === null || cfg === void 0 ? void 0 : cfg.retry) !== null && _b !== void 0 ? _b : 3;
+                // ensure max retries is always respected
+                if (retryAttempt >= retry)
+                    return false;
+                // retry if 0x returns error code 111 Gas estimation failed
+                if (((_d = (_c = err === null || err === void 0 ? void 0 : err.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.code) === 111)
+                    return true;
+                // Handle the request based on your other config options, e.g. `statusCodesToRetry`
+                return rax.shouldRetryRequest(err);
+            }
+        });
+        const quoteResponse = await zrxRetry.get('/swap/v1/quote', {
+            params: {
+                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,
+                affiliateAddress: constants_1.AFFILIATE_ADDRESS
+            }
+        });
+        const { data } = quoteResponse;
+        const estimatedGas = (0, bignumber_1.bnOrZero)(data.gas || 0);
+        const trade = {
+            sellAsset,
+            buyAsset,
+            success: true,
+            statusReason: '',
+            sellAssetAccountId,
+            receiveAddress,
+            rate: data.price,
+            depositAddress: data.to,
+            feeData: {
+                fee: (0, bignumber_1.bnOrZero)(estimatedGas).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString(),
+                chainSpecific: {
+                    estimatedGas: estimatedGas.toString(),
+                    gasPrice: data.gasPrice
+                }
+            },
+            txData: data.data,
+            sellAmount: data.sellAmount,
+            buyAmount: data.buyAmount,
+            allowanceContract: data.allowanceTarget,
+            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE
+        };
+        const allowanceRequired = await (0, helpers_1.getAllowanceRequired)({
+            sellAsset,
+            allowanceContract: data.allowanceTarget,
+            receiveAddress,
+            sellAmount: data.sellAmount,
+            web3,
+            erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi
+        });
+        if (allowanceRequired) {
+            trade.feeData = {
+                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()
+                }
+            };
+        }
+        return trade;
+    }
+    catch (e) {
+        // eslint-disable-next-line no-console
+        const statusReason = ((_g = (_f = (_e = (_d = e === null || e === void 0 ? void 0 : e.response) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.validationErrors) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.reason) ||
+            ((_j = (_h = e === null || e === void 0 ? void 0 : e.response) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.reason) ||
+            'Unknown Error';
+        // This hackyness will go away when we correctly handle errors
+        return {
+            sellAsset,
+            buyAsset,
+            success: false,
+            statusReason,
+            sellAmount: '0',
+            buyAmount: '0',
+            depositAddress: '',
+            allowanceContract: '',
+            receiveAddress: '',
+            sellAssetAccountId,
+            txData: '',
+            rate: '0',
+            feeData: { fee: '0', chainSpecific: {} },
+            sources: []
+        };
+    }
+}
+exports.zrxBuildTrade = zrxBuildTrade;

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

@@ -0,0 +1,4 @@
+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>;

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

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.zrxExecuteTrade = void 0;
+const web3_utils_1 = require("web3-utils");
+const api_1 = require("../../../api");
+async function zrxExecuteTrade({ adapterManager }, { trade, wallet }) {
+    var _a, _b, _c, _d, _e, _f;
+    const { sellAsset } = trade;
+    if (!sellAsset.symbol) {
+        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteTrade sellAssetSymbol is required');
+    }
+    if (!trade.sellAssetAccountId) {
+        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteTrade sellAssetAccountId is required');
+    }
+    if (!trade.sellAmount) {
+        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteTrade sellAmount is required');
+    }
+    if (!trade.depositAddress) {
+        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteTrade depositAddress is required');
+    }
+    // value is 0 for erc20s
+    const value = sellAsset.symbol === 'ETH' ? trade.sellAmount : '0';
+    const adapter = adapterManager.byChain(sellAsset.chain);
+    const bip44Params = adapter.buildBIP44Params({
+        accountNumber: Number(trade.sellAssetAccountId)
+    });
+    let buildTxResponse, signedTx, txid;
+    try {
+        buildTxResponse = await adapter.buildSendTransaction({
+            value,
+            wallet,
+            to: trade.depositAddress,
+            chainSpecific: {
+                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = trade.feeData) === null || _a === void 0 ? void 0 : _a.chainSpecific) === null || _b === void 0 ? void 0 : _b.gasPrice) || 0),
+                gasLimit: (0, web3_utils_1.numberToHex)(((_d = (_c = trade.feeData) === null || _c === void 0 ? void 0 : _c.chainSpecific) === null || _d === void 0 ? void 0 : _d.estimatedGas) || 0)
+            },
+            bip44Params
+        });
+    }
+    catch (error) {
+        throw new api_1.SwapError(`ZrxExecuteTrade - buildSendTransaction error: ${error}`);
+    }
+    const { txToSign } = buildTxResponse;
+    const txWithQuoteData = { ...txToSign, data: (_e = trade.txData) !== null && _e !== void 0 ? _e : '' };
+    if (wallet.supportsOfflineSigning()) {
+        try {
+            signedTx = await adapter.signTransaction({ txToSign: txWithQuoteData, wallet });
+        }
+        catch (error) {
+            throw new api_1.SwapError(`ZrxExecuteTrade - signTransaction error: ${error}`);
+        }
+        if (!signedTx) {
+            throw new api_1.SwapError(`ZrxExecuteTrade - Signed transaction is required: ${signedTx}`);
+        }
+        try {
+            txid = await adapter.broadcastTransaction(signedTx);
+        }
+        catch (error) {
+            throw new api_1.SwapError(`ZrxExecuteTrade - broadcastTransaction error: ${error}`);
+        }
+        return { txid };
+    }
+    else if (wallet.supportsBroadcast() && adapter.signAndBroadcastTransaction) {
+        try {
+            txid = await ((_f = adapter.signAndBroadcastTransaction) === null || _f === void 0 ? void 0 : _f.call(adapter, { txToSign: txWithQuoteData, wallet }));
+        }
+        catch (error) {
+            throw new api_1.SwapError(`ZrxExecuteTrade - signAndBroadcastTransaction error: ${error}`);
+        }
+        return { txid };
+    }
+    else {
+        throw new api_1.SwapError('ZrxExecuteTrade - invalid HDWallet config');
+    }
+}
+exports.zrxExecuteTrade = zrxExecuteTrade;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "3.0.5",
+  "version": "4.0.0",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -31,17 +31,17 @@
   },
   "peerDependencies": {
     "@shapeshiftoss/asset-service": "^2.0.0",
-    "@shapeshiftoss/caip": "^2.0.0",
-    "@shapeshiftoss/chain-adapters": "^2.0.0",
+    "@shapeshiftoss/caip": "^3.0.0",
+    "@shapeshiftoss/chain-adapters": "^3.0.0",
     "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^3.0.0"
+    "@shapeshiftoss/types": "^4.0.0"
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^2.0.0",
-    "@shapeshiftoss/caip": "^2.0.0",
-    "@shapeshiftoss/chain-adapters": "^2.0.0",
+    "@shapeshiftoss/caip": "^3.0.0",
+    "@shapeshiftoss/chain-adapters": "^3.0.0",
     "@shapeshiftoss/hdwallet-core": "^1.20.0",
-    "@shapeshiftoss/types": "^3.0.0",
+    "@shapeshiftoss/types": "^4.0.0",
     "@types/readline-sync": "^1.4.4",
     "readline-sync": "^1.4.10",
     "web3-utils": "^1.5.2"