Skip to content

Develop -> Master #3091

Merged
tynes merged 54 commits intomasterfrom
develop
Jul 25, 2022
Merged

Develop -> Master #3091
tynes merged 54 commits intomasterfrom
develop

Conversation

@tynes
Copy link
Contributor

@tynes tynes commented Jul 25, 2022

Description
Start release process

maurelian and others added 30 commits July 14, 2022 00:09
* style(ctb): Rename append to propose
Please enter the commit message for your changes. Lines starting

* style(ctb): Use output root for bytes32

This is more accurate than saying 'L2 output' which is better
applied to the full unhashed data structure

* style(ctb): Rename sequencer to proposer in oracle

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Cleans up minor linting issues in MerkleTrie.sol.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Adds a test that ETH gets properly stuck in the CrossDomainMessenger
contracts but then is unstuck when the message is replayed.

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Maurelian <maurelian@protonmail.ch>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Adds tests for reentrancy on message relaying.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* op-batcher: improve logging

* op-e2e: increase sequence window size, and update missing-batch test with comments to clarify behavior

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This was previously waiting for 2 blocks to deploy the portal contract.
Some new contract changes are now hitting a timeout so this increases
the timeout to 6 L1 blocks.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Adds a test that bridge contracts return to sender on failed deposits or
withdrawals.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Updates revert messages across all contracts to use the standardized
format "<ContractName>: <lowercase message>".
* feat(bedrock): Versioned TransactionDeposited event

- Index the deposit event version
- Update fuzz test to use new deposit type
- UnmarshalDepositLogEvent update
- Change event version from 1 to 0
- Add version to MarshalDepositLogEvent
- Pack opaque data, abi.encodePacked
- Handle encodePacked data in Marshal and Unmarshal DepositLogEvent
- Refactor for versioned opaqueData marshal/unmarshal methods
- Update op-bindings OptimismPortal

* core-utils: update deposit transaction serialization

* op-node: Add comment to clarify deserialization

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Shortens library names. Woot.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Updates the Semver contract to include a getter function to retrieve the
full version string.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* fix: remove deposit tx subtype

Opt to stay typed tx spec compliant

* bedrock: update geth, deposit tx without sub-version

* go: go.work.sum update

Co-authored-by: protolambda <proto@protolambda.com>
Moves various legacy contracts into the legacy folder. Purpose of the
legacy folder is to explicitly mark the contracts that we're trying to
push users away from. By moving these contracts into the legacy folder,
we're creating a clearer message that users should be using alternatives
and should not be using these contracts after Bedrock.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat(bedrock): getL2Output reverts if not found

feat(bedrock): Handle error on empty output in Portal

feat(ctb): use isOutputFinalized in finalizeWithdrawalTx

* ctb: Remove extraneous abi encoding

Revert "feat(ctb): use isOutputFinalized in finalizeWithdrawalTx"

This reverts commit 4d4e89d.

ctb: getL2Output returns the next output for a block

ctb: Fix error message style
* Op-Node: Restore sync package

* Op-Node: Fix reset/reorg logic

This now uses the old sync package b/c the pipeline reset logic was
not actually working.

* OP Node: Add time invariant check to reset step

* Don't skip L1 Origin in reset step

* sync: Rollback to block with sequence number 0

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* batch derivation spec draft

* add diagrams, fix recovery-from-reorg wording

* update spec to cover channel ID timestamp

* specs: update batch derivation diagrams

* simplified overview draft + greatly expand glossary

* section on batch submission an encoding

* stages explanation

* edit resetting part of the spec

* rework pipeline description (& more)

* incorporate review feedback

* recover lost change

* rework payload attributes derivation section

* specs: toc fix

* specs: misc lint fixes

* specs/meta: toc fix

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* core-utils: add encoding and hashing functions to core-utils

* ci: update

* contracts-bedrock: differential fuzzing

* deps: update forge-std

* contracts-bedrock: set fuzz runs to 512

* contracts-bedrock: rename differential-testing method

* contracts-bedrock: no sender as address(OptimismPortal)
Using solc 0.8.15
contracts-bedrock: bump to use solidity 0.8.15
Introduces a new library, Types.sol, meant to hold various different
structs that get used all over the place.
tynes and others added 19 commits July 19, 2022 08:19
Fixes a bug in the Bedrock L2 genesis script where storage slots were
being set in the implementation rather than the proxy, which (obviously)
broke various things that the SDK relies on.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Removes linter errors by importing things that extend types
* Fix Optimism Config in L2 Genesis builder

This places the Optimism chain config in the correct place as
well as deleting the spurious Clique config in the L2 genesis.

* packages/core-utils: bedrock config type fix

* packages/contracts-bedrock: update genesis l2 task import

* packages/core-utils: bedrock - remove old todo comment

Co-authored-by: Joshua Gutow <jgutow@optimism.io>

Co-authored-by: protolambda <proto@protolambda.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Deploy goerli StateCommitmentChain to fix sccFaultProofWindowSeconds

* Deploy goerli StateCommitmentChain to fix sccFaultProofWindowSeconds

* redeploy

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This logging provides insights into which L2 blocks are going
through the reconciliation process.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Introduces a new SentMessageExtraData event to the CrossDomainMessenger
base contract. We need this event so that we can properly find all
relevant message data in the SDK. SDK cannot function without this
event. We also cannot add to the old SentMessage event without breaking
the ABI of our contract, so we're stuck adding an extra data event.
Updates the TypeScript build to also generate ABI objects that can be
imported on the client-side. Specifically necessary so that these ABIs
can be imported on the frontend where fs/glob is not available.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Updates the SDK to throw a better error when the user provides a bad
chain ID. Would've helped an end-user more easily debug an issue where
the chain ID parameter was missing.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…3082)

* feat(sdk): Update the Goerli SCC contract address to the new value

* feat(sdk): Bump the SDK version to 1.3.1

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
contracts-bedrock: print receipt after deposit
Bumps [@openzeppelin/contracts-upgradeable](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable) from 4.4.0 to 4.7.1.
- [Release notes](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/releases)
- [Changelog](https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable/blob/master/CHANGELOG.md)
- [Commits](OpenZeppelin/openzeppelin-contracts-upgradeable@v4.4.0...v4.7.1)

---
updated-dependencies:
- dependency-name: "@openzeppelin/contracts-upgradeable"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@changeset-bot
Copy link

changeset-bot bot commented Jul 25, 2022

🦋 Changeset detected

Latest commit: 9e83f9a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 11 packages
Name Type
@eth-optimism/core-utils Patch
@eth-optimism/contracts-bedrock Patch
@eth-optimism/contracts-periphery Patch
@eth-optimism/sdk Patch
@eth-optimism/ci-builder Patch
@eth-optimism/contracts Patch
@eth-optimism/common-ts Patch
@eth-optimism/data-transport-layer Patch
@eth-optimism/drippie-mon Patch
@eth-optimism/message-relayer Patch
@eth-optimism/replica-healthcheck Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added 2-reviewers A-pkg-contracts-bedrock Area: packages/contracts-bedrock A-op-bindings Area: op-bindings A-pkg-core-utils Area: packages/core-utils A-pkg-sdk Area: packages/sdk labels Jul 25, 2022
@tynes tynes merged commit a5d669e into master Jul 25, 2022
theochap pushed a commit that referenced this pull request Jan 15, 2026
…3146)

## Summary
- Added `shutdown_signal()` function to listen for SIGTERM and SIGINT
- Spawned a task in `RollupNode::start()` that triggers the existing
`CancellationToken` when OS signals are received
- All actors already support graceful shutdown via CancellationToken,
this just adds the missing OS signal handling

## Changes
- Modified `crates/node/service/src/service/node.rs`
- Cross-platform support: SIGTERM on Unix, Ctrl+C (SIGINT) on all
platforms

Closes #3091
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-op-bindings Area: op-bindings A-pkg-contracts-bedrock Area: packages/contracts-bedrock A-pkg-core-utils Area: packages/core-utils A-pkg-sdk Area: packages/sdk

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants