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.

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

Sequential Proposal Ids Alt #5290

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

arr00
Copy link
Contributor

@arr00 arr00 commented Nov 1, 2024

Alternative solution to #5280

PR Checklist

  • Tests
  • Documentation
  • Changeset entry (run npx changeset add)

Copy link

changeset-bot bot commented Nov 1, 2024

⚠️ No Changeset found

Latest commit: b063a61

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

Comment on lines +30 to +33
uint256 proposalHash = super.hashProposal(targets, values, calldatas, keccak256(bytes(description)));
_proposalIds[proposalHash] = ++_numberOfProposals;

return super._propose(targets, values, calldatas, description, proposer);
Copy link
Member

Choose a reason for hiding this comment

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

I feel this is a bit cleaner

Suggested change
uint256 proposalHash = super.hashProposal(targets, values, calldatas, keccak256(bytes(description)));
_proposalIds[proposalHash] = ++_numberOfProposals;
return super._propose(targets, values, calldatas, description, proposer);
uint256 proposalId = super._propose(targets, values, calldatas, description, proposer);
_proposalIds[proposalId] = ++_numberOfProposals;
return proposalId;

Otherwise, the super in hashProposal is not needed:

Suggested change
uint256 proposalHash = super.hashProposal(targets, values, calldatas, keccak256(bytes(description)));
_proposalIds[proposalHash] = ++_numberOfProposals;
return super._propose(targets, values, calldatas, description, proposer);
uint256 proposalHash = hashProposal(targets, values, calldatas, keccak256(bytes(description)));
_proposalIds[proposalHash] = ++_numberOfProposals;
return super._propose(targets, values, calldatas, description, proposer);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

First: we need to set the mapping first so that the _propose call fetches the correct proposalId.

Second: I believe we do need the super as we do not want to be calling the overridden hashProposal in the extension.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants