use v1 of proposal API

Author: Eason Smith

examples/vote-proposal/components/voting/Proposal.tsx

@@ -13,7 +13,7 @@ import {
 import {
   Proposal as IProposal,
   ProposalStatus,
-} from "interchain-query/cosmos/gov/v1beta1/gov";
+} from "interchain-query/cosmos/gov/v1/gov";
 import {
   exponentiate,
   formatDate,
@@ -59,7 +59,7 @@ export function Proposal({
   bondedTokens,
   onVoteSuccess = () => { },
 }: ProposalProps) {
-  const vote = votes?.[proposal.proposalId.toString()];
+  const vote = votes?.[proposal.id.toString()];
 
   const [showMore, setShowMore] = useState(false);
   const [voteType, setVoteType] = useState<GovernanceVoteType>();
@@ -267,29 +267,29 @@ export function Proposal({
           <GovernanceVoteBreakdown
             voteType="yes"
             title="Yes"
-            votePercentage={percent(proposal.finalTallyResult?.yes, total)}
+            votePercentage={percent(proposal.finalTallyResult?.yesCount, total)}
             description={`${exponentiate(
-              proposal.finalTallyResult?.yes,
+              proposal.finalTallyResult?.yesCount,
               -exponent,
             ).toFixed(2)
               } ${coin.symbol}`}
           />
           <GovernanceVoteBreakdown
             voteType="abstain"
             title="Abstain"
-            votePercentage={percent(proposal.finalTallyResult?.abstain, total)}
+            votePercentage={percent(proposal.finalTallyResult?.abstainCount, total)}
             description={`${exponentiate(
-              proposal.finalTallyResult?.abstain,
+              proposal.finalTallyResult?.abstainCount,
               -exponent,
             ).toFixed(2)
               } ${coin.symbol}`}
           />
           <GovernanceVoteBreakdown
             voteType="no"
             title="No"
-            votePercentage={percent(proposal.finalTallyResult?.no, total)}
+            votePercentage={percent(proposal.finalTallyResult?.noCount, total)}
             description={`${exponentiate(
-              proposal.finalTallyResult?.no,
+              proposal.finalTallyResult?.noCount,
               -exponent,
             ).toFixed(2)
               } ${coin.symbol}`}
@@ -298,11 +298,11 @@ export function Proposal({
             voteType="noWithVeto"
             title="No with veto"
             votePercentage={percent(
-              proposal.finalTallyResult?.noWithVeto,
+              proposal.finalTallyResult?.noWithVetoCount,
               total,
             )}
             description={`${exponentiate(
-              proposal.finalTallyResult?.noWithVeto,
+              proposal.finalTallyResult?.noWithVetoCount,
               -exponent,
             ).toFixed(2)
               } ${coin.symbol}`}
@@ -314,7 +314,7 @@ export function Proposal({
               <GovernanceResultCard
                 resultType="passed"
                 label="Passed"
-                votePercentage={percent(proposal.finalTallyResult?.yes, total)}
+                votePercentage={percent(proposal.finalTallyResult?.yesCount, total)}
               />
             )
             : null}
@@ -324,10 +324,10 @@ export function Proposal({
                 resultType="rejected"
                 label="Rejected"
                 votePercentage={+(percent(
-                  proposal.finalTallyResult?.no,
+                  proposal.finalTallyResult?.noCount,
                   total,
                 ) +
-                  percent(proposal.finalTallyResult?.noWithVeto, total))
+                  percent(proposal.finalTallyResult?.noWithVetoCount, total))
                   .toFixed(2)}
               />
             )

examples/vote-proposal/components/voting/Voting.tsx

@@ -4,7 +4,7 @@ import {
   Proposal as IProposal,
   ProposalStatus,
   TallyResult,
-} from "interchain-query/cosmos/gov/v1beta1/gov";
+} from "interchain-query/cosmos/gov/v1/gov";
 import {
   BasicModal,
   Box,
@@ -38,10 +38,10 @@ function status(s: ProposalStatus) {
 
 function votes(result: TallyResult) {
   return {
-    yes: Number(result.yes) || 0,
-    no: Number(result.no) || 0,
-    abstain: Number(result.abstain) || 0,
-    noWithVeto: Number(result.noWithVeto) || 0,
+    yes: Number(result.yesCount) || 0,
+    no: Number(result.noCount) || 0,
+    abstain: Number(result.abstainCount) || 0,
+    noWithVeto: Number(result.noWithVetoCount) || 0,
   };
 }
 
@@ -68,11 +68,11 @@ export function Voting({ chainName }: VotingProps) {
       {data.proposals?.map((proposal, index) => (
         <Box
           my="$8"
-          key={proposal.proposalId?.toString() || index}
+          key={proposal.id?.toString() || index}
           position="relative"
           attributes={{ onClick: () => onClickProposal(index) }}
         >
-          {data.votes[proposal.proposalId.toString()]
+          {data.votes[proposal.id.toString()]
             ? (
               <Box
                 position="absolute"
@@ -90,7 +90,7 @@ export function Voting({ chainName }: VotingProps) {
             )
             : null}
           <GovernanceProposalItem
-            id={`# ${proposal.proposalId?.toString()}`}
+            id={`# ${proposal.id?.toString()}`}
             key={proposal.submitTime?.getTime()}
             // @ts-ignore
             title={proposal.content?.title || ""}

examples/vote-proposal/hooks/useVoting.ts

@@ -3,7 +3,7 @@ import { cosmos } from 'interchain-query';
 import { toast } from '@interchain-ui/react';
 import { useChain } from '@cosmos-kit/react';
 import { coins, StdFee } from '@cosmjs/stargate';
-import { Proposal } from "interchain-query/cosmos/gov/v1beta1/gov";
+import { Proposal } from "interchain-query/cosmos/gov/v1/gov";
 import { useTx } from '@/hooks';
 import { getCoin } from '@/utils';
 
@@ -33,7 +33,7 @@ export function useVoting({ chainName, proposal }: useVotingOptions) {
     const msg = MessageComposer.fromPartial.vote({
       option,
       voter: address,
-      proposalId: proposal.proposalId,
+      proposalId: proposal.id,
     });
 
     const fee: StdFee = {

examples/vote-proposal/hooks/useVotingData.ts

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { useChain } from '@cosmos-kit/react';
 import { useQueries } from '@tanstack/react-query';
 import { Proposal, ProposalStatus } from 'interchain-query/cosmos/gov/v1beta1/gov';
+import { Proposal as ProposalV1 } from 'interchain-query/cosmos/gov/v1/gov';
 import { useQueryHooks, useRpcQueryClient } from '.';
 import { getTitle, paginate, parseQuorum } from '@/utils';
 
@@ -13,9 +14,9 @@ export interface Votes {
   [key: string]: number;
 }
 
-export function processProposals(proposals: Proposal[]) {
+export function processProposals(proposals: ProposalV1[]) {
   const sorted = proposals.sort(
-    (a, b) => Number(b.proposalId) - Number(a.proposalId)
+    (a, b) => Number(b.id) - Number(a.id)
   );
 
   proposals.forEach((proposal) => {
@@ -39,7 +40,9 @@ export function useVotingData(chainName: string) {
   const { rpcQueryClient } = useRpcQueryClient(chainName);
   const { cosmos, isReady, isFetching } = useQueryHooks(chainName);
 
-  const proposalsQuery = cosmos.gov.v1beta1.useProposals({
+  // cosmos.gov.v1.useProposals
+
+  const proposalsQuery = cosmos.gov.v1.useProposals({
     request: {
       voter: '',
       depositor: '',
@@ -61,16 +64,16 @@ export function useVotingData(chainName: string) {
     },
   });
 
-  const quorumQuery = cosmos.gov.v1beta1.useParams({
+  const quorumQuery = cosmos.gov.v1.useParams({
     request: { paramsType: 'tallying' },
     options: {
       enabled: isReady,
       staleTime: Infinity,
-      select: ({ tallyParams }) => parseQuorum(tallyParams?.quorum),
+      select: ({ tallyParams }) => parseQuorum(tallyParams?.quorum as any),
     },
   });
 
-  const votedProposalsQuery = cosmos.gov.v1beta1.useProposals({
+  const votedProposalsQuery = cosmos.gov.v1.useProposals({
     request: {
       voter: address || '/', // use '/' to differentiate from proposalsQuery
       depositor: '',
@@ -85,11 +88,11 @@ export function useVotingData(chainName: string) {
   });
 
   const votesQueries = useQueries({
-    queries: (votedProposalsQuery.data || []).map(({ proposalId }) => ({
-      queryKey: ['voteQuery', proposalId, address],
+    queries: (votedProposalsQuery.data || []).map(({ id }) => ({
+      queryKey: ['voteQuery', id, address],
       queryFn: () =>
-        rpcQueryClient?.cosmos.gov.v1beta1.vote({
-          proposalId,
+        rpcQueryClient?.cosmos.gov.v1.vote({
+          proposalId: id,
           voter: address || '',
         }),
       enabled: Boolean(rpcQueryClient) && Boolean(address) && Boolean(votedProposalsQuery.data),