Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions contracts/finance/ERC7821WithExecutor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ abstract contract ERC7821WithExecutor is Initializable, ERC7821 {
}

// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.ERC7821WithExecutor")) - 1)) & ~bytes32(uint256(0xff))
// solhint-disable-next-line const-name-snakecase
bytes32 private constant ERC7821WithExecutorStorageLocation =
bytes32 private constant ERC7821_WITH_EXECUTOR_STORAGE_LOCATION =
0x246106ffca67a7d3806ba14f6748826b9c39c9fa594b14f83fe454e8e9d0dc00;

/// @dev Trusted address that is able to execute arbitrary calls from the vesting wallet via `ERC7821.execute`.
Expand All @@ -40,7 +39,7 @@ abstract contract ERC7821WithExecutor is Initializable, ERC7821 {

function _getERC7821WithExecutorStorage() private pure returns (ERC7821WithExecutorStorage storage $) {
assembly ("memory-safe") {
$.slot := ERC7821WithExecutorStorageLocation
$.slot := ERC7821_WITH_EXECUTOR_STORAGE_LOCATION
}
}
}
5 changes: 2 additions & 3 deletions contracts/finance/VestingWalletCliffConfidential.sol
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ abstract contract VestingWalletCliffConfidential is VestingWalletConfidential {
}

// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.VestingWalletCliffConfidential")) - 1)) & ~bytes32(uint256(0xff))
// solhint-disable-next-line const-name-snakecase
bytes32 private constant VestingWalletCliffStorageLocation =
bytes32 private constant VESTING_WALLET_CLIFF_STORAGE_LOCATION =
0x3c715f77db997bdb68403fafb54820cd57dedce553ed6315028656b0d601c700;

/// @dev The specified cliff duration is larger than the vesting duration.
Expand Down Expand Up @@ -67,7 +66,7 @@ abstract contract VestingWalletCliffConfidential is VestingWalletConfidential {

function _getVestingWalletCliffStorage() private pure returns (VestingWalletCliffStorage storage $) {
assembly ("memory-safe") {
$.slot := VestingWalletCliffStorageLocation
$.slot := VESTING_WALLET_CLIFF_STORAGE_LOCATION
}
}
}
5 changes: 2 additions & 3 deletions contracts/finance/VestingWalletConfidential.sol
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua
}

// keccak256(abi.encode(uint256(keccak256("openzeppelin.storage.VestingWalletConfidential")) - 1)) & ~bytes32(uint256(0xff))
// solhint-disable-next-line const-name-snakecase
bytes32 private constant VestingWalletStorageLocation =
bytes32 private constant VESTING_WALLET_STORAGE_LOCATION =
0x78ce9ee9eb65fa0cf5bf10e861c3a95cb7c3c713c96ab1e5323a21e846796800;

/// @dev Emitted when releasable vested tokens are released.
Expand Down Expand Up @@ -136,7 +135,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua

function _getVestingWalletStorage() private pure returns (VestingWalletStorage storage $) {
assembly ("memory-safe") {
$.slot := VestingWalletStorageLocation
$.slot := VESTING_WALLET_STORAGE_LOCATION
}
}
}