@shapeshiftoss/swapper 15.3.1 → 15.3.3

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -183,8 +183,9 @@ class OsmosisSwapper {
                 amount: sellAmountCryptoBaseUnit,
             };
             const responseAccount = await cosmosAdapter.getAccount(sellAddress);
+            const ibcAccountNumber = parseInt(responseAccount.chainSpecific.accountNumber || '0');
             const sequence = responseAccount.chainSpecific.sequence || '0';
-            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, feeData.fast.txFee, accountNumber, sequence, gas, 'uatom');
+            const { tradeId } = await (0, helpers_1.performIbcTransfer)(transfer, cosmosAdapter, wallet, this.deps.osmoUrl, 'uatom', constants_1.COSMO_OSMO_CHANNEL, feeData.fast.txFee, accountNumber, ibcAccountNumber, sequence, gas, 'uatom');
             cosmosIbcTradeId = tradeId;
             // wait till confirmed
             const pollResult = await (0, helpers_1.pollForComplete)(tradeId, this.deps.cosmosUrl);
@@ -240,7 +241,7 @@ class OsmosisSwapper {
                 pubkey: cosmosAddress,
                 pageSize: 1,
             });
-            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', ibcAccountNumber, ibcSequence, gas, 'uosmo');
+            await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', accountNumber, ibcAccountNumber, ibcSequence, gas, 'uosmo');
             return { tradeId, previousCosmosTxid: (_a = cosmosTxHistory.transactions[0]) === null || _a === void 0 ? void 0 : _a.txid, cosmosAddress };
         }
         return { tradeId, previousCosmosTxid: cosmosIbcTradeId };

package/dist/swappers/osmosis/utils/helpers.d.ts

@@ -21,7 +21,7 @@ export declare const getRateInfo: (sellAsset: string, buyAsset: string, sellAmou
     buyAssetTradeFeeUsd: string;
     buyAmountCryptoBaseUnit: string;
 }>;
-export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: number, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
+export declare const performIbcTransfer: (input: IbcTransferInput, adapter: CosmosSdkSupportedChainAdapters, wallet: HDWallet, blockBaseUrl: string, denom: string, sourceChannel: string, feeAmount: string, accountNumber: number, ibcAccountNumber: number, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
 export declare const buildTradeTx: ({ osmoAddress, adapter, accountNumber, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {
     osmoAddress: string;
     adapter: osmosis.ChainAdapter;

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

@@ -9,8 +9,19 @@ const chain_adapters_1 = require("@shapeshiftoss/chain-adapters");
 const axios_1 = __importDefault(require("axios"));
 const lodash_1 = require("lodash");
 const api_1 = require("../../../api");
+const utils_1 = require("../../../utils");
 const bignumber_1 = require("../../utils/bignumber");
 const constants_1 = require("./constants");
+// Create cached axios service for pools endpoint because it gets called a LOT
+const cache = (0, utils_1.createCache)(3000, ['/osmosis/gamm/v1beta1/pools/']);
+const osmoPoolsService = axios_1.default.create({
+    timeout: 10000,
+    headers: {
+        Accept: 'application/json',
+        'Content-Type': 'application/json',
+    },
+    adapter: cache.adapter,
+});
 exports.symbolDenomMapping = {
     OSMO: 'uosmo',
     ATOM: 'ibc/27394FB092D2ECCD56123C74F36E4C1F926001CEADA9CA97EA622B25F41E5EB2',
@@ -102,10 +113,12 @@ exports.pollForAtomChannelBalance = pollForAtomChannelBalance;
 const findPool = async (sellAssetSymbol, buyAssetSymbol, osmoUrl) => {
     const sellAssetDenom = exports.symbolDenomMapping[sellAssetSymbol];
     const buyAssetDenom = exports.symbolDenomMapping[buyAssetSymbol];
-    const poolsUrl = osmoUrl + '/osmosis/gamm/v1beta1/pools?pagination.limit=1000';
+    // pagination.limit can be small because we only care about the osmo/atom pool right now
+    // this will need to increase when adding new pools
+    const poolsUrl = osmoUrl + '/osmosis/gamm/v1beta1/pools?pagination.limit=10';
     const poolsResponse = await (async () => {
         try {
-            return axios_1.default.get(poolsUrl);
+            return osmoPoolsService.get(poolsUrl);
         }
         catch (e) {
             throw new api_1.SwapError('failed to get pool', {
@@ -161,7 +174,7 @@ const getRateInfo = async (sellAsset, buyAsset, sellAmount, osmoUrl) => {
 };
 exports.getRateInfo = getRateInfo;
 // TODO: move to chain adapters
-const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, sourceChannel, feeAmount, accountNumber, sequence, gas, feeDenom) => {
+const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, sourceChannel, feeAmount, accountNumber, ibcAccountNumber, sequence, gas, feeDenom) => {
     const { sender, receiver, amount } = input;
     const responseLatestBlock = await (async () => {
         try {
@@ -212,7 +225,7 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
             tx,
             addressNList: (0, chain_adapters_1.toAddressNList)(bip44Params),
             chain_id: (0, caip_1.fromChainId)(adapter.getChainId()).chainReference,
-            account_number: accountNumber.toString(),
+            account_number: ibcAccountNumber.toString(),
             sequence,
         },
         wallet,

package/package.json

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