Skip to content

fix: sync develop#264

Merged
agusduha merged 29 commits intosc-feat/add-shared-lockboxfrom
fix/merge-conflict-lockbox-11
Feb 6, 2025
Merged

fix: sync develop#264
agusduha merged 29 commits intosc-feat/add-shared-lockboxfrom
fix/merge-conflict-lockbox-11

Conversation

@agusduha
Copy link
Copy Markdown
Member

@agusduha agusduha commented Feb 6, 2025

No description provided.

tynes and others added 29 commits February 4, 2025 19:59
This config file is no longer used now that we moved over to the
kurtosis based devnet. Removing it means less maintenance burden.
* feat: prevent ASR deployment collisions

* Slightly more compact casts

* lint and semver-lock

* feat: bump semvers

---------

Co-authored-by: alcueca <alberto@yield.is>
…#14152)

* supervisor: Refactor "Contains" ; Check Timestamps

* Update op-supervisor/supervisor/types/types.go

Co-authored-by: protolambda <proto@protolambda.com>

---------

Co-authored-by: protolambda <proto@protolambda.com>
…eum-optimism#13923)

* tweak: Allow RecordRef metrics to take arbitrary labels.

* interop: Add metrics to track CrossUnsafe and CrossSafe heads.

* tests: Add metrics tests to the backend.
Gives us the vm.prank() variants with delegateCall options
* feat: use v4 engine APIs when Isthmus enabled

* fix: ensure op-program requests hash empty

* Clean up test logging

* Fix tests

* Remove debug

* Ensure empty array is passed to new payload

* Fix op-program engine test

* Remove debug line

* Ensure requests empty array in other engine tests

* Use built-in empty requests hash

* Remove empty requests check

* Set prague time to isthmus time

* Resolve merge conflicts
…ptimism#14089)

Bumps [github.com/consensys/gnark-crypto](https://github.com/consensys/gnark-crypto) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/consensys/gnark-crypto/releases)
- [Changelog](https://github.com/Consensys/gnark-crypto/blob/master/CHANGELOG.md)
- [Commits](Consensys/gnark-crypto@v0.15.0...v0.16.0)

---
updated-dependencies:
- dependency-name: github.com/consensys/gnark-crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…m#14093)

* feat: add prague to genesis script based on Isthmus

* Ensure Isthmus fork status defaults to nil

* Ensure L1 prague disabled by default

* Remove extra change
…#14138)

* op-supervisor: Implement supervisor_syncStatus RPC

* set localUnsafe status after indexing; update tests

* Route origin updates to supe sync-status

* fix supervisor_client syncStatus

* fix naming and MinSyncedL1 comment
Rough start of a DSL to make writing interop action tests easier and higher level. This significantly reduces the amount of code required to setup the chain state needed for testing and generally makes the tests more readable.
* ci: Publish git commit and prestate hash alongside prestate

Fix naming of published prestates from release tags - they should be named as the prestate hash with no suffix.

* Test publishing

* Only upload git commit info for branch uploads, not releases.

* Skip uploading preimages to not pollute files while testing.

* Fix config

* Add context

* Include actual prestate hash

* Disable testing

* vm-runner: Download and log metadata for named prestates
removes a dead deployment file that was committed into the repo. this
should not be there.
* op-service/txmgr: add  TestQueue_Send_MaxPendingMetrics

* SendAsync: simplify m.metr.RecordPendingTx() usage

* use anonymous fn

* tidy
* feat: etch and reset upgrader

* fix var names

* feat: fix: testFuzz_upgrade_nonUpgradeControllerDelegatecallerShouldNotSetIsRCToFalse_works
* cannon: Add a few more test cases

* cannon: Use U32Mask throughout mips_instructions
* feat: Restore absolutePrestate input to opcm.upgrade()

* Update packages/contracts-bedrock/test/opcm/UpgradeOPChain.t.sol

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>

---------

Co-authored-by: Matt Solomon <matt@mattsolomon.dev>
* ci: Separate coverage job

Seeing a huge amount of CPU usage on this job which is starving the executor of resources.

* Also move the fuzzing

* use cci ip ranges
* Rename/Reorganize LocalDerivedFromStorage

* Rename LocalDerivedFromStorage to DerivationStorage ; remove CrossDerivedFromStorage

* Rename DerivedFrom to Source in events

* Rename DerivedFrom to Source in Types

* fix lint

* IsCanonical -> ContainsDerived

* Clean up Origin Event structure

* Remove most references to DerivedFrom

* Remove superflous First from function names
…14153)

Reconfigures existing gas snapshot system into a normal forge test.
Gas usage will now be asserted as part of CI instead of requiring
manual review.
* ci: Separate out contracts tests

* skip coverage test for now
* ci: Tweak rerun parameters

* ci: reduce parallel
Bounds the size of the DisputeGameFactory search tests when
running forked tests.
…mism#14180)

* op-program: use hdr withdrawalsRoot if isthmus is active

when computing L2OutputRoot, no need to re-compute the storage root
if Isthmus is active.

* Add Unit test for output root when Isthmus is active

* tweak tests a bit

* bail if withdrawalsHash is unexpectedly nil

---------

Co-authored-by: Vinod Damle <5338861+vdamle@users.noreply.github.com>
* ctb: filter upgrade tests in coverage

* ci: use rpc cache for coverage generation

* undo coverage skip

* ci: fix cache key generation

---------

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
@agusduha agusduha requested a review from 0xDiscotech February 6, 2025 00:44
@agusduha agusduha requested a review from hexshire February 6, 2025 00:44
@agusduha agusduha self-assigned this Feb 6, 2025
@agusduha agusduha merged commit d0d7c1e into sc-feat/add-shared-lockbox Feb 6, 2025
@agusduha agusduha deleted the fix/merge-conflict-lockbox-11 branch February 6, 2025 00:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.