feat: use soldeer

.forge-snapshots/manySstore.snap

@@ -1 +1 @@
-70348
+49284

.forge-snapshots/singleSstore.snap

@@ -1 +1 @@
-48459
+27395

.forge-snapshots/singleSstoreClosure.snap

@@ -1 +1 @@
-46269
+25205

.forge-snapshots/singleSstoreLastCall.snap

@@ -1 +1 @@
-43429
+22365

.forge-snapshots/sstoreClosure.snap

@@ -1 +1 @@
-68158
+47094

.gitignore

@@ -1,3 +1,4 @@
 out/
 lib/
 cache/
+dependencies/

.soldeerignore

@@ -0,0 +1,5 @@
+.git/
+.github/
+.forge_snapshots/
+out/
+dependencies/

README.md

@@ -10,7 +10,7 @@ Forge has native gas reporting with `forge snapshot` and `forge test --gas-repor
 
 # Installation
 ```solidity
-forge install marktoda/forge-gas-snapshot
+soldeer install forge-gas-snapshot~v0.0.5
 ```
 
 - NOTE: foundry.toml must be updated to allow forge to write the snapshots

foundry.toml

@@ -4,3 +4,16 @@ out = 'out'
 libs = ['lib']
 ffi = true
 fs_permissions = [{ access = "read-write", path = ".forge-snapshots/"}]
+
+[soldeer]
+# whether soldeer manages remappings
+remappings_generated = true
+
+# whether soldeer re-generates all remappings when installing, updating or uninstalling deps
+remappings_regenerate = true
+
+# whether to suffix the remapping with the version: `name-a.b.c`
+remappings_version = false
+
+[dependencies]
+forge-std = "1.9.2"

remappings.txt

@@ -0,0 +1 @@
+forge-std/=dependencies/forge-std-1.9.2/

soldeer.lock

@@ -0,0 +1,6 @@
+[[dependencies]]
+name = "forge-std"
+version = "1.9.2"
+source = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_9_2_06-08-2024_17:31:25_forge-std-1.9.2.zip"
+checksum = "20fd008c7c69b6c737cc0284469d1c76497107bc3e004d8381f6d8781cb27980"
+integrity = "ae8b0d2637a0bdd85b6134117c0a7549dbe0ee8af66db454c66060547b654a89"

src/GasSnapshot.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
-import "forge-std/console2.sol";
-import {Script} from "forge-std/Script.sol";
+import "forge-std/src/console2.sol";
+import {Script} from "forge-std/src/Script.sol";
 import {UintString} from "./utils/UintString.sol";
 
 contract GasSnapshot is Script {

test/GasSnapshot.t.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.13;
 
-import "forge-std/console2.sol";
-import {Test} from "forge-std/Test.sol";
+import "forge-std/src/console2.sol";
+import {Test} from "forge-std/src/Test.sol";
 import {GasSnapshot} from "../src/GasSnapshot.sol";
 import {SimpleOperations} from "../src/test/SimpleOperations.sol";
 
@@ -26,7 +26,7 @@ contract GasSnapshotTest is Test, GasSnapshot {
         snapEnd();
 
         string memory value = vm.readLine(".forge-snapshots/singleSstore.snap");
-        assertEq(value, "48459");
+        assertEq(value, "27395");
     }
 
     function testSingleSstoreLastCall() public {
@@ -35,21 +35,21 @@ contract GasSnapshotTest is Test, GasSnapshot {
 
         string memory value = vm.readLine(".forge-snapshots/singleSstoreLastCall.snap");
         // includes 21,000 overhead for transaction, 20,000 clean SSTORE
-        assertEq(value, "43429");
+        assertEq(value, "22365");
     }
 
     function testSingleSstoreClosure() public {
         snap("singleSstoreClosure", simpleOperations.singleSstore);
 
         string memory value = vm.readLine(".forge-snapshots/singleSstoreClosure.snap");
-        assertEq(value, "46269");
+        assertEq(value, "25205");
     }
 
     function testManySstoreClosure() public {
         snap("sstoreClosure", simpleOperations.manySstore);
 
         string memory value = vm.readLine(".forge-snapshots/sstoreClosure.snap");
-        assertEq(value, "68158");
+        assertEq(value, "47094");
     }
 
     function testInternalClosure() public {
@@ -96,7 +96,7 @@ contract GasSnapshotTest is Test, GasSnapshot {
         snapEnd();
 
         string memory value = vm.readLine(".forge-snapshots/manySstore.snap");
-        assertEq(value, "70348");
+        assertEq(value, "49284");
     }
 
     function testSnapshotCodeSize() public {
@@ -132,7 +132,7 @@ contract GasSnapshotTest is Test, GasSnapshot {
         // preloaded with the wrong value
         snapStart("checkManySstore");
         simpleOperations.manySstore();
-        vm.expectRevert(abi.encodeWithSelector(GasSnapshot.GasMismatch.selector, 1, 73825));
+        vm.expectRevert(abi.encodeWithSelector(GasSnapshot.GasMismatch.selector, 1, 52761));
         snapEnd();
     }