refactor part 3 - almost final

sofinico · May 12, 2024 · 407dec6 · 407dec6
1 parent c492188
commit 407dec6
Show file tree

Hide file tree

Showing 17 changed files with 39 additions and 24 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -7,10 +7,6 @@
 [submodule "lib/openzeppelin-contracts-06"]
 	path = lib/openzeppelin-contracts-06
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-
-# openzeppelin contracts versions
-# forge install openzeppelin-contracts-06=OpenZeppelin/openzeppelin-contracts@v3.4.2
-# forge install openzeppelin-contracts-08=OpenZeppelin/openzeppelin-contracts@v4.7.3
 [submodule "lib/openzeppelin-contracts-08"]
 	path = lib/openzeppelin-contracts-08
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/README.md b/README.md
@@ -19,3 +19,20 @@ Custom "test" with typescript + ethers.js
 ```zsh
 npm test <file-path>
 ```
+
+## Additional notes
+
+### openzeppelin-contracts
+
+OpenZeppelin contracts versions 
+
+- `openzeppelin-contracts-06` corresponds to `v3.4.2`;
+- `openzeppelin-contracts-08` corresponds to `v4.7.3`.
+
+This is analogous as how it is done in [ethernaut](https://github.com/OpenZeppelin/ethernaut/tree/master) repo. This versioning install is done via
+
+```bash
+forge install openzeppelin-contracts-06=OpenZeppelin/openzeppelin-contracts@v3.4.2
+```
+
+respectively.
diff --git a/remappings.txt b/remappings.txt
@@ -1,3 +1,4 @@
-@forge-std/=lib/forge-std/src/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
+forge-std/=lib/forge-std/src/
+openzeppelin-contracts-06/=lib/openzeppelin-contracts-06/contracts/
+openzeppelin-contracts-08/=lib/openzeppelin-contracts-08/contracts/
+openzeppelin-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
diff --git a/src/Ethernaut.sol b/src/Ethernaut.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "openzeppelin-contracts-08/access/Ownable.sol";
 import "./levels/base/Level.sol";
 
 interface IStatistics {

diff --git a/src/attacks/NaughtCoinAttack.sol b/src/attacks/NaughtCoinAttack.sol
@@ -1,7 +1,7 @@
 /// SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "openzeppelin-contracts-08/token/ERC20/IERC20.sol";
 
 contract NaughtCoinAttack {
     IERC20 public token;

diff --git a/src/levels/NaughtCoin.sol b/src/levels/NaughtCoin.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "openzeppelin-contracts-08/token/ERC20/ERC20.sol";
 
 contract NaughtCoin is ERC20 {
     // string public constant name = 'NaughtCoin';

diff --git a/src/levels/base/Level.sol b/src/levels/base/Level.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "openzeppelin-contracts-08/access/Ownable.sol";
 
 abstract contract Level is Ownable {
     function createInstance(address _player) public payable virtual returns (address);

diff --git a/src/metrics/Statistics.sol b/src/metrics/Statistics.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "openzeppelin-upgradeable/proxy/utils/Initializable.sol";
 
 contract Statistics is Initializable {
     address public ethernaut;

diff --git a/src/metrics/StatisticsLevelSuperseder.sol b/src/metrics/StatisticsLevelSuperseder.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "openzeppelin-upgradeable/proxy/utils/Initializable.sol";
+import "openzeppelin-contracts-08/access/Ownable.sol";
 
 contract StatisticsLevelSuperseder is Initializable {
     address public ethernaut;

diff --git a/src/proxy/ProxyAdmin.sol b/src/proxy/ProxyAdmin.sol
@@ -3,8 +3,8 @@
 
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "openzeppelin-contracts-08/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "openzeppelin-contracts-08/access/Ownable.sol";
 
 /**
  * @dev This is an auxiliary contract meant to be assigned as the admin of a {TransparentUpgradeableProxy}. For an

diff --git a/src/proxy/ProxyStats.sol b/src/proxy/ProxyStats.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "openzeppelin-contracts-08/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 contract ProxyStats is TransparentUpgradeableProxy {
     constructor(address _impl, address _admin, address _ethernautAddress)

diff --git a/test/GatekeeperOne.t.sol b/test/GatekeeperOne.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import {Test, console} from "@forge-std/Test.sol";
+import {Test, console} from "forge-std/Test.sol";
 import {Utils} from "./utils/Utils.sol";
 
 import {GatekeeperOne} from "../src/levels/GatekeeperOne.sol";

diff --git a/test/GatekeeperOneOld.t.sol b/test/GatekeeperOneOld.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.0;
 
-import {Test, console} from "@forge-std/Test.sol";
+import {Test, console} from "forge-std/Test.sol";
 import {Utils} from "./utils/Utils.sol";
 
 import {GatekeeperOne} from "../src/levels/GatekeeperOne.sol";

diff --git a/test/GatekeeperTwo.t.sol b/test/GatekeeperTwo.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.13;
 
-import {Test, console} from "@forge-std/Test.sol";
+import {Test, console} from "forge-std/Test.sol";
 import {Utils} from "./utils/Utils.sol";
 
 import {GatekeeperTwo} from "../src/levels/GatekeeperTwo.sol";

diff --git a/test/NaughtCoin.t.sol b/test/NaughtCoin.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.13;
 
-import {Test, console} from "@forge-std/Test.sol";
+import {Test, console} from "forge-std/Test.sol";
 import {Utils} from "./utils/Utils.sol";
 
 import {NaughtCoin} from "../src/levels/NaughtCoin.sol";

diff --git a/test/Preservation.t.sol b/test/Preservation.t.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.13;
 
-import {Test, console} from "@forge-std/Test.sol";
+import "forge-std/Test.sol";
 import {Utils} from "./utils/Utils.sol";
 
-import {Preservation} from "../src/levels/Preservation.sol";
+import {Preservation, LibraryContract} from "../src/levels/Preservation.sol";
 import {PreservationFactory} from "../src/levels/PreservationFactory.sol";
 import {PreservationAttack} from "../src/attacks/PreservationAttack.sol";
 

diff --git a/test/utils/Utils.sol b/test/utils/Utils.sol
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {Test, console} from "@forge-std/Test.sol";
+import "forge-std/Test.sol";
+import "forge-std/StdJson.sol";
 
 import {Ethernaut} from "src/Ethernaut.sol";
 import {Statistics} from "src/metrics/Statistics.sol";