update

Author: Amxx

contracts/crosschain/axelar/AxelarGatewayDestination.sol

@@ -20,7 +20,7 @@ abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive,
         string calldata sender, // CAIP-10
         bytes calldata payload,
         bytes[] calldata attributes
-    ) external virtual {
+    ) external {
         // Extract Axelar commandId
         bytes32 commandId = abi.decode(messageKey, (bytes32));
 
@@ -56,7 +56,7 @@ abstract contract AxelarGatewayDestination is IERC7786GatewayDestinationPassive,
         string calldata remoteChain, // chain of the remote gateway - axelar format
         string calldata remoteAccount, // address of the remote gateway
         bytes calldata adapterPayload
-    ) internal virtual override {
+    ) internal override {
         // Parse the package
         (string memory sender, string memory receiver, bytes memory payload, bytes[] memory attributes) = abi.decode(
             adapterPayload,

contracts/crosschain/axelar/AxelarGatewaySource.sol

@@ -11,7 +11,7 @@ import {IERC7786GatewaySource} from "../interfaces/draft-IERC7786.sol";
 abstract contract AxelarGatewaySource is IERC7786GatewaySource, AxelarGatewayBase {
     using Strings for address;
 
-    function supportsAttribute(bytes4 /*selector*/) public view virtual returns (bool) {
+    function supportsAttribute(bytes4 /*selector*/) public pure returns (bool) {
         return false;
     }
 
@@ -20,9 +20,9 @@ abstract contract AxelarGatewaySource is IERC7786GatewaySource, AxelarGatewayBas
         string calldata receiver, // i.e. address
         bytes calldata payload,
         bytes[] calldata attributes
-    ) external payable virtual returns (bytes32) {
+    ) external payable returns (bytes32) {
         require(msg.value == 0, "Value not supported");
-        require(attributes.length == 0, UnsupportedAttribute(bytes4(attributes[0][0:4])));
+        if (attributes.length > 0) revert UnsupportedAttribute(bytes4(attributes[0][0:4]));
 
         // Create the package
         string memory sender = msg.sender.toChecksumHexString();

contracts/crosschain/mocks/ERC7786GatewayMock.sol

@@ -29,14 +29,12 @@ contract ERC7786GatewayMock is IERC7786GatewaySource, IERC7786GatewayDestination
         bytes calldata payload,
         bytes[] calldata attributes
     ) public payable returns (bytes32) {
-        string memory source = CAIP2.local();
-        string memory sender = msg.sender.toChecksumHexString();
+        require(msg.value == 0, "Value not supported");
+        if (attributes.length > 0) revert UnsupportedAttribute(bytes4(attributes[0][0:4]));
+        require(destination.equal(CAIP2.local()), "This mock only supports local messages");
 
-        require(destination.equal(source), "This mock only supports local messages");
-        for (uint256 i = 0; i < attributes.length; ++i) {
-            bytes4 selector = bytes4(attributes[i][0:4]);
-            if (!supportsAttribute(selector)) revert UnsupportedAttribute(selector);
-        }
+        string memory source = destination;
+        string memory sender = msg.sender.toChecksumHexString();
 
         if (_activeMode) {
             address target = Strings.parseAddress(receiver);