Merge pull request #28 from bgd-labs/feat/script-to-change-owner-guardians

sendra · web-flow · commit 884db49c6105 · 2024-08-08T11:42:49.000+02:00
feat: add script to change owner and guardian on adi / gov contracts
diff --git a/.gitmodules b/.gitmodules
@@ -4,4 +4,3 @@
 [submodule "lib/aave-helpers"]
 	path = lib/aave-helpers
 	url = https://github.com/bgd-labs/aave-helpers
-	branch = fix/e2e-fix-forwarder-diff-zksync
diff --git a/Makefile b/Makefile
@@ -270,3 +270,6 @@ deploy-ccc-shuffle-payload:
 
 deploy-zksync-path-payload:
 	$(call deploy_fn,payloads/adapters/zksync/Network_Deployments,ethereum)
+
+update-owners-and-guardians:
+	$(call deploy_fn,helpers/Update_Ownership,zksync)
diff --git a/foundry.toml b/foundry.toml
@@ -11,7 +11,7 @@ metadata="none"
 solc = "0.8.19"
 ffi = true
 
-[profile.default.zksync]
+[profile.zksync.zksync]
 fallback_oz = true
 mode = "3"
 zksolc="1.4.1"
diff --git a/lib/aave-delivery-infrastructure b/lib/aave-delivery-infrastructure
@@ -1 +1 @@
-Subproject commit cb7fc0c4132ae7b76b18e8622ac3cf1ac5d56e18
+Subproject commit bcc0e8737756f4b9fddbd685659e7f75a39b6383
diff --git a/lib/aave-helpers b/lib/aave-helpers
@@ -1 +1 @@
-Subproject commit da9ab68b5730d0475192c3f3956884ab7e5d66a3
+Subproject commit 11b5c7bf7c43cdf2dc8eb9d9bbf66f600e9feaa7
diff --git a/remappings.txt b/remappings.txt
@@ -1,4 +1,4 @@
-solidity-utils/=lib/aave-delivery-infrastructure/lib/solidity-utils/src/
+solidity-utils/=lib/aave-helpers/lib/solidity-utils/src/
 forge-std/=lib/aave-helpers/lib/forge-std/src/
 openzeppelin-contracts/=lib/aave-delivery-infrastructure/lib/openzeppelin-contracts/
 aave-helpers/=lib/aave-helpers/src/
diff --git a/scripts/InitialDeployments.s.sol b/scripts/InitialDeployments.s.sol
@@ -272,7 +272,7 @@ contract Zksync is BaseInitialDeployment {
   //  }
 
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 }
 
diff --git a/scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol b/scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol
@@ -217,6 +217,6 @@ contract Zksync is DeployGranularGuardian {
   }
 
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 }
diff --git a/scripts/adapters/DeployZkSyncAdapter.s.sol b/scripts/adapters/DeployZkSyncAdapter.s.sol
@@ -6,7 +6,7 @@ import '../BaseDeployerScript.sol';
 
 abstract contract DeployZkSyncAdapter is BaseDeployerScript, BaseZkSyncAdapter {
   function _execute(Addresses memory addresses) internal virtual override {
-    if (TRANSACTION_NETWORK() == ChainIds.ZK_SYNC) {
+    if (TRANSACTION_NETWORK() == ChainIds.ZKSYNC) {
       addresses.zksyncAdapter = _deployWithoutCreate2(
         BaseAdapterArgs({
           crossChainController: addresses.crossChainController,
@@ -31,7 +31,7 @@ contract Ethereum is DeployZkSyncAdapter {
   }
 
   function REFUND_ADDRESS() internal view override returns (address) {
-    Addresses memory remoteAddresses = _getAddresses(ChainIds.ZK_SYNC);
+    Addresses memory remoteAddresses = _getAddresses(ChainIds.ZKSYNC);
     return remoteAddresses.crossChainController;
   }
 
@@ -46,7 +46,7 @@ contract Ethereum is DeployZkSyncAdapter {
 
 contract Zksync is DeployZkSyncAdapter {
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 
   function REMOTE_CCC_BY_NETWORK() internal view override returns (RemoteCCC[] memory) {
@@ -68,7 +68,7 @@ contract Ethereum_testnet is DeployZkSyncAdapter {
   }
 
   function REFUND_ADDRESS() internal view override returns (address) {
-    Addresses memory remoteAddresses = _getAddresses(TestNetChainIds.ZK_SYNC_SEPOLIA);
+    Addresses memory remoteAddresses = _getAddresses(TestNetChainIds.ZKSYNC_SEPOLIA);
     return remoteAddresses.crossChainController;
   }
 
@@ -87,7 +87,7 @@ contract Ethereum_testnet is DeployZkSyncAdapter {
 
 contract Zksync_testnet is DeployZkSyncAdapter {
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
-    return TestNetChainIds.ZK_SYNC_SEPOLIA;
+    return TestNetChainIds.ZKSYNC_SEPOLIA;
   }
 
   function REMOTE_CCC_BY_NETWORK() internal view override returns (RemoteCCC[] memory) {
diff --git a/scripts/ccc/DeployCCC.s.sol b/scripts/ccc/DeployCCC.s.sol
@@ -146,7 +146,7 @@ contract Celo is BaseCCCNetworkDeployment {
 
 contract Zksync is BaseCCCNetworkDeployment {
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 }
 
diff --git a/scripts/ccc/Set_CCF_Sender_Adapters.s.sol b/scripts/ccc/Set_CCF_Sender_Adapters.s.sol
@@ -56,7 +56,7 @@ contract Ethereum is BaseCCFSenderAdapters {
       zkevm: _getAddresses(ChainIds.POLYGON_ZK_EVM),
       scroll: _getAddresses(ChainIds.SCROLL),
       celo: _getAddresses(ChainIds.CELO),
-      zksync: _getAddresses(ChainIds.ZK_SYNC)
+      zksync: _getAddresses(ChainIds.ZKSYNC)
     });
 
     // polygon path
diff --git a/scripts/ccc/Set_CCR_Confirmations.s.sol b/scripts/ccc/Set_CCR_Confirmations.s.sol
@@ -250,7 +250,7 @@ contract Celo is BaseSetCCRConfirmations {
 
 contract Zksync is BaseSetCCRConfirmations {
   function TRANSACTION_NETWORK() internal pure virtual override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 
   function getConfirmationsByChainIds()
diff --git a/scripts/ccc/Set_CCR_Receivers_Adapters.s.sol b/scripts/ccc/Set_CCR_Receivers_Adapters.s.sol
@@ -315,7 +315,7 @@ contract Celo is BaseSetCCRAdapters {
 
 contract Zksync is BaseSetCCRAdapters {
   function TRANSACTION_NETWORK() internal pure virtual override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 
   function getChainIds() public pure virtual override returns (uint256[] memory) {
diff --git a/scripts/helpers/Deploy_Mock_destination.s.sol b/scripts/helpers/Deploy_Mock_destination.s.sol
@@ -84,7 +84,7 @@ contract Scroll is BaseMockDestination {
 
 contract Zksync is BaseMockDestination {
   function TRANSACTION_NETWORK() internal pure virtual override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 }
 
diff --git a/scripts/helpers/Update_Ownership.s.sol b/scripts/helpers/Update_Ownership.s.sol
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+// This Scripts change the ownership of the V3 contracts from Deployer to the correct addresses. For most of the cases
+// ownership will be changed to executor lvl1, and guardian to the aave safes.
+
+import {ZkSyncScript} from 'solidity-utils/contracts/utils/ScriptUtils.sol';
+import {OwnableWithGuardian} from 'solidity-utils/contracts/access-control/OwnableWithGuardian.sol';
+import {GovernanceV3ZkSync} from 'aave-address-book/AaveAddressBook.sol';
+
+contract ZkSync is ZkSyncScript {
+  function run() external {
+    vm.startBroadcast();
+    OwnableWithGuardian(address(GovernanceV3ZkSync.PAYLOADS_CONTROLLER)).transferOwnership(
+      GovernanceV3ZkSync.EXECUTOR_LVL_1
+    );
+    OwnableWithGuardian(address(GovernanceV3ZkSync.PAYLOADS_CONTROLLER)).updateGuardian(
+      GovernanceV3ZkSync.GOVERNANCE_GUARDIAN
+    );
+
+    OwnableWithGuardian(GovernanceV3ZkSync.CROSS_CHAIN_CONTROLLER).updateGuardian(
+      GovernanceV3ZkSync.GRANULAR_GUARDIAN
+    );
+
+    OwnableWithGuardian(GovernanceV3ZkSync.CROSS_CHAIN_CONTROLLER).transferOwnership(
+      GovernanceV3ZkSync.EXECUTOR_LVL_1
+    );
+
+    vm.stopBroadcast();
+  }
+}
diff --git a/scripts/payloads/adapters/zksync/Network_Deployments.s.sol b/scripts/payloads/adapters/zksync/Network_Deployments.s.sol
@@ -13,6 +13,6 @@ contract Ethereum is Base_Deploy_Add_ZkSync_Path_Payload {
   }
 
   function DESTINATION_CHAIN_ID() internal pure override returns (uint256) {
-    return ChainIds.ZK_SYNC;
+    return ChainIds.ZKSYNC;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-solidity-utils/=lib/aave-delivery-infrastructure/lib/solidity-utils/src/`
	`1`	`+solidity-utils/=lib/aave-helpers/lib/solidity-utils/src/`
`2`	`2`	`forge-std/=lib/aave-helpers/lib/forge-std/src/`
`3`	`3`	`openzeppelin-contracts/=lib/aave-delivery-infrastructure/lib/openzeppelin-contracts/`
`4`	`4`	`aave-helpers/=lib/aave-helpers/src/`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ contract Zksync is BaseInitialDeployment {`
`272`	`272`	`// }`
`273`	`273`
`274`	`274`	`function TRANSACTION_NETWORK() internal pure override returns (uint256) {`
`275`		`- return ChainIds.ZK_SYNC;`
	`275`	`+ return ChainIds.ZKSYNC;`
`276`	`276`	`}`
`277`	`277`	`}`
`278`	`278`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,6 @@ contract Zksync is DeployGranularGuardian {`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`function TRANSACTION_NETWORK() internal pure override returns (uint256) {`
`220`		`- return ChainIds.ZK_SYNC;`
	`220`	`+ return ChainIds.ZKSYNC;`
`221`	`221`	`}`
`222`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import '../BaseDeployerScript.sol';`
`6`	`6`
`7`	`7`	`abstract contract DeployZkSyncAdapter is BaseDeployerScript, BaseZkSyncAdapter {`
`8`	`8`	`function _execute(Addresses memory addresses) internal virtual override {`
`9`		`- if (TRANSACTION_NETWORK() == ChainIds.ZK_SYNC) {`
	`9`	`+ if (TRANSACTION_NETWORK() == ChainIds.ZKSYNC) {`
`10`	`10`	`addresses.zksyncAdapter = _deployWithoutCreate2(`
`11`	`11`	`BaseAdapterArgs({`
`12`	`12`	`crossChainController: addresses.crossChainController,`
`@@ -31,7 +31,7 @@ contract Ethereum is DeployZkSyncAdapter {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`function REFUND_ADDRESS() internal view override returns (address) {`
`34`		`- Addresses memory remoteAddresses = _getAddresses(ChainIds.ZK_SYNC);`
	`34`	`+ Addresses memory remoteAddresses = _getAddresses(ChainIds.ZKSYNC);`
`35`	`35`	`return remoteAddresses.crossChainController;`
`36`	`36`	`}`
`37`	`37`
`@@ -46,7 +46,7 @@ contract Ethereum is DeployZkSyncAdapter {`
`46`	`46`
`47`	`47`	`contract Zksync is DeployZkSyncAdapter {`
`48`	`48`	`function TRANSACTION_NETWORK() internal pure override returns (uint256) {`
`49`		`- return ChainIds.ZK_SYNC;`
	`49`	`+ return ChainIds.ZKSYNC;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`function REMOTE_CCC_BY_NETWORK() internal view override returns (RemoteCCC[] memory) {`
`@@ -68,7 +68,7 @@ contract Ethereum_testnet is DeployZkSyncAdapter {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`function REFUND_ADDRESS() internal view override returns (address) {`
`71`		`- Addresses memory remoteAddresses = _getAddresses(TestNetChainIds.ZK_SYNC_SEPOLIA);`
	`71`	`+ Addresses memory remoteAddresses = _getAddresses(TestNetChainIds.ZKSYNC_SEPOLIA);`
`72`	`72`	`return remoteAddresses.crossChainController;`
`73`	`73`	`}`
`74`	`74`
`@@ -87,7 +87,7 @@ contract Ethereum_testnet is DeployZkSyncAdapter {`
`87`	`87`
`88`	`88`	`contract Zksync_testnet is DeployZkSyncAdapter {`
`89`	`89`	`function TRANSACTION_NETWORK() internal pure override returns (uint256) {`
`90`		`- return TestNetChainIds.ZK_SYNC_SEPOLIA;`
	`90`	`+ return TestNetChainIds.ZKSYNC_SEPOLIA;`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`function REMOTE_CCC_BY_NETWORK() internal view override returns (RemoteCCC[] memory) {`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ contract Celo is BaseCCCNetworkDeployment {`
`146`	`146`
`147`	`147`	`contract Zksync is BaseCCCNetworkDeployment {`
`148`	`148`	`function TRANSACTION_NETWORK() internal pure override returns (uint256) {`
`149`		`- return ChainIds.ZK_SYNC;`
	`149`	`+ return ChainIds.ZKSYNC;`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`