fix(swapper): osmosis multi-account swaps (#1210)

packages/swapper/src/api.ts

@@ -89,6 +89,7 @@ type CommonTradeInput = {
   sendMax: boolean
   receiveAddress: string
   accountNumber: number
+  receiveAccountNumber?: number
 }
 
 export type GetEvmTradeQuoteInput = CommonTradeInput & {
@@ -139,6 +140,7 @@ export interface TradeQuote<C extends ChainId> extends TradeBase<C> {
 
 export interface Trade<C extends ChainId> extends TradeBase<C> {
   receiveAddress: string
+  receiveAccountNumber?: number
 }
 
 export type ExecuteTradeInput<C extends ChainId> = {
@@ -230,6 +232,7 @@ export enum SwapErrorType {
   POOL_NOT_FOUND = 'POOL_NOT_FOUND',
   GET_TRADE_TXS_FAILED = 'GET_TRADE_TXS_FAILED',
   TRADE_FAILED = 'TRADE_FAILED',
+  RECEIVE_ACCOUNT_NUMBER_NOT_PROVIDED = 'RECEIVE_ACCOUNT_NUMBER_NOT_PROVIDED',
 }
 export interface Swapper<T extends ChainId> {
   /** Human-readable swapper name */

packages/swapper/src/swappers/osmosis/OsmosisSwapper.ts

@@ -163,6 +163,7 @@ export class OsmosisSwapper implements Swapper<ChainId> {
       sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
       receiveAddress,
       accountNumber,
+      receiveAccountNumber,
     } = args
 
     if (!sellAmountCryptoBaseUnit) {
@@ -206,6 +207,7 @@ export class OsmosisSwapper implements Swapper<ChainId> {
       sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBase, // TODO(gomes): wat?
       sellAsset,
       accountNumber,
+      receiveAccountNumber,
       sources: [{ name: SwapperName.Osmosis, proportion: '100' }],
     }
   }
@@ -268,9 +270,15 @@ export class OsmosisSwapper implements Swapper<ChainId> {
       buyAsset,
       sellAmountBeforeFeesCryptoBaseUnit: sellAmountCryptoBaseUnit,
       accountNumber,
+      receiveAccountNumber,
       receiveAddress,
     } = trade
 
+    if (!receiveAccountNumber)
+      throw new SwapError('Receive account number not provided', {
+        code: SwapErrorType.RECEIVE_ACCOUNT_NUMBER_NOT_PROVIDED,
+      })
+
     const isFromOsmo = sellAsset.assetId === osmosisAssetId
     const sellAssetDenom = symbolDenomMapping[sellAsset.symbol as keyof SymbolDenomMapping]
     const buyAssetDenom = symbolDenomMapping[buyAsset.symbol as keyof SymbolDenomMapping]
@@ -357,7 +365,7 @@ export class OsmosisSwapper implements Swapper<ChainId> {
     const cosmosAddress = isFromOsmo ? receiveAddress : sellAddress
     const signTxInput = await buildTradeTx({
       osmoAddress,
-      accountNumber,
+      accountNumber: receiveAccountNumber,
       adapter: osmosisAdapter,
       buyAssetDenom,
       sellAssetDenom,