Skip to content

Add Governor signature nonces #4378

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 18 commits into from
Jul 3, 2023
Merged

Add Governor signature nonces #4378

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0619b5c
Add Governor signature nonces
ernestognw Jun 22, 2023
5ecb405
Add changeset
ernestognw Jun 22, 2023
9e9e238
Ignore initcode-size warnings
ernestognw Jun 22, 2023
b84ea6e
Fix lint
ernestognw Jun 22, 2023
2781b5f
Apply suggestions
ernestognw Jun 23, 2023
ba44fa1
Improve testing coverage
ernestognw Jun 23, 2023
3f6e520
Update .changeset/sixty-numbers-reply.md
ernestognw Jun 29, 2023
79c5982
Do not emit Approval event when calling transferFrom (#4370)
Amxx Jun 22, 2023
35de382
Update comment to reflect code logic in Ownable.sol (#4369)
s-tikhomirov Jun 22, 2023
a75ca26
Pack Governor's ProposalCore into a single slot (#4268)
Amxx Jun 23, 2023
b32bfdd
Update Ownable2Step docs (#4384)
RenanSouza2 Jun 23, 2023
d518d65
Add unreleased disclaimer in readme
frangio Jun 24, 2023
71cd6ba
Rename `ERC1155InsufficientApprovalForAll` to `ERC1155MissingApproval…
ernestognw Jun 26, 2023
48a048c
Add Foundry installation instructions with required warnings (#4389)
frangio Jun 26, 2023
8a810c9
Add `ERC2771Forwarder` as an enhanced successor to `MinimalForwarder`…
ernestognw Jun 29, 2023
f808576
Fix details AccessControl-test (#4391)
RenanSouza2 Jun 29, 2023
2ed9be3
Fix tests
ernestognw Jun 29, 2023
2ae0a13
Merge branch 'master' into lib-895-add-governor-signature-nonces
Amxx Jun 29, 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
Merge branch 'master' into lib-895-add-governor-signature-nonces
  • Loading branch information
@Amxx
Amxx authored Jun 29, 2023
commit 2ae0a131d79dce7cde7b63d6946c7cb1d42d319b
22 changes: 11 additions & 11 deletions contracts/governance/Governor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

pragma solidity ^0.8.19;

import "../token/ERC721/IERC721Receiver.sol";
import "../token/ERC1155/IERC1155Receiver.sol";
import "../utils/cryptography/ECDSA.sol";
import "../utils/cryptography/EIP712.sol";
import "../utils/introspection/ERC165.sol";
import "../utils/math/SafeCast.sol";
import "../utils/structs/DoubleEndedQueue.sol";
import "../utils/Address.sol";
import "../utils/Context.sol";
import "../utils/Nonces.sol";
import "./IGovernor.sol";
import {IERC721Receiver} from "../token/ERC721/IERC721Receiver.sol";
import {IERC1155Receiver} from "../token/ERC1155/IERC1155Receiver.sol";
import {ECDSA} from "../utils/cryptography/ECDSA.sol";
import {EIP712} from "../utils/cryptography/EIP712.sol";
import {IERC165, ERC165} from "../utils/introspection/ERC165.sol";
import {SafeCast} from "../utils/math/SafeCast.sol";
import {DoubleEndedQueue} from "../utils/structs/DoubleEndedQueue.sol";
import {Address} from "../utils/Address.sol";
import {Context} from "../utils/Context.sol";
import {Nonces} from "../utils/Nonces.sol";
import {IGovernor, IERC6372} from "./IGovernor.sol";

/**
* @dev Core of the governance system, designed to be extended though various modules.
Expand Down
8 changes: 4 additions & 4 deletions contracts/metatx/ERC2771Forwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

pragma solidity ^0.8.19;

import "../utils/cryptography/ECDSA.sol";
import "../utils/cryptography/EIP712.sol";
import "../utils/Nonces.sol";
import "../utils/Address.sol";
import {ECDSA} from "../utils/cryptography/ECDSA.sol";
import {EIP712} from "../utils/cryptography/EIP712.sol";
import {Nonces} from "../utils/Nonces.sol";
import {Address} from "../utils/Address.sol";

/**
* @dev A forwarder compatible with ERC2771 contracts. See {ERC2771Context}.
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/token/ERC20ApprovalMock.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.19;

import "../../token/ERC20/ERC20.sol";
import {ERC20} from "../../token/ERC20/ERC20.sol";

abstract contract ERC20ApprovalMock is ERC20 {
function _approve(address owner, address spender, uint256 amount, bool) internal virtual override {
Expand Down
12 changes: 6 additions & 6 deletions scripts/upgradeable/upgradeable.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ index ff596b0c..00000000
-<!-- Make sure that you have reviewed the OpenZeppelin Contracts Contributor Guidelines. -->
-<!-- https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/CONTRIBUTING.md -->
diff --git a/README.md b/README.md
index 9d1c405b..c264e29c 100644
index 27627f43..e42a66e8 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,9 @@
Expand Down Expand Up @@ -106,7 +106,7 @@ index 9d1c405b..c264e29c 100644
}
```
diff --git a/contracts/finance/VestingWallet.sol b/contracts/finance/VestingWallet.sol
index ebdf0a33..8888803e 100644
index f776a7ca..d7a7e0b0 100644
--- a/contracts/finance/VestingWallet.sol
+++ b/contracts/finance/VestingWallet.sol
@@ -19,6 +19,8 @@ import {Context} from "../utils/Context.sol";
Expand Down Expand Up @@ -152,7 +152,7 @@ index df141192..1cf90ad1 100644
"keywords": [
"solidity",
diff --git a/contracts/token/ERC20/extensions/ERC20Capped.sol b/contracts/token/ERC20/extensions/ERC20Capped.sol
index 41e9ce5c..1d910dfa 100644
index 98ec7144..4992115b 100644
--- a/contracts/token/ERC20/extensions/ERC20Capped.sol
+++ b/contracts/token/ERC20/extensions/ERC20Capped.sol
@@ -7,6 +7,8 @@ import {ERC20} from "../ERC20.sol";
Expand All @@ -165,7 +165,7 @@ index 41e9ce5c..1d910dfa 100644
abstract contract ERC20Capped is ERC20 {
uint256 private immutable _cap;
diff --git a/contracts/token/ERC20/extensions/ERC20Permit.sol b/contracts/token/ERC20/extensions/ERC20Permit.sol
index 4378eb7c..1da9e731 100644
index 8778f4ba..825d4e16 100644
--- a/contracts/token/ERC20/extensions/ERC20Permit.sol
+++ b/contracts/token/ERC20/extensions/ERC20Permit.sol
@@ -18,6 +18,8 @@ import {Nonces} from "../../../utils/Nonces.sol";
Expand All @@ -178,7 +178,7 @@ index 4378eb7c..1da9e731 100644
abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712, Nonces {
// solhint-disable-next-line var-name-mixedcase
diff --git a/contracts/token/ERC20/extensions/ERC20Wrapper.sol b/contracts/token/ERC20/extensions/ERC20Wrapper.sol
index 389965e9..66436b14 100644
index 2cbff622..97f43d7a 100644
--- a/contracts/token/ERC20/extensions/ERC20Wrapper.sol
+++ b/contracts/token/ERC20/extensions/ERC20Wrapper.sol
@@ -14,6 +14,8 @@ import {SafeERC20} from "../utils/SafeERC20.sol";
Expand Down Expand Up @@ -361,7 +361,7 @@ index d94e956a..86bb5713 100644
}
}
diff --git a/package.json b/package.json
index 37e8f871..d098669f 100644
index 9eae6732..b3a56366 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.