Skip to content

Merge develop into master#2789

Merged
mslipper merged 27 commits intomasterfrom
develop
Jun 15, 2022
Merged

Merge develop into master#2789
mslipper merged 27 commits intomasterfrom
develop

Conversation

@tynes
Copy link
Copy Markdown
Contributor

@tynes tynes commented Jun 15, 2022

Description
Start the release process

smartcontracts and others added 27 commits June 10, 2022 18:49
Have BSV2 collect default node metrics

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
…e payload/attributes types to eth package (#2761)

* feat(bedrock): move ExecutionPayload, PayloadAttributes and other engine types from l2 to eth package

* chore(bedrock): clean up derive package, move test util out or polish for public use, split payload_attributes and improve file names

* chore(bedrock): move more test utils out of derive and driver packages into shared package

* bedrock: fix go import newlines/order

* testutils: describe TestID usage

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat: nft bridge from eth network to optimism

* Update yarn.lock

* feat: added event tests

* fixed import path

* feat: added integration tests to nft bridge

* fix: removed constructor logic from l2 bridge so it can exist as a proxy

* fix: updated pr based on maurelian's comments

* deploy scripts

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* ci: better check for snapshot diff

* contracts-bedrock: unified solmate import

* contracts-bedrock: fix solmate import

* contracts-bedrock: implement Proxy

* contracts-bedrock: implement ProxyAdmin

* bedrock: snapshot

* contracts: make admin work with legacy proxies

* contracts-bedrock: review fixes

* contracts-bedrock: linting

* contracts-bedrock: lint

* contracts-bedrock: review fixes

* contracts-bedrock: snapshot

* contracts-bedrock: rename

* contracts-bedrock: renames

* contracts-bedrock: renaming
This enables full semgrep scans on develop while retaining
incremental scans on PR branches. This should help with the
baseline stats + showing fixed commits.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat: introduce hardhat-deploy-config

Creates a new package hardhat-deploy-config. We're using the same
configuration system for all of our contracts package, so might as well
turn it into a hardhat plugin to avoid duplicating code.

* feat(ct): use hardhat-deploy-config

* plugin: don't validate if spec not passed

* contracts: update deps

* contracts-bedrock: use deploy config plugin

* contracts-bedrock: deploy instructions

* contracts-bedrock: modularize deployment

* contracts-bedrock: add deploy-config

* contracts-bedrock: add in deploy config spec

* lint: fix

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Checks to ensure the latest gas snapshot has
been committed
* Add `make nuke` which removes ALL build output/caches/etc
  (everything that is `.gitignore`d).

* Add `-v` flag to `xargs` in `make devnet-clean` so that it doesn't error when
  there are no volumes or images to delete.

* If `nvm` is installed, emit `nvm use` before compiling js.

* Add `yarn install` to `build-ts`.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Updates L2 contract style to match L1 contract style.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Deploys Drippie and related contracts to Kovan and OP kovan.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Downloads and caches the Solidity compilers to avoid CI errors where
circle seems to be getting rate limited. Checks compilers against known
hashes to guarantee that we're not getting any sort of error during this
caching step.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* feat(ctp): simplify and standardize ERC721 bridge

Significantly simplifies the ERC721 bridge contracts and standardizes
them according to our new seaport-style standard. Removes some
unnecessary code and updates the interface for the bridge to match the
expected interface for the ERC20 bridge after Bedrock.

* integration-tests: fixup

* integration-tests: fix constructor

* fix: circular dep in itests

* tests: fixes

* fix(ctp): add version to contracts

* fix: test failures

* fix: tests

* itests: additional check

* whoops

* fix: address review feedback

* fix: rename data to extraData

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* build: add prebuild script to check for foundry installation

* fix: replace shell script with simple ts script for windows compatability

* lint: use import statement instead of variable require

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* end immediately when looping

* changeset

* improvements based on comments

* add logging

* add logging ect. to main loop

* stop main loop

* get rid of this.running for this.loop

* Revert "get rid of this.running for this.loop"

This reverts commit 18e6fe8.

* lower-case

Co-authored-by: Will Cory <willcory@Wills-MacBook-Pro.local>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* Working L2 replicas

* Split env for sync-source

* Split env, fixed address manager

* goerli-replica-l1-0-5-14-beta

* Updated docker-compose config

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This change addresses the H-O2 finding in the OZ audit extension.

Co-authored-by: Matthew Slipper <me@matthewslipper.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Removes the Mergify rule that requests reviewers. We need to redo who gets reviewed when. In the meantime, this prevents spammy review requests from getting through.
* Additional mainnet replicas

* Added mainnet-replica-l1-0-5-14-beta and mainnet-replica-l1-0-5-15
The curl commands weren't outputting files and the checksum verification was breaking other commands.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
* contracts: deploy scripts

* deploy-scripts: rename

* wip: deploy script

* feat: use deploy config plugin

Co-authored-by: Mark Tyneway <mark.tyneway@gmail.com>
* Deployment for bedrock contracts on goerli

* Added changeset

* Use single quotes

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
We accidentally bumped the es target to 2022 when it should've remained
at 2017.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This fixes the hh artifact schema that is generated
@changeset-bot
Copy link
Copy Markdown

changeset-bot bot commented Jun 15, 2022

🦋 Changeset detected

Latest commit: 2f3fae0

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

This PR includes changesets to release 19 packages
Name Type
@eth-optimism/contracts-bedrock Minor
@eth-optimism/contracts Patch
@eth-optimism/common-ts Minor
@eth-optimism/hardhat-deploy-config Minor
@eth-optimism/contracts-governance Patch
@eth-optimism/contracts-periphery Patch
@eth-optimism/js-builder Patch
@eth-optimism/integration-tests Patch
@eth-optimism/hardhat-node Patch
@eth-optimism/core-utils Patch
@eth-optimism/data-transport-layer Patch
@eth-optimism/drippie-mon Patch
@eth-optimism/fault-detector Patch
@eth-optimism/integration-tests-bedrock Patch
@eth-optimism/message-relayer Patch
@eth-optimism/replica-healthcheck Patch
@eth-optimism/sdk Patch
@eth-optimism/teleportr Patch
@eth-optimism/l2geth 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 C-protocol-critical Category: Modifies protocol-critical code labels Jun 15, 2022
@github-actions github-actions bot added M-contracts A-op-bindings Area: op-bindings A-integration Area: integration tests A-cannon Area: cannon A-ops Area: ops labels Jun 15, 2022
@mergify mergify bot requested a review from smartcontracts June 15, 2022 18:04
@mslipper mslipper merged commit 4587247 into master Jun 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-cannon Area: cannon A-integration Area: integration tests A-op-bindings Area: op-bindings A-ops Area: ops C-protocol-critical Category: Modifies protocol-critical code

Projects

None yet

Development

Successfully merging this pull request may close these issues.