Skip to content

Commit

Permalink
Merge pull request #191 from alpenlabs/refactor/rename-vertex-to-express
Browse files Browse the repository at this point in the history
Rename `vertex` to `express`
  • Loading branch information
delbonis authored Jul 31, 2024
2 parents 5824a9a + 7afaf2f commit cf3e358
Show file tree
Hide file tree
Showing 86 changed files with 347 additions and 347 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
env:
RUSTDOCFLAGS: --show-type-layout --enable-index-page -Zunstable-options -D warnings
- name: Compress docs artifacts
run: tar czf vertex-core-docs.tar.gz target/doc
run: tar czf express-core-docs.tar.gz target/doc
- name: Archive docs
uses: actions/upload-artifact@v4
if: always()
with:
name: docs
path: vertex-core-docs.tar.gz
path: express-core-docs.tar.gz
4 changes: 2 additions & 2 deletions .github/workflows/functional.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
continue-on-error: true
run: |
export PATH=$(realpath target/debug/):$PATH
which alpen-vertex-sequencer
which alpen-express-sequencer
cd functional-tests && \
poetry run python entry.py
Expand All @@ -65,6 +65,6 @@ jobs:
if: steps.funcTestsRun1.outcome == 'failure'
run: |
export PATH=$(realpath target/debug/):$PATH
which alpen-vertex-sequencer
which alpen-express-sequencer
cd functional-tests && \
poetry run python entry.py
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
include:
- binary: alpen-vertex-sequencer
- binary: alpen-express-sequencer
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@clippy
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ jobs:
test:
name: Test and generate report
runs-on: ubuntu-latest
# nightly rust might break from time to time
continue-on-error: true
env:
RUSTFLAGS: -D warnings
CARGO_TERM_COLOR: always
Expand Down
116 changes: 58 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ default-members = ["sequencer", "reth"]
resolver = "2"

[workspace.dependencies]
alpen-express-btcio = { path = "crates/btcio" }
alpen-express-common = { path = "crates/common" }
alpen-express-consensus-logic = { path = "crates/consensus-logic" }
alpen-express-db = { path = "crates/db" }
alpen-express-evmctl = { path = "crates/evmctl" }
alpen-express-evmexec = { path = "crates/evmexec" }
alpen-express-mmr = { path = "crates/util/mmr" }
alpen-express-primitives = { path = "crates/primitives" }
alpen-express-rpc-api = { path = "crates/rpc/api" }
alpen-express-state = { path = "crates/state" }
alpen-test-utils = { path = "crates/test-utils" }
alpen-vertex-btcio = { path = "crates/btcio" }
alpen-vertex-common = { path = "crates/common" }
alpen-vertex-consensus-logic = { path = "crates/consensus-logic" }
alpen-vertex-db = { path = "crates/db" }
alpen-vertex-evmctl = { path = "crates/evmctl" }
alpen-vertex-evmexec = { path = "crates/evmexec" }
alpen-vertex-mmr = { path = "crates/util/mmr" }
alpen-vertex-primitives = { path = "crates/primitives" }
alpen-vertex-rpc-api = { path = "crates/rpc/api" }
alpen-vertex-state = { path = "crates/state" }
zkvm = { path = "crates/prover/zkvm" }

alloy-genesis = { version = "0.1", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ help: ## Display this help.

.PHONY: build
build: ## Build the workspace into the `target` directory.
cargo build --workspace --bin "alpen-vertex-sequencer" --features "$(FEATURES)" --profile "$(PROFILE)"
cargo build --workspace --bin "alpen-express-sequencer" --features "$(FEATURES)" --profile "$(PROFILE)"

##@ Test

Expand Down Expand Up @@ -122,7 +122,7 @@ fmt-func-tests: ensure-ruff ## Apply formatting of python files inside `test` di
lint-check-ws: ## Checks for lint issues in the workspace.
cargo clippy \
--workspace \
--bin "alpen-vertex-sequencer" \
--bin "alpen-express-sequencer" \
--lib \
--examples \
--tests \
Expand All @@ -134,7 +134,7 @@ lint-check-ws: ## Checks for lint issues in the workspace.
lint-fix-ws: ## Lints the workspace and applies fixes where possible.
cargo clippy \
--workspace \
--bin "alpen-vertex-sequencer" \
--bin "alpen-express-sequencer" \
--lib \
--examples \
--tests \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Alpen Vertex Rollup
# Alpen Express Rollup

Alpen's prototype rollup, codenamed Vertex. This is pre-alpha software and
Alpen's prototype rollup, codenamed Express. This is pre-alpha software and
nothing is even close to being usable yet.

## Repository structure
Expand Down Expand Up @@ -73,11 +73,11 @@ ensure `horizon_l1_height` <= `genesis_l1_height` < bitcoin_block_height
Start EL Client:

```sh
cargo run --bin alpen-vertex-reth -- --datadir .data/reth --http -vvvv
cargo run --bin alpen-express-reth -- --datadir .data/reth --http -vvvv
```

Start CL Client/Sequencer

```sh
cargo run --bin alpen-vertex-sequencer -- --config config.toml
cargo run --bin alpen-express-sequencer -- --config config.toml
```
8 changes: 4 additions & 4 deletions crates/btcio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[package]
edition = "2021"
name = "alpen-vertex-btcio"
name = "alpen-express-btcio"
version = "0.1.0"

[dependencies]
alpen-vertex-db = { workspace = true }
alpen-vertex-primitives = { workspace = true }
alpen-vertex-state = { workspace = true }
alpen-express-db = { workspace = true }
alpen-express-primitives = { workspace = true }
alpen-express-state = { workspace = true }

anyhow = { workspace = true }
async-trait = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/btcio/src/reader/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::collections::VecDeque;
use std::sync::Arc;
use std::time::{self, Duration};

use alpen_vertex_primitives::l1::L1Status;
use alpen_express_primitives::l1::L1Status;
use anyhow::bail;
use bitcoin::{Block, BlockHash};
use tokio::sync::{mpsc, RwLock};
Expand Down
2 changes: 1 addition & 1 deletion crates/btcio/src/status.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use std::sync::Arc;

use tokio::sync::RwLock;

use alpen_vertex_primitives::l1::L1Status;
use alpen_express_primitives::l1::L1Status;

#[derive(Debug, Clone)]
pub enum StatusUpdate {
Expand Down
Loading

0 comments on commit cf3e358

Please sign in to comment.