diff --git a/bin/cgp.sh b/bin/cgp.sh index 31a99a3..408084b 100755 --- a/bin/cgp.sh +++ b/bin/cgp.sh @@ -53,8 +53,8 @@ else fi if [ "$SIMULATE" = true ] ; then - echo "🥸 Simulating $CONTRACT" yarn build -u $UPGRADE + echo "🥸 Simulating $CONTRACT" forge script $(forge_skip $UPGRADE) --rpc-url $RPC_URL --skip .dev.sol --sig "run(string)" $UTILS_DIR/SimulateUpgrade.sol:SimulateUpgrade $CONTRACT else echo "🔥 Submitting $CONTRACT" diff --git a/script/upgrades/MU08/MU08.sol b/script/upgrades/MU08/MU08.sol index 7a3cda7..df31f55 100644 --- a/script/upgrades/MU08/MU08.sol +++ b/script/upgrades/MU08/MU08.sol @@ -67,11 +67,12 @@ contract MU08 is IMentoUpgrade, GovernanceScript { * @dev Loads the deployed contracts from previous deployments */ function loadDeployedContracts() public { - contracts.load("MU01-00-Create-Proxies", "latest"); - contracts.load("MU01-01-Create-Nonupgradeable-Contracts", "latest"); - contracts.load("MU03-01-Create-Nonupgradeable-Contracts", "latest"); - contracts.load("eXOF-00-Create-Proxies", "latest"); - contracts.load("cKES-00-Create-Proxies", "latest"); + contracts.loadSilent("MU01-00-Create-Proxies", "latest"); + contracts.loadSilent("MU01-01-Create-Nonupgradeable-Contracts", "latest"); + contracts.loadSilent("MU03-01-Create-Nonupgradeable-Contracts", "latest"); + contracts.loadSilent("eXOF-00-Create-Proxies", "latest"); + contracts.loadSilent("cKES-00-Create-Proxies", "latest"); + contracts.loadSilent("MUGOV-00-Create-Factory", "latest"); } /** @@ -103,7 +104,7 @@ contract MU08 is IMentoUpgrade, GovernanceScript { grandaMentoProxy = contracts.dependency("GrandaMento"); // MentoGovernance contracts: - governanceFactory = contracts.dependency("GovernanceFactory"); + governanceFactory = contracts.deployed("GovernanceFactory"); timelockProxy = IGovernanceFactory(governanceFactory).governanceTimelock(); } diff --git a/script/upgrades/MU08/MU08Checks.sol b/script/upgrades/MU08/MU08Checks.sol index 7d24123..f012db2 100644 --- a/script/upgrades/MU08/MU08Checks.sol +++ b/script/upgrades/MU08/MU08Checks.sol @@ -58,6 +58,7 @@ contract MU08Checks is GovernanceScript, Test { contracts.loadSilent("MU03-01-Create-Nonupgradeable-Contracts", "latest"); contracts.loadSilent("eXOF-00-Create-Proxies", "latest"); contracts.loadSilent("cKES-00-Create-Proxies", "latest"); + contracts.loadSilent("MUGOV-00-Create-Factory", "latest"); // Celo Governance: celoGovernance = contracts.celoRegistry("Governance"); @@ -84,7 +85,7 @@ contract MU08Checks is GovernanceScript, Test { grandaMentoProxy = contracts.dependency("GrandaMento"); // MentoGovernance contracts: - governanceFactory = contracts.dependency("GovernanceFactory"); + governanceFactory = contracts.deployed("GovernanceFactory"); timelockProxy = IGovernanceFactory(governanceFactory).governanceTimelock(); } @@ -159,7 +160,7 @@ contract MU08Checks is GovernanceScript, Test { // so we are not able to transfer them. Since they are deprecated anyways we are fine with this. if (implementationOwner != timelockProxy && !isMentoV1Contract(proxy)) { console.log("🟡 Warning Implementation:[%s] ownership not transferred to Mento Governance 🟡 ", implementation); - } else { + } else if (implementationOwner == timelockProxy) { console.log("🟢 Implementation:[%s] ownership transferred to Mento Governance", implementation); } } diff --git a/script/upgrades/dependencies.json b/script/upgrades/dependencies.json index 7e6404c..39bea66 100644 --- a/script/upgrades/dependencies.json +++ b/script/upgrades/dependencies.json @@ -18,8 +18,7 @@ "MentoLiquiditySupport": "0xA74Ac93de1A209957E62391B01E09161277a9ffC", "WatchdogMultisig": "0xE6951C4176aaB41097C6f5fE11e9c515B7108acd", "FractalSigner": "0xacD08d6714ADba531beFF582e6FD5DA1AFD6bc65", - "MentoFoundationMultisig": "0x3468D23A0B1aB3Ab9A537813166A8f7ff1947014", - "GovernanceFactory": "0xee6CE2dbe788dFC38b8F583Da86cB9caf2C8cF5A" + "MentoFoundationMultisig": "0x3468D23A0B1aB3Ab9A537813166A8f7ff1947014" }, "62320": { "BridgedUSDC": "0xD4079B322c392D6b196f90AA4c439fC2C16d6770", @@ -40,8 +39,7 @@ "WatchdogMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81", "MentoFoundationMultisig": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81", "MentoLiquiditySupport": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81", - "FractalSigner": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81", - "GovernanceFactory": "0xe23A28a92B95c743fC0F09c16a6b2E6D59F234Fa" + "FractalSigner": "0x56fD3F2bEE130e9867942D0F463a16fBE49B8d81" }, "44787": { "BridgedUSDC": "0x87D61dA3d668797786D73BC674F053f87111570d", @@ -62,7 +60,6 @@ "WatchdogMultisig": "0x823655c966be3b6344Efd4D2A0FE8d0a1e3D691B", "MentoFoundationMultisig": "0x707D2B6Bd0acf76821AD5A09A1C6F43d6d6f692c", "MentoLiquiditySupport": "0x6bD481a12cb2790E7EE805b9E6e7E91917DeEe6a", - "FractalSigner": "0x2fCAb633adFA6aF8266025D63228047033c3ceD0", - "GovernanceFactory": "0x96Fe03DBFEc1EB419885a01d2335bE7c1a45e33b" + "FractalSigner": "0x2fCAb633adFA6aF8266025D63228047033c3ceD0" } }