Skip to content

Commit 8d75ec8

Browse files
ashutosh-ukeyashutosh-ukey
committed
chore: refactor contract addr constants
1 parent 43e8a5e commit 8d75ec8

12 files changed

+66
-33
lines changed

‎.env.example‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
########### General settings with defaults ###########
2-
ENTRY_POINT=0x0000000071727De22E5E9d8BAf0edAc6f37da032
32
VERIFYING_SIGNER=0xf...6
43
PAYMASTER_OWNER=0x7...C
54
RPC_URL=http://127.0.0.1:8545
@@ -15,12 +14,3 @@ DEPLOYER_ADDRESS=0xB...E
1514
INFURA_API_KEY=
1615
ALCHEMY_API_KEY=
1716
ETHERSCAN_API_KEY=
18-
19-
########### Contract addresses ###########
20-
# Set to "0x0000000000000000000000000000000000000000" if unknown or deploying new version
21-
PLUGIN_MANAGER_ADDRESS=0x0000000000000000000000000000000000000000
22-
UPGRADABLE_MSCA_FACTORY_ADDRESS=0x0000000000000000000000000000000000000000
23-
SINGLE_OWNER_PLUGIN_ADDRESS=0x0000000000000000000000000000000000000000
24-
COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS=0x0000000000000000000000000000000000000000
25-
WEIGHTED_MULTISIG_PLUGIN_ADDRESS=0x0000000000000000000000000000000000000000
26-
DEFAULT_TOKEN_CALLBACK_PLUGIN_ADDRESS=0x0000000000000000000000000000000000000000

‎script/000_ContractAddress.sol‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
pragma solidity 0.8.24;
2+
3+
address constant ENTRY_POINT = 0x0000000071727De22E5E9d8BAf0edAc6f37da032;
4+
5+
// Use address(0) if unknown or deploying a new version of a contract.
6+
address constant PLUGIN_MANAGER_ADDRESS = 0xBc17c439278c4E64C333beE4A890DE6d1f862dDb;
7+
address constant UPGRADABLE_MSCA_FACTORY_ADDRESS = 0x3e6b66A72B76850c372FBDf29f53268ad636B320;
8+
address constant SINGLE_OWNER_PLUGIN_ADDRESS = 0x7af5E9DBe3e50F023a5b99f44002697cF8e1de2e;
9+
address constant COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS = 0x3c95978Af08B6B2Fd82659B393be86AfB4bd3D6F;
10+
address constant WEIGHTED_MULTISIG_PLUGIN_ADDRESS = 0x558498E7CD325b17be8c8A79884A1cAcfD72a4AA;
11+
address constant DEFAULT_TOKEN_CALLBACK_PLUGIN_ADDRESS = 0x03431Fb00fB2e26b5bC502DFeF8dA30E1C8643b8;
12+
13+
address constant PAYMASTER_ADDRESS = 0x36058Cc257967db1912FC276F9CBEC072CD572cb;
14+
address constant PAYMASTER_PROXY_ADDRESS = 0x03dF76C8c30A88f424CF3CBBC36A1Ca02763103b;

‎script/001_DeployPluginManager.s.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
pragma solidity 0.8.24;
2020

2121
import {PluginManager} from "../src/msca/6900/v0.7/managers/PluginManager.sol";
22+
23+
import {PLUGIN_MANAGER_ADDRESS} from "./000_ContractAddress.sol";
2224
import {Script, console} from "forge-std/src/Script.sol";
2325

2426
contract DeployPluginManagerScript is Script {
25-
address EXPECTED_PLUGIN_MANAGER = vm.envAddress("PLUGIN_MANAGER_ADDRESS");
27+
address EXPECTED_PLUGIN_MANAGER = PLUGIN_MANAGER_ADDRESS;
2628

2729
function run() public {
2830
uint256 deployerKey = vm.envUint("DEPLOYER_PRIVATE_KEY");

‎script/002_DeployUpgradableMSCAFactory.s.sol‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
pragma solidity 0.8.24;
2020

2121
import {UpgradableMSCAFactory} from "../src/msca/6900/v0.7/factories/UpgradableMSCAFactory.sol";
22+
23+
import {ENTRY_POINT, PLUGIN_MANAGER_ADDRESS, UPGRADABLE_MSCA_FACTORY_ADDRESS} from "./000_ContractAddress.sol";
2224
import {Script, console} from "forge-std/src/Script.sol";
2325

2426
contract DeployUpgradableMSCAFactoryScript is Script {
25-
address PLUGIN_MANAGER = vm.envAddress("PLUGIN_MANAGER_ADDRESS");
2627
address OWNER = vm.envAddress("MSCA_FACTORY_OWNER_ADDRESS");
27-
address payable EXPECTED_FACTORY_ADDRESS = payable(vm.envAddress("UPGRADABLE_MSCA_FACTORY_ADDRESS"));
28+
address PLUGIN_MANAGER = PLUGIN_MANAGER_ADDRESS;
29+
address payable EXPECTED_FACTORY_ADDRESS = payable(UPGRADABLE_MSCA_FACTORY_ADDRESS);
2830

2931
function run() public {
30-
address entryPoint = vm.envAddress("ENTRY_POINT");
32+
address entryPoint = ENTRY_POINT;
3133
uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");
3234

3335
vm.startBroadcast(key);

‎script/004_DeploySingleOwnerPlugin.s.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
pragma solidity 0.8.24;
2020

2121
import "../src/msca/6900/v0.7/plugins/v1_0_0/acl/SingleOwnerPlugin.sol";
22+
23+
import {SINGLE_OWNER_PLUGIN_ADDRESS} from "./000_ContractAddress.sol";
2224
import "forge-std/src/Script.sol";
2325

2426
contract DeploySingleOwnerPluginScript is Script {
25-
address payable EXPECTED_PLUGIN_ADDRESS = payable(vm.envAddress("SINGLE_OWNER_PLUGIN_ADDRESS"));
27+
address payable EXPECTED_PLUGIN_ADDRESS = payable(SINGLE_OWNER_PLUGIN_ADDRESS);
2628

2729
function run() public {
2830
uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");

‎script/007_DeployColdStorageAddressBookPlugin.s.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ pragma solidity 0.8.24;
2020

2121
import {ColdStorageAddressBookPlugin} from
2222
"../src/msca/6900/v0.7/plugins/v1_0_0/addressbook/ColdStorageAddressBookPlugin.sol";
23+
24+
import {COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS} from "./000_ContractAddress.sol";
2325
import {Script} from "forge-std/src/Script.sol";
2426
import {console} from "forge-std/src/console.sol";
2527

2628
contract DeployColdStorageAddressBookPluginScript is Script {
27-
address payable EXPECTED_PLUGIN_ADDRESS = payable(vm.envAddress("COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS"));
29+
address payable EXPECTED_PLUGIN_ADDRESS = payable(COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS);
2830

2931
function run() public {
3032
uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");

‎script/008_DeployWeightedWebauthnMultisigPlugin.s.sol‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ pragma solidity 0.8.24;
2020

2121
import {WeightedWebauthnMultisigPlugin} from
2222
"../src/msca/6900/v0.7/plugins/v1_0_0/multisig/WeightedWebauthnMultisigPlugin.sol";
23+
24+
import {ENTRY_POINT, WEIGHTED_MULTISIG_PLUGIN_ADDRESS} from "./000_ContractAddress.sol";
2325
import {Script} from "forge-std/src/Script.sol";
2426
import {console} from "forge-std/src/console.sol";
2527

2628
contract DeployWeightedWebauthnMultisigPlugin is Script {
27-
address payable EXPECTED_PLUGIN_ADDRESS = payable(vm.envAddress("WEIGHTED_MULTISIG_PLUGIN_ADDRESS"));
29+
address payable EXPECTED_PLUGIN_ADDRESS = payable(WEIGHTED_MULTISIG_PLUGIN_ADDRESS);
2830

2931
function run() public {
30-
address entryPoint = vm.envAddress("ENTRY_POINT");
32+
address entryPoint = ENTRY_POINT;
3133
uint256 key = vm.envUint("DEPLOYER_PRIVATE_KEY");
3234

3335
vm.startBroadcast(key);

‎script/009_SetUpgradableMSCAFactoryPlugins.s.sol‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@
1919
pragma solidity 0.8.24;
2020

2121
import {UpgradableMSCAFactory} from "../src/msca/6900/v0.7/factories/UpgradableMSCAFactory.sol";
22+
23+
import {
24+
COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS,
25+
SINGLE_OWNER_PLUGIN_ADDRESS,
26+
UPGRADABLE_MSCA_FACTORY_ADDRESS,
27+
WEIGHTED_MULTISIG_PLUGIN_ADDRESS
28+
} from "./000_ContractAddress.sol";
2229
import {Script, console} from "forge-std/src/Script.sol";
2330

2431
// Skip this step if deploying MSCA 0.7 contracts (instead use 011.1_SetUpgradableMSCAFactoryPlugins.s.sol later)
2532
contract SetUpgradableMSCAFactoryPlugins is Script {
26-
address payable EXPECTED_FACTORY_ADDRESS = payable(vm.envAddress("UPGRADABLE_MSCA_FACTORY_ADDRESS"));
33+
address payable EXPECTED_FACTORY_ADDRESS = payable(UPGRADABLE_MSCA_FACTORY_ADDRESS);
2734

2835
function run() public {
2936
uint256 key = vm.envUint("MSCA_FACTORY_OWNER_PRIVATE_KEY");
@@ -33,9 +40,9 @@ contract SetUpgradableMSCAFactoryPlugins is Script {
3340
address[] memory plugins = new address[](numPlugins);
3441
bool[] memory pluginPermissions = new bool[](numPlugins);
3542

36-
plugins[0] = vm.envAddress("SINGLE_OWNER_PLUGIN_ADDRESS");
37-
plugins[1] = vm.envAddress("COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS");
38-
plugins[2] = vm.envAddress("WEIGHTED_MULTISIG_PLUGIN_ADDRESS");
43+
plugins[0] = SINGLE_OWNER_PLUGIN_ADDRESS;
44+
plugins[1] = COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS;
45+
plugins[2] = WEIGHTED_MULTISIG_PLUGIN_ADDRESS;
3946

4047
for (uint256 i = 0; i < numPlugins; i++) {
4148
pluginPermissions[i] = true;

‎script/010_StakeUpgradableMSCAFactory.s.sol‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
pragma solidity 0.8.24;
2020

2121
import {UpgradableMSCAFactory} from "../src/msca/6900/v0.7/factories/UpgradableMSCAFactory.sol";
22+
23+
import {UPGRADABLE_MSCA_FACTORY_ADDRESS} from "./000_ContractAddress.sol";
2224
import {Script, console} from "forge-std/src/Script.sol";
2325

2426
contract StakeUpgradableMSCAFactory is Script {
25-
address payable EXPECTED_FACTORY_ADDRESS = payable(vm.envAddress("UPGRADABLE_MSCA_FACTORY_ADDRESS"));
27+
address payable EXPECTED_FACTORY_ADDRESS = payable(UPGRADABLE_MSCA_FACTORY_ADDRESS);
2628

2729
function run() public {
2830
uint256 key = vm.envUint("MSCA_FACTORY_OWNER_PRIVATE_KEY");

‎script/011.1_SetUpgradableMSCAFactoryPlugins.s.sol‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,21 @@
1919
pragma solidity 0.8.24;
2020

2121
import {UpgradableMSCAFactory} from "../src/msca/6900/v0.7/factories/UpgradableMSCAFactory.sol";
22+
23+
import {
24+
COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS,
25+
DEFAULT_TOKEN_CALLBACK_PLUGIN_ADDRESS,
26+
SINGLE_OWNER_PLUGIN_ADDRESS,
27+
UPGRADABLE_MSCA_FACTORY_ADDRESS,
28+
WEIGHTED_MULTISIG_PLUGIN_ADDRESS
29+
} from "./000_ContractAddress.sol";
2230
import {Script, console} from "forge-std/src/Script.sol";
2331

2432
// Only needed for MSCA v0.7 factories. This script is the same as 009_SetUpgradableMSCAFactoryPlugins.s.sol, but with
2533
// the
2634
// default token callback plugin included).
2735
contract SetUpgradableMSCAFactoryPlugins is Script {
28-
address payable EXPECTED_FACTORY_ADDRESS = payable(vm.envAddress("UPGRADABLE_MSCA_FACTORY_ADDRESS"));
36+
address payable EXPECTED_FACTORY_ADDRESS = payable(UPGRADABLE_MSCA_FACTORY_ADDRESS);
2937

3038
function run() public {
3139
uint256 key = vm.envUint("MSCA_FACTORY_OWNER_PRIVATE_KEY");
@@ -35,10 +43,10 @@ contract SetUpgradableMSCAFactoryPlugins is Script {
3543
address[] memory plugins = new address[](numPlugins);
3644
bool[] memory pluginPermissions = new bool[](numPlugins);
3745

38-
plugins[0] = vm.envAddress("SINGLE_OWNER_PLUGIN_ADDRESS");
39-
plugins[1] = vm.envAddress("COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS");
40-
plugins[2] = vm.envAddress("WEIGHTED_MULTISIG_PLUGIN_ADDRESS");
41-
plugins[3] = vm.envAddress("DEFAULT_TOKEN_CALLBACK_PLUGIN_ADDRESS");
46+
plugins[0] = SINGLE_OWNER_PLUGIN_ADDRESS;
47+
plugins[1] = COLD_STORAGE_ADDRESS_BOOK_PLUGIN_ADDRESS;
48+
plugins[2] = WEIGHTED_MULTISIG_PLUGIN_ADDRESS;
49+
plugins[3] = DEFAULT_TOKEN_CALLBACK_PLUGIN_ADDRESS;
4250

4351
for (uint256 i = 0; i < numPlugins; i++) {
4452
pluginPermissions[i] = true;

0 commit comments

Comments
 (0)