Skip to content

Split vote to 2 values #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vampik33 wants to merge 1 commit into
base: feature/page-reputation-referenda
Choose a base branch
from
Open

Split vote to 2 values #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion packages/apps-config/src/api/spec/peerplays.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,30 @@ const definitions: OverrideBundleDefinition = {
parent: 'Option<AccountId>',
children: 'Vec<AccountId>'
},
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'
}
}
]
Expand Down
25 changes: 24 additions & 1 deletion packages/apps-config/src/api/typesBundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63439,7 +63439,30 @@ export const typesBundle = {
"parent": "Option<AccountId>",
"children": "Vec<AccountId>"
},
"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"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion packages/page-reputation-referenda/src/Referenda/Delegate/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
/>
</Modal.Columns>
</Modal.Content>
Expand Down
5 changes: 1 addition & 4 deletions packages/page-reputation-referenda/src/Referenda/Vote/VoteStandard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions packages/page-reputation-referenda/src/Referenda/Vote/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/page-reputation-referenda/src/useAccountLocks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down