fix v1beta1 gov prop decoding

DA0-DA0 · Apr 5, 2024 · 3d0384a · 3d0384a
1 parent d48ba48
commit 3d0384a
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 34 deletions.
diff --git a/packages/state/recoil/selectors/chain.ts b/packages/state/recoil/selectors/chain.ts
@@ -759,7 +759,7 @@ export const govProposalsSelector = selectorFamily<
           v1Beta1Proposals = indexerProposals.flatMap(
             ({ data }): ProposalV1Beta1 | [] => {
               try {
-                return ProposalV1Beta1.decode(fromBase64(data))
+                return ProposalV1Beta1.decode(fromBase64(data), undefined, true)
               } catch {
                 return []
               }
@@ -824,22 +824,26 @@ export const govProposalsSelector = selectorFamily<
                 pagination: undefined,
               },
               'proposals',
+              true,
               true
             )
             total = v1Beta1Proposals.length
           } else {
-            const response = await client.gov.v1beta1.proposals({
-              proposalStatus: status,
-              voter: '',
-              depositor: '',
-              pagination: {
-                key: new Uint8Array(),
-                offset: BigInt(offset || 0),
-                limit: BigInt(limit || 0),
-                countTotal: true,
-                reverse: true,
+            const response = await client.gov.v1beta1.proposals(
+              {
+                proposalStatus: status,
+                voter: '',
+                depositor: '',
+                pagination: {
+                  key: new Uint8Array(),
+                  offset: BigInt(offset || 0),
+                  limit: BigInt(limit || 0),
+                  countTotal: true,
+                  reverse: true,
+                },
               },
-            })
+              true
+            )
             v1Beta1Proposals = response.proposals
             total = Number(response.pagination?.total || 0)
           }
@@ -911,7 +915,11 @@ export const govProposalSelector = selectorFamily<
           return await decodeGovProposal({
             version: GovProposalVersion.V1_BETA_1,
             id: BigInt(proposalId),
-            proposal: ProposalV1Beta1.decode(fromBase64(indexerProposal.data)),
+            proposal: ProposalV1Beta1.decode(
+              fromBase64(indexerProposal.data),
+              undefined,
+              true
+            ),
           })
         }
       }
@@ -933,7 +941,7 @@ export const govProposalSelector = selectorFamily<
           return await decodeGovProposal({
             version: GovProposalVersion.V1,
             id: BigInt(proposalId),
-            proposal: proposal,
+            proposal,
           })
         } catch (err) {
           // Fallback to v1beta1 query if v1 not supported.
@@ -948,9 +956,12 @@ export const govProposalSelector = selectorFamily<
       }
 
       const proposal = (
-        await client.gov.v1beta1.proposal({
-          proposalId: BigInt(proposalId),
-        })
+        await client.gov.v1beta1.proposal(
+          {
+            proposalId: BigInt(proposalId),
+          },
+          true
+        )
       ).proposal
       if (!proposal) {
         throw new Error('Proposal not found')
@@ -959,7 +970,7 @@ export const govProposalSelector = selectorFamily<
       return await decodeGovProposal({
         version: GovProposalVersion.V1_BETA_1,
         id: BigInt(proposalId),
-        proposal: proposal,
+        proposal,
       })
     },
 })

diff --git a/packages/stateful/server/makeGetGovStaticProps.ts b/packages/stateful/server/makeGetGovStaticProps.ts
@@ -237,7 +237,9 @@ export const makeGetGovProposalStaticProps = ({
               version: GovProposalVersion.V1_BETA_1,
               id: BigInt(proposalId),
               proposal: ProposalV1Beta1.decode(
-                fromBase64(indexerProposal.data)
+                fromBase64(indexerProposal.data),
+                undefined,
+                true
               ),
             })
           }
@@ -281,9 +283,12 @@ export const makeGetGovProposalStaticProps = ({
 
           if (!proposal) {
             const proposalV1Beta1 = (
-              await client.gov.v1beta1.proposal({
-                proposalId: BigInt(proposalId),
-              })
+              await client.gov.v1beta1.proposal(
+                {
+                  proposalId: BigInt(proposalId),
+                },
+                true
+              )
             ).proposal
             if (!proposalV1Beta1) {
               throw new Error('NOT_FOUND')

diff --git a/packages/utils/messages/protobuf.ts b/packages/utils/messages/protobuf.ts
@@ -48,6 +48,7 @@ export const decodeGovProposal = async (
   if (govProposal.version === GovProposalVersion.V1_BETA_1) {
     let title = govProposal.proposal.content?.title || ''
     let description = govProposal.proposal.content?.description || ''
+
     // If content not decoded and stuck as Any, decode as TextProposal to get
     // the title and description.
     if (

diff --git a/packages/utils/pagination.ts b/packages/utils/pagination.ts
@@ -8,26 +8,30 @@ export const getAllRpcResponse = async <
   R extends { pagination?: PageResponse; [key: string]: any },
   K extends keyof R
 >(
-  queryFn: (params: P) => Promise<R>,
+  queryFn: (params: P, useInterfaces?: boolean) => Promise<R>,
   params: P,
   key: K,
-  reverse = false
+  reverse = false,
+  useInterfaces = false
 ): Promise<R[K]> => {
   let pagination: Partial<PageRequest> | undefined
   const data = [] as any[]
 
   do {
-    const response = await queryFn({
-      ...params,
-      pagination: {
-        key: new Uint8Array(),
-        ...pagination,
-        reverse,
-        // Get all.
-        offset: 0n,
-        limit: BigInt(Number.MAX_SAFE_INTEGER),
+    const response = await queryFn(
+      {
+        ...params,
+        pagination: {
+          key: new Uint8Array(),
+          ...pagination,
+          reverse,
+          // Get all.
+          offset: 0n,
+          limit: BigInt(Number.MAX_SAFE_INTEGER),
+        },
       },
-    })
+      useInterfaces
+    )
 
     pagination = response.pagination?.nextKey?.length
       ? {