Fix legacy to support Tendermint 37 (#1463)

* Updated cosmjs packages to support tendermint 37. * Fixed cosmodal commit hash. * Backport decodeMessages vulnerability.
DA0-DA0 · Nov 9, 2023 · 51a6504 · 51a6504
1 parent 77ad4f9
commit 51a6504
Show file tree

Hide file tree

Showing 11 changed files with 219 additions and 204 deletions.
diff --git a/apps/dapp/package.json b/apps/dapp/package.json
@@ -15,10 +15,10 @@
     "ts:watch": "ts --watch"
   },
   "dependencies": {
-    "@cosmjs/cosmwasm-stargate": "^0.28.1",
-    "@cosmjs/encoding": "^0.28.1",
-    "@cosmjs/proto-signing": "^0.28.1",
-    "@cosmjs/stargate": "^0.28.1",
+    "@cosmjs/cosmwasm-stargate": "^0.31.3",
+    "@cosmjs/encoding": "^0.31.3",
+    "@cosmjs/proto-signing": "^0.31.3",
+    "@cosmjs/stargate": "^0.31.3",
     "@dao-dao/icons": "*",
     "@dao-dao/types": "^0.0.8",
     "@dao-dao/ui": "*",

diff --git a/apps/dapp/selectors/contracts.ts b/apps/dapp/selectors/contracts.ts
@@ -86,9 +86,9 @@ export const contractInstantiateTime = selectorFamily<Date | undefined, string>(
           return undefined
         }
 
-        const events = await client.searchTx({
-          tags: [{ key: 'instantiate._contract_address', value: address }],
-        })
+        const events = await client.searchTx([
+          { key: 'instantiate._contract_address', value: address },
+        ])
         if (events.length == 0) {
           // Failed to locate the instantiate transaction. This happens if the
           // RPC node doesn't have historical data this far back.

diff --git a/apps/dapp/selectors/proposals.ts b/apps/dapp/selectors/proposals.ts
@@ -113,13 +113,11 @@ export const proposalStartBlockSelector = selectorFamily<
         return 0
       }
 
-      const events = await client.searchTx({
-        tags: [
-          { key: 'wasm._contract_address', value: contractAddress },
-          { key: 'wasm.proposal_id', value: proposalId.toString() },
-          { key: 'wasm.action', value: 'propose' },
-        ],
-      })
+      const events = await client.searchTx([
+        { key: 'wasm._contract_address', value: contractAddress },
+        { key: 'wasm.proposal_id', value: proposalId.toString() },
+        { key: 'wasm.action', value: 'propose' },
+      ])
 
       if (events.length != 1) {
         return 0
@@ -172,13 +170,11 @@ export const proposalExecutionTXHashSelector = selectorFamily<
       // No TX Hash if proposal not yet executed.
       if (!client || proposal?.status !== 'executed') return null
 
-      const events = await client.searchTx({
-        tags: [
-          { key: 'wasm._contract_address', value: contractAddress },
-          { key: 'wasm.proposal_id', value: proposalId.toString() },
-          { key: 'wasm.action', value: 'execute' },
-        ],
-      })
+      const events = await client.searchTx([
+        { key: 'wasm._contract_address', value: contractAddress },
+        { key: 'wasm.proposal_id', value: proposalId.toString() },
+        { key: 'wasm.action', value: 'execute' },
+      ])
 
       if (events.length > 1) {
         console.error('More than one execution', events)

diff --git a/apps/dapp/selectors/treasury.ts b/apps/dapp/selectors/treasury.ts
@@ -97,9 +97,9 @@ export const transactions = selectorFamily({
     (address: string) =>
     async ({ get }) => {
       const client = get(cosmWasmClientSelector)
-      const response = (await client.searchTx({
-        sentFromOrTo: address,
-      })) as IndexedTx[]
+      const response = (await client.searchTx(
+        `message.module='bank' AND (transfer.sender='${address}' OR transfer.recipient='${address}')`
+      )) as IndexedTx[]
       return response
     },
 })

diff --git a/apps/dapp/util/messagehelpers.ts b/apps/dapp/util/messagehelpers.ts
@@ -408,39 +408,31 @@ function isBinaryType(msgType?: WasmMsgType): boolean {
 export function decodeMessages(
   msgs: ProposalResponse['msgs']
 ): { [key: string]: any }[] {
-  const decodedMessageArray: any[] = []
-  const proposalMsgs = Object.values(msgs)
-  for (const msgObj of proposalMsgs) {
-    if (isWasmMsg(msgObj)) {
-      const msgType = getWasmMsgType(msgObj.wasm)
+  return msgs.map((msg) => {
+    if (isWasmMsg(msg)) {
+      const msgType = getWasmMsgType(msg.wasm)
       if (msgType && isBinaryType(msgType)) {
-        const base64Msg = (msgObj.wasm as any)[msgType]
-        if (base64Msg) {
-          const msg = parseEncodedMessage(base64Msg.msg)
-          if (msg) {
-            decodedMessageArray.push({
-              ...msgObj,
+        const base64MsgContainer = (msg.wasm as any)[msgType]
+        if (base64MsgContainer && 'msg' in base64MsgContainer) {
+          const parsedMsg = parseEncodedMessage(base64MsgContainer.msg)
+          if (parsedMsg) {
+            return {
+              ...msg,
               wasm: {
-                ...msgObj.wasm,
+                ...msg.wasm,
                 [msgType]: {
-                  ...base64Msg,
-                  msg,
+                  ...base64MsgContainer,
+                  msg: parsedMsg,
                 },
               },
-            })
+            }
           }
         }
       }
-    } else {
-      decodedMessageArray.push(msgObj)
     }
-  }
-
-  const decodedMessages = decodedMessageArray.length
-    ? decodedMessageArray
-    : proposalMsgs
 
-  return decodedMessages
+    return msg
+  })
 }
 
 export function decodedMessagesString(msgs: ProposalResponse['msgs']): string {

diff --git a/apps/sda/package.json b/apps/sda/package.json
@@ -15,10 +15,10 @@
     "ts:watch": "ts --watch"
   },
   "dependencies": {
-    "@cosmjs/cosmwasm-stargate": "^0.28.1",
-    "@cosmjs/encoding": "^0.28.1",
-    "@cosmjs/proto-signing": "^0.28.1",
-    "@cosmjs/stargate": "^0.28.1",
+    "@cosmjs/cosmwasm-stargate": "^0.31.3",
+    "@cosmjs/encoding": "^0.31.3",
+    "@cosmjs/proto-signing": "^0.31.3",
+    "@cosmjs/stargate": "^0.31.3",
     "@dao-dao/icons": "*",
     "@dao-dao/state": "*",
     "@dao-dao/types": "^0.0.8",

diff --git a/packages/state/package.json b/packages/state/package.json
@@ -10,7 +10,7 @@
     "@keplr-wallet/stores": "^0.10.3",
     "@walletconnect/browser-utils": "^1.7.8",
     "@walletconnect/client": "^1.7.8",
-    "cosmodal": "https://github.com/NoahSaso/cosmodal#7abc9d43f31693f56d3809dc7a87eeedce3c3ca2",
+    "cosmodal": "https://github.com/NoahSaso/cosmodal#a3db5393bedf755613f76c5adff0a3de126df09d",
     "react": "^18.1.0",
     "recoil": "^0.7.2"
   },

diff --git a/packages/state/recoil/selectors/proposal.ts b/packages/state/recoil/selectors/proposal.ts
@@ -20,13 +20,11 @@ export const proposalExecutionTXHashSelector = selectorFamily<
       // No TX Hash if proposal not yet executed.
       if (!client || proposal?.proposal.status !== Status.Executed) return
 
-      const events = await client.searchTx({
-        tags: [
-          { key: 'wasm._contract_address', value: contractAddress },
-          { key: 'wasm.proposal_id', value: proposalId.toString() },
-          { key: 'wasm.action', value: 'execute' },
-        ],
-      })
+      const events = await client.searchTx([
+        { key: 'wasm._contract_address', value: contractAddress },
+        { key: 'wasm.proposal_id', value: proposalId.toString() },
+        { key: 'wasm.action', value: 'execute' },
+      ])
 
       if (events.length > 1) {
         console.error('More than one execution', events)

diff --git a/packages/utils/messages.ts b/packages/utils/messages.ts
@@ -69,39 +69,31 @@ function isBinaryType(msgType?: WasmMsgType): boolean {
 export function decodeMessages(
   msgs: ProposalResponse['msgs']
 ): { [key: string]: any }[] {
-  const decodedMessageArray: any[] = []
-  const proposalMsgs = Object.values(msgs)
-  for (const msgObj of proposalMsgs) {
-    if (isWasmMsg(msgObj)) {
-      const msgType = getWasmMsgType(msgObj.wasm)
+  return msgs.map((msg) => {
+    if (isWasmMsg(msg)) {
+      const msgType = getWasmMsgType(msg.wasm)
       if (msgType && isBinaryType(msgType)) {
-        const base64Msg = (msgObj.wasm as any)[msgType]
-        if (base64Msg) {
-          const msg = parseEncodedMessage(base64Msg.msg)
-          if (msg) {
-            decodedMessageArray.push({
-              ...msgObj,
+        const base64MsgContainer = (msg.wasm as any)[msgType]
+        if (base64MsgContainer && 'msg' in base64MsgContainer) {
+          const parsedMsg = parseEncodedMessage(base64MsgContainer.msg)
+          if (parsedMsg) {
+            return {
+              ...msg,
               wasm: {
-                ...msgObj.wasm,
+                ...msg.wasm,
                 [msgType]: {
-                  ...base64Msg,
-                  msg,
+                  ...base64MsgContainer,
+                  msg: parsedMsg,
                 },
               },
-            })
+            }
           }
         }
       }
-    } else {
-      decodedMessageArray.push(msgObj)
     }
-  }
-
-  const decodedMessages = decodedMessageArray.length
-    ? decodedMessageArray
-    : proposalMsgs
 
-  return decodedMessages
+    return msg
+  })
 }
 
 export function decodedMessagesString(msgs: ProposalResponse['msgs']): string {

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -14,6 +14,6 @@
   "prettier": "@dao-dao/config/prettier",
   "license": "MIT",
   "dependencies": {
-    "cosmodal": "https://github.com/NoahSaso/cosmodal#7abc9d43f31693f56d3809dc7a87eeedce3c3ca2"
+    "cosmodal": "https://github.com/NoahSaso/cosmodal#a3db5393bedf755613f76c5adff0a3de126df09d"
   }
 }