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

[Sequencer] New network integration #1294

Merged
merged 34 commits into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
416e2e1
new network integration
rob-maron Apr 1, 2024
419abbe
remove capnp dependency
rob-maron Apr 1, 2024
4d4a0ce
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 1, 2024
9bf5f95
dev example, docker builds, readme
rob-maron Apr 1, 2024
2f9e7e7
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 3, 2024
04b4df7
spacing
rob-maron Apr 3, 2024
99a7ca6
fix TOML parse error
rob-maron Apr 3, 2024
bf1948c
update dockerfiles
rob-maron Apr 3, 2024
a54c126
keydb to docker
rob-maron Apr 3, 2024
53f7499
cargo sort (whoops)
rob-maron Apr 3, 2024
b531080
add env vars for cdn binaries
rob-maron Apr 8, 2024
cdce947
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 8, 2024
1e8ada7
format
rob-maron Apr 8, 2024
d36d97f
changes for new builder
rob-maron Apr 8, 2024
4cfa128
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 8, 2024
bae8dcf
fmt
rob-maron Apr 8, 2024
1db76f7
merge main
rob-maron Apr 10, 2024
e91edb5
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 10, 2024
fb53b64
PR updates
rob-maron Apr 10, 2024
601f2d2
add health checks
rob-maron Apr 10, 2024
1fde255
cargo sort
rob-maron Apr 10, 2024
13bc5c0
add healthcheck to dockerfiles
rob-maron Apr 11, 2024
9f4af34
Merge remote-tracking branch 'origin/main' into rm/network-integration
rob-maron Apr 11, 2024
bad444a
health check to redis
rob-maron Apr 11, 2024
5866e18
depend on keydb being healthy
rob-maron Apr 11, 2024
aeb8783
change ready thresholds
rob-maron Apr 11, 2024
c670401
fix keydb health check
rob-maron Apr 11, 2024
1bb983c
change healthy thresholds
rob-maron Apr 11, 2024
8235fc9
add initial delay
rob-maron Apr 11, 2024
549fe9d
change server threads to 1
rob-maron Apr 11, 2024
974115d
change process-compose to run on 0.0.0.0
rob-maron Apr 11, 2024
ebf8711
use latest
rob-maron Apr 11, 2024
062eaa8
fix keydb for real this time
rob-maron Apr 11, 2024
acbef33
change command to nc
rob-maron Apr 11, 2024
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
14 changes: 9 additions & 5 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,15 @@ ASYNC_STD_THREAD_COUNT=1
RAYON_NUM_THREADS=2

# Internal port inside container
ESPRESSO_WEB_SERVER_PORT=40000
ESPRESSO_CDN_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=50
ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s
ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s
ESPRESSO_CONSENSUS_SERVER_PORT=40002
ESPRESSO_DA_SERVER_PORT=40003
ESPRESSO_SEQUENCER_DA_SERVER_URL=http://da-server:$ESPRESSO_WEB_SERVER_PORT
ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL=http://consensus-server:$ESPRESSO_WEB_SERVER_PORT
ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal:$ESPRESSO_CDN_SERVER_PORT
ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:$ESPRESSO_ORCHESTRATOR_PORT
ESPRESSO_SEQUENCER_API_PORT=50000
ESPRESSO_SEQUENCER1_API_PORT=50001
Expand Down Expand Up @@ -67,6 +64,13 @@ ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_2=SCHNORR_SIGNING_KEY~s3ld5AYUXdugXYmR
ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_3=SCHNORR_SIGNING_KEY~bUrtzmLjEVW9ggG7UW9jXDROZvICg-ykaWc1za3Y4gOp
ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_4=SCHNORR_SIGNING_KEY~4YXyoT7ZxwXcU0_J6NH9ziGLrG0jShNCtGJIZ7a0yQBr

# Sequencer demo: Libp2p (advertise and bind) ports
ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_0 = 7000
ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_1 = 7001
ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_2 = 7002
ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_3 = 7003
ESPRESSO_DEMO_SEQUENCER_LIBP2P_PORT_4 = 7004

# Foundry
# The mnemonic used by foundry to deploy contracts.
MNEMONIC="test test test test test test test test test test test junk"
Expand Down
8 changes: 0 additions & 8 deletions .github/actions/install-capnp/action.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install capnproto
uses: ./.github/actions/install-capnp

# See https://github.com/rustsec/audit-check for docs
- uses: rustsec/audit-check@v1
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ jobs:
with:
prefix-key: v1-rust

- name: Install capnproto
uses: ./.github/actions/install-capnp

- name: Build
# Build in release without `testing` feature, this should work without `hotshot_example` config.
run: |
Expand Down Expand Up @@ -88,10 +85,6 @@ jobs:
with:
submodules: recursive

- name: Install Capn Proto
run: |
apt-get update && apt-get install -y capnproto

- name: Enable Rust Caching
uses: Swatinem/rust-cache@v2

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ jobs:
- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching

- name: Install capnproto
uses: ./.github/actions/install-capnp

- name: Format Check
run: cargo fmt -- --check

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test-demo-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ jobs:
- name: Enable Rust Caching
uses: Swatinem/rust-cache@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- name: Build
run: cargo build --release

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ jobs:
- name: Enable Rust Caching
uses: Swatinem/rust-cache@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- name: Test
# Build test binary with `testing` feature, which requires `hotshot_example` config
run: |
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/unused-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ jobs:

- uses: Swatinem/rust-cache@v2

- name: Install capnproto
uses: ./.github/actions/install-capnp

- name: Run cargo-udeps
uses: aig787/cargo-udeps-action@v1
with:
Expand Down
Loading
Loading