@shapeshiftoss/swapper 1.11.6 → 1.11.10

package/dist/swappers/zrx/ZrxSwapper.js

@@ -45,8 +45,8 @@ class ZrxSwapper {
     }
     getDefaultPair() {
         const ETH = { name: 'Ethereum', chain: types_1.ChainTypes.Ethereum, symbol: 'ETH' };
-        const USDC = { name: 'USD Coin', chain: types_1.ChainTypes.Ethereum, symbol: 'USDC' };
-        return [ETH, USDC];
+        const FOX = { name: 'Fox', chain: types_1.ChainTypes.Ethereum, symbol: 'FOX' };
+        return [ETH, FOX];
     }
     async executeQuote(args) {
         return (0, executeQuote_1.executeQuote)(this.deps, args);

package/dist/swappers/zrx/executeQuote/executeQuote.js

@@ -4,7 +4,7 @@ exports.executeQuote = void 0;
 const web3_utils_1 = require("web3-utils");
 const api_1 = require("../../../api");
 async function executeQuote({ adapterManager }, { quote, wallet }) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const { sellAsset } = quote;
     if (!quote.success) {
         throw new api_1.SwapError('ZrxSwapper:executeQuote Cannot execute a failed quote');
@@ -45,20 +45,35 @@ async function executeQuote({ adapterManager }, { quote, wallet }) {
     }
     const { txToSign } = buildTxResponse;
     const txWithQuoteData = { ...txToSign, data: (_e = quote.txData) !== null && _e !== void 0 ? _e : '' };
-    try {
-        signedTx = await adapter.signTransaction({ txToSign: txWithQuoteData, wallet });
+    if (wallet.supportsOfflineSigning()) {
+        try {
+            signedTx = await adapter.signTransaction({ txToSign: txWithQuoteData, wallet });
+        }
+        catch (error) {
+            throw new api_1.SwapError(`executeQuote - signTransaction error: ${error}`);
+        }
+        if (!signedTx) {
+            throw new api_1.SwapError(`executeQuote - Signed transaction is required: ${signedTx}`);
+        }
+        try {
+            txid = await adapter.broadcastTransaction(signedTx);
+        }
+        catch (error) {
+            throw new api_1.SwapError(`executeQuote - broadcastTransaction error: ${error}`);
+        }
+        return { txid };
     }
-    catch (error) {
-        throw new api_1.SwapError(`executeQuote - signTransaction error: ${error}`);
+    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(`executeQuote - signAndBroadcastTransaction error: ${error}`);
+        }
+        return { txid };
     }
-    if (!signedTx)
-        throw new api_1.SwapError(`executeQuote - Signed transaction is required: ${signedTx}`);
-    try {
-        txid = await adapter.broadcastTransaction(signedTx);
-    }
-    catch (error) {
-        throw new api_1.SwapError(`executeQuote - broadcastTransaction error: ${error}`);
+    else {
+        throw new api_1.SwapError('executeQuote - invalid HDWallet config');
     }
-    return { txid };
 }
 exports.executeQuote = executeQuote;

package/dist/swappers/zrx/getSendMaxAmount/getSendMaxAmount.js

@@ -8,6 +8,7 @@ const types_1 = require("@shapeshiftoss/types");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const api_1 = require("../../../api");
 const bignumber_1 = require("../utils/bignumber");
+const constants_1 = require("../utils/constants");
 async function getSendMaxAmount({ adapterManager }, { wallet, quote, sellAssetAccountId, feeEstimateKey = types_1.chainAdapters.FeeDataKey.Average }) {
     var _a, _b, _c;
     const adapter = adapterManager.byChain(types_1.ChainTypes.Ethereum);
@@ -16,6 +17,9 @@ async function getSendMaxAmount({ adapterManager }, { wallet, quote, sellAssetAc
     });
     const ethAddress = await adapter.getAddress({ wallet, bip32Params });
     const account = await adapter.getAccount(ethAddress);
+    if (!quote.sellAsset) {
+        throw new api_1.SwapError('quote.sellAsset is required');
+    }
     const tokenId = (_a = quote.sellAsset) === null || _a === void 0 ? void 0 : _a.tokenId;
     let balance;
     if (tokenId) {
@@ -36,15 +40,19 @@ async function getSendMaxAmount({ adapterManager }, { wallet, quote, sellAssetAc
     }
     const feeEstimates = await adapter.getFeeData({
         to: quote.depositAddress,
-        value: balance,
+        value: (0, bignumber_1.bnOrZero)(quote.sellAmount).toString(),
         chainSpecific: {
             from: ethAddress,
             contractData: quote.txData
         }
     });
     const estimatedFee = feeEstimates[feeEstimateKey].txFee;
-    const sendMaxAmount = new bignumber_js_1.default(balance).minus(estimatedFee);
-    if (sendMaxAmount.lt(0)) {
+    // (ryankk) We need to pad the fee for ETH max sends because the fee estimate is based off
+    // of a minimum quote value (quote.sellAmount) and not the users full ETH balance.
+    const paddedFee = new bignumber_js_1.default(estimatedFee).times(constants_1.ETH_FEE_ESTIMATE_PADDING);
+    const sendMaxAmount = new bignumber_js_1.default(balance).minus(paddedFee);
+    // gte covers if sendMaxAmount is NaN
+    if (!sendMaxAmount.gte(0)) {
         throw new api_1.SwapError('ETH balance is less than estimated fee');
     }
     return sendMaxAmount.toString();

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

@@ -15,5 +15,6 @@ export declare const DEFAULT_SOURCE: {
 }[];
 export declare const DEFAULT_SLIPPAGE = "0.03";
 export declare const MAX_SLIPPAGE = "0.3";
+export declare const ETH_FEE_ESTIMATE_PADDING = "1.2";
 export declare const AFFILIATE_ADDRESS = "0xc770eefad204b5180df6a14ee197d99d808ee52d";
 export declare const APPROVAL_BUY_AMOUNT = "100000000000000000";

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APPROVAL_BUY_AMOUNT = exports.AFFILIATE_ADDRESS = exports.MAX_SLIPPAGE = exports.DEFAULT_SLIPPAGE = exports.DEFAULT_SOURCE = exports.MAX_ZRX_TRADE = exports.MAX_GAS_PRICE = exports.LIQUIDITY_GAS_LIMIT = exports.APPROVAL_GAS_LIMIT = exports.MAX_ALLOWANCE = exports.UNISWAP_WETH_FOX_POOL_ADDRESS = exports.WETH_TOKEN_CONTRACT_ADDRESS = exports.FOX_TOKEN_CONTRACT_ADDRESS = exports.ZERO_ADDRESS = exports.UNISWAP_FACTORY_ADDRESS = exports.UNISWAP_ROUTER_ADDRESS = void 0;
+exports.APPROVAL_BUY_AMOUNT = exports.AFFILIATE_ADDRESS = exports.ETH_FEE_ESTIMATE_PADDING = exports.MAX_SLIPPAGE = exports.DEFAULT_SLIPPAGE = exports.DEFAULT_SOURCE = exports.MAX_ZRX_TRADE = exports.MAX_GAS_PRICE = exports.LIQUIDITY_GAS_LIMIT = exports.APPROVAL_GAS_LIMIT = exports.MAX_ALLOWANCE = exports.UNISWAP_WETH_FOX_POOL_ADDRESS = exports.WETH_TOKEN_CONTRACT_ADDRESS = exports.FOX_TOKEN_CONTRACT_ADDRESS = exports.ZERO_ADDRESS = exports.UNISWAP_FACTORY_ADDRESS = exports.UNISWAP_ROUTER_ADDRESS = void 0;
 exports.UNISWAP_ROUTER_ADDRESS = '0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D';
 exports.UNISWAP_FACTORY_ADDRESS = '0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f';
 exports.ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';
@@ -15,5 +15,6 @@ exports.MAX_ZRX_TRADE = '100000000000000000000000000';
 exports.DEFAULT_SOURCE = [{ name: '0x', proportion: '1' }];
 exports.DEFAULT_SLIPPAGE = '0.03'; // 3%
 exports.MAX_SLIPPAGE = '0.3'; // 30%
+exports.ETH_FEE_ESTIMATE_PADDING = '1.2'; // Padding the fee estimate by 20% to avoid trade errors.
 exports.AFFILIATE_ADDRESS = '0xc770eefad204b5180df6a14ee197d99d808ee52d';
 exports.APPROVAL_BUY_AMOUNT = '100000000000000000'; // A valid buy amount - 0.1 ETH

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

@@ -16,6 +16,7 @@ exports.BTC = {
     icon: 'https://assets.coincap.io/assets/icons/btc@2x.png',
     explorer: 'https://live.blockcypher.com',
     explorerTxLink: 'https://live.blockcypher.com/btc/tx/',
+    explorerAddressLink: 'https://live.blockcypher.com/btc/address/',
     sendSupport: false,
     receiveSupport: false,
     symbol: 'BTC'
@@ -35,6 +36,7 @@ exports.WETH = {
     slip44: 60,
     explorer: 'https://etherscan.io',
     explorerTxLink: 'https://etherscan.io/tx/',
+    explorerAddressLink: 'https://etherscan.io/address/',
     sendSupport: true,
     receiveSupport: true,
     symbol: 'WETH'
@@ -55,6 +57,7 @@ exports.FOX = {
     slip44: 60,
     explorer: 'https://etherscan.io',
     explorerTxLink: 'https://etherscan.io/tx/',
+    explorerAddressLink: 'https://etherscan.io/address/',
     receiveSupport: true,
     symbol: 'FOX'
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "1.11.6",
+  "version": "1.11.10",
   "description": "TODO: description",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@shapeshiftoss/chain-adapters": "^1.16.2",
-    "@shapeshiftoss/hdwallet-core": "^1.17.1",
+    "@shapeshiftoss/hdwallet-core": "^1.18.0",
     "@shapeshiftoss/types": "^1.12.0",
     "axios": "^0.21.4",
     "bignumber.js": "^9.0.1",