diff --git a/packages/apps-config/src/api/spec/peerplays.ts b/packages/apps-config/src/api/spec/peerplays.ts index 3107c95e483d..ed0ac7de09df 100644 --- a/packages/apps-config/src/api/spec/peerplays.ts +++ b/packages/apps-config/src/api/spec/peerplays.ts @@ -305,7 +305,30 @@ const definitions: OverrideBundleDefinition = { parent: 'Option', children: 'Vec' }, - WildcardThresholdType: 'u32' + WildcardThresholdType: 'u32', + Conviction: { + _enum: [ + 'None', + 'Locked1x', + 'Locked2x', + 'Locked3x', + 'Locked4x', + 'Locked5x', + 'Locked6x' + ] + }, + Vote: '(u8, u8)', + AccountVote: { + _enum: { + Standard: '(Vote, Balance)', + Split: '(Balance, Balance)', + SplitAbstain: '(Balance, Balance, Balance)' + } + }, + PalletReputationVotingVote: 'Vote', + PalletReputationVotingVoteConviction: 'Conviction', + PalletReputationVotingVoteVote: 'Vote', + PalletReputationVotingVoteAccountVote: 'AccountVote' } } ] diff --git a/packages/apps-config/src/api/typesBundle.ts b/packages/apps-config/src/api/typesBundle.ts index c8859ee4c574..115f959f0baa 100644 --- a/packages/apps-config/src/api/typesBundle.ts +++ b/packages/apps-config/src/api/typesBundle.ts @@ -63439,7 +63439,30 @@ export const typesBundle = { "parent": "Option", "children": "Vec" }, - "WildcardThresholdType": "u32" + "WildcardThresholdType": "u32", + "Conviction": { + "_enum": [ + "None", + "Locked1x", + "Locked2x", + "Locked3x", + "Locked4x", + "Locked5x", + "Locked6x" + ] + }, + "Vote": "(u8, u8)", + "AccountVote": { + "_enum": { + "Standard": "(Vote, Balance)", + "Split": "(Balance, Balance)", + "SplitAbstain": "(Balance, Balance, Balance)" + } + }, + "PalletReputationVotingVote": "Vote", + "PalletReputationVotingVoteConviction": "Conviction", + "PalletReputationVotingVoteVote": "Vote", + "PalletReputationVotingVoteAccountVote": "AccountVote" } } ] diff --git a/packages/page-reputation-referenda/src/Referenda/Delegate/index.tsx b/packages/page-reputation-referenda/src/Referenda/Delegate/index.tsx index 63befb36e33d..b0034ebe4586 100644 --- a/packages/page-reputation-referenda/src/Referenda/Delegate/index.tsx +++ b/packages/page-reputation-referenda/src/Referenda/Delegate/index.tsx @@ -175,7 +175,7 @@ function Delegate ({ className, palletReferenda, palletVote, tracks }: Props): R label={t('conviction')} onChange={setConviction} value={conviction} - voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod} + voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod as unknown as BN} /> diff --git a/packages/page-reputation-referenda/src/Referenda/Vote/VoteStandard.tsx b/packages/page-reputation-referenda/src/Referenda/Vote/VoteStandard.tsx index 2dfc09ada414..470ac7c409bc 100644 --- a/packages/page-reputation-referenda/src/Referenda/Vote/VoteStandard.tsx +++ b/packages/page-reputation-referenda/src/Referenda/Vote/VoteStandard.tsx @@ -23,10 +23,7 @@ function VoteStandard ({ accountId, id, isAye, onChange, voteLockingPeriod }: Pr onChange([id, { Standard: { balance, - vote: { - aye: isAye, - conviction - } + vote: [isAye ? 1 : 0, conviction] } }]); }, [balance, conviction, id, isAye, onChange]); diff --git a/packages/page-reputation-referenda/src/Referenda/Vote/index.tsx b/packages/page-reputation-referenda/src/Referenda/Vote/index.tsx index 6619c0e592a0..281b619d7b0d 100644 --- a/packages/page-reputation-referenda/src/Referenda/Vote/index.tsx +++ b/packages/page-reputation-referenda/src/Referenda/Vote/index.tsx @@ -145,7 +145,7 @@ function Voting ({ className, id, isConvictionVote, isMember, members, palletVot id={id} isAye onChange={setParams} - voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod} + voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod as unknown as BN} /> ) : voteTypeIndex === 1 @@ -154,7 +154,7 @@ function Voting ({ className, id, isConvictionVote, isMember, members, palletVot accountId={accountId} id={id} onChange={setParams} - voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod} + voteLockingPeriod={api.consts[palletVote as 'reputationVoting'].voteLockingPeriod as unknown as BN} /> ) : voteTypeIndex === 2 diff --git a/packages/page-reputation-referenda/src/useAccountLocks.ts b/packages/page-reputation-referenda/src/useAccountLocks.ts index 2dfacd0cade7..f08b45e83113 100644 --- a/packages/page-reputation-referenda/src/useAccountLocks.ts +++ b/packages/page-reputation-referenda/src/useAccountLocks.ts @@ -71,7 +71,7 @@ function getRefParams (votes?: [classId: BN, refIds: BN[], casting: PalletConvic } function getLocks (api: ApiPromise, palletVote: PalletVote, votes: [classId: BN, refIds: BN[], casting: PalletConvictionVotingVoteCasting][], referenda: [BN, PalletReferendaReferendumInfoConvictionVotingTally][]): Lock[] { - const lockPeriod = api.consts[palletVote].voteLockingPeriod as BN; + const lockPeriod = api.consts[palletVote].voteLockingPeriod as unknown as BN; const locks: Lock[] = []; for (let i = 0, voteCount = votes.length; i < voteCount; i++) {