feat: Add base ccc update payload.

src/adi/BaseADIPayloadUpdate.sol

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.8.0;
+
+import {IProposalGenericExecutor} from '../interfaces/IProposalGenericExecutor.sol';
+
+abstract contract BaseADIPayloadUpdate is IProposalGenericExecutor {
+  address public immutable CROSS_CHAIN_CONTROLLER;
+
+  /**
+   * @param crossChainController address of the CCC of the network where payload will be deployed
+   */
+  constructor(address crossChainController) {
+    CROSS_CHAIN_CONTROLLER = crossChainController;
+  }
+}

src/adi/BaseAdaptersUpdate.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IProposalGenericExecutor} from '../interfaces/IProposalGenericExecutor.sol';
 import './BaseReceiverAdaptersUpdate.sol';
 import './BaseForwarderAdaptersUpdate.sol';
+import './BaseADIPayloadUpdate.sol';
 
 /**
  * @title Base payload aDI and bridge adapters update
@@ -12,18 +12,14 @@ import './BaseForwarderAdaptersUpdate.sol';
 abstract contract BaseAdaptersUpdate is
   BaseReceiverAdaptersUpdate,
   BaseForwarderAdaptersUpdate,
-  IProposalGenericExecutor
+  BaseADIPayloadUpdate
 {
-  address public immutable CROSS_CHAIN_CONTROLLER;
-
   /**
    * @param crossChainController address of the CCC of the network where payload will be deployed
    */
-  constructor(address crossChainController) {
-    CROSS_CHAIN_CONTROLLER = crossChainController;
-  }
+  constructor(address crossChainController) BaseADIPayloadUpdate(crossChainController) {}
 
-  function execute() public override {
+  function execute() public virtual {
     executeReceiversUpdate(CROSS_CHAIN_CONTROLLER);
 
     executeForwardersUpdate(CROSS_CHAIN_CONTROLLER);

src/adi/BaseCCCUpdate.sol

@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: AGPL-3.0
+pragma solidity ^0.8.0;
+
+import {TransparentUpgradeableProxy} from 'solidity-utils/contracts/transparent-proxy/TransparentUpgradeableProxy.sol';
+import {TransparentProxyFactory} from 'solidity-utils/contracts/transparent-proxy/TransparentProxyFactory.sol';
+import {ProxyAdmin} from 'solidity-utils/contracts/transparent-proxy/ProxyAdmin.sol';
+import './BaseADIPayloadUpdate.sol';
+
+/**
+ * @param crossChainController address of the CCC of the network where payload will be deployed
+ * @param newCCCImpl address of the new ccc implementation
+ * @param proxyAdmin address of the proxy admin owner of ccc
+ */
+struct CCCUpdateArgs {
+  address crossChainController;
+  address crossChainControllerImpl;
+  address proxyAdmin;
+}
+
+/**
+ * @title Base payload to update CCC
+ * @author BGD Labs @bgdlabs
+ */
+abstract contract BaseCCCUpdate is BaseADIPayloadUpdate {
+  address public immutable NEW_CCC_IMPL;
+  address public immutable PROXY_ADMIN;
+
+  /*
+   * @param cccUpdateArgs arguments necessary to update ccc implementation
+   */
+  constructor(
+    CCCUpdateArgs memory cccUpdateArgs
+  ) BaseADIPayloadUpdate(cccUpdateArgs.crossChainController) {
+    NEW_CCC_IMPL = cccUpdateArgs.crossChainControllerImpl;
+    PROXY_ADMIN = cccUpdateArgs.proxyAdmin;
+  }
+
+  function getInitializeSignature() public virtual returns (bytes memory);
+
+  /// @inheritdoc IProposalGenericExecutor
+  function execute() external virtual override {
+    ProxyAdmin(PROXY_ADMIN).upgradeAndCall(
+      TransparentUpgradeableProxy(payable(CROSS_CHAIN_CONTROLLER)),
+      NEW_CCC_IMPL,
+      getInitializeSignature()
+    );
+  }
+}

src/adi/test/ADITestBase.sol

@@ -7,6 +7,7 @@ import {ICrossChainReceiver, ICrossChainForwarder} from 'aave-address-book/commo
 import {ChainIds, ChainHelpers} from '../../ChainIds.sol';
 import {GovV3Helpers} from '../../GovV3Helpers.sol';
 import {IBaseAdaptersUpdate} from '../interfaces/IBaseAdaptersUpdate.sol';
+import {ProxyHelpers} from '../../ProxyHelpers.sol';
 
 import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
 import {GovernanceV3Polygon} from 'aave-address-book/GovernanceV3Polygon.sol';
@@ -40,6 +41,7 @@ contract ADITestBase is Test {
   }
 
   struct CCCConfig {
+    address crossChainControllerImpl;
     ReceiverConfigByChain[] receiverConfigs;
     ReceiverAdaptersByChain[] receiverAdaptersConfig;
     ForwarderAdaptersByChain[] forwarderAdaptersConfig;
@@ -89,7 +91,8 @@ contract ADITestBase is Test {
     string memory reportName,
     address crossChainController,
     address payload,
-    bool runE2E
+    bool runE2E,
+    Vm vm
   ) public returns (CCCConfig memory, CCCConfig memory) {
     string memory beforeString = string(abi.encodePacked('adi_', reportName, '_before'));
     CCCConfig memory configBefore = createConfigurationSnapshot(beforeString, crossChainController);
@@ -128,7 +131,7 @@ contract ADITestBase is Test {
       memory forwardersToEnable = IBaseAdaptersUpdate(payload).getForwarderBridgeAdaptersToEnable();
     if (forwardersToEnable.length != 0) {
       _testCorrectForwarderAdaptersConfiguration(payload, crossChainController, forwardersToEnable);
-      _testDestinationAdapterIsRegistered(payload, crossChainController, forwardersToEnable);
+      _testDestinationAdapterIsRegistered(forwardersToEnable);
     }
     ICrossChainForwarder.BridgeAdapterToDisable[] memory forwardersToRemove = IBaseAdaptersUpdate(
       payload
@@ -148,8 +151,6 @@ contract ADITestBase is Test {
   }
 
   function _testDestinationAdapterIsRegistered(
-    address payload,
-    address crossChainController,
     ICrossChainForwarder.ForwarderBridgeAdapterConfigInput[] memory forwardersToEnable
   ) internal {
     DestinationPayload[] memory destinationPayloads = getDestinationPayloadsByChain();
@@ -382,31 +383,42 @@ contract ADITestBase is Test {
     string memory reportName,
     address crossChainController
   ) public returns (CCCConfig memory) {
-    return createConfigurationSnapshot(reportName, crossChainController, true, true, true);
+    return createConfigurationSnapshot(reportName, crossChainController, true, true, true, true);
   }
 
   function createConfigurationSnapshot(
     string memory reportName,
     address crossChainController,
     bool receiverConfigs,
     bool receiverAdapterConfigs,
-    bool forwarderAdapterConfigs
+    bool forwarderAdapterConfigs,
+    bool cccImplUpdate
   ) public returns (CCCConfig memory) {
     string memory path = string(abi.encodePacked('./reports/', reportName, '.json'));
     // overwrite with empty json to later be extended
     vm.writeFile(
       path,
-      '{ "receiverConfigsByChain": {}, "receiverAdaptersByChain": {}, "forwarderAdaptersByChain": {}}'
+      '{ "cccImplementation": {}, "receiverConfigsByChain": {}, "receiverAdaptersByChain": {}, "forwarderAdaptersByChain": {}}'
     );
     vm.serializeUint('root', 'chainId', block.chainid);
     CCCConfig memory config = _getCCCConfig(crossChainController);
     if (receiverConfigs) _writeReceiverConfigs(path, config);
     if (receiverAdapterConfigs) _writeReceiverAdapters(path, config);
     if (forwarderAdapterConfigs) _writeForwarderAdatpers(path, config);
+    if (cccImplUpdate) _writeCCCImplUpdate(path, config);
 
     return config;
   }
 
+  function _writeCCCImplUpdate(string memory path, CCCConfig memory config) internal {
+    string memory output = vm.serializeAddress(
+      'root',
+      'crossChainControllerImpl',
+      config.crossChainControllerImpl
+    );
+    vm.writeJson(output, path);
+  }
+
   function _writeForwarderAdatpers(string memory path, CCCConfig memory config) internal {
     // keys for json stringification
     string memory forwarderAdaptersKey = 'forwarderAdapters';
@@ -507,6 +519,9 @@ contract ADITestBase is Test {
   function _getCCCConfig(address ccc) internal view returns (CCCConfig memory) {
     CCCConfig memory config;
 
+    // get crossChainController implementation
+    config.crossChainControllerImpl = ProxyHelpers
+      .getInitializableAdminUpgradeabilityProxyImplementation(vm, ccc);
     // get supported networks
     uint256[] memory receiverSupportedChains = ICrossChainReceiver(ccc).getSupportedChains();
     ReceiverConfigByChain[] memory receiverConfigs = new ReceiverConfigByChain[](

tests/adi/SimpleOneToManyAdapterUpdatePayloadTest.t.sol

@@ -151,7 +151,8 @@ contract SimpleOneToManyAdapterUpdatePayloadTest is ADITestBase {
       'test_adi_diffs',
       GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER,
       address(payload),
-      true
+      true,
+      vm
     );
   }
 }