Skip to content

Develop -> Master#2816

Merged
mslipper merged 30 commits intomasterfrom
develop
Jun 18, 2022
Merged

Develop -> Master#2816
mslipper merged 30 commits intomasterfrom
develop

Conversation

@mslipper
Copy link
Copy Markdown
Contributor

github-actions bot and others added 29 commits June 15, 2022 11:18
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
* bedrock: Use startPrank to clean up tests

* bedrock: Simplify static calling code in proxy admin

* bedrock: rename OpenZeppelin proxy to ERC1967
Adds deployment artifacts for our Kovan deployment of the NFT bridge and
all related proxy contracts. Also includes an update to
contracts-bedrock to properly export contract sources.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
fixup! contracts: Fix OZ-N-03 Complex ERC165 implementation

contracts: Fix OZ-N-03 Complex ERC165 implementation

fixup! contracts: Fix OZ-N-03 Complex ERC165 implementation
Also fixes OZ-N-06 which was a single typo.
* op-bindings: Provide common.Address types of predeploys

We provide both a string literal which contains the address as const
a hex string and as the type common.Address.

We typically use addresses in the common.Address type so this avoids
users having to do the conversion manually.

* Use new predeploy address types

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
We never want to expose Geth's accounts to the public internet, so proxyd will now return `[]` for `eth_accounts` RPC calls without hitting the backend.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This PR depends on #26 on reference-optimistic-geth:

ethereum-optimism/reference-optimistic-geth#26

A new test TestFees is added, which runs a simple transaction and tests
that the L2 fee is redirected to the configured fee recipient and that
the L1 availability fee is calculated based the RLP encoded transaction
size and also redirected to the configured fee recipient.

TestFees is skipped, but can be enabled the above PR is merged into
reference-optimistic-geth.

NOTE: After #26 reference-optimistic-geth is merged, L2 genesis
configuration needs to be updated for OptimismConfig to enable special
fee handling and to find L1Block, GasPriceOracle contract addresses.
* bedrock: use block number for key in output oracle

* contracts: Apply seaport style to natspec comments

Inspo: https://github.com/ProjectOpenSea/seaport/blob/main/contracts/Seaport.sol

* bedrock: Improve oracle error messages

* bedrock: update node and proposer with new oracle interface

* bedrock: add tests for oracle reorg protection.

* Fix op-proposer & withdrawals logic

* Golang PR Fixes

* specs: use block number for key in output oracle

* bedrock: Fix CamelCase on oracle events

* bedrock: Update arg name in usage of getL2Output

* bedrock: Oracle add computeL2Timestamp and check on append

Co-authored-by: Joshua Gutow <jgutow@optimism.io>
This commit also expands on the natspec comments to clarify how the additional
data may be used.

fixup! contracts: Fix OZ-M-05 rename _data to _extraData
There was no `drippie-mon` target in `Dockerfile.packages`, and the canary build was using the `relayer` target.
* update metrics to more permissive type

* changeset

Co-authored-by: Will Cory <willcory@Wills-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fixes BSV2 to correctly ignore invalid routes in metrics by normalizing
them to /invalid_path_not_a_real_route.
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 18, 2022

🦋 Changeset detected

Latest commit: 10e4152

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

This PR includes changesets to release 9 packages
Name Type
@eth-optimism/common-ts Minor
@eth-optimism/contracts-bedrock Minor
@eth-optimism/drippie-mon Patch
@eth-optimism/proxyd Patch
@eth-optimism/contracts-periphery Patch
@eth-optimism/data-transport-layer Patch
@eth-optimism/fault-detector 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-op-bindings Area: op-bindings A-pkg-core-utils Area: packages/core-utils A-integration Area: integration tests A-cannon Area: cannon A-ops Area: ops A-pkg-sdk Area: packages/sdk labels Jun 18, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 18, 2022

Hey @mslipper! This PR has merge conflicts. Please fix them before continuing review.

@mergify mergify bot added the conflict label Jun 18, 2022
@github-actions github-actions bot removed M-contracts A-cannon Area: cannon A-pkg-sdk Area: packages/sdk A-pkg-core-utils Area: packages/core-utils A-integration Area: integration tests labels Jun 18, 2022
@mslipper mslipper changed the title Devlop -> Master Develop -> Master Jun 18, 2022
@mergify mergify bot removed the conflict label Jun 18, 2022
@mslipper mslipper merged commit 570941d into master Jun 18, 2022
theochap pushed a commit that referenced this pull request Dec 10, 2025
Uniswap labs runs bootnodes dedicated to the CL as well as to the EL.
I have added rather than replaced because both EL and CL bootnodes
are present in this file.
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-ops Area: ops

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants