Merge branch 'sami/optimism-migration' into debug_scenarios

RobinNagpal · Oct 22, 2024 · b6e22bc · b6e22bc
2 parents 27e81ae + 786ff73
commit b6e22bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts b/deployments/optimism/usdc/migrations/1729593027_gov_marketupdates.ts
@@ -22,7 +22,7 @@ const newConfiguratorImplementationAddress = '0x371DB45c7ee248dAFf4Dc1FFB67A20fa
 const newCometProxyAdminAddress = '0x24D86Da09C4Dd64e50dB7501b0f695d030f397aF';
 const marketAdminPermissionCheckerAddress = '0x62DD0452411113404cf9a7fE88A5E6E86f9B71a6';
 
-const communityMultiSigAddress = '0x0747a435b8a60070A7a111D015046d765098e4cc';
+const communityMultiSigAddress = '0x3fFd6c073a4ba24a113B18C8F373569640916A45';
 
 const cometProxyAdminOldAddress = '0x3C30B5a5A04656565686f800481580Ac4E7ed178';
 const configuratorProxyAddress = '0x84E93EC6170ED630f5ebD89A1AAE72d4F63f2713';

diff --git a/forge/script/marketupdates/ComputeContractsAddresses.s.sol b/forge/script/marketupdates/ComputeContractsAddresses.s.sol
@@ -30,7 +30,7 @@ contract ComputeContractAddresses is Script {
         ChainAddresses.Chain chain = ChainAddresses.getChainBasedOnChainId(passedChainId);
         ChainAddresses.ChainAddressesStruct memory chainAddresses = ChainAddresses.getChainAddresses(chain);
 
-        console.log("Deploying contracts with sender: ", msg.sender);
+        console.log("computing addresses for contracts with sender: ", msg.sender);
 
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
 

diff --git a/forge/script/marketupdates/helpers/MarketUpdateContractsDeployer.sol b/forge/script/marketupdates/helpers/MarketUpdateContractsDeployer.sol
@@ -151,7 +151,7 @@ library MarketUpdateContractsDeployer {
         address marketAdminPauseGuardianAddress,
         address marketUpdateProposalGuardianAddress,
         address localTimelockAddress
-    ) internal returns (DeployedContracts memory) {
+    ) internal view returns (DeployedContracts memory) {
 
         ICreate2Deployer create2Deployer = ICreate2Deployer(create2DeployerAddress);
         ContractDeploymentParams memory marketUpdateTimelockParams = getMarketUpdateTimelockParams(msgSender);