Skip to content

Develop -> Master#2694

Merged
mslipper merged 29 commits intomasterfrom
develop
Jun 6, 2022
Merged

Develop -> Master#2694
mslipper merged 29 commits intomasterfrom
develop

Conversation

@mslipper
Copy link
Collaborator

@mslipper mslipper commented Jun 6, 2022

tynes and others added 29 commits June 2, 2022 15:17
It was previously in dev dependencies which could
cause problems for production builds
* bedrock: update geth, fixes empty tx list problem, and update go.work properly

* fix(op-node): increase gas of l1 info tx, temporary work-around, evm was running out of gas

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
contracts-bedrock: move core-utils to deps
* feat: new --l2.jwt-secret flag to authenticate engine API comms with l2, remove l2.eth flag, update e2e tests

* feat: update bedrock ops with jwt secret flag

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Replaces OZ contracts with solmate, now that v7 is MIT licensed.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Will Cory <willcory@Wills-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
ci: Add mergify-ignore label to prevent automerge
Fixes the top level makefile after bedrock contracts migration
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…0.17 in /op-exporter (#2651)

* chore(deps): bump github.com/ethereum/go-ethereum in /op-exporter

Bumps [github.com/ethereum/go-ethereum](https://github.com/ethereum/go-ethereum) from 1.10.16 to 1.10.17.
- [Release notes](https://github.com/ethereum/go-ethereum/releases)
- [Commits](ethereum/go-ethereum@v1.10.16...v1.10.17)

---
updated-dependencies:
- dependency-name: github.com/ethereum/go-ethereum
  dependency-type: direct:production
...

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

* Create red-eyes-sparkle.md

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* maint(ct): clean up OptimismPortal contract

Cleans up and standardizes the OptimismPortal contract.

* feat(ct): implement EIP-1559 gas burn

Implements the EIP-1559 gas burn in the OptimismPortal using Joshua's
specification. Simplified the initial draft by Mark quite a bit at the
expense of slightly increased gas costs.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* Update replicas for new healthcheck verison

* Added mainnet replicas

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Addresses TOB-OPT-7:
> When a smart contract submits a deposit transaction, the code will transform the contract address to an aliased address by adding a fixed offset. Due to the lack of specification and guidance regarding how smart contracts should manage funds within the system, a naive smart contract that interacts with the DepositFeed could lock funds in the system that may not be retrievable later.

The recommendation was:
> Provide guidance within the documentation to ensure that smart contract developers are aware of this edge case.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Fixes the linter to ensure that the prettier
that was installed is used instead of a global
prettier executable
- Update metrics collection to happen on an interval in addition to on each tick of the driver loop. This lets us continue collecting on-chain metrics if the driver loop halts for some reason.
- Adds an additional metric to track the last on-chian deposit ID. This will let add Teleportr halting alerts more easily.
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
@changeset-bot
Copy link

changeset-bot bot commented Jun 6, 2022

🦋 Changeset detected

Latest commit: 0f794f9

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

This PR includes changesets to release 2 packages
Name Type
@eth-optimism/teleportr Patch
@eth-optimism/contracts-bedrock 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 labels Jun 6, 2022
@mslipper mslipper merged commit 3406775 into master Jun 6, 2022
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants