From 42ce013a251372011b6f289ea69e58f3b6e33d15 Mon Sep 17 00:00:00 2001
From: Yotam Bar-On <tudmotu@gmail.com>
Date: Fri, 4 Oct 2024 11:23:14 +0300
Subject: [PATCH] Update Vm with `mockCalls` and VmSafe with `randomBytes`
 methods

---
 src/Vm.sol    | 22 +++++++++++++++++-----
 test/Vm.t.sol |  4 ++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/Vm.sol b/src/Vm.sol
index 13a219e1..01725dbc 100644
--- a/src/Vm.sol
+++ b/src/Vm.sol
@@ -1592,16 +1592,22 @@ interface VmSafe {
     /// Returns a random `address`.
     function randomAddress() external returns (address);
 
-    /// Returns an random `bool`.
+    /// Returns a random `bool`.
     function randomBool() external view returns (bool);
 
-    /// Returns an random byte array value of the given length.
+    /// Returns a random byte array value of the given length.
     function randomBytes(uint256 len) external view returns (bytes memory);
 
-    /// Returns an random `int256` value.
+    /// Returns a random fixed-size byte array of length 4.
+    function randomBytes4() external view returns (bytes4);
+
+    /// Returns a random fixed-size byte array of length 8.
+    function randomBytes8() external view returns (bytes8);
+
+    /// Returns a random `int256` value.
     function randomInt() external view returns (int256);
 
-    /// Returns an random `int256` value of given bits.
+    /// Returns a random `int256` value of given bits.
     function randomInt(uint256 bits) external view returns (int256);
 
     /// Returns a random uint256 value.
@@ -1610,7 +1616,7 @@ interface VmSafe {
     /// Returns random uint256 value between the provided range (=min..=max).
     function randomUint(uint256 min, uint256 max) external returns (uint256);
 
-    /// Returns an random `uint256` value of given bits.
+    /// Returns a random `uint256` value of given bits.
     function randomUint(uint256 bits) external view returns (uint256);
 
     /// Unpauses collection of call traces.
@@ -1747,6 +1753,12 @@ interface Vm is VmSafe {
     /// Calldata match takes precedence over `msg.value` in case of ambiguity.
     function mockCall(address callee, uint256 msgValue, bytes calldata data, bytes calldata returnData) external;
 
+    /// Mocks multiple calls to an address, returning specified data for each call.
+    function mockCalls(address callee, bytes calldata data, bytes[] calldata returnData) external;
+
+    /// Mocks multiple calls to an address with a specific `msg.value`, returning specified data for each call.
+    function mockCalls(address callee, uint256 msgValue, bytes calldata data, bytes[] calldata returnData) external;
+
     /// Whenever a call is made to `callee` with calldata `data`, this cheatcode instead calls
     /// `target` with the same calldata. This functionality is similar to a delegate call made to
     /// `target` contract from `callee`.
diff --git a/test/Vm.t.sol b/test/Vm.t.sol
index 5a01c6fd..a462bb3a 100644
--- a/test/Vm.t.sol
+++ b/test/Vm.t.sol
@@ -9,10 +9,10 @@ import {Vm, VmSafe} from "../src/Vm.sol";
 // added to or removed from Vm or VmSafe.
 contract VmTest is Test {
     function test_VmInterfaceId() public pure {
-        assertEq(type(Vm).interfaceId, bytes4(0x35457718), "Vm");
+        assertEq(type(Vm).interfaceId, bytes4(0x61a5f010), "Vm");
     }
 
     function test_VmSafeInterfaceId() public pure {
-        assertEq(type(VmSafe).interfaceId, bytes4(0x681d10d4), "VmSafe");
+        assertEq(type(VmSafe).interfaceId, bytes4(0xf7f67508), "VmSafe");
     }
 }