fix: minor improvements

Author: sandstone-ag

lib/dg-installation.ts

@@ -3,7 +3,7 @@ import fs from "node:fs/promises";
 import { runCommand } from "./subprocess";
 
 const DG_REPOSITORY_URL = "https://github.com/lidofinance/dual-governance.git";
-const DG_REPOSITORY_BRANCH = "feature/scratch-deploy-support2"; // TODO: use release branch
+const DG_REPOSITORY_BRANCH = "feature/scratch-deploy-support"; // TODO: use release branch
 const DG_INSTALL_DIR = `${process.cwd()}/dg`;
 
 async function main() {

scripts/dao-local-deploy.sh

@@ -26,6 +26,6 @@ export INTEGRATION_WITH_CSM="off"
 yarn test:integration:fork:local
 
 # If Dual Governance was deployed
-if grep "dg:dualGovernance" $NETWORK_STATE_FILE -q; then
+if grep "dg:escrow_master_copy" $NETWORK_STATE_FILE -q; then
   yarn dg:regression-tests
 fi

scripts/dao-local-upgrade.sh

@@ -24,6 +24,6 @@ yarn hardhat --network $NETWORK run --no-compile scripts/utils/mine.ts
 yarn test:integration:fork:local
 
 # If Dual Governance was deployed
-if grep "dg:dualGovernance" $NETWORK_STATE_FILE -q; then
+if grep "dg:escrow_master_copy" $NETWORK_STATE_FILE -q; then
   yarn dg:regression-tests
 fi

scripts/utils/upgrade.ts

@@ -57,7 +57,7 @@ export async function mockDGAragonVoting(
   const voting = await loadContract<Voting>("Voting", votingAddress);
   const timelock = await loadContract<IEmergencyProtectedTimelock>(
     "IEmergencyProtectedTimelock",
-    state[Sk.dgEmergencyProtectedTimelock].proxy.address, // TODO: del!
+    state[Sk.dgEmergencyProtectedTimelock].address,
   );
   const afterSubmitDelay = await timelock.getAfterSubmitDelay();
   const afterScheduleDelay = await timelock.getAfterScheduleDelay();