fix: osmosis multi-account swaps

package.json

@@ -106,7 +106,7 @@
     "@shapeshiftoss/investor-yearn": "^6.4.0",
     "@shapeshiftoss/logger": "^1.1.3",
     "@shapeshiftoss/market-service": "^7.7.0",
-    "@shapeshiftoss/swapper": "^17.3.0",
+    "@shapeshiftoss/swapper": "^17.3.1",
     "@shapeshiftoss/types": "8.5.0",
     "@shapeshiftoss/unchained-client": "^10.12.1",
     "@uniswap/sdk": "^3.0.3",

src/components/Trade/hooks/useSwapper/typeGuards.ts

@@ -21,3 +21,9 @@ export const isSupportedNonUtxoSwappingChain = (
     chainId === KnownChainIds.ThorchainMainnet
   )
 }
+
+export const isSupportedCosmosSdkSwappingChain = (
+  chainId: ChainId,
+): chainId is SupportedSwappingChain => {
+  return chainId === KnownChainIds.OsmosisMainnet || chainId === KnownChainIds.CosmosMainnet
+}

src/components/Trade/hooks/useSwapper/useSwapper.tsx

@@ -9,6 +9,7 @@ import { useAvailableSwappers } from 'components/Trade/hooks/useAvailableSwapper
 import { useReceiveAddress } from 'components/Trade/hooks/useReceiveAddress'
 import { getSwapperManager } from 'components/Trade/hooks/useSwapper/swapperManager'
 import {
+  isSupportedCosmosSdkSwappingChain,
   isSupportedNonUtxoSwappingChain,
   isSupportedUtxoSwappingChain,
 } from 'components/Trade/hooks/useSwapper/typeGuards'
@@ -39,6 +40,7 @@ export const useSwapper = () => {
   const buyTradeAsset = useWatch({ control, name: 'buyTradeAsset' })
   const quote = useWatch({ control, name: 'quote' })
   const sellAssetAccountId = useWatch({ control, name: 'sellAssetAccountId' })
+  const buyAssetAccountId = useWatch({ control, name: 'buyAssetAccountId' })
   const isSendMax = useWatch({ control, name: 'isSendMax' })
   const isExactAllowance = useWatch({ control, name: 'isExactAllowance' })
   const slippage = useWatch({ control, name: 'slippage' })
@@ -94,6 +96,18 @@ export const useSwapper = () => {
     selectBIP44ParamsByAccountId(state, sellAccountFilter),
   )
 
+  const buyAssetAccountIds = useAppSelector(state =>
+    selectPortfolioAccountIdsByAssetId(state, { assetId: buyAsset?.assetId ?? '' }),
+  )
+  const buyAccountFilter = useMemo(
+    () => ({ accountId: buyAssetAccountId ?? buyAssetAccountIds[0] }),
+    [buyAssetAccountId, buyAssetAccountIds],
+  )
+
+  const buyAccountBip44Params = useAppSelector(state =>
+    selectBIP44ParamsByAccountId(state, buyAccountFilter),
+  )
+
   /*
   Cross-account trading means trades that are either:
     - Trades between assets on the same chain but different accounts
@@ -161,6 +175,7 @@ export const useSwapper = () => {
     if (!receiveAddress) throw new Error('Missing receiveAddress')
     if (!sellAssetAccountId) throw new Error('Missing sellAssetAccountId')
     if (!sellAccountBip44Params) throw new Error('Missing sellAccountBip44Params')
+    if (!buyAccountBip44Params) throw new Error('Missing buyAccountBip44Params')
     if (!sellAccountMetadata) throw new Error('Missing sellAccountMetadata')
 
     const buildTradeCommonArgs: BuildTradeInputCommonArgs = {
@@ -176,7 +191,16 @@ export const useSwapper = () => {
       slippage,
     }
     const sellAssetChainId = sellAsset.chainId
-    if (isSupportedNonUtxoSwappingChain(sellAssetChainId)) {
+    if (isSupportedCosmosSdkSwappingChain(sellAssetChainId)) {
+      const { accountNumber } = sellAccountBip44Params
+      const { accountNumber: receiveAccountNumber } = buyAccountBip44Params
+      return bestTradeSwapper.buildTrade({
+        ...buildTradeCommonArgs,
+        chainId: sellAssetChainId,
+        accountNumber,
+        receiveAccountNumber,
+      })
+    } else if (isSupportedNonUtxoSwappingChain(sellAssetChainId)) {
       const { accountNumber } = sellAccountBip44Params
       return bestTradeSwapper.buildTrade({
         ...buildTradeCommonArgs,
@@ -201,18 +225,19 @@ export const useSwapper = () => {
       })
     }
   }, [
+    sellAsset,
     bestTradeSwapper,
+    sellTradeAsset?.amountCryptoPrecision,
+    sellTradeAsset?.asset,
     buyTradeAsset?.asset,
-    isSendMax,
+    wallet,
     receiveAddress,
-    sellAccountBip44Params,
-    sellAsset,
     sellAssetAccountId,
+    sellAccountBip44Params,
+    buyAccountBip44Params,
     sellAccountMetadata,
-    sellTradeAsset?.amountCryptoPrecision,
-    sellTradeAsset?.asset,
+    isSendMax,
     slippage,
-    wallet,
   ])
 
   // useEffects

yarn.lock

@@ -4196,10 +4196,10 @@
     google-protobuf "^3.17.0"
     long "^4.0.0"
 
-"@shapeshiftoss/swapper@^17.3.0":
-  version "17.3.0"
-  resolved "https://registry.yarnpkg.com/@shapeshiftoss/swapper/-/swapper-17.3.0.tgz#d248f4f0d3436143effda1d187e38ff89f5b7062"
-  integrity sha512-GJvxts6N5RcSl7+hjanPiQ4AGbdrNqQ0zN/n6DvIeS8C/HJ8ogCWO8+ssxt14FJHj7y1rJtdv976Wu99H9Tszg==
+"@shapeshiftoss/swapper@^17.3.1":
+  version "17.3.1"
+  resolved "https://registry.yarnpkg.com/@shapeshiftoss/swapper/-/swapper-17.3.1.tgz#97b4c94644b9c46eb031539dd9d6b9cf0eebef02"
+  integrity sha512-kWF4/hXPmiaozqT7vsZQIhKSvoeh2vuNvsUSpkVpcUHSE/TKYxdOso1Iy7bW8S6IWDUO1/2Wu7BqxNrA+V84bA==
   dependencies:
     axios "^0.26.1"
     axios-cache-adapter "^2.7.3"