@shapeshiftoss/swapper 15.2.0 → 15.2.1

package/dist/swappers/osmosis/OsmosisSwapper.js

@@ -154,6 +154,7 @@ class OsmosisSwapper {
         };
     }
     async executeTrade({ trade, wallet }) {
+        var _a;
         const { sellAsset, buyAsset, sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit, accountNumber, receiveAddress, } = trade;
         const isFromOsmo = sellAsset.assetId === caip_1.osmosisAssetId;
         const sellAssetDenom = helpers_1.symbolDenomMapping[sellAsset.symbol];
@@ -183,7 +184,7 @@ class OsmosisSwapper {
             };
             const responseAccount = await cosmosAdapter.getAccount(sellAddress);
             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.toString(), 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, sequence, gas, 'uatom');
             cosmosIbcTradeId = tradeId;
             // wait till confirmed
             const pollResult = await (0, helpers_1.pollForComplete)(tradeId, this.deps.cosmosUrl);
@@ -207,6 +208,7 @@ class OsmosisSwapper {
         const cosmosAddress = isFromOsmo ? receiveAddress : sellAddress;
         const signTxInput = await (0, helpers_1.buildTradeTx)({
             osmoAddress,
+            accountNumber,
             adapter: osmosisAdapter,
             buyAssetDenom,
             sellAssetDenom,
@@ -229,7 +231,7 @@ class OsmosisSwapper {
                 amount,
             };
             const ibcResponseAccount = await osmosisAdapter.getAccount(sellAddress);
-            const ibcAccountNumber = ibcResponseAccount.chainSpecific.accountNumber || '0';
+            const ibcAccountNumber = Number(ibcResponseAccount.chainSpecific.accountNumber);
             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
@@ -239,7 +241,7 @@ class OsmosisSwapper {
                 pageSize: 1,
             });
             await (0, helpers_1.performIbcTransfer)(transfer, osmosisAdapter, wallet, this.deps.cosmosUrl, buyAssetDenom, constants_1.OSMO_COSMO_CHANNEL, '0', ibcAccountNumber, ibcSequence, gas, 'uosmo');
-            return { tradeId, previousCosmosTxid: cosmosTxHistory.transactions[0].txid, cosmosAddress };
+            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,10 +21,11 @@ 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: string, sequence: string, gas: string, feeDenom: string) => Promise<TradeResult>;
-export declare const buildTradeTx: ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {
+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 buildTradeTx: ({ osmoAddress, adapter, accountNumber, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }: {
     osmoAddress: string;
     adapter: osmosis.ChainAdapter;
+    accountNumber: number;
     buyAssetDenom: string;
     sellAssetDenom: string;
     sellAmount: string;

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

@@ -206,12 +206,13 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
             },
         ],
     };
+    const bip44Params = adapter.getBIP44Params({ accountNumber });
     const signed = await adapter.signTransaction({
         txToSign: {
             tx,
-            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBIP44Params({ accountNumber: 0 })),
+            addressNList: (0, chain_adapters_1.toAddressNList)(bip44Params),
             chain_id: (0, caip_1.fromChainId)(adapter.getChainId()).chainReference,
-            account_number: accountNumber,
+            account_number: accountNumber.toString(),
             sequence,
         },
         wallet,
@@ -223,9 +224,8 @@ const performIbcTransfer = async (input, adapter, wallet, blockBaseUrl, denom, s
 };
 exports.performIbcTransfer = performIbcTransfer;
 // TODO: move to chain adapters
-const buildTradeTx = async ({ osmoAddress, adapter, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }) => {
+const buildTradeTx = async ({ osmoAddress, adapter, accountNumber, buyAssetDenom, sellAssetDenom, sellAmount, gas, wallet, }) => {
     const responseAccount = await adapter.getAccount(osmoAddress);
-    const accountNumber = responseAccount.chainSpecific.accountNumber || '0';
     const sequence = responseAccount.chainSpecific.sequence || '0';
     const tx = {
         memo: '',
@@ -259,12 +259,13 @@ const buildTradeTx = async ({ osmoAddress, adapter, buyAssetDenom, sellAssetDeno
             },
         ],
     };
+    const bip44Params = adapter.getBIP44Params({ accountNumber });
     return {
         txToSign: {
             tx,
-            addressNList: (0, chain_adapters_1.toAddressNList)(adapter.getBIP44Params({ accountNumber: 0 })),
+            addressNList: (0, chain_adapters_1.toAddressNList)(bip44Params),
             chain_id: caip_1.CHAIN_REFERENCE.OsmosisMainnet,
-            account_number: accountNumber,
+            account_number: accountNumber.toString(),
             sequence,
         },
         wallet,

package/package.json

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