Skip to content
This repository has been archived by the owner on Feb 6, 2025. It is now read-only.

Commit

Permalink
Merge v0.2.0 beta.7 with opbnb support (#10)
Browse files Browse the repository at this point in the history
* feat: support opBNB

* chore: update revm

* fix: merge conflicts

* feat: add opbnb features

* chore: fix fmt

* fixup! chore: fix fmt

* fix: add opbnb features to more code spaces

* feat: add mgasps log

* ci: change ut runner to github official provided

* fix: mgas ps log

* ci: fix unit, integration test job

* fix: revm spec dispatcher

* chore: update revm

* fix: add fermat fork timestamp to fix revm init

* update revm and alloy-chain version

---------

Co-authored-by: j75689 <[email protected]>
Co-authored-by: Keefe Liu <[email protected]>
  • Loading branch information
3 people authored May 21, 2024
1 parent aadf535 commit b608fc4
Show file tree
Hide file tree
Showing 21 changed files with 30,666 additions and 382 deletions.
16 changes: 9 additions & 7 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.network }}
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
strategy:
matrix:
network: ["ethereum", "optimism"]
include:
- network: ethereum
extra-features: ""
- network: optimism
extra-features: "opbnb"
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
Expand All @@ -40,21 +43,20 @@ jobs:
name: Run tests
run: |
cargo nextest run \
--locked --features "asm-keccak ${{ matrix.network }}" \
--locked --features "asm-keccak ${{ matrix.network }} ${{ matrix.extra-features }}" \
--workspace --exclude examples --exclude ef-tests \
-E "kind(test)"
- if: matrix.network == 'optimism'
name: Run tests
run: |
cargo nextest run \
--locked -p reth-node-optimism --features "optimism"
--locked -p reth-node-optimism --features "optimism ${{ matrix.extra-features }}"
sync:
name: sync / 100k blocks
# Only run sync tests in merge groups
if: github.event_name == 'merge_group'
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_LOG: info,sync=error
RUST_BACKTRACE: 1
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,17 @@ jobs:
include:
- binary: reth
network: ethereum
extra-features: ""
- binary: op-reth
network: optimism
extra-features: "opbnb"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@clippy
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
- run: cargo clippy --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} ${{ matrix.extra-features }} asm-keccak jemalloc jemalloc-prof min-error-logs min-warn-logs min-info-logs min-debug-logs min-trace-logs"
env:
RUSTFLAGS: -D warnings

Expand Down Expand Up @@ -66,8 +68,10 @@ jobs:
include:
- binary: reth
network: ethereum
extra-features: ""
- binary: op-reth
network: optimism
extra-features: "opbnb"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
Expand All @@ -76,7 +80,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- run: cargo build --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }}"
- run: cargo build --bin "${{ matrix.binary }}" --workspace --features "${{ matrix.network }} ${{ matrix.extra-features }}"
env:
RUSTFLAGS: -D warnings

Expand Down
30 changes: 20 additions & 10 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,13 @@ concurrency:
jobs:
test:
name: test / ${{ matrix.network }} (${{ matrix.partition }}/2)
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
strategy:
matrix:
partition: [1, 2]
network: ["ethereum", "optimism"]
network: [ethereum, optimism]
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
Expand All @@ -35,18 +34,26 @@ jobs:
with:
cache-on-failure: true
- uses: taiki-e/install-action@nextest
- name: Run tests
- if: matrix.network == 'ethereum'
name: Run tests
run: |
cargo nextest run \
--locked --features "asm-keccak ${{ matrix.network }}" \
--workspace --exclude examples --exclude ef-tests \
--partition hash:${{ matrix.partition }}/2 \
-E "!kind(test)"
- if: matrix.network == 'optimism'
name: Run tests
run: |
cargo nextest run \
--locked --features "asm-keccak ${{ matrix.network }} opbnb" \
--workspace --exclude examples --exclude ef-tests \
--partition hash:${{ matrix.partition }}/2 \
-E "!kind(test)"
state:
name: Ethereum state tests
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_LOG: info,sync=error
RUST_BACKTRACE: 1
Expand All @@ -70,22 +77,25 @@ jobs:

doc:
name: doc tests (${{ matrix.network }})
runs-on:
group: Reth
runs-on: ubuntu-latest
env:
RUST_BACKTRACE: 1
timeout-minutes: 30
strategy:
matrix:
network: ["ethereum", "optimism"]
include:
- network: ethereum
extra-features: ""
- network: optimism
extra-features: "opbnb"
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- name: Run doctests
run: cargo test --doc --workspace --features "${{ matrix.network }}"
run: cargo test --doc --workspace --features "${{ matrix.network }} ${{ matrix.extra-features }}"

unit-success:
name: unit success
Expand Down
Loading

0 comments on commit b608fc4

Please sign in to comment.