@shapeshiftoss/swapper 3.0.6 → 4.0.1

package/dist/api.d.ts

@@ -1,19 +1,19 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { HDWallet } from '@shapeshiftoss/hdwallet-core';
-import { ApprovalNeededOutput, Asset, BuildQuoteTxInput, chainAdapters, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, chainAdapters, ChainTypes, 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;
@@ -83,16 +83,6 @@ export interface Swapper {
      * 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>>;
     /**
      * Get the usd rate from either the assets symbol or tokenId
      */
@@ -101,10 +91,6 @@ export interface Swapper {
      * Get the minimum and maximum trade value of the sellAsset and buyAsset
      */
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    /**
-     * 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
      */
@@ -120,10 +106,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/swappercli.js

@@ -86,15 +86,12 @@ const main = async () => {
     manager.addSwapper(types_1.SwapperType.Zrx, zrxSwapper);
     const swapper = manager.getSwapper(types_1.SwapperType.Zrx);
     const sellAmountBase = toBaseUnit(sellAmount, sellAsset.precision);
-    const quote = await swapper.buildQuoteTx({
-        input: {
-            sellAsset,
-            buyAsset,
-            sellAmount: sellAmountBase,
-            sellAssetAccountId: '0',
-            buyAssetAccountId: '0'
-        },
-        wallet
+    const quote = await swapper.getTradeQuote({
+        sellAsset,
+        buyAsset,
+        sellAmount: sellAmountBase,
+        sellAssetAccountId: '0',
+        sendMax: false
     });
     console.info('quote = ', JSON.stringify(quote));
     if (!quote.success) {
@@ -104,7 +101,16 @@ const main = async () => {
     const buyAmount = fromBaseUnit(quote.buyAmount || '0', buyAsset.precision);
     const answer = readline_sync_1.default.question(`Swap ${sellAmount} ${sellAsset.symbol} for ${buyAmount} ${buyAsset.symbol} on ${swapper.getType()}? (y/n): `);
     if (answer === 'y') {
-        const txid = await swapper.executeQuote({ quote, wallet });
+        const trade = await swapper.buildTrade({
+            wallet,
+            buyAsset,
+            sendMax: false,
+            sellAmount: sellAmountBase,
+            sellAsset,
+            sellAssetAccountId: '0',
+            buyAssetAccountId: '0'
+        });
+        const txid = await swapper.executeTrade({ trade, wallet });
         console.info('broadcast tx with id: ', txid);
     }
 };

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

@@ -1,5 +1,5 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
-import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { AssetId } from '@shapeshiftoss/caip';
+import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, SwapperType } from '@shapeshiftoss/types';
 import { BuyAssetBySellIdInput, Swapper, Trade, TradeQuote } from '../../api';
 /**
  * Playground for testing different scenarios of multiple swappers in the manager.
@@ -9,15 +9,12 @@ export declare class TestSwapper implements Swapper {
     supportAssets: string[];
     getType(): SwapperType;
     constructor();
-    getQuote(): Promise<Quote<ChainTypes>>;
-    buildQuoteTx(): Promise<Quote<ChainTypes>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    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

@@ -17,12 +17,6 @@ class TestSwapper {
     getType() {
         return types_1.SwapperType.Test;
     }
-    async getQuote() {
-        throw new Error('TestSwapper: getQuote unimplemented');
-    }
-    async buildQuoteTx() {
-        throw new Error('TestSwapper: getQuote unimplemented');
-    }
     getUsdRate(input) {
         console.info(input);
         throw new Error('TestSwapper: getUsdRate unimplemented');
@@ -31,9 +25,6 @@ class TestSwapper {
         console.info(input);
         throw new Error('TestSwapper: getMinMax unimplemented');
     }
-    async executeQuote() {
-        throw new Error('TestSwapper: executeQuote unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('TestSwapper: approvalNeeded unimplemented');
     }

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

@@ -1,17 +1,14 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
-import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { AssetId } from '@shapeshiftoss/caip';
+import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, SwapperType } from '@shapeshiftoss/types';
 import { Swapper, Trade, TradeQuote } from '../../api';
 export declare class ThorchainSwapper implements Swapper {
     getType(): SwapperType;
-    getQuote(): Promise<Quote<ChainTypes>>;
-    buildQuoteTx(): Promise<Quote<ChainTypes>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    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

@@ -6,12 +6,6 @@ class ThorchainSwapper {
     getType() {
         return types_1.SwapperType.Thorchain;
     }
-    async getQuote() {
-        throw new Error('ThorchainSwapper: getQuote unimplemented');
-    }
-    async buildQuoteTx() {
-        throw new Error('ThorchainSwapper: getQuote unimplemented');
-    }
     getUsdRate(input) {
         console.info(input);
         throw new Error('ThorchainSwapper: getUsdRate unimplemented');
@@ -20,9 +14,6 @@ class ThorchainSwapper {
         console.info(input);
         throw new Error('ThorchainSwapper: getMinMax unimplemented');
     }
-    async executeQuote() {
-        throw new Error('ThorchainSwapper: executeQuote unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('ThorchainSwapper: approvalNeeded unimplemented');
     }

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

@@ -1,6 +1,6 @@
-import { CAIP19 } from '@shapeshiftoss/caip';
+import { AssetId } from '@shapeshiftoss/caip';
 import { ChainAdapterManager } from '@shapeshiftoss/chain-adapters';
-import { ApprovalNeededOutput, Asset, BuildQuoteTxInput, ChainTypes, ExecQuoteInput, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, Quote, SwapperType } from '@shapeshiftoss/types';
+import { ApprovalNeededOutput, Asset, ChainTypes, ExecQuoteOutput, GetQuoteInput, MinMaxOutput, 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,16 +15,13 @@ export declare class ZrxSwapper implements Swapper {
     deps: ZrxSwapperDeps;
     constructor(deps: ZrxSwapperDeps);
     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

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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) {
@@ -26,12 +23,6 @@ class ZrxSwapper {
     getType() {
         return types_1.SwapperType.Zrx;
     }
-    async buildQuoteTx(args) {
-        return (0, ZrxBuildQuoteTx_1.ZrxBuildQuoteTx)(this.deps, args);
-    }
-    async getQuote(input) {
-        return (0, getZrxQuote_1.getZrxQuote)(input);
-    }
     async buildTrade(args) {
         return (0, zrxBuildTrade_1.zrxBuildTrade)(this.deps, args);
     }
@@ -44,9 +35,6 @@ class ZrxSwapper {
     async getMinMax(input) {
         return (0, getZrxMinMax_1.getZrxMinMax)(input);
     }
-    async executeQuote(args) {
-        return (0, ZrxExecuteQuote_1.ZrxExecuteQuote)(this.deps, args);
-    }
     async executeTrade(args) {
         return (0, zrxExecuteTrade_1.zrxExecuteTrade)(this.deps, args);
     }
@@ -58,7 +46,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/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

@@ -6,18 +6,63 @@ export declare const setupQuote: () => {
         buyAsset: Asset;
         success: boolean;
         sellAmount: string;
-        slippage: string;
         allowanceContract: string;
         allowanceTarget: string;
         receiveAddress: string;
         sellAssetAccountId: string;
         buyAssetAccountId: string;
+        sendMax: boolean;
     };
     buyAsset: Asset;
     sellAsset: Asset;
 };
-export declare const setupZrxQuoteResponse: () => {
+export declare const setupZrxTradeQuoteResponse: () => {
     quoteResponse: ZrxQuoteResponse;
     buyAsset: Asset;
     sellAsset: Asset;
 };
+export declare const setupBuildTrade: () => {
+    buildTradeInput: {
+        sellAmount: string;
+        allowanceTarget: string;
+        price: string;
+        to: string;
+        buyAmount: string;
+        buyAsset: Asset;
+        sendMax: boolean;
+        sellAssetAccountId: string;
+        buyAssetAccountId: string;
+        sellAsset: Asset;
+    };
+    buyAsset: Asset;
+    sellAsset: Asset;
+};
+export declare const setupExecuteTrade: () => {
+    executeTradeInput: {
+        sellAmount: string;
+        allowanceTarget: string;
+        price: string;
+        to: string;
+        gas: string;
+        gasPrice: string;
+        buyAmount: string;
+        buyAsset: Asset;
+        sellAsset: Asset;
+        sendMax: boolean;
+        sellAssetAccountId: string;
+        txData: string;
+        depositAddress: string;
+        receiveAddress: string;
+        success: boolean;
+        statusReason: string;
+        feeData: {
+            fee: string;
+            chainSpecific: {};
+        };
+        rate: string;
+        allowanceContract: string;
+        sources: never[];
+    };
+    buyAsset: Asset;
+    sellAsset: Asset;
+};

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupZrxQuoteResponse = exports.setupQuote = void 0;
-const constants_1 = require("../constants");
+exports.setupExecuteTrade = exports.setupBuildTrade = exports.setupZrxTradeQuoteResponse = exports.setupQuote = void 0;
 const assets_1 = require("./assets");
 const setupQuote = () => {
     const sellAsset = { ...assets_1.FOX };
@@ -11,17 +10,17 @@ const setupQuote = () => {
         buyAsset,
         success: true,
         sellAmount: '1000000000000000000',
-        slippage: constants_1.DEFAULT_SLIPPAGE,
         allowanceContract: 'allowanceContractAddress',
         allowanceTarget: 'allowanceTargetAddress',
         receiveAddress: 'receiveAddress',
         sellAssetAccountId: '0',
-        buyAssetAccountId: '0'
+        buyAssetAccountId: '0',
+        sendMax: false
     };
     return { quoteInput, buyAsset, sellAsset };
 };
 exports.setupQuote = setupQuote;
-const setupZrxQuoteResponse = () => {
+const setupZrxTradeQuoteResponse = () => {
     const sellAsset = { ...assets_1.FOX };
     const buyAsset = { ...assets_1.WETH };
     const quoteResponse = {
@@ -37,4 +36,50 @@ const setupZrxQuoteResponse = () => {
     };
     return { quoteResponse, buyAsset, sellAsset };
 };
-exports.setupZrxQuoteResponse = setupZrxQuoteResponse;
+exports.setupZrxTradeQuoteResponse = setupZrxTradeQuoteResponse;
+const setupBuildTrade = () => {
+    const sellAsset = { ...assets_1.FOX };
+    const buyAsset = { ...assets_1.WETH };
+    const buildTradeInput = {
+        sellAmount: '1000000000000000000',
+        allowanceTarget: 'allowanceTargetAddress',
+        price: '1',
+        to: '0x123',
+        buyAmount: '',
+        buyAsset,
+        sendMax: false,
+        sellAssetAccountId: '0',
+        buyAssetAccountId: '0',
+        sellAsset
+    };
+    return { buildTradeInput, buyAsset, sellAsset };
+};
+exports.setupBuildTrade = setupBuildTrade;
+const setupExecuteTrade = () => {
+    const sellAsset = { ...assets_1.FOX };
+    const buyAsset = { ...assets_1.WETH };
+    const executeTradeInput = {
+        sellAmount: '1000000000000000000',
+        allowanceTarget: 'allowanceTargetAddress',
+        price: '1',
+        to: '0x123',
+        gas: '1235',
+        gasPrice: '1236',
+        buyAmount: '',
+        buyAsset,
+        sellAsset,
+        sendMax: false,
+        sellAssetAccountId: '0',
+        txData: '0x0',
+        depositAddress: '0x0',
+        receiveAddress: '0x0',
+        success: true,
+        statusReason: '',
+        feeData: { fee: '0', chainSpecific: {} },
+        rate: '0',
+        allowanceContract: '0x0',
+        sources: []
+    };
+    return { executeTradeInput, buyAsset, sellAsset };
+};
+exports.setupExecuteTrade = setupExecuteTrade;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "3.0.6",
+  "version": "4.0.1",
   "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"

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

@@ -1,3 +0,0 @@
-import { BuildQuoteTxInput, ChainTypes, Quote } from '@shapeshiftoss/types';
-import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxBuildQuoteTx({ adapterManager, web3 }: ZrxSwapperDeps, { input, wallet }: BuildQuoteTxInput): Promise<Quote<ChainTypes>>;

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

@@ -1,161 +0,0 @@
-"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.ZrxBuildQuoteTx = 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 ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    const { sellAsset, buyAsset, sellAmount, buyAmount, slippage, sellAssetAccountId, buyAssetAccountId } = input;
-    if ((buyAmount && sellAmount) || (!buyAmount && !sellAmount)) {
-        throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx Exactly one of buyAmount or sellAmount is required');
-    }
-    if (!sellAssetAccountId || !buyAssetAccountId) {
-        throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx 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:ZrxBuildQuoteTx One of buyAssetContract or buyAssetSymbol or buyAssetNetwork are required');
-    }
-    if (!sellToken) {
-        throw new __1.SwapError('ZrxSwapper:ZrxBuildQuoteTx One of sellAssetContract or sellAssetSymbol or sellAssetNetwork are required');
-    }
-    if (buyAsset.chain !== types_1.ChainTypes.Ethereum) {
-        throw new __1.SwapError(`ZrxSwapper:ZrxBuildQuoteTx 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:ZrxBuildQuoteTx 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);
-        const quote = {
-            sellAsset,
-            buyAsset,
-            sellAssetAccountId,
-            buyAssetAccountId,
-            receiveAddress,
-            success: true,
-            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
-        };
-        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)({
-            sellAsset,
-            allowanceContract: data.allowanceTarget,
-            receiveAddress,
-            sellAmount: data.sellAmount,
-            web3,
-            erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi
-        });
-        if (allowanceRequired) {
-            quote.feeData = {
-                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: (0, bignumber_1.bnOrZero)(constants_1.APPROVAL_GAS_LIMIT).multipliedBy((0, bignumber_1.bnOrZero)(data.gasPrice)).toString()
-                }
-            };
-        }
-        return quote;
-    }
-    catch (e) {
-        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';
-        return {
-            sellAsset,
-            buyAsset,
-            success: false,
-            statusReason
-        };
-    }
-}
-exports.ZrxBuildQuoteTx = ZrxBuildQuoteTx;

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

@@ -1,3 +0,0 @@
-import { ChainTypes, ExecQuoteInput, ExecQuoteOutput } from '@shapeshiftoss/types';
-import { ZrxSwapperDeps } from '../ZrxSwapper';
-export declare function ZrxExecuteQuote({ adapterManager }: ZrxSwapperDeps, { quote, wallet }: ExecQuoteInput<ChainTypes.Ethereum>): Promise<ExecQuoteOutput>;

package/dist/swappers/zrx/ZrxExecuteQuote/ZrxExecuteQuote.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ZrxExecuteQuote = void 0;
-const web3_utils_1 = require("web3-utils");
-const api_1 = require("../../../api");
-async function ZrxExecuteQuote({ adapterManager }, { quote, wallet }) {
-    var _a, _b, _c, _d, _e, _f;
-    const { sellAsset } = quote;
-    if (!quote.success) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteQuote Cannot execute a failed quote');
-    }
-    if (!sellAsset.network || !sellAsset.symbol) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteQuote sellAssetNetwork and sellAssetSymbol are required');
-    }
-    if (!quote.sellAssetAccountId) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteQuote sellAssetAccountId is required');
-    }
-    if (!quote.sellAmount) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteQuote sellAmount is required');
-    }
-    if (!quote.depositAddress) {
-        throw new api_1.SwapError('ZrxSwapper:ZrxExecuteQuote depositAddress is required');
-    }
-    // value is 0 for erc20s
-    const value = sellAsset.symbol === 'ETH' ? quote.sellAmount : '0';
-    const adapter = adapterManager.byChain(sellAsset.chain);
-    const bip44Params = adapter.buildBIP44Params({
-        accountNumber: Number(quote.sellAssetAccountId)
-    });
-    let buildTxResponse, signedTx, txid;
-    try {
-        buildTxResponse = await adapter.buildSendTransaction({
-            value,
-            wallet,
-            to: quote.depositAddress,
-            chainSpecific: {
-                gasPrice: (0, web3_utils_1.numberToHex)(((_b = (_a = quote.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 = quote.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(`ZrxExecuteQuote - buildSendTransaction error: ${error}`);
-    }
-    const { txToSign } = buildTxResponse;
-    const txWithQuoteData = { ...txToSign, data: (_e = quote.txData) !== null && _e !== void 0 ? _e : '' };
-    if (wallet.supportsOfflineSigning()) {
-        try {
-            signedTx = await adapter.signTransaction({ txToSign: txWithQuoteData, wallet });
-        }
-        catch (error) {
-            throw new api_1.SwapError(`ZrxExecuteQuote - signTransaction error: ${error}`);
-        }
-        if (!signedTx) {
-            throw new api_1.SwapError(`ZrxExecuteQuote - Signed transaction is required: ${signedTx}`);
-        }
-        try {
-            txid = await adapter.broadcastTransaction(signedTx);
-        }
-        catch (error) {
-            throw new api_1.SwapError(`ZrxExecuteQuote - 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(`ZrxExecuteQuote - signAndBroadcastTransaction error: ${error}`);
-        }
-        return { txid };
-    }
-    else {
-        throw new api_1.SwapError('ZrxExecuteQuote - invalid HDWallet config');
-    }
-}
-exports.ZrxExecuteQuote = ZrxExecuteQuote;

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

@@ -1,2 +0,0 @@
-import { ChainTypes, GetQuoteInput, Quote } from '@shapeshiftoss/types';
-export declare function getZrxQuote(input: GetQuoteInput): Promise<Quote<ChainTypes.Ethereum>>;

package/dist/swappers/zrx/getZrxQuote/getZrxQuote.js

@@ -1,95 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getZrxQuote = 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 getZrxQuote(input) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const { sellAsset, buyAsset, sellAmount, buyAmount } = 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 {
-            sellAsset,
-            buyAsset,
-            success: true,
-            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
-        };
-    }
-    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';
-        return {
-            sellAsset,
-            buyAsset,
-            success: false,
-            statusReason
-        };
-    }
-}
-exports.getZrxQuote = getZrxQuote;