governance input removed from deploy script

term-finance · Nov 18, 2024 · f5bea30 · f5bea30
1 parent ca32eaf
commit f5bea30
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/deploy-sepolia-strategy.yaml b/.github/workflows/deploy-sepolia-strategy.yaml
@@ -46,6 +46,7 @@ jobs:
         env:
           RPC_URL:  ${{ secrets.RPC_URL }}
           PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          GOVERNOR_DEPLOYER_KEY: ${{ secrets.GOVERNANCE_DEPLOYER_KEY }}
           ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
           ASSET_ADDRESS: ${{ github.event.inputs.asset }}
           YEARN_VAULT_ADDRESS: ${{ vars.YEARN_VAULT_ADDRESS }}

diff --git a/script/DeployGovernance.s.sol b/script/DeployGovernance.s.sol
@@ -1,4 +1,5 @@
 import "forge-std/Script.sol";
+import "../src/Strategy.sol";
 
 interface TermVaultGovernanceFactory {
     function deploySafe(
@@ -25,6 +26,9 @@ contract DeployGovernance is Script {
         address governor = vm.envAddress("GOVERNOR");
         uint256 saltNonce = block.number;
 
+        Strategy strategy = Strategy(strategy);
+        strategy.setPendingGovernor(governor);
+
         factory.deploySafe(proposer, strategy, governor, saltNonce);
 
         vm.stopBroadcast();

diff --git a/script/Strategy.s.sol b/script/Strategy.s.sol
@@ -128,6 +128,7 @@ contract DeployStrategy is Script {
 
     function run() external {
         uint256 deployerPK = vm.envUint("PRIVATE_KEY");
+        uint256 governorDeployerPK = vm.envUint("GOVERNOR_DEPLOYER_KEY");
 
         // Set up the RPC URL (optional if you're using the default foundry config)
         string memory rpcUrl = vm.envString("RPC_URL");
@@ -143,7 +144,7 @@ contract DeployStrategy is Script {
 
         TermVaultEventEmitter eventEmitter = _deployEventEmitter();
 
-        address deployer = vm.addr(deployerPK);
+        address deployer = vm.addr(governorDeployerPK);
 
         Strategy.StrategyParams memory params = buildStrategyParams(address(eventEmitter), deployer);
 
@@ -159,8 +160,6 @@ contract DeployStrategy is Script {
         console.log("set pending management");
         console.log(strategyManagement);
 
-        strategy.setPendingGovernor(governorRoleAddress);
-
         if (isTest) {
             eventEmitter.pairVaultContract(address(strategy));
             console.log("paired strategy contract with event emitter");