Merge branch 'gov' of https://github.com/open-dollar/od-contracts int…

…o gov
open-dollar · Feb 1, 2024 · ce2ec00 · ce2ec00
2 parents f999724 + e6dbc3d
commit ce2ec00
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.env.example b/.env.example
@@ -1,10 +1,12 @@
 ARB_MAINNET_RPC=
 ARB_MAINNET_PK=0x
 ARB_MAINNET_DEPLOYER_PK=0x
+ARB_MAINNET_DEPLOYER_ADDR=0x
 
 ARB_SEPOLIA_RPC=
 ARB_SEPOLIA_PK=0x
 ARB_SEPOLIA_DEPLOYER_PK=0x
+ARB_SEPOLIA_DEPLOYER_ADDR=0x
 
 ARB_ETHERSCAN_API_KEY=
 

diff --git a/script/postdeployment/SetupOracleRelayer.s.sol b/script/postdeployment/SetupOracleRelayer.s.sol
@@ -19,7 +19,7 @@ import {SepoliaDeployment} from '@script/SepoliaDeployment.s.sol';
  *     vm.startBroadcast(vm.envUint('ARB_MAINNET_DEPLOYER_PK'));
  *     oracleRelayer.modifyParameters('systemCoinOracle', abi.encode(MAINNET_SYSTEM_COIN_ORACLE));
  *     oracleRelayer.addAuthorization(MAINNET_TIMELOCK_CONTROLLER);
- *     oracleRelayer.removeAuthorization(vm.envAddress('ARB_MAINNET_DEPLOYER_PC'));
+ *     oracleRelayer.removeAuthorization(vm.envAddress('ARB_MAINNET_DEPLOYER_ADDR'));
  *     vm.stopBroadcast();
  *   }
  * }
@@ -36,7 +36,7 @@ contract SetupOracleRelayerSepolia is SepoliaDeployment, Script {
     vm.startBroadcast(vm.envUint('ARB_SEPOLIA_DEPLOYER_PK'));
     oracleRelayer.modifyParameters('systemCoinOracle', abi.encode(SEPOLIA_SYSTEM_COIN_ORACLE));
     oracleRelayer.addAuthorization(SEPOLIA_TIMELOCK_CONTROLLER);
-    oracleRelayer.removeAuthorization(vm.envAddress('ARB_SEPOLIA_DEPLOYER_PC'));
+    oracleRelayer.removeAuthorization(vm.envAddress('ARB_SEPOLIA_DEPLOYER_ADDR'));
     vm.stopBroadcast();
   }
 }

diff --git a/script/predeployment/DeployGovernance.s.sol b/script/predeployment/DeployGovernance.s.sol
@@ -19,7 +19,7 @@ contract DeployGovernanceMainnet is Script {
   function run() public {
     vm.startBroadcast(vm.envUint('ARB_MAINNET_DEPLOYER_PK'));
 
-    address deployer = vm.envAddress('ARB_MAINNET_DEPLOYER_PC');
+    address deployer = vm.envAddress('ARB_MAINNET_DEPLOYER_ADDR');
 
     // empty address array for Proposers and Executors (ODGovernor will assume these roles)
     address[] memory members = new address[](0);
@@ -56,7 +56,7 @@ contract DeployGovernanceSepolia is Script {
   function run() public {
     vm.startBroadcast(vm.envUint('ARB_SEPOLIA_DEPLOYER_PK'));
 
-    address deployer = vm.envAddress('ARB_SEPOLIA_DEPLOYER_PC');
+    address deployer = vm.envAddress('ARB_SEPOLIA_DEPLOYER_ADDR');
 
     // empty address array for Proposers and Executors (ODGovernor will assume these roles)
     address[] memory members = new address[](0);