Skip to content

Commit

Permalink
Merge branch 'main' into ab/marketplace-upgrade-type
Browse files Browse the repository at this point in the history
  • Loading branch information
imabdulbasit authored Aug 14, 2024
2 parents 8d7de78 + 06bf72f commit 849d54c
Show file tree
Hide file tree
Showing 23 changed files with 1,069 additions and 334 deletions.
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ ESPRESSO_SEQUENCER_STAKE_TABLE_CAPACITY=10
MNEMONIC="test test test test test test test test test test test junk"
# The RPC URL for deploying to the sepolia network.
SEPOLIA_RPC_URL=
# The etherscan API key is needed to verify contracts on etherscan.
ETHERSCAN_API_KEY="placeholder"


# Temporary flags for state relay server, should remove after integrating with stake table
# Related issue: [https://github.com/EspressoSystems/espresso-sequencer/issues/1022]
Expand Down
3 changes: 3 additions & 0 deletions .env.contracts.example
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,6 @@ export APPROVED_PROVER_ADDRESS=

# Plonk Verification Library Deployment with Defender
export PLONK_VERIFIER_SALT=

# The etherscan API key is needed to verify contracts on etherscan.
export ETHERSCAN_API_KEY=
64 changes: 64 additions & 0 deletions .github/workflows/slowtest.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: SlowEst

on:
push:
branches:
- main
- release-*
tags:
# YYYYMMDD
- "20[0-9][0-9][0-1][0-9][0-3][0-9]*"
schedule:
- cron: "0 0 * * 1"
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ !contains(github.ref, 'main')}}

env:
RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
RUST_LOG: info,libp2p=off,node=error

jobs:
slowest:
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: Enable Rust Caching
uses: Swatinem/rust-cache@v2

- name: Build
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
export PATH="$PWD/target/release:$PATH"
cargo build --locked --bin diff-test --release
cargo nextest run --locked --release --workspace --all-features --no-run
timeout-minutes: 90

- name: SlowEst
env:
CARGO_TERM_COLOR: always
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
export PATH="$PWD/target/release:$PATH"
cargo nextest run --locked --release --workspace --all-features --verbose -E 'test(slow_)'
timeout-minutes: 25
22 changes: 14 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,7 @@ jobs:
with:
version: nightly

- name: Install just command runner
run: |
sudo snap install --edge --classic just
just --version
- uses: taiki-e/install-action@nextest

- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -47,12 +44,21 @@ jobs:
- name: Enable Rust Caching
uses: Swatinem/rust-cache@v2

- name: Test
- name: Build
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
export PATH="$PWD/target/release:$PATH"
cargo build --locked --bin diff-test --release
cargo test --locked --release --workspace --all-features --no-run
cargo test --locked --release --workspace --all-features --verbose -- --test-threads 1 --nocapture
timeout-minutes: 40
cargo nextest run --locked --release --workspace --all-features --no-run
timeout-minutes: 90

- name: Test
env:
CARGO_TERM_COLOR: always
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
export PATH="$PWD/target/release:$PATH"
cargo nextest run --locked --release --workspace --all-features --retries 2 --verbose -E '!test(slow_)'
timeout-minutes: 5
Loading

0 comments on commit 849d54c

Please sign in to comment.