Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Jan 17, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0376630
contracts-bedrock: bump forge-std 1fd874f0efdb711cb6807c4f4a000ed2805…
tynes Jan 17, 2024
986b011
contracts-bedrock: fix build
tynes Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/lib/forge-std
Open in desktop
Submodule forge-std updated 8 files
+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
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))));
}

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/scripts/Deployer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
tynes marked this conversation as resolved.
Show resolved Hide resolved
string memory context = vm.envOr("DEPLOYMENT_CONTEXT", string(""));
if (bytes(context).length > 0) {
return context;
Expand Down
Loading