Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ethereum-optimism/optimism into v…
Browse files Browse the repository at this point in the history
…0.3.0-rc
  • Loading branch information
karlfloersch committed Apr 30, 2021
2 parents 4eff927 + 4837aae commit e29730d
Show file tree
Hide file tree
Showing 152 changed files with 9,056 additions and 409 deletions.
5 changes: 0 additions & 5 deletions .changeset/calm-flies-drive.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cuddly-geese-hope.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/eleven-books-camp.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/famous-dragons-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/data-transport-layer': patch
---

add metrics to measure http endpoint latency
6 changes: 0 additions & 6 deletions .changeset/new-owls-scream.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/odd-cows-fry.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/old-mirrors-doubt.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/rich-steaks-train.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/seven-kids-smash.md

This file was deleted.

9 changes: 9 additions & 0 deletions .changeset/silent-turtles-add.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@eth-optimism/common-ts': minor
'@eth-optimism/core-utils': minor
'@eth-optimism/batch-submitter': patch
'@eth-optimism/data-transport-layer': patch
'@eth-optimism/message-relayer': patch
---

move metrics, logger, and base-service to new common-ts package
5 changes: 0 additions & 5 deletions .changeset/smooth-beds-rhyme.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/violet-falcons-hunt.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/wild-cycles-care.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@eth-optimism/contracts": patch
---

Add pause(), blockMessage() and allowMessage() to L1 messenger
5 changes: 0 additions & 5 deletions .changeset/wild-experts-explode.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/wild-jokes-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/l2geth': patch
---

Update `scripts/start.sh` to regenesis v0.2.0
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ ops/ @tynes @karlfloersch
packages/hardhat-ovm/ @smartcontracts
packages/smock/ @smartcontracts @maurelian
packages/core-utils/ @smartcontracts @annieke @ben-chain
packages/common-ts/ @annieke
packages/core-utils/src/watcher.ts @K-Ho
packages/message-relayer/ @K-Ho
packages/batch-submitter/ @annieke @karlfloersch
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/geth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ on:
branches:
- master
- '*rc'
workflow_dispatch:

defaults:
run:
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- master
- '*rc'
pull_request:
workflow_dispatch:

jobs:
integration:
Expand All @@ -14,6 +15,7 @@ jobs:
DOCKER_BUILDKIT: 1
COMPOSE_DOCKER_CLI_BUILD: 1
steps:
# Monorepo tests
- uses: actions/checkout@v2

- name: Get yarn cache directory path
Expand Down Expand Up @@ -42,3 +44,33 @@ jobs:
yarn build:contracts
yarn build:contracts:ovm
yarn test:integration
env:
FORCE_COLOR: 1
ENABLE_GAS_REPORT: 1

- name: Print gas report
run: cat integration-tests/gas-report.txt

# Examples Tests
- name: Test & deploy hardhat-example on hardhat (regression)
working-directory: ./examples/hardhat
run: |
yarn deploy
yarn test:integration
- name: Test & deploy hardhat-example on Optimism
working-directory: ./examples/hardhat
run: |
yarn deploy:ovm
yarn test:integration:ovm
- name: Test & deploy waffle-example on waffle (regression)
working-directory: ./examples/waffle
run: |
yarn compile
yarn test:integration
- name: Test & deploy waffle-example on Optimism
working-directory: ./examples/waffle
run: |
yarn compile:ovm
yarn test:integration:ovm
11 changes: 8 additions & 3 deletions .github/workflows/ts-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
paths:
- 'packages/**/*.sol'
- 'packages/**/*.ts'
workflow_dispatch:

jobs:
test:
Expand Down Expand Up @@ -53,8 +54,12 @@ jobs:
run: yarn build

- name: Test
run: yarn test:ci

run: yarn test
env:
FORCE_COLOR: 1
ENABLE_GAS_REPORT: 1
- name: Print gas report
run: cat packages/contracts/gas-report.txt
lint:
name: Linting
runs-on: ubuntu-latest
Expand Down Expand Up @@ -84,4 +89,4 @@ jobs:
run: yarn install

- name: Lint
run: yarn lint:ci
run: yarn lint
File renamed without changes.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Extensive documentation is available [here](http://community.optimism.io/docs/)
* [`packages`](./packages): Contains all the typescript packages and contracts
* [`contracts`](./packages/contracts): Solidity smart contracts implementing the OVM
* [`core-utils`](./packages/core-utils): Low-level utilities and encoding packages
* [`common-ts`](./packages/common-ts): Common tools for TypeScript code that runs in Node
* [`hardhat-ovm`](./packages/hardhat-ovm): Hardhat plugin which enables the [OVM Compiler](https://github.com/ethereum-optimism/solidity)
* [`smock`](./packages/smock): Testing utility for mocking smart contract return values and storage
* [`data-transport-layer`](./packages/data-transport-layer): Event indexer, allowing the `l2geth` node to access L1 data
Expand Down
6 changes: 6 additions & 0 deletions examples/hardhat/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# The Official™ Optimism Tutorial

[![Discord](https://img.shields.io/discord/667044843901681675.svg?color=768AD4&label=discord&logo=https%3A%2F%2Fdiscordapp.com%2Fassets%2F8c9701b98ad4372b58f13fd9f65f966e.svg)](https://discord.com/channels/667044843901681675)
[![Twitter Follow](https://img.shields.io/twitter/follow/optimismPBC.svg?label=optimismPBC&style=social)](https://twitter.com/optimismPBC)

### For the full README, please see the [guided repository of the `optimism-tutorial`](https://github.com/ethereum-optimism/optimism-tutorial) repository
Loading

0 comments on commit e29730d

Please sign in to comment.