@shapeshiftoss/swapper 3.0.2 → 3.0.5

package/dist/api.d.ts

@@ -32,10 +32,6 @@ export interface Swapper {
      * Get the usd rate from either the assets symbol or tokenId
      */
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
-    /**
-     * Get the default pair of the swapper
-     */
-    getDefaultPair(): [CAIP19, CAIP19];
     /**
      * Get the minimum and maximum trade value of the sellAsset and buyAsset
      */

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

@@ -14,7 +14,6 @@ export declare class TestSwapper implements Swapper {
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     executeQuote(): Promise<ExecQuoteOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(args: BuyAssetBySellIdInput): CAIP19[];

package/dist/swappers/test/TestSwapper.js

@@ -34,9 +34,6 @@ class TestSwapper {
     async executeQuote() {
         throw new Error('TestSwapper: executeQuote unimplemented');
     }
-    getDefaultPair() {
-        throw new Error('TestSwapper: getDefaultPair unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('TestSwapper: approvalNeeded unimplemented');
     }

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

@@ -8,7 +8,6 @@ export declare class ThorchainSwapper implements Swapper {
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
     executeQuote(): Promise<ExecQuoteOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     approvalNeeded(): Promise<ApprovalNeededOutput>;
     approveInfinite(): Promise<string>;
     filterBuyAssetsBySellAssetId(): CAIP19[];

package/dist/swappers/thorchain/ThorchainSwapper.js

@@ -23,9 +23,6 @@ class ThorchainSwapper {
     async executeQuote() {
         throw new Error('ThorchainSwapper: executeQuote unimplemented');
     }
-    getDefaultPair() {
-        throw new Error('ThorchainSwapper: getDefaultPair unimplemented');
-    }
     async approvalNeeded() {
         throw new Error('ThorchainSwapper: approvalNeeded unimplemented');
     }

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

@@ -37,8 +37,8 @@ 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, _k, _l, _m, _o, _p, _q;
-    const { sellAsset, buyAsset, sellAmount, buyAmount, slippage, sellAssetAccountId, buyAssetAccountId, priceImpact } = input;
+    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');
     }
@@ -112,9 +112,7 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
             sellAssetAccountId,
             buyAssetAccountId,
             receiveAddress,
-            slippage,
             success: true,
-            statusCode: 0,
             rate: data.price,
             depositAddress: data.to,
             feeData: {
@@ -129,18 +127,15 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
             txData: data.data,
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            guaranteedPrice: data.guaranteedPrice,
             allowanceContract: data.allowanceTarget,
-            sources: ((_a = data.sources) === null || _a === void 0 ? void 0 : _a.filter((s) => parseFloat(s.proportion) > 0)) || constants_1.DEFAULT_SOURCE,
-            priceImpact
+            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)({
             quote,
             web3,
             erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi
         });
-        quote.allowanceGrantRequired = allowanceRequired.gt(0);
-        if (quote.allowanceGrantRequired) {
+        if (allowanceRequired) {
             quote.feeData = {
                 fee: ((_b = quote.feeData) === null || _b === void 0 ? void 0 : _b.fee) || '0',
                 chainSpecific: {
@@ -152,15 +147,13 @@ async function ZrxBuildQuoteTx({ adapterManager, web3 }, { input, wallet }) {
         return quote;
     }
     catch (e) {
-        const statusCode = ((_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.code) || ((_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.code) || -1;
-        const statusReason = ((_o = (_m = (_l = (_k = e === null || e === void 0 ? void 0 : e.response) === null || _k === void 0 ? void 0 : _k.data) === null || _l === void 0 ? void 0 : _l.validationErrors) === null || _m === void 0 ? void 0 : _m[0]) === null || _o === void 0 ? void 0 : _o.reason) ||
-            ((_q = (_p = e === null || e === void 0 ? void 0 : e.response) === null || _p === void 0 ? void 0 : _p.data) === null || _q === void 0 ? void 0 : _q.reason) ||
+        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,
-            statusCode,
             statusReason
         };
     }

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

@@ -19,7 +19,6 @@ export declare class ZrxSwapper implements Swapper {
     getQuote(input: GetQuoteInput): Promise<Quote<ChainTypes>>;
     getUsdRate(input: Pick<Asset, 'symbol' | 'tokenId'>): Promise<string>;
     getMinMax(input: GetQuoteInput): Promise<MinMaxOutput>;
-    getDefaultPair(): [CAIP19, CAIP19];
     executeQuote(args: ExecQuoteInput<ChainTypes>): Promise<ExecQuoteOutput>;
     approvalNeeded(args: ApprovalNeededInput<ChainTypes>): Promise<ApprovalNeededOutput>;
     approveInfinite(args: ApproveInfiniteInput<ChainTypes>): Promise<string>;

package/dist/swappers/zrx/ZrxSwapper.js

@@ -35,11 +35,6 @@ class ZrxSwapper {
     async getMinMax(input) {
         return (0, getZrxMinMax_1.getZrxMinMax)(input);
     }
-    getDefaultPair() {
-        const ETH = 'eip155:1/slip44:60';
-        const FOX = 'eip155:1/erc20:0xc770eefad204b5180df6a14ee197d99d808ee52d';
-        return [ETH, FOX];
-    }
     async executeQuote(args) {
         return (0, ZrxExecuteQuote_1.ZrxExecuteQuote)(this.deps, args);
     }

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

@@ -21,7 +21,7 @@ const getZrxMinMax = async (input) => {
     const minimum = new bignumber_js_1.default(1).dividedBy(new bignumber_js_1.default(usdRate)).toString();
     return {
         minimum,
-        maximum: constants_1.MAX_ZRX_TRADE
+        maximum: constants_1.MAX_ZRX_TRADE // Arbitrarily large value. 10e+28 here.
     };
 };
 exports.getZrxMinMax = getZrxMinMax;

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

@@ -6,13 +6,15 @@ 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");
 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, _h, _j, _k, _l, _m, _o;
-    const { sellAsset, buyAsset, sellAmount, buyAmount, minimumPrice, minimum: minQuoteSellAmount, slippage } = 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');
     }
@@ -28,10 +30,8 @@ async function getZrxQuote(input) {
     const useSellAmount = !!sellAmount;
     const buyToken = buyAsset.tokenId || buyAsset.symbol;
     const sellToken = sellAsset.tokenId || sellAsset.symbol;
-    let minQuoteSellAmountWei = null;
-    if (minQuoteSellAmount) {
-        minQuoteSellAmountWei = new bignumber_js_1.default(minQuoteSellAmount).times(new bignumber_js_1.default(10).exponentiatedBy(sellAsset.precision));
-    }
+    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];
@@ -42,7 +42,6 @@ async function getZrxQuote(input) {
     if (!normalizedAmount || normalizedAmount === '0') {
         throw new ZrxSwapper_1.ZrxError('getQuote - Must have valid sellAmount, buyAmount or minimum amount');
     }
-    const slippagePercentage = slippage ? new bignumber_js_1.default(slippage).div(100).toString() : undefined;
     try {
         /**
          * /swap/v1/price
@@ -57,17 +56,10 @@ async function getZrxQuote(input) {
             params: {
                 sellToken,
                 buyToken,
-                slippagePercentage,
                 [amountKey]: normalizedAmount
             }
         });
         const { data } = quoteResponse;
-        const quotePrice = new bignumber_js_1.default(data.price);
-        const priceDifference = quotePrice.minus(minimumPrice);
-        const priceImpact = priceDifference
-            .dividedBy(minimumPrice)
-            .abs()
-            .valueOf();
         const estimatedGas = data.estimatedGas
             ? new bignumber_js_1.default(data.estimatedGas).times(1.5)
             : new bignumber_js_1.default(0);
@@ -75,13 +67,10 @@ async function getZrxQuote(input) {
         return {
             sellAsset,
             buyAsset,
-            priceImpact,
-            slippage,
             success: true,
-            statusCode: 0,
             rate,
             minimum: minQuoteSellAmount,
-            maximum: constants_1.MAX_ZRX_TRADE,
+            maximum: maxSellAmount,
             feeData: {
                 fee: new bignumber_js_1.default(estimatedGas || 0)
                     .multipliedBy(new bignumber_js_1.default(data.gasPrice || 0))
@@ -95,23 +84,18 @@ async function getZrxQuote(input) {
             },
             sellAmount: data.sellAmount,
             buyAmount: data.buyAmount,
-            guaranteedPrice: data.guaranteedPrice,
             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 statusCode = ((_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.code) || ((_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.code) || -1;
-        const statusReason = ((_l = (_k = (_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.validationErrors) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.reason) ||
-            ((_o = (_m = e === null || e === void 0 ? void 0 : e.response) === null || _m === void 0 ? void 0 : _m.data) === null || _o === void 0 ? void 0 : _o.reason) ||
+        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,
-            minimum: minQuoteSellAmount,
-            maximum: constants_1.MAX_ZRX_TRADE,
             success: false,
-            statusCode,
             statusReason
         };
     }

package/package.json

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