Skip to content

Commit

Permalink
Merge branch 'main' into 2304-stake-table-registration
Browse files Browse the repository at this point in the history
  • Loading branch information
alysiahuggins authored Dec 6, 2024
2 parents 2b2411c + a48b5b2 commit d7a352d
Show file tree
Hide file tree
Showing 106 changed files with 13,581 additions and 1,344 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -148,3 +148,6 @@ INTEGRATION_TEST_PROTO=http
# Version of sequencer protocol we want to test. If this is set to
# `03`, marketplace upgrade will be tested.
INTEGRATION_TEST_SEQUENCER_VERSION=02

# max database connections
ESPRESSO_SEQUENCER_DATABASE_MAX_CONNECTIONS=25
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@ version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
# Group all updates together
groups:
all:
patterns:
- "*"
schedule:
interval: "daily"

- package-ecosystem: "cargo"
directory: "/"
# Group all updates together
groups:
all:
patterns:
- "*"
schedule:
interval: "daily"
4 changes: 2 additions & 2 deletions .github/workflows/benchmark-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
- name: Build Espresso Dev Node
# Espresso Dev Node currently requires testing feature, so it is built separately.
run: |
cargo build --locked --release --features benchmarking,testing --bin espresso-dev-node
cargo build --locked --release --features benchmarking,testing,embedded-db --bin espresso-dev-node
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Build Espresso Dev Node
# Espresso Dev Node currently requires testing feature, so it is built separately.
run: |
cargo build --locked --release --features benchmarking,testing --bin espresso-dev-node
cargo build --locked --release --features benchmarking,testing,embedded-db --bin espresso-dev-node
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,14 @@ jobs:
# Build in release without `testing` feature, this should work without `hotshot_example` config.
run: |
cargo build --locked --release --workspace
- name: Build sequencer-sqlite
run: cargo build --release --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target

- name: Build Espresso Dev Node
# Espresso Dev Node currently requires testing feature, so it is built separately.
run: |
cargo build --locked --release --features testing --bin espresso-dev-node
cargo build --locked --release --features "testing embedded-db" --bin espresso-dev-node
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -79,6 +82,7 @@ jobs:
target/release/marketplace-builder
target/release/node-metrics
target/release/dev-rollup
target/release/sequencer-sqlite
build-arm:
if: github.event_name != 'pull_request'
Expand All @@ -100,10 +104,13 @@ jobs:
run: |
cargo build --locked --release --workspace
- name: Build sequencer-sqlite
run: cargo build --locked --release --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir ./target

- name: Build Espresso Dev Node
# Espresso Dev Node currently requires testing feature, so it is built separately.
run: |
cargo build --locked --release --features testing --bin espresso-dev-node
cargo build --locked --release --features "embedded-db testing" --bin espresso-dev-node
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -132,6 +139,7 @@ jobs:
target/release/marketplace-builder
target/release/node-metrics
target/release/dev-rollup
target/release/sequencer-sqlite
build-dockers:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -286,7 +294,6 @@ jobs:
with:
images: ghcr.io/espressosystems/espresso-sequencer/dev-rollup


- name: Build and push sequencer docker
uses: docker/build-push-action@v6
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/build_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@V27
uses: cachix/install-nix-action@v30

- name: Enable Cachix
uses: cachix/cachix-action@v15
Expand All @@ -68,7 +68,8 @@ jobs:
- name: Compile all executables
# timeout-minutes: 120
run: |
nix develop $DEVSHELL --accept-flake-config --option sandbox relaxed -c cargo build --locked --release
nix develop $DEVSHELL --accept-flake-config --option sandbox relaxed -c cargo build --locked --release
-c cargo build --locked --release --manifest-path ./sequencer-sqlite/Cargo.toml --target-dir 'echo $CARGO_TARGET_DIR'
- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand All @@ -95,6 +96,7 @@ jobs:
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/marketplace-builder
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/node-metrics
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/dev-rollup
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/sequencer-sqlite
static-dockers:
runs-on: ubuntu-latest
needs: static-build
Expand Down Expand Up @@ -377,4 +379,4 @@ jobs:
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.dev-rollup.outputs.tags }}
labels: ${{ steps.dev-rollup.outputs.labels }}
labels: ${{ steps.dev-rollup.outputs.labels }}
2 changes: 1 addition & 1 deletion .github/workflows/cargo-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
pull_request:
workflow_dispatch:

concurrency:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/combine-prs.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Nix
uses: cachix/install-nix-action@V27
uses: cachix/install-nix-action@v30

- name: Enable Cachix
uses: cachix/cachix-action@v15
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
- name: Build diff-test
run: |
nix develop --accept-flake-config -c cargo build --locked --bin diff-test --release
nix develop --accept-flake-config -c cargo build --locked --bin diff-test --profile test
- name: Run tests (quick version for PR)
if: ${{ github.event_name == 'pull_request' }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,8 @@ jobs:
- name: Format Check
run: cargo fmt -- --check

- name: Check
run: cargo clippy --workspace --all-features --all-targets -- -D warnings
- name: Check (embedded-db)
run: cargo clippy --workspace --features "embedded-db testing" --all-targets -- -D warnings

- name: Check (postgres)
run: cargo clippy --workspace --features testing --all-targets -- -D warnings
44 changes: 41 additions & 3 deletions .github/workflows/slowtest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
RUST_LOG: info,libp2p=off,node=error

jobs:
slow-tests:
slow-tests-sqlite:
runs-on: ubuntu-latest
steps:
# These tests need the `anvil` binary provided by foundry
Expand All @@ -46,11 +46,49 @@ jobs:
- name: Build
run: |
cargo build --locked --bin diff-test --release
cargo nextest run --locked --release --workspace --all-features --no-run
cargo nextest run --locked --release --workspace --features embedded-db --no-run
timeout-minutes: 90

- name: Slow Test
env:
NEXTEST_PROFILE: slow
run: cargo nextest run --locked --release --workspace --all-features --verbose --no-fail-fast --nocapture
run: cargo nextest run --locked --release --workspace --features embedded-db --verbose --no-fail-fast --nocapture
timeout-minutes: 40
slow-tests-postgres:
runs-on: ubuntu-latest
steps:
- name: Fix submodule permissions check
run: |
git config --global --add safe.directory '*'
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
version: nightly

- uses: taiki-e/install-action@nextest

- name: Checkout Repository
uses: actions/checkout@v4
with:
submodules: recursive

- name: Configure Environment
run: PATH="$PWD/target/release:$PATH"

- name: Enable Rust Caching
uses: Swatinem/rust-cache@v2
with:
cache-all-crates: true

- name: Build
run: |
cargo build --locked --bin diff-test --release
cargo nextest run --locked --release --workspace --no-run
timeout-minutes: 90

- name: Slow Test
env:
NEXTEST_PROFILE: slow
run: cargo nextest run --locked --release --workspace --verbose --no-fail-fast --nocapture
timeout-minutes: 40
Loading

0 comments on commit d7a352d

Please sign in to comment.