toUint256

yellowBirdy · Feb 6, 2024 · ee40d63 · ee40d63
1 parent cbe02ed
commit ee40d63
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/src/HuffCastLib.huff b/src/HuffCastLib.huff
@@ -552,3 +552,13 @@
     REVERT_OVERFLOW()
     success:
 }
+
+
+#define macro TO_UINT256() = takes (1) returns (1) {
+    0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+    dup2
+    sgt
+    success jumpi
+    REVERT_OVERFLOW()
+    success:
+}
diff --git a/src/HuffCastLibImportoor.huff b/src/HuffCastLibImportoor.huff
@@ -64,6 +64,8 @@
 #define function toInt240(uint256) view returns (int240)
 #define function toInt248(uint256) view returns (int248)
 #define function toInt256(uint256) view returns (int256)
+#define function toUint256(int256) view returns (uint256)
+
 
 
 
@@ -135,6 +137,7 @@
    dup2 __FUNC_SIG(toInt240) eq i240 jumpi
    dup2 __FUNC_SIG(toInt248) eq i248 jumpi
    dup2 __FUNC_SIG(toInt256) eq i256 jumpi
+   dup2 __FUNC_SIG(toUint256) eq u256 jumpi
 
 
    0x00 0x00 revert
@@ -329,6 +332,9 @@
    i256: 
       TO_INT256()
       ret jump
+   u256: 
+      TO_UINT256()
+      ret jump
 
 
    ret:

diff --git a/src/IHuffCastLibImportoor.sol b/src/IHuffCastLibImportoor.sol
@@ -53,6 +53,7 @@ interface IHuffCastLibImportoor {
 	function toUint24(uint256) external view returns (uint24);
 	function toUint240(uint256) external view returns (uint240);
 	function toUint248(uint256) external view returns (uint248);
+	function toUint256(int256) external view returns (uint256);
 	function toUint32(uint256) external view returns (uint32);
 	function toUint40(uint256) external view returns (uint40);
 	function toUint48(uint256) external view returns (uint48);

diff --git a/test/HuffCastLib.t.sol b/test/HuffCastLib.t.sol
@@ -934,5 +934,19 @@ contract HuffCastTest is Test {
         vm.expectRevert(SafeCastLibImplementoor.Overflow.selector);  //  Overflow() selector
         huffUser.toInt256(value);
     }
+
+    // int256 to uint256
+    function testHappyToUint256(int256 value) public {
+        vm.assume(value >= 0);
+
+        uint256 castingResult = huffUser.toUint256(value);
+        assertEq(castingResult, uint256(value));
+    }
+    function testUnappyToUint256(int256 value) public {
+        vm.assume(value < 0);
+
+        vm.expectRevert(SafeCastLibImplementoor.Overflow.selector);  //  Overflow() selector
+        huffUser.toUint256(value);
+    }
 }