Skip to content

Enable ERC-1271 signature checks in Governor castVoteBySig #4418

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

Merged
Amxx merged 7 commits into from
Jul 5, 2023
Merged

Enable ERC-1271 signature checks in Governor castVoteBySig #4418

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f95789f
Make Governor ERC-1271 compatible
ernestognw Jul 3, 2023
3c74d60
Improved test and docs
ernestognw Jul 3, 2023
351450b
Add changeset
ernestognw Jul 3, 2023
01cbd6c
Add another changeset
ernestognw Jul 3, 2023
c0fab29
Apply review suggestions
ernestognw Jul 4, 2023
89ba1a4
Changesets periods
ernestognw Jul 4, 2023
3b9dcd2
Merge changesets
ernestognw Jul 4, 2023
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
Prev Previous commit
Next Next commit
Apply review suggestions 
Co-authored-by: Hadrien Croubois <[email protected]>
Co-authored-by: Francisco <[email protected]>
  • Loading branch information
@ernestognw @Amxx @frangio
3 people committed Jul 4, 2023
commit c0fab294626337fe3f54080d0a8c794a528d89fe
48 changes: 27 additions & 21 deletions test/governance/Governor.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,24 +196,30 @@ contract('Governor', function (accounts) {
});

describe('vote with signature', function () {
beforeEach(async function () {
this.sign = privateKey => (contract, message) =>
getDomain(contract)
.then(domain => ({
primaryType: 'Ballot',
types: {
EIP712Domain: domainType(domain),
Ballot: [
{ name: 'proposalId', type: 'uint256' },
{ name: 'support', type: 'uint8' },
{ name: 'voter', type: 'address' },
{ name: 'nonce', type: 'uint256' },
],
},
domain,
message,
}))
.then(data => ethSigUtil.signTypedMessage(privateKey, { data }));
const sign = privateKey => async (contract, message) => {
const domain = await getDomain(contract);
return ethSigUtil.signTypedMessage(privateKey, {
data: {
primaryType: 'Ballot',
types: {
EIP712Domain: domainType(domain),
Ballot: [
{ name: 'proposalId', type: 'uint256' },
{ name: 'support', type: 'uint8' },
{ name: 'voter', type: 'address' },
{ name: 'nonce', type: 'uint256' },
],
},
domain,
message,
},
});
};

afterEach('no other votes are cast for proposalId', async function () {
expect(await this.mock.hasVoted(this.proposal.id, owner)).to.be.equal(false);
expect(await this.mock.hasVoted(this.proposal.id, voter1)).to.be.equal(false);
expect(await this.mock.hasVoted(this.proposal.id, voter2)).to.be.equal(false);
});

it('votes with an EOA signature', async function () {
Expand All @@ -232,7 +238,7 @@ contract('Governor', function (accounts) {
support: Enums.VoteType.For,
voter: voterBySigAddress,
nonce,
signature: this.sign(voterBySig.getPrivateKey()),
signature: sign(voterBySig.getPrivateKey()),
}),
'VoteCast',
{
Expand Down Expand Up @@ -266,7 +272,7 @@ contract('Governor', function (accounts) {
support: Enums.VoteType.For,
voter: wallet.address,
nonce,
signature: this.sign(ERC1271WalletOwner.getPrivateKey()),
signature: sign(ERC1271WalletOwner.getPrivateKey()),
}),
'VoteCast',
{
Expand All @@ -282,7 +288,7 @@ contract('Governor', function (accounts) {
expect(await this.mock.nonces(wallet.address)).to.be.bignumber.equal(nonce.addn(1));
});

afterEach(async function () {
afterEach('no other votes are cast', async function () {
expect(await this.mock.hasVoted(this.proposal.id, owner)).to.be.equal(false);
expect(await this.mock.hasVoted(this.proposal.id, voter1)).to.be.equal(false);
expect(await this.mock.hasVoted(this.proposal.id, voter2)).to.be.equal(false);
Expand Down
6 changes: 3 additions & 3 deletions test/governance/extensions/GovernorWithParams.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ contract('GovernorWithParams', function (accounts) {
expect(votes.forVotes).to.be.bignumber.equal(weight);
});

describe.only('voting by signature', function () {
describe('voting by signature', function () {
beforeEach(async function () {
this.voterBySig = Wallet.generate();
this.voterBySig.address = web3.utils.toChecksumAddress(this.voterBySig.getAddressString());
Expand All @@ -143,8 +143,8 @@ contract('GovernorWithParams', function (accounts) {
message,
}));

this.sign = privateKey => (contract, message) =>
this.data(contract, message).then(data => ethSigUtil.signTypedMessage(privateKey, { data }));
this.sign = privateKey => async (contract, message) =>
ethSigUtil.signTypedMessage(privateKey, { data: await this.data(contract, message) });
});

it('suports EOA signatures', async function () {
Expand Down