Add timestamp based governor with EIP-6372 and EIP-5805

contracts/governance/Governor.sol

@@ -109,7 +109,6 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor, IERC721Receive
                 this.getVotesWithParams.selector) ||
             // Previous interface for backwards compatibility
             interfaceId == (type(IGovernor).interfaceId ^ type(IERC6372).interfaceId ^ this.cancel.selector) ||
-            interfaceId == type(IGovernor).interfaceId ||
             interfaceId == type(IERC1155Receiver).interfaceId ||
             super.supportsInterface(interfaceId);
     }

contracts/governance/extensions/GovernorTimelockCompound.sol

@@ -25,7 +25,7 @@ abstract contract GovernorTimelockCompound is IGovernorTimelock, Governor {
 
     ICompoundTimelock private _timelock;
 
-    /// @custom:oz-retyped-from mapping(uint256 => Timers.Timestamp)
+    /// @custom:oz-retyped-from mapping(uint256 => GovernorTimelockCompound.ProposalTimelock)
     mapping(uint256 => uint64) private _proposalTimelocks;
 
     /**

test/governance/Governor.test.js

@@ -161,24 +161,22 @@ contract('Governor', function (accounts) {
         const voterBySig = Wallet.generate();
         const voterBySigAddress = web3.utils.toChecksumAddress(voterBySig.getAddressString());
 
-        const signature = async message => {
-          return fromRpcSig(
-            ethSigUtil.signTypedMessage(voterBySig.getPrivateKey(), {
-              data: {
-                types: {
-                  EIP712Domain,
-                  Ballot: [
-                    { name: 'proposalId', type: 'uint256' },
-                    { name: 'support', type: 'uint8' },
-                  ],
-                },
-                domain: { name, version, chainId: this.chainId, verifyingContract: this.mock.address },
-                primaryType: 'Ballot',
-                message,
+        const signature = (contract, message) =>
+          getDomain(contract)
+            .then(domain => ({
+              primaryType: 'Ballot',
+              types: {
+                EIP712Domain: domainType(domain),
+                Ballot: [
+                  { name: 'proposalId', type: 'uint256' },
+                  { name: 'support', type: 'uint8' },
+                ],
               },
-            }),
-          );
-        };
+              domain,
+              message,
+            }))
+            .then(data => ethSigUtil.signTypedMessage(voterBySig.getPrivateKey(), { data }))
+            .then(fromRpcSig);
 
         await this.token.delegate(voterBySigAddress, { from: voter1 });
 

test/governance/extensions/GovernorTimelockCompound.test.js

@@ -270,7 +270,7 @@ contract('GovernorTimelockCompound', function (accounts) {
             expect(await this.token.balanceOf(this.mock.address), 0);
             expect(await this.token.balanceOf(other), 1);
 
-            expectEvent.inTransaction(txExecute.tx, this.token, 'Transfer', {
+            await expectEvent.inTransaction(txExecute.tx, this.token, 'Transfer', {
               from: this.mock.address,
               to: other,
               value: '1',

test/governance/extensions/GovernorTimelockControl.test.js

@@ -304,7 +304,7 @@ contract('GovernorTimelockControl', function (accounts) {
                 expect(await this.token.balanceOf(this.mock.address), 0);
                 expect(await this.token.balanceOf(other), 1);
 
-                expectEvent.inTransaction(txExecute.tx, this.token, 'Transfer', {
+                await expectEvent.inTransaction(txExecute.tx, this.token, 'Transfer', {
                   from: this.mock.address,
                   to: other,
                   value: '1',

test/governance/extensions/GovernorWithParams.test.js

@@ -121,26 +121,24 @@ contract('GovernorWithParams', function (accounts) {
         const voterBySig = Wallet.generate();
         const voterBySigAddress = web3.utils.toChecksumAddress(voterBySig.getAddressString());
 
-        const signature = async message => {
-          return fromRpcSig(
-            ethSigUtil.signTypedMessage(voterBySig.getPrivateKey(), {
-              data: {
-                types: {
-                  EIP712Domain,
-                  ExtendedBallot: [
-                    { name: 'proposalId', type: 'uint256' },
-                    { name: 'support', type: 'uint8' },
-                    { name: 'reason', type: 'string' },
-                    { name: 'params', type: 'bytes' },
-                  ],
-                },
-                domain: { name, version, chainId: this.chainId, verifyingContract: this.mock.address },
-                primaryType: 'ExtendedBallot',
-                message,
+        const signature = (contract, message) =>
+          getDomain(contract)
+            .then(domain => ({
+              primaryType: 'ExtendedBallot',
+              types: {
+                EIP712Domain: domainType(domain),
+                ExtendedBallot: [
+                  { name: 'proposalId', type: 'uint256' },
+                  { name: 'support', type: 'uint8' },
+                  { name: 'reason', type: 'string' },
+                  { name: 'params', type: 'bytes' },
+                ],
               },
-            }),
-          );
-        };
+              domain,
+              message,
+            }))
+            .then(data => ethSigUtil.signTypedMessage(voterBySig.getPrivateKey(), { data }))
+            .then(fromRpcSig);
 
         await this.token.delegate(voterBySigAddress, { from: voter2 });
 

test/governance/utils/Votes.behavior.js

@@ -8,7 +8,7 @@ const Wallet = require('ethereumjs-wallet').default;
 
 const { shouldBehaveLikeEIP6372 } = require('./EIP6372.behavior');
 
-const { EIP712Domain, domainSeparator } = require('../../helpers/eip712');
+const { getDomain, domainType, domainSeparator } = require('../../helpers/eip712');
 const { clockFromReceipt } = require('../../helpers/time');
 
 const Delegation = [
@@ -17,8 +17,6 @@ const Delegation = [
   { name: 'expiry', type: 'uint256' },
 ];
 
-const version = '1';
-
 function shouldBehaveLikeVotes(mode = 'blocknumber') {
   shouldBehaveLikeEIP6372(mode);
 

test/helpers/governance.js

@@ -15,7 +15,7 @@ function concatOpts(args, opts = null) {
 }
 
 class GovernorHelper {
-  constructor(governor, mode = 'blockNumber') {
+  constructor(governor, mode = 'blocknumber') {
     this.governor = governor;
     this.mode = mode;
   }

test/token/ERC20/extensions/ERC20Votes.test.js

@@ -10,7 +10,6 @@ const Wallet = require('ethereumjs-wallet').default;
 
 const { batchInBlock } = require('../../../helpers/txpool');
 const { getDomain, domainType, domainSeparator } = require('../../../helpers/eip712');
-const { getChainId } = require('../../../helpers/chainid');
 const { clock, clockFromReceipt } = require('../../../helpers/time');
 
 const { shouldBehaveLikeEIP6372 } = require('../../../governance/utils/EIP6372.behavior');
@@ -31,13 +30,11 @@ contract('ERC20Votes', function (accounts) {
 
   const name = 'My Token';
   const symbol = 'MTKN';
-  const version = '1';
   const supply = new BN('10000000000000000000000000');
 
   for (const [mode, artifact] of Object.entries(MODES)) {
     describe(`vote with ${mode}`, function () {
       beforeEach(async function () {
-        this.chainId = await getChainId();
         this.token = await artifact.new(name, symbol, name);
       });
 
@@ -48,9 +45,7 @@ contract('ERC20Votes', function (accounts) {
       });
 
       it('domain separator', async function () {
-        expect(await this.token.DOMAIN_SEPARATOR()).to.equal(
-          await domainSeparator({ name, version, chainId: this.chainId, verifyingContract: this.token.address }),
-        );
+        expect(await this.token.DOMAIN_SEPARATOR()).to.equal(await getDomain(this.token).then(domainSeparator));
       });
 
       it('minting restriction', async function () {
@@ -119,30 +114,24 @@ contract('ERC20Votes', function (accounts) {
           const delegatorAddress = web3.utils.toChecksumAddress(delegator.getAddressString());
           const nonce = 0;
 
-          const buildData = (chainId, verifyingContract, message) => ({
-            data: {
+          const buildData = (contract, message) =>
+            getDomain(contract).then(domain => ({
               primaryType: 'Delegation',
-              types: { EIP712Domain, Delegation },
-              domain: { name, version, chainId, verifyingContract },
+              types: { EIP712Domain: domainType(domain), Delegation },
+              domain,
               message,
-            },
-          });
+            }));
 
           beforeEach(async function () {
             await this.token.$_mint(delegatorAddress, supply);
           });
 
           it('accept signed delegation', async function () {
-            const { v, r, s } = fromRpcSig(
-              ethSigUtil.signTypedMessage(
-                delegator.getPrivateKey(),
-                buildData(this.chainId, this.token.address, {
-                  delegatee: delegatorAddress,
-                  nonce,
-                  expiry: MAX_UINT256,
-                }),
-              ),
-            );
+            const { v, r, s } = await buildData(this.token, {
+              delegatee: delegatorAddress,
+              nonce,
+              expiry: MAX_UINT256,
+            }).then(data => fromRpcSig(ethSigUtil.signTypedMessage(delegator.getPrivateKey(), { data })));
 
             expect(await this.token.delegates(delegatorAddress)).to.be.equal(ZERO_ADDRESS);
 
@@ -169,16 +158,11 @@ contract('ERC20Votes', function (accounts) {
           });
 
           it('rejects reused signature', async function () {
-            const { v, r, s } = fromRpcSig(
-              ethSigUtil.signTypedMessage(
-                delegator.getPrivateKey(),
-                buildData(this.chainId, this.token.address, {
-                  delegatee: delegatorAddress,
-                  nonce,
-                  expiry: MAX_UINT256,
-                }),
-              ),
-            );
+            const { v, r, s } = await buildData(this.token, {
+              delegatee: delegatorAddress,
+              nonce,
+              expiry: MAX_UINT256,
+            }).then(data => fromRpcSig(ethSigUtil.signTypedMessage(delegator.getPrivateKey(), { data })));
 
             await this.token.delegateBySig(delegatorAddress, nonce, MAX_UINT256, v, r, s);
 
@@ -189,16 +173,11 @@ contract('ERC20Votes', function (accounts) {
           });
 
           it('rejects bad delegatee', async function () {
-            const { v, r, s } = fromRpcSig(
-              ethSigUtil.signTypedMessage(
-                delegator.getPrivateKey(),
-                buildData(this.chainId, this.token.address, {
-                  delegatee: delegatorAddress,
-                  nonce,
-                  expiry: MAX_UINT256,
-                }),
-              ),
-            );
+            const { v, r, s } = await buildData(this.token, {
+              delegatee: delegatorAddress,
+              nonce,
+              expiry: MAX_UINT256,
+            }).then(data => fromRpcSig(ethSigUtil.signTypedMessage(delegator.getPrivateKey(), { data })));
 
             const receipt = await this.token.delegateBySig(holderDelegatee, nonce, MAX_UINT256, v, r, s);
             const { args } = receipt.logs.find(({ event }) => event == 'DelegateChanged');
@@ -208,16 +187,12 @@ contract('ERC20Votes', function (accounts) {
           });
 
           it('rejects bad nonce', async function () {
-            const { v, r, s } = fromRpcSig(
-              ethSigUtil.signTypedMessage(
-                delegator.getPrivateKey(),
-                buildData(this.chainId, this.token.address, {
-                  delegatee: delegatorAddress,
-                  nonce,
-                  expiry: MAX_UINT256,
-                }),
-              ),
-            );
+            const { v, r, s } = await buildData(this.token, {
+              delegatee: delegatorAddress,
+              nonce,
+              expiry: MAX_UINT256,
+            }).then(data => fromRpcSig(ethSigUtil.signTypedMessage(delegator.getPrivateKey(), { data })));
+
             await expectRevert(
               this.token.delegateBySig(delegatorAddress, nonce + 1, MAX_UINT256, v, r, s),
               'ERC20Votes: invalid nonce',
@@ -226,16 +201,11 @@ contract('ERC20Votes', function (accounts) {
 
           it('rejects expired permit', async function () {
             const expiry = (await time.latest()) - time.duration.weeks(1);
-            const { v, r, s } = fromRpcSig(
-              ethSigUtil.signTypedMessage(
-                delegator.getPrivateKey(),
-                buildData(this.chainId, this.token.address, {
-                  delegatee: delegatorAddress,
-                  nonce,
-                  expiry,
-                }),
-              ),
-            );
+            const { v, r, s } = await buildData(this.token, {
+              delegatee: delegatorAddress,
+              nonce,
+              expiry,
+            }).then(data => fromRpcSig(ethSigUtil.signTypedMessage(delegator.getPrivateKey(), { data })));
 
             await expectRevert(
               this.token.delegateBySig(delegatorAddress, nonce, expiry, v, r, s),