@shapeshiftoss/swapper 9.10.1 → 9.12.0

package/dist/api.d.ts

@@ -173,6 +173,7 @@ export declare enum SwapErrorTypes {
     RESPONSE_ERROR = "RESPONSE_ERROR",
     SIGN_AND_BROADCAST_FAILED = "SIGN_AND_BROADCAST_FAILED",
     TRADE_QUOTE_FAILED = "TRADE_QUOTE_FAILED",
+    TRADE_QUOTE_INPUT_LOWER_THAN_FEES = "TRADE_QUOTE_INPUT_LOWER_THAN_FEES",
     UNSUPPORTED_PAIR = "UNSUPPORTED_PAIR",
     USD_RATE_FAILED = "USD_RATE_FAILED",
     UNSUPPORTED_CHAIN = "UNSUPPORTED_CHAIN",

package/dist/api.js

@@ -28,6 +28,7 @@ var SwapErrorTypes;
     SwapErrorTypes["RESPONSE_ERROR"] = "RESPONSE_ERROR";
     SwapErrorTypes["SIGN_AND_BROADCAST_FAILED"] = "SIGN_AND_BROADCAST_FAILED";
     SwapErrorTypes["TRADE_QUOTE_FAILED"] = "TRADE_QUOTE_FAILED";
+    SwapErrorTypes["TRADE_QUOTE_INPUT_LOWER_THAN_FEES"] = "TRADE_QUOTE_INPUT_LOWER_THAN_FEES";
     SwapErrorTypes["UNSUPPORTED_PAIR"] = "UNSUPPORTED_PAIR";
     SwapErrorTypes["USD_RATE_FAILED"] = "USD_RATE_FAILED";
     SwapErrorTypes["UNSUPPORTED_CHAIN"] = "UNSUPPORTED_CHAIN";

package/dist/swappers/cow/cowGetTradeTxs/cowGetTradeTxs.js

@@ -15,7 +15,7 @@ async function cowGetTradeTxs(deps, input) {
         }
         const getTradesResponse = await cowService_1.cowService.get(`${deps.apiUrl}/v1/trades/?orderUid=${input.tradeId}`);
         return {
-            sellTxid: '',
+            sellTxid: input.tradeId,
             buyTxid: getTradesResponse.data[0].txHash
         };
     }

package/dist/swappers/cow/getCowSwapTradeQuote/getCowSwapTradeQuote.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCowSwapTradeQuote = void 0;
 const caip_1 = require("@shapeshiftoss/caip");
 const types_1 = require("@shapeshiftoss/types");
+const axios_1 = __importDefault(require("axios"));
 const api_1 = require("../../../api");
 const bignumber_1 = require("../../utils/bignumber");
 const helpers_1 = require("../../utils/helpers/helpers");
@@ -11,6 +15,7 @@ const constants_1 = require("../utils/constants");
 const cowService_1 = require("../utils/cowService");
 const helpers_2 = require("../utils/helpers/helpers");
 async function getCowSwapTradeQuote(deps, input) {
+    var _a, _b;
     try {
         const { sellAsset, buyAsset, sellAmount, sellAssetAccountNumber, wallet } = input;
         const { adapter, web3 } = deps;
@@ -113,6 +118,15 @@ async function getCowSwapTradeQuote(deps, input) {
         };
     }
     catch (e) {
+        if (axios_1.default.isAxiosError(e) &&
+            ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 400 &&
+            ((_b = e.response) === null || _b === void 0 ? void 0 : _b.data.errorType) ===
+                'SellAmountDoesNotCoverFee') {
+            throw new api_1.SwapError('[getCowSwapTradeQuote]', {
+                cause: e,
+                code: api_1.SwapErrorTypes.TRADE_QUOTE_INPUT_LOWER_THAN_FEES
+            });
+        }
         if (e instanceof api_1.SwapError)
             throw e;
         throw new api_1.SwapError('[getCowSwapTradeQuote]', {

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -76,7 +76,7 @@ class OsmosisSwapper {
                 code: api_1.SwapErrorTypes.BUILD_TRADE_FAILED
             });
         const feeData = await osmosisAdapter.getFeeData({});
-        const fee = feeData.average.txFee;
+        const fee = feeData.fast.txFee;
         return {
             buyAmount,
             buyAsset,
@@ -104,7 +104,7 @@ class OsmosisSwapper {
                 code: api_1.SwapErrorTypes.TRADE_QUOTE_FAILED
             });
         const feeData = await osmosisAdapter.getFeeData({});
-        const fee = feeData.average.txFee;
+        const fee = feeData.fast.txFee;
         return {
             buyAsset,
             feeData: { fee, tradeFee },
@@ -134,7 +134,7 @@ class OsmosisSwapper {
         }
         let sellAddress;
         const feeData = await osmosisAdapter.getFeeData({});
-        const gas = feeData.average.chainSpecific.gasLimit;
+        const gas = feeData.fast.chainSpecific.gasLimit;
         if (!isFromOsmo) {
             const sellBip44Params = cosmosAdapter.buildBIP44Params({
                 accountNumber: Number(sellAssetAccountNumber)
@@ -160,6 +160,9 @@ class OsmosisSwapper {
                     code: api_1.SwapErrorTypes.EXECUTE_TRADE_FAILED
                 });
             ibcSellAmount = await (0, helpers_1.pollForAtomChannelBalance)(receiveAddress, this.deps.osmoUrl);
+            // delay to ensure all nodes we interact with are up to date at this point
+            // seeing intermittent bugs that suggest the balances and sequence numbers were sometimes off
+            await new Promise((resolve) => setTimeout(resolve, 3000));
         }
         else {
             const sellBip44Params = osmosisAdapter.buildBIP44Params({
@@ -199,6 +202,9 @@ class OsmosisSwapper {
             const ibcResponseAccount = await osmosisAdapter.getAccount(sellAddress);
             const ibcAccountNumber = ibcResponseAccount.chainSpecific.accountNumber || '0';
             const ibcSequence = ibcResponseAccount.chainSpecific.sequence || '0';
+            // delay to ensure all nodes we interact with are up to date at this point
+            // seeing intermittent bugs that suggest the balances and sequence numbers were sometimes off
+            await new Promise((resolve) => setTimeout(resolve, 3000));
             await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, trade.feeData.fee, ibcAccountNumber, ibcSequence, gas);
         }
         return { tradeId: tradeId || 'error' };

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

@@ -27,14 +27,14 @@ const txStatus = async (txid, baseUrl) => {
             return 'failed';
     }
     catch (e) {
-        console.error('Failed to get status');
+        console.warn('Retrying to retrieve status');
     }
     return 'not found';
 };
 // TODO: leverage chain-adapters websockets
 const pollForComplete = async (txid, baseUrl) => {
     return new Promise((resolve, reject) => {
-        const timeout = 120000; // 2 mins
+        const timeout = 300000; // 5 mins
         const startTime = Date.now();
         const interval = 5000; // 5 seconds
         const poll = async function () {
@@ -72,14 +72,14 @@ const getAtomChannelBalance = async (address, osmoUrl) => {
         toAtomChannelBalance = Number(amount);
     }
     catch (e) {
-        console.error('no channel balance');
+        console.warn('Retrying to get ibc balance');
     }
     return toAtomChannelBalance;
 };
 exports.getAtomChannelBalance = getAtomChannelBalance;
 const pollForAtomChannelBalance = async (address, osmoUrl) => {
     return new Promise((resolve, reject) => {
-        const timeout = 120000; // 2 mins
+        const timeout = 300000; // 5 mins
         const startTime = Date.now();
         const interval = 5000; // 5 seconds
         const poll = async function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/swapper",
-  "version": "9.10.1",
+  "version": "9.12.0",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",