From f98d4c3df2cc629c9d143c360dcb3b808f245dec Mon Sep 17 00:00:00 2001 From: Arr00 <13561405+arr00@users.noreply.github.com> Date: Mon, 10 Nov 2025 15:46:33 -0300 Subject: [PATCH 1/2] N-08: constant names are screaming camel case --- contracts/finance/ERC7821WithExecutor.sol | 4 ++-- contracts/finance/VestingWalletCliffConfidential.sol | 4 ++-- contracts/finance/VestingWalletConfidential.sol | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/finance/ERC7821WithExecutor.sol b/contracts/finance/ERC7821WithExecutor.sol index 1c27b1ef..85007740 100644 --- a/contracts/finance/ERC7821WithExecutor.sol +++ b/contracts/finance/ERC7821WithExecutor.sol @@ -16,7 +16,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`. @@ -40,7 +40,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 } } } diff --git a/contracts/finance/VestingWalletCliffConfidential.sol b/contracts/finance/VestingWalletCliffConfidential.sol index 79eaae4b..a58c0902 100644 --- a/contracts/finance/VestingWalletCliffConfidential.sol +++ b/contracts/finance/VestingWalletCliffConfidential.sol @@ -17,7 +17,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. @@ -67,7 +67,7 @@ abstract contract VestingWalletCliffConfidential is VestingWalletConfidential { function _getVestingWalletCliffStorage() private pure returns (VestingWalletCliffStorage storage $) { assembly ("memory-safe") { - $.slot := VestingWalletCliffStorageLocation + $.slot := VESTING_WALLET_CLIFF_STORAGE_LOCATION } } } diff --git a/contracts/finance/VestingWalletConfidential.sol b/contracts/finance/VestingWalletConfidential.sol index 2d0aa37d..f3fef8bc 100644 --- a/contracts/finance/VestingWalletConfidential.sol +++ b/contracts/finance/VestingWalletConfidential.sol @@ -35,7 +35,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. @@ -136,7 +136,7 @@ abstract contract VestingWalletConfidential is OwnableUpgradeable, ReentrancyGua function _getVestingWalletStorage() private pure returns (VestingWalletStorage storage $) { assembly ("memory-safe") { - $.slot := VestingWalletStorageLocation + $.slot := VESTING_WALLET_STORAGE_LOCATION } } } From 06fa610d660f768883b789f48e5734d7f5600aef Mon Sep 17 00:00:00 2001 From: Arr00 <13561405+arr00@users.noreply.github.com> Date: Mon, 10 Nov 2025 23:06:57 -0300 Subject: [PATCH 2/2] fix lint --- contracts/finance/ERC7821WithExecutor.sol | 1 - contracts/finance/VestingWalletCliffConfidential.sol | 1 - contracts/finance/VestingWalletConfidential.sol | 1 - 3 files changed, 3 deletions(-) diff --git a/contracts/finance/ERC7821WithExecutor.sol b/contracts/finance/ERC7821WithExecutor.sol index 85007740..f6433f65 100644 --- a/contracts/finance/ERC7821WithExecutor.sol +++ b/contracts/finance/ERC7821WithExecutor.sol @@ -15,7 +15,6 @@ 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 ERC7821_WITH_EXECUTOR_STORAGE_LOCATION = 0x246106ffca67a7d3806ba14f6748826b9c39c9fa594b14f83fe454e8e9d0dc00; diff --git a/contracts/finance/VestingWalletCliffConfidential.sol b/contracts/finance/VestingWalletCliffConfidential.sol index a58c0902..1a850aa4 100644 --- a/contracts/finance/VestingWalletCliffConfidential.sol +++ b/contracts/finance/VestingWalletCliffConfidential.sol @@ -16,7 +16,6 @@ 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 VESTING_WALLET_CLIFF_STORAGE_LOCATION = 0x3c715f77db997bdb68403fafb54820cd57dedce553ed6315028656b0d601c700; diff --git a/contracts/finance/VestingWalletConfidential.sol b/contracts/finance/VestingWalletConfidential.sol index f3fef8bc..43348cac 100644 --- a/contracts/finance/VestingWalletConfidential.sol +++ b/contracts/finance/VestingWalletConfidential.sol @@ -34,7 +34,6 @@ 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 VESTING_WALLET_STORAGE_LOCATION = 0x78ce9ee9eb65fa0cf5bf10e861c3a95cb7c3c713c96ab1e5323a21e846796800;