ctb: Update forge-std

ethereum-optimism · Nov 3, 2022 · a14382f · a14382f
1 parent 8eabbd7
commit a14382f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/packages/contracts-bedrock/contracts/test/CommonTest.t.sol b/packages/contracts-bedrock/contracts/test/CommonTest.t.sol
@@ -2,7 +2,7 @@
 pragma solidity 0.8.15;
 
 /* Testing utilities */
-import { Test } from "forge-std/Test.sol";
+import { Test, StdUtils } from "forge-std/Test.sol";
 import { L2OutputOracle } from "../L1/L2OutputOracle.sol";
 import { L2ToL1MessagePasser } from "../L2/L2ToL1MessagePasser.sol";
 import { L1StandardBridge } from "../L1/L1StandardBridge.sol";

diff --git a/packages/contracts-bedrock/contracts/test/CrossDomainOwnable.t.sol b/packages/contracts-bedrock/contracts/test/CrossDomainOwnable.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
 import { CommonTest, Portal_Initializer } from "./CommonTest.t.sol";
 import { CrossDomainOwnable } from "../L2/CrossDomainOwnable.sol";
 import { AddressAliasHelper } from "../vendor/AddressAliasHelper.sol";
-import { Vm } from "forge-std/Vm.sol";
+import { Vm, VmSafe } from "forge-std/Vm.sol";
 import { Bytes32AddressLib } from "@rari-capital/solmate/src/utils/Bytes32AddressLib.sol";
 
 contract XDomainSetter is CrossDomainOwnable {
@@ -62,7 +62,7 @@ contract CrossDomainOwnableThroughPortal_Test is Portal_Initializer {
 
         // Simulate the operation of the `op-node` by parsing data
         // from logs
-        Vm.Log[] memory logs = vm.getRecordedLogs();
+        VmSafe.Log[] memory logs = vm.getRecordedLogs();
         // Only 1 log emitted
         assertEq(logs.length, 1);
 

diff --git a/packages/contracts-bedrock/package.json b/packages/contracts-bedrock/package.json
@@ -67,7 +67,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#f18682b2874fc57d7c80a511fed0b35ec4201ffa",
+    "forge-std": "https://github.com/foundry-rs/forge-std.git#17656a2fa5453f495d8c1302a0cedded912457eb",
     "glob": "^7.1.6",
     "hardhat-deploy": "^0.11.4",
     "solhint": "^3.3.7",

diff --git a/packages/contracts-periphery/package.json b/packages/contracts-periphery/package.json
@@ -77,7 +77,7 @@
     "ds-test": "https://github.com/dapphub/ds-test.git#9310e879db8ba3ea6d5c6489a579118fd264a3f5",
     "ethereum-waffle": "^3.4.4",
     "ethers": "^5.7.0",
-    "forge-std": "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa",
+    "forge-std": "https://github.com/foundry-rs/forge-std.git#17656a2fa5453f495d8c1302a0cedded912457eb",
     "hardhat": "^2.9.6",
     "hardhat-deploy": "^0.11.10",
     "hardhat-gas-reporter": "^1.0.8",

diff --git a/yarn.lock b/yarn.lock
@@ -9470,9 +9470,9 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
   integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
 
-"forge-std@https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa":
-  version "0.0.0"
-  resolved "https://github.com/foundry-rs/forge-std.git#f18682b2874fc57d7c80a511fed0b35ec4201ffa"
+"forge-std@https://github.com/foundry-rs/forge-std.git#17656a2fa5453f495d8c1302a0cedded912457eb":
+  version "1.0.0"
+  resolved "https://github.com/foundry-rs/forge-std.git#17656a2fa5453f495d8c1302a0cedded912457eb"
 
 form-data@^2.2.0:
   version "2.5.1"