Skip to content
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

Fix quorum formatting #1348

Merged
merged 6 commits into from
Feb 9, 2024
Merged

Fix quorum formatting #1348

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
871bc54
Multiply quorum percentage by 10000 to get it into proper format duri…
mudrila Feb 9, 2024
d19d8df
Do not divide by quorum denominator
mudrila Feb 9, 2024
cb1cbf0
More cleanup
mudrila Feb 9, 2024
4cb3f1b
Remove log
mudrila Feb 9, 2024
5ecbffc
Fetch QUORUM_DENOMINATOR from voting strategy master copy
mudrila Feb 9, 2024
82e1662
Move content of setPredictedAddresses of AzoriusTxBuilder directly in…
mudrila Feb 9, 2024
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
17 changes: 10 additions & 7 deletions src/hooks/DAO/loaders/governance/useERC20LinearStrategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ export const useERC20LinearStrategy = () => {
if (!ozLinearVotingContract || !azoriusContract) {
return {};
}
const [votingPeriodBlocks, quorumNumerator, timeLockPeriod] = await Promise.all([
ozLinearVotingContract.asSigner.votingPeriod(),
ozLinearVotingContract.asSigner.quorumNumerator(),
azoriusContract.asSigner.timelockPeriod(),
]);
const [votingPeriodBlocks, quorumNumerator, quorumDenominator, timeLockPeriod] =
await Promise.all([
ozLinearVotingContract.asSigner.votingPeriod(),
ozLinearVotingContract.asSigner.quorumNumerator(),
ozLinearVotingContract.asSigner.QUORUM_DENOMINATOR(),
azoriusContract.asSigner.timelockPeriod(),
]);

const quorumPercentage = quorumNumerator.mul(100).div(quorumDenominator);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes!

const votingPeriodValue = await blocksToSeconds(votingPeriodBlocks, provider);
const timeLockPeriodValue = await blocksToSeconds(timeLockPeriod, provider);
const votingData = {
Expand All @@ -42,8 +45,8 @@ export const useERC20LinearStrategy = () => {
formatted: getTimeDuration(votingPeriodValue),
},
quorumPercentage: {
value: quorumNumerator,
formatted: quorumNumerator.toString() + '%',
value: quorumPercentage,
formatted: quorumPercentage.toString() + '%',
},
timeLockPeriod: {
value: BigNumber.from(timeLockPeriodValue),
Expand Down
2 changes: 1 addition & 1 deletion src/models/AzoriusTxBuilder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
'0x0000000000000000000000000000000000000001', // Azorius module
azoriusGovernanceDaoData.votingPeriod,
BigNumber.from(1), // proposer weight, how much is needed to create a proposal.
azoriusGovernanceDaoData.quorumPercentage, // quorom numerator, denominator is 1,000,000, so quorum percentage is 50%
azoriusGovernanceDaoData.quorumPercentage.mul(10000), // quorom numerator, denominator is 1,000,000, so quorum percentage is quorumNumerator * 100 / quorumDenominator
mudrila marked this conversation as resolved.
Show resolved Hide resolved
BigNumber.from(500000), // basis numerator, denominator is 1,000,000, so basis percentage is 50% (simple majority)
]
);
Expand Down
Loading