Skip to content

Commit

Permalink
Merge branch 'develop' into fix/release-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
mslipper authored Mar 3, 2022
2 parents a47e9e8 + 5e0a328 commit 624f4b3
Show file tree
Hide file tree
Showing 577 changed files with 33,196 additions and 11,585 deletions.
5 changes: 0 additions & 5 deletions .changeset/clean-jars-check.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/empty-deers-buy.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/fair-starfishes-admire.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'@eth-optimism/integration-tests': patch
---

Updates to support nightly actor tests
Add test coverage for zlib compressed batches
5 changes: 5 additions & 0 deletions .changeset/flat-penguins-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/data-transport-layer': patch
---

Enable typed batch support
5 changes: 5 additions & 0 deletions .changeset/heavy-bugs-mate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/batch-submitter': patch
---

Update to allow for zlib compressed batches
5 changes: 0 additions & 5 deletions .changeset/mean-llamas-speak.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/poor-walls-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/batch-submitter-service': patch
---

Move L2 dial logic out of bss-core to avoid l2geth dependency
5 changes: 5 additions & 0 deletions .changeset/rare-onions-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/integration-tests': patch
---

Replaces contract references in integration tests with SDK CrossChainMessenger objects.
5 changes: 0 additions & 5 deletions .changeset/silent-keys-hunt.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/ten-rats-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/batch-submitter-service': patch
---

Enable the usage of typed batches and type 0 zlib compressed batches
5 changes: 5 additions & 0 deletions .changeset/thin-trees-matter.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/core-utils': patch
---

Update batch serialization with typed batches and zlib compression
118 changes: 108 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
orbs:
gcp-gke: circleci/[email protected]
slack: circleci/[email protected]
slack-fail-post-step: &slack-fail-post-step
slack-nightly-build-fail-post-step: &slack-nightly-build-fail-post-step
post-steps:
- slack/notify:
channel: $SLACK_DEFAULT_CHANNEL
Expand Down Expand Up @@ -141,6 +141,32 @@ jobs:
kubectl rollout restart statefulset nightly-dtl --namespace nightly
kubectl rollout restart deployment nightly-gas-oracle --namespace nightly
kubectl rollout restart deployment edge-proxyd --namespace nightly
run-itests-nightly:
docker:
- image: cimg/base:2021.04
steps:
- setup_remote_docker:
version: 19.03.13
- run:
name: Run integration tests
command: |
docker run \
--env PRIVATE_KEY=$NIGHTLY_ITESTS_PRIVKEY \
--env L1_URL=https://nightly-l1.optimism-stacks.net \
--env L2_URL=https://nightly-l2.optimism-stacks.net \
--env ADDRESS_MANAGER=0xfcA6De8Db94C4d99bD5a7f5De1bb7A039265Ac42 \
--env L2_CHAINID=69 \
--env MOCHA_BAIL=true \
--env MOCHA_TIMEOUT=300000 \
--env L1_GAS_PRICE=onchain \
--env L2_GAS_PRICE=onchain \
--env RUN_DEBUG_TRACE_TESTS=false \
--env RUN_REPLICA_TESTS=false \
--env RUN_STRESS_TESTS=false \
--env OVMCONTEXT_SPEC_NUM_TXS=1 \
--env DTL_ENQUEUE_CONFIRMATIONS=12 \
"$STACKMAN_REPO/integration-tests:nightly" \
yarn test:integration:live
notify:
docker:
- image: cimg/base:2021.04
Expand All @@ -152,6 +178,78 @@ jobs:
workflows:
nightly-itests:
triggers:
- schedule:
cron: "0 1 * * * "
filters:
branches:
only:
- develop
jobs:
- run-itests-nightly:
context:
- optimism
post-steps:
- slack/notify:
channel: $SLACK_DEFAULT_CHANNEL
event: fail
custom: |
{
"text": "",
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "🔴 Nightly integration tests failed!"
}
},
{
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "View Job"
},
"url": "${CIRCLE_BUILD_URL}"
}
]
}
]
}
- slack/notify:
channel: $SLACK_DEFAULT_CHANNEL
event: pass
custom: |
{
"text": "",
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "✅ Nightly integration tests passed."
}
},
{
"type": "actions",
"elements": [
{
"type": "button",
"text": {
"type": "plain_text",
"text": "View Job"
},
"url": "${CIRCLE_BUILD_URL}"
}
]
}
]
}
nightly:
triggers:
- schedule:
Expand All @@ -165,47 +263,47 @@ workflows:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-batch-submitter:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-deployer:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-l2geth:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-gas-oracle:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-integration-tests:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-go-batch-submitter:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- build-proxyd:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
- deploy-nightly:
context:
- optimism
- slack
<<: *slack-fail-post-step
<<: *slack-nightly-build-fail-post-step
requires:
- build-dtl
- build-batch-submitter
Expand Down
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.github

node_modules
.env
**/.env

test
**/*_test.go
Expand All @@ -12,3 +14,4 @@ l2geth/signer/fourbyte
l2geth/cmd/puppeth
l2geth/cmd/clef
go/gas-oracle/gas-oracle
go/batch-submitter/batch-submitter
12 changes: 11 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,17 @@ module.exports = {
'id-match': 'off',
'import/no-extraneous-dependencies': ['error'],
'import/no-internal-modules': 'off',
'import/order': 'off',
'import/order': [
"error",
{
groups: [
'builtin',
'external',
'internal',
],
'newlines-between': 'always',
},
],
indent: 'off',
'jsdoc/check-alignment': 'error',
'jsdoc/check-indentation': 'error',
Expand Down
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,8 @@ M-core-utils:
M-dtl:
- any: ['packages/data-transport-layer/**/*']

M-sdk:
- any: ['packages/sdk/**/*']

M-ops:
- any: ['ops/**/*']
4 changes: 2 additions & 2 deletions .github/workflows/batch-submitter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:
- '*rc'
- 'regenesis/*'
pull_request:
paths:
- 'go/batch-submitter/*'
branches:
- '*'
workflow_dispatch:

defaults:
Expand Down
35 changes: 35 additions & 0 deletions .github/workflows/bss-core.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: bss-core unit tests

on:
push:
paths:
- 'go/bss-core/**'
branches:
- 'master'
- 'develop'
- '*rc'
- 'regenesis/*'
pull_request:
branches:
- '*'
workflow_dispatch:

defaults:
run:
working-directory: './go/bss-core'

jobs:
tests:
runs-on: ubuntu-latest

steps:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.16.x

- name: Checkout code
uses: actions/checkout@v2

- name: Test
run: go test -v ./...
4 changes: 2 additions & 2 deletions .github/workflows/gas-oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:
- '*rc'
- 'regenesis/*'
pull_request:
paths:
- 'go/gas-oracle/**'
branches:
- '*'
workflow_dispatch:

defaults:
Expand Down
17 changes: 14 additions & 3 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ on:
paths:
- 'go/gas-oracle/**'
- 'go/batch-submitter/**'
- 'go/bss-core/**'
- 'go/teleportr/**'
branches:
- 'master'
- 'develop'
- '*rc'
- 'regenesis/*'
pull_request:
paths:
- 'go/gas-oracle/**'
- 'go/batch-submitter/**'
branches:
- '*'
jobs:
golangci:
name: lint
Expand All @@ -29,3 +30,13 @@ jobs:
with:
version: v1.29
working-directory: go/batch-submitter
- name: golangci-lint bss-core
uses: golangci/golangci-lint-action@v2
with:
version: v1.29
working-directory: go/bss-core
- name: golangci-lint teleportr
uses: golangci/golangci-lint-action@v2
with:
version: v1.29
working-directory: go/teleportr
Loading

0 comments on commit 624f4b3

Please sign in to comment.