Cherry-pick Safe directory changes from develop to op-safe-contracts/v1.0.0#18371
Merged
JosepBove merged 4 commits intoproposal/op-safe-contracts/v1.0.0from Nov 24, 2025
Merged
Conversation
…ruct (#18097) * feat(ctb): Add the nonce and txHash into the ScheduledTransactions struct * chore(ctb): bump the semver on SaferSafes * feat(ctb): txHash at start of struct * semver-lock * fix ITimelockGuard to match --------- Co-authored-by: Alberto Cuesta Cañada <alberto@oplabs.co>
* Typo * Fix natspec notice * `_blockingThreshold` natspec * Bump the safe nonce when cancelling * Accepted trade-off * We allow cancelling transactions from disabled guards. * Fixed `changeOwnershipToFallback` natspec. * Updated version and semver-lock * Typo
* Missing `indexed` in an event * Don't allow configuring a non-enabled safe * Version and semver-lock * Disallow the safe address as a fallback owner * Document why we prefer not to revert * Disallow a timelock delay of zero, use `setGuard(0)` instead. * lint and semver-lock * Simpler natspec * Update test description Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com> --------- Co-authored-by: graphite-app[bot] <96075541+graphite-app[bot]@users.noreply.github.com>
smartcontracts
approved these changes
Nov 24, 2025
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## proposal/op-safe-contracts/v1.0.0 #18371 +/- ##
==================================================================
Coverage 81.62% 81.62%
==================================================================
Files 120 120
Lines 6480 6482 +2
==================================================================
+ Hits 5289 5291 +2
Misses 1191 1191
Flags with carried forward coverage won't be shown. Click here to find out more.
🚀 New features to boost your workflow:
|
JosepBove
merged commit e3c3b8d
into
proposal/op-safe-contracts/v1.0.0
66 of 69 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR cherry-picks all Safe directory changes from develop that occurred after the
op-safe-contracts/v1.0.0tag was created. This ensures the Safe contracts on the v1.0.0 branch match the latest improvements on develop.Changes
Cherry-picked the following commits:
feat(ctb): Add the nonce and txHash into the ScheduledTransactions struct (feat(ctb): Add the nonce and txHash into the ScheduledTransactions struct #18097)
Safer Safes audit fixes (no bytecode changes) (Safer Safes audit fixes (no bytecode changes) #18147)
SaferSafes audit fixes 2 (SaferSafes audit fixes 2 #18172)
indexedto eventsRecommended a Safe fallback owner (Recommended a Safe fallback owner #18239)
Files Changed
src/safe/LivenessModule2.solsrc/safe/SaferSafes.solsrc/safe/TimelockGuard.soltest/safe/LivenessModule2.t.soltest/safe/TimelockGuard.t.solinterfaces/safe/ITimelockGuard.solVerification
All cherry-picks were successful with no conflicts. The Safe directory now matches develop.