audit: APEX-478 Import syntax

Ethernal-Tech · Jan 24, 2025 · 6dd05a9 · 6dd05a9
1 parent 8021e65
commit 6dd05a9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/contracts/Gateway.sol b/contracts/Gateway.sol
@@ -5,10 +5,10 @@ import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import "./interfaces/IGateway.sol";
-import "./interfaces/IGatewayStructs.sol";
-import "./interfaces/IValidators.sol";
-import "./NativeTokenPredicate.sol";
+import {IGateway} from "./interfaces/IGateway.sol";
+import {IGatewayStructs} from "./interfaces/IGatewayStructs.sol";
+import {IValidators} from "./interfaces/IValidators.sol";
+import {NativeTokenPredicate} from "./NativeTokenPredicate.sol";
 
 contract Gateway is
     IGateway,

diff --git a/contracts/NativeTokenPredicate.sol b/contracts/NativeTokenPredicate.sol
@@ -9,10 +9,10 @@ import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/proxy/Clones.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
-import "./interfaces/INativeTokenPredicate.sol";
-import "./interfaces/INativeTokenWallet.sol";
-import "./interfaces/IGateway.sol";
-import "./interfaces/IGatewayStructs.sol";
+import {INativeTokenPredicate} from "./interfaces/INativeTokenPredicate.sol";
+import {INativeTokenWallet} from "./interfaces/INativeTokenWallet.sol";
+import {IGateway} from "./interfaces/IGateway.sol";
+import {IGatewayStructs} from "./interfaces/IGatewayStructs.sol";
 
 /**
     @title ERC20TokenPredicate

diff --git a/contracts/NativeTokenWallet.sol b/contracts/NativeTokenWallet.sol
@@ -5,9 +5,9 @@ import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "./interfaces/IGatewayStructs.sol";
-import "./interfaces/INativeTokenWallet.sol";
-import "./NativeTokenPredicate.sol";
+import {IGatewayStructs} from "./interfaces/IGatewayStructs.sol";
+import {INativeTokenWallet} from "./interfaces/INativeTokenWallet.sol";
+import {NativeTokenPredicate} from "./NativeTokenPredicate.sol";
 
 /**
     @title NativeToken

diff --git a/contracts/Validators.sol b/contracts/Validators.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.24;
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
-import "./interfaces/IValidators.sol";
-import "./interfaces/IGatewayStructs.sol";
+import {IValidators} from "./interfaces/IValidators.sol";
+import {IGatewayStructs} from "./interfaces/IGatewayStructs.sol";
 
 contract Validators is
     IValidators,

diff --git a/contracts/interfaces/IGateway.sol b/contracts/interfaces/IGateway.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "./IGatewayStructs.sol";
+import {IGatewayStructs} from "./IGatewayStructs.sol";
 
 interface IGateway is IGatewayStructs {
     function deposit(

diff --git a/contracts/interfaces/INativeTokenPredicate.sol b/contracts/interfaces/INativeTokenPredicate.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import "./IGatewayStructs.sol";
+import {IGatewayStructs} from "./IGatewayStructs.sol";
 
 interface INativeTokenPredicate is IGatewayStructs {
     function deposit(

diff --git a/contracts/interfaces/IValidators.sol b/contracts/interfaces/IValidators.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.24;
 
-import "./IGatewayStructs.sol";
+import {IGatewayStructs} from "./IGatewayStructs.sol";
 
 interface IValidators is IGatewayStructs {
     function setValidatorsChainData(