contracts-bedrock: bump forge-std 1fd874f0efdb711cb6807c4f4a000ed2805…

…dc809 (#9043) * contracts-bedrock: bump forge-std 1fd874f0efdb711cb6807c4f4a000ed2805dc809 Bumps `forge-std` to the latest commit that includes the `vm.dumpState` cheatcode. - foundry-rs/forge-std#499 - foundry-rs/foundry#6827 * contracts-bedrock: fix build
ethereum-optimism · Jan 17, 2024 · 5f55e84 · 5f55e84
1 parent 15dca91
commit 5f55e84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packages/contracts-bedrock/lib/forge-std b/packages/contracts-bedrock/lib/forge-std
diff --git a/packages/contracts-bedrock/scripts/Deploy.s.sol b/packages/contracts-bedrock/scripts/Deploy.s.sol
@@ -115,7 +115,7 @@ contract Deploy is Deployer {
     /// @notice The create2 salt used for deployment of the contract implementations.
     ///         Using this helps to reduce config across networks as the implementation
     ///         addresses will be the same across networks when deployed with create2.
-    function _implSalt() internal returns (bytes32) {
+    function _implSalt() internal view returns (bytes32) {
         return keccak256(bytes(vm.envOr("IMPL_SALT", string("ethers phoenix"))));
     }
 

diff --git a/packages/contracts-bedrock/scripts/Deployer.sol b/packages/contracts-bedrock/scripts/Deployer.sol
@@ -624,7 +624,7 @@ abstract contract Deployer is Script {
 
     /// @notice The context of the deployment is used to namespace the artifacts.
     ///         An unknown context will use the chainid as the context name.
-    function _getDeploymentContext() private returns (string memory) {
+    function _getDeploymentContext() private view returns (string memory) {
         string memory context = vm.envOr("DEPLOYMENT_CONTEXT", string(""));
         if (bytes(context).length > 0) {
             return context;
+1 −0		.gitattributes
+1 −1		package.json
+635 −0		scripts/vm.py
+5 −1		src/StdChains.sol
+750 −484		src/Vm.sol
+3 −1		test/StdError.t.sol
+2 −2		test/StdUtils.t.sol
+2 −2		test/Vm.t.sol