Skip to content
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

fix(EVM): Add explicit visibility modifiers for constants in EvmPredeploysManager #1258

Merged
merged 1 commit into from
Feb 12, 2025
Merged

fix(EVM): Add explicit visibility modifiers for constants in EvmPredeploysManager #1258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 19 additions & 15 deletions system-contracts/contracts/EvmPredeploysManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,34 +14,38 @@ import {EfficientCall} from "./libraries/EfficientCall.sol";
*/
contract EvmPredeploysManager {
// https://github.com/Arachnid/deterministic-deployment-proxy
address constant CREATE2_PROXY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
bytes32 constant CREATE2_PROXY_INPUT_HASH = 0x50ea9137a35a9ad33b0ed4a431e9b6996ea9ed1f14781126cec78f168c0e64e5;
bytes32 constant CREATE2_PROXY_BYTECODE_HASH = 0x020000453cf89ad86bc13761a15f8f205faa1dbb41ccd3553352fa3c5dd3a9a0;
address private constant CREATE2_PROXY = 0x4e59b44847b379578588920cA78FbF26c0B4956C;
bytes32 private constant CREATE2_PROXY_INPUT_HASH =
0x50ea9137a35a9ad33b0ed4a431e9b6996ea9ed1f14781126cec78f168c0e64e5;
bytes32 private constant CREATE2_PROXY_BYTECODE_HASH =
0x020000453cf89ad86bc13761a15f8f205faa1dbb41ccd3553352fa3c5dd3a9a0;

// https://github.com/pcaversaccio/create2deployer
address constant CREATE2_DEPLOYER = 0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2;
bytes32 constant CREATE2_DEPLOYER_INPUT_HASH = 0xc9cdbda80cd4ba1961148079822602f7bd7619c26f78fec2fd1fc0beaf39d7d0;
bytes32 constant CREATE2_DEPLOYER_BYTECODE_HASH =
address private constant CREATE2_DEPLOYER = 0x13b0D85CcB8bf860b6b79AF3029fCA081AE9beF2;
bytes32 private constant CREATE2_DEPLOYER_INPUT_HASH =
0xc9cdbda80cd4ba1961148079822602f7bd7619c26f78fec2fd1fc0beaf39d7d0;
bytes32 private constant CREATE2_DEPLOYER_BYTECODE_HASH =
0x02000aab5ea35752b7904cb5c3d2a2608f283b04c4da41202326c0f712c85568;

// https://eips.ethereum.org/EIPS/eip-2470
address constant ERC2470_SINGLETON_FACTORY = 0xce0042B868300000d44A59004Da54A005ffdcf9f;
bytes32 constant ERC2470_SINGLETON_FACTORY_INPUT_HASH =
address private constant ERC2470_SINGLETON_FACTORY = 0xce0042B868300000d44A59004Da54A005ffdcf9f;
bytes32 private constant ERC2470_SINGLETON_FACTORY_INPUT_HASH =
0x122b6b28aeddfd05fa3ce4348e93d357b3ce50d9ab7dda4e8ee524a5b9a6ab3b;
bytes32 constant ERC2470_SINGLETON_FACTORY_BYTECODE_HASH =
bytes32 private constant ERC2470_SINGLETON_FACTORY_BYTECODE_HASH =
0x0200013423ebb21b5377c3afaef4cbb0117243b48d1b32a751500760027b87a4;

// https://github.com/safe-global/safe-singleton-factory/blob/main/source/deterministic-deployment-proxy.yul
address constant SAFE_SINGLETON_FACTORY = 0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7;
bytes32 constant SAFE_SINGLETON_FACTORY_INPUT_HASH =
address private constant SAFE_SINGLETON_FACTORY = 0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7;
bytes32 private constant SAFE_SINGLETON_FACTORY_INPUT_HASH =
0x50ea9137a35a9ad33b0ed4a431e9b6996ea9ed1f14781126cec78f168c0e64e5;
bytes32 constant SAFE_SINGLETON_FACTORY_BYTECODE_HASH =
bytes32 private constant SAFE_SINGLETON_FACTORY_BYTECODE_HASH =
0x020000453cf89ad86bc13761a15f8f205faa1dbb41ccd3553352fa3c5dd3a9a0;

// https://github.com/mds1/multicall/tree/main
address constant MULTICALL3 = 0xcA11bde05977b3631167028862bE2a173976CA11;
bytes32 constant MULTICALL3_INPUT_HASH = 0x0b2046aa018109118d518235014ac2c679dcbdff32c64705fdf50d048cd32d22;
bytes32 constant MULTICALL3_BYTECODE_HASH = 0x02000ee02baee85cacb504f6ee1df7aad6809ac8d94a4a111d76991f90d36d6e;
address private constant MULTICALL3 = 0xcA11bde05977b3631167028862bE2a173976CA11;
bytes32 private constant MULTICALL3_INPUT_HASH = 0x0b2046aa018109118d518235014ac2c679dcbdff32c64705fdf50d048cd32d22;
bytes32 private constant MULTICALL3_BYTECODE_HASH =
0x02000ee02baee85cacb504f6ee1df7aad6809ac8d94a4a111d76991f90d36d6e;

/// @notice The method used to deploy pre-defined contract at specified address
/// @dev Can only use the date of the corresponding presigned deployment transaction as constructorInput
Expand Down
Loading