Skip to content

fix: merge conflicts in lockbox#147

Merged
agusduha merged 112 commits intosc-feat/add-shared-lockboxfrom
fix/merge-conflict-lockbox-2
Dec 9, 2024
Merged

fix: merge conflicts in lockbox#147
agusduha merged 112 commits intosc-feat/add-shared-lockboxfrom
fix/merge-conflict-lockbox-2

Conversation

@agusduha
Copy link
Copy Markdown
Member

@agusduha agusduha commented Dec 9, 2024

No description provided.

zhiqiangxu and others added 30 commits November 29, 2024 01:49
Adds the ability to supply arguments to the "just test" recipe in
the contracts package. Developers frequently need to add arguments
to test specific contracts and running "just test" as the unified
testing command is better than flipping to "forge test".
There was one other spot where the batcher would log after tests exit, causing a panic.
…m#13128)

* Update README.md

* Update README.md

* Update README.md
Fixes the stack-too-deep error in the PermissionedDisputeGame by
updating the game to use a struct as the constructor parameter.
…ng (ethereum-optimism#13124)

* add additional assertions to test to check for tx ordering

* enhance test to handle tx confirmation ID ordering

* increase size of 0th tx to expose race condition

* change approach since the backend does not order txs by nonce

* tidy

* clarify

* Update op-service/txmgr/queue_test.go

Co-authored-by: Sebastian Stammler <seb@oplabs.co>

---------

Co-authored-by: Sebastian Stammler <seb@oplabs.co>
* SendDepositTx: make applyL2Opts nil-able

* move maxBlobs closer to used place

* fix typo
When any of the setup transactions in `TestInterop_EmitLogs` fail to be mined, the test hangs until it times out. See [here](https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/73118/workflows/b48debaa-55bc-4138-a419-a87c236cbc58/jobs/2994655/artifacts) for an example. This PR updates the SuperSystem API to take a context from the test itself to allow for timeouts.
* disable forge coverage in ci

* disable forge coverage in ci

* disable forge coverage in ci
Updates the Cannon libraries to be version agnostic instead of
being pinned to 0.8.15. This is OK because we do not deploy
libraries outside of contracts that have pinned contract versions.
…3134)

Introduces a new common base framework for writing contracts
check scripts in Go. Many of the check scripts basically do the
exact same logic of somehow parsing either the interfaces or the
artifact files. Goal of this small project is to make the process
of writing new checks easier and more reliable.

We demonstrate this framework in action by porting the test-names
script to use this new framework.
Introduces mise for polyglot tool dependency management.
Golang map iteration order is random, so we need to sort first.
…d signing (ethereum-optimism#12325)

* Initial implementation of integrating op-node with op-signer for remote signer configuration for block payload signing

* op-service: remove the requirement for signer.address to be set when using op-service

* op-service: add blockpayload_args to send to rpc opsigner_signBlockPayload

* Implement mock rpc in gossip_test and apply review

* Clean up tests
* feat: remove unused onlyTestnetOrDevnet modifier

* feat: remove unused _includeDump arg
* remove done todo from just file

* remove done todo from just file
zhiqiangxu and others added 24 commits December 6, 2024 17:09
* Don't repeat yourself

* add a log for loadBlocksIntoState

* op-batcher: fix log in batcher/driver.go

* modify log

---------

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
With Holocene, batcher transaction ordering has to be strictly preserved, so
trying to send a transaction candidate should just never timeout.
Note that the txmgr will still bump fees to get a transaction for the
same nonce submitted.
…3223)

semver-lock justfile task didn't build by default which was
confusing. Now it does.
* test utils

* test utils

* rm unncesessary vm.assume

* rm unncesessary vm.assume

* rm unncesessary vm.assume

* fixes...

* rm testutils
* op-supervisor: readme draft

* op-supervisor: fix review suggestions

* op-supervisor: readme extension

* op-supervisor: fix mermaid diagram syntax
* op-deployer: Bootstrap superchain command

Fixes ethereum-optimism#13265.

* fix test
ethereum-optimism#13298)

Bumps [github.com/holiman/uint256](https://github.com/holiman/uint256) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/holiman/uint256/releases)
- [Commits](holiman/uint256@v1.3.1...v1.3.2)

---
updated-dependencies:
- dependency-name: github.com/holiman/uint256
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* feat: remove unused systemConfigs mapping from OPCM

* fix semver lock
…timism#11901)

* single source of truth for DerivationVersion

* op-node/rollup: fix imports

---------

Co-authored-by: protolambda <proto@protolambda.com>
* ci: Specify number of jobs in contract tests

* reduce runs

* decrease runs

* don't rebuild on semver lock

* remove -j
Bumps versions being used for forge, cast, and anvil.
* op-deployer: Support output files in bootstrap

* lint
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
* Fix conductor test race condition

* update

* Address shell ci check

* rerun CI for non-related issue
…ptimism#13292)

* add additional test case for computeSyncActions

* fixup test

* check for unsafe = safe edge case & replace oldestUnsafeBlock with nextSafeBlock

* add test case for no progress and safe=unsafe

* refine log

* rename variable

* harmonize log ordering and labels

* tighten up test behaviour for expectedLogs

* add test case: no progress + unsafe=safe + blocks in state

and fix behaviour so we don't try to fetch unsafe blocks if there aren't any, even when there are blocks in state

* typo
* supervisor: L1 Processor

* comments ; test fixes

* Make L1 source separate from RPC Addr

* fix test

* Add atomic bool for singleton processor routine
* add RegSP constant

* address comments

* fix natspec

* update semver-lock
@agusduha agusduha self-assigned this Dec 9, 2024
@agusduha agusduha merged commit 9163c9c into sc-feat/add-shared-lockbox Dec 9, 2024
@agusduha agusduha deleted the fix/merge-conflict-lockbox-2 branch December 9, 2024 17:55
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.