Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Light client test merge #895

Merged
merged 135 commits into from
Dec 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
f50dd8d
Set up a different module sub-command for each type of persistence
jbearer Nov 15, 2023
3597ed7
Create a trait to abstract persistence-specific functionality
jbearer Nov 16, 2023
f8e3730
Break api into multiple single-purpose modules
jbearer Nov 16, 2023
2dff4c4
chore: use mocks/ instead of stubs/ (#790)
alxiong Dec 2, 2023
9f95508
Update query service
jbearer Dec 4, 2023
58a9d57
Merge remote-tracking branch 'origin/main' into feat/api-traits
jbearer Dec 4, 2023
af2ae0a
Add support for SQL API storage
jbearer Dec 4, 2023
6be5bd1
Make API tests generic over storage type
jbearer Dec 4, 2023
a0055e5
Instsantiate generic API tests for SQL storage
jbearer Dec 4, 2023
720bb29
Add an example of using the SQL query service to the local demo
jbearer Dec 5, 2023
78b7fc5
Document data source trait
jbearer Dec 6, 2023
de9d20e
Merge pull request #787 from EspressoSystems/feat/api-traits
jbearer Dec 6, 2023
97a7494
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 6, 2023
c9d7bc4
Appease cargo audit
jbearer Dec 6, 2023
1a79044
feat: add tx table entry proofs to tx payload proof (#796)
ggutoski Dec 6, 2023
f34f37b
Update dependencies
jbearer Dec 7, 2023
feb4b40
Implementation of `deposit`, `requestExit` and `withdrawFunds` functi…
philippecamacho Dec 7, 2023
090f3da
First pass at header/payload refactor
jbearer Dec 7, 2023
5386c7b
Fix errors in HotShot initialization
jbearer Dec 7, 2023
a45a24a
Fix errors in block impl
jbearer Dec 7, 2023
6e10893
Fix errors in API
jbearer Dec 7, 2023
d0e340b
Complete first round of errors
jbearer Dec 7, 2023
46d4eb4
Fix more build errors
jbearer Dec 7, 2023
7f993cf
Fix Clippy, except hotshot-testing deprecation warnings
jbearer Dec 7, 2023
cbd6d27
Merge remote-tracking branch 'origin/main' into feat/update-hotshot
jbearer Dec 7, 2023
48dbf06
Fix tests
jbearer Dec 7, 2023
e936899
Clean up hotshot-testing configuration
jbearer Dec 7, 2023
57a946e
Increase view timeout for hotshot test
jbearer Dec 7, 2023
5f2b871
Make genesis header deterministic
jbearer Dec 7, 2023
b81ffd3
Decrease required decides for hotshot test
jbearer Dec 7, 2023
99ba48c
Fix unused import warning
jbearer Dec 7, 2023
36ec369
Merge pull request #808 from EspressoSystems/feat/update-hotshot
jbearer Dec 8, 2023
a6e465d
Bump cachix/install-nix-action from 23 to 24
dependabot[bot] Dec 8, 2023
13be69f
Fix URL parsing in orchestrator and web servers
jbearer Dec 8, 2023
8789239
Merge pull request #813 from EspressoSystems/fix/server-url-parsing
sveitser Dec 8, 2023
d57bb3e
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 8, 2023
7a441e2
Fix scripts to build docker images
sveitser Dec 8, 2023
9ed649c
Run natively with process-compose
sveitser Dec 8, 2023
9fc666a
Fix local demo
sveitser Dec 8, 2023
4fe4c8e
Merge pull request #815 from EspressoSystems/fix/update-hotshot
sveitser Dec 8, 2023
64aa408
Merge branch 'main' into feat/run-natively
sveitser Dec 8, 2023
13a737c
Merge pull request #814 from EspressoSystems/feat/run-natively
sveitser Dec 8, 2023
9c90df9
Avoid using u64::MAX in timestamp tests
jbearer Dec 8, 2023
788e1af
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 8, 2023
42ca27a
Enable status API without full query API
jbearer Dec 9, 2023
f79a5f2
Merge branch 'main' into dependabot/github_actions/cachix/install-nix…
jbearer Dec 9, 2023
63b2f50
Merge pull request #778 from EspressoSystems/dependabot/github_action…
jbearer Dec 9, 2023
78ac373
Update sequencer/src/api.rs
jbearer Dec 11, 2023
0f428b5
Merge branch 'main' into feat/metrics-api
jbearer Dec 11, 2023
86400c6
Bump github/combine-prs from 4.1.0 to 5.0.0
dependabot[bot] Dec 8, 2023
59f7bfe
Merge pull request #818 from EspressoSystems/feat/metrics-api
jbearer Dec 11, 2023
4d6ded0
Bump cachix/cachix-action from 12 to 13 (#779)
dependabot[bot] Dec 11, 2023
a5cb2fc
Merge pull request #777 from EspressoSystems/dependabot/github_action…
jbearer Dec 11, 2023
64409f4
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 11, 2023
12a5800
Update query service
jbearer Dec 11, 2023
c7878a0
Merge pull request #828 from EspressoSystems/update/query-service
jbearer Dec 11, 2023
59100ca
Bump itertools from 0.10.5 to 0.12.0
dependabot[bot] Dec 11, 2023
14f912f
Update HotShot and query service
jbearer Dec 11, 2023
6f5e7d5
Merge pull request #831 from EspressoSystems/update/hotshot
jbearer Dec 11, 2023
ff52680
Merge pull request #830 from EspressoSystems/dependabot/cargo/itertoo…
jbearer Dec 11, 2023
a618ed2
Remove workaround for decreasing timestamps
jbearer Dec 11, 2023
7a9b982
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 12, 2023
077414d
Fix handling of config path
jbearer Dec 12, 2023
1c48f7d
Remove config file saving
jbearer Dec 12, 2023
f3eb164
Merge pull request #832 from EspressoSystems/fix/config-path
jbearer Dec 12, 2023
efc8e0b
Update surf-disco
jbearer Dec 12, 2023
545b5dd
Merge pull request #837 from EspressoSystems/update/surf-disco
jbearer Dec 12, 2023
9989117
Update surf-disco
jbearer Dec 12, 2023
b3706e1
Appease cargo audit
jbearer Dec 12, 2023
a837d0b
Merge pull request #840 from EspressoSystems/update/surf-disco
jbearer Dec 12, 2023
4668ca0
Update sequencer/api/migrations/V11__timestamp_index.sql
jbearer Dec 12, 2023
60eeaa5
Comments explaining test helpers
jbearer Dec 12, 2023
e6ee7d3
Merge remote-tracking branch 'origin/main' into feat/sql-data-source
jbearer Dec 12, 2023
3f51c68
Fix from()
jbearer Dec 12, 2023
2689d7b
Merge pull request #798 from EspressoSystems/feat/sql-data-source
jbearer Dec 12, 2023
5121cda
Update HotShot
jbearer Dec 12, 2023
b73a18c
Merge pull request #844 from EspressoSystems/update/hotshot
jbearer Dec 12, 2023
02635b8
flake.lock: Update (#742)
github-actions[bot] Dec 13, 2023
1ead82d
Update contract bindings
sveitser Dec 14, 2023
7f3df1f
Run formatters
sveitser Dec 14, 2023
c70ee0f
Merge pull request #853 from EspressoSystems/ma/fix-ci
sveitser Dec 14, 2023
9dfa191
Update HotShot
jbearer Dec 14, 2023
df7bdeb
Merge pull request #855 from EspressoSystems/update/hotshot
jbearer Dec 14, 2023
0d12934
feat: Support tx proofs for truncated tx payloads and negative-length…
ggutoski Dec 14, 2023
68af3a1
Fix native demo
jbearer Dec 14, 2023
2ed2568
Refactor/t775 update dependency bn254 (#797)
philippecamacho Dec 14, 2023
a284a1f
Bump zerocopy from 0.7.29 to 0.7.31
dependabot[bot] Dec 15, 2023
ccf58d0
Merge pull request #860 from EspressoSystems/fix/native-demo
jbearer Dec 15, 2023
37d0429
Merge pull request #863 from EspressoSystems/dependabot/cargo/zerocop…
jbearer Dec 15, 2023
ed5e1ef
Update HotShot, query service, and Tide Disco
jbearer Dec 15, 2023
d17e481
Merge pull request #866 from EspressoSystems/update/tide-disco
jbearer Dec 15, 2023
940a72f
Add batches for required CI jobs
sveitser Dec 15, 2023
4b560fb
Feat/t737 queue logic (#803)
philippecamacho Dec 15, 2023
9a22ea7
Fix Header::new and add tests
jbearer Dec 15, 2023
56c8769
Merge pull request #868 from EspressoSystems/feat/ci-batches
sveitser Dec 15, 2023
bcb06bc
Add tool to check consistency of headers in a chain
jbearer Dec 15, 2023
d7b7dad
parameterize the WS polling interval
rob-maron Dec 18, 2023
a3ee65f
fmt
rob-maron Dec 18, 2023
96e8d9c
command line duration
rob-maron Dec 18, 2023
7175cc4
fmt
rob-maron Dec 18, 2023
d865701
Merge pull request #874 from EspressoSystems/rm/parameterize-ws-poll-…
rob-maron Dec 18, 2023
8c2eb6b
Update HotShot
jbearer Dec 18, 2023
b8f86d7
Merge pull request #875 from EspressoSystems/update/hotshot
jbearer Dec 18, 2023
175f95b
Update HotShot
jbearer Dec 18, 2023
3741f48
Update status tests
jbearer Dec 18, 2023
c417a6c
Merge pull request #876 from EspressoSystems/update/hotshot
jbearer Dec 18, 2023
e82160d
feat: Support block payloads that are too small to hold the entire tx…
ggutoski Dec 18, 2023
18a8601
Recreate HotShot deployment script and deploy contract
jbearer Dec 19, 2023
0b6d385
flake.lock: Update (#871)
github-actions[bot] Dec 19, 2023
8396b44
Merge pull request #877 from EspressoSystems/feat/deploy-hotshot
jbearer Dec 19, 2023
919f753
Improve logging/feedback
jbearer Dec 19, 2023
aa5e837
Merge remote-tracking branch 'origin/main' into fix/monotonic-l1-block
jbearer Dec 19, 2023
9a81c1d
Make header test cases more reasonable
jbearer Dec 19, 2023
72e1385
Merge pull request #869 from EspressoSystems/fix/monotonic-l1-block
jbearer Dec 19, 2023
334899d
Update query service and improve SQL backend
jbearer Dec 19, 2023
d471435
Merge pull request #880 from EspressoSystems/feat/reset-sql-data-source
jbearer Dec 19, 2023
eb2c1e9
Bump time from 0.3.30 to 0.3.31 (#881)
dependabot[bot] Dec 20, 2023
d081975
backoff on number of leaves when gas limit is exceeded
nomaxg Dec 20, 2023
58255b4
Bump anyhow from 1.0.75 to 1.0.76
dependabot[bot] Dec 21, 2023
bad6803
Bump async-trait from 0.1.74 to 0.1.75
dependabot[bot] Dec 21, 2023
8c3482f
Merge pull request #884 from EspressoSystems/dependabot/cargo/anyhow-…
jbearer Dec 21, 2023
db31313
Merge pull request #885 from EspressoSystems/dependabot/cargo/async-t…
jbearer Dec 21, 2023
deebc2d
Fix tests that do not run locally by waiting for anvil endpoints to b…
philippecamacho Dec 21, 2023
3ea9cb2
use sync error to test for gas limit, incorporate a soft block limit …
nomaxg Dec 21, 2023
6aee9a2
populate error with num leaves sent
nomaxg Dec 21, 2023
f498d5e
Merge pull request #882 from EspressoSystems/exceeds-gas-limit
nomaxg Dec 21, 2023
4c88a62
Add a tool to reset persistent storage
jbearer Dec 21, 2023
f1f97e9
Update Tide Disco and HotShot
jbearer Dec 21, 2023
055b3d5
Merge pull request #888 from EspressoSystems/feat/reset-script
jbearer Dec 21, 2023
f1fa685
Run *cargo update*
philippecamacho Dec 21, 2023
3453851
Try without rust cache
sveitser Dec 21, 2023
43ac2d1
Merge pull request #890 from EspressoSystems/update/tide-disco-cargo-…
jbearer Dec 21, 2023
1c59f65
feat: VID namespace `from_txs` support namespaces (#891)
ggutoski Dec 21, 2023
f51deaf
Revert "update hotshot dep to use latest main"
sveitser Dec 22, 2023
0f035cf
Merge remote-tracking branch 'origin/main' into lc-test
sveitser Dec 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ L1_BLOCK_TIME_SEC=3
# Internal port inside container
ESPRESSO_WEB_SERVER_PORT=40000
ESPRESSO_ORCHESTRATOR_PORT=40001
ESPRESSO_ORCHESTRATOR_NUM_NODES=5
ESPRESSO_ORCHESTRATOR_START_DELAY=5s
ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s
ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=1
ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=0s
ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=1s
ESPRESSO_CONSENSUS_SERVER_PORT=40002
ESPRESSO_DA_SERVER_PORT=40003
ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ env:

jobs:
build:
runs-on: [self-hosted, X64]
container:
image: ghcr.io/espressosystems/devops-rust:stable
runs-on: ubuntu-latest
steps:
- name: Fix submodule permissions check
run: |
Expand All @@ -46,11 +44,14 @@ jobs:
uses: Swatinem/rust-cache@v2

- name: Build
# Build in release without `testing` feature, this should work without `hotshot_example` config.
run: |
cargo build --release --workspace

- name: Test
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
export RUSTFLAGS="$RUSTFLAGS --cfg hotshot_example"
cargo test --release --workspace --all-features --no-run
cargo test --release --workspace --all-features --verbose -- --test-threads 1 --nocapture
timeout-minutes: 30
Expand All @@ -65,6 +66,7 @@ jobs:
target/release/sequencer
target/release/cli
target/release/commitment-task
target/release/reset-storage

build-arm:
runs-on: [self-hosted, ARM64]
Expand Down Expand Up @@ -100,6 +102,7 @@ jobs:
target/release/sequencer
target/release/cli
target/release/commitment-task
target/release/reset-storage

build-dockers:
runs-on: ubuntu-latest
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/build_static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v23
uses: cachix/install-nix-action@v24

- name: Enable Cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v13
# If PR is from a non-collaborator (e. g. dependabot) the secrets are missing and the login to cachix fails.
continue-on-error: true
with:
Expand Down Expand Up @@ -80,6 +80,7 @@ jobs:
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/sequencer
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/cli
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/commitment-task
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/reset-storage

static-dockers:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
steps:
- name: combine-prs
id: combine-prs
uses: github/combine-prs@v4.1.0
uses: github/combine-prs@v5.0.0
with:
github_token: ${{ github.token }}
labels: "dependabot,combined-pr"
6 changes: 3 additions & 3 deletions .github/workflows/contracts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Nix
uses: cachix/install-nix-action@v23
uses: cachix/install-nix-action@v24

- name: Enable Cachix
uses: cachix/cachix-action@v12
uses: cachix/cachix-action@v13
# If PR is from a non-collaborator (e. g. dependabot) the secrets are missing and the login to cachix fails.
continue-on-error: true
with:
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
prefix-key: v1-rust
prefix-key: v2-rust

- name: Check toolchain versions
run: nix develop --accept-flake-config -c ./scripts/show-toolchain-versions
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ jobs:
run: cargo clippy --workspace --all-features --all-targets -- -D warnings

- name: Audit
run: cargo audit --ignore RUSTSEC-2023-0063 --ignore RUSTSEC-2023-0065
run: cargo audit --ignore RUSTSEC-2023-0018 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2023-0065
4 changes: 2 additions & 2 deletions .github/workflows/update_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v23
uses: cachix/install-nix-action@v24

- uses: cachix/cachix-action@v12
- uses: cachix/cachix-action@v13
with:
name: espresso-systems-private
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[submodule "lib/bn254"]
path = contracts/lib/bn254
url = https://github.com/EspressoSystems/solidity-bn254
branch = v0.1.1
branch = v0.2.0
[submodule "contracts/lib/solmate"]
path = contracts/lib/solmate
url = https://github.com/transmissions11/solmate
Loading
Loading