clarify CAIP-10 format

Author: Amxx

contracts/crosschain/axelar/AxelarGatewayDestination.sol

@@ -10,7 +10,7 @@ import {IERC7786GatewayDestinationPassive, IERC7786Receiver} from "../interfaces
 import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
 
 /**
- * @dev Implementation of an ERC7786 gateway destination adapter for the Axelar Network in dual mode.
+ * @dev Implementation of an ERC-7786 gateway destination adapter for the Axelar Network in dual mode.
  *
  * The contract implements implements AxelarExecutable's {_execute} function to execute the message,
  * converting Axelar's native workflow into the standard ERC7786 active mode.
@@ -24,8 +24,8 @@ abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive,
     /// @dev Sets a message as executed so it can't be executed again. Should be called by the receiver contract.
     function setMessageExecuted(
         bytes calldata messageKey,
-        string calldata source, // CAIP-2
-        string calldata sender, // CAIP-10
+        string calldata sourceChain, // CAIP-2 chain identifier
+        string calldata sender, // CAIP-10 account address (does not include the chain identifier)
         bytes calldata payload,
         bytes[] calldata attributes
     ) external {
@@ -44,8 +44,8 @@ abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive,
         require(
             gateway.validateContractCall(
                 commandId,
-                getEquivalentChain(source),
-                getRemoteGateway(source),
+                getEquivalentChain(sourceChain),
+                getRemoteGateway(sourceChain),
                 keccak256(adapterPayload)
             ),
             NotApprovedByGateway()

contracts/crosschain/axelar/AxelarGatewaySource.sol

@@ -24,8 +24,8 @@ abstract contract AxelarGatewaySource is IERC7786GatewaySource, AxelarGatewayBas
 
     /// @inheritdoc IERC7786GatewaySource
     function sendMessage(
-        string calldata destination, // CAIP-2 chain ID
-        string calldata receiver, // i.e. address
+        string calldata destinationChain, // CAIP-2 chain identifier
+        string calldata receiver, // CAIP-10 account address (does not include the chain identifier)
         bytes calldata payload,
         bytes[] calldata attributes
     ) external payable returns (bytes32) {
@@ -40,14 +40,14 @@ abstract contract AxelarGatewaySource is IERC7786GatewaySource, AxelarGatewayBas
         emit MessagePosted(
             0,
             CAIP10.format(CAIP2.local(), sender),
-            CAIP10.format(destination, receiver),
+            CAIP10.format(destinationChain, receiver),
             payload,
             attributes
         );
 
         // Send the message
-        string memory axelarDestination = getEquivalentChain(destination);
-        string memory remoteGateway = getRemoteGateway(destination);
+        string memory axelarDestination = getEquivalentChain(destinationChain);
+        string memory remoteGateway = getRemoteGateway(destinationChain);
         localGateway.callContract(axelarDestination, remoteGateway, adapterPayload);
 
         return 0;

contracts/crosschain/interfaces/draft-IERC7786.sol

@@ -14,8 +14,8 @@ interface IERC7786GatewaySource {
      */
     event MessagePosted(
         bytes32 indexed outboxId,
-        string sender, // CAIP-10 account ID
-        string receiver, // CAIP-10 account ID
+        string sender, // CAIP-10 account identifier (chain identifier + ":" + account address)
+        string receiver, // CAIP-10 account identifier (chain identifier + ":" + account address)
         bytes payload,
         bytes[] attributes
     );
@@ -37,8 +37,8 @@ interface IERC7786GatewaySource {
      * Other errors SHOULD revert with errors not specified in ERC-7786.
      */
     function sendMessage(
-        string calldata destinationChain, // CAIP-2 chain ID
-        string calldata receiver, // CAIP-10 account ID
+        string calldata destinationChain, // CAIP-2 chain identifier
+        string calldata receiver, // CAIP-10 account address (does not include the chain identifier)
         bytes calldata payload,
         bytes[] calldata attributes
     ) external payable returns (bytes32 outboxId);
@@ -62,8 +62,8 @@ interface IERC7786GatewayDestinationPassive {
      */
     function setMessageExecuted(
         bytes calldata messageKey,
-        string calldata sourceChain,
-        string calldata sender,
+        string calldata sourceChain, // CAIP-2 chain identifier
+        string calldata sender, // CAIP-10 account address (does not include the chain identifier)
         bytes calldata payload,
         bytes[] calldata attributes
     ) external;
@@ -83,8 +83,8 @@ interface IERC7786Receiver {
     function executeMessage(
         address gateway,
         bytes calldata gatewayMessageKey,
-        string calldata sourceChain,
-        string calldata sender,
+        string calldata sourceChain, // CAIP-2 chain identifier
+        string calldata sender, // CAIP-10 account address (does not include the chain identifier)
         bytes calldata payload,
         bytes[] calldata attributes
     ) external payable returns (bytes4);