NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split StorageSlot into TransientSlot (#5239)

Browse Source 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>
This commit is contained in:
Ernesto García
2024-10-08 13:39:53 -06:00
committed by Hadrien Croubois
parent f8432e82d6
commit 1bcd1c65db
15 changed files with 434 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contracts/token/ERC20/extensions/draft-ERC20TemporaryApproval.sol
View File

@ -7,7 +7,7 @@ import {IERC20, ERC20} from "../ERC20.sol";
import {IERC7674} from "../../../interfaces/draft-IERC7674.sol";
import {Math} from "../../../utils/math/Math.sol";
import {SlotDerivation} from "../../../utils/SlotDerivation.sol";
import {StorageSlot} from "../../../utils/StorageSlot.sol";
import {TransientSlot} from "../../../utils/TransientSlot.sol";
/**
* @dev Extension of {ERC20} that adds support for temporary allowances following ERC-7674.
@ -18,8 +18,8 @@ import {StorageSlot} from "../../../utils/StorageSlot.sol";
*/
abstract contract ERC20TemporaryApproval is ERC20, IERC7674 {
using SlotDerivation for bytes32;
using StorageSlot for bytes32;
using StorageSlot for StorageSlot.Uint256SlotType;
using TransientSlot for bytes32;
using TransientSlot for TransientSlot.Uint256Slot;
// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.ERC20_TEMPORARY_APPROVAL_STORAGE")) - 1)) & ~bytes32(uint256(0xff))
bytes32 private constant ERC20_TEMPORARY_APPROVAL_STORAGE =
@ -113,10 +113,7 @@ abstract contract ERC20TemporaryApproval is ERC20, IERC7674 {
}
}
function _temporaryAllowanceSlot(
address owner,
address spender
) private pure returns (StorageSlot.Uint256SlotType) {
function _temporaryAllowanceSlot(address owner, address spender) private pure returns (TransientSlot.Uint256Slot) {
return ERC20_TEMPORARY_APPROVAL_STORAGE.deriveMapping(owner).deriveMapping(spender).asUint256();
}
}