@shapeshiftoss/swapper 9.11.0 → 9.11.1

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.11.0",
+  "version": "9.11.1",
   "description": "An interface and implementations to trade coins via various protocols",
   "repository": "https://github.com/shapeshift/lib",
   "license": "MIT",