From e73300005454ae86d5dea93ef18339d9fd6d6c1e Mon Sep 17 00:00:00 2001 From: Ashutosh Ukey Date: Wed, 15 Jan 2025 17:05:13 +0000 Subject: [PATCH] Successfully verified contracts for SingleOwnerMSCAFactory --- foundry.toml | 2 +- script/000_ContractAddress.sol | 5 +++-- script/003_DeploySingleOwnerMSCAFactory.s.sol | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/foundry.toml b/foundry.toml index c496664..fc02ef6 100644 --- a/foundry.toml +++ b/foundry.toml @@ -7,7 +7,7 @@ libs = ['lib', 'node_modules'] solc_version = "0.8.24" evm_version = 'paris' test = 'test' -via_ir = true +via_ir = false auto_detect_solc = false auto_detect_remappings = false deny_warnings = true diff --git a/script/000_ContractAddress.sol b/script/000_ContractAddress.sol index 0a26536..eea4a89 100644 --- a/script/000_ContractAddress.sol +++ b/script/000_ContractAddress.sol @@ -21,8 +21,9 @@ pragma solidity 0.8.24; address constant ENTRY_POINT = 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789; // Use address(0) if unknown or deploying a new version of a contract. -address constant PLUGIN_MANAGER_ADDRESS = 0x3169Ad878021B87C9CaA9b5CDA740ff3ca270Ce9; -address constant SINGLE_OWNER_MSCA_FACTORY_ADDRESS = 0xa233b124D7b9CFF2D38cB62319e1A3f79144B490; +address constant PLUGIN_MANAGER_ADDRESS = 0xc93D6559Fe4dB59742751A857d11a04861a50CCC; +// address constant SINGLE_OWNER_MSCA_FACTORY_ADDRESS = 0xf572431ecB11D1602C3d2a92CC8B504388E094F4; +address constant SINGLE_OWNER_MSCA_FACTORY_ADDRESS = address(0); address constant UPGRADABLE_MSCA_FACTORY_ADDRESS = 0x3e6b66A72B76850c372FBDf29f53268ad636B320; address constant SINGLE_OWNER_PLUGIN_ADDRESS = 0x7af5E9DBe3e50F023a5b99f44002697cF8e1de2e; address constant COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS = 0x3c95978Af08B6B2Fd82659B393be86AfB4bd3D6F; diff --git a/script/003_DeploySingleOwnerMSCAFactory.s.sol b/script/003_DeploySingleOwnerMSCAFactory.s.sol index c5e2b49..1233e60 100644 --- a/script/003_DeploySingleOwnerMSCAFactory.s.sol +++ b/script/003_DeploySingleOwnerMSCAFactory.s.sol @@ -27,12 +27,14 @@ contract DeploySingleOwnerMSCAFactoryScript is Script { address payable internal constant EXPECTED_FACTORY_ADDRESS = payable(SINGLE_OWNER_MSCA_FACTORY_ADDRESS); function run() public { + uint256 saltInt = 1; + bytes32 salt = bytes32(saltInt); address entryPoint = ENTRY_POINT; uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY"); vm.startBroadcast(key); SingleOwnerMSCAFactory factory; if (EXPECTED_FACTORY_ADDRESS.code.length == 0) { - factory = new SingleOwnerMSCAFactory{salt: 0}(entryPoint, PLUGIN_MANAGER); + factory = new SingleOwnerMSCAFactory{salt: salt}(entryPoint, PLUGIN_MANAGER); console.log("New single owner MSCA factory address: %s", address(factory)); } else { factory = SingleOwnerMSCAFactory(EXPECTED_FACTORY_ADDRESS);