Add solution for QuillCTF 2022 - Challenge 6 (minaminao#10)

PraneshASP · web-flow · commit 1e4064dc1daa · 2023-02-20T19:30:18.000+09:00
diff --git a/src/QuillCTF2022/CollatzPuzzle/CollatzPuzzleSolution.huff b/src/QuillCTF2022/CollatzPuzzle/CollatzPuzzleSolution.huff
@@ -0,0 +1,22 @@
+#define macro MAIN() = takes (0) returns (0) {
+  0x04 calldataload    // [n]
+  0x02                 // [2,n]
+  dup2                 // [n,2,n]
+  mod                  // [n%2,n]
+  iszero               // [n%2==0,n]
+  handleEvenCase jumpi
+  0x03                 // [3, n]
+  mul                  // [3*n]
+  0x1                  // [1,3*n]
+  add                  // [1+3*n]
+  returnResult jump    // return result
+  
+  handleEvenCase:
+  0x01                  // [1,n]
+  shr                   // [n>>1] (div by 2)
+ 
+ returnResult:
+  returndatasize mstore
+  calldatasize returndatasize return  
+    
+}
diff --git a/src/QuillCTF2022/CollatzPuzzle/CollatzPuzzleSolved.t.sol b/src/QuillCTF2022/CollatzPuzzle/CollatzPuzzleSolved.t.sol
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.15;
+
+import "foundry-huff/HuffDeployer.sol";
+import "forge-std/Test.sol";
+import "forge-std/console.sol";
+
+import {CollatzPuzzle} from "./challenge/CollatzPuzzle.sol";
+
+interface ICollatzPuzzle {
+    function collatzIteration(uint256 n) external pure returns (uint256);
+}
+
+contract CollatzPuzzleSolved is Test {
+    CollatzPuzzle public puzzle;
+    ICollatzPuzzle public solution;
+
+    /// @dev Setup the testing environment.
+    function setUp() public {
+        puzzle = new CollatzPuzzle();
+        solution = ICollatzPuzzle(
+            HuffDeployer.deploy(
+                "/QuillCTF2022/CollatzPuzzle/CollatzPuzzleSolution"
+            )
+        );
+    }
+
+    function testSolution() public {
+        assertEq(puzzle.callMe(address(solution)), true);
+    }
+}
diff --git a/src/QuillCTF2022/CollatzPuzzle/challenge/CollatzPuzzle.sol b/src/QuillCTF2022/CollatzPuzzle/challenge/CollatzPuzzle.sol
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+interface ICollatz {
+    function collatzIteration(uint256 n) external pure returns (uint256);
+}
+
+contract CollatzPuzzle is ICollatz {
+    function collatzIteration(uint256 n)
+        public
+        pure
+        override
+        returns (uint256)
+    {
+        if (n % 2 == 0) {
+            return n / 2;
+        } else {
+            return 3 * n + 1;
+        }
+    }
+
+    function callMe(address addr) external view returns (bool) {
+        // check code size
+        uint256 size;
+        assembly {
+            size := extcodesize(addr)
+        }
+        require(size > 0 && size <= 32, "bad code size!");
+
+        // check results to be matching
+        uint256 p;
+        uint256 q;
+        for (uint256 n = 1; n < 200; n++) {
+            // local result
+            p = n;
+            for (uint256 i = 0; i < 5; i++) {
+                p = collatzIteration(p);
+            }
+            // your result
+            q = n;
+            for (uint256 i = 0; i < 5; i++) {
+                q = ICollatz(addr).collatzIteration{gas: 100}(q);
+            }
+            require(p == q, "result mismatch!");
+        }
+
+        return true;
+    }
+}
diff --git a/src/QuillCTF2022/README.md b/src/QuillCTF2022/README.md
@@ -5,12 +5,12 @@ Here's the link to the challenges page: https://quillctf.super.site/challenges.
 ---
 
 **Table of Contents**
-- [QuillHash CTF 2022 Solutions](#quillhash-ctf-2022-solutions)
-  - [Road closed:](#road-closed)
-  - [VIP Bank:](#vip-bank)
-  - [Confidential Hash:](#confidential-hash)
-  - [SafeNFT:](#safenft)
-  - [D3l3g4t3:](#d3l3g4t3)
+- [Road closed:](#road-closed)
+- [VIP Bank:](#vip-bank)
+- [Confidential Hash:](#confidential-hash)
+- [SafeNFT:](#safenft)
+- [D3l3g4t3:](#d3l3g4t3)
+- [CollatzPuzzle:](#collatzpuzzle)
 
 
 ---
@@ -76,4 +76,16 @@ Goerli link: https://goerli.etherscan.io/address/0x971e55f02367dcdd1535a7faed0a5
  
 ```
 forge test --match-contract D3l3g4t3Solved -vvvv
+```
+
+## CollatzPuzzle:
+https://quillctf.super.site/challenges/quillctf-challenges/collatz-puzzle
+
+**Objective**:
+- Make a successful call to the callMe function.
+- You should be the deployer of the contract at the given addr parameter!
+  
+ 
+```
+forge test -vvvv --match-contract CollatzPuzzleSolved
 ```
