Reorder variable, events and errors declarations in AxelarGatewayBase

Author: Amxx

contracts/crosschain/axelar/AxelarGatewayBase.sol

@@ -16,6 +16,17 @@ import {InteroperableAddress} from "@openzeppelin/contracts/utils/draft-Interope
 abstract contract AxelarGatewayBase is Ownable {
     using InteroperableAddress for bytes;
 
+    /// @dev Axelar's official gateway for the current chain.
+    IAxelarGateway internal immutable _axelarGateway;
+
+    // Remote gateway.
+    // `addr` is the isolated address part of ERC-7930. Its not a full ERC-7930 interoperable address.
+    mapping(bytes2 chainType => mapping(bytes chainReference => bytes addr)) private _remoteGateways;
+
+    // chain equivalence ERC-7930 (no address) <> Axelar
+    mapping(bytes erc7930 => string axelar) private _erc7930ToAxelar;
+    mapping(string axelar => bytes erc7930) private _axelarToErc7930;
+
     /// @dev A remote gateway has been registered for a chain.
     event RegisteredRemoteGateway(bytes remote);
 
@@ -29,17 +40,6 @@ abstract contract AxelarGatewayBase is Ownable {
     error ChainEquivalenceAlreadyRegistered(bytes erc7930binary, string axelar);
     error RemoteGatewayAlreadyRegistered(bytes2 chainType, bytes chainReference);
 
-    /// @dev Axelar's official gateway for the current chain.
-    IAxelarGateway internal immutable _axelarGateway;
-
-    // Remote gateway.
-    // `addr` is the isolated address part of ERC-7930. Its not a full ERC-7930 interoperable address.
-    mapping(bytes2 chainType => mapping(bytes chainReference => bytes addr)) private _remoteGateways;
-
-    // chain equivalence ERC-7930 (no address) <> Axelar
-    mapping(bytes erc7930 => string axelar) private _erc7930ToAxelar;
-    mapping(string axelar => bytes erc7930) private _axelarToErc7930;
-
     /// @dev Sets the local gateway address (i.e. Axelar's official gateway for the current chain).
     constructor(IAxelarGateway _gateway) {
         _axelarGateway = _gateway;

contracts/crosschain/axelar/AxelarGatewayDestination.sol

@@ -15,8 +15,8 @@ import {AxelarGatewayBase} from "./AxelarGatewayBase.sol";
  * workflow into the standard ERC-7786.
  */
 abstract contract AxelarGatewayDestination is AxelarGatewayBase, AxelarExecutable {
-    using Strings for *;
     using InteroperableAddress for bytes;
+    using Strings for *;
 
     error InvalidOriginGateway(string axelarSourceChain, string axelarSourceAddress);
     error ReceiverExecutionFailed();
@@ -43,6 +43,7 @@ abstract contract AxelarGatewayDestination is AxelarGatewayBase, AxelarExecutabl
             adapterPayload,
             (bytes, bytes, bytes, bytes[])
         );
+
         // Axelar to ERC-7930 translation
         bytes memory addr = getRemoteGateway(getErc7930Chain(axelarSourceChain));
 
@@ -53,13 +54,8 @@ abstract contract AxelarGatewayDestination is AxelarGatewayBase, AxelarExecutabl
             InvalidOriginGateway(axelarSourceChain, axelarSourceAddress)
         );
 
-        (, , bytes memory target) = recipient.parseV1();
-        bytes4 result = IERC7786Receiver(address(bytes20(target))).executeMessage(
-            commandId,
-            sender,
-            payload,
-            attributes
-        );
+        (, address target) = recipient.parseEvmV1();
+        bytes4 result = IERC7786Receiver(target).executeMessage(commandId, sender, payload, attributes);
         require(result == IERC7786Receiver.executeMessage.selector, ReceiverExecutionFailed());
     }
 }