From cae3cf3ba355334843462fa0f27c4f69a53d3710 Mon Sep 17 00:00:00 2001
From: kamuik16 <krishang.s@ahduni.edu.in>
Date: Tue, 23 Apr 2024 21:39:20 +0530
Subject: [PATCH] uintToHex cheatcode

---
 crates/cheatcodes/assets/cheatcodes.json | 20 ++++++++++++++++++++
 crates/cheatcodes/spec/src/vm.rs         |  5 +++++
 crates/cheatcodes/src/json.rs            |  8 ++++++++
 crates/evm/traces/src/decoder/mod.rs     |  1 +
 testdata/cheats/Vm.sol                   |  1 +
 testdata/default/cheats/Json.t.sol       |  1 +
 6 files changed, 36 insertions(+)

diff --git a/crates/cheatcodes/assets/cheatcodes.json b/crates/cheatcodes/assets/cheatcodes.json
index 9ce73e931abe..1c7781591e6c 100644
--- a/crates/cheatcodes/assets/cheatcodes.json
+++ b/crates/cheatcodes/assets/cheatcodes.json
@@ -7191,6 +7191,26 @@
       "status": "stable",
       "safety": "safe"
     },
+    {
+      "func": {
+        "id": "serializeUintToHex",
+        "description": "See `serializeJson`.",
+        "declaration": "function serializeUintToHex(string calldata objectKey, string calldata valueKey, uint256 value) external returns (string memory json);",
+        "visibility": "external",
+        "mutability": "",
+        "signature": "serializeUintToHex(string,string,uint256)",
+        "selector": "0xae5a2ae8",
+        "selectorBytes": [
+          174,
+          90,
+          42,
+          232
+        ]
+      },
+      "group": "json",
+      "status": "stable",
+      "safety": "safe"
+    },
     {
       "func": {
         "id": "serializeUint_0",
diff --git a/crates/cheatcodes/spec/src/vm.rs b/crates/cheatcodes/spec/src/vm.rs
index 39f0fd8b0006..44ee2534fec1 100644
--- a/crates/cheatcodes/spec/src/vm.rs
+++ b/crates/cheatcodes/spec/src/vm.rs
@@ -1865,6 +1865,11 @@ interface Vm {
         returns (string memory json);
     /// See `serializeJson`.
     #[cheatcode(group = Json)]
+    function serializeUintToHex(string calldata objectKey, string calldata valueKey, uint256 value)
+        external
+        returns (string memory json);
+    /// See `serializeJson`.
+    #[cheatcode(group = Json)]
     function serializeInt(string calldata objectKey, string calldata valueKey, int256 value)
         external
         returns (string memory json);
diff --git a/crates/cheatcodes/src/json.rs b/crates/cheatcodes/src/json.rs
index b837c8425051..e493078a3262 100644
--- a/crates/cheatcodes/src/json.rs
+++ b/crates/cheatcodes/src/json.rs
@@ -248,6 +248,14 @@ impl Cheatcode for serializeBytes_1Call {
     }
 }
 
+impl Cheatcode for serializeUintToHexCall {
+    fn apply(&self, state: &mut Cheatcodes) -> Result {
+        let Self { objectKey, valueKey, value } = self;
+        let hex = format!("0x{:x}", value);
+        serialize_json(state, objectKey, Some(valueKey), &hex)
+    }
+}
+
 impl Cheatcode for writeJson_0Call {
     fn apply(&self, state: &mut Cheatcodes) -> Result {
         let Self { json, path } = self;
diff --git a/crates/evm/traces/src/decoder/mod.rs b/crates/evm/traces/src/decoder/mod.rs
index ad4e161cf954..70720dc6c708 100644
--- a/crates/evm/traces/src/decoder/mod.rs
+++ b/crates/evm/traces/src/decoder/mod.rs
@@ -441,6 +441,7 @@ impl CallTraceDecoder {
             "keyExistsJson" |
             "serializeBool" |
             "serializeUint" |
+            "serializeUintToHex" |
             "serializeInt" |
             "serializeAddress" |
             "serializeBytes32" |
diff --git a/testdata/cheats/Vm.sol b/testdata/cheats/Vm.sol
index 02eeac480e33..01d2bd431f36 100644
--- a/testdata/cheats/Vm.sol
+++ b/testdata/cheats/Vm.sol
@@ -355,6 +355,7 @@ interface Vm {
     function serializeJson(string calldata objectKey, string calldata value) external returns (string memory json);
     function serializeString(string calldata objectKey, string calldata valueKey, string calldata value) external returns (string memory json);
     function serializeString(string calldata objectKey, string calldata valueKey, string[] calldata values) external returns (string memory json);
+    function serializeUintToHex(string calldata objectKey, string calldata valueKey, uint256 value) external returns (string memory json);
     function serializeUint(string calldata objectKey, string calldata valueKey, uint256 value) external returns (string memory json);
     function serializeUint(string calldata objectKey, string calldata valueKey, uint256[] calldata values) external returns (string memory json);
     function setEnv(string calldata name, string calldata value) external;
diff --git a/testdata/default/cheats/Json.t.sol b/testdata/default/cheats/Json.t.sol
index b15292e15c7a..ca53b1801297 100644
--- a/testdata/default/cheats/Json.t.sol
+++ b/testdata/default/cheats/Json.t.sol
@@ -224,6 +224,7 @@ contract WriteJsonTest is DSTest {
         vm.serializeBool(json1, "boolean", true);
         vm.serializeInt(json2, "key2", -234);
         vm.serializeUint(json2, "deploy", uint256(254));
+        vm.serializeUintToHex(json2, "hexUint", uint256(255));
         string memory data = vm.serializeBool(json2, "boolean", true);
         vm.serializeString(json2, "json1", data);
         emit log(data);