Fix: updated adi tests. Updated chain ids (#299)

* fix: use bytecode for create2 adapter helpers and tests

* fix: removed comments

* fix: use mock adapter contract instead of deployed from etherscan

* wip: final version but test not working

* fix: passing predicting address

* fix: added testnets

* fix: ethereum network

* fix: added helper method to get network name

* fix: fixed comments

diffs/adi_test_adi_diffs_before_adi_test_adi_diffs_after.md

@@ -4,23 +4,15 @@
 {
   "forwarderAdaptersByChain": {
     "1": {
-      "0xDA4B6024aA06f7565BBcAaD9B8bE24C3c229AAb5": {
-        "from": "0x2a323be63e08E08536Fc3b5d8C6f24825e68895e",
-        "to": null
-      },
-      "0x7FAE7765abB4c8f778d57337bB720d0BC53057e3": {
+      "0xF1592Fc21d1E66350591cEcd51964Dd57Bae5bC0": {
         "from": null,
         "to": "0x8410d9BD353b420ebA8C48ff1B0518426C280FCC"
       }
     }
   },
   "receiverAdaptersByChain": {
     "1": {
-      "0xDA4B6024aA06f7565BBcAaD9B8bE24C3c229AAb5": {
-        "from": true,
-        "to": null
-      },
-      "0x7FAE7765abB4c8f778d57337bB720d0BC53057e3": {
+      "0xF1592Fc21d1E66350591cEcd51964Dd57Bae5bC0": {
         "from": null,
         "to": true
       }

src/ChainIds.sol

@@ -4,6 +4,7 @@ import {Vm} from 'forge-std/Vm.sol';
 
 library ChainIds {
   uint256 internal constant MAINNET = 1;
+  uint256 internal constant ETHEREUM = 1;
   uint256 internal constant OPTIMISM = 10;
   uint256 internal constant BNB = 56;
   uint256 internal constant POLYGON = 137;
@@ -18,6 +19,24 @@ library ChainIds {
   uint256 internal constant SCROLL = 534352;
   uint256 internal constant SEPOLIA = 11155111;
   uint256 internal constant HARMONY = 1666600000;
+  uint256 internal constant CELO = 42220;
+  uint256 internal constant POLYGON_ZK_EVM = 1101;
+}
+
+library TestNetChainIds {
+  uint256 internal constant ETHEREUM_SEPOLIA = 11155111;
+  uint256 internal constant POLYGON_AMOY = 80002;
+  uint256 internal constant AVALANCHE_FUJI = 43113;
+  uint256 internal constant FANTOM_TESTNET = 4002;
+  uint256 internal constant HARMONY_TESTNET = 1666700000;
+  uint256 internal constant METIS_TESTNET = 599;
+  uint256 internal constant BNB_TESTNET = 97;
+  uint256 internal constant GNOSIS_CHIADO = 10200;
+  uint256 internal constant SCROLL_SEPOLIA = 534351;
+  uint256 internal constant BASE_SEPOLIA = 84532;
+  uint256 internal constant CELO_ALFAJORES = 44787;
+  uint256 internal constant OPTIMISM_SEPOLIA = 11155420;
+  uint256 internal constant ARBITRUM_SEPOLIA = 421614;
 }
 
 library ChainHelpers {
@@ -62,4 +81,61 @@ library ChainHelpers {
     }
     return (previousFork, newFork);
   }
+
+  function getNetworkNameFromId(uint256 chainId) internal pure returns (string memory) {
+    string memory networkName;
+    if (chainId == ChainIds.ETHEREUM) {
+      networkName = 'ethereum';
+    } else if (chainId == ChainIds.POLYGON) {
+      networkName = 'polygon';
+    } else if (chainId == ChainIds.AVALANCHE) {
+      networkName = 'avalanche';
+    } else if (chainId == ChainIds.ARBITRUM) {
+      networkName = 'arbitrum';
+    } else if (chainId == ChainIds.OPTIMISM) {
+      networkName = 'optimism';
+    } else if (chainId == ChainIds.METIS) {
+      networkName = 'metis';
+    } else if (chainId == ChainIds.BNB) {
+      networkName = 'binance';
+    } else if (chainId == ChainIds.BASE) {
+      networkName = 'base';
+    } else if (chainId == ChainIds.POLYGON_ZK_EVM) {
+      networkName = 'zkevm';
+    } else if (chainId == ChainIds.GNOSIS) {
+      networkName = 'gnosis';
+    } else if (chainId == ChainIds.SCROLL) {
+      networkName = 'scroll';
+    } else if (chainId == ChainIds.CELO) {
+      networkName = 'celo';
+    }
+    // testnets
+    else if (chainId == TestNetChainIds.ETHEREUM_SEPOLIA) {
+      networkName = 'ethereum_sepolia';
+    } else if (chainId == TestNetChainIds.POLYGON_AMOY) {
+      networkName = 'polygon_amoy';
+    } else if (chainId == TestNetChainIds.AVALANCHE_FUJI) {
+      networkName = 'avalanche_fuji';
+    } else if (chainId == TestNetChainIds.ARBITRUM_SEPOLIA) {
+      networkName = 'arbitrum_sepolia';
+    } else if (chainId == TestNetChainIds.OPTIMISM_SEPOLIA) {
+      networkName = 'optimism_sepolia';
+    } else if (chainId == TestNetChainIds.METIS_TESTNET) {
+      networkName = 'metis_test';
+    } else if (chainId == TestNetChainIds.BNB_TESTNET) {
+      networkName = 'binance_testnet';
+    } else if (chainId == TestNetChainIds.BASE_SEPOLIA) {
+      networkName = 'base_sepolia';
+    } else if (chainId == TestNetChainIds.GNOSIS_CHIADO) {
+      networkName = 'gno_chiado';
+    } else if (chainId == TestNetChainIds.SCROLL_SEPOLIA) {
+      networkName = 'scroll_sepolia';
+    } else if (chainId == TestNetChainIds.CELO_ALFAJORES) {
+      networkName = 'celo_alfajores';
+    } else {
+      revert('chain id is not supported');
+    }
+
+    return networkName;
+  }
 }

src/adi/SimpleOneToManyAdapterUpdate.sol

@@ -68,16 +68,22 @@ abstract contract SimpleOneToManyAdapterUpdate is BaseAdaptersUpdate {
     override
     returns (ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[] memory)
   {
-    // remove old Receiver bridge adapter
-    ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]
-      memory bridgeAdaptersToRemove = new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](1);
-
-    bridgeAdaptersToRemove[0] = ICrossChainReceiver.ReceiverBridgeAdapterConfigInput({
-      bridgeAdapter: ADAPTER_TO_REMOVE,
-      chainIds: getChainsToReceive()
-    });
+    if (ADAPTER_TO_REMOVE != address(0)) {
+      // remove old Receiver bridge adapter
+      ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]
+        memory bridgeAdaptersToRemove = new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](
+          1
+        );
+
+      bridgeAdaptersToRemove[0] = ICrossChainReceiver.ReceiverBridgeAdapterConfigInput({
+        bridgeAdapter: ADAPTER_TO_REMOVE,
+        chainIds: getChainsToReceive()
+      });
 
-    return bridgeAdaptersToRemove;
+      return bridgeAdaptersToRemove;
+    } else {
+      return new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](0);
+    }
   }
 
   /// @inheritdoc IBaseForwarderAdaptersUpdate
@@ -88,15 +94,19 @@ abstract contract SimpleOneToManyAdapterUpdate is BaseAdaptersUpdate {
     override
     returns (ICrossChainForwarder.BridgeAdapterToDisable[] memory)
   {
-    ICrossChainForwarder.BridgeAdapterToDisable[]
-      memory forwarderAdaptersToRemove = new ICrossChainForwarder.BridgeAdapterToDisable[](1);
+    if (ADAPTER_TO_REMOVE != address(0)) {
+      ICrossChainForwarder.BridgeAdapterToDisable[]
+        memory forwarderAdaptersToRemove = new ICrossChainForwarder.BridgeAdapterToDisable[](1);
 
-    forwarderAdaptersToRemove[0] = ICrossChainForwarder.BridgeAdapterToDisable({
-      bridgeAdapter: ADAPTER_TO_REMOVE,
-      chainIds: getChainsToSend()
-    });
+      forwarderAdaptersToRemove[0] = ICrossChainForwarder.BridgeAdapterToDisable({
+        bridgeAdapter: ADAPTER_TO_REMOVE,
+        chainIds: getChainsToSend()
+      });
 
-    return forwarderAdaptersToRemove;
+      return forwarderAdaptersToRemove;
+    } else {
+      return new ICrossChainForwarder.BridgeAdapterToDisable[](0);
+    }
   }
 
   /// @inheritdoc IBaseReceiverAdaptersUpdate
@@ -107,15 +117,19 @@ abstract contract SimpleOneToManyAdapterUpdate is BaseAdaptersUpdate {
     override
     returns (ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[] memory)
   {
-    ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]
-      memory bridgeAdapterConfig = new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](1);
+    if (NEW_ADAPTER != address(0)) {
+      ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]
+        memory bridgeAdapterConfig = new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](1);
 
-    bridgeAdapterConfig[0] = ICrossChainReceiver.ReceiverBridgeAdapterConfigInput({
-      bridgeAdapter: NEW_ADAPTER,
-      chainIds: getChainsToReceive()
-    });
+      bridgeAdapterConfig[0] = ICrossChainReceiver.ReceiverBridgeAdapterConfigInput({
+        bridgeAdapter: NEW_ADAPTER,
+        chainIds: getChainsToReceive()
+      });
 
-    return bridgeAdapterConfig;
+      return bridgeAdapterConfig;
+    } else {
+      return new ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[](0);
+    }
   }
 
   /// @inheritdoc IBaseForwarderAdaptersUpdate

tests/adi/SimpleOneToManyAdapterUpdatePayloadTest.t.sol

@@ -4,19 +4,24 @@ pragma solidity ^0.8.0;
 import {SimpleOneToManyAdapterUpdate} from '../../src/adi/SimpleOneToManyAdapterUpdate.sol';
 import {GovernanceV3Polygon} from 'aave-address-book/GovernanceV3Polygon.sol';
 import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
-import {ChainIds} from '../../src/ChainIds.sol';
 import 'forge-std/Test.sol';
 import '../../src/adi/test/ADITestBase.sol';
+import {MockAdapterDeploymentHelper} from './mocks/AdaptersByteCode.sol';
 
-contract SimpleOneToManyAdapterUpdatePayload is
-  SimpleOneToManyAdapterUpdate(
-    SimpleOneToManyAdapterUpdate.ConstructorInput({
-      ccc: GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER,
-      newAdapter: 0x7FAE7765abB4c8f778d57337bB720d0BC53057e3,
-      adapterToRemove: 0xDA4B6024aA06f7565BBcAaD9B8bE24C3c229AAb5
-    })
+contract SimpleOneToManyAdapterUpdatePayload is SimpleOneToManyAdapterUpdate {
+  constructor(
+    address crossChainController,
+    address newAdapter
   )
-{
+    SimpleOneToManyAdapterUpdate(
+      SimpleOneToManyAdapterUpdate.ConstructorInput({
+        ccc: crossChainController,
+        adapterToRemove: address(0),
+        newAdapter: newAdapter
+      })
+    )
+  {}
+
   function getChainsToReceive() public pure override returns (uint256[] memory) {
     uint256[] memory chains = new uint256[](1);
     chains[0] = ChainIds.MAINNET;
@@ -38,18 +43,24 @@ contract SimpleOneToManyAdapterUpdatePayload is
   }
 }
 
-contract SimpleOneToManyAdapterUpdateEthereumPayload is
-  SimpleOneToManyAdapterUpdate(
-    SimpleOneToManyAdapterUpdate.ConstructorInput({
-      ccc: GovernanceV3Ethereum.CROSS_CHAIN_CONTROLLER,
-      newAdapter: 0x8410d9BD353b420ebA8C48ff1B0518426C280FCC, // POLYGON native bridge adapter
-      adapterToRemove: 0xb13712De579E1f9943502FFCf72eab6ec348cF79 // POLYGON
-    })
+contract SimpleOneToManyAdapterUpdateEthereumPayload is SimpleOneToManyAdapterUpdate {
+  constructor(
+    address crossChainController,
+    address newAdapter
   )
-{
+    SimpleOneToManyAdapterUpdate(
+      SimpleOneToManyAdapterUpdate.ConstructorInput({
+        ccc: crossChainController,
+        adapterToRemove: address(0),
+        newAdapter: newAdapter
+      })
+    )
+  {}
+
   function getChainsToReceive() public pure override returns (uint256[] memory) {
-    uint256[] memory chains = new uint256[](1);
+    uint256[] memory chains = new uint256[](2);
     chains[0] = ChainIds.POLYGON;
+    chains[1] = ChainIds.AVALANCHE;
     return chains;
   }
 }
@@ -59,20 +70,77 @@ contract SimpleOneToManyAdapterUpdatePayloadTest is ADITestBase {
   SimpleOneToManyAdapterUpdatePayload public payload;
 
   function setUp() public {
-    vm.createSelectFork(vm.rpcUrl('polygon'), 55428042);
-    payload = new SimpleOneToManyAdapterUpdatePayload();
+    vm.createSelectFork(vm.rpcUrl('polygon'), 56680671);
+    // create payload constructor args
+    IBaseAdapter.TrustedRemotesConfig[]
+      memory trustedRemotes = new IBaseAdapter.TrustedRemotesConfig[](1);
+    trustedRemotes[0] = IBaseAdapter.TrustedRemotesConfig({
+      originChainId: ChainIds.MAINNET,
+      originForwarder: GovernanceV3Ethereum.CROSS_CHAIN_CONTROLLER
+    });
+
+    MockAdapterDeploymentHelper.MockAdapterArgs memory args = MockAdapterDeploymentHelper
+      .MockAdapterArgs({
+        baseArgs: MockAdapterDeploymentHelper.BaseAdapterArgs({
+          crossChainController: GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER,
+          providerGasLimit: 0,
+          trustedRemotes: trustedRemotes,
+          isTestnet: false
+        }),
+        mockEndpoint: 0x1a44076050125825900e736c501f859c50fE728c
+      });
+
+    // deploy adapter
+    address newAdapter = GovV3Helpers.deployDeterministic(
+      MockAdapterDeploymentHelper.getAdapterCode(args)
+    );
+    // deploy payload
+    payload = new SimpleOneToManyAdapterUpdatePayload(
+      GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER,
+      newAdapter
+    );
   }
 
   function getDestinationPayloadsByChain()
     public
-    view
+    pure
     override
     returns (DestinationPayload[] memory)
   {
     DestinationPayload[] memory destinationPayload = new DestinationPayload[](1);
+
+    IBaseAdapter.TrustedRemotesConfig[]
+      memory trustedRemotes = new IBaseAdapter.TrustedRemotesConfig[](2);
+    trustedRemotes[0] = IBaseAdapter.TrustedRemotesConfig({
+      originChainId: ChainIds.POLYGON,
+      originForwarder: GovernanceV3Polygon.CROSS_CHAIN_CONTROLLER
+    });
+    trustedRemotes[1] = IBaseAdapter.TrustedRemotesConfig({
+      originChainId: ChainIds.AVALANCHE,
+      originForwarder: GovernanceV3Avalanche.CROSS_CHAIN_CONTROLLER
+    });
+
+    MockAdapterDeploymentHelper.MockAdapterArgs memory args = MockAdapterDeploymentHelper
+      .MockAdapterArgs({
+        baseArgs: MockAdapterDeploymentHelper.BaseAdapterArgs({
+          crossChainController: GovernanceV3Ethereum.CROSS_CHAIN_CONTROLLER,
+          providerGasLimit: 0,
+          trustedRemotes: trustedRemotes,
+          isTestnet: false
+        }),
+        mockEndpoint: 0x1a44076050125825900e736c501f859c50fE728c
+      });
+
+    bytes memory adapterCode = MockAdapterDeploymentHelper.getAdapterCode(args);
+
+    address newAdapter = GovV3Helpers.predictDeterministicAddress(adapterCode);
+
     destinationPayload[0] = DestinationPayload({
       chainId: ChainIds.MAINNET,
-      payloadCode: type(SimpleOneToManyAdapterUpdateEthereumPayload).creationCode
+      payloadCode: abi.encodePacked(
+        type(SimpleOneToManyAdapterUpdateEthereumPayload).creationCode,
+        abi.encode(GovernanceV3Ethereum.CROSS_CHAIN_CONTROLLER, newAdapter)
+      )
     });
 
     return destinationPayload;