chore(cheatcodes): remove base64 group, add string overloads (#6830)

crates/cheatcodes/spec/src/cheatcode.rs

@@ -103,12 +103,6 @@ pub enum Group {
     ///
     /// Safety: safe.
     Json,
-    /// Utility cheatcodes that deal with encoding and decoding Base64.
-    ///
-    /// Examples: `toBase64`, `toBase64URL`.
-    ///
-    /// Safety: safe.
-    Base64,
     /// Generic, uncategorized utilities.
     ///
     /// Examples: `toString`, `parse*`, `serialize*`.
@@ -131,7 +125,6 @@ impl Group {
             Self::Environment |
             Self::String |
             Self::Json |
-            Self::Base64 |
             Self::Utilities => Some(Safety::Safe),
         }
     }
@@ -147,7 +140,6 @@ impl Group {
             Self::Environment => "environment",
             Self::String => "string",
             Self::Json => "json",
-            Self::Base64 => "base64",
             Self::Utilities => "utilities",
         }
     }

crates/cheatcodes/spec/src/vm.rs

@@ -1236,16 +1236,6 @@ interface Vm {
     #[cheatcode(group = Json)]
     function writeJson(string calldata json, string calldata path, string calldata valueKey) external;
 
-    // -------- Base64 --------
-
-    /// Encodes a `bytes` value to base64 string
-    #[cheatcode(group = Base64)]
-    function toBase64(bytes calldata data) external pure returns (string memory);
-
-    /// Encodes a `bytes` value to base64url string
-    #[cheatcode(group = Base64)]
-    function toBase64URL(bytes calldata data) external pure returns (string memory);
-
     // -------- Key Management --------
 
     /// Derives a private key from the name, labels the account with that name, and returns the wallet.
@@ -1319,5 +1309,21 @@ interface Vm {
     /// Compute the address of a contract created with CREATE2 using the default CREATE2 deployer.
     #[cheatcode(group = Utilities)]
     function computeCreate2Address(bytes32 salt, bytes32 initCodeHash) external pure returns (address);
+
+    /// Encodes a `bytes` value to a base64 string.
+    #[cheatcode(group = Utilities)]
+    function toBase64(bytes calldata data) external pure returns (string memory);
+
+    /// Encodes a `string` value to a base64 string.
+    #[cheatcode(group = Utilities)]
+    function toBase64(string calldata data) external pure returns (string memory);
+
+    /// Encodes a `bytes` value to a base64url string.
+    #[cheatcode(group = Utilities)]
+    function toBase64URL(bytes calldata data) external pure returns (string memory);
+
+    /// Encodes a `string` value to a base64url string.
+    #[cheatcode(group = Utilities)]
+    function toBase64URL(string calldata data) external pure returns (string memory);
 }
 }

crates/cheatcodes/src/base64.rs

@@ -2,14 +2,28 @@ use crate::{Cheatcode, Cheatcodes, Result, Vm::*};
 use alloy_sol_types::SolValue;
 use base64::prelude::*;
 
-impl Cheatcode for toBase64Call {
+impl Cheatcode for toBase64_0Call {
     fn apply(&self, _state: &mut Cheatcodes) -> Result {
         let Self { data } = self;
         Ok(BASE64_STANDARD.encode(data).abi_encode())
     }
 }
 
-impl Cheatcode for toBase64URLCall {
+impl Cheatcode for toBase64_1Call {
+    fn apply(&self, _state: &mut Cheatcodes) -> Result {
+        let Self { data } = self;
+        Ok(BASE64_STANDARD.encode(data).abi_encode())
+    }
+}
+
+impl Cheatcode for toBase64URL_0Call {
+    fn apply(&self, _state: &mut Cheatcodes) -> Result {
+        let Self { data } = self;
+        Ok(BASE64_URL_SAFE.encode(data).abi_encode())
+    }
+}
+
+impl Cheatcode for toBase64URL_1Call {
     fn apply(&self, _state: &mut Cheatcodes) -> Result {
         let Self { data } = self;
         Ok(BASE64_URL_SAFE.encode(data).abi_encode())