Skip to content

Fix circular dependency issues in rollup-core#188

Merged
smartcontracts merged 2 commits intomasterfrom
YAS-546/rollup-core/circular-deps
Jul 21, 2020
Merged

Fix circular dependency issues in rollup-core#188
smartcontracts merged 2 commits intomasterfrom
YAS-546/rollup-core/circular-deps

Conversation

@smartcontracts
Copy link
Copy Markdown
Contributor

Description

rollup-core currently depends on rollup-contracts for various L1/L2 node initialization tasks. rollup-core is used within many other packages, meaning we end up with circular dependency errors within rollup-contracts. This PR shifts these dependencies into rollup-full-node, the only package actually making use of the offending functions (will not be a dependency of rollup-contracts)

Metadata

Fixes

Contributing Agreement

@smartcontracts smartcontracts changed the title Fix circular dependency issues in rollup-core Fix circular dependency issues in rollup-core Jul 20, 2020
Copy link
Copy Markdown

@willmeister willmeister left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine -- I might suggest leaving environment.ts in rollup-core though. That should just be reading env vars, and it's convenient to have all of those in one place. I could also be convinced to separate them by service, but I think we may have the same ones for a number of services, so consistency could be nice.

@smartcontracts
Copy link
Copy Markdown
Contributor Author

smartcontracts commented Jul 20, 2020

Looks fine -- I might suggest leaving environment.ts in rollup-core though. That should just be reading env vars, and it's convenient to have all of those in one place. I could also be convinced to separate them by service, but I think we may have the same ones for a number of services, so consistency could be nice.

Sounds good. Will make that update in a sec.

Edit: Pushed.

@smartcontracts smartcontracts merged commit 30d08b7 into master Jul 21, 2020
@gakonst gakonst deleted the YAS-546/rollup-core/circular-deps branch March 18, 2021 15:02
snario pushed a commit that referenced this pull request Apr 14, 2021
Lredhdx pushed a commit to node-real/combo-optimism that referenced this pull request Jun 17, 2024
bap2pecs pushed a commit to babylonlabs-io/optimism that referenced this pull request Jul 31, 2024
Inphi added a commit that referenced this pull request Aug 16, 2024
* contracts: Add gas input to precompile pre-images (#186)

Also update the cannon evm tests to use the new precompile preimage scheme.

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

* op-challenger: Support uploading data in new format. (#188)

* op-program: Add required gas to precompile oracle key (#176)

* op-challenger: Support multiple versions of the preimage oracle contract

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

---------

Co-authored-by: inphi <mlaw2501@gmail.com>

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>
samlaf pushed a commit to samlaf/optimism that referenced this pull request Aug 20, 2024
…eum-optimism#252)

* contracts: Add gas input to precompile pre-images (ethereum-optimism#186)

Also update the cannon evm tests to use the new precompile preimage scheme.

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

* op-challenger: Support uploading data in new format. (ethereum-optimism#188)

* op-program: Add required gas to precompile oracle key (ethereum-optimism#176)

* op-challenger: Support multiple versions of the preimage oracle contract

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

---------

Co-authored-by: inphi <mlaw2501@gmail.com>

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>
ajsutton pushed a commit that referenced this pull request Dec 10, 2024
* contracts: Add gas input to precompile pre-images (#186)

Also update the cannon evm tests to use the new precompile preimage scheme.

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

* op-challenger: Support uploading data in new format. (#188)

* op-program: Add required gas to precompile oracle key (#176)

* op-challenger: Support multiple versions of the preimage oracle contract

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

---------

Co-authored-by: inphi <mlaw2501@gmail.com>

---------

Co-authored-by: Adrian Sutton <adrian@oplabs.co>

# Conflicts:
#	packages/contracts-bedrock/semver-lock.json
#	packages/contracts-bedrock/snapshots/state-diff/Kontrol-31337.json
#	packages/contracts-bedrock/src/cannon/PreimageOracle.sol
#	packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummary.sol
#	packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryCode.sol
#	packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofs.sol
#	packages/contracts-bedrock/test/kontrol/proofs/utils/DeploymentSummaryFaultProofsCode.sol
Zena-park added a commit to tokamak-network/optimism that referenced this pull request Dec 30, 2025
theochap pushed a commit that referenced this pull request Jan 15, 2026
### Description

Part of a port migrating the batch types from `kona-derive` to
`op-alloy`. See
[`kona#695`](op-rs/kona#695).

This PR introduces the `SingleBatch` type.
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.

2 participants