Merge pull request #1618 from mars-protocol/develop

v2.11.2

Author: linkielink

package.json

@@ -100,6 +100,15 @@
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.39.0"
   },
+  "overrides": {
+    "chalk": "5.3.0",
+    "strip-ansi": "7.1.0",
+    "color-convert": "2.0.1",
+    "color-name": "1.1.4",
+    "is-core-module": "2.13.1",
+    "error-ex": "1.3.2",
+    "has-ansi": "5.0.1"
+  },
   "engines": {
     "npm": "please-use-yarn",
     "yarn": ">= 1.19.1"

src/utils/broadcast.ts

@@ -173,9 +173,9 @@ function getTransactionCoinsGrouped(
   perpsBaseDenom?: string,
 ) {
   const transactionCoins: TransactionCoin[] = []
-  // Event types that include coins are wasm, token_swapped, pool_joined, and message (for Duality swaps)
+  // Event types that include coins are wasm, token_swapped, pool_joined, message (for Duality swaps), and TickUpdate (for MultihopSwap)
   // This should be streamlined by SC one day
-  const eventTypes = ['wasm', 'token_swapped', 'pool_joined', 'message']
+  const eventTypes = ['wasm', 'token_swapped', 'pool_joined', 'message', 'TickUpdate']
 
   const coinRules = getRules()
 
@@ -192,6 +192,63 @@ function getTransactionCoinsGrouped(
     return action === 'swap'
   })
 
+  // Also collect MultihopSwap events (new pattern)
+  const multihopSwapEvents = filteredEvents.filter((event: TransactionEvent) => {
+    if (!Array.isArray(event.attributes)) return false
+    const action = event.attributes.find(
+      (a: TransactionEventAttribute) => a.key === 'action',
+    )?.value
+    return action === 'MultihopSwap'
+  })
+
+  // Process MultihopSwap events by looking for WASM events with coin_in/denom_out
+  if (multihopSwapEvents.length > 0) {
+    const wasmSwapEvents = filteredEvents.filter((event: TransactionEvent) => {
+      if (event.type !== 'wasm') return false
+      if (!Array.isArray(event.attributes)) return false
+      
+      const hasCoinIn = event.attributes.some(a => a.key === 'coin_in')
+      const hasDenomOut = event.attributes.some(a => a.key === 'denom_out')
+      
+      return hasCoinIn && hasDenomOut
+    })
+
+    wasmSwapEvents.forEach((event: TransactionEvent) => {
+      const coinInAttr = event.attributes.find(a => a.key === 'coin_in')?.value
+      const denomOut = event.attributes.find(a => a.key === 'denom_out')?.value
+
+      if (coinInAttr && denomOut) {
+        // Parse coin_in format: "amount+denom"
+        const coinInMatch = coinInAttr.match(/^(\d+)(.+)$/)
+        if (coinInMatch) {
+          const [, amount, denom] = coinInMatch
+          
+          // Add input coin
+          transactionCoins.push({
+            type: 'swap',
+            coin: BNCoin.fromDenomAndBigNumber(denom, BN(amount)),
+          })
+          
+          // For output, we need to find the actual output amount
+          // Look for SwapAmountOut in TickUpdate events
+          const tickUpdateEvent = filteredEvents.find((tickEvent: TransactionEvent) => {
+            if (tickEvent.type !== 'TickUpdate') return false
+            return tickEvent.attributes?.some((a: TransactionEventAttribute) => a.key === 'SwapAmountOut' && parseInt(a.value || '0') > 1000)
+          })
+          
+          const outputAmount = tickUpdateEvent?.attributes?.find((a: TransactionEventAttribute) => a.key === 'SwapAmountOut')?.value
+          
+          if (outputAmount) {
+            transactionCoins.push({
+              type: 'swap',
+              coin: BNCoin.fromDenomAndBigNumber(denomOut, BN(outputAmount)),
+            })
+          }
+        }
+      }
+    })
+  }
+
   // Process swap events to show complete multi-hop route
   if (swapEvents.length > 1) {
     // For multi-hop swaps, show the complete route: input -> output -> input -> output -> etc.