Transpile 0ed435b7

contracts/access/AccessControlCrossChainUpgradeable.sol

@@ -24,13 +24,13 @@ import "../proxy/utils/Initializable.sol";
  * _Available since v4.6._
  */
 abstract contract AccessControlCrossChainUpgradeable is Initializable, AccessControlUpgradeable, CrossChainEnabledUpgradeable {
+    bytes32 public constant CROSSCHAIN_ALIAS = keccak256("CROSSCHAIN_ALIAS");
+
     function __AccessControlCrossChain_init() internal onlyInitializing {
     }
 
     function __AccessControlCrossChain_init_unchained() internal onlyInitializing {
     }
-    bytes32 public constant CROSSCHAIN_ALIAS = keccak256("CROSSCHAIN_ALIAS");
-
     /**
      * @dev See {AccessControl-_checkRole}.
      */

contracts/access/AccessControlEnumerableUpgradeable.sol

@@ -12,15 +12,15 @@ import "../proxy/utils/Initializable.sol";
  * @dev Extension of {AccessControl} that allows enumerating the members of each role.
  */
 abstract contract AccessControlEnumerableUpgradeable is Initializable, IAccessControlEnumerableUpgradeable, AccessControlUpgradeable {
+    using EnumerableSetUpgradeable for EnumerableSetUpgradeable.AddressSet;
+
+    mapping(bytes32 => EnumerableSetUpgradeable.AddressSet) private _roleMembers;
+
     function __AccessControlEnumerable_init() internal onlyInitializing {
     }
 
     function __AccessControlEnumerable_init_unchained() internal onlyInitializing {
     }
-    using EnumerableSetUpgradeable for EnumerableSetUpgradeable.AddressSet;
-
-    mapping(bytes32 => EnumerableSetUpgradeable.AddressSet) private _roleMembers;
-
     /**
      * @dev See {IERC165-supportsInterface}.
      */

contracts/access/AccessControlUpgradeable.sol

@@ -49,11 +49,6 @@ import "../proxy/utils/Initializable.sol";
  * to enforce additional security measures for this role.
  */
 abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable, IAccessControlUpgradeable, ERC165Upgradeable {
-    function __AccessControl_init() internal onlyInitializing {
-    }
-
-    function __AccessControl_init_unchained() internal onlyInitializing {
-    }
     struct RoleData {
         mapping(address => bool) members;
         bytes32 adminRole;
@@ -78,6 +73,11 @@ abstract contract AccessControlUpgradeable is Initializable, ContextUpgradeable,
         _;
     }
 
+    function __AccessControl_init() internal onlyInitializing {
+    }
+
+    function __AccessControl_init_unchained() internal onlyInitializing {
+    }
     /**
      * @dev See {IERC165-supportsInterface}.
      */

contracts/access/Ownable2StepUpgradeable.sol

@@ -18,16 +18,16 @@ import "../proxy/utils/Initializable.sol";
  * from parent (Ownable).
  */
 abstract contract Ownable2StepUpgradeable is Initializable, OwnableUpgradeable {
+    address private _pendingOwner;
+
+    event OwnershipTransferStarted(address indexed previousOwner, address indexed newOwner);
+
     function __Ownable2Step_init() internal onlyInitializing {
         __Ownable_init_unchained();
     }
 
     function __Ownable2Step_init_unchained() internal onlyInitializing {
     }
-    address private _pendingOwner;
-
-    event OwnershipTransferStarted(address indexed previousOwner, address indexed newOwner);
-
     /**
      * @dev Returns the address of the pending owner.
      */

contracts/crosschain/CrossChainEnabledUpgradeable.sol

@@ -19,11 +19,6 @@ import "../proxy/utils/Initializable.sol";
  * _Available since v4.6._
  */
 abstract contract CrossChainEnabledUpgradeable is Initializable {
-    function __CrossChainEnabled_init() internal onlyInitializing {
-    }
-
-    function __CrossChainEnabled_init_unchained() internal onlyInitializing {
-    }
     /**
      * @dev Throws if the current function call is not the result of a
      * cross-chain execution.
@@ -43,6 +38,11 @@ abstract contract CrossChainEnabledUpgradeable is Initializable {
         _;
     }
 
+    function __CrossChainEnabled_init() internal onlyInitializing {
+    }
+
+    function __CrossChainEnabled_init_unchained() internal onlyInitializing {
+    }
     /**
      * @dev Returns whether the current function call is the result of a
      * cross-chain message.

contracts/governance/IGovernorUpgradeable.sol

@@ -13,11 +13,6 @@ import "../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorUpgradeable is Initializable, IERC165Upgradeable, IERC6372Upgradeable {
-    function __IGovernor_init() internal onlyInitializing {
-    }
-
-    function __IGovernor_init_unchained() internal onlyInitializing {
-    }
     enum ProposalState {
         Pending,
         Active,
@@ -76,6 +71,11 @@ abstract contract IGovernorUpgradeable is Initializable, IERC165Upgradeable, IER
         bytes params
     );
 
+    function __IGovernor_init() internal onlyInitializing {
+    }
+
+    function __IGovernor_init_unchained() internal onlyInitializing {
+    }
     /**
      * @notice module:core
      * @dev Name of the governor instance (used in building the ERC712 domain separator).

contracts/governance/compatibility/GovernorCompatibilityBravoUpgradeable.sol

@@ -20,11 +20,6 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGovernorTimelockUpgradeable, IGovernorCompatibilityBravoUpgradeable, GovernorUpgradeable {
-    function __GovernorCompatibilityBravo_init() internal onlyInitializing {
-    }
-
-    function __GovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
-    }
     enum VoteType {
         Against,
         For,
@@ -46,6 +41,11 @@ abstract contract GovernorCompatibilityBravoUpgradeable is Initializable, IGover
 
     mapping(uint256 => ProposalDetails) private _proposalDetails;
 
+    function __GovernorCompatibilityBravo_init() internal onlyInitializing {
+    }
+
+    function __GovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
+    }
     // solhint-disable-next-line func-name-mixedcase
     function COUNTING_MODE() public pure virtual override returns (string memory) {
         return "support=bravo&quorum=bravo";

contracts/governance/compatibility/IGovernorCompatibilityBravoUpgradeable.sol

@@ -12,11 +12,6 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorCompatibilityBravoUpgradeable is Initializable, IGovernorUpgradeable {
-    function __IGovernorCompatibilityBravo_init() internal onlyInitializing {
-    }
-
-    function __IGovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
-    }
     /**
      * @dev Proposal structure from Compound Governor Bravo. Not actually used by the compatibility layer, as
      * {{proposal}} returns a very different structure.
@@ -48,6 +43,11 @@ abstract contract IGovernorCompatibilityBravoUpgradeable is Initializable, IGove
         uint96 votes;
     }
 
+    function __IGovernorCompatibilityBravo_init() internal onlyInitializing {
+    }
+
+    function __IGovernorCompatibilityBravo_init_unchained() internal onlyInitializing {
+    }
     /**
      * @dev Part of the Governor Bravo's interface.
      */

contracts/governance/extensions/GovernorCountingSimpleUpgradeable.sol

@@ -12,11 +12,6 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUpgradeable {
-    function __GovernorCountingSimple_init() internal onlyInitializing {
-    }
-
-    function __GovernorCountingSimple_init_unchained() internal onlyInitializing {
-    }
     /**
      * @dev Supported vote types. Matches Governor Bravo ordering.
      */
@@ -35,6 +30,11 @@ abstract contract GovernorCountingSimpleUpgradeable is Initializable, GovernorUp
 
     mapping(uint256 => ProposalVote) private _proposalVotes;
 
+    function __GovernorCountingSimple_init() internal onlyInitializing {
+    }
+
+    function __GovernorCountingSimple_init_unchained() internal onlyInitializing {
+    }
     /**
      * @dev See {IGovernor-COUNTING_MODE}.
      */

contracts/governance/extensions/IGovernorTimelockUpgradeable.sol

@@ -12,13 +12,13 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.3._
  */
 abstract contract IGovernorTimelockUpgradeable is Initializable, IGovernorUpgradeable {
+    event ProposalQueued(uint256 proposalId, uint256 eta);
+
     function __IGovernorTimelock_init() internal onlyInitializing {
     }
 
     function __IGovernorTimelock_init_unchained() internal onlyInitializing {
     }
-    event ProposalQueued(uint256 proposalId, uint256 eta);
-
     function timelock() public view virtual returns (address);
 
     function proposalEta(uint256 proposalId) public view virtual returns (uint256);

contracts/governance/utils/VotesUpgradeable.sol

@@ -30,11 +30,6 @@ import "../../proxy/utils/Initializable.sol";
  * _Available since v4.5._
  */
 abstract contract VotesUpgradeable is Initializable, ContextUpgradeable, EIP712Upgradeable, IERC5805Upgradeable {
-    function __Votes_init() internal onlyInitializing {
-    }
-
-    function __Votes_init_unchained() internal onlyInitializing {
-    }
     using CheckpointsUpgradeable for CheckpointsUpgradeable.Trace224;
     using CountersUpgradeable for CountersUpgradeable.Counter;
 
@@ -51,6 +46,11 @@ abstract contract VotesUpgradeable is Initializable, ContextUpgradeable, EIP712U
 
     mapping(address => CountersUpgradeable.Counter) private _nonces;
 
+    function __Votes_init() internal onlyInitializing {
+    }
+
+    function __Votes_init_unchained() internal onlyInitializing {
+    }
     /**
      * @dev Clock used for flagging checkpoints. Can be overridden to implement timestamp based
      * checkpoints (and voting), in which case {CLOCK_MODE} should be overridden as well to match.

contracts/mocks/CallReceiverMockUpgradeable.sol

@@ -4,16 +4,16 @@ pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
 contract CallReceiverMockUpgradeable is Initializable {
-    function __CallReceiverMock_init() internal onlyInitializing {
-    }
-
-    function __CallReceiverMock_init_unchained() internal onlyInitializing {
-    }
     event MockFunctionCalled();
     event MockFunctionCalledWithArgs(uint256 a, uint256 b);
 
     uint256[] private _array;
 
+    function __CallReceiverMock_init() internal onlyInitializing {
+    }
+
+    function __CallReceiverMock_init_unchained() internal onlyInitializing {
+    }
     function mockFunction() public payable returns (string memory) {
         emit MockFunctionCalled();
 

contracts/mocks/ConditionalEscrowMockUpgradeable.sol

@@ -7,14 +7,14 @@ import "../proxy/utils/Initializable.sol";
 
 // mock class using ConditionalEscrow
 contract ConditionalEscrowMockUpgradeable is Initializable, ConditionalEscrowUpgradeable {
+    mapping(address => bool) private _allowed;
+
     function __ConditionalEscrowMock_init() internal onlyInitializing {
         __Ownable_init_unchained();
     }
 
     function __ConditionalEscrowMock_init_unchained() internal onlyInitializing {
     }
-    mapping(address => bool) private _allowed;
-
     function setAllowed(address payee, bool allowed) public {
         _allowed[payee] = allowed;
     }

contracts/mocks/ContextMockUpgradeable.sol

@@ -6,13 +6,13 @@ import "../utils/ContextUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ContextMockUpgradeable is Initializable, ContextUpgradeable {
+    event Sender(address sender);
+
     function __ContextMock_init() internal onlyInitializing {
     }
 
     function __ContextMock_init_unchained() internal onlyInitializing {
     }
-    event Sender(address sender);
-
     function msgSender() public {
         emit Sender(_msgSender());
     }

contracts/mocks/DummyImplementationUpgradeable.sol

@@ -20,15 +20,15 @@ abstract contract ImplUpgradeable is Initializable {
 }
 
 contract DummyImplementationUpgradeable is Initializable {
+    uint256 public value;
+    string public text;
+    uint256[] public values;
+
     function __DummyImplementation_init() internal onlyInitializing {
     }
 
     function __DummyImplementation_init_unchained() internal onlyInitializing {
     }
-    uint256 public value;
-    string public text;
-    uint256[] public values;
-
     function initializeNonPayable() public {
         value = 10;
     }

contracts/mocks/ERC20ReentrantUpgradeable.sol

@@ -6,12 +6,6 @@ import "../token/ERC20/extensions/ERC4626Upgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract ERC20ReentrantUpgradeable is Initializable, ERC20Upgradeable {
-    function __ERC20Reentrant_init() internal onlyInitializing {
-        __ERC20_init_unchained("TEST", "TST");
-    }
-
-    function __ERC20Reentrant_init_unchained() internal onlyInitializing {
-    }
     enum Type {
         No,
         Before,
@@ -22,6 +16,12 @@ contract ERC20ReentrantUpgradeable is Initializable, ERC20Upgradeable {
     address private _reenterTarget;
     bytes private _reenterData;
 
+    function __ERC20Reentrant_init() internal onlyInitializing {
+        __ERC20_init_unchained("TEST", "TST");
+    }
+
+    function __ERC20Reentrant_init_unchained() internal onlyInitializing {
+    }
     function scheduleReenter(Type when, address target, bytes calldata data) external {
         _reenterType = when;
         _reenterTarget = target;

contracts/mocks/EtherReceiverMockUpgradeable.sol

@@ -4,13 +4,13 @@ pragma solidity ^0.8.0;
 import "../proxy/utils/Initializable.sol";
 
 contract EtherReceiverMockUpgradeable is Initializable {
+    bool private _acceptEther;
+
     function __EtherReceiverMock_init() internal onlyInitializing {
     }
 
     function __EtherReceiverMock_init_unchained() internal onlyInitializing {
     }
-    bool private _acceptEther;
-
     function setAcceptEther(bool acceptEther) public {
         _acceptEther = acceptEther;
     }

contracts/mocks/StorageSlotMockUpgradeable.sol

@@ -6,13 +6,13 @@ import "../utils/StorageSlotUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract StorageSlotMockUpgradeable is Initializable {
+    using StorageSlotUpgradeable for *;
+
     function __StorageSlotMock_init() internal onlyInitializing {
     }
 
     function __StorageSlotMock_init_unchained() internal onlyInitializing {
     }
-    using StorageSlotUpgradeable for *;
-
     function setBoolean(bytes32 slot, bool value) public {
         slot.getBooleanSlot().value = value;
     }

contracts/mocks/TimelockReentrantUpgradeable.sol

@@ -5,15 +5,15 @@ import "../utils/AddressUpgradeable.sol";
 import "../proxy/utils/Initializable.sol";
 
 contract TimelockReentrantUpgradeable is Initializable {
+    address private _reenterTarget;
+    bytes private _reenterData;
+    bool _reentered;
+
     function __TimelockReentrant_init() internal onlyInitializing {
     }
 
     function __TimelockReentrant_init_unchained() internal onlyInitializing {
     }
-    address private _reenterTarget;
-    bytes private _reenterData;
-    bool _reentered;
-
     function disableReentrancy() external {
         _reentered = true;
     }