Fix pragma and imports for some contracts

stader-labs · Sep 30, 2024 · 6889ca1 · 6889ca1
1 parent 2b11895
commit 6889ca1
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 30 deletions.
diff --git a/contracts/interfaces/IPolygonMigration.sol b/contracts/interfaces/IPolygonMigration.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: MIT
+// SPDX-License-Identifier: GPL-3.0
 pragma solidity 0.8.7;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/contracts/lib/ExitPayloadReader.sol b/contracts/lib/ExitPayloadReader.sol
@@ -1,4 +1,5 @@
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 import { RLPReader } from "./RLPReader.sol";
 

diff --git a/contracts/lib/Merkle.sol b/contracts/lib/Merkle.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 library Merkle {
 	function checkMembership(

diff --git a/contracts/lib/MerklePatriciaProof.sol b/contracts/lib/MerklePatriciaProof.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 import { RLPReader } from "./RLPReader.sol";
 

diff --git a/contracts/lib/RLPReader.sol b/contracts/lib/RLPReader.sol
@@ -1,8 +1,5 @@
-/*
- * @author Hamdi Allam [email protected]
- * Please reach out with any questions or concerns
- */
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 library RLPReader {
 	uint8 constant STRING_SHORT_START = 0x80;

diff --git a/contracts/state-transfer/FxStateChildTunnel.sol b/contracts/state-transfer/FxStateChildTunnel.sol
@@ -1,8 +1,7 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.7;
-
-import "@openzeppelin/contracts/access/AccessControl.sol";
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
+import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
 import { FxBaseChildTunnel } from "../tunnel/FxBaseChildTunnel.sol";
 
 /**

diff --git a/contracts/state-transfer/FxStateRootTunnel.sol b/contracts/state-transfer/FxStateRootTunnel.sol
@@ -1,8 +1,7 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.7;
-
-import "@openzeppelin/contracts/access/AccessControl.sol";
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
+import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
 import { FxBaseRootTunnel } from "../tunnel/FxBaseRootTunnel.sol";
 
 /**

diff --git a/contracts/state-transfer/RateProvider.sol b/contracts/state-transfer/RateProvider.sol
@@ -1,10 +1,9 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.7;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
-import "@openzeppelin/contracts/access/AccessControl.sol";
-
-import "../interfaces/IRateProvider.sol";
-import "../interfaces/IFxStateChildTunnel.sol";
+import { AccessControl } from "@openzeppelin/contracts/access/AccessControl.sol";
+import { IRateProvider } from "../interfaces/IRateProvider.sol";
+import { IFxStateChildTunnel } from "../interfaces/IFxStateChildTunnel.sol";
 
 /**
  * @title RateProvider

diff --git a/contracts/tunnel/FxBaseChildTunnel.sol b/contracts/tunnel/FxBaseChildTunnel.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 // IFxMessageProcessor represents interface to process message
 interface IFxMessageProcessor {

diff --git a/contracts/tunnel/FxBaseRootTunnel.sol b/contracts/tunnel/FxBaseRootTunnel.sol
@@ -1,10 +1,10 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity 0.8.7;
 
 import { RLPReader } from "../lib/RLPReader.sol";
 import { MerklePatriciaProof } from "../lib/MerklePatriciaProof.sol";
 import { Merkle } from "../lib/Merkle.sol";
-import "../lib/ExitPayloadReader.sol";
+import { ExitPayloadReader } from "../lib/ExitPayloadReader.sol";
 
 interface IFxStateSender {
 	function sendMessageToChild(