Fix: Check burn token is usdc on remote chain

Author: shahthepro

contracts/contracts/strategies/crosschain/AbstractCCTPIntegrator.sol

@@ -82,6 +82,9 @@ abstract contract AbstractCCTPIntegrator is Governable, IMessageHandlerV2 {
     /// @notice USDC address on local chain
     address public immutable usdcToken;
 
+    /// @notice USDC address on remote chain
+    address public immutable peerUsdcToken;
+
     /// @notice Domain ID of the chain from which messages are accepted
     uint32 public immutable peerDomainID;
 
@@ -142,10 +145,15 @@ abstract contract AbstractCCTPIntegrator is Governable, IMessageHandlerV2 {
         uint32 peerDomainID;
         address peerStrategy;
         address usdcToken;
+        address peerUsdcToken;
     }
 
     constructor(CCTPIntegrationConfig memory _config) {
         require(_config.usdcToken != address(0), "Invalid USDC address");
+        require(
+            _config.peerUsdcToken != address(0),
+            "Invalid peer USDC address"
+        );
         require(
             _config.cctpTokenMessenger != address(0),
             "Invalid CCTP config"
@@ -183,6 +191,9 @@ abstract contract AbstractCCTPIntegrator is Governable, IMessageHandlerV2 {
                 keccak256(abi.encodePacked("USDC")),
             "Token symbol must be USDC"
         );
+
+        // USDC address on remote chain
+        peerUsdcToken = _config.peerUsdcToken;
     }
 
     /**
@@ -477,7 +488,7 @@ abstract contract AbstractCCTPIntegrator is Governable, IMessageHandlerV2 {
             address burnToken = messageBody.extractAddress(
                 BURN_MESSAGE_V2_BURN_TOKEN_INDEX
             );
-            require(burnToken == usdcToken, "Invalid burn token");
+            require(burnToken == peerUsdcToken, "Invalid burn token");
 
             // Address of caller of depositForBurn (or depositForBurnWithCaller) on source domain
             sender = messageBody.extractAddress(

contracts/deploy/base/041_crosschain_strategy.js

@@ -24,6 +24,7 @@ module.exports = deployOnBase(
       cctpDomainIds.Ethereum,
       crossChainStrategyProxyAddress,
       addresses.base.USDC,
+      addresses.mainnet.USDC,
       "CrossChainRemoteStrategy",
       addresses.CCTPTokenMessengerV2,
       addresses.CCTPMessageTransmitterV2,

contracts/deploy/deployActions.js

@@ -1833,6 +1833,7 @@ const deployCrossChainMasterStrategyImpl = async (
   targetDomainId,
   remoteStrategyAddress,
   baseToken,
+  peerBaseToken,
   vaultAddress,
   implementationName = "CrossChainMasterStrategy",
   skipInitialize = false,
@@ -1860,6 +1861,7 @@ const deployCrossChainMasterStrategyImpl = async (
       targetDomainId,
       remoteStrategyAddress,
       baseToken,
+      peerBaseToken,
     ],
   ]);
   const dCrossChainMasterStrategy = await ethers.getContract(
@@ -1894,6 +1896,7 @@ const deployCrossChainRemoteStrategyImpl = async (
   targetDomainId,
   remoteStrategyAddress,
   baseToken,
+  peerBaseToken,
   implementationName = "CrossChainRemoteStrategy",
   tokenMessengerAddress = addresses.CCTPTokenMessengerV2,
   messageTransmitterAddress = addresses.CCTPMessageTransmitterV2,
@@ -1920,6 +1923,7 @@ const deployCrossChainRemoteStrategyImpl = async (
       targetDomainId,
       remoteStrategyAddress,
       baseToken,
+      peerBaseToken,
     ],
   ]);
   const dCrossChainRemoteStrategy = await ethers.getContract(
@@ -1977,6 +1981,7 @@ const deployCrossChainUnitTestStrategy = async (usdcAddress) => {
     // unit tests differ from mainnet where remote strategy has a different address
     dRemoteProxy.address,
     usdcAddress,
+    usdcAddress, // Assume both are same on unit tests
     cVaultProxy.address,
     "CrossChainMasterStrategy",
     false,
@@ -1991,6 +1996,7 @@ const deployCrossChainUnitTestStrategy = async (usdcAddress) => {
     0, // Ethereum domain id
     dMasterProxy.address,
     usdcAddress,
+    usdcAddress, // Assume both are same on unit tests
     "CrossChainRemoteStrategy",
     tokenMessenger.address,
     messageTransmitter.address,

contracts/deploy/mainnet/166_crosschain_strategy.js

@@ -32,6 +32,7 @@ module.exports = deploymentWithGovernanceProposal(
       // Same address for both master and remote strategy
       crossChainStrategyProxyAddress,
       addresses.mainnet.USDC,
+      addresses.base.USDC,
       cVaultProxy.address,
       "CrossChainMasterStrategy",
       false,