Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
da00d28c
Unverified
Commit
da00d28c
authored
Dec 23, 2020
by
Mikhail Melnik
Committed by
GitHub
Dec 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename "amount" to "value" in permit (#2445)
parent
c23d5e01
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ERC20Permit.sol
contracts/drafts/ERC20Permit.sol
+3
-3
IERC20Permit.sol
contracts/drafts/IERC20Permit.sol
+2
-2
No files found.
contracts/drafts/ERC20Permit.sol
View file @
da00d28c
...
@@ -35,7 +35,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
...
@@ -35,7 +35,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
/**
/**
* @dev See {IERC20Permit-permit}.
* @dev See {IERC20Permit-permit}.
*/
*/
function permit(address owner, address spender, uint256
amount
, uint256 deadline, uint8 v, bytes32 r, bytes32 s) public virtual override {
function permit(address owner, address spender, uint256
value
, uint256 deadline, uint8 v, bytes32 r, bytes32 s) public virtual override {
// solhint-disable-next-line not-rely-on-time
// solhint-disable-next-line not-rely-on-time
require(block.timestamp <= deadline, "ERC20Permit: expired deadline");
require(block.timestamp <= deadline, "ERC20Permit: expired deadline");
...
@@ -44,7 +44,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
...
@@ -44,7 +44,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
_PERMIT_TYPEHASH,
_PERMIT_TYPEHASH,
owner,
owner,
spender,
spender,
amount
,
value
,
_nonces[owner].current(),
_nonces[owner].current(),
deadline
deadline
)
)
...
@@ -56,7 +56,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
...
@@ -56,7 +56,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712 {
require(signer == owner, "ERC20Permit: invalid signature");
require(signer == owner, "ERC20Permit: invalid signature");
_nonces[owner].increment();
_nonces[owner].increment();
_approve(owner, spender,
amount
);
_approve(owner, spender,
value
);
}
}
/**
/**
...
...
contracts/drafts/IERC20Permit.sol
View file @
da00d28c
...
@@ -12,7 +12,7 @@ pragma solidity >=0.6.0 <0.8.0;
...
@@ -12,7 +12,7 @@ pragma solidity >=0.6.0 <0.8.0;
*/
*/
interface IERC20Permit {
interface IERC20Permit {
/**
/**
* @dev Sets `
amount
` as the allowance of `spender` over `owner`'s tokens,
* @dev Sets `
value
` as the allowance of `spender` over `owner`'s tokens,
* given `owner`'s signed approval.
* given `owner`'s signed approval.
*
*
* IMPORTANT: The same issues {IERC20-approve} has related to transaction
* IMPORTANT: The same issues {IERC20-approve} has related to transaction
...
@@ -32,7 +32,7 @@ interface IERC20Permit {
...
@@ -32,7 +32,7 @@ interface IERC20Permit {
* https://eips.ethereum.org/EIPS/eip-2612#specification[relevant EIP
* https://eips.ethereum.org/EIPS/eip-2612#specification[relevant EIP
* section].
* section].
*/
*/
function permit(address owner, address spender, uint256
amount
, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external;
function permit(address owner, address spender, uint256
value
, uint256 deadline, uint8 v, bytes32 r, bytes32 s) external;
/**
/**
* @dev Returns the current nonce for `owner`. This value must be
* @dev Returns the current nonce for `owner`. This value must be
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment