Update `foundry` & `forge-std`

ops/docker/ci-builder/Dockerfile

@@ -16,7 +16,7 @@ WORKDIR /opt/foundry
 # Only diff from upstream docker image is this clone instead
 # of COPY. We select a specific commit to use.
 RUN git clone https://github.com/foundry-rs/foundry.git . \
-    && git checkout 2ff99025abade470a795724c10648c800a41025e
+    && git checkout edf15abd648bb96e2bcee342c1d72ec7d1066cd1
 
 RUN source $HOME/.profile && \
     cargo build --release && \

packages/contracts-bedrock/contracts/test/invariants/CrossDomainMessenger.t.sol

 pragma solidity 0.8.15;
 
-import { InvariantTest } from "forge-std/InvariantTest.sol";
 import { StdUtils } from "forge-std/StdUtils.sol";
 import { Vm } from "forge-std/Vm.sol";
 import { OptimismPortal } from "../../L1/OptimismPortal.sol";
@@ -92,7 +91,7 @@ contract RelayActor is StdUtils {
     }
 }
 
-contract XDM_MinGasLimits is Messenger_Initializer, InvariantTest {
+contract XDM_MinGasLimits is Messenger_Initializer {
     RelayActor actor;
 
     function setUp() public override {

packages/contracts-bedrock/contracts/test/invariants/L2OutputOracle.t.sol

 pragma solidity 0.8.15;
 
-import { InvariantTest } from "forge-std/InvariantTest.sol";
+import { Test } from "forge-std/Test.sol";
 import { L2OutputOracle_Initializer } from "../CommonTest.t.sol";
 
 contract L2OutputOracle_MonotonicBlockNumIncrease_Invariant is
-    InvariantTest,
     L2OutputOracle_Initializer
 {
     function setUp() public override {

packages/contracts-bedrock/contracts/test/invariants/OptimismPortal.t.sol

 pragma solidity 0.8.15;
 
-import { InvariantTest } from "forge-std/InvariantTest.sol";
 import { Portal_Initializer } from "../CommonTest.t.sol";
 import { Types } from "../../libraries/Types.sol";
 
-contract OptimismPortal_Invariant_Harness is Portal_Initializer, InvariantTest {
+contract OptimismPortal_Invariant_Harness is Portal_Initializer {
     // Reusable default values for a test withdrawal
     Types.WithdrawalTransaction _defaultTx;
 

packages/contracts-bedrock/contracts/test/invariants/SystemConfig.t.sol

 pragma solidity 0.8.15;
 
-import { InvariantTest } from "forge-std/InvariantTest.sol";
-import { StdAssertions } from "forge-std/StdAssertions.sol";
+import { Test } from "forge-std/Test.sol";
 import { SystemConfig } from "../../L1/SystemConfig.sol";
 
-contract SystemConfig_GasLimitLowerBound_Invariant is InvariantTest, StdAssertions {
+contract SystemConfig_GasLimitLowerBound_Invariant is Test {
     SystemConfig public config;
 
     function setUp() public {

packages/contracts-bedrock/package.json

@@ -79,7 +79,7 @@
     "dotenv": "^16.0.0",
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
     "ethereum-waffle": "^3.0.0",
-    "forge-std": "https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02",
+    "forge-std": "https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df",
     "glob": "^7.1.6",
     "hardhat-deploy": "^0.11.4",
     "solhint": "^3.3.7",

yarn.lock

@@ -9518,6 +9518,10 @@ forever-agent@~0.6.1:
   version "1.2.0"
   resolved "https://github.com/foundry-rs/forge-std.git#53331f4cb2e313466f72440f3e73af048c454d02"
 
+"forge-std@https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df":
+  version "1.4.0"
+  resolved "https://github.com/foundry-rs/forge-std.git#a2edd39db95df7e9dd3f9ef9edc8c55fefddb6df"
+
 form-data@^2.2.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"