♻️ Update revertTo and snapshot Cheat Codes (#275)

### 🕓 Changelog The Foundry PR [#8945](foundry-rs/foundry#8945) introduced a renaming of the `snapshot` and `revertTo` cheat codes, now referred to as `snapshotState` and `revertToState`. In response, this PR updates our test suite—specifically the `ERC721Test` contract—to align with these revised cheat codes. Additionally, `ethers` has been upgraded to the latest version [`6.13.3`](https://github.com/ethers-io/ethers.js/releases/tag/v6.13.3), and all submodules have been updated to their most recent available commits. --------- Signed-off-by: Pascal Marco Caversaccio <[email protected]>
pcaversaccio · Oct 3, 2024 · 949adb5 · 949adb5
1 parent 1ff03b4
commit 949adb5
Show file tree

Hide file tree

Showing 8 changed files with 174 additions and 174 deletions.
diff --git a/.gas-snapshot b/.gas-snapshot
diff --git a/lib/create-util b/lib/create-util
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/solady b/lib/solady
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
     "@openzeppelin/merkle-tree": "^1.0.7",
     "eslint": "^9.11.1",
     "eslint-config-prettier": "^9.1.0",
-    "ethers": "^6.13.2",
+    "ethers": "^6.13.3",
     "keccak256": "^1.0.6",
     "merkletreejs": "^0.4.0",
     "prettier": "^3.3.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/test/tokens/ERC721.t.sol b/test/tokens/ERC721.t.sol
@@ -221,7 +221,7 @@ contract ERC721Test is Test {
         bool withData,
         bytes memory data
     ) internal {
-        uint256 snapshot = vm.snapshot();
+        uint256 snapshot = vm.snapshotState();
         vm.startPrank(owner);
         vm.expectEmit(true, true, true, false);
         emit IERC721.Transfer(owner, receiver, tokenId);
@@ -249,9 +249,9 @@ contract ERC721Test is Test {
         }
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(approved);
         vm.expectEmit(true, true, true, false);
         emit IERC721.Transfer(owner, receiver, tokenId);
@@ -279,9 +279,9 @@ contract ERC721Test is Test {
         }
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(operator);
         vm.expectEmit(true, true, true, false);
         emit IERC721.Transfer(owner, receiver, tokenId);
@@ -309,9 +309,9 @@ contract ERC721Test is Test {
         }
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(owner);
         ERC721Extended.approve(zeroAddress, tokenId);
         vm.stopPrank();
@@ -342,9 +342,9 @@ contract ERC721Test is Test {
         }
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(owner);
         vm.expectEmit(true, true, true, false);
         emit IERC721.Transfer(owner, owner, tokenId);
@@ -371,7 +371,7 @@ contract ERC721Test is Test {
         assertEq(ERC721Extended.tokenOfOwnerByIndex(owner, 0), tokenId);
         assertTrue(ERC721Extended.tokenOfOwnerByIndex(owner, 1) == tokenId + 1);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
         /**
          * @dev Validates all possible reverts.
@@ -408,7 +408,7 @@ contract ERC721Test is Test {
         address receiver,
         bytes memory data
     ) internal {
-        uint256 snapshot = vm.snapshot();
+        uint256 snapshot = vm.snapshotState();
         _shouldTransferTokensByUsers(
             transferFunction,
             owner,
@@ -419,9 +419,9 @@ contract ERC721Test is Test {
             true,
             data
         );
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         _shouldTransferTokensByUsers(
             transferFunction,
             owner,
@@ -432,9 +432,9 @@ contract ERC721Test is Test {
             true,
             data
         );
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(owner);
         vm.expectEmit(true, true, true, true, receiver);
         emit ERC721ReceiverMock.Received(owner, owner, tokenId, data);
@@ -450,9 +450,9 @@ contract ERC721Test is Test {
         );
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
-        snapshot = vm.snapshot();
+        snapshot = vm.snapshotState();
         vm.startPrank(approved);
         vm.expectEmit(true, true, true, true, receiver);
         emit ERC721ReceiverMock.Received(approved, owner, tokenId, data);
@@ -468,7 +468,7 @@ contract ERC721Test is Test {
         );
         _transferSuccess(owner, tokenId, receiver);
         vm.stopPrank();
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
 
         vm.startPrank(owner);
         vm.expectRevert(bytes("erc721: invalid token ID"));
+8 −0		.solcover.js
+70 −24		contracts/utils/cryptography/P256.sol
+6 −2		contracts/utils/cryptography/RSA.sol
+6 −6		docs/modules/ROOT/pages/utilities.adoc
+1 −1		lib/forge-std
+2 −2		test/helpers/iterate.js
+13 −104		test/utils/cryptography/P256.t.sol
+1 −1		package.json
+2 −2		src/accounts/Pod.sol
+262 −25		src/utils/DynamicArrayLib.sol
+61 −6		src/utils/LibClone.sol
+112 −1		src/utils/LibSort.sol
+349 −354		src/utils/LibString.sol
+194 −0		test/DynamicArrayLib.t.sol
+30 −0		test/LibClone.t.sol
+3 −0		test/LibSort.t.sol
+176 −0		test/LibString.t.sol
+4 −0		test/utils/mocks/MockPod.sol