@shapeshiftoss/swapper 15.3.0 → 15.3.2

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

@@ -161,7 +161,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 +212,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,
@@ -226,6 +226,8 @@ exports.performIbcTransfer = performIbcTransfer;
 // TODO: move to chain adapters
 const buildTradeTx = async ({ osmoAddress, adapter, accountNumber, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }) => {
     const responseAccount = await adapter.getAccount(osmoAddress);
+    // note - this is a cosmos sdk specific account_number, not a bip44Params accountNumber
+    const account_number = responseAccount.chainSpecific.accountNumber || '0';
     const sequence = responseAccount.chainSpecific.sequence || '0';
     const tx = {
         memo: '',
@@ -265,7 +267,7 @@ const buildTradeTx = async ({ osmoAddress, adapter, accountNumber, buyAssetDenom
             tx,
             addressNList: (0, chain_adapters_1.toAddressNList)(bip44Params),
             chain_id: caip_1.CHAIN_REFERENCE.OsmosisMainnet,
-            account_number: accountNumber.toString(),
+            account_number,
             sequence,
         },
         wallet,

package/package.json

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