Skip to content

Commit 7b4876e

Browse files
authored
fix: assumeNotForgeAddress in StdCheats.sol (#430)
* Fix assumeNotForgeAddress in StdCheats.sol * Add Create2Deployer address to assumeNotForgeAddress function * Fix formatting * Test assumeNotForgeAddress cheat
1 parent 4772599 commit 7b4876e

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/StdCheats.sol

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,11 @@ abstract contract StdCheatsSafe {
342342
}
343343

344344
function assumeNotForgeAddress(address addr) internal pure virtual {
345-
// vm and console addresses
346-
vm.assume(addr != address(vm) || addr != 0x000000000000000000636F6e736F6c652e6c6f67);
345+
// vm, console, and Create2Deployer addresses
346+
vm.assume(
347+
addr != address(vm) && addr != 0x000000000000000000636F6e736F6c652e6c6f67
348+
&& addr != 0x4e59b44847b379578588920cA78FbF26c0B4956C
349+
);
347350
}
348351

349352
function readEIP1559ScriptArtifact(string memory path)

test/StdCheats.t.sol

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,14 @@ contract StdCheatsTest is Test {
408408
);
409409
}
410410

411+
function testAssumeNotForgeAddress(address addr) external {
412+
assumeNotForgeAddress(addr);
413+
assertTrue(
414+
addr != address(vm) && addr != 0x000000000000000000636F6e736F6c652e6c6f67
415+
&& addr != 0x4e59b44847b379578588920cA78FbF26c0B4956C
416+
);
417+
}
418+
411419
function testCannotDeployCodeTo() external {
412420
vm.expectRevert("StdCheats deployCodeTo(string,bytes,uint256,address): Failed to create runtime bytecode.");
413421
this._revertDeployCodeTo();

0 commit comments

Comments
 (0)