Updated cosmjs packages to support tendermint 37.

DA0-DA0 · Nov 9, 2023 · 144b2b1 · 144b2b1
1 parent 77ad4f9
commit 144b2b1
Show file tree

Hide file tree

Showing 7 changed files with 185 additions and 154 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/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/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)