fix to pass ci

minaminao · minaminao · commit f34b4a3b92f0 · 2024-06-26T03:12:56.000+09:00
diff --git a/.env b/.env
diff --git a/.env.template b/.env.template
@@ -0,0 +1 @@
+RPC_MAINNET=https://rpc.ankr.com/eth
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,6 +12,7 @@ on:
 
 env:
   FOUNDRY_PROFILE: ci
+  RPC_MAINNET: ${{ secrets.RPC_MAINNET }}
 
 jobs:
   check:
diff --git a/.gitignore b/.gitignore
@@ -37,3 +37,5 @@ storage
 *.gz
 
 attachments/
+
+.env
diff --git a/foundry.toml b/foundry.toml
@@ -13,15 +13,12 @@ ignored_error_codes = [
     9302, # Warning (9302): Return value of low-level calls not used.
 ]
 
-# For Huff & Vyper
+# For Huff
 ffi = true
 fs_permissions = [{ access = "read", path = "./out" }]
 
 # For CREATE2
 bytecode_hash = "none"
 cbor_metadata = false
 
-[profile.default.rpc_endpoints]
-mainnet = "https://rpc.ankr.com/eth"
-
 # See more config options https://github.com/foundry-rs/foundry/tree/master/crates/config
diff --git a/src/Ethernaut/CoinFlip/CoinFlipExploit.t.sol b/src/Ethernaut/CoinFlip/CoinFlipExploit.t.sol
@@ -4,7 +4,6 @@ pragma solidity ^0.8.13;
 import {Test, console2} from "forge-std/Test.sol";
 import {playerScript, CoinFlipExploit} from "./CoinFlipExploit.sol";
 import {CoinFlipFactory} from "./CoinFlipFactory.sol";
-import {VyperUtils} from "src/utils/VyperUtils.sol";
 
 contract CoinFlipExploitTest is Test {
     address playerAddr = makeAddr("player");
@@ -30,9 +29,7 @@ contract CoinFlipExploitTest is Test {
     }
 
     function testExploitVyper() public solveChecker {
-        VyperUtils vyperUtils = new VyperUtils();
-        vm.allowCheatcodes(address(vyperUtils));
-        address exploitAddr = vyperUtils.deploy("src/Ethernaut/CoinFlip/CoinFlipExploit.vy");
+        address exploitAddr = deployCode("src/Ethernaut/CoinFlip/CoinFlipExploit.vy");
         for (uint256 i = 0; i < 10; i++) {
             vm.roll(i + 10);
             (bool success,) = exploitAddr.call(abi.encodeWithSignature("exploit(address)", instanceAddr));
diff --git a/src/Ethernaut/CoinFlip/CoinFlipExploit.vy b/src/Ethernaut/CoinFlip/CoinFlipExploit.vy
@@ -7,6 +7,6 @@ interface ICoinFlip:
 def exploit(instanceAddress: address):
     instance: ICoinFlip = ICoinFlip(instanceAddress)
     blockValue: uint256 = convert(blockhash(block.number - 1), uint256)
-    coinFlip: uint256 = blockValue / FACTOR
+    coinFlip: uint256 = blockValue // FACTOR
     side: bool = coinFlip == 1
-    instance.flip(side)
+    extcall instance.flip(side)
diff --git a/src/HuffChallenge/challenge5/Challenge5.t.sol b/src/HuffChallenge/challenge5/Challenge5.t.sol
@@ -10,7 +10,7 @@ contract Challenge5Test is Test {
 
     function setUp() public {
         // Fork mainnet
-        vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));
+        vm.createSelectFork(vm.envString("RPC_MAINNET"));
         solver = HuffDeployer.config().deploy("HuffChallenge/challenge5/Challenge5");
     }
 
diff --git a/src/ParadigmCTF2021/Farmer/FarmerExploit.t.sol b/src/ParadigmCTF2021/Farmer/FarmerExploit.t.sol
@@ -8,7 +8,7 @@ contract FarmerExploitTest is Test {
     address playerAddress = makeAddr("player");
 
     function setUp() public {
-        vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));
+        vm.createSelectFork(vm.envString("RPC_MAINNET"));
         vm.deal(playerAddress, 10 ether);
     }
 
diff --git a/src/ParadigmCTF2021/Secure/SecureExploit.t.sol b/src/ParadigmCTF2021/Secure/SecureExploit.t.sol
@@ -8,7 +8,7 @@ contract SecureExploitTest is Test {
     address playerAddress = makeAddr("player");
 
     function setUp() public {
-        vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));
+        vm.createSelectFork(vm.envString("RPC_MAINNET"));
         vm.deal(playerAddress, 50 ether);
     }
 
diff --git a/src/ParadigmCTF2023/GrainsOfSand/Exploit.t.sol b/src/ParadigmCTF2023/GrainsOfSand/Exploit.t.sol
@@ -13,7 +13,7 @@ contract ExploitTest is Test {
     IToken token;
 
     function setUp() public {
-        vm.createSelectFork("mainnet", 18437825);
+        vm.createSelectFork(vm.envString("RPC_MAINNET"), 18437825);
         vm.deal(playerAddr, 1000 ether);
         challenge = new Challenge();
         tokenStore = ITokenStore(0x1cE7AE555139c5EF5A57CC8d814a867ee6Ee33D8);
diff --git a/src/ParadigmCTF2023/SkillBasedGame/Exploit.t.sol b/src/ParadigmCTF2023/SkillBasedGame/Exploit.t.sol
@@ -11,7 +11,7 @@ contract ExploitTest is Test {
     Challenge challenge;
 
     function setUp() public {
-        vm.createSelectFork("mainnet");
+        vm.createSelectFork(vm.envString("RPC_MAINNET"));
         vm.deal(playerAddr, 1000 ether);
 
         payable(BLACKJACK).transfer(50 ether);

-Original file line number
+Diff line change
 *.gz
 attachments/
++
 +.env
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ contract Challenge5Test is Test {`
`10`	`10`
`11`	`11`	`function setUp() public {`
`12`	`12`	`// Fork mainnet`
`13`		`- vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));`
	`13`	`+ vm.createSelectFork(vm.envString("RPC_MAINNET"));`
`14`	`14`	`solver = HuffDeployer.config().deploy("HuffChallenge/challenge5/Challenge5");`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ contract FarmerExploitTest is Test {`
`8`	`8`	`address playerAddress = makeAddr("player");`
`9`	`9`
`10`	`10`	`function setUp() public {`
`11`		`- vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));`
	`11`	`+ vm.createSelectFork(vm.envString("RPC_MAINNET"));`
`12`	`12`	`vm.deal(playerAddress, 10 ether);`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ contract SecureExploitTest is Test {`
`8`	`8`	`address playerAddress = makeAddr("player");`
`9`	`9`
`10`	`10`	`function setUp() public {`
`11`		`- vm.createSelectFork(vm.envString("RPC_ANKR_MAINNET"));`
	`11`	`+ vm.createSelectFork(vm.envString("RPC_MAINNET"));`
`12`	`12`	`vm.deal(playerAddress, 50 ether);`
`13`	`13`	`}`
`14`	`14`