@shapeshiftoss/swapper 3.0.1 → 3.0.2

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

@@ -7,8 +7,8 @@ const api_1 = require("../../../api");
 const erc20Allowance_abi_1 = require("../utils/abi/erc20Allowance-abi");
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
-const zrxService_1 = require("../utils/zrxService");
 async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
+    var _a, _b;
     const { sellAsset } = quote;
     if (sellAsset.symbol === 'ETH') {
         return { approvalNeeded: false };
@@ -20,42 +20,21 @@ async function ZrxApprovalNeeded({ adapterManager, web3 }, { quote, wallet }) {
     const adapter = adapterManager.byChain(sellAsset.chain);
     const bip44Params = adapter.buildBIP44Params({ accountNumber });
     const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-    /**
-     * /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 quoteResponse = await zrxService_1.zrxService.get('/swap/v1/quote', {
-        params: {
-            buyToken: 'ETH',
-            sellToken: quote.sellAsset.tokenId || quote.sellAsset.symbol || quote.sellAsset.chain,
-            buyAmount: constants_1.APPROVAL_BUY_AMOUNT,
-            takerAddress: receiveAddress,
-            slippagePercentage: constants_1.DEFAULT_SLIPPAGE,
-            skipValidation: true,
-            affiliateAddress: constants_1.AFFILIATE_ADDRESS
-        }
-    });
-    const { data } = quoteResponse;
-    if (!quote.sellAsset.tokenId || !data.allowanceTarget) {
+    if (!quote.sellAsset.tokenId || !quote.allowanceContract) {
         throw new api_1.SwapError('ZrxApprovalNeeded - tokenId and allowanceTarget are required');
     }
     const allowanceResult = await (0, helpers_1.getERC20Allowance)({
         web3,
         erc20AllowanceAbi: erc20Allowance_abi_1.erc20AllowanceAbi,
         tokenId: quote.sellAsset.tokenId,
-        spenderAddress: data.allowanceTarget,
+        spenderAddress: quote.allowanceContract,
         ownerAddress: receiveAddress
     });
     const allowanceOnChain = new bignumber_js_1.BigNumber(allowanceResult || '0');
     return {
         approvalNeeded: allowanceOnChain.lt(new bignumber_js_1.BigNumber(quote.sellAmount || 1)),
         gas: constants_1.APPROVAL_GAS_LIMIT,
-        gasPrice: data.gasPrice
+        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
     };
 }
 exports.ZrxApprovalNeeded = ZrxApprovalNeeded;

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

@@ -2,46 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZrxApproveInfinite = void 0;
 const types_1 = require("@shapeshiftoss/types");
-const api_1 = require("../../../api");
 const erc20_abi_1 = require("../utils/abi/erc20-abi");
-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 ZrxApproveInfinite({ adapterManager, web3 }, { quote, wallet }) {
     const adapter = adapterManager.byChain(types_1.ChainTypes.Ethereum);
-    const bip44Params = adapter.buildBIP44Params({
-        accountNumber: (0, bignumber_1.bnOrZero)(quote.sellAssetAccountId).toNumber()
-    }); // TODO: Add account number
-    const receiveAddress = await adapter.getAddress({ wallet, bip44Params });
-    /**
-     * /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 quoteResponse = await zrxService_1.zrxService.get('/swap/v1/quote', {
-        params: {
-            buyToken: 'ETH',
-            sellToken: quote.sellAsset.tokenId || quote.sellAsset.symbol || quote.sellAsset.network,
-            buyAmount: '100000000000000000',
-            takerAddress: receiveAddress,
-            slippagePercentage: constants_1.DEFAULT_SLIPPAGE,
-            skipValidation: true,
-            affiliateAddress: constants_1.AFFILIATE_ADDRESS
-        }
-    });
-    const { data } = quoteResponse;
-    if (!data.allowanceTarget) {
-        throw new api_1.SwapError('approveInfinite - allowanceTarget is required');
-    }
     const allowanceGrantRequired = await (0, helpers_1.grantAllowance)({
         quote: {
             ...quote,
-            allowanceContract: data.allowanceTarget,
+            allowanceContract: quote.allowanceContract,
             sellAmount: constants_1.MAX_ALLOWANCE
         },
         wallet,

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

@@ -8,35 +8,19 @@ const types_1 = require("@shapeshiftoss/types");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../utils/constants");
 const helpers_1 = require("../utils/helpers/helpers");
-const zrxService_1 = require("../utils/zrxService");
 const ZrxSwapper_1 = require("../ZrxSwapper");
 const getZrxMinMax = async (input) => {
-    var _a;
     const { sellAsset, buyAsset } = input;
     if (sellAsset.chain !== types_1.ChainTypes.Ethereum || buyAsset.chain !== types_1.ChainTypes.Ethereum) {
         throw new ZrxSwapper_1.ZrxError('getZrxMinMax - must be eth assets');
     }
-    const buyToken = buyAsset.tokenId || buyAsset.symbol;
-    const sellToken = sellAsset.tokenId || sellAsset.symbol;
     const usdRate = await (0, helpers_1.getUsdRate)({
         symbol: sellAsset.symbol,
         tokenId: sellAsset.tokenId
     });
-    const minimumWeiAmount = new bignumber_js_1.default(1)
-        .dividedBy(new bignumber_js_1.default(usdRate))
-        .times(new bignumber_js_1.default(10).exponentiatedBy(sellAsset.precision));
     const minimum = new bignumber_js_1.default(1).dividedBy(new bignumber_js_1.default(usdRate)).toString();
-    const minimumPriceResult = await zrxService_1.zrxService.get('/swap/v1/price', {
-        params: {
-            sellToken,
-            buyToken,
-            sellAmount: (0, helpers_1.normalizeAmount)(minimumWeiAmount.toString())
-        }
-    });
-    const minimumPrice = new bignumber_js_1.default((_a = minimumPriceResult === null || minimumPriceResult === void 0 ? void 0 : minimumPriceResult.data) === null || _a === void 0 ? void 0 : _a.price).toString();
     return {
         minimum,
-        minimumPrice,
         maximum: constants_1.MAX_ZRX_TRADE
     };
 };

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

@@ -96,7 +96,8 @@ 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
+            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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "@shapeshiftoss/caip": "^2.0.0",
     "@shapeshiftoss/chain-adapters": "^2.0.0",
     "@shapeshiftoss/hdwallet-core": "1.20.0",
-    "@shapeshiftoss/types": "^2.1.0"
+    "@shapeshiftoss/types": "^3.0.0"
   },
   "devDependencies": {
     "@shapeshiftoss/asset-service": "^2.0.0",