Skip to content

Improvements to SaferSafes styling #17903

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

Merged
maurelian merged 9 commits into from
Oct 20, 2025
Merged

Improvements to SaferSafes styling #17903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcf7aa3
Add public getter livenessSafeConfiguration to return a struct rather…
maurelian Oct 16, 2025
87710bf
Use Safe as input type to mappings and functions on LivenessModule2
maurelian Oct 16, 2025
cc4ecdb
Add dividers based on function type
maurelian Oct 16, 2025
e01da18
fmt
maurelian Oct 16, 2025
3d6b245
snapshots
maurelian Oct 16, 2025
aca3d92
Remove conditional return of 0 in the cancellationThreshold if the gu…
maurelian Oct 16, 2025
7dcddf2
rename timelockConfiguration func to timelockDelay
maurelian Oct 16, 2025
b6a67ca
semver-lock
maurelian Oct 16, 2025
44aedcf
Add missing natspec on tests and convert to fuzzing where possible
maurelian Oct 20, 2025
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
8 changes: 4 additions & 4 deletions packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,14 @@ contract DeployOwnership is Deploy {
removeDeployerFromSafe({ _name: "SecurityCouncilSafe", _newThreshold: exampleCouncilConfig.safeConfig.threshold });

// Verify the module was configured correctly
(uint256 configuredPeriod, address configuredFallback) =
LivenessModule2(livenessModule).livenessSafeConfiguration(address(safe));
LivenessModule2.ModuleConfig memory verifyConfig =
LivenessModule2(livenessModule).livenessSafeConfiguration(safe);
require(
configuredPeriod == exampleCouncilConfig.livenessModuleConfig.livenessInterval,
verifyConfig.livenessResponsePeriod == exampleCouncilConfig.livenessModuleConfig.livenessInterval,
"DeployOwnership: configured liveness interval must match expected value"
);
require(
configuredFallback == exampleCouncilConfig.livenessModuleConfig.fallbackOwner,
verifyConfig.fallbackOwner == exampleCouncilConfig.livenessModuleConfig.fallbackOwner,
"DeployOwnership: configured fallback owner must match expected value"
);

Expand Down
35 changes: 21 additions & 14 deletions packages/contracts-bedrock/snapshots/abi/SaferSafes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{
"inputs": [
{
"internalType": "address",
"internalType": "contract GnosisSafe",
"name": "_safe",
"type": "address"
}
Expand All @@ -62,7 +62,7 @@
{
"inputs": [
{
"internalType": "address",
"internalType": "contract GnosisSafe",
"name": "",
"type": "address"
}
Expand All @@ -81,7 +81,7 @@
{
"inputs": [
{
"internalType": "address",
"internalType": "contract GnosisSafe",
"name": "_safe",
"type": "address"
}
Expand Down Expand Up @@ -227,7 +227,7 @@
{
"inputs": [
{
"internalType": "address",
"internalType": "contract GnosisSafe",
"name": "_safe",
"type": "address"
}
Expand All @@ -246,22 +246,29 @@
{
"inputs": [
{
"internalType": "address",
"name": "",
"internalType": "contract GnosisSafe",
"name": "_safe",
"type": "address"
}
],
"name": "livenessSafeConfiguration",
"outputs": [
{
"internalType": "uint256",
"name": "livenessResponsePeriod",
"type": "uint256"
},
{
"internalType": "address",
"name": "fallbackOwner",
"type": "address"
"components": [
{
"internalType": "uint256",
"name": "livenessResponsePeriod",
"type": "uint256"
},
{
"internalType": "address",
"name": "fallbackOwner",
"type": "address"
}
],
"internalType": "struct LivenessModule2.ModuleConfig",
"name": "",
"type": "tuple"
}
],
"stateMutability": "view",
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@
"sourceCodeHash": "0x950725f8b9ad9bb3b6b5e836f67e18db824a7864bac547ee0eeba88ada3de0e9"
},
"src/safe/SaferSafes.sol:SaferSafes": {
"initCodeHash": "0xde571369d6823ac315c03a862df84fa9fc0e9a7e58fd6227c5513d06ffdc6ba1",
"sourceCodeHash": "0x9d76fa66c0bd1261ab3f6c32892a0942ce4c10a5dfa169c012985dd43ea1cdde"
"initCodeHash": "0xaa17bb150c9bcf19675a33e9762b050148aceae9f6a9a6ba020fc6947ebaab39",
"sourceCodeHash": "0xc4201612048ff051ed795521efa3eece1a6556f2c514a268b180d84a2ad8b2d1"
},
"src/universal/OptimismMintableERC20.sol:OptimismMintableERC20": {
"initCodeHash": "0x3c85eed0d017dca8eda6396aa842ddc12492587b061e8c756a8d32c4610a9658",
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/snapshots/storageLayout/SaferSafes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[
{
"bytes": "32",
"label": "livenessSafeConfiguration",
"label": "_livenessSafeConfiguration",
"offset": 0,
"slot": "0",
"type": "mapping(address => struct LivenessModule2.ModuleConfig)"
"type": "mapping(contract GnosisSafe => struct LivenessModule2.ModuleConfig)"
},
{
"bytes": "32",
"label": "challengeStartTime",
"offset": 0,
"slot": "1",
"type": "mapping(address => uint256)"
"type": "mapping(contract GnosisSafe => uint256)"
},
{
"bytes": "32",
Expand Down
Loading