Skip to content

Address potential reentrancy vector on LivenessModule2 #17975

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
mds1 merged 4 commits into from
Oct 22, 2025
Merged

Address potential reentrancy vector on LivenessModule2 #17975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be3c7db
Moved `delete challengeStartTime[_safe]` up
alcueca Oct 22, 2025
34125e4
I though pre-pr did this
alcueca Oct 22, 2025
3d53e1f
Version and semver-lock fix
alcueca Oct 22, 2025
0943132
minor version bump
alcueca Oct 22, 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
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": "0x7fc4789b082bc8ecd29c4c75a06058f0ff0b72f1c1028a42db6f1c35269c8865"
},
"src/safe/SaferSafes.sol:SaferSafes": {
"initCodeHash": "0xc546c21b73dce6c0b04ab5ddca56f61f648e26fc8345d0dcf160d94767dc4af6",
"sourceCodeHash": "0x22d773a7d6cc981b374b7cdc823e418293e0a82714757cac1ebb6079b2f9650b"
"initCodeHash": "0x54eb5d9d4dd6c7a6ac5c223c7e166cf30e93e11acb8caefab73eac596dba5af7",
"sourceCodeHash": "0xeb7745b3f5626573d1e935affbbb0e6b455e729f1d8b2da84ab0d5a46f848377"
},
"src/universal/OptimismMintableERC20.sol:OptimismMintableERC20": {
"initCodeHash": "0x3c85eed0d017dca8eda6396aa842ddc12492587b061e8c756a8d32c4610a9658",
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/src/safe/LivenessModule2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,9 @@ abstract contract LivenessModule2 {
revert LivenessModule2_ResponsePeriodActive();
}

// Reset the challenge state to allow a new challenge
delete challengeStartTime[_safe];

// Get current owners
address[] memory owners = _safe.getOwners();

Expand Down Expand Up @@ -296,9 +299,6 @@ abstract contract LivenessModule2 {
revert LivenessModule2_OwnershipTransferFailed();
}

// Reset the challenge state to allow a new challenge
delete challengeStartTime[_safe];

// Disable the guard
// Note that this will remove whichever guard is currently set on the Safe,
// even if it is not the SaferSafes guard. This is intentional, as it is possible that the guard
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/src/safe/SaferSafes.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { ISemver } from "interfaces/universal/ISemver.sol";
/// functionality is not desired, then there is no need to enable or configure it.
contract SaferSafes is LivenessModule2, TimelockGuard, ISemver {
/// @notice Semantic version.
/// @custom:semver 1.4.0
string public constant version = "1.4.0";
/// @custom:semver 1.5.0
string public constant version = "1.5.0";

/// @notice Error for when the liveness response period is insufficient.
error SaferSafes_InsufficientLivenessResponsePeriod();
Expand Down