Merge branch 'SC-452-refactor-forwards-receivers' into SC-437-fix-cov…

…erage
marsfoundation · Jun 5, 2024 · 05e3840 · 05e3840
2 parents 747c428 + 8190995
commit 05e3840
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/receivers/CCTPReceiver.sol b/src/receivers/CCTPReceiver.sol
@@ -9,13 +9,13 @@ contract CCTPReceiver {
 
     address public immutable destinationMessenger;
     uint32  public immutable sourceDomainId;
-    address public immutable sourceAuthority;
+    bytes32 public immutable sourceAuthority;
     address public immutable target;
 
     constructor(
         address _destinationMessenger,
         uint32  _sourceDomainId,
-        address _sourceAuthority,
+        bytes32 _sourceAuthority,
         address _target
     ) {
         destinationMessenger = _destinationMessenger;
@@ -29,9 +29,9 @@ contract CCTPReceiver {
         bytes32 sender,
         bytes calldata messageBody
     ) external returns (bool) {
-        require(msg.sender == destinationMessenger,                   "CCTPReceiver/invalid-sender");
-        require(sourceDomainId == sourceDomain,                       "CCTPReceiver/invalid-sourceDomain");
-        require(sender == bytes32(uint256(uint160(sourceAuthority))), "CCTPReceiver/invalid-sourceAuthority");
+        require(msg.sender == destinationMessenger, "CCTPReceiver/invalid-sender");
+        require(sourceDomainId == sourceDomain,     "CCTPReceiver/invalid-sourceDomain");
+        require(sender == sourceAuthority,          "CCTPReceiver/invalid-sourceAuthority");
 
         (bool success, bytes memory ret) = target.call(messageBody);
         if (!success) {

diff --git a/test/CircleCCTPIntegration.t.sol b/test/CircleCCTPIntegration.t.sol
@@ -77,11 +77,11 @@ contract CircleCCTPIntegrationTest is IntegrationBaseTest {
     }
 
     function initSourceReceiver() internal override returns (address) {
-        return address(new CCTPReceiver(bridge.sourceCrossChainMessenger, destinationDomainId, destinationAuthority, address(moSource)));
+        return address(new CCTPReceiver(bridge.sourceCrossChainMessenger, destinationDomainId, bytes32(uint256(uint160(destinationAuthority))), address(moSource)));
     }
 
     function initDestinationReceiver() internal override returns (address) {
-        return address(new CCTPReceiver(bridge.destinationCrossChainMessenger, sourceDomainId, sourceAuthority, address(moDestination)));
+        return address(new CCTPReceiver(bridge.destinationCrossChainMessenger, sourceDomainId, bytes32(uint256(uint160(sourceAuthority))), address(moDestination)));
     }
 
     function initBridgeTesting() internal override returns (Bridge memory) {