Updated ERC specs

Author: Amxx

contracts/crosschain/axelar/AxelarGatewayDestination.sol

@@ -14,15 +14,15 @@ import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
  *
  * The contract implements implements AxelarExecutable's {_execute} function to execute the message,
  * converting Axelar's native workflow into the standard ERC7786 active mode.
- * Alternatively, it provides a way to set a message as executed by calling the {setExecutedMessage}
+ * Alternatively, it provides a way to set a message as executed by calling the {setMessageExecuted}
  * function (passive mode).
  */
 abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive, AxelarGatewayBase, AxelarExecutable {
     using Strings for address;
     using Strings for string;
 
     /// @dev Sets a message as executed so it can't be executed again. Should be called by the receiver contract.
-    function setExecutedMessage(
+    function setMessageExecuted(
         bytes calldata messageKey,
         string calldata source, // CAIP-2
         string calldata sender, // CAIP-10
@@ -81,7 +81,7 @@ abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive,
         require(getRemoteGateway(source).equal(remoteAccount), "Invalid origin gateway");
 
         // Active mode
-        IERC7786Receiver(receiver.parseAddress()).receiveMessage(
+        IERC7786Receiver(receiver.parseAddress()).executeMessage(
             address(0), // not needed in active mode
             new bytes(0), // not needed in active mode
             source,

contracts/crosschain/axelar/AxelarGatewaySource.sol

@@ -37,7 +37,7 @@ abstract contract AxelarGatewaySource is IERC7786GatewaySource, AxelarGatewayBas
         bytes memory adapterPayload = abi.encode(sender, receiver, payload, attributes);
 
         // Emit event
-        emit MessageCreated(
+        emit MessagePosted(
             0,
             CAIP10.format(CAIP2.local(), sender),
             CAIP10.format(destination, receiver),

contracts/crosschain/interfaces/draft-IERC7786.sol

@@ -9,24 +9,17 @@ pragma solidity ^0.8.0;
  */
 interface IERC7786GatewaySource {
     /**
-     * @dev Event emitted when a message is created. If `outboxId` is zero, no further processing is necessary, and
-     * no {MessageSent} event SHOULD be expected. If `outboxId` is not zero, then further (gateway specific, and non
-     * standardized) action is required.
+     * @dev Event emitted when a message is created. If `outboxId` is zero, no further processing is necessary. If
+     * `outboxId` is not zero, then further (gateway specific, and non standardized) action is required.
      */
-    event MessageCreated(
+    event MessagePosted(
         bytes32 indexed outboxId,
         string sender, // CAIP-10 account ID
         string receiver, // CAIP-10 account ID
         bytes payload,
         bytes[] attributes
     );
 
-    /**
-     * @dev This event is emitted when a message, for which the {MessageCreated} event contains an non zero `outboxId`,
-     * received the required post processing actions, and was thus sent to the destination chain.
-     */
-    event MessageSent(bytes32 indexed outboxId);
-
     /// @dev This error is thrown when a message creation fails because of an unsupported attribute being specified.
     error UnsupportedAttribute(bytes4 selector);
 
@@ -39,13 +32,12 @@ interface IERC7786GatewaySource {
      * message MUST be sent and this function must return 0.
      *
      * * MUST emit a {MessageCreated} event.
-     * * SHOULD NOT emit a {MessageSent} event.
      *
      * If any of the `attributes` is not supported, this function SHOULD revert with an {UnsupportedAttribute} error.
      * Other errors SHOULD revert with errors not specified in ERC-7786.
      */
     function sendMessage(
-        string calldata destination, // CAIP-2 chain ID
+        string calldata destinationChain, // CAIP-2 chain ID
         string calldata receiver, // CAIP-10 account ID
         bytes calldata payload,
         bytes[] calldata attributes
@@ -68,9 +60,9 @@ interface IERC7786GatewayDestinationPassive {
      *
      * NOTE: implementing this interface is OPTIONAL. Some destination gateway MAY only support active mode.
      */
-    function setExecutedMessage(
+    function setMessageExecuted(
         bytes calldata messageKey,
-        string calldata source,
+        string calldata sourceChain,
         string calldata sender,
         bytes calldata payload,
         bytes[] calldata attributes
@@ -88,10 +80,10 @@ interface IERC7786Receiver {
      *
      * This function may be called directly by the gateway (active mode) or by a third party (passive mode).
      */
-    function receiveMessage(
+    function executeMessage(
         address gateway,
         bytes calldata gatewayMessageKey,
-        string calldata source,
+        string calldata sourceChain,
         string calldata sender,
         bytes calldata payload,
         bytes[] calldata attributes

contracts/crosschain/mocks/ERC7786GatewayMock.sol

@@ -38,16 +38,16 @@ contract ERC7786GatewayMock is IERC7786GatewaySource, IERC7786GatewayDestination
 
         if (_activeMode) {
             address target = Strings.parseAddress(receiver);
-            IERC7786Receiver(target).receiveMessage(address(this), new bytes(0), source, sender, payload, attributes);
+            IERC7786Receiver(target).executeMessage(address(this), new bytes(0), source, sender, payload, attributes);
         } else {
             _outbox.set(uint256(keccak256(abi.encode(source, sender, receiver, payload, attributes))));
         }
 
-        emit MessageCreated(0, CAIP10.format(source, sender), CAIP10.format(source, receiver), payload, attributes);
+        emit MessagePosted(0, CAIP10.format(source, sender), CAIP10.format(source, receiver), payload, attributes);
         return 0;
     }
 
-    function setExecutedMessage(
+    function setMessageExecuted(
         bytes calldata /*messageKey*/, // this mock doesn't use a messageKey
         string calldata source,
         string calldata sender,

contracts/crosschain/utils/draft-ERC7786Receiver.sol

@@ -7,7 +7,7 @@ import {IERC7786GatewayDestinationPassive, IERC7786Receiver} from "../interfaces
 /**
  * @dev Base implementation of an ERC-7786 compliant cross-chain message receiver.
  *
- * This abstract contract exposes the `receiveMessage` function that is used in both active and passive mode for
+ * This abstract contract exposes the `executeMessage` function that is used in both active and passive mode for
  * communication with (one or multiple) destination gateways. This contract leaves two function unimplemented:
  *
  * {_isKnownGateway}, an internal getter used to verify whether an address is recognised by the contract as a valid
@@ -21,7 +21,7 @@ abstract contract ERC7786Receiver is IERC7786Receiver {
     error ERC7786ReceivePassiveModeValue();
 
     /// @inheritdoc IERC7786Receiver
-    function receiveMessage(
+    function executeMessage(
         address gateway,
         bytes calldata gatewayMessageKey,
         string calldata source,
@@ -35,7 +35,7 @@ abstract contract ERC7786Receiver is IERC7786Receiver {
         } else if (_isKnownGateway(gateway)) {
             // Passive mode
             if (msg.value != 0) revert ERC7786ReceivePassiveModeValue();
-            IERC7786GatewayDestinationPassive(gateway).setExecutedMessage(
+            IERC7786GatewayDestinationPassive(gateway).setMessageExecuted(
                 gatewayMessageKey,
                 source,
                 sender,

test/crosschain/ERC7786Receiver.test.js

@@ -31,7 +31,7 @@ describe('ERC7786Receiver', function () {
 
     it('nominal workflow', async function () {
       await expect(this.gateway.connect(this.sender).sendMessage(this.caip2, getAddress(this.receiver), payload, attributes))
-        .to.emit(this.gateway, 'MessageCreated')
+        .to.emit(this.gateway, 'MessagePosted')
         .withArgs(ethers.ZeroHash, this.toCaip10(this.sender), this.toCaip10(this.receiver), payload, attributes)
         .to.emit(this.receiver, 'MessageReceived')
         .withArgs(this.gateway, this.caip2, getAddress(this.sender), payload, attributes);
@@ -45,12 +45,12 @@ describe('ERC7786Receiver', function () {
 
     it('nominal workflow', async function () {
       await expect(this.gateway.connect(this.sender).sendMessage(this.caip2, this.receiver.target, payload, attributes))
-        .to.emit(this.gateway, 'MessageCreated')
+        .to.emit(this.gateway, 'MessagePosted')
         .withArgs(ethers.ZeroHash, this.toCaip10(this.sender), this.toCaip10(this.receiver), payload, attributes)
         .to.not.emit(this.receiver, 'MessageReceived');
 
       await expect(
-        this.receiver.receiveMessage(this.gateway, '0x', this.caip2, getAddress(this.sender), payload, attributes),
+        this.receiver.executeMessage(this.gateway, '0x', this.caip2, getAddress(this.sender), payload, attributes),
       )
         .to.emit(this.receiver, 'MessageReceived')
         .withArgs(this.gateway, this.caip2, getAddress(this.sender), payload, attributes);
@@ -62,21 +62,21 @@ describe('ERC7786Receiver', function () {
       // Altering the message (in this case, changing the sender's address)
       // Here the error is actually triggered by the gateway itself.
       await expect(
-        this.receiver.receiveMessage(this.gateway, '0x', this.caip2, getAddress(this.notAGateway), payload, attributes),
+        this.receiver.executeMessage(this.gateway, '0x', this.caip2, getAddress(this.notAGateway), payload, attributes),
       ).to.be.revertedWith('invalid message');
     });
 
     it('invalid gateway', async function () {
       await expect(
-        this.receiver.receiveMessage(this.notAGateway, '0x', this.caip2, getAddress(this.sender), payload, attributes),
+        this.receiver.executeMessage(this.notAGateway, '0x', this.caip2, getAddress(this.sender), payload, attributes),
       )
         .to.be.revertedWithCustomError(this.receiver, 'ERC7786ReceiverInvalidGateway')
         .withArgs(this.notAGateway);
     });
 
     it('with value', async function () {
       await expect(
-        this.receiver.receiveMessage(this.gateway, '0x', this.caip2, getAddress(this.sender), payload, attributes, {
+        this.receiver.executeMessage(this.gateway, '0x', this.caip2, getAddress(this.sender), payload, attributes, {
           value: 1n,
         }),
       ).to.be.revertedWithCustomError(this.receiver, 'ERC7786ReceivePassiveModeValue');

test/crosschain/axelar/AxelarGateway.test.js

@@ -54,7 +54,7 @@ describe('AxelarGateway', function () {
 
       const tx = await this.srcGateway.connect(this.sender).sendMessage(this.CAIP2, getAddress(this.receiver), payload, attributes);
       await expect(tx)
-        .to.emit(this.srcGateway, 'MessageCreated').withArgs(ethers.ZeroHash, srcCAIP10, dstCAIP10, payload, attributes)
+        .to.emit(this.srcGateway, 'MessagePosted').withArgs(ethers.ZeroHash, srcCAIP10, dstCAIP10, payload, attributes)
         .to.emit(this.axelar, 'ContractCall').withArgs(this.srcGateway, 'local', getAddress(this.dstGateway), ethers.keccak256(package), package)
         .to.emit(this.axelar, 'ContractCallExecuted').withArgs(anyValue)
         .to.emit(this.receiver, 'MessageReceived').withArgs(ethers.ZeroAddress, this.CAIP2, getAddress(this.sender), payload, attributes);
@@ -75,15 +75,15 @@ describe('AxelarGateway', function () {
 
       const tx = await this.srcGateway.connect(this.sender).sendMessage(this.CAIP2, getAddress(this.receiver), payload, attributes);
       await expect(tx)
-        .to.emit(this.srcGateway, 'MessageCreated').withArgs(ethers.ZeroHash, srcCAIP10, dstCAIP10, payload, attributes)
+        .to.emit(this.srcGateway, 'MessagePosted').withArgs(ethers.ZeroHash, srcCAIP10, dstCAIP10, payload, attributes)
         .to.emit(this.axelar, 'ContractCall').withArgs(this.srcGateway, 'local', getAddress(this.dstGateway), ethers.keccak256(package), package)
         .to.emit(this.axelar, 'CommandIdPending').withArgs(anyValue, 'local', getAddress(this.dstGateway), package);
 
       const { logs } = await tx.wait();
       const commandIdEvent = logs.find(({ address, topics }) => address == this.axelar.target && topics[0] == this.axelar.interface.getEvent('CommandIdPending').topicHash);
       const [ commandId ] = this.axelar.interface.decodeEventLog('CommandIdPending', commandIdEvent.data, commandIdEvent.topics);
 
-      await expect(this.receiver.receiveMessage(
+      await expect(this.receiver.executeMessage(
         this.dstGateway,
         commandId, // bytes32 is already self-encoded
         this.CAIP2,