Merge a0e8b9da73f4af928b54a16006d3f9cf53237111 into 4bcffafe274151617975b7afe16c61b8a08d6b97

.github/workflows/bench-regression.yml

@@ -2,7 +2,7 @@ on:
   pull_request:
     paths:
       - "tools/crypto_primitives_bench/**"
-      - "key_protocol/**"
+      - "lez/key_protocol/**"
       - "lee/core/**"
       - ".github/workflows/bench-regression.yml"
 

.github/workflows/publish_images.yml

@@ -13,18 +13,18 @@ jobs:
       matrix:
         include:
           - name: sequencer_service
-            dockerfile: ./sequencer/service/Dockerfile
+            dockerfile: ./lez/sequencer/service/Dockerfile
             build_args: |
               STANDALONE=false
           - name: sequencer_service-standalone
-            dockerfile: ./sequencer/service/Dockerfile
+            dockerfile: ./lez/sequencer/service/Dockerfile
             build_args: |
               STANDALONE=true
           - name: indexer_service
-            dockerfile: ./indexer/service/Dockerfile
+            dockerfile: ./lez/indexer/service/Dockerfile
             build_args: ""
           - name: explorer_service
-            dockerfile: ./explorer_service/Dockerfile
+            dockerfile: ./lez/explorer_service/Dockerfile
             build_args: ""
     steps:
       - uses: actions/checkout@v5

Cargo.lock

@@ -4864,6 +4864,14 @@ dependencies = [
  "tachys",
 ]
 
+[[package]]
+name = "lez"
+version = "0.1.0"
+dependencies = [
+ "indexer_core",
+ "sequencer_core",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.186"

Cargo.toml

@@ -5,14 +5,14 @@ license = "MIT or Apache-2.0"
 resolver = "3"
 members = [
   "integration_tests",
-  "storage",
+  "lez/storage",
   "lee/key_protocol",
-  "mempool",
-  "wallet",
-  "wallet-ffi",
-  "common",
   "lee/state_machine",
   "lee/state_machine/core",
+  "lez/mempool",
+  "lez/wallet",
+  "lez/wallet-ffi",
+  "lez/common",
   "programs/amm/core",
   "programs/amm",
   "programs/clock/core",
@@ -24,15 +24,15 @@ members = [
   "programs/faucet/core",
   "programs/bridge/core",
   "programs/vault/core",
-  "sequencer/core",
-  "sequencer/service",
-  "sequencer/service/protocol",
-  "sequencer/service/rpc",
-  "indexer/core",
-  "indexer/service",
-  "indexer/service/protocol",
-  "indexer/service/rpc",
-  "explorer_service",
+  "lez/sequencer/core",
+  "lez/sequencer/service",
+  "lez/sequencer/service/protocol",
+  "lez/sequencer/service/rpc",
+  "lez/indexer/core",
+  "lez/indexer/service",
+  "lez/indexer/service/protocol",
+  "lez/indexer/service/rpc",
+  "lez/explorer_service",
   "program_methods",
   "program_methods/guest",
   "test_program_methods",
@@ -40,9 +40,10 @@ members = [
   "examples/program_deployment",
   "examples/program_deployment/methods",
   "examples/program_deployment/methods/guest",
-  "testnet_initial_state",
-  "indexer/ffi",
-  "keycard_wallet",
+  "lez/testnet_initial_state",
+  "lez/indexer/ffi",
+  "lez",
+  "lez/keycard_wallet",
   "test_fixtures",
   "tools/cycle_bench",
   "tools/crypto_primitives_bench",
@@ -52,21 +53,22 @@ members = [
 [workspace.dependencies]
 lee = { path = "lee/state_machine" }
 lee_core = { path = "lee/state_machine/core" }
-common = { path = "common" }
-mempool = { path = "mempool" }
-storage = { path = "storage" }
+common = { path = "lez/common" }
+mempool = { path = "lez/mempool" }
+storage = { path = "lez/storage" }
 key_protocol = { path = "lee/key_protocol" }
-sequencer_core = { path = "sequencer/core" }
-sequencer_service_protocol = { path = "sequencer/service/protocol" }
-sequencer_service_rpc = { path = "sequencer/service/rpc" }
-sequencer_service = { path = "sequencer/service" }
-indexer_core = { path = "indexer/core" }
-indexer_service = { path = "indexer/service" }
-indexer_service_protocol = { path = "indexer/service/protocol" }
-indexer_service_rpc = { path = "indexer/service/rpc" }
-wallet = { path = "wallet" }
-wallet-ffi = { path = "wallet-ffi", default-features = false }
-indexer_ffi = { path = "indexer/ffi" }
+sequencer_core = { path = "lez/sequencer/core" }
+sequencer_service_protocol = { path = "lez/sequencer/service/protocol" }
+sequencer_service_rpc = { path = "lez/sequencer/service/rpc" }
+sequencer_service = { path = "lez/sequencer/service" }
+indexer_core = { path = "lez/indexer/core" }
+indexer_service = { path = "lez/indexer/service" }
+indexer_service_protocol = { path = "lez/indexer/service/protocol" }
+indexer_service_rpc = { path = "lez/indexer/service/rpc" }
+wallet = { path = "lez/wallet" }
+wallet-ffi = { path = "lez/wallet-ffi", default-features = false }
+indexer_ffi = { path = "lez/indexer/ffi" }
+lez = { path = "lez" }
 clock_core = { path = "programs/clock/core" }
 token_core = { path = "programs/token/core" }
 token_program = { path = "programs/token" }
@@ -79,8 +81,8 @@ faucet_core = { path = "programs/faucet/core" }
 bridge_core = { path = "programs/bridge/core" }
 vault_core = { path = "programs/vault/core" }
 test_program_methods = { path = "test_program_methods" }
-testnet_initial_state = { path = "testnet_initial_state" }
-keycard_wallet = { path = "keycard_wallet" }
+testnet_initial_state = { path = "lez/testnet_initial_state" }
+keycard_wallet = { path = "lez/keycard_wallet" }
 test_fixtures = { path = "test_fixtures" }
 
 tokio = { version = "1.50", features = [

Justfile

@@ -36,13 +36,13 @@ run-bedrock:
     docker compose up
 
 # Run Sequencer
-[working-directory: 'sequencer/service']
+[working-directory: 'lez/sequencer/service']
 run-sequencer:
     @echo "🧠 Running sequencer"
     RUST_LOG=info RISC0_DEV_MODE=1 cargo run --release -p sequencer_service configs/debug/sequencer_config.json
 
 # Run Indexer
-[working-directory: 'indexer/service']
+[working-directory: 'lez/indexer/service']
 run-indexer mock="":
     @echo "🔍 Running indexer"
     @if [ "{{mock}}" = "mock" ]; then \
@@ -54,13 +54,13 @@ run-indexer mock="":
     fi
 
 # Run Explorer
-[working-directory: 'explorer_service']
+[working-directory: 'lez/explorer_service']
 run-explorer:
     @echo "🌐 Running explorer"
     RUST_LOG=info cargo leptos serve
 
 # Run Wallet
-[working-directory: 'wallet']
+[working-directory: 'lez/wallet']
 run-wallet +args:
     @echo "🔑 Running wallet"
     LEE_WALLET_HOME_DIR=$(pwd)/configs/debug cargo run --release -p wallet -- {{args}}
@@ -68,9 +68,9 @@ run-wallet +args:
 # Clean runtime data
 clean:
     @echo "🧹 Cleaning run artifacts"
-    rm -rf sequencer/service/bedrock_signing_key
-    rm -rf sequencer/service/rocksdb
-    rm -rf indexer/service/rocksdb
-    rm -rf wallet/configs/debug/storage.json
+    rm -rf lez/sequencer/service/bedrock_signing_key
+    rm -rf lez/sequencer/service/rocksdb
+    rm -rf lez/indexer/service/rocksdb
+    rm -rf lez/wallet/configs/debug/storage.json
     rm -rf rocksdb
     cd bedrock && docker compose down -v

README.md

@@ -152,17 +152,17 @@ The sequencer and logos blockchain node can be run locally:
     - `cargo build --all-features`
     - `./target/debug/logos-blockchain-node --deployment nodes/node/standalone-deployment-config.yaml nodes/node/standalone-node-config.yaml`
 
- - Alternatively (WARNING: This node is outdated) go to `logos-blockchain/lssa/` repo and run the node from docker:
+ - Alternatively (WARNING: This node is outdated) go to `logos-blockchain/logos-execution-zone/` repo and run the node from docker:
     - `cd bedrock`
     - Change line 14 of `docker-compose.yml` from `"0:18080/tcp"` into `"8080:18080/tcp"`
     - `docker compose up`
 
- 2. On another terminal go to the `logos-blockchain/lssa` repo and run indexer service:
-      - `RUST_LOG=info cargo run -p indexer_service indexer/service/configs/indexer_config.json`
+ 2. On another terminal go to the `logos-blockchain/logos-execution-zone` repo and run indexer service:
+      - `RUST_LOG=info cargo run -p indexer_service lez/indexer/service/configs/indexer_config.json`
 
- 3. On another terminal go to the `logos-blockchain/lssa` repo and run the sequencer:
-      - `RUST_LOG=info cargo run -p sequencer_service sequencer/service/configs/debug/sequencer_config.json`
- 4. (To run the explorer): on another terminal go to `logos-blockchain/lssa/explorer_service` and run the following:
+ 3. On another terminal go to the `logos-blockchain/logos-execution-zone` repo and run the sequencer:
+      - `RUST_LOG=info cargo run -p sequencer_service lez/sequencer/service/configs/debug/sequencer_config.json`
+ 4. (To run the explorer): on another terminal go to `logos-blockchain/logos-execution-zone/lez/explorer_service` and run the following:
       - `cargo install cargo-leptos`
       - `cargo leptos build --release`
       - `cargo leptos serve --release`
@@ -171,9 +171,9 @@ The sequencer and logos blockchain node can be run locally:
 
 After stopping services above you need to remove 3 folders to start cleanly:
  1. In the `logos-blockchain/logos-blockchain` folder `state` (not needed in case of docker setup)
- 2. In the `lssa` folder `sequencer/service/rocksdb`
- 3. In the `lssa` file `sequencer/service/bedrock_signing_key`
- 4. In the `lssa` folder `indexer/service/rocksdb`
+ 2. In the `logos-execution-zone` folder `lez/sequencer/service/rocksdb`
+ 3. In the `logos-execution-zone` file `lez/sequencer/service/bedrock_signing_key`
+ 4. In the `logos-execution-zone` folder `lez/indexer/service/rocksdb`
 
 ### Normal mode (`just` commands)
 We provide a `Justfile` for developer and user needs, you can run the whole setup with it. The only difference will be that logos-blockchain (bedrock) will be started from docker.
@@ -220,7 +220,7 @@ This will use a wallet binary built from this repo and not the one installed in
 ### Standalone mode
 The sequencer can be run in standalone mode with:
 ```bash
-RUST_LOG=info cargo run --features standalone -p sequencer_service sequencer/service/configs/debug
+RUST_LOG=info cargo run --features standalone -p sequencer_service lez/sequencer/service/configs/debug
 ```
 
 ## Running with Docker
@@ -231,7 +231,7 @@ You can run the whole setup with Docker:
 docker compose up
 ```
 
-With that you can send transactions from local wallet to the Sequencer running inside Docker using `wallet/configs/debug` as well as exploring blocks by opening `http://localhost:8080`.
+With that you can send transactions from local wallet to the Sequencer running inside Docker using `lez/wallet/configs/debug` as well as exploring blocks by opening `http://localhost:8080`.
 
 ## Caution for local image builds
 

completions/README.md

@@ -1,6 +1,6 @@
 # Wallet CLI Completion
 
-Completion scripts for the LSSA `wallet` command.
+Completion scripts for the LEZ `wallet` command.
 
 ## ZSH
 

docker-compose.override.yml

@@ -12,13 +12,13 @@ services:
       - logos-blockchain-node-0
       - indexer_service
     volumes:
-      - ./configs/docker-all-in-one/sequencer_config.json:/etc/sequencer_service/sequencer_config.json
+      - ./lez/configs/docker-all-in-one/sequencer_config.json:/etc/sequencer_service/sequencer_config.json
 
   indexer_service:
     depends_on:
       - logos-blockchain-node-0
     volumes:
-      - ./configs/docker-all-in-one/indexer_config.json:/etc/indexer_service/indexer_config.json
+      - ./lez/configs/docker-all-in-one/indexer_config.json:/etc/indexer_service/indexer_config.json
 
   explorer_service:
     depends_on:

docker-compose.yml

@@ -6,8 +6,8 @@ include:
   - path:
       bedrock/docker-compose.yml
   - path:
-      sequencer/service/docker-compose.yml
+      lez/sequencer/service/docker-compose.yml
   - path:
-      indexer/service/docker-compose.yml
+      lez/indexer/service/docker-compose.yml
   - path:
-      explorer_service/docker-compose.yml
+      lez/explorer_service/docker-compose.yml

docs/LEZ testnet v0.1 tutorials/keycard.md

@@ -16,28 +16,28 @@ Installation:
 1. Install math applet on your keycard; this process only needs to be done once. In the root of repo:
     ```
     sudo apt-get install -y default-jdk
-    wget https://github.com/martinpaljak/GlobalPlatformPro/releases/download/v25.10.20/gp.jar -P keycard_wallet/keycard_applets
-    cd keycard_wallet/keycard_applets
+    wget https://github.com/martinpaljak/GlobalPlatformPro/releases/download/v25.10.20/gp.jar -P lez/keycard_wallet/keycard_applets
+    cd lez/keycard_wallet/keycard_applets
     java -jar gp.jar --key c212e073ff8b4bbfaff4de8ab655221f --load math.cap
     ```
 2. Install `keycard-desktop` from [github](https://github.com/choppu/keycard-desktop)
     - Keycard Desktop is used to install the LEE key protocol to a blank keycard.
-    - Select (Re)Install Applet and upload the key binary (`keycard_wallet/keycard_applets/LEE_keycard.cap`).
+    - Select (Re)Install Applet and upload the key binary (`lez/keycard_wallet/keycard_applets/LEE_keycard.cap`).
     ![keycard-desktop.png](keycard-desktop.png)
     - **Important:** keycard can only connect with one application at a time; if Keycard-Desktop is using keycard then Wallet CLI cannot access the same keycard, and vice-versa.
 
 ## Wallet with Keycard
-Keycard functionality is available to Wallet CLI by setting up the following Python virtual environment. The steps below can also be run via `keycard_wallet/wallet_with_keycard.sh`.
+Keycard functionality is available to Wallet CLI by setting up the following Python virtual environment. The steps below can also be run via `lez/keycard_wallet/wallet_with_keycard.sh`.
 
 ```bash
 # Install appropriate version of `keycard-py`.
-git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git keycard_wallet/python/keycard-py
+git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git lez/keycard_wallet/python/keycard-py
 
 # Set up virtual environment.
 python3 -m venv venv
 source venv/bin/activate
 pip install pyscard mnemonic ecdsa pyaes
-pip install -e keycard_wallet/python/keycard-py
+pip install -e lez/keycard_wallet/python/keycard-py
 ```
 
 **Important**: Keycard wallet commands only work within the virtual environment.
@@ -215,10 +215,10 @@ Transaction hash is 7d4c1b8e2f903a56fd19084b3c8b25d07e8f243829bc50addf6e2c78b4b0
 
 ## Testing
 
-Tests for Keycard commands are in `keycard_wallet/tests/keycard_tests.sh`. Run from the repo root with a Keycard connected:
+Tests for Keycard commands are in `lez/keycard_wallet/tests/keycard_tests.sh`. Run from the repo root with a Keycard connected:
 
 ```bash
-bash keycard_wallet/tests/keycard_tests.sh
+bash lez/keycard_wallet/tests/keycard_tests.sh
 ```
 
 ## SigningGroups

examples/program_deployment/README.md

@@ -13,7 +13,7 @@ cargo install --path wallet --force
 ```
 
 # 1. Run the sequencer
-From the project’s root directory, start the sequencer by following [these instructions](https://github.com/logos-blockchain/lssa#run-the-sequencer-and-node).
+From the project’s root directory, start the sequencer by following [these instructions](https://github.com/logos-blockchain/logos-execution-zone#run-the-sequencer-and-node).
 
 ## Checking and setting up the wallet
 For sanity let's check that the wallet can connect to it.
@@ -28,7 +28,7 @@ For this tutorial, use: `program-tutorial`
 You should see `✅All looks good!` if everything went well.
 
 # 2. Compile the example programs
-In a second terminal, from the `lssa` root directory, compile the example Risc0 programs:
+In a second terminal, from the `logos-execution-zone` root directory, compile the example Risc0 programs:
 ```bash
 cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 ```

examples/program_deployment/src/bin/run_hello_world.rs

@@ -11,7 +11,7 @@ use wallet::WalletCore;
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/hello_world.bin
 //

examples/program_deployment/src/bin/run_hello_world_private.rs

@@ -5,7 +5,7 @@ use wallet::{AccountIdentity, WalletCore};
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/hello_world.bin
 //

examples/program_deployment/src/bin/run_hello_world_through_tail_call.rs

@@ -11,7 +11,7 @@ use wallet::WalletCore;
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/simple_tail_call.bin
 //

examples/program_deployment/src/bin/run_hello_world_through_tail_call_private.rs

@@ -10,7 +10,7 @@ use wallet::{AccountIdentity, WalletCore};
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/simple_tail_call.bin
 //

examples/program_deployment/src/bin/run_hello_world_with_authorization.rs

@@ -11,7 +11,7 @@ use wallet::WalletCore;
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/hello_world_with_authorization.bin
 //

examples/program_deployment/src/bin/run_hello_world_with_authorization_through_tail_call_with_pda.rs

@@ -17,7 +17,7 @@ use wallet::WalletCore;
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/simple_tail_call.bin
 //

examples/program_deployment/src/bin/run_hello_world_with_move_function.rs

@@ -8,7 +8,7 @@ use wallet::{AccountIdentity, WalletCore};
 //
 //   cargo risczero build --manifest-path examples/program_deployment/methods/guest/Cargo.toml
 //
-// Note: you must run the above command from the root of the `lssa` repository.
+// Note: you must run the above command from the root of the `logos-execution-zone` repository.
 // Note: The compiled binary file is stored in
 // methods/guest/target/riscv32im-risc0-zkvm-elf/docker/hello_world_with_move_function.bin
 //

lez/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "lez"
+version = "0.1.0"
+edition = "2024"
+license = { workspace = true }
+
+[lints]
+workspace = true
+
+[dependencies]
+sequencer_core.workspace = true
+indexer_core.workspace = true

lez/explorer_service/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   explorer_service:
-    image: lssa/explorer_service
+    image: lez/explorer_service
     build:
       context: ..
       dockerfile: explorer_service/Dockerfile

lez/indexer/service/docker-compose.yml

@@ -1,9 +1,9 @@
 services:
   indexer_service:
-    image: lssa/indexer_service
+    image: lez/indexer_service
     build:
       context: ../..
-      dockerfile: indexer/service/Dockerfile
+      dockerfile: lez/indexer/service/Dockerfile
     container_name: indexer_service
     ports:
       - "8779:8779"

lez/keycard_wallet/wallet_with_keycard.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-cargo install --path wallet --force
+cargo install --path lez/wallet --force
 
 # Install appropriate version of `keycard-py`.
-git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git keycard_wallet/python/keycard-py
+git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git lez/keycard_wallet/python/keycard-py
 
 # Set up virtual environment.
 python3 -m venv venv
 source venv/bin/activate
 pip install pyscard mnemonic ecdsa pyaes
-pip install -e keycard_wallet/python/keycard-py
+pip install -e lez/keycard_wallet/python/keycard-py