Merge remote-tracking branch 'bgd/feat/deployment-celo' into certora

Certora · Jan 9, 2025 · 508bf50 · 508bf50
2 parents 97d9c49 + 87cd3b0
commit 508bf50
Show file tree

Hide file tree

Showing 25 changed files with 255 additions and 60 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "lib/adi-deploy"]
 	path = lib/adi-deploy
 	url = https://github.com/bgd-labs/adi-deploy
+	branch = feat/deploy-celo
diff --git a/Makefile b/Makefile
@@ -100,7 +100,7 @@ write-json-addresses :; forge script scripts/WriteAddresses.s.sol:WriteDeployedA
 
 
 deploy-initial-test:
-	$(call deploy_fn,InitialDeployments,zksync)
+	$(call deploy_fn,InitialDeployments,celo)
 
 # Deploy Governance contracts
 deploy-governance-test:
@@ -131,7 +131,7 @@ deploy-executor-lvl2-test:
 
 ## Deploy execution chain contracts
 deploy-payloads-controller-chain-test:
-	$(call deploy_fn,Payloads/Deploy_PayloadsController,zksync)
+	$(call deploy_fn,Payloads/Deploy_PayloadsController,celo)
 
 ## Deploy Governance Voting Portal
 deploy-voting-portals-test:
@@ -148,7 +148,7 @@ set-vp-as_ccf-senders-test:
 
 ## Deploy Contract Helpers
 deploy-helper-contracts-test:
-	$(call deploy_fn,Deploy_ContractHelpers,zksync)
+	$(call deploy_fn,Deploy_ContractHelpers,celo)
 
 deploy-full-key-test:
 		make deploy-initial-test

diff --git a/deployments/cc/mainnet/celo.json b/deployments/cc/mainnet/celo.json
@@ -0,0 +1,29 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x3d534E8964e7aAcfc702751cc9A2BB6A9fe7d928",
+  "chainId": 42220,
+  "clEmergencyOracle": "0x91b21900E91CD302EBeD05E45D8f270ddAED944d",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x50F4dAA86F3c747ce15C3C38bD0383200B61d6Dd",
+  "crossChainControllerImpl": "0xB0f963f93bb14C9c7c9061939107989c726E144d",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0xa5cc218513305221201f196760E9e64e9D49d98A",
+  "lineaAdapter": "0x0000000000000000000000000000000000000000",
+  "lzAdapter": "0xAE93BEa44dcbE52B625169588574d31e36fb3A67",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x0000000000000000000000000000000000000000",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdmin": "0x54BDcc37c4143f944A3EE51C892a6cBDF305E7a0",
+  "proxyFactory": "0xAe13e4DA0952f0B8fE04E21df53716fCF799a923",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x3F006299eC88985c18E6e885EeA29A49eC579882",
+  "zkevmAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
+}
diff --git a/deployments/cc/mainnet/eth.json b/deployments/cc/mainnet/eth.json
@@ -1,23 +1,29 @@
 {
-  "arbAdapter": "0xE2a33403eaD139873820da597531f07f65ED0E3c",
-  "baseAdapter": "0xEB442296880a3FC7C00FFe695c40B09d970fb936",
-  "ccipAdapter": "0xDB8953194810b1942544fA528791278D458719D5",
+  "arbAdapter": "0x88d6D01e08d3e64513b15fD46528dBbA7d755883",
+  "baseAdapter": "0xa5948b0ac79f72966dFFC5C13E44f6dfDD3D58A0",
+  "ccipAdapter": "0x58489B249BfBCF5ef4B30bdE2792086e83122B6f",
   "chainId": 1,
   "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
   "create3Factory": "0xcc3C54B95f3f1867A43009B80ed4DD930E3cE2F7",
   "crossChainController": "0xEd42a7D8559a463722Ca4beD50E0Cc05a386b0e1",
-  "crossChainControllerImpl": "0x0Bf5bbfaE7808D329e0Ba8277e0b746BbfDA68f1",
+  "crossChainControllerImpl": "0x28559c2F4B038b1E836fA419DCcDe7454d8Fe215",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
-  "gnosisAdapter": "0xe95B40b2CF5fA2F56AAEf9E52f5Bd1e70C059858",
+  "gnosisAdapter": "0x7238d75fD75bb936E83b75854c653F104Ce9c9d8",
+  "granularCCCGuardian": "0x4457cA11E90f416Cc1D3a8E1cA41C0cdEcC251d4",
   "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
-  "hlAdapter": "0x6Abb61beb5848B476d026C4934E8a6415e2E75a8",
-  "lzAdapter": "0x1783DA119C35ED03e608f88cB9528Aba8174fFfc",
-  "metisAdapter": "0x619643b346E3389062527cdb60C8720415B39860",
+  "hlAdapter": "0x01dcb90Cf13b82Cde4A0BAcC655585a83Af3cCC1",
+  "lineaAdapter": "0x8097555ffDa4176C93FEf92dF473b9763e467686",
+  "lzAdapter": "0x8410d9BD353b420ebA8C48ff1B0518426C280FCC",
+  "metisAdapter": "0x6B3Dc800E7c813Db3fe8D0F30fDCaE636935dC14",
   "mockDestination": "0x19198689FfBE82207F023248dca175a84c52eCE1",
-  "opAdapter": "0x2ecC4F6CDbe6ea77107dd131Af81ec82Db330d6b",
+  "opAdapter": "0x0e24524778fdc67f53eEf144b8cbf50261E930B3",
   "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
-  "polAdapter": "0xb13712De579E1f9943502FFCf72eab6ec348cF79",
+  "polAdapter": "0x1562F1b2487F892BBA8Ef325aF054Fd157510a71",
   "proxyAdmin": "0xD3cF979e676265e4f6379749DECe4708B9A22476",
   "proxyFactory": "0xB4e496f70602fE2AC6Ae511D028BA4D194773B29",
-  "sameChainAdapter": "0x118DFD5418890c0332042ab05173Db4A2C1d283c"
+  "sameChainAdapter": "0x6cfbd2aA4691fc18B9C209bDd43DC3943C228FCf",
+  "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",
+  "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
+  "zkevmAdapter": "0xe0a6Eee6d0c883734A7a7e7B378BD09fffb89EB6",
+  "zksyncAdapter": "0x6aD9d4147467f08b165e1b6364584C5d28898b84"
 }
diff --git a/deployments/cc/mainnet/linea.json b/deployments/cc/mainnet/linea.json
@@ -0,0 +1,29 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x0000000000000000000000000000000000000000",
+  "chainId": 59144,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x0D3f821e9741C8a8Bcac231162320251Db0cdf52",
+  "crossChainControllerImpl": "0xcb5C27e1EF28949b354904ee8D3088330D806a6f",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "granularCCCGuardian": "0x8CAdaAE6cd278c7C8FBaD5d6F55Ca6129A627E10",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0x0000000000000000000000000000000000000000",
+  "lineaAdapter": "0xB3332d31ECFC3ef3BF6Cda79833D11d1A53f5cE6",
+  "lzAdapter": "0x0000000000000000000000000000000000000000",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x0000000000000000000000000000000000000000",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdmin": "0x160E35e28fEE90F3656420584e0a990276219b5A",
+  "proxyFactory": "0xDe090EfCD6ef4b86792e2D84E55a5fa8d49D25D2",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "zkevmAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
+}
diff --git a/deployments/gov/mainnet/celo.json b/deployments/gov/mainnet/celo.json
@@ -0,0 +1,25 @@
+{
+  "aavePool": "0x0000000000000000000000000000000000000000",
+  "chainId": 42220,
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "dataWarehouse": "0x0000000000000000000000000000000000000000",
+  "executorLvl1": "0x1dF462e2712496373A347f8ad10802a5E95f053D",
+  "executorLvl2": "0x0000000000000000000000000000000000000000",
+  "governance": "0x0000000000000000000000000000000000000000",
+  "governanceDataHelper": "0x0000000000000000000000000000000000000000",
+  "governanceImpl": "0x0000000000000000000000000000000000000000",
+  "governancePowerStrategy": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "metaDelegateHelper": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "payloadsController": "0xE48E10834C04E394A04BF22a565D063D40b9FA42",
+  "payloadsControllerDataHelper": "0x8657Cd5a0957e8C5BE15c69C67078b5d730D720a",
+  "payloadsControllerImpl": "0xDA4B6024aA06f7565BBcAaD9B8bE24C3c229AAb5",
+  "votingMachine": "0x0000000000000000000000000000000000000000",
+  "votingMachineDataHelper": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Avax": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_BNB": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Eth": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Pol": "0x0000000000000000000000000000000000000000",
+  "votingStrategy": "0x0000000000000000000000000000000000000000"
+}
diff --git a/deployments/gov/mainnet/linea.json b/deployments/gov/mainnet/linea.json
@@ -0,0 +1,25 @@
+{
+  "aavePool": "0x0000000000000000000000000000000000000000",
+  "chainId": 59144,
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "dataWarehouse": "0x0000000000000000000000000000000000000000",
+  "executorLvl1": "0x8c2d95FE7aeB57b86961F3abB296A54f0ADb7F88",
+  "executorLvl2": "0x0000000000000000000000000000000000000000",
+  "governance": "0x0000000000000000000000000000000000000000",
+  "governanceDataHelper": "0x0000000000000000000000000000000000000000",
+  "governanceImpl": "0x0000000000000000000000000000000000000000",
+  "governancePowerStrategy": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "metaDelegateHelper": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "payloadsController": "0x3BcE23a1363728091bc57A58a226CF2940C2e074",
+  "payloadsControllerDataHelper": "0x6d4F341d8Bb3Dc5ABe822Aa940F1884508C13f99",
+  "payloadsControllerImpl": "0xA806DA549FcB2B4912a7dFFE4c1aA7A1ed0Bd5C9",
+  "votingMachine": "0x0000000000000000000000000000000000000000",
+  "votingMachineDataHelper": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Avax": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_BNB": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Eth": "0x0000000000000000000000000000000000000000",
+  "votingPortal_Eth_Pol": "0x0000000000000000000000000000000000000000",
+  "votingStrategy": "0x0000000000000000000000000000000000000000"
+}
diff --git a/foundry.toml b/foundry.toml
@@ -9,6 +9,9 @@ solc='0.8.20'
 
 fs_permissions = [{ access = "read-write", path = "./"}]
 
+evm_version = "paris"
+
+
 # Whether or not to enable `vm.ffi`
 ffi = true
 
@@ -46,6 +49,10 @@ scroll="${RPC_SCROLL}"
 scroll-testnet="${RPC_SCROLL_TESTNET}"
 zksync="${RPC_ZK_SYNC}"
 zksync-testnet="${RPC_ZK_SYNC_TESTNET}"
+linea="${RPC_LINEA}"
+linea-testnet="${RPC_LINEA_SEPOLIA}"
+celo="${RPC_CELO}"
+celo-testnet="${RPC_CELO_ALFAJORES}"
 
 [etherscan]
 ethereum={key="${ETHERSCAN_API_KEY_MAINNET}", chain=1 }
@@ -72,6 +79,10 @@ scroll={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534352, utl='https://api.scroll
 scroll-testnet={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534351, url='https://api-sepolia.scrollscan.com/api/'}
 zksync={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=324}
 zksync-testnet={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=300, url='https://api-sepolia-era.zksync.network/api'}
+linea={key="${ETHERSCAN_API_KEY_LINEA}", chain=59144 }
+linea-testnet={key="${ETHERSCAN_API_KEY_LINEA}",chain=59141}
+celo={key="${ETHERSCAN_API_KEY_CELO}", chain=42220, utl='https://api.celoscan.io/api'}
+celo-testnet={key="${ETHERSCAN_API_KEY_CELO}", chain=44787, url='https://api-alfajores.celoscan.io/api'}
 
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config

diff --git a/lib/adi-deploy b/lib/adi-deploy
diff --git a/scripts/Deploy_ContractHelpers.s.sol b/scripts/Deploy_ContractHelpers.s.sol
@@ -102,6 +102,18 @@ contract Zksync is BaseContractHelpers {
   }
 }
 
+contract Linea is BaseContractHelpers {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.LINEA;
+  }
+}
+
+contract Celo is BaseContractHelpers {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.CELO;
+  }
+}
+
 contract Ethereum_testnet is BaseContractHelpers {
   function TRANSACTION_NETWORK() public pure override returns (uint256) {
     return TestNetChainIds.ETHEREUM_SEPOLIA;

diff --git a/scripts/GovBaseScript.sol b/scripts/GovBaseScript.sol
@@ -69,6 +69,10 @@ library GovDeployerHelpers {
       return './deployments/gov/mainnet/zkevm.json';
     } else if (chainId == ChainIds.ZKSYNC) {
       return './deployments/gov/mainnet/zksync.json';
+    } else if (chainId == ChainIds.LINEA) {
+      return './deployments/gov/mainnet/linea.json';
+    } else if (chainId == ChainIds.CELO) {
+      return './deployments/gov/mainnet/celo.json';
     }
     if (chainId == TestNetChainIds.ETHEREUM_SEPOLIA) {
       return './deployments/gov/testnet/sep.json';

diff --git a/scripts/Governance/Deploy_Governance.s.sol b/scripts/Governance/Deploy_Governance.s.sol
@@ -6,7 +6,9 @@ import {Governance} from '../../src/contracts/Governance.sol';
 import {IGovernance, IGovernanceCore} from '../../src/interfaces/IGovernance.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
 import {PayloadsControllerUtils} from '../../src/contracts/payloads/PayloadsControllerUtils.sol';
-import {AaveV3Ethereum, AaveV3Sepolia} from 'aave-address-book/AaveAddressBook.sol';
+import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
+import {AaveV3Sepolia} from 'aave-address-book/AaveV3Sepolia.sol';
+import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
 
 import {GovernanceExtended} from '../extendedContracts/Governance.sol';
 
@@ -62,7 +64,7 @@ abstract contract BaseDeployGovernance is GovBaseScript {
     addresses.governance = TransparentProxyFactory(ccAddresses.proxyFactory)
       .createDeterministic(
         address(governanceImpl),
-        ccAddresses.proxyAdmin,
+        ProxyAdmin(ccAddresses.proxyAdmin),
         abi.encodeWithSelector(
           IGovernance.initialize.selector,
           addresses.owner,

diff --git a/scripts/InitialDeployments.s.sol b/scripts/InitialDeployments.s.sol
@@ -145,6 +145,18 @@ contract Zksync is BaseInitialDeployment {
   }
 }
 
+contract Linea is BaseInitialDeployment {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.LINEA;
+  }
+}
+
+contract Celo is BaseInitialDeployment {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.CELO;
+  }
+}
+
 contract Ethereum_testnet is BaseInitialDeployment {
   function TRANSACTION_NETWORK() public pure override returns (uint256) {
     return TestNetChainIds.ETHEREUM_SEPOLIA;

diff --git a/scripts/Payloads/Deploy_ExecutorLvl1.s.sol b/scripts/Payloads/Deploy_ExecutorLvl1.s.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import '../GovBaseScript.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Executor} from '../../src/contracts/payloads/Executor.sol';
-import {AaveGovernanceV2} from 'aave-address-book/AaveAddressBook.sol';
+import {AaveGovernanceV2} from 'aave-address-book/AaveGovernanceV2.sol';
 
 abstract contract BaseDeployExecutorLvl1 is GovBaseScript {
   function getExecutorOwner() public view virtual returns (address) {
@@ -62,7 +62,7 @@ contract Metis is BaseDeployExecutorLvl1 {
   }
 
   function getExecutorOwner() public pure override returns (address) {
-    return AaveGovernanceV2.METIS_BRIDGE_EXECUTOR;
+    return AaveGovernanceV2.SHORT_EXECUTOR;
   }
 }
 
@@ -72,7 +72,7 @@ contract Base is BaseDeployExecutorLvl1 {
   }
 
   function getExecutorOwner() public pure override returns (address) {
-    return AaveGovernanceV2.BASE_BRIDGE_EXECUTOR;
+    return AaveGovernanceV2.SHORT_EXECUTOR;
   }
 }
 

diff --git a/scripts/Payloads/Deploy_ExecutorLvl2.s.sol b/scripts/Payloads/Deploy_ExecutorLvl2.s.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import '../GovBaseScript.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Executor} from '../../src/contracts/payloads/Executor.sol';
-import {AaveGovernanceV2} from 'aave-address-book/AaveAddressBook.sol';
+import {AaveGovernanceV2} from 'aave-address-book/AaveGovernanceV2.sol';
 
 abstract contract BaseDeployExecutorLvl2 is GovBaseScript {
   function getExecutorOwner() public view virtual returns (address) {

diff --git a/scripts/Payloads/Deploy_PayloadsController.s.sol b/scripts/Payloads/Deploy_PayloadsController.s.sol
@@ -9,6 +9,7 @@ import {TransparentUpgradeableProxy} from 'solidity-utils/contracts/transparent-
 import {PayloadsControllerUtils} from '../../src/contracts/payloads/PayloadsControllerUtils.sol';
 import {PayloadsControllerExtended} from '../extendedContracts/PayloadsController.sol';
 import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
+import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
 
 abstract contract BaseDeployPayloadsController is GovBaseScript {
   function GOVERNANCE_NETWORK() public view virtual returns (uint256);
@@ -105,7 +106,7 @@ abstract contract BaseDeployPayloadsController is GovBaseScript {
       ccAddresses.proxyFactory
     ).createDeterministic(
         addresses.payloadsControllerImpl,
-        ccAddresses.proxyAdmin,
+        ProxyAdmin(ccAddresses.proxyAdmin),
         abi.encodeWithSelector(
           IPayloadsControllerCore.initialize.selector,
           OWNER(),
@@ -115,12 +116,12 @@ abstract contract BaseDeployPayloadsController is GovBaseScript {
         Constants.PAYLOADS_CONTROLLER_SALT
       );
 
-    if (addresses.chainId != ChainIds.ETHEREUM) {
-      for (uint256 i = 0; i < executors.length; i++) {
-        Ownable(address(executors[i].executorConfig.executor))
-          .transferOwnership(addresses.payloadsController);
-      }
-    }
+    //    if (addresses.chainId != ChainIds.ETHEREUM) {
+    //      for (uint256 i = 0; i < executors.length; i++) {
+    //        Ownable(address(executors[i].executorConfig.executor))
+    //          .transferOwnership(addresses.payloadsController);
+    //      }
+    //    }
   }
 }
 
@@ -257,6 +258,26 @@ contract Zksync is BaseDeployPayloadsController {
   }
 }
 
+contract Linea is BaseDeployPayloadsController {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.LINEA;
+  }
+
+  function GOVERNANCE_NETWORK() public pure override returns (uint256) {
+    return ChainIds.ETHEREUM;
+  }
+}
+
+contract Celo is BaseDeployPayloadsController {
+  function TRANSACTION_NETWORK() public pure override returns (uint256) {
+    return ChainIds.CELO;
+  }
+
+  function GOVERNANCE_NETWORK() public pure override returns (uint256) {
+    return ChainIds.ETHEREUM;
+  }
+}
+
 contract Ethereum_testnet is BaseDeployPayloadsController {
   function TRANSACTION_NETWORK() public pure override returns (uint256) {
     return TestNetChainIds.ETHEREUM_SEPOLIA;
+1 −0		.env.example
+1 −0		.gitmodules
+23 −11		Makefile
+2 −1		deployments/arbitrum.json
+2 −1		deployments/avalanche.json
+1 −0		deployments/avalanche_fuji.json
+2 −1		deployments/base.json
+2 −1		deployments/binance.json
+1 −0		deployments/binance_testnet.json
+8 −7		deployments/celo.json
+1 −0		deployments/celo_alfajores.json
+2 −1		deployments/ethereum.json
+3 −2		deployments/ethereum_sepolia.json
+2 −1		deployments/gnosis.json
+29 −0		deployments/linea.json
+29 −0		deployments/linea_sepolia.json
+2 −1		deployments/metis.json
+2 −1		deployments/metis_test.json
+2 −1		deployments/optimism.json
+2 −1		deployments/polygon.json
+1 −0		deployments/pre_prod_arbitrum.json
+1 −0		deployments/pre_prod_avalanche.json
+1 −0		deployments/pre_prod_base.json
+1 −0		deployments/pre_prod_binance.json
+1 −0		deployments/pre_prod_celo.json
+1 −0		deployments/pre_prod_ethereum.json
+1 −0		deployments/pre_prod_gnosis.json
+29 −0		deployments/pre_prod_linea.json
+1 −0		deployments/pre_prod_metis.json
+1 −0		deployments/pre_prod_optimism.json
+1 −0		deployments/pre_prod_polygon.json
+1 −0		deployments/pre_prod_scroll.json
+2 −1		deployments/pre_prod_zksync.json
+2 −1		deployments/scroll.json
+1 −0		deployments/scroll_sepolia.json
+1 −0		deployments/zkevm.json
+2 −1		deployments/zksync.json
+2 −1		deployments/zksync_sepolia.json
+14 −0		diffs/adi_add_linea_path_to_adiethereum_before_adi_add_linea_path_to_adiethereum_after.md
+14 −3		foundry.toml
+1 −1		lib/aave-delivery-infrastructure
+1 −1		lib/aave-helpers
+2 −2		remappings.txt
+3 −0		scripts/BaseDeployerScript.sol
+35 −1		scripts/InitialDeployments.s.sol
+18 −0		scripts/access_control/network_scripts/GranularGuardianNetworkDeploys.s.sol
+23 −0		scripts/adapters/DeployCCIPAdapter.s.sol
+83 −0		scripts/adapters/DeployLineaAdapter.s.sol
+16 −3		scripts/ccc/DeployCCC.s.sol
+20 −3		scripts/ccc/Set_CCF_Sender_Adapters.s.sol
+39 −0		scripts/ccc/Set_CCR_Confirmations.s.sol
+46 −3		scripts/ccc/Set_CCR_Receivers_Adapters.s.sol
+12 −0		scripts/helpers/Deploy_Mock_destination.s.sol
+13 −13		scripts/helpers/RemoveBridgeAdapters.s.sol
+2 −2		scripts/helpers/Send_Direct_CCMessage.s.sol
+2 −2		scripts/helpers/UpdateCCCImpl_Payload.s.sol
+1 −1		scripts/helpers/Update_Ownership.s.sol
+34 −0		scripts/payloads/adapters/ethereum/Ethereum_Activate_Lina_Bridge_Adapter_Payload.s.sol
+18 −0		scripts/payloads/adapters/ethereum/Network_Deployments.s.sol
+2 −2		src/templates/BaseCCCUpdate.sol
+44 −31		tests/access_control/GranularGuardianDeployTest.t.sol
+6 −2		tests/adi/ADITestBase.sol
+92 −0		tests/payloads/ethereum/AddLineaPathTest.t.sol