Add storage gap to upgradeable contracts

src/child/ChildAxelarBridgeAdaptor.sol

@@ -13,12 +13,12 @@ import {IChildERC20BridgeAdaptor} from "../interfaces/child/IChildERC20BridgeAda
 import {AdaptorRoles} from "../common/AdaptorRoles.sol";
 
 contract ChildAxelarBridgeAdaptor is
+    AdaptorRoles,
     AxelarExecutable,
     IChildERC20BridgeAdaptor,
     IChildAxelarBridgeAdaptorErrors,
     IChildAxelarBridgeAdaptorEvents,
-    IChildAxelarBridgeAdaptor,
-    AdaptorRoles
+    IChildAxelarBridgeAdaptor
 {
     /// @notice Address of bridge to relay messages to.
     IChildERC20Bridge public childBridge;
@@ -131,4 +131,7 @@ contract ChildAxelarBridgeAdaptor is
         emit AdaptorExecute(sourceChain_, sourceAddress_, payload_);
         childBridge.onMessageReceive(sourceChain_, sourceAddress_, payload_);
     }
+
+    // slither-disable-next-line unused-state,naming-convention
+    uint256[50] private __gapChildAxelarBridgeAdaptor;
 }

src/child/ChildERC20Bridge.sol

@@ -23,7 +23,7 @@ import {BridgeRoles} from "../common/BridgeRoles.sol";
  * @dev Because of this pattern, any checks or logic that is agnostic to the messaging protocol should be done in ChildERC20Bridge.
  * @dev Any checks or logic that is specific to the underlying messaging protocol should be done in the bridge adaptor.
  */
-contract ChildERC20Bridge is IChildERC20BridgeErrors, IChildERC20Bridge, IChildERC20BridgeEvents, BridgeRoles {
+contract ChildERC20Bridge is BridgeRoles, IChildERC20BridgeErrors, IChildERC20Bridge, IChildERC20BridgeEvents {
     /// @dev leave this as the first param for the integration tests
     mapping(address => address) public rootTokenToChildToken;
 
@@ -429,4 +429,7 @@ contract ChildERC20Bridge is IChildERC20BridgeErrors, IChildERC20Bridge, IChildE
             emit IMXDeposit(rootToken, sender, receiver, amount);
         }
     }
+
+    // slither-disable-next-line unused-state,naming-convention
+    uint256[50] private __gapChildERC20Bridge;
 }

src/root/RootAxelarBridgeAdaptor.sol

@@ -16,12 +16,12 @@ import {AdaptorRoles} from "../common/AdaptorRoles.sol";
  * @notice RootAxelarBridgeAdaptor is a bridge adaptor that allows the RootERC20Bridge to communicate with the Axelar Gateway.
  */
 contract RootAxelarBridgeAdaptor is
+    AdaptorRoles,
     AxelarExecutable,
     IRootERC20BridgeAdaptor,
     IRootAxelarBridgeAdaptorEvents,
     IRootAxelarBridgeAdaptorErrors,
-    IRootAxelarBridgeAdaptor,
-    AdaptorRoles
+    IRootAxelarBridgeAdaptor
 {
     IRootERC20Bridge public rootBridge;
     string public childChain;
@@ -137,4 +137,7 @@ contract RootAxelarBridgeAdaptor is
         emit AdaptorExecute(sourceChain_, sourceAddress_, payload_);
         rootBridge.onMessageReceive(sourceChain_, sourceAddress_, payload_);
     }
+
+    // slither-disable-next-line unused-state,naming-convention
+    uint256[50] private __gapRootAxelarBridgeAdaptor;
 }

src/root/RootERC20Bridge.sol

@@ -28,7 +28,7 @@ import {BridgeRoles} from "../common/BridgeRoles.sol";
  * @dev Any checks or logic that is specific to the underlying messaging protocol should be done in the bridge adaptor.
  * @dev Note that there is undefined behaviour for bridging non-standard ERC20 tokens (e.g. rebasing tokens). Please approach such cases with great care.
  */
-contract RootERC20Bridge is IRootERC20Bridge, IRootERC20BridgeEvents, IRootERC20BridgeErrors, BridgeRoles {
+contract RootERC20Bridge is BridgeRoles, IRootERC20Bridge, IRootERC20BridgeEvents, IRootERC20BridgeErrors {
     using SafeERC20 for IERC20Metadata;
 
     /// @dev leave this as the first param for the integration tests
@@ -488,4 +488,7 @@ contract RootERC20Bridge is IRootERC20Bridge, IRootERC20BridgeEvents, IRootERC20
         }
         // slither-disable-next-line reentrancy-events
     }
+
+    // slither-disable-next-line unused-state,naming-convention
+    uint256[50] private __gapRootERC20Bridge;
 }

src/root/flowrate/FlowRateDetection.sol

@@ -126,5 +126,5 @@ abstract contract FlowRateDetection {
     }
 
     // slither-disable-next-line unused-state,naming-convention
-    uint256[50] private __gapFlowRateDetecton;
+    uint256[50] private __gapFlowRateDetection;
 }

src/root/flowrate/RootERC20BridgeFlowRate.sol

@@ -255,5 +255,5 @@ contract RootERC20BridgeFlowRate is
     }
 
     // slither-disable-next-line unused-state,naming-convention
-    uint256[50] private __gapRootERC20PredicateFlowRate;
+    uint256[50] private __gapRootERC20BridgeFlowRate;
 }