From a2f752ac2f9636a85f1855845b1a5159f2feebbf Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 18:33:35 +0200 Subject: [PATCH 01/19] chore(ci): enable indexer integration tests --- .github/workflows/ci.yml | 44 ++++++++++++++++++-------------------- bedrock/cfgsync.yaml | 2 +- bedrock/docker-compose.yml | 26 ---------------------- 3 files changed, 22 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b327aaae..bbfa53b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,35 +160,33 @@ jobs: RUST_LOG: "info" run: cargo nextest run -p integration_tests -- --skip tps_test --skip indexer - # # TODO: Bring this back once we find the source of the errors. - # # - # integration-tests-indexer: - # runs-on: ubuntu-latest - # timeout-minutes: 60 - # steps: - # - uses: actions/checkout@v5 - # with: - # ref: ${{ github.event.pull_request.head.sha || github.head_ref }} + integration-tests-indexer: + runs-on: ubuntu-latest + timeout-minutes: 60 + steps: + - uses: actions/checkout@v5 + with: + ref: ${{ github.event.pull_request.head.sha || github.head_ref }} - # - uses: ./.github/actions/install-system-deps + - uses: ./.github/actions/install-system-deps - # - uses: ./.github/actions/install-risc0 + - uses: ./.github/actions/install-risc0 - # - uses: ./.github/actions/install-logos-blockchain-circuits - # with: - # github-token: ${{ secrets.GITHUB_TOKEN }} + - uses: ./.github/actions/install-logos-blockchain-circuits + with: + github-token: ${{ secrets.GITHUB_TOKEN }} - # - name: Install active toolchain - # run: rustup install + - name: Install active toolchain + run: rustup install - # - name: Install nextest - # run: cargo install --locked cargo-nextest + - name: Install nextest + run: cargo install --locked cargo-nextest - # - name: Run tests - # env: - # RISC0_DEV_MODE: "1" - # RUST_LOG: "info" - # run: cargo nextest run -p integration_tests indexer -- --skip tps_test + - name: Run tests + env: + RISC0_DEV_MODE: "1" + RUST_LOG: "info" + run: cargo nextest run -p integration_tests indexer -- --skip tps_test valid-proof-test: runs-on: ubuntu-latest diff --git a/bedrock/cfgsync.yaml b/bedrock/cfgsync.yaml index e09fe586..6d0d9fe6 100644 --- a/bedrock/cfgsync.yaml +++ b/bedrock/cfgsync.yaml @@ -1,5 +1,5 @@ port: 4400 -n_hosts: 4 +n_hosts: 1 timeout: 10 # Tracing diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 4f85bf25..1749437b 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -18,29 +18,3 @@ services: - cfgsync entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh - logos-blockchain-node-1: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 - volumes: - - ./scripts:/etc/logos-blockchain/scripts - - ./kzgrs_test_params:/kzgrs_test_params:z - depends_on: - - cfgsync - entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh - - logos-blockchain-node-2: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 - volumes: - - ./scripts:/etc/logos-blockchain/scripts - - ./kzgrs_test_params:/kzgrs_test_params:z - depends_on: - - cfgsync - entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh - - logos-blockchain-node-3: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 - volumes: - - ./scripts:/etc/logos-blockchain/scripts - - ./kzgrs_test_params:/kzgrs_test_params:z - depends_on: - - cfgsync - entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh From 63206faeea4300636b2f62a796da48d03e3f53e6 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 18:39:47 +0200 Subject: [PATCH 02/19] tag commits --- Cargo.lock | 336 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 10 +- 2 files changed, 203 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9e1d157c..0ba39cde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -643,40 +643,6 @@ dependencies = [ "xattr", ] -[[package]] -name = "astro-float" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96034cc871c05bb65ad7fb77e6a8bebf45d8b055ed0311769e2f83a1d373c1ec" -dependencies = [ - "astro-float-macro", - "astro-float-num", -] - -[[package]] -name = "astro-float-macro" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cfe0f6df5a74fb25b9e713470ad77e091f35f798730673c8772f26ed438963" -dependencies = [ - "astro-float-num", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "astro-float-num" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86887daca11d02e0b04f37a9cb81888aae881397fb48ff66494e356aea97554a" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "rand 0.8.5", - "serde", -] - [[package]] name = "async-lock" version = "3.4.2" @@ -824,9 +790,10 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tower", + "tower 0.5.3", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -860,7 +827,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-tungstenite", - "tower", + "tower 0.5.3", "tower-layer", "tower-service", "tracing", @@ -884,6 +851,7 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1936,6 +1904,19 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "data-encoding" version = "2.10.0" @@ -2634,6 +2615,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror 1.0.69", +] + [[package]] name = "funty" version = "2.0.0" @@ -2899,6 +2890,26 @@ dependencies = [ "web-sys", ] +[[package]] +name = "governor" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", +] + [[package]] name = "group" version = "0.13.0" @@ -3834,7 +3845,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "tower", + "tower 0.5.3", "tracing", "wasm-bindgen-futures", ] @@ -3858,7 +3869,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "tower", + "tower 0.5.3", "url", ] @@ -3898,7 +3909,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.5.3", "tracing", ] @@ -3923,7 +3934,7 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", - "tower", + "tower 0.5.3", ] [[package]] @@ -3936,7 +3947,7 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", - "tower", + "tower 0.5.3", "url", ] @@ -4084,7 +4095,7 @@ dependencies = [ "server_fn", "tachys", "tokio", - "tower", + "tower 0.5.3", "tower-http", ] @@ -4378,8 +4389,8 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4392,8 +4403,8 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "blake2", "derivative", @@ -4414,17 +4425,14 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", - "hex", "logos-blockchain-blend-crypto", "logos-blockchain-groth16", - "logos-blockchain-pol", "logos-blockchain-poq", - "logos-blockchain-utils", "num-bigint 0.4.6", "serde", "thiserror 1.0.69", @@ -4432,8 +4440,8 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "derivative", @@ -4448,8 +4456,8 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "bytes", @@ -4478,8 +4486,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4487,25 +4495,22 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "dirs", ] [[package]] name = "logos-blockchain-common-http-client" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "futures", - "hex", "logos-blockchain-chain-broadcast-service", "logos-blockchain-chain-service", "logos-blockchain-core", - "logos-blockchain-groth16", "logos-blockchain-http-api-common", - "logos-blockchain-key-management-system-keys", "reqwest", "serde", "serde_json", @@ -4515,8 +4520,8 @@ dependencies = [ [[package]] name = "logos-blockchain-core" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4545,11 +4550,10 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "cfg_eval", - "logos-blockchain-pol", "logos-blockchain-utils", "serde", "serde_with", @@ -4561,8 +4565,8 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "bytes", "futures", @@ -4578,8 +4582,8 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4596,28 +4600,29 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "axum 0.7.9", + "governor", "logos-blockchain-core", "logos-blockchain-key-management-system-keys", "serde", "serde_json", "serde_with", - "tracing", + "tower_governor", ] [[package]] name = "logos-blockchain-key-management-system-keys" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", - "hex", + "logos-blockchain-blend-proofs", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", "logos-blockchain-poseidon2", @@ -4636,39 +4641,22 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "proc-macro2", "quote", "syn 2.0.117", ] -[[package]] -name = "logos-blockchain-key-management-system-operators" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" -dependencies = [ - "async-trait", - "logos-blockchain-blend-proofs", - "logos-blockchain-core", - "logos-blockchain-groth16", - "logos-blockchain-key-management-system-keys", - "logos-blockchain-poseidon2", - "logos-blockchain-utxotree", - "tokio", - "tracing", -] - [[package]] name = "logos-blockchain-key-management-system-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "log", "logos-blockchain-key-management-system-keys", - "logos-blockchain-key-management-system-operators", "overwatch", "serde", "thiserror 2.0.18", @@ -4678,8 +4666,8 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4702,8 +4690,8 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "futures", @@ -4718,8 +4706,8 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4729,32 +4717,28 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "tracing", ] [[package]] name = "logos-blockchain-pol" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ - "astro-float", "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", "logos-blockchain-groth16", - "logos-blockchain-utils", "logos-blockchain-witness-generator", "num-bigint 0.4.6", "num-traits", "serde", "serde_json", "thiserror 2.0.18", - "tracing", ] [[package]] name = "logos-blockchain-poq" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4765,13 +4749,12 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "tracing", ] [[package]] name = "logos-blockchain-poseidon2" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4781,8 +4764,8 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "futures", @@ -4796,8 +4779,8 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "bytes", @@ -4813,8 +4796,8 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "futures", @@ -4831,8 +4814,8 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "async-trait", "blake2", @@ -4848,8 +4831,8 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4862,16 +4845,16 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "tempfile", ] [[package]] name = "logos-blockchain-zksign" -version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git#81dbb4517aa466358ed425d92fad7d45a0c419fd" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4882,7 +4865,6 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", - "tracing", ] [[package]] @@ -5237,6 +5219,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "no_std_strings" version = "0.1.3" @@ -5262,6 +5250,18 @@ dependencies = [ "memchr", ] +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "nssa" version = "0.1.0" @@ -5571,7 +5571,7 @@ checksum = "8c04f5d74368e4d0dfe06c45c8627c81bd7c317d52762d118fb9b3076f6420fd" [[package]] name = "overwatch" version = "0.1.0" -source = "git+https://github.com/logos-co/Overwatch?rev=448c192#448c192895b8311c742b1726a1bb12ee314ad95c" +source = "git+https://github.com/logos-co/Overwatch?rev=f5a9902#f5a99022f389d65adbd55e51f1e3f9eead62432a" dependencies = [ "async-trait", "futures", @@ -5586,7 +5586,7 @@ dependencies = [ [[package]] name = "overwatch-derive" version = "0.1.0" -source = "git+https://github.com/logos-co/Overwatch?rev=448c192#448c192895b8311c742b1726a1bb12ee314ad95c" +source = "git+https://github.com/logos-co/Overwatch?rev=f5a9902#f5a99022f389d65adbd55e51f1e3f9eead62432a" dependencies = [ "convert_case 0.8.0", "proc-macro-error2", @@ -5998,6 +5998,21 @@ dependencies = [ "parking_lot", ] +[[package]] +name = "quanta" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi", + "web-sys", + "winapi", +] + [[package]] name = "quinn" version = "0.11.9" @@ -6170,6 +6185,15 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "raw-cpuid" +version = "11.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" +dependencies = [ + "bitflags 2.11.0", +] + [[package]] name = "rawpointer" version = "0.2.1" @@ -6365,7 +6389,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tokio-util", - "tower", + "tower 0.5.3", "tower-http", "tower-service", "url", @@ -7418,7 +7442,7 @@ dependencies = [ "thiserror 2.0.18", "throw_error", "tokio", - "tower", + "tower 0.5.3", "tower-layer", "url", "wasm-bindgen", @@ -7573,6 +7597,15 @@ dependencies = [ "lock_api", ] +[[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + [[package]] name = "spki" version = "0.7.3" @@ -8245,7 +8278,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-stream", - "tower", + "tower 0.5.3", "tower-layer", "tower-service", "tracing", @@ -8262,6 +8295,17 @@ dependencies = [ "tonic", ] +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower" version = "0.5.3" @@ -8303,7 +8347,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", + "tower 0.5.3", "tower-layer", "tower-service", "tracing", @@ -8321,6 +8365,22 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +[[package]] +name = "tower_governor" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3790eac6ad3fb8d9d96c2b040ae06e2517aa24b067545d1078b96ae72f7bb9a7" +dependencies = [ + "axum 0.7.9", + "forwarded-header-value", + "governor", + "http", + "pin-project", + "thiserror 1.0.69", + "tower 0.4.13", + "tracing", +] + [[package]] name = "tracing" version = "0.1.44" diff --git a/Cargo.toml b/Cargo.toml index 1d9aa707..9f9d6f33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", From c2690236e970a7582a0288449611b22582c2ff96 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 19:12:04 +0200 Subject: [PATCH 03/19] dump logs --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbfa53b5..6b9b6ddd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,6 +188,14 @@ jobs: RUST_LOG: "info" run: cargo nextest run -p integration_tests indexer -- --skip tps_test + - name: Dump bedrock container logs on failure + if: failure() + run: | + for c in $(docker ps -aq); do + echo "=== $(docker inspect -f '{{.Name}}' $c) ===" + docker logs $c 2>&1 | tail -300 + done + valid-proof-test: runs-on: ubuntu-latest timeout-minutes: 60 From 5ba939d156c7409bcfaf914accc2e73a67293ad0 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 19:40:26 +0200 Subject: [PATCH 04/19] print logs --- .github/workflows/ci.yml | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b9b6ddd..140d9e8a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,18 +182,41 @@ jobs: - name: Install nextest run: cargo install --locked cargo-nextest + - name: Start container log capture + run: | + mkdir -p /tmp/container-logs + ( + seen="" + while true; do + for c in $(docker ps -q 2>/dev/null); do + case " $seen " in + *" $c "*) ;; + *) + name=$(docker inspect -f '{{.Name}}' "$c" 2>/dev/null | sed 's|^/||') + docker logs -f "$c" >"/tmp/container-logs/${name}.log" 2>&1 & + seen="$seen $c" + ;; + esac + done + sleep 1 + done + ) & + echo $! > /tmp/log-watcher.pid + - name: Run tests env: RISC0_DEV_MODE: "1" RUST_LOG: "info" run: cargo nextest run -p integration_tests indexer -- --skip tps_test - - name: Dump bedrock container logs on failure + - name: Dump captured container logs on failure if: failure() run: | - for c in $(docker ps -aq); do - echo "=== $(docker inspect -f '{{.Name}}' $c) ===" - docker logs $c 2>&1 | tail -300 + kill "$(cat /tmp/log-watcher.pid)" 2>/dev/null || true + for f in /tmp/container-logs/*.log; do + [ -e "$f" ] || continue + echo "=== $f ===" + tail -300 "$f" done valid-proof-test: From ab40aedf34c2fdb2576dc23d61d63edcffa87036 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 20:10:09 +0200 Subject: [PATCH 05/19] debug logs --- bedrock/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 1749437b..4aaf194a 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -9,6 +9,8 @@ services: logos-blockchain-node-0: image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + environment: + RUST_LOG: "info,logos_blockchain=debug" ports: - "${PORT:-8080}:18080/tcp" volumes: From 817cf35fff079a255a8e19ee56d6677b1aacda18 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 20:37:51 +0200 Subject: [PATCH 06/19] debug --- bedrock/docker-compose.yml | 2 -- bedrock/scripts/run_logos_blockchain_node.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 4aaf194a..1749437b 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -9,8 +9,6 @@ services: logos-blockchain-node-0: image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 - environment: - RUST_LOG: "info,logos_blockchain=debug" ports: - "${PORT:-8080}:18080/tcp" volumes: diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index e318ab4a..b91ba4b4 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -6,7 +6,7 @@ export CFG_FILE_PATH="/config.yaml" \ CFG_SERVER_ADDR="http://cfgsync:4400" \ CFG_HOST_IP=$(hostname -i) \ CFG_HOST_IDENTIFIER="validator-$(hostname -i)" \ - LOG_LEVEL="INFO" \ + LOG_LEVEL="DEBUG" \ POL_PROOF_DEV_MODE=true /usr/bin/logos-blockchain-cfgsync-client && \ From 4d9ed77e144288d9ece78328154d883555409949 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 21:07:03 +0200 Subject: [PATCH 07/19] debug --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 140d9e8a..a1fbb2a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -215,8 +215,11 @@ jobs: kill "$(cat /tmp/log-watcher.pid)" 2>/dev/null || true for f in /tmp/container-logs/*.log; do [ -e "$f" ] || continue - echo "=== $f ===" - tail -300 "$f" + echo "=== $f (lines: $(wc -l < $f)) ===" + echo "--- proposed-block events with removals ---" + grep -B 200 -A 5 -E '\([1-9][0-9]* removed\)' "$f" | tail -3000 || true + echo "--- mempool/tx/inscribe activity ---" + grep -i -E 'mempool|inscrib|verif|reject|invalid|gas|validate|removed' "$f" | tail -1000 || true done valid-proof-test: From 74039f5cca00ca4d94dedbafe96bcfcdfc13d6f7 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 21:59:15 +0200 Subject: [PATCH 08/19] debug --- Cargo.lock | 225 ++++++++++++++--------------------------------------- Cargo.toml | 10 +-- 2 files changed, 63 insertions(+), 172 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ba39cde..23a343d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -790,10 +790,9 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tower 0.5.3", + "tower", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -827,7 +826,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-tungstenite", - "tower 0.5.3", + "tower", "tower-layer", "tower-service", "tracing", @@ -851,7 +850,6 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1904,19 +1902,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", -] - [[package]] name = "data-encoding" version = "2.10.0" @@ -2615,16 +2600,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "forwarded-header-value" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" -dependencies = [ - "nonempty", - "thiserror 1.0.69", -] - [[package]] name = "funty" version = "2.0.0" @@ -2890,26 +2865,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "governor" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" -dependencies = [ - "cfg-if", - "dashmap", - "futures", - "futures-timer", - "no-std-compat", - "nonzero_ext", - "parking_lot", - "portable-atomic", - "quanta", - "rand 0.8.5", - "smallvec", - "spinning_top", -] - [[package]] name = "group" version = "0.13.0" @@ -3845,7 +3800,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "tower 0.5.3", + "tower", "tracing", "wasm-bindgen-futures", ] @@ -3869,7 +3824,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "tower 0.5.3", + "tower", "url", ] @@ -3909,7 +3864,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower 0.5.3", + "tower", "tracing", ] @@ -3934,7 +3889,7 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", - "tower 0.5.3", + "tower", ] [[package]] @@ -3947,7 +3902,7 @@ dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", - "tower 0.5.3", + "tower", "url", ] @@ -4095,7 +4050,7 @@ dependencies = [ "server_fn", "tachys", "tokio", - "tower 0.5.3", + "tower", "tower-http", ] @@ -4390,7 +4345,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4404,7 +4359,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "blake2", "derivative", @@ -4426,7 +4381,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -4441,7 +4396,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "derivative", @@ -4457,7 +4412,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "bytes", @@ -4487,7 +4442,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4496,7 +4451,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "dirs", ] @@ -4504,7 +4459,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "futures", "logos-blockchain-chain-broadcast-service", @@ -4521,7 +4476,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4551,7 +4506,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "cfg_eval", "logos-blockchain-utils", @@ -4566,7 +4521,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "bytes", "futures", @@ -4583,7 +4538,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4601,28 +4556,25 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "axum 0.7.9", - "governor", "logos-blockchain-core", "logos-blockchain-key-management-system-keys", "serde", "serde_json", "serde_with", - "tower_governor", ] [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", - "logos-blockchain-blend-proofs", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", "logos-blockchain-poseidon2", @@ -4642,21 +4594,38 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "proc-macro2", "quote", "syn 2.0.117", ] +[[package]] +name = "logos-blockchain-key-management-system-operators" +version = "0.1.0" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +dependencies = [ + "async-trait", + "logos-blockchain-blend-proofs", + "logos-blockchain-core", + "logos-blockchain-groth16", + "logos-blockchain-key-management-system-keys", + "logos-blockchain-poseidon2", + "logos-blockchain-utxotree", + "tokio", + "tracing", +] + [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "log", "logos-blockchain-key-management-system-keys", + "logos-blockchain-key-management-system-operators", "overwatch", "serde", "thiserror 2.0.18", @@ -4667,7 +4636,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4691,7 +4660,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "futures", @@ -4707,7 +4676,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4722,7 +4691,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4738,7 +4707,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4754,7 +4723,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4765,7 +4734,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "futures", @@ -4780,7 +4749,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "bytes", @@ -4797,7 +4766,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "futures", @@ -4815,7 +4784,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "async-trait", "blake2", @@ -4832,7 +4801,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4846,7 +4815,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "tempfile", ] @@ -4854,7 +4823,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ca0f8b3231202cdd528f5b57e805adfe398a36e1#ca0f8b3231202cdd528f5b57e805adfe398a36e1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -5219,12 +5188,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "no_std_strings" version = "0.1.3" @@ -5250,18 +5213,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "nonempty" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" - -[[package]] -name = "nonzero_ext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" - [[package]] name = "nssa" version = "0.1.0" @@ -5998,21 +5949,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "quanta" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ab5a9d756f0d97bdc89019bd2e4ea098cf9cde50ee7564dde6b81ccc8f06c7" -dependencies = [ - "crossbeam-utils", - "libc", - "once_cell", - "raw-cpuid", - "wasi", - "web-sys", - "winapi", -] - [[package]] name = "quinn" version = "0.11.9" @@ -6185,15 +6121,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "raw-cpuid" -version = "11.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" -dependencies = [ - "bitflags 2.11.0", -] - [[package]] name = "rawpointer" version = "0.2.1" @@ -6389,7 +6316,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tokio-util", - "tower 0.5.3", + "tower", "tower-http", "tower-service", "url", @@ -7442,7 +7369,7 @@ dependencies = [ "thiserror 2.0.18", "throw_error", "tokio", - "tower 0.5.3", + "tower", "tower-layer", "url", "wasm-bindgen", @@ -7597,15 +7524,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spinning_top" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" -dependencies = [ - "lock_api", -] - [[package]] name = "spki" version = "0.7.3" @@ -8278,7 +8196,7 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-stream", - "tower 0.5.3", + "tower", "tower-layer", "tower-service", "tracing", @@ -8295,17 +8213,6 @@ dependencies = [ "tonic", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "tower" version = "0.5.3" @@ -8347,7 +8254,7 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower 0.5.3", + "tower", "tower-layer", "tower-service", "tracing", @@ -8365,22 +8272,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "tower_governor" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3790eac6ad3fb8d9d96c2b040ae06e2517aa24b067545d1078b96ae72f7bb9a7" -dependencies = [ - "axum 0.7.9", - "forwarded-header-value", - "governor", - "http", - "pin-project", - "thiserror 1.0.69", - "tower 0.4.13", - "tracing", -] - [[package]] name = "tracing" version = "0.1.44" diff --git a/Cargo.toml b/Cargo.toml index 9f9d6f33..7b59b578 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ca0f8b3231202cdd528f5b57e805adfe398a36e1" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", From 7af703f1983149fe1187e06f1af3170e65ec77e8 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 22:30:21 +0200 Subject: [PATCH 09/19] debug --- Cargo.lock | 108 ++++++++++++++++++++++++++++++++++++++--------------- Cargo.toml | 10 ++--- 2 files changed, 83 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23a343d4..821bc854 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -643,6 +643,40 @@ dependencies = [ "xattr", ] +[[package]] +name = "astro-float" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96034cc871c05bb65ad7fb77e6a8bebf45d8b055ed0311769e2f83a1d373c1ec" +dependencies = [ + "astro-float-macro", + "astro-float-num", +] + +[[package]] +name = "astro-float-macro" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cfe0f6df5a74fb25b9e713470ad77e091f35f798730673c8772f26ed438963" +dependencies = [ + "astro-float-num", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "astro-float-num" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86887daca11d02e0b04f37a9cb81888aae881397fb48ff66494e356aea97554a" +dependencies = [ + "itertools 0.10.5", + "lazy_static", + "rand 0.8.5", + "serde", +] + [[package]] name = "async-lock" version = "3.4.2" @@ -4345,7 +4379,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4359,7 +4393,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "blake2", "derivative", @@ -4381,13 +4415,15 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", "logos-blockchain-blend-crypto", "logos-blockchain-groth16", + "logos-blockchain-pol", "logos-blockchain-poq", + "logos-blockchain-utils", "num-bigint 0.4.6", "serde", "thiserror 1.0.69", @@ -4396,7 +4432,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "derivative", @@ -4412,7 +4448,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "bytes", @@ -4442,7 +4478,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4451,7 +4487,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "dirs", ] @@ -4459,13 +4495,16 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "futures", + "hex", "logos-blockchain-chain-broadcast-service", "logos-blockchain-chain-service", "logos-blockchain-core", + "logos-blockchain-groth16", "logos-blockchain-http-api-common", + "logos-blockchain-key-management-system-keys", "reqwest", "serde", "serde_json", @@ -4476,7 +4515,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4506,9 +4545,10 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "cfg_eval", + "logos-blockchain-pol", "logos-blockchain-utils", "serde", "serde_with", @@ -4521,7 +4561,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "bytes", "futures", @@ -4538,7 +4578,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4556,7 +4596,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "axum 0.7.9", "logos-blockchain-core", @@ -4564,17 +4604,19 @@ dependencies = [ "serde", "serde_json", "serde_with", + "tracing", ] [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", + "hex", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", "logos-blockchain-poseidon2", @@ -4594,7 +4636,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "proc-macro2", "quote", @@ -4604,7 +4646,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -4620,7 +4662,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "log", @@ -4636,7 +4678,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4660,7 +4702,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "futures", @@ -4676,7 +4718,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4686,28 +4728,32 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", + "tracing", ] [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ + "astro-float", "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", "logos-blockchain-groth16", + "logos-blockchain-utils", "logos-blockchain-witness-generator", "num-bigint 0.4.6", "num-traits", "serde", "serde_json", "thiserror 2.0.18", + "tracing", ] [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4718,12 +4764,13 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", + "tracing", ] [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4734,7 +4781,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "futures", @@ -4749,7 +4796,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "bytes", @@ -4766,7 +4813,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "futures", @@ -4784,7 +4831,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "async-trait", "blake2", @@ -4801,7 +4848,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4815,7 +4862,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "tempfile", ] @@ -4823,7 +4870,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=271a97ebd03f21a13e9ca72ef8411fd478960296#271a97ebd03f21a13e9ca72ef8411fd478960296" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4834,6 +4881,7 @@ dependencies = [ "serde", "serde_json", "thiserror 2.0.18", + "tracing", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7b59b578..23be2e7b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "271a97ebd03f21a13e9ca72ef8411fd478960296" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", From 359619ad14a2010cbad8ef7b833327bff087d322 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Wed, 8 Apr 2026 23:33:12 +0200 Subject: [PATCH 10/19] new version --- Cargo.lock | 456 +++++++++++++++--- Cargo.toml | 10 +- bedrock/cfgsync.yaml | 15 +- bedrock/docker-compose.yml | 5 +- bedrock/scripts/run_logos_blockchain_node.sh | 11 +- bedrock/test_entropy | 1 + sequencer/core/src/block_settlement_client.rs | 17 +- 7 files changed, 425 insertions(+), 90 deletions(-) create mode 100644 bedrock/test_entropy diff --git a/Cargo.lock b/Cargo.lock index 821bc854..15da4cd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -503,7 +503,7 @@ dependencies = [ "ark-ff 0.4.2", "ark-std 0.4.0", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -515,7 +515,7 @@ dependencies = [ "ark-ff 0.5.0", "ark-std 0.5.0", "tracing", - "tracing-subscriber", + "tracing-subscriber 0.2.25", ] [[package]] @@ -1137,7 +1137,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85a885520bf6249ab931a764ffdb87b0ceef48e6e7d807cfdb21b751e086e1ad" dependencies = [ "prost 0.14.3", - "prost-types", + "prost-types 0.14.3", "tonic", "tonic-prost", "ureq", @@ -1766,6 +1766,15 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" +[[package]] +name = "crossbeam-channel" +version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -3073,6 +3082,17 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + [[package]] name = "html-escape" version = "0.2.13" @@ -4378,8 +4398,8 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4392,11 +4412,12 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "blake2", "derivative", + "hex", "itertools 0.14.0", "logos-blockchain-blend-crypto", "logos-blockchain-blend-proofs", @@ -4414,11 +4435,12 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", + "hex", "logos-blockchain-blend-crypto", "logos-blockchain-groth16", "logos-blockchain-pol", @@ -4431,8 +4453,8 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "derivative", @@ -4447,8 +4469,8 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "bytes", @@ -4463,6 +4485,7 @@ dependencies = [ "logos-blockchain-services-utils", "logos-blockchain-storage-service", "logos-blockchain-time-service", + "logos-blockchain-tracing", "logos-blockchain-utils", "num-bigint 0.4.6", "overwatch", @@ -4477,8 +4500,8 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4486,16 +4509,16 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "dirs", ] [[package]] name = "logos-blockchain-common-http-client" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "futures", "hex", @@ -4514,8 +4537,8 @@ dependencies = [ [[package]] name = "logos-blockchain-core" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4544,8 +4567,8 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "cfg_eval", "logos-blockchain-pol", @@ -4560,8 +4583,8 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "bytes", "futures", @@ -4577,8 +4600,8 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4595,12 +4618,13 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "axum 0.7.9", "logos-blockchain-core", "logos-blockchain-key-management-system-keys", + "logos-blockchain-tracing", "serde", "serde_json", "serde_with", @@ -4609,8 +4633,8 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "bytes", @@ -4635,8 +4659,8 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "proc-macro2", "quote", @@ -4645,8 +4669,8 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -4661,13 +4685,14 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "log", "logos-blockchain-key-management-system-keys", "logos-blockchain-key-management-system-operators", + "logos-blockchain-tracing", "overwatch", "serde", "thiserror 2.0.18", @@ -4677,8 +4702,8 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4695,19 +4720,21 @@ dependencies = [ "rand 0.8.5", "rpds", "serde", + "serde_arrays", "thiserror 1.0.69", "tracing", ] [[package]] name = "logos-blockchain-network-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "futures", "logos-blockchain-core", "logos-blockchain-cryptarchia-sync", + "logos-blockchain-tracing", "overwatch", "serde", "tokio", @@ -4717,8 +4744,8 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4733,8 +4760,8 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "astro-float", "logos-blockchain-circuits-prover", @@ -4752,8 +4779,8 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4769,8 +4796,8 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4780,8 +4807,8 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "futures", @@ -4795,14 +4822,15 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "bytes", "futures", "logos-blockchain-core", "logos-blockchain-cryptarchia-engine", + "logos-blockchain-tracing", "overwatch", "serde", "thiserror 1.0.69", @@ -4812,13 +4840,14 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "futures", "log", "logos-blockchain-cryptarchia-engine", + "logos-blockchain-tracing", "overwatch", "sntpc", "thiserror 2.0.18", @@ -4828,10 +4857,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "logos-blockchain-tracing" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +dependencies = [ + "opentelemetry", + "opentelemetry-appender-tracing", + "opentelemetry-http", + "opentelemetry-otlp", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", + "rand 0.8.5", + "serde", + "tokio", + "tracing", + "tracing-appender", + "tracing-gelf", + "tracing-loki", + "tracing-opentelemetry", + "tracing-subscriber 0.3.23", + "url", +] + [[package]] name = "logos-blockchain-utils" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "async-trait", "blake2", @@ -4847,8 +4899,8 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4861,16 +4913,16 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "tempfile", ] [[package]] name = "logos-blockchain-zksign" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=81192877116cbc3eedf6688b85fab6dd0e448290#81192877116cbc3eedf6688b85fab6dd0e448290" +version = "0.2.1" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4884,6 +4936,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "loki-api" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc38a304f59a03e6efa3876766a48c70a766a93f88341c3fff4212834b8e327" +dependencies = [ + "prost 0.13.5", + "prost-types 0.13.5", +] + [[package]] name = "lru-slab" version = "0.1.2" @@ -4997,6 +5059,21 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" +dependencies = [ + "regex-automata", +] + [[package]] name = "matchit" version = "0.7.3" @@ -5304,6 +5381,15 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "nu-ansi-term" +version = "0.50.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "num" version = "0.4.3" @@ -5544,6 +5630,98 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "opentelemetry" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0" +dependencies = [ + "futures-core", + "futures-sink", + "js-sys", + "pin-project-lite", + "thiserror 2.0.18", +] + +[[package]] +name = "opentelemetry-appender-tracing" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef6a1ac5ca3accf562b8c306fa8483c85f4390f768185ab775f242f7fe8fdcc2" +dependencies = [ + "opentelemetry", + "tracing", + "tracing-core", + "tracing-subscriber 0.3.23", +] + +[[package]] +name = "opentelemetry-http" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry", + "reqwest", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f" +dependencies = [ + "http", + "opentelemetry", + "opentelemetry-http", + "opentelemetry-proto", + "opentelemetry_sdk", + "prost 0.14.3", + "reqwest", + "thiserror 2.0.18", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost 0.14.3", + "tonic", + "tonic-prost", +] + +[[package]] +name = "opentelemetry-semantic-conventions" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e62e29dfe041afb8ed2a6c9737ab57db4907285d999ef8ad3a59092a36bdc846" + +[[package]] +name = "opentelemetry_sdk" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd" +dependencies = [ + "futures-channel", + "futures-executor", + "futures-util", + "opentelemetry", + "percent-encoding", + "rand 0.9.2", + "thiserror 2.0.18", + "tokio", + "tokio-stream", +] + [[package]] name = "optfield" version = "0.4.0" @@ -5570,7 +5748,7 @@ checksum = "8c04f5d74368e4d0dfe06c45c8627c81bd7c317d52762d118fb9b3076f6420fd" [[package]] name = "overwatch" version = "0.1.0" -source = "git+https://github.com/logos-co/Overwatch?rev=f5a9902#f5a99022f389d65adbd55e51f1e3f9eead62432a" +source = "git+https://github.com/logos-co/Overwatch?rev=448c192#448c192895b8311c742b1726a1bb12ee314ad95c" dependencies = [ "async-trait", "futures", @@ -5585,7 +5763,7 @@ dependencies = [ [[package]] name = "overwatch-derive" version = "0.1.0" -source = "git+https://github.com/logos-co/Overwatch?rev=f5a9902#f5a99022f389d65adbd55e51f1e3f9eead62432a" +source = "git+https://github.com/logos-co/Overwatch?rev=448c192#448c192895b8311c742b1726a1bb12ee314ad95c" dependencies = [ "convert_case 0.8.0", "proc-macro-error2", @@ -5974,6 +6152,15 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "prost-types" +version = "0.13.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16" +dependencies = [ + "prost 0.13.5", +] + [[package]] name = "prost-types" version = "0.14.3" @@ -7226,6 +7413,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_arrays" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94a16b99c5ea4fe3daccd14853ad260ec00ea043b2708d1fd1da3106dcd8d9df" +dependencies = [ + "serde", +] + [[package]] name = "serde_core" version = "1.0.228" @@ -7474,6 +7670,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.3.0" @@ -7527,6 +7732,12 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + [[package]] name = "sntpc" version = "0.5.2" @@ -7932,6 +8143,15 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "thread_local" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + [[package]] name = "throw_error" version = "0.3.1" @@ -8332,6 +8552,18 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-appender" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "786d480bce6247ab75f005b14ae1624ad978d3029d9113f0a22fa1ac773faeaf" +dependencies = [ + "crossbeam-channel", + "thiserror 2.0.18", + "time", + "tracing-subscriber 0.3.23", +] + [[package]] name = "tracing-attributes" version = "0.1.31" @@ -8363,6 +8595,82 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-gelf" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c0170f1bf67b749d4377c2da1d99d6e722600051ee53870cfb6f618611e29e" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "hostname", + "serde_json", + "thiserror 1.0.69", + "tokio", + "tokio-util", + "tracing-core", + "tracing-futures", + "tracing-subscriber 0.3.23", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-loki" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3beec919fbdf99d719de8eda6adae3281f8a5b71ae40431f44dc7423053d34" +dependencies = [ + "loki-api", + "reqwest", + "serde", + "serde_json", + "snap", + "tokio", + "tokio-stream", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", + "tracing-subscriber 0.3.23", + "url", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ac28f2d093c6c477eaa76b23525478f38de514fa9aeb1285738d4b97a9552fc" +dependencies = [ + "js-sys", + "opentelemetry", + "smallvec", + "tracing", + "tracing-core", + "tracing-subscriber 0.3.23", + "web-time", +] + +[[package]] +name = "tracing-serde" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704b1aeb7be0d0a84fc9828cae51dab5970fee5088f83d1dd7ee6f6246fc6ff1" +dependencies = [ + "serde", + "tracing-core", +] + [[package]] name = "tracing-subscriber" version = "0.2.25" @@ -8372,6 +8680,24 @@ dependencies = [ "tracing-core", ] +[[package]] +name = "tracing-subscriber" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex-automata", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + [[package]] name = "triomphe" version = "0.1.15" diff --git a/Cargo.toml b/Cargo.toml index 23be2e7b..03189dcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "81192877116cbc3eedf6688b85fab6dd0e448290" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", diff --git a/bedrock/cfgsync.yaml b/bedrock/cfgsync.yaml index 6d0d9fe6..9512e4d2 100644 --- a/bedrock/cfgsync.yaml +++ b/bedrock/cfgsync.yaml @@ -2,11 +2,22 @@ port: 4400 n_hosts: 1 timeout: 10 +faucet_settings: + enabled: false + +deployment_settings_storage_path: deployment-settings.yaml + +entropy_file: /etc/logos-blockchain/test_entropy + +mode: Setup + # Tracing tracing_settings: - logger: Stdout + logger: + stdout: true + stderr: true tracing: None filter: None metrics: None console: None - level: DEBUG + level: Debug diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 1749437b..efdf399e 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -1,14 +1,15 @@ services: cfgsync: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:80755855c70aea11bc58fda01048e9bae3a806253a9a8c0641d2f4738008fbbe volumes: - ./scripts:/etc/logos-blockchain/scripts - ./cfgsync.yaml:/etc/logos-blockchain/cfgsync.yaml:z + - ./test_entropy:/etc/logos-blockchain/test_entropy:z entrypoint: /etc/logos-blockchain/scripts/run_cfgsync.sh logos-blockchain-node-0: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:80755855c70aea11bc58fda01048e9bae3a806253a9a8c0641d2f4738008fbbe ports: - "${PORT:-8080}:18080/tcp" volumes: diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index b91ba4b4..37af2e04 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -9,5 +9,12 @@ export CFG_FILE_PATH="/config.yaml" \ LOG_LEVEL="DEBUG" \ POL_PROOF_DEV_MODE=true -/usr/bin/logos-blockchain-cfgsync-client && \ - exec /usr/bin/logos-blockchain-node /config.yaml +/usr/bin/logos-blockchain-cfgsync-client + +# Download deployment settings generated by cfgsync +curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml + +# Force storage_gas_price to 0 so altruistic inscription txs are accepted +sed -i 's/storage_gas_price: [0-9]*/storage_gas_price: 0/' /deployment-settings.yaml + +exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml diff --git a/bedrock/test_entropy b/bedrock/test_entropy new file mode 100644 index 00000000..314128ee --- /dev/null +++ b/bedrock/test_entropy @@ -0,0 +1 @@ +deterministic-lez-test-entropy-seed-do-not-use-in-production \ No newline at end of file diff --git a/sequencer/core/src/block_settlement_client.rs b/sequencer/core/src/block_settlement_client.rs index 2f036b98..6b32f8de 100644 --- a/sequencer/core/src/block_settlement_client.rs +++ b/sequencer/core/src/block_settlement_client.rs @@ -3,7 +3,7 @@ use bedrock_client::BedrockClient; pub use common::block::Block; pub use logos_blockchain_core::mantle::{MantleTx, SignedMantleTx, ops::channel::MsgId}; use logos_blockchain_core::mantle::{ - Op, OpProof, Transaction as _, TxHash, ledger, + Op, OpProof, Transaction as _, ops::channel::{ChannelId, inscribe::InscriptionOp}, }; pub use logos_blockchain_key_management_system_service::keys::Ed25519Key; @@ -45,14 +45,11 @@ pub trait BlockSettlementClientTrait: Clone { }; let inscribe_op_id = inscribe_op.id(); - let ledger_tx = ledger::Tx::new(vec![], vec![]); - let inscribe_tx = MantleTx { ops: vec![Op::ChannelInscribe(inscribe_op)], - ledger_tx, // Altruistic test config - storage_gas_price: 0, - execution_gas_price: 0, + storage_gas_price: 0.into(), + execution_gas_price: 0.into(), }; let tx_hash = inscribe_tx.hash(); @@ -67,7 +64,6 @@ pub trait BlockSettlementClientTrait: Clone { let signed_mantle_tx = SignedMantleTx { ops_proofs: vec![OpProof::Ed25519Sig(signature)], - ledger_tx_proof: empty_ledger_signature(&tx_hash), mantle_tx: inscribe_tx, }; Ok((signed_mantle_tx, inscribe_op_id)) @@ -118,10 +114,3 @@ impl BlockSettlementClientTrait for BlockSettlementClient { &self.signing_key } } - -fn empty_ledger_signature( - tx_hash: &TxHash, -) -> logos_blockchain_key_management_system_service::keys::ZkSignature { - logos_blockchain_key_management_system_service::keys::ZkKey::multi_sign(&[], tx_hash.as_ref()) - .expect("multi-sign with empty key set works") -} From b7ba2daa975bb5addbb383fb37fae389a1c1cdfd Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 13:18:54 +0200 Subject: [PATCH 11/19] use newer image --- Cargo.lock | 63 ++++++++++---------- Cargo.toml | 10 ++-- bedrock/docker-compose.yml | 4 +- bedrock/scripts/run_logos_blockchain_node.sh | 3 - 4 files changed, 39 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15da4cd8..2a9d8df4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4399,7 +4399,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-blend-crypto" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -4413,7 +4413,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "blake2", "derivative", @@ -4436,7 +4436,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -4449,12 +4449,13 @@ dependencies = [ "num-bigint 0.4.6", "serde", "thiserror 1.0.69", + "zeroize", ] [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "derivative", @@ -4470,7 +4471,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "bytes", @@ -4501,7 +4502,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -4510,7 +4511,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "dirs", ] @@ -4518,7 +4519,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "futures", "hex", @@ -4538,7 +4539,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -4568,7 +4569,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "cfg_eval", "logos-blockchain-pol", @@ -4584,7 +4585,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "bytes", "futures", @@ -4601,7 +4602,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -4619,7 +4620,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "axum 0.7.9", "logos-blockchain-core", @@ -4634,7 +4635,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "bytes", @@ -4660,7 +4661,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "proc-macro2", "quote", @@ -4670,7 +4671,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -4686,7 +4687,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "log", @@ -4703,7 +4704,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -4728,7 +4729,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "futures", @@ -4745,7 +4746,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4761,7 +4762,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "astro-float", "logos-blockchain-circuits-prover", @@ -4780,7 +4781,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4797,7 +4798,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4808,7 +4809,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "futures", @@ -4823,7 +4824,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "bytes", @@ -4841,7 +4842,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "futures", @@ -4860,7 +4861,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "opentelemetry", "opentelemetry-appender-tracing", @@ -4883,7 +4884,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "async-trait", "blake2", @@ -4900,7 +4901,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4914,7 +4915,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "tempfile", ] @@ -4922,7 +4923,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.2.1" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36#ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=44c9513a1525372b725ba1010169d04ab00768b5#44c9513a1525372b725ba1010169d04ab00768b5" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", diff --git a/Cargo.toml b/Cargo.toml index 03189dcd..45b52b2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,11 +120,11 @@ tokio-retry = "0.3.0" schemars = "1.2" async-stream = "0.3.6" -logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } -logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } -logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } -logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } -logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "ea9d6fbfea8d9cc94db7e83b9aade818e4a3cf36" } +logos-blockchain-common-http-client = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } +logos-blockchain-key-management-system-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } +logos-blockchain-core = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } +logos-blockchain-chain-broadcast-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } +logos-blockchain-chain-service = { git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "44c9513a1525372b725ba1010169d04ab00768b5" } rocksdb = { version = "0.24.0", default-features = false, features = [ "snappy", diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index efdf399e..ce231530 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -1,7 +1,7 @@ services: cfgsync: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:80755855c70aea11bc58fda01048e9bae3a806253a9a8c0641d2f4738008fbbe + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:093d0319a366a5b7b7db1a29fd54510dea37336f24accbda6d5d1b94d15fb64b volumes: - ./scripts:/etc/logos-blockchain/scripts - ./cfgsync.yaml:/etc/logos-blockchain/cfgsync.yaml:z @@ -9,7 +9,7 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_cfgsync.sh logos-blockchain-node-0: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:80755855c70aea11bc58fda01048e9bae3a806253a9a8c0641d2f4738008fbbe + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:093d0319a366a5b7b7db1a29fd54510dea37336f24accbda6d5d1b94d15fb64b ports: - "${PORT:-8080}:18080/tcp" volumes: diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index 37af2e04..c79e1b5d 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -14,7 +14,4 @@ export CFG_FILE_PATH="/config.yaml" \ # Download deployment settings generated by cfgsync curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml -# Force storage_gas_price to 0 so altruistic inscription txs are accepted -sed -i 's/storage_gas_price: [0-9]*/storage_gas_price: 0/' /deployment-settings.yaml - exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml From 0eb389b62ce922d7bd3f2ea58e2cea6e45c090fb Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 13:51:53 +0200 Subject: [PATCH 12/19] increase timeout --- integration_tests/tests/indexer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_tests/tests/indexer.rs b/integration_tests/tests/indexer.rs index 147cadec..1932e0fe 100644 --- a/integration_tests/tests/indexer.rs +++ b/integration_tests/tests/indexer.rs @@ -18,7 +18,7 @@ use tokio::test; use wallet::cli::{Command, programs::native_token_transfer::AuthTransferSubcommand}; /// Timeout in milliseconds to reliably await for block finalization. -const L2_TO_L1_TIMEOUT_MILLIS: u64 = 600_000; +const L2_TO_L1_TIMEOUT_MILLIS: u64 = 900_000; #[test] async fn indexer_test_run() -> Result<()> { From a8202603b6f3ef021479b04936dd7ba3575a04c8 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 14:29:36 +0200 Subject: [PATCH 13/19] reduce coefficient --- bedrock/scripts/run_logos_blockchain_node.sh | 5 ++ integration_tests/tests/indexer.rs | 53 ++++++++++++-------- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index c79e1b5d..ce2dd922 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -14,4 +14,9 @@ export CFG_FILE_PATH="/config.yaml" \ # Download deployment settings generated by cfgsync curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml +# Single-node test setup: bump slot_activation_coeff from 1/10 to 1/2 so blocks +# (and LIB) advance ~5x faster, keeping the indexer integration test within budget. +# Safe with 1 node since there are no reorgs. +sed -i '/slot_activation_coeff:/{n;n;s/denominator: 10/denominator: 2/}' /deployment-settings.yaml + exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml diff --git a/integration_tests/tests/indexer.rs b/integration_tests/tests/indexer.rs index 1932e0fe..aab03171 100644 --- a/integration_tests/tests/indexer.rs +++ b/integration_tests/tests/indexer.rs @@ -17,27 +17,46 @@ use nssa::AccountId; use tokio::test; use wallet::cli::{Command, programs::native_token_transfer::AuthTransferSubcommand}; -/// Timeout in milliseconds to reliably await for block finalization. +/// Maximum time to wait for the indexer to catch up to the sequencer. const L2_TO_L1_TIMEOUT_MILLIS: u64 = 900_000; +/// Poll the indexer until its last finalized block id reaches the sequencer's +/// current last block id (and at least the genesis block has been advanced past), +/// or until [`L2_TO_L1_TIMEOUT_MILLIS`] elapses. Returns the last indexer block +/// id observed. +async fn wait_for_indexer_to_catch_up(ctx: &TestContext) -> u64 { + let deadline = tokio::time::Instant::now() + Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS); + loop { + let seq = sequencer_service_rpc::RpcClient::get_last_block_id(ctx.sequencer_client()) + .await + .unwrap_or(0); + let ind = ctx + .indexer_client() + .get_last_finalized_block_id() + .await + .unwrap_or(1); + if ind >= seq && ind > 1 { + info!("Indexer caught up: seq={seq}, ind={ind}"); + return ind; + } + if tokio::time::Instant::now() >= deadline { + info!("Indexer catch-up timed out: seq={seq}, ind={ind}"); + return ind; + } + tokio::time::sleep(Duration::from_secs(2)).await; + } +} + #[test] async fn indexer_test_run() -> Result<()> { let ctx = TestContext::new().await?; - // RUN OBSERVATION - tokio::time::sleep(std::time::Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS)).await; + let last_block_indexer = wait_for_indexer_to_catch_up(&ctx).await; let last_block_seq = sequencer_service_rpc::RpcClient::get_last_block_id(ctx.sequencer_client()).await?; info!("Last block on seq now is {last_block_seq}"); - - let last_block_indexer = ctx - .indexer_client() - .get_last_finalized_block_id() - .await - .unwrap(); - info!("Last block on ind now is {last_block_indexer}"); assert!(last_block_indexer > 1); @@ -49,15 +68,8 @@ async fn indexer_test_run() -> Result<()> { async fn indexer_block_batching() -> Result<()> { let ctx = TestContext::new().await?; - // WAIT info!("Waiting for indexer to parse blocks"); - tokio::time::sleep(std::time::Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS)).await; - - let last_block_indexer = ctx - .indexer_client() - .get_last_finalized_block_id() - .await - .unwrap(); + let last_block_indexer = wait_for_indexer_to_catch_up(&ctx).await; info!("Last block on ind now is {last_block_indexer}"); @@ -152,9 +164,8 @@ async fn indexer_state_consistency() -> Result<()> { info!("Successfully transferred privately to owned account"); - // WAIT info!("Waiting for indexer to parse blocks"); - tokio::time::sleep(std::time::Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS)).await; + wait_for_indexer_to_catch_up(&ctx).await; let acc1_ind_state = ctx .indexer_client() @@ -240,7 +251,7 @@ async fn indexer_state_consistency_with_labels() -> Result<()> { assert_eq!(acc_2_balance, 20100); info!("Waiting for indexer to parse blocks"); - tokio::time::sleep(std::time::Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS)).await; + wait_for_indexer_to_catch_up(&ctx).await; let acc1_ind_state = ctx .indexer_client() From e6ad1d3eeabe126b05117c5538fae73fb64a19e6 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 14:35:51 +0200 Subject: [PATCH 14/19] resubmit interval --- integration_tests/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration_tests/src/config.rs b/integration_tests/src/config.rs index 1dd726eb..c4718f71 100644 --- a/integration_tests/src/config.rs +++ b/integration_tests/src/config.rs @@ -211,7 +211,7 @@ pub fn sequencer_config( max_block_size, mempool_max_size, block_create_timeout, - retry_pending_blocks_timeout: Duration::from_mins(2), + retry_pending_blocks_timeout: Duration::from_secs(5), initial_public_accounts: Some(initial_data.sequencer_initial_public_accounts()), initial_private_accounts: Some(initial_data.sequencer_initial_private_accounts()), signing_key: [37; 32], From 35b7712b12d848b319886cfaa95211f2f7bc5216 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 15:04:15 +0200 Subject: [PATCH 15/19] debugging --- .github/workflows/ci.yml | 14 +++++++--- integration_tests/tests/indexer.rs | 41 +++++++++++++++++------------- 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1fbb2a3..0fb307ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -213,13 +213,19 @@ jobs: if: failure() run: | kill "$(cat /tmp/log-watcher.pid)" 2>/dev/null || true + # Filter out noisy gossipsub/overwatch lines that bloat the log without helping debug. + NOISE='gossipsub|libp2p_gossipsub|overwatch::overwatch::(handle|runner)|services::state::handle' for f in /tmp/container-logs/*.log; do [ -e "$f" ] || continue echo "=== $f (lines: $(wc -l < $f)) ===" - echo "--- proposed-block events with removals ---" - grep -B 200 -A 5 -E '\([1-9][0-9]* removed\)' "$f" | tail -3000 || true - echo "--- mempool/tx/inscribe activity ---" - grep -i -E 'mempool|inscrib|verif|reject|invalid|gas|validate|removed' "$f" | tail -1000 || true + echo "--- proposed-block events with removals (denoised) ---" + grep -v -E "$NOISE" "$f" \ + | grep -B 200 -A 5 -E '\([1-9][0-9]* removed\)' \ + | tail -3000 || true + echo "--- mempool/tx/inscribe activity (denoised) ---" + grep -v -E "$NOISE" "$f" \ + | grep -i -E 'mempool|inscrib|verif|reject|invalid|gas|validate|removed' \ + | tail -1000 || true done valid-proof-test: diff --git a/integration_tests/tests/indexer.rs b/integration_tests/tests/indexer.rs index aab03171..9f520676 100644 --- a/integration_tests/tests/indexer.rs +++ b/integration_tests/tests/indexer.rs @@ -25,25 +25,32 @@ const L2_TO_L1_TIMEOUT_MILLIS: u64 = 900_000; /// or until [`L2_TO_L1_TIMEOUT_MILLIS`] elapses. Returns the last indexer block /// id observed. async fn wait_for_indexer_to_catch_up(ctx: &TestContext) -> u64 { - let deadline = tokio::time::Instant::now() + Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS); - loop { - let seq = sequencer_service_rpc::RpcClient::get_last_block_id(ctx.sequencer_client()) - .await - .unwrap_or(0); - let ind = ctx - .indexer_client() - .get_last_finalized_block_id() - .await - .unwrap_or(1); - if ind >= seq && ind > 1 { - info!("Indexer caught up: seq={seq}, ind={ind}"); - return ind; + let timeout = Duration::from_millis(L2_TO_L1_TIMEOUT_MILLIS); + let mut last_ind: u64 = 1; + let inner = async { + loop { + let seq = sequencer_service_rpc::RpcClient::get_last_block_id(ctx.sequencer_client()) + .await + .unwrap_or(0); + let ind = ctx + .indexer_client() + .get_last_finalized_block_id() + .await + .unwrap_or(1); + last_ind = ind; + if ind >= seq && ind > 1 { + info!("Indexer caught up: seq={seq}, ind={ind}"); + return ind; + } + tokio::time::sleep(Duration::from_secs(2)).await; } - if tokio::time::Instant::now() >= deadline { - info!("Indexer catch-up timed out: seq={seq}, ind={ind}"); - return ind; + }; + match tokio::time::timeout(timeout, inner).await { + Ok(ind) => ind, + Err(_) => { + info!("Indexer catch-up timed out: ind={last_ind}"); + last_ind } - tokio::time::sleep(Duration::from_secs(2)).await; } } From d96e7aed68ba2d0d6774504ec4ba60bf8468ba9a Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 15:45:54 +0200 Subject: [PATCH 16/19] debug --- bedrock/scripts/run_logos_blockchain_node.sh | 16 +++++++++++++++- integration_tests/tests/indexer.rs | 9 ++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index ce2dd922..c619b86b 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -17,6 +17,20 @@ curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml # Single-node test setup: bump slot_activation_coeff from 1/10 to 1/2 so blocks # (and LIB) advance ~5x faster, keeping the indexer integration test within budget. # Safe with 1 node since there are no reorgs. -sed -i '/slot_activation_coeff:/{n;n;s/denominator: 10/denominator: 2/}' /deployment-settings.yaml +# Range-based sed: within the 4 lines after `slot_activation_coeff:`, rewrite any +# `denominator: ` to `denominator: 2` regardless of field order or spacing. +sed -i '/slot_activation_coeff:/,+4 s/denominator: [0-9]\+/denominator: 2/' /deployment-settings.yaml + +# Lower security_param so finalization (LIB) lag is shorter — the indexer only +# sees finalized blocks, so a smaller security_param makes inscriptions visible +# to the indexer much sooner. +sed -i 's/security_param: [0-9]\+/security_param: 10/' /deployment-settings.yaml + +# Verify the patches took effect (printed to container stdout for debugging). +echo "=== slot_activation_coeff after sed ===" +sed -n '/slot_activation_coeff:/,+4 p' /deployment-settings.yaml +echo "=== security_param after sed ===" +grep 'security_param' /deployment-settings.yaml +echo "=======================================" exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml diff --git a/integration_tests/tests/indexer.rs b/integration_tests/tests/indexer.rs index 9f520676..c0b92a90 100644 --- a/integration_tests/tests/indexer.rs +++ b/integration_tests/tests/indexer.rs @@ -45,13 +45,12 @@ async fn wait_for_indexer_to_catch_up(ctx: &TestContext) -> u64 { tokio::time::sleep(Duration::from_secs(2)).await; } }; - match tokio::time::timeout(timeout, inner).await { - Ok(ind) => ind, - Err(_) => { + tokio::time::timeout(timeout, inner) + .await + .unwrap_or_else(|_| { info!("Indexer catch-up timed out: ind={last_ind}"); last_ind - } - } + }) } #[test] From 427e1cea45e33a1c48f0e31b9a88061122e7e18c Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 17:10:40 +0200 Subject: [PATCH 17/19] debug --- bedrock/scripts/run_logos_blockchain_node.sh | 2 +- integration_tests/tests/indexer.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index c619b86b..94486ad6 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -6,7 +6,7 @@ export CFG_FILE_PATH="/config.yaml" \ CFG_SERVER_ADDR="http://cfgsync:4400" \ CFG_HOST_IP=$(hostname -i) \ CFG_HOST_IDENTIFIER="validator-$(hostname -i)" \ - LOG_LEVEL="DEBUG" \ + LOG_LEVEL="INFO" \ POL_PROOF_DEV_MODE=true /usr/bin/logos-blockchain-cfgsync-client diff --git a/integration_tests/tests/indexer.rs b/integration_tests/tests/indexer.rs index c0b92a90..0aef4a42 100644 --- a/integration_tests/tests/indexer.rs +++ b/integration_tests/tests/indexer.rs @@ -18,7 +18,7 @@ use tokio::test; use wallet::cli::{Command, programs::native_token_transfer::AuthTransferSubcommand}; /// Maximum time to wait for the indexer to catch up to the sequencer. -const L2_TO_L1_TIMEOUT_MILLIS: u64 = 900_000; +const L2_TO_L1_TIMEOUT_MILLIS: u64 = 180_000; /// Poll the indexer until its last finalized block id reaches the sequencer's /// current last block id (and at least the genesis block has been advanced past), From 7266433d5192e57ad1068231b46bf9c4f2f93692 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 18:07:04 +0200 Subject: [PATCH 18/19] debug --- indexer/core/src/lib.rs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/indexer/core/src/lib.rs b/indexer/core/src/lib.rs index e68e97c0..4de92e51 100644 --- a/indexer/core/src/lib.rs +++ b/indexer/core/src/lib.rs @@ -143,7 +143,22 @@ impl IndexerCore { info!("Parsed {} L2 blocks with ids {:?}", l2_block_vec.len(), l2_blocks_parsed_ids); for l2_block in l2_block_vec { - self.store.put_block(l2_block.clone(), l1_header).await?; + // TODO: proper fix is to make the sequencer's genesis include a + // trailing `clock_invocation(0)` (and have the indexer's + // `open_db_with_genesis` not pre-apply state transitions) so the + // inscribed genesis can flow through `put_block` like any other + // block. For now we skip re-applying it. + // + // The channel-start (block_id == 1) is the sequencer's genesis + // inscription that we re-discover during initial search. The + // indexer already has its own locally-constructed genesis in + // the store from `open_db_with_genesis`, so re-applying the + // inscribed copy is both redundant and would fail the strict + // block validation in `put_block` (the inscribed genesis lacks + // the trailing clock invocation). + if l2_block.header.block_id != 1 { + self.store.put_block(l2_block.clone(), l1_header).await?; + } yield Ok(l2_block); } From 9dc5c32354b05c45c22ec92eb4cc4fe72f795882 Mon Sep 17 00:00:00 2001 From: Petar Radovic Date: Thu, 9 Apr 2026 19:43:33 +0200 Subject: [PATCH 19/19] clear debug stuff --- .github/workflows/ci.yml | 40 -------------------- bedrock/scripts/run_logos_blockchain_node.sh | 7 ---- 2 files changed, 47 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0fb307ce..bbfa53b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,52 +182,12 @@ jobs: - name: Install nextest run: cargo install --locked cargo-nextest - - name: Start container log capture - run: | - mkdir -p /tmp/container-logs - ( - seen="" - while true; do - for c in $(docker ps -q 2>/dev/null); do - case " $seen " in - *" $c "*) ;; - *) - name=$(docker inspect -f '{{.Name}}' "$c" 2>/dev/null | sed 's|^/||') - docker logs -f "$c" >"/tmp/container-logs/${name}.log" 2>&1 & - seen="$seen $c" - ;; - esac - done - sleep 1 - done - ) & - echo $! > /tmp/log-watcher.pid - - name: Run tests env: RISC0_DEV_MODE: "1" RUST_LOG: "info" run: cargo nextest run -p integration_tests indexer -- --skip tps_test - - name: Dump captured container logs on failure - if: failure() - run: | - kill "$(cat /tmp/log-watcher.pid)" 2>/dev/null || true - # Filter out noisy gossipsub/overwatch lines that bloat the log without helping debug. - NOISE='gossipsub|libp2p_gossipsub|overwatch::overwatch::(handle|runner)|services::state::handle' - for f in /tmp/container-logs/*.log; do - [ -e "$f" ] || continue - echo "=== $f (lines: $(wc -l < $f)) ===" - echo "--- proposed-block events with removals (denoised) ---" - grep -v -E "$NOISE" "$f" \ - | grep -B 200 -A 5 -E '\([1-9][0-9]* removed\)' \ - | tail -3000 || true - echo "--- mempool/tx/inscribe activity (denoised) ---" - grep -v -E "$NOISE" "$f" \ - | grep -i -E 'mempool|inscrib|verif|reject|invalid|gas|validate|removed' \ - | tail -1000 || true - done - valid-proof-test: runs-on: ubuntu-latest timeout-minutes: 60 diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index 94486ad6..1d326f22 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -26,11 +26,4 @@ sed -i '/slot_activation_coeff:/,+4 s/denominator: [0-9]\+/denominator: 2/' /dep # to the indexer much sooner. sed -i 's/security_param: [0-9]\+/security_param: 10/' /deployment-settings.yaml -# Verify the patches took effect (printed to container stdout for debugging). -echo "=== slot_activation_coeff after sed ===" -sed -n '/slot_activation_coeff:/,+4 p' /deployment-settings.yaml -echo "=== security_param after sed ===" -grep 'security_param' /deployment-settings.yaml -echo "=======================================" - exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml