Merge pull request #26 from Big-Aaron/main

Set the evm version of MagicNumber/Solver.huff to paris
WTFAcademy · Aug 17, 2023 · 5a562f9 · 5a562f9
2 parents 1ed2403 + 27aacc2
commit 5a562f9
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,12 +4,15 @@
 [submodule "lib/openzeppelin-contracts-05"]
 	path = lib/openzeppelin-contracts-05
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = release-v2.5.0
 [submodule "lib/openzeppelin-contracts-06"]
 	path = lib/openzeppelin-contracts-06
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = release-v3.3
 [submodule "lib/openzeppelin-contracts-08"]
 	path = lib/openzeppelin-contracts-08
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+	branch = release-v4.9
 [submodule "lib/foundry-huff"]
 	path = lib/foundry-huff
-	url = https://github.com/huff-language/foundry-huff
+	url = https://github.com/huff-language/foundry-huff
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/foundry-huff b/lib/foundry-huff
diff --git a/lib/openzeppelin-contracts-05 b/lib/openzeppelin-contracts-05
diff --git a/lib/openzeppelin-contracts-06 b/lib/openzeppelin-contracts-06
diff --git a/lib/openzeppelin-contracts-08 b/lib/openzeppelin-contracts-08
diff --git a/src/Ethernaut/MagicNumber/MagicNum.t.sol b/src/Ethernaut/MagicNumber/MagicNum.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.0;
+pragma solidity 0.8.19;
 
 import "forge-std/Test.sol";
 import {HuffConfig} from "foundry-huff/HuffConfig.sol";
@@ -13,7 +13,8 @@ contract MagicNumTest is Test {
 
     function setUp() public {
         factory = new MagicNumFactory();
-        solverHuff = HuffDeployer.config().deploy("Ethernaut/MagicNumber/Solver");
+
+        solverHuff = HuffDeployer.config().with_evm_version("paris").deploy("Ethernaut/MagicNumber/Solver");
         solverAssembly = address(new solver());
 
         assertEq(Solver(address(solverAssembly)).whatIsTheMeaningOfLife(), bytes32(uint256(0x2a)));