Commit a035ce97 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

contracts-bedrock: bump forge-std 1fd874f0efdb711cb6807c4f4a000ed2805dc809 (#9043)

* contracts-bedrock: bump forge-std 1fd874f0efdb711cb6807c4f4a000ed2805dc809

Bumps `forge-std` to the latest commit that includes the `vm.dumpState`
cheatcode.

- https://github.com/foundry-rs/forge-std/pull/499
- https://github.com/foundry-rs/foundry/pull/6827

* contracts-bedrock: fix build
parent 67f03963
Subproject commit 155d547c449afa8715f538d69454b83944117811 Subproject commit 1fd874f0efdb711cb6807c4f4a000ed2805dc809
...@@ -115,7 +115,7 @@ contract Deploy is Deployer { ...@@ -115,7 +115,7 @@ contract Deploy is Deployer {
/// @notice The create2 salt used for deployment of the contract implementations. /// @notice The create2 salt used for deployment of the contract implementations.
/// Using this helps to reduce config across networks as the implementation /// Using this helps to reduce config across networks as the implementation
/// addresses will be the same across networks when deployed with create2. /// 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")))); return keccak256(bytes(vm.envOr("IMPL_SALT", string("ethers phoenix"))));
} }
......
...@@ -624,7 +624,7 @@ abstract contract Deployer is Script { ...@@ -624,7 +624,7 @@ abstract contract Deployer is Script {
/// @notice The context of the deployment is used to namespace the artifacts. /// @notice The context of the deployment is used to namespace the artifacts.
/// An unknown context will use the chainid as the context name. /// 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("")); string memory context = vm.envOr("DEPLOYMENT_CONTEXT", string(""));
if (bytes(context).length > 0) { if (bytes(context).length > 0) {
return context; return context;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment