From c80c3fd2e3622575ad7fdc67dbc1f0c50607264a Mon Sep 17 00:00:00 2001 From: Hansie Odendaal <39146854+hansieodendaal@users.noreply.github.com> Date: Mon, 9 Feb 2026 10:28:15 +0200 Subject: [PATCH] chore: config and naming updates (#27) * Update config and crate naming - Updated configs to the lates main repo configs. - Updated all main repo crate namings to be same as the main repo. - Added `create_dir_all` to `pub(crate) fn create_tempdir(custom_work_dir: Option) -> std::io::Result {`. - Wired in optional `persist_dir` when using the local deployer. - Update `time` vulnerability **Note:** Unsure about the `service_params` mapping in `pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeploymentSettings {` --- Cargo.lock | 224 +++++------------- Cargo.toml | 62 ++--- book/src/environment-variables.md | 14 +- book/src/logging-observability.md | 18 +- testing-framework/configs/Cargo.toml | 53 +++-- testing-framework/configs/src/lib.rs | 16 +- testing-framework/configs/src/nodes/blend.rs | 16 +- testing-framework/configs/src/nodes/common.rs | 75 +++--- testing-framework/configs/src/nodes/kms.rs | 4 +- testing-framework/configs/src/nodes/node.rs | 12 +- .../configs/src/topology/configs/api.rs | 2 +- .../configs/src/topology/configs/blend.rs | 8 +- .../configs/src/topology/configs/consensus.rs | 38 +-- .../src/topology/configs/deployment.rs | 8 +- .../configs/src/topology/configs/mod.rs | 10 +- .../configs/src/topology/configs/network.rs | 12 +- .../configs/src/topology/configs/runtime.rs | 4 +- .../configs/src/topology/configs/tracing.rs | 10 +- .../configs/src/topology/configs/wallet.rs | 2 +- testing-framework/core/Cargo.toml | 58 ++--- .../core/src/nodes/api_client.rs | 12 +- .../core/src/nodes/common/config/injection.rs | 2 +- .../core/src/nodes/common/lifecycle/spawn.rs | 2 +- .../core/src/nodes/common/node.rs | 2 +- testing-framework/core/src/nodes/mod.rs | 11 +- testing-framework/core/src/nodes/node.rs | 4 +- .../core/src/scenario/capabilities.rs | 2 +- .../core/src/scenario/cfgsync.rs | 4 +- .../core/src/scenario/definition.rs | 18 +- .../core/src/scenario/http_probe.rs | 2 +- .../core/src/scenario/runtime/block_feed.rs | 6 +- testing-framework/core/src/topology/config.rs | 35 +-- .../core/src/topology/readiness/network.rs | 8 +- testing-framework/core/src/topology/utils.rs | 10 +- .../deployers/compose/Cargo.toml | 14 +- .../deployers/compose/src/deployer/mod.rs | 10 +- .../deployers/compose/src/descriptor/mod.rs | 2 +- .../compose/src/infrastructure/cfgsync.rs | 4 +- testing-framework/deployers/k8s/Cargo.toml | 4 +- .../k8s/src/infrastructure/assets.rs | 4 +- testing-framework/deployers/local/Cargo.toml | 8 +- .../deployers/local/src/manual/readiness.rs | 2 +- .../local/src/node_control/config.rs | 4 +- .../deployers/local/src/node_control/mod.rs | 2 +- testing-framework/env/src/lib.rs | 2 +- testing-framework/tools/cfgsync_tf/Cargo.toml | 46 ++-- .../cfgsync_tf/src/bin/cfgsync-client.rs | 2 +- .../tools/cfgsync_tf/src/config/builder.rs | 8 +- .../tools/cfgsync_tf/src/config/kms.rs | 4 +- .../tools/cfgsync_tf/src/config/providers.rs | 4 +- .../tools/cfgsync_tf/src/config/tracing.rs | 2 +- .../tools/cfgsync_tf/src/network/address.rs | 2 +- .../tools/cfgsync_tf/src/network/peers.rs | 2 +- .../tools/cfgsync_tf/src/repo.rs | 2 +- .../tools/cfgsync_tf/src/server.rs | 4 +- testing-framework/workflows/Cargo.toml | 21 +- .../src/expectations/consensus_liveness.rs | 2 +- testing-framework/workflows/src/util/tx.rs | 4 +- .../src/workloads/transaction/expectation.rs | 4 +- .../src/workloads/transaction/workload.rs | 4 +- .../workflows/src/workloads/util.rs | 2 +- versions.env | 2 +- 62 files changed, 435 insertions(+), 500 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f62babc..9e534cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -601,7 +601,6 @@ dependencies = [ "tower 0.5.3", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -622,7 +621,6 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -1218,19 +1216,6 @@ dependencies = [ "syn 2.0.114", ] -[[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" @@ -1685,16 +1670,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 = "futures" version = "0.3.31" @@ -1919,26 +1894,6 @@ dependencies = [ "wasm-bindgen", ] -[[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" @@ -3389,12 +3344,13 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-api-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "bytes", "futures", "logos-blockchain-chain-broadcast-service", + "logos-blockchain-chain-leader-service", "logos-blockchain-chain-service", "logos-blockchain-core", "logos-blockchain-network-service", @@ -3415,7 +3371,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-blend-crypto", "logos-blockchain-blend-message", @@ -3427,7 +3383,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -3441,7 +3397,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "blake2", "derivative", @@ -3463,7 +3419,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-network" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "either", "futures", @@ -3481,7 +3437,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -3496,7 +3452,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-scheduling" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "derivative", @@ -3513,13 +3469,14 @@ dependencies = [ "thiserror 1.0.69", "tokio", "tokio-stream", + "tokio-util", "tracing", ] [[package]] name = "logos-blockchain-blend-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "fork_stream", @@ -3554,7 +3511,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "derivative", @@ -3570,7 +3527,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-leader-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -3598,7 +3555,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -3626,7 +3583,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "bytes", @@ -3656,7 +3613,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-core", "serde", @@ -3665,7 +3622,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -3674,7 +3631,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "dirs", ] @@ -3682,13 +3639,16 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" 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", @@ -3699,7 +3659,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -3729,7 +3689,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "cfg_eval", "logos-blockchain-utils", @@ -3744,7 +3704,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "bytes", "futures", @@ -3763,7 +3723,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -3781,22 +3741,20 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "axum", - "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-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "bytes", @@ -3821,7 +3779,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "proc-macro2", "quote", @@ -3831,7 +3789,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -3847,7 +3805,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "log", @@ -3863,7 +3821,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -3887,7 +3845,7 @@ dependencies = [ [[package]] name = "logos-blockchain-libp2p" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "backon", @@ -3916,7 +3874,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -3935,7 +3893,7 @@ dependencies = [ [[package]] name = "logos-blockchain-node" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "axum", @@ -3991,7 +3949,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4006,7 +3964,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4022,7 +3980,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4038,7 +3996,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4049,7 +4007,7 @@ dependencies = [ [[package]] name = "logos-blockchain-sdp-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -4065,7 +4023,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -4080,7 +4038,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "bytes", @@ -4098,7 +4056,7 @@ dependencies = [ [[package]] name = "logos-blockchain-system-sig-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-ctrlc", "async-trait", @@ -4109,7 +4067,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "cfg_eval", @@ -4131,7 +4089,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "opentelemetry", "opentelemetry-http", @@ -4154,7 +4112,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "logos-blockchain-tracing", @@ -4168,7 +4126,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tx-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "futures", @@ -4190,7 +4148,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "blake2", @@ -4207,7 +4165,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4221,7 +4179,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-core", "logos-blockchain-key-management-system-keys", @@ -4236,7 +4194,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "async-trait", "bytes", @@ -4261,7 +4219,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "tempfile", ] @@ -4269,7 +4227,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=2392190d88e8ae8271fa9321014ea33324be7c28#2392190d88e8ae8271fa9321014ea33324be7c28" +source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4644,12 +4602,6 @@ dependencies = [ "libc", ] -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - [[package]] name = "nom" version = "7.1.3" @@ -4669,18 +4621,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 = "nu-ansi-term" version = "0.50.3" @@ -5351,21 +5291,6 @@ dependencies = [ "prost", ] -[[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 = "quick-protobuf" version = "0.8.1" @@ -5527,15 +5452,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.10.0", -] - [[package]] name = "rcgen" version = "0.13.2" @@ -6262,15 +6178,6 @@ dependencies = [ "windows-sys 0.60.2", ] -[[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" @@ -6458,6 +6365,7 @@ dependencies = [ "hex", "logos-blockchain-api-service", "logos-blockchain-blend-service", + "logos-blockchain-chain-leader-service", "logos-blockchain-chain-network-service", "logos-blockchain-chain-service", "logos-blockchain-core", @@ -6597,7 +6505,6 @@ name = "testing-framework-workflows" version = "0.1.0" dependencies = [ "async-trait", - "logos-blockchain-chain-service", "logos-blockchain-core", "logos-blockchain-key-management-system-service", "rand 0.8.5", @@ -6660,9 +6567,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.46" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9da98b7d9b7dad93488a84b8248efc35352b0b2657397d4167e7ad67e5d535e5" +checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" dependencies = [ "deranged", "itoa", @@ -6681,9 +6588,9 @@ checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" [[package]] name = "time-macros" -version = "0.2.26" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc610bac2dcee56805c99642447d4c5dbde4d01f752ffea0199aee1f601dc4" +checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" dependencies = [ "num-conv", "time-core", @@ -6910,7 +6817,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -6982,22 +6888,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", - "forwarded-header-value", - "governor", - "http 1.4.0", - "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 e59709a..675f508 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,37 +40,37 @@ testing-framework-runner-local = { default-features = false, path = "testing-f testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" } # Logos git dependencies (pinned to latest master) -broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" } -chain-leader = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } -zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } +cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" } +lb-api-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-chain-broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-chain-leader-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-network-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-sdp-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-time-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-wallet-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } # External crates async-trait = { default-features = false, version = "0.1" } diff --git a/book/src/environment-variables.md b/book/src/environment-variables.md index bcfd7de..6896261 100644 --- a/book/src/environment-variables.md +++ b/book/src/environment-variables.md @@ -127,13 +127,13 @@ ls /tmp/test-logs/ **Common filter targets:** -| Target Prefix | Subsystem | -|---------------|-----------| -| `cryptarchia` | Consensus (Cryptarchia) | -| `nomos_blend` | Mix network/privacy layer | -| `chain_service` | Chain service (node APIs/state) | -| `chain_network` | P2P networking | -| `chain_leader` | Leader election | +| Target Prefix | Subsystem | +|---------------------------|-----------| +| `lb_cryptarchia` | Consensus (Cryptarchia) | +| `lb_blend` | Mix network/privacy layer | +| `lb_chain_service` | Chain service (node APIs/state) | +| `lb_chain_network` | P2P networking | +| `lb_chain_leader_service` | Leader election | --- diff --git a/book/src/logging-observability.md b/book/src/logging-observability.md index 9243874..eb0a3bd 100644 --- a/book/src/logging-observability.md +++ b/book/src/logging-observability.md @@ -45,7 +45,7 @@ See [Environment Variables Reference](environment-variables.md) for complete det LOGOS_BLOCKCHAIN_TESTS_TRACING=true \ LOGOS_BLOCKCHAIN_LOG_DIR=/tmp/test-logs \ LOGOS_BLOCKCHAIN_LOG_LEVEL=debug \ -LOGOS_BLOCKCHAIN_LOG_FILTER="cryptarchia=trace,chain_service=info,chain_network=info" \ +LOGOS_BLOCKCHAIN_LOG_FILTER="lb_cryptarchia=trace,lb_chain_service=info,lb_chain_network=info" \ cargo run -p runner-examples --bin local_runner ``` @@ -66,18 +66,18 @@ When `LOGOS_BLOCKCHAIN_LOG_DIR` is set, each node writes logs to separate files: Common target prefixes for `LOGOS_BLOCKCHAIN_LOG_FILTER`: -| Target Prefix | Subsystem | -|---------------|-----------| -| `cryptarchia` | Consensus (Cryptarchia) | -| `nomos_blend` | Mix network/privacy layer | -| `chain_service` | Chain service (node APIs/state) | -| `chain_network` | P2P networking | -| `chain_leader` | Leader election | +| Target Prefix | Subsystem | +|---------------------------|-----------| +| `lb_cryptarchia` | Consensus (Cryptarchia) | +| `lb_blend` | Mix network/privacy layer | +| `lb_chain_service` | Chain service (node APIs/state) | +| `lb_chain_network` | P2P networking | +| `lb_chain_leader_service` | Leader election | **Example filter:** ```bash -LOGOS_BLOCKCHAIN_LOG_FILTER="cryptarchia=trace,chain_service=info,chain_network=info" +LOGOS_BLOCKCHAIN_LOG_FILTER="lb_cryptarchia=trace,lb_chain_service=info,lb_chain_network=info" ``` --- diff --git a/testing-framework/configs/Cargo.toml b/testing-framework/configs/Cargo.toml index 5030d6d..993fea9 100644 --- a/testing-framework/configs/Cargo.toml +++ b/testing-framework/configs/Cargo.toml @@ -10,32 +10,33 @@ repository.workspace = true version = "0.1.0" [dependencies] -chain-network = { workspace = true } -chain-service = { workspace = true } -cryptarchia-engine = { features = ["serde"], workspace = true } -cryptarchia-sync = { workspace = true } -groth16 = { workspace = true } -hex = { default-features = false, version = "0.4.3" } -key-management-system-service = { workspace = true } -nomos-api = { workspace = true } -nomos-blend-service = { features = ["libp2p"], workspace = true } -nomos-core = { workspace = true } -nomos-ledger = { features = ["serde"], workspace = true } -nomos-libp2p = { workspace = true } -nomos-node = { default-features = false, features = ["testing"], workspace = true } -nomos-sdp = { workspace = true } -nomos-time = { workspace = true } -nomos-tracing = { workspace = true } -nomos-tracing-service = { workspace = true } -nomos-utils = { workspace = true } -nomos-wallet = { workspace = true } -num-bigint = { default-features = false, version = "0.4" } -rand = { workspace = true } -serde = { features = ["derive"], workspace = true } -testing-framework-env = { workspace = true } -thiserror = { workspace = true } -time = { default-features = true, version = "0.3" } -tracing = { workspace = true } +hex = { default-features = false, version = "0.4.3" } +lb-api-service = { workspace = true } +lb-blend-service = { features = ["libp2p"], workspace = true } +lb-chain-leader-service = { workspace = true } +lb-chain-network = { workspace = true } +lb-chain-service = { workspace = true } +lb-core = { workspace = true } +lb-cryptarchia-engine = { features = ["serde"], workspace = true } +lb-cryptarchia-sync = { workspace = true } +lb-groth16 = { workspace = true } +lb-key-management-system-service = { workspace = true } +lb-ledger = { features = ["serde"], workspace = true } +lb-libp2p = { workspace = true } +lb-node = { default-features = false, features = ["testing"], workspace = true } +lb-sdp-service = { workspace = true } +lb-time-service = { workspace = true } +lb-tracing = { workspace = true } +lb-tracing-service = { workspace = true } +lb-utils = { workspace = true } +lb-wallet-service = { workspace = true } +num-bigint = { default-features = false, version = "0.4" } +rand = { workspace = true } +serde = { features = ["derive"], workspace = true } +testing-framework-env = { workspace = true } +thiserror = { workspace = true } +time = { default-features = true, version = "0.3" } +tracing = { workspace = true } [lints] workspace = true diff --git a/testing-framework/configs/src/lib.rs b/testing-framework/configs/src/lib.rs index 0cc15c3..f2002a2 100644 --- a/testing-framework/configs/src/lib.rs +++ b/testing-framework/configs/src/lib.rs @@ -1,7 +1,7 @@ use std::{net::Ipv4Addr, ops::Mul as _, sync::LazyLock, time::Duration}; -use nomos_core::sdp::ProviderId; -use nomos_libp2p::{Multiaddr, PeerId, multiaddr}; +use lb_core::sdp::ProviderId; +use lb_libp2p::{Multiaddr, PeerId, multiaddr}; use testing_framework_env as tf_env; pub mod constants; @@ -31,17 +31,13 @@ pub fn node_address_from_port(port: u16) -> Multiaddr { } #[must_use] -pub fn secret_key_to_peer_id(node_key: nomos_libp2p::ed25519::SecretKey) -> PeerId { - PeerId::from_public_key( - &nomos_libp2p::ed25519::Keypair::from(node_key) - .public() - .into(), - ) +pub fn secret_key_to_peer_id(node_key: lb_libp2p::ed25519::SecretKey) -> PeerId { + PeerId::from_public_key(&lb_libp2p::ed25519::Keypair::from(node_key).public().into()) } #[must_use] -pub fn secret_key_to_provider_id(node_key: nomos_libp2p::ed25519::SecretKey) -> ProviderId { - let bytes = nomos_libp2p::ed25519::Keypair::from(node_key) +pub fn secret_key_to_provider_id(node_key: lb_libp2p::ed25519::SecretKey) -> ProviderId { + let bytes = lb_libp2p::ed25519::Keypair::from(node_key) .public() .to_bytes(); match ProviderId::try_from(bytes) { diff --git a/testing-framework/configs/src/nodes/blend.rs b/testing-framework/configs/src/nodes/blend.rs index 1f8dbd8..44f4775 100644 --- a/testing-framework/configs/src/nodes/blend.rs +++ b/testing-framework/configs/src/nodes/blend.rs @@ -1,19 +1,19 @@ use std::{num::NonZeroU64, path::PathBuf, time::Duration}; use blend_serde::Config as BlendUserConfig; -use key_management_system_service::keys::Key; -use nomos_blend_service::{ +use lb_blend_service::{ core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings, ZkSettings}, settings::TimingSettings, }; -use nomos_node::config::{ +use lb_key_management_system_service::keys::Key; +use lb_node::config::{ blend::{ deployment::{self as blend_deployment, Settings as BlendDeploymentSettings}, serde as blend_serde, }, network::deployment::Settings as NetworkDeploymentSettings, }; -use nomos_utils::math::NonNegativeF64; +use lb_utils::math::NonNegativeF64; use crate::{ nodes::kms::key_id_for_preload_backend, @@ -33,6 +33,7 @@ const SAFETY_BUFFER_INTERVALS: u64 = 100; const MESSAGE_FREQUENCY_PER_ROUND: f64 = 1.0; const MAX_RELEASE_DELAY_ROUNDS: u64 = 3; const DATA_REPLICATION_FACTOR: u64 = 0; +pub const ACTIVITY_THRESHOLD_SENSITIVITY: u64 = 1; pub(crate) fn build_blend_service_config( config: &TopologyBlendConfig, @@ -138,19 +139,20 @@ fn build_blend_deployment_settings( }, minimum_messages_coefficient: backend_core.minimum_messages_coefficient, normalization_constant: backend_core.normalization_constant, + activity_threshold_sensitivity: ACTIVITY_THRESHOLD_SENSITIVITY, }, } } fn build_network_deployment_settings() -> NetworkDeploymentSettings { NetworkDeploymentSettings { - identify_protocol_name: nomos_libp2p::protocol_name::StreamProtocol::new( + identify_protocol_name: lb_libp2p::protocol_name::StreamProtocol::new( "/integration/nomos/identify/1.0.0", ), - kademlia_protocol_name: nomos_libp2p::protocol_name::StreamProtocol::new( + kademlia_protocol_name: lb_libp2p::protocol_name::StreamProtocol::new( "/integration/nomos/kad/1.0.0", ), - chain_sync_protocol_name: nomos_libp2p::protocol_name::StreamProtocol::new( + chain_sync_protocol_name: lb_libp2p::protocol_name::StreamProtocol::new( "/integration/nomos/cryptarchia/sync/1.0.0", ), } diff --git a/testing-framework/configs/src/nodes/common.rs b/testing-framework/configs/src/nodes/common.rs index 4fe836c..0f5afe2 100644 --- a/testing-framework/configs/src/nodes/common.rs +++ b/testing-framework/configs/src/nodes/common.rs @@ -5,19 +5,23 @@ use std::{ time::Duration, }; -use chain_network::{BootstrapConfig as ChainBootstrapConfig, OrphanConfig, SyncConfig}; -use chain_service::StartingState; -use key_management_system_service::keys::Key; -use nomos_api::ApiServiceSettings; -use nomos_node::{ +use lb_api_service::ApiServiceSettings; +use lb_chain_leader_service::LeaderWalletConfig; +use lb_chain_network::{BootstrapConfig as ChainBootstrapConfig, OrphanConfig, SyncConfig}; +use lb_chain_service::StartingState; +use lb_core::mantle::Value; +use lb_key_management_system_service::keys::{Key, secured_key::SecuredKey}; +use lb_node::{ api::backend::AxumBackendSettings as NodeAxumBackendSettings, config::{ cryptarchia::{ deployment::{ - SdpConfig as DeploymentSdpConfig, Settings as CryptarchiaDeploymentSettings, + SdpConfig as DeploymentSdpConfig, ServiceParameters, + Settings as CryptarchiaDeploymentSettings, }, serde::{ - Config as CryptarchiaConfig, NetworkConfig as CryptarchiaNetworkConfig, + Config as CryptarchiaConfig, LeaderConfig, + NetworkConfig as CryptarchiaNetworkConfig, ServiceConfig as CryptarchiaServiceConfig, }, }, @@ -25,7 +29,7 @@ use nomos_node::{ time::{deployment::Settings as TimeDeploymentSettings, serde::Config as TimeConfig}, }, }; -use nomos_wallet::WalletServiceSettings; +use lb_wallet_service::WalletServiceSettings; use crate::{nodes::kms::key_id_for_preload_backend, timeouts, topology::configs::GeneralConfig}; @@ -35,11 +39,29 @@ const MEMPOOL_PUBSUB_TOPIC: &str = "mantle"; const STATE_RECORDING_INTERVAL_SECS: u64 = 60; const IBD_DOWNLOAD_DELAY_SECS: u64 = 10; const MAX_ORPHAN_CACHE_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(5) }; -const API_RATE_LIMIT_PER_SECOND: u64 = 10000; -const API_RATE_LIMIT_BURST: u32 = 10000; const API_MAX_CONCURRENT_REQUESTS: usize = 1000; pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeploymentSettings { + let mantle_service_params = &config + .consensus_config + .ledger_config + .sdp_config + .service_params; + let node_service_params = mantle_service_params + .iter() + .map(|(service_type, service_parameters)| { + ( + service_type.clone(), + ServiceParameters { + lock_period: service_parameters.lock_period, + inactivity_period: service_parameters.inactivity_period, + retention_period: service_parameters.retention_period, + timestamp: service_parameters.timestamp, + }, + ) + }) + .collect::>(); + CryptarchiaDeploymentSettings { epoch_config: config.consensus_config.ledger_config.epoch_config, security_param: config @@ -48,12 +70,7 @@ pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeplo .consensus_config .security_param(), sdp_config: DeploymentSdpConfig { - service_params: config - .consensus_config - .ledger_config - .sdp_config - .service_params - .clone(), + service_params: node_service_params, min_stake: config.consensus_config.ledger_config.sdp_config.min_stake, }, gossipsub_protocol: CRYPTARCHIA_GOSSIPSUB_PROTOCOL.to_owned(), @@ -79,10 +96,10 @@ pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig { genesis_tx: config.consensus_config.genesis_tx.clone(), }, recovery_file: PathBuf::from("recovery/cryptarchia.json"), - bootstrap: chain_service::BootstrapConfig { + bootstrap: lb_chain_service::BootstrapConfig { prolonged_bootstrap_period: config.bootstrapping_config.prolonged_bootstrap_period, force_bootstrap: false, - offline_grace_period: chain_service::OfflineGracePeriodConfig { + offline_grace_period: lb_chain_service::OfflineGracePeriodConfig { grace_period: timeouts::grace_period(), state_recording_interval: Duration::from_secs(STATE_RECORDING_INTERVAL_SECS), }, @@ -90,7 +107,7 @@ pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig { }, network: CryptarchiaNetworkConfig { bootstrap: ChainBootstrapConfig { - ibd: chain_network::IbdConfig { + ibd: lb_chain_network::IbdConfig { peers: HashSet::new(), delay_before_new_download: Duration::from_secs(IBD_DOWNLOAD_DELAY_SECS), }, @@ -101,14 +118,20 @@ pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig { }, }, }, + leader: LeaderConfig { + wallet: LeaderWalletConfig { + max_tx_fee: Value::MAX, + funding_pk: config.consensus_config.funding_sk.as_public_key(), + }, + }, } } pub(crate) fn time_config(config: &GeneralConfig) -> TimeConfig { TimeConfig { - backend: nomos_time::backends::NtpTimeBackendSettings { + backend: lb_time_service::backends::NtpTimeBackendSettings { ntp_server: config.time_config.ntp_server.clone(), - ntp_client_settings: nomos_time::backends::ntp::async_client::NTPClientSettings { + ntp_client_settings: lb_time_service::backends::ntp::async_client::NTPClientSettings { timeout: config.time_config.timeout, listening_interface: config.time_config.interface.clone(), }, @@ -118,13 +141,13 @@ pub(crate) fn time_config(config: &GeneralConfig) -> TimeConfig { } } -pub(crate) fn mempool_config() -> nomos_node::config::mempool::serde::Config { - nomos_node::config::mempool::serde::Config { +pub(crate) fn mempool_config() -> lb_node::config::mempool::serde::Config { + lb_node::config::mempool::serde::Config { recovery_path: PathBuf::from("recovery/mempool.json"), } } -pub(crate) fn tracing_settings(config: &GeneralConfig) -> nomos_tracing_service::TracingSettings { +pub(crate) fn tracing_settings(config: &GeneralConfig) -> lb_tracing_service::TracingSettings { config.tracing_config.tracing_settings.clone() } @@ -132,8 +155,6 @@ pub(crate) fn http_config(config: &GeneralConfig) -> ApiServiceSettings RunConfig { fn build_node_deployment_settings( config: &GeneralConfig, - blend_deployment: nomos_node::config::blend::deployment::Settings, - network_deployment: nomos_node::config::network::deployment::Settings, + blend_deployment: lb_node::config::blend::deployment::Settings, + network_deployment: lb_node::config::network::deployment::Settings, ) -> DeploymentSettings { DeploymentSettings { blend: blend_deployment, diff --git a/testing-framework/configs/src/topology/configs/api.rs b/testing-framework/configs/src/topology/configs/api.rs index aaa97be..13bf132 100644 --- a/testing-framework/configs/src/topology/configs/api.rs +++ b/testing-framework/configs/src/topology/configs/api.rs @@ -1,6 +1,6 @@ use std::net::SocketAddr; -use nomos_utils::net::get_available_tcp_port; +use lb_utils::net::get_available_tcp_port; use thiserror::Error; const LOCALHOST: [u8; 4] = [127, 0, 0, 1]; diff --git a/testing-framework/configs/src/topology/configs/blend.rs b/testing-framework/configs/src/topology/configs/blend.rs index 60a631e..2a4be29 100644 --- a/testing-framework/configs/src/topology/configs/blend.rs +++ b/testing-framework/configs/src/topology/configs/blend.rs @@ -1,13 +1,13 @@ use core::time::Duration; use std::{net::Ipv4Addr, num::NonZeroU64}; -use key_management_system_service::keys::{Ed25519Key, UnsecuredEd25519Key, ZkKey}; -use nomos_blend_service::{ +use lb_blend_service::{ core::backends::libp2p::Libp2pBlendBackendSettings as Libp2pCoreBlendBackendSettings, edge::backends::libp2p::Libp2pBlendBackendSettings as Libp2pEdgeBlendBackendSettings, }; -use nomos_libp2p::{Multiaddr, Protocol, protocol_name::StreamProtocol}; -use nomos_utils::math::NonNegativeF64; +use lb_key_management_system_service::keys::{Ed25519Key, UnsecuredEd25519Key, ZkKey}; +use lb_libp2p::{Multiaddr, Protocol, protocol_name::StreamProtocol}; +use lb_utils::math::NonNegativeF64; use num_bigint::BigUint; const EDGE_NODE_CONNECTION_TIMEOUT: Duration = Duration::from_secs(1); diff --git a/testing-framework/configs/src/topology/configs/consensus.rs b/testing-framework/configs/src/topology/configs/consensus.rs index c620ea7..0082c37 100644 --- a/testing-framework/configs/src/topology/configs/consensus.rs +++ b/testing-framework/configs/src/topology/configs/consensus.rs @@ -5,12 +5,7 @@ use std::{ sync::Arc, }; -use cryptarchia_engine::EpochConfig; -use groth16::CompressedGroth16Proof; -use key_management_system_service::keys::{ - Ed25519Key, UnsecuredZkKey, ZkKey, ZkPublicKey, ZkSignature, -}; -use nomos_core::{ +use lb_core::{ mantle::{ GenesisTx as GenesisTxTrait, MantleTx, Note, OpProof, Utxo, genesis_tx::GenesisTx, @@ -22,11 +17,17 @@ use nomos_core::{ }, sdp::{DeclarationMessage, Locator, ProviderId, ServiceParameters, ServiceType}, }; -use nomos_node::{SignedMantleTx, Transaction as _}; -use nomos_utils::math::NonNegativeF64; +use lb_cryptarchia_engine::EpochConfig; +use lb_groth16::CompressedGroth16Proof; +use lb_key_management_system_service::keys::{ + Ed25519Key, UnsecuredZkKey, ZkKey, ZkPublicKey, ZkSignature, +}; +use lb_node::{SignedMantleTx, Transaction as _}; +use lb_utils::math::NonNegativeF64; use num_bigint::BigUint; use super::wallet::{WalletAccount, WalletConfig}; +use crate::nodes::blend::ACTIVITY_THRESHOLD_SENSITIVITY; #[derive(Debug, thiserror::Error)] pub enum ConsensusConfigError { @@ -101,7 +102,7 @@ impl ProviderInfo { pub struct GeneralConsensusConfig { pub leader_pk: ZkPublicKey, pub leader_sk: UnsecuredZkKey, - pub ledger_config: nomos_ledger::Config, + pub ledger_config: lb_ledger::Config, pub genesis_tx: GenesisTx, pub utxos: Vec, pub blend_notes: Vec, @@ -161,18 +162,18 @@ fn create_genesis_tx(utxos: &mut [Utxo]) -> Result Result { - Ok(nomos_ledger::Config { +) -> Result { + Ok(lb_ledger::Config { epoch_config: EpochConfig { epoch_stake_distribution_stabilization: unsafe { NonZero::new_unchecked(3) }, epoch_period_nonce_buffer: unsafe { NonZero::new_unchecked(3) }, epoch_period_nonce_stabilization: unsafe { NonZero::new_unchecked(4) }, }, - consensus_config: cryptarchia_engine::Config::new( + consensus_config: lb_cryptarchia_engine::Config::new( consensus_params.security_param, consensus_params.active_slot_coeff, ), - sdp_config: nomos_ledger::mantle::sdp::Config { + sdp_config: lb_ledger::mantle::sdp::Config { service_params: Arc::new( [( ServiceType::BlendNetwork, @@ -186,12 +187,12 @@ fn build_ledger_config( )] .into(), ), - min_stake: nomos_core::sdp::MinStake { + min_stake: lb_core::sdp::MinStake { threshold: 1, timestamp: 0, }, - service_rewards_params: nomos_ledger::mantle::sdp::ServiceRewardsParameters { - blend: nomos_ledger::mantle::sdp::rewards::blend::RewardsParameters { + service_rewards_params: lb_ledger::mantle::sdp::ServiceRewardsParameters { + blend: lb_ledger::mantle::sdp::rewards::blend::RewardsParameters { rounds_per_session: unsafe { NonZeroU64::new_unchecked(10) }, message_frequency_per_round: NonNegativeF64::try_from(1.0).map_err(|_| { ConsensusConfigError::LedgerConfig { @@ -201,6 +202,7 @@ fn build_ledger_config( num_blend_layers: unsafe { NonZeroU64::new_unchecked(3) }, minimum_network_size: unsafe { NonZeroU64::new_unchecked(1) }, data_replication_factor: 0, + activity_threshold_sensitivity: ACTIVITY_THRESHOLD_SENSITIVITY, }, }, }, @@ -397,7 +399,7 @@ fn build_genesis_inscription() -> Result { fn build_genesis_ops( inscription: InscriptionOp, - ledger_tx_hash: nomos_core::mantle::TxHash, + ledger_tx_hash: lb_core::mantle::TxHash, providers: &[ProviderInfo], ) -> Vec { let mut ops = Vec::with_capacity(1 + providers.len()); @@ -423,7 +425,7 @@ fn build_genesis_ops( } fn build_genesis_ops_proofs( - mantle_tx_hash: nomos_core::mantle::TxHash, + mantle_tx_hash: lb_core::mantle::TxHash, providers: Vec, ) -> Result, ConsensusConfigError> { let mut ops_proofs = Vec::with_capacity(1 + providers.len()); diff --git a/testing-framework/configs/src/topology/configs/deployment.rs b/testing-framework/configs/src/topology/configs/deployment.rs index 4f6284d..1c7df23 100644 --- a/testing-framework/configs/src/topology/configs/deployment.rs +++ b/testing-framework/configs/src/topology/configs/deployment.rs @@ -1,11 +1,11 @@ use core::{num::NonZeroU64, time::Duration}; -use nomos_blend_service::{ +use lb_blend_service::{ core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings}, settings::TimingSettings, }; -use nomos_libp2p::protocol_name::StreamProtocol; -use nomos_node::config::{ +use lb_libp2p::protocol_name::StreamProtocol; +use lb_node::config::{ blend::deployment::{ CommonSettings as BlendCommonSettings, CoreSettings as BlendCoreSettings, Settings as BlendDeploymentSettings, @@ -13,7 +13,7 @@ use nomos_node::config::{ deployment::{CustomDeployment, Settings as DeploymentSettings}, network::deployment::Settings as NetworkDeploymentSettings, }; -use nomos_utils::math::NonNegativeF64; +use lb_utils::math::NonNegativeF64; const DEFAULT_ROUND_DURATION: Duration = Duration::from_secs(1); diff --git a/testing-framework/configs/src/topology/configs/mod.rs b/testing-framework/configs/src/topology/configs/mod.rs index 259c0ef..198f58e 100644 --- a/testing-framework/configs/src/topology/configs/mod.rs +++ b/testing-framework/configs/src/topology/configs/mod.rs @@ -16,13 +16,13 @@ use consensus::{ ConsensusConfigError, GeneralConsensusConfig, ProviderInfo, create_genesis_tx_with_declarations, sync_utxos_with_genesis, }; -use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; -use network::GeneralNetworkConfig; -use nomos_core::{ +use lb_core::{ mantle::GenesisTx as _, sdp::{Locator, ServiceType}, }; -use nomos_utils::net::get_available_udp_port; +use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; +use lb_utils::net::get_available_udp_port; +use network::GeneralNetworkConfig; use rand::{Rng as _, thread_rng}; use tracing::GeneralTracingConfig; use wallet::WalletConfig; @@ -200,7 +200,7 @@ fn collect_blend_core_providers( fn apply_consensus_genesis_tx( consensus_configs: &mut [GeneralConsensusConfig], - genesis_tx: &nomos_core::mantle::genesis_tx::GenesisTx, + genesis_tx: &lb_core::mantle::genesis_tx::GenesisTx, ) -> Result<(), ConsensusConfigError> { for c in consensus_configs { c.genesis_tx = genesis_tx.clone(); diff --git a/testing-framework/configs/src/topology/configs/network.rs b/testing-framework/configs/src/topology/configs/network.rs index 49387e4..8f189ae 100644 --- a/testing-framework/configs/src/topology/configs/network.rs +++ b/testing-framework/configs/src/topology/configs/network.rs @@ -1,10 +1,10 @@ use std::time::Duration; -use nomos_libp2p::{ +use lb_libp2p::{ IdentifySettings, KademliaSettings, Multiaddr, NatSettings, Protocol, ed25519, gossipsub, }; -use nomos_node::config::network::serde::{BackendSettings, Config, SwarmConfig}; -use nomos_utils::net::get_available_udp_port; +use lb_node::config::network::serde::{BackendSettings, Config, SwarmConfig}; +use lb_utils::net::get_available_udp_port; use testing_framework_env as tf_env; use thiserror::Error; @@ -45,7 +45,7 @@ fn default_swarm_config() -> SwarmConfig { gossipsub_config: gossipsub::Config::default(), kademlia_config: KademliaSettings::default(), identify_config: IdentifySettings::default(), - chain_sync_config: cryptarchia_sync::Config::default(), + chain_sync_config: lb_cryptarchia_sync::Config::default(), nat_config: NatSettings::default(), } } @@ -85,7 +85,7 @@ pub fn create_network_configs( Ok(SwarmConfig { node_key, port, - chain_sync_config: cryptarchia_sync::Config { + chain_sync_config: lb_cryptarchia_sync::Config { peer_response_timeout: PEER_RESPONSE_TIMEOUT, }, nat_config: nat_settings(port)?, @@ -123,7 +123,7 @@ pub fn build_network_config_for_node( let swarm_config = SwarmConfig { node_key, port, - chain_sync_config: cryptarchia_sync::Config { + chain_sync_config: lb_cryptarchia_sync::Config { peer_response_timeout: PEER_RESPONSE_TIMEOUT, }, nat_config: nat_settings(port)?, diff --git a/testing-framework/configs/src/topology/configs/runtime.rs b/testing-framework/configs/src/topology/configs/runtime.rs index 62fd17f..76bbdec 100644 --- a/testing-framework/configs/src/topology/configs/runtime.rs +++ b/testing-framework/configs/src/topology/configs/runtime.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; -use nomos_libp2p::Multiaddr; +use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; +use lb_libp2p::Multiaddr; use crate::{ node_address_from_port, diff --git a/testing-framework/configs/src/topology/configs/tracing.rs b/testing-framework/configs/src/topology/configs/tracing.rs index 75dc701..9d6e309 100644 --- a/testing-framework/configs/src/topology/configs/tracing.rs +++ b/testing-framework/configs/src/topology/configs/tracing.rs @@ -1,9 +1,9 @@ -use nomos_tracing::{ +use lb_tracing::{ logging::{local::FileConfig, loki::LokiConfig}, metrics::otlp::OtlpMetricsConfig, tracing::otlp::OtlpTracingConfig, }; -use nomos_tracing_service::{ +use lb_tracing_service::{ ConsoleLayer, FilterLayer, LoggerLayer, MetricsLayer, TracingLayer, TracingSettings, }; use testing_framework_env as tf_env; @@ -40,7 +40,7 @@ impl GeneralTracingConfig { .unwrap_or(MetricsLayer::None); let filter = file_filter_override().unwrap_or_else(|| { - nomos_tracing::filter::envfilter::EnvFilterConfig { + lb_tracing::filter::envfilter::EnvFilterConfig { filters: std::iter::once(&("nomos", "debug")) .map(|(k, v)| ((*k).to_owned(), (*v).to_owned())) .collect(), @@ -121,8 +121,8 @@ fn file_log_level() -> Level { .unwrap_or(Level::INFO) } -fn file_filter_override() -> Option { - tf_env::nomos_log_filter().map(|raw| nomos_tracing::filter::envfilter::EnvFilterConfig { +fn file_filter_override() -> Option { + tf_env::nomos_log_filter().map(|raw| lb_tracing::filter::envfilter::EnvFilterConfig { filters: raw .split(',') .filter_map(|pair| { diff --git a/testing-framework/configs/src/topology/configs/wallet.rs b/testing-framework/configs/src/topology/configs/wallet.rs index 43af407..a20d6eb 100644 --- a/testing-framework/configs/src/topology/configs/wallet.rs +++ b/testing-framework/configs/src/topology/configs/wallet.rs @@ -1,6 +1,6 @@ use std::num::NonZeroUsize; -use key_management_system_service::keys::{ZkKey, ZkPublicKey}; +use lb_key_management_system_service::keys::{ZkKey, ZkPublicKey}; use num_bigint::BigUint; /// Collection of wallet accounts that should be funded at genesis. diff --git a/testing-framework/core/Cargo.toml b/testing-framework/core/Cargo.toml index ee2bb8b..8b902b7 100644 --- a/testing-framework/core/Cargo.toml +++ b/testing-framework/core/Cargo.toml @@ -16,32 +16,32 @@ workspace = true default = [] [dependencies] -anyhow = "1" -async-trait = "0.1" -chain-service = { workspace = true } -common-http-client = { workspace = true } -futures = { default-features = false, version = "0.3" } -groth16 = { workspace = true } -hex = { default-features = false, version = "0.4.3" } -key-management-system-service = { workspace = true } -nomos-core = { workspace = true } -nomos-http-api-common = { workspace = true } -nomos-libp2p = { workspace = true } -nomos-network = { features = ["libp2p"], workspace = true } -nomos-node = { default-features = false, features = ["testing"], workspace = true } -nomos-tracing = { workspace = true } -nomos-tracing-service = { workspace = true } -nomos-utils = { workspace = true } -prometheus-http-query = "0.8" -rand = { workspace = true } -reqwest = { features = ["json"], workspace = true } -serde = { workspace = true } -serde_json = { workspace = true } -serde_with = { workspace = true } -serde_yaml = { workspace = true } -tempfile = { workspace = true } -testing-framework-config = { workspace = true } -testing-framework-env = { workspace = true } -thiserror = { workspace = true } -tokio = { features = ["macros", "process", "rt-multi-thread", "time"], workspace = true } -tracing = { workspace = true } +anyhow = "1" +async-trait = "0.1" +futures = { default-features = false, version = "0.3" } +hex = { default-features = false, version = "0.4.3" } +lb-chain-service = { workspace = true } +lb-common-http-client = { workspace = true } +lb-core = { workspace = true } +lb-groth16 = { workspace = true } +lb-http-api-common = { workspace = true } +lb-key-management-system-service = { workspace = true } +lb-libp2p = { workspace = true } +lb-network-service = { features = ["libp2p"], workspace = true } +lb-node = { default-features = false, features = ["testing"], workspace = true } +lb-tracing = { workspace = true } +lb-tracing-service = { workspace = true } +lb-utils = { workspace = true } +prometheus-http-query = "0.8" +rand = { workspace = true } +reqwest = { features = ["json"], workspace = true } +serde = { workspace = true } +serde_json = { workspace = true } +serde_with = { workspace = true } +serde_yaml = { workspace = true } +tempfile = { workspace = true } +testing-framework-config = { workspace = true } +testing-framework-env = { workspace = true } +thiserror = { workspace = true } +tokio = { features = ["macros", "process", "rt-multi-thread", "time"], workspace = true } +tracing = { workspace = true } diff --git a/testing-framework/core/src/nodes/api_client.rs b/testing-framework/core/src/nodes/api_client.rs index 1fdedab..e5e6671 100644 --- a/testing-framework/core/src/nodes/api_client.rs +++ b/testing-framework/core/src/nodes/api_client.rs @@ -1,14 +1,14 @@ use std::net::SocketAddr; -use chain_service::CryptarchiaInfo; -use common_http_client::CommonHttpClient; use hex; -use nomos_core::{block::Block, mantle::SignedMantleTx}; -use nomos_http_api_common::paths::{ +use lb_chain_service::CryptarchiaInfo; +use lb_common_http_client::CommonHttpClient; +use lb_core::{block::Block, mantle::SignedMantleTx}; +use lb_http_api_common::paths::{ CRYPTARCHIA_HEADERS, CRYPTARCHIA_INFO, MEMPOOL_ADD_TX, NETWORK_INFO, STORAGE_BLOCK, }; -use nomos_network::backends::libp2p::Libp2pInfo; -use nomos_node::HeaderId; +use lb_network_service::backends::libp2p::Libp2pInfo; +use lb_node::HeaderId; use reqwest::{Client, RequestBuilder, Response, Url}; use serde::{Serialize, de::DeserializeOwned}; use serde_json::Value; diff --git a/testing-framework/core/src/nodes/common/config/injection.rs b/testing-framework/core/src/nodes/common/config/injection.rs index 7682010..18172a8 100644 --- a/testing-framework/core/src/nodes/common/config/injection.rs +++ b/testing-framework/core/src/nodes/common/config/injection.rs @@ -1,5 +1,5 @@ use hex; -use key_management_system_service::keys::{Ed25519Key, Key}; +use lb_key_management_system_service::keys::{Ed25519Key, Key}; use serde_yaml::{Mapping, Number as YamlNumber, Value}; use testing_framework_config::nodes::kms::key_id_for_preload_backend; diff --git a/testing-framework/core/src/nodes/common/lifecycle/spawn.rs b/testing-framework/core/src/nodes/common/lifecycle/spawn.rs index b8409c9..86d5121 100644 --- a/testing-framework/core/src/nodes/common/lifecycle/spawn.rs +++ b/testing-framework/core/src/nodes/common/lifecycle/spawn.rs @@ -4,7 +4,7 @@ use std::{ path::Path, }; -use nomos_tracing::logging::local::FileConfig; +use lb_tracing::logging::local::FileConfig; use serde::Serialize; use serde_yaml::Value; use testing_framework_env as tf_env; diff --git a/testing-framework/core/src/nodes/common/node.rs b/testing-framework/core/src/nodes/common/node.rs index b6f05cb..1bc05a8 100644 --- a/testing-framework/core/src/nodes/common/node.rs +++ b/testing-framework/core/src/nodes/common/node.rs @@ -6,7 +6,7 @@ use std::{ time::Duration, }; -use nomos_tracing_service::LoggerLayer; +use lb_tracing_service::LoggerLayer; use reqwest::Url; use serde::Serialize; use tempfile::TempDir; diff --git a/testing-framework/core/src/nodes/mod.rs b/testing-framework/core/src/nodes/mod.rs index bd5c3b0..7b2ad55 100644 --- a/testing-framework/core/src/nodes/mod.rs +++ b/testing-framework/core/src/nodes/mod.rs @@ -3,6 +3,7 @@ pub mod common; pub mod node; use std::{ + fs, io::{Error, ErrorKind}, path::PathBuf, sync::LazyLock, @@ -20,7 +21,7 @@ pub(crate) fn create_tempdir(custom_work_dir: Option) -> std::io::Resul let final_dir_name = dir .components() .last() - .ok_or(Error::new(ErrorKind::Other, "invalid final directory"))? + .ok_or(Error::new(ErrorKind::Other, "Invalid final directory"))? .as_os_str() .display() .to_string() @@ -28,7 +29,13 @@ pub(crate) fn create_tempdir(custom_work_dir: Option) -> std::io::Resul + "_"; let parent_dir = dir .parent() - .ok_or(Error::new(ErrorKind::Other, "invalid parent directory"))?; + .ok_or(Error::new(ErrorKind::Other, "Invalid parent directory"))?; + fs::create_dir_all(parent_dir).map_err(|e| { + Error::new( + ErrorKind::Other, + format!("Error creating parent dir: {}", e), + ) + })?; let mut temp_dir = TempDir::with_prefix_in(final_dir_name, parent_dir)?; if should_persist_tempdir() { temp_dir.disable_cleanup(true); diff --git a/testing-framework/core/src/nodes/node.rs b/testing-framework/core/src/nodes/node.rs index 50878f5..f97c706 100644 --- a/testing-framework/core/src/nodes/node.rs +++ b/testing-framework/core/src/nodes/node.rs @@ -1,7 +1,7 @@ use std::{ops::Deref, path::PathBuf, time::Duration}; -use nomos_node::config::RunConfig; -use nomos_tracing_service::LoggerLayer; +use lb_node::config::RunConfig; +use lb_tracing_service::LoggerLayer; pub use testing_framework_config::nodes::node::create_node_config; use tracing::{debug, info}; diff --git a/testing-framework/core/src/scenario/capabilities.rs b/testing-framework/core/src/scenario/capabilities.rs index 712c966..ca89fea 100644 --- a/testing-framework/core/src/scenario/capabilities.rs +++ b/testing-framework/core/src/scenario/capabilities.rs @@ -58,7 +58,7 @@ impl Default for StartNodeOptions { impl StartNodeOptions { pub fn create_patch(mut self, f: F) -> Self where - F: Fn(nomos_node::config::RunConfig) -> Result + F: Fn(lb_node::config::RunConfig) -> Result + Send + Sync + 'static, diff --git a/testing-framework/core/src/scenario/cfgsync.rs b/testing-framework/core/src/scenario/cfgsync.rs index 1dca652..53ab636 100644 --- a/testing-framework/core/src/scenario/cfgsync.rs +++ b/testing-framework/core/src/scenario/cfgsync.rs @@ -1,8 +1,8 @@ use std::{fs::File, num::NonZero, path::Path, time::Duration}; use anyhow::{Context as _, Result}; -use nomos_tracing_service::TracingSettings; -use nomos_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; +use lb_tracing_service::TracingSettings; +use lb_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; use serde::{Deserialize, Serialize}; use serde_with::serde_as; use tracing::debug; diff --git a/testing-framework/core/src/scenario/definition.rs b/testing-framework/core/src/scenario/definition.rs index ded9307..da0f144 100644 --- a/testing-framework/core/src/scenario/definition.rs +++ b/testing-framework/core/src/scenario/definition.rs @@ -1,6 +1,6 @@ -use std::{num::NonZeroUsize, sync::Arc, time::Duration}; +use std::{num::NonZeroUsize, path::PathBuf, sync::Arc, time::Duration}; -use nomos_node::config::RunConfig; +use lb_node::config::RunConfig; use thiserror::Error; use tracing::{debug, info}; @@ -107,6 +107,7 @@ pub struct TopologyConfigurator { builder: Builder, nodes: usize, network_star: bool, + scenario_base_dir: Option, } impl Builder { @@ -286,6 +287,7 @@ impl TopologyConfigurator { builder, nodes: 0, network_star: false, + scenario_base_dir: None, } } @@ -296,6 +298,13 @@ impl TopologyConfigurator { self } + /// Set a base scenario directory for nodes to persist data. If not set, + /// nodes will use + pub fn scenario_base_dir(mut self, path: PathBuf) -> Self { + self.scenario_base_dir = Some(path); + self + } + /// Use a star libp2p network layout. #[must_use] pub fn network_star(mut self) -> Self { @@ -327,7 +336,10 @@ impl TopologyConfigurator { #[must_use] pub fn apply(self) -> Builder { let mut builder = self.builder; - builder.topology = builder.topology.with_node_count(self.nodes); + builder.topology = builder + .topology + .with_node_count(self.nodes) + .with_scenario_base_dir(self.scenario_base_dir); if self.network_star { builder.topology = builder diff --git a/testing-framework/core/src/scenario/http_probe.rs b/testing-framework/core/src/scenario/http_probe.rs index 7dfc823..835d7c5 100644 --- a/testing-framework/core/src/scenario/http_probe.rs +++ b/testing-framework/core/src/scenario/http_probe.rs @@ -1,7 +1,7 @@ use std::time::Duration; use futures::future::try_join_all; -use nomos_http_api_common::paths; +use lb_http_api_common::paths; use reqwest::Client as ReqwestClient; use thiserror::Error; use tokio::time::{Instant, sleep}; diff --git a/testing-framework/core/src/scenario/runtime/block_feed.rs b/testing-framework/core/src/scenario/runtime/block_feed.rs index b2f7d49..e30ed3a 100644 --- a/testing-framework/core/src/scenario/runtime/block_feed.rs +++ b/testing-framework/core/src/scenario/runtime/block_feed.rs @@ -8,9 +8,9 @@ use std::{ }; use anyhow::{Context as _, Result}; -use nomos_core::{block::Block, mantle::SignedMantleTx}; -use nomos_http_api_common::paths::STORAGE_BLOCK; -use nomos_node::HeaderId; +use lb_core::{block::Block, mantle::SignedMantleTx}; +use lb_http_api_common::paths::STORAGE_BLOCK; +use lb_node::HeaderId; use tokio::{sync::broadcast, task::JoinHandle, time::sleep}; use tracing::{debug, error}; diff --git a/testing-framework/core/src/topology/config.rs b/testing-framework/core/src/topology/config.rs index 0360754..0d9a903 100644 --- a/testing-framework/core/src/topology/config.rs +++ b/testing-framework/core/src/topology/config.rs @@ -1,10 +1,10 @@ use std::{collections::HashMap, path::PathBuf, sync::Arc}; -use nomos_core::{ +use lb_core::{ mantle::GenesisTx as _, sdp::{Locator, ServiceType}, }; -use nomos_node::config::RunConfig; +use lb_node::config::RunConfig; use testing_framework_config::topology::{ configs::{ api::{ApiConfigError, create_api_configs}, @@ -126,11 +126,6 @@ impl TopologyConfig { self } - #[must_use] - pub fn persist_dir(&self, index: usize) -> Option<&PathBuf> { - self.persist_dirs.get(&index) - } - #[must_use] pub fn with_persist_dir(mut self, index: usize, dir: PathBuf) -> Self { self.persist_dirs.insert(index, dir); @@ -144,6 +139,7 @@ pub struct TopologyBuilder { config: TopologyConfig, ids: Option>, blend_ports: Option>, + scenario_base_dir: Option, } impl TopologyBuilder { @@ -154,6 +150,7 @@ impl TopologyBuilder { config, ids: None, blend_ports: None, + scenario_base_dir: None, } } @@ -192,6 +189,11 @@ impl TopologyBuilder { self } + pub fn with_scenario_base_dir(mut self, scenario_base_dir: Option) -> Self { + self.scenario_base_dir = scenario_base_dir; + self + } + #[must_use] /// Configure the libp2p network layout. pub const fn with_network_layout(mut self, layout: Libp2pNetworkLayout) -> Self { @@ -208,12 +210,19 @@ impl TopologyBuilder { /// Finalize and generate topology and node descriptors. pub fn build(self) -> Result { let Self { - config, + mut config, ids, blend_ports, + scenario_base_dir, } = self; let n_participants = participant_count(&config)?; + if let Some(base_dir) = scenario_base_dir { + for i in 0..n_participants { + let dir = base_dir.join(format!("node_{i}")); + config = config.with_persist_dir(i, dir); + } + } let (ids, blend_ports) = resolve_and_validate_vectors(ids, blend_ports, n_participants)?; @@ -262,7 +271,6 @@ impl TopologyBuilder { &kms_configs, &time_config, &config.node_config_patches, - &config.persist_dirs, )?; Ok(GeneratedTopology { config, nodes }) @@ -322,14 +330,14 @@ fn collect_provider_infos( fn create_consensus_genesis_tx( first_consensus: &testing_framework_config::topology::configs::consensus::GeneralConsensusConfig, providers: Vec, -) -> Result { +) -> Result { let ledger_tx = first_consensus.genesis_tx.mantle_tx().ledger_tx.clone(); Ok(create_genesis_tx_with_declarations(ledger_tx, providers)?) } fn apply_consensus_genesis_tx( consensus_configs: &mut [testing_framework_config::topology::configs::consensus::GeneralConsensusConfig], - genesis_tx: &nomos_core::mantle::genesis_tx::GenesisTx, + genesis_tx: &lb_core::mantle::genesis_tx::GenesisTx, ) -> Result<(), TopologyBuildError> { for c in consensus_configs { c.genesis_tx = genesis_tx.clone(); @@ -350,10 +358,9 @@ fn build_node_descriptors( blend_configs: &[testing_framework_config::topology::configs::blend::GeneralBlendConfig], api_configs: &[testing_framework_config::topology::configs::api::GeneralApiConfig], tracing_configs: &[testing_framework_config::topology::configs::tracing::GeneralTracingConfig], - kms_configs: &[key_management_system_service::backend::preload::PreloadKMSBackendSettings], + kms_configs: &[lb_key_management_system_service::backend::preload::PreloadKMSBackendSettings], time_config: &testing_framework_config::topology::configs::time::GeneralTimeConfig, node_config_patches: &HashMap, - persist_dirs: &HashMap, ) -> Result, TopologyBuildError> { let mut nodes = Vec::with_capacity(config.n_nodes); @@ -388,7 +395,7 @@ fn build_node_descriptors( general, blend_port, config_patch: node_config_patches.get(&i).cloned(), - persist_dir: persist_dirs.get(&i).cloned(), + persist_dir: config.persist_dirs.get(&i).cloned(), }; nodes.push(descriptor); diff --git a/testing-framework/core/src/topology/readiness/network.rs b/testing-framework/core/src/topology/readiness/network.rs index eaf0af1..24751d8 100644 --- a/testing-framework/core/src/topology/readiness/network.rs +++ b/testing-framework/core/src/topology/readiness/network.rs @@ -1,5 +1,5 @@ -use nomos_libp2p::PeerId; -use nomos_network::backends::libp2p::Libp2pInfo; +use lb_libp2p::PeerId; +use lb_network_service::backends::libp2p::Libp2pInfo; use reqwest::{Client, Url}; use thiserror::Error; use tracing::warn; @@ -135,12 +135,12 @@ pub async fn try_fetch_network_info( client: &Client, base: &Url, ) -> Result { - let path = nomos_http_api_common::paths::NETWORK_INFO.trim_start_matches('/'); + let path = lb_http_api_common::paths::NETWORK_INFO.trim_start_matches('/'); let url = base .join(path) .map_err(|source| NetworkInfoError::JoinUrl { base: base.clone(), - path: nomos_http_api_common::paths::NETWORK_INFO, + path: lb_http_api_common::paths::NETWORK_INFO, message: source.to_string(), })?; diff --git a/testing-framework/core/src/topology/utils.rs b/testing-framework/core/src/topology/utils.rs index a9e6038..b2d65da 100644 --- a/testing-framework/core/src/topology/utils.rs +++ b/testing-framework/core/src/topology/utils.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, iter}; -use groth16::fr_to_bytes; -use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; -use nomos_utils::net::get_available_udp_port; +use lb_groth16::fr_to_bytes; +use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; +use lb_utils::net::get_available_udp_port; use rand::{Rng, thread_rng}; use thiserror::Error; @@ -120,10 +120,10 @@ pub fn resolve_ports( Ok(resolved) } -pub fn multiaddr_port(addr: &nomos_libp2p::Multiaddr) -> Option { +pub fn multiaddr_port(addr: &lb_libp2p::Multiaddr) -> Option { for protocol in addr { match protocol { - nomos_libp2p::Protocol::Udp(port) | nomos_libp2p::Protocol::Tcp(port) => { + lb_libp2p::Protocol::Udp(port) | lb_libp2p::Protocol::Tcp(port) => { return Some(port); } _ => {} diff --git a/testing-framework/deployers/compose/Cargo.toml b/testing-framework/deployers/compose/Cargo.toml index f9e787f..9af9ea3 100644 --- a/testing-framework/deployers/compose/Cargo.toml +++ b/testing-framework/deployers/compose/Cargo.toml @@ -16,8 +16,8 @@ workspace = true anyhow = "1" async-trait = { workspace = true } cfgsync_tf = { workspace = true } -nomos-tracing = { workspace = true } -nomos-tracing-service = { workspace = true } +lb-tracing = { workspace = true } +lb-tracing-service = { workspace = true } reqwest = { features = ["json"], workspace = true } serde = { features = ["derive"], workspace = true } tempfile = { workspace = true } @@ -32,8 +32,8 @@ url = { version = "2" } uuid = { features = ["v4"], version = "1" } [dev-dependencies] -groth16 = { workspace = true } -key-management-system-service = { workspace = true } -nomos-core = { workspace = true } -nomos-ledger = { workspace = true } -zksign = { workspace = true } +lb-core = { workspace = true } +lb-groth16 = { workspace = true } +lb-key-management-system-service = { workspace = true } +lb-ledger = { workspace = true } +lb-zksign = { workspace = true } diff --git a/testing-framework/deployers/compose/src/deployer/mod.rs b/testing-framework/deployers/compose/src/deployer/mod.rs index df822f8..833ce28 100644 --- a/testing-framework/deployers/compose/src/deployer/mod.rs +++ b/testing-framework/deployers/compose/src/deployer/mod.rs @@ -91,14 +91,14 @@ mod tests { config::builder::create_node_configs, host::{Host, PortOverrides}, }; - use groth16::Fr; - use key_management_system_service::keys::ZkPublicKey; - use nomos_core::{ + use lb_core::{ mantle::{GenesisTx as GenesisTxTrait, ledger::NoteId}, sdp::{ProviderId, ServiceType}, }; - use nomos_ledger::LedgerState; - use nomos_tracing_service::TracingSettings; + use lb_groth16::Fr; + use lb_key_management_system_service::keys::ZkPublicKey; + use lb_ledger::LedgerState; + use lb_tracing_service::TracingSettings; use testing_framework_core::{ scenario::ScenarioBuilder, topology::{ diff --git a/testing-framework/deployers/compose/src/descriptor/mod.rs b/testing-framework/deployers/compose/src/descriptor/mod.rs index 47077dd..8d93e41 100644 --- a/testing-framework/deployers/compose/src/descriptor/mod.rs +++ b/testing-framework/deployers/compose/src/descriptor/mod.rs @@ -121,7 +121,7 @@ fn default_extra_hosts() -> Vec { fn base_environment(cfgsync_port: u16) -> Vec { let rust_log = tf_env::rust_log().unwrap_or_else(|| "info".to_string()); let nomos_log_level = tf_env::nomos_log_level().unwrap_or_else(|| "info".to_string()); - let time_backend = tf_env::nomos_time_backend().unwrap_or_else(|| "monotonic".into()); + let time_backend = tf_env::lb_time_service_backend().unwrap_or_else(|| "monotonic".into()); vec![ EnvEntry::new("RUST_LOG", rust_log), EnvEntry::new("LOGOS_BLOCKCHAIN_LOG_LEVEL", nomos_log_level), diff --git a/testing-framework/deployers/compose/src/infrastructure/cfgsync.rs b/testing-framework/deployers/compose/src/infrastructure/cfgsync.rs index a4b05ea..ebd7f17 100644 --- a/testing-framework/deployers/compose/src/infrastructure/cfgsync.rs +++ b/testing-framework/deployers/compose/src/infrastructure/cfgsync.rs @@ -1,7 +1,7 @@ use std::{path::Path, process::Command as StdCommand}; -use nomos_tracing::metrics::otlp::OtlpMetricsConfig; -use nomos_tracing_service::MetricsLayer; +use lb_tracing::metrics::otlp::OtlpMetricsConfig; +use lb_tracing_service::MetricsLayer; use reqwest::Url; use testing_framework_core::{ scenario::cfgsync::{apply_topology_overrides, load_cfgsync_template, write_cfgsync_template}, diff --git a/testing-framework/deployers/k8s/Cargo.toml b/testing-framework/deployers/k8s/Cargo.toml index 2d5f978..89b9056 100644 --- a/testing-framework/deployers/k8s/Cargo.toml +++ b/testing-framework/deployers/k8s/Cargo.toml @@ -17,8 +17,8 @@ anyhow = "1" async-trait = { workspace = true } k8s-openapi = { features = ["latest"], version = "0.20" } kube = { default-features = false, features = ["client", "runtime", "rustls-tls"], version = "0.87" } -nomos-tracing = { workspace = true } -nomos-tracing-service = { workspace = true } +lb-tracing = { workspace = true } +lb-tracing-service = { workspace = true } reqwest = { features = ["json"], workspace = true } serde = { features = ["derive"], version = "1" } serde_yaml = { workspace = true } diff --git a/testing-framework/deployers/k8s/src/infrastructure/assets.rs b/testing-framework/deployers/k8s/src/infrastructure/assets.rs index d6980f2..624d5f5 100644 --- a/testing-framework/deployers/k8s/src/infrastructure/assets.rs +++ b/testing-framework/deployers/k8s/src/infrastructure/assets.rs @@ -5,8 +5,8 @@ use std::{ }; use anyhow::{Context as _, Result as AnyResult}; -use nomos_tracing::metrics::otlp::OtlpMetricsConfig; -use nomos_tracing_service::MetricsLayer; +use lb_tracing::metrics::otlp::OtlpMetricsConfig; +use lb_tracing_service::MetricsLayer; use reqwest::Url; use serde::Serialize; use tempfile::TempDir; diff --git a/testing-framework/deployers/local/Cargo.toml b/testing-framework/deployers/local/Cargo.toml index 32b895a..1ea16bd 100644 --- a/testing-framework/deployers/local/Cargo.toml +++ b/testing-framework/deployers/local/Cargo.toml @@ -14,10 +14,10 @@ workspace = true [dependencies] async-trait = "0.1" -nomos-libp2p = { workspace = true } -nomos-network = { workspace = true } -nomos-node = { workspace = true } -nomos-utils = { workspace = true } +lb-libp2p = { workspace = true } +lb-network-service = { workspace = true } +lb-node = { workspace = true } +lb-utils = { workspace = true } rand = { workspace = true } testing-framework-config = { workspace = true } testing-framework-core = { path = "../../core" } diff --git a/testing-framework/deployers/local/src/manual/readiness.rs b/testing-framework/deployers/local/src/manual/readiness.rs index 327a2af..2e9ac08 100644 --- a/testing-framework/deployers/local/src/manual/readiness.rs +++ b/testing-framework/deployers/local/src/manual/readiness.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use nomos_network::backends::libp2p::Libp2pInfo; +use lb_network_service::backends::libp2p::Libp2pInfo; use testing_framework_core::topology::readiness::ReadinessCheck; use tokio::time::timeout; diff --git a/testing-framework/deployers/local/src/node_control/config.rs b/testing-framework/deployers/local/src/node_control/config.rs index 8fe9aec..bcab4b9 100644 --- a/testing-framework/deployers/local/src/node_control/config.rs +++ b/testing-framework/deployers/local/src/node_control/config.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; -use nomos_libp2p::Multiaddr; -use nomos_utils::net::get_available_udp_port; +use lb_libp2p::Multiaddr; +use lb_utils::net::get_available_udp_port; use rand::Rng as _; use testing_framework_config::topology::configs::{ consensus, diff --git a/testing-framework/deployers/local/src/node_control/mod.rs b/testing-framework/deployers/local/src/node_control/mod.rs index da7ae79..d39965a 100644 --- a/testing-framework/deployers/local/src/node_control/mod.rs +++ b/testing-framework/deployers/local/src/node_control/mod.rs @@ -3,7 +3,7 @@ use std::{ sync::Mutex, }; -use nomos_node::config::RunConfig; +use lb_node::config::RunConfig; use testing_framework_config::topology::configs::{consensus, time}; use testing_framework_core::{ nodes::{ diff --git a/testing-framework/env/src/lib.rs b/testing-framework/env/src/lib.rs index b5a2437..1c5ccdb 100644 --- a/testing-framework/env/src/lib.rs +++ b/testing-framework/env/src/lib.rs @@ -58,7 +58,7 @@ pub fn rust_log() -> Option { } #[must_use] -pub fn nomos_time_backend() -> Option { +pub fn lb_time_service_backend() -> Option { env::var("LOGOS_BLOCKCHAIN_TIME_BACKEND").ok() } diff --git a/testing-framework/tools/cfgsync_tf/Cargo.toml b/testing-framework/tools/cfgsync_tf/Cargo.toml index 6951e60..d17c5b0 100644 --- a/testing-framework/tools/cfgsync_tf/Cargo.toml +++ b/testing-framework/tools/cfgsync_tf/Cargo.toml @@ -13,26 +13,26 @@ version = { workspace = true } workspace = true [dependencies] -anyhow = "1" -axum = { default-features = false, features = ["http1", "http2", "json", "tokio"], version = "0.7.5" } -clap = { default-features = false, version = "4" } -groth16 = { workspace = true } -hex = { workspace = true } -key-management-system-service = { workspace = true } -nomos-core = { workspace = true } -nomos-libp2p = { workspace = true } -nomos-node = { workspace = true } -nomos-tracing-service = { workspace = true } -nomos-utils = { workspace = true } -rand = { workspace = true } -reqwest = { workspace = true } -serde = { default-features = false, version = "1" } -serde_json = { default-features = false, version = "1.0" } -serde_path_to_error = "0.1" -serde_with = { workspace = true } -serde_yaml = "0.9" -testing-framework-config = { workspace = true } -testing-framework-core = { path = "../../core" } -thiserror = { workspace = true } -tokio = { default-features = false, features = ["macros", "net", "rt-multi-thread"], version = "1" } -tracing = { workspace = true } +anyhow = "1" +axum = { default-features = false, features = ["http1", "http2", "json", "tokio"], version = "0.7.5" } +clap = { default-features = false, version = "4" } +hex = { workspace = true } +lb-core = { workspace = true } +lb-groth16 = { workspace = true } +lb-key-management-system-service = { workspace = true } +lb-libp2p = { workspace = true } +lb-node = { workspace = true } +lb-tracing-service = { workspace = true } +lb-utils = { workspace = true } +rand = { workspace = true } +reqwest = { workspace = true } +serde = { default-features = false, version = "1" } +serde_json = { default-features = false, version = "1.0" } +serde_path_to_error = "0.1" +serde_with = { workspace = true } +serde_yaml = "0.9" +testing-framework-config = { workspace = true } +testing-framework-core = { path = "../../core" } +thiserror = { workspace = true } +tokio = { default-features = false, features = ["macros", "net", "rt-multi-thread"], version = "1" } +tracing = { workspace = true } diff --git a/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs b/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs index 8469338..cb95f6a 100644 --- a/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs +++ b/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs @@ -4,7 +4,7 @@ use cfgsync_tf::{ client::{FetchedConfig, get_config}, server::ClientIp, }; -use nomos_node::UserConfig; +use lb_node::UserConfig; use serde::{Serialize, de::DeserializeOwned}; use testing_framework_config::constants::cfgsync_port as default_cfgsync_port; use testing_framework_core::nodes::common::config::injection::{ diff --git a/testing-framework/tools/cfgsync_tf/src/config/builder.rs b/testing-framework/tools/cfgsync_tf/src/config/builder.rs index 74638f1..bbc1dae 100644 --- a/testing-framework/tools/cfgsync_tf/src/config/builder.rs +++ b/testing-framework/tools/cfgsync_tf/src/config/builder.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, net::Ipv4Addr, str::FromStr as _}; -use nomos_core::mantle::GenesisTx as _; -use nomos_libp2p::{Multiaddr, PeerId, ed25519}; -use nomos_tracing_service::TracingSettings; +use lb_core::mantle::GenesisTx as _; +use lb_libp2p::{Multiaddr, PeerId, ed25519}; +use lb_tracing_service::TracingSettings; use rand::{Rng as _, thread_rng}; use testing_framework_config::topology::configs::{ GeneralConfig, @@ -165,7 +165,7 @@ pub fn try_create_node_configs( message: source.to_string(), } })?; - network_config.backend.swarm.nat_config = nomos_libp2p::NatSettings::Static { + network_config.backend.swarm.nat_config = lb_libp2p::NatSettings::Static { external_address: nat_addr, }; diff --git a/testing-framework/tools/cfgsync_tf/src/config/kms.rs b/testing-framework/tools/cfgsync_tf/src/config/kms.rs index a7a76c9..f9699bb 100644 --- a/testing-framework/tools/cfgsync_tf/src/config/kms.rs +++ b/testing-framework/tools/cfgsync_tf/src/config/kms.rs @@ -1,5 +1,5 @@ -use groth16::fr_to_bytes; -use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; +use lb_groth16::fr_to_bytes; +use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; use testing_framework_config::topology::configs::blend::GeneralBlendConfig; pub fn create_kms_configs(blend_configs: &[GeneralBlendConfig]) -> Vec { diff --git a/testing-framework/tools/cfgsync_tf/src/config/providers.rs b/testing-framework/tools/cfgsync_tf/src/config/providers.rs index e5ff712..c8fad65 100644 --- a/testing-framework/tools/cfgsync_tf/src/config/providers.rs +++ b/testing-framework/tools/cfgsync_tf/src/config/providers.rs @@ -1,7 +1,7 @@ use std::str::FromStr; -use nomos_core::sdp::{Locator, ServiceType}; -use nomos_libp2p::Multiaddr; +use lb_core::sdp::{Locator, ServiceType}; +use lb_libp2p::Multiaddr; use testing_framework_config::topology::configs::{ blend::GeneralBlendConfig, consensus::{GeneralConsensusConfig, ProviderInfo}, diff --git a/testing-framework/tools/cfgsync_tf/src/config/tracing.rs b/testing-framework/tools/cfgsync_tf/src/config/tracing.rs index 7a174ab..04123c2 100644 --- a/testing-framework/tools/cfgsync_tf/src/config/tracing.rs +++ b/testing-framework/tools/cfgsync_tf/src/config/tracing.rs @@ -1,4 +1,4 @@ -use nomos_tracing_service::{LoggerLayer, MetricsLayer, TracingLayer, TracingSettings}; +use lb_tracing_service::{LoggerLayer, MetricsLayer, TracingLayer, TracingSettings}; use testing_framework_config::topology::configs::tracing::GeneralTracingConfig; pub fn update_tracing_identifier( diff --git a/testing-framework/tools/cfgsync_tf/src/network/address.rs b/testing-framework/tools/cfgsync_tf/src/network/address.rs index 175a004..462a163 100644 --- a/testing-framework/tools/cfgsync_tf/src/network/address.rs +++ b/testing-framework/tools/cfgsync_tf/src/network/address.rs @@ -1,4 +1,4 @@ -use nomos_libp2p::{Multiaddr, Protocol}; +use lb_libp2p::{Multiaddr, Protocol}; pub fn extract_udp_port(addr: &Multiaddr) -> Option { addr.iter().find_map(|protocol| { diff --git a/testing-framework/tools/cfgsync_tf/src/network/peers.rs b/testing-framework/tools/cfgsync_tf/src/network/peers.rs index 1e0ebfe..138a96f 100644 --- a/testing-framework/tools/cfgsync_tf/src/network/peers.rs +++ b/testing-framework/tools/cfgsync_tf/src/network/peers.rs @@ -1,4 +1,4 @@ -use nomos_libp2p::{Multiaddr, PeerId, Protocol}; +use lb_libp2p::{Multiaddr, PeerId, Protocol}; use thiserror::Error; use super::address::find_matching_host; diff --git a/testing-framework/tools/cfgsync_tf/src/repo.rs b/testing-framework/tools/cfgsync_tf/src/repo.rs index 657bae3..6ccf57e 100644 --- a/testing-framework/tools/cfgsync_tf/src/repo.rs +++ b/testing-framework/tools/cfgsync_tf/src/repo.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::Arc, time::Duration}; -use nomos_tracing_service::TracingSettings; +use lb_tracing_service::TracingSettings; use testing_framework_config::topology::configs::{ GeneralConfig, consensus::ConsensusParams, wallet::WalletConfig, }; diff --git a/testing-framework/tools/cfgsync_tf/src/server.rs b/testing-framework/tools/cfgsync_tf/src/server.rs index 48acd5b..7a79126 100644 --- a/testing-framework/tools/cfgsync_tf/src/server.rs +++ b/testing-framework/tools/cfgsync_tf/src/server.rs @@ -5,8 +5,8 @@ const DEFAULT_DELAY_BEFORE_NEW_DOWNLOAD_SECS: u64 = 10; const DEFAULT_MAX_ORPHAN_CACHE_SIZE: usize = 5; use axum::{Json, Router, extract::State, http::StatusCode, response::IntoResponse, routing::post}; -use nomos_tracing_service::TracingSettings; -use nomos_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; +use lb_tracing_service::TracingSettings; +use lb_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; use serde::{Deserialize, Serialize}; use serde_json::{Value, json, to_value}; use serde_with::serde_as; diff --git a/testing-framework/workflows/Cargo.toml b/testing-framework/workflows/Cargo.toml index 58b6337..9b575dd 100644 --- a/testing-framework/workflows/Cargo.toml +++ b/testing-framework/workflows/Cargo.toml @@ -13,17 +13,16 @@ version = "0.1.0" workspace = true [dependencies] -async-trait = "0.1" -chain-service = { workspace = true } -key-management-system-service = { workspace = true } -nomos-core = { workspace = true } -rand = { workspace = true } -reqwest = { workspace = true } -testing-framework-config = { workspace = true } -testing-framework-core = { workspace = true } -thiserror = { workspace = true } -tokio = { features = ["macros", "net", "rt-multi-thread", "time"], workspace = true } -tracing = { workspace = true } +async-trait = "0.1" +lb-core = { workspace = true } +lb-key-management-system-service = { workspace = true } +rand = { workspace = true } +reqwest = { workspace = true } +testing-framework-config = { workspace = true } +testing-framework-core = { workspace = true } +thiserror = { workspace = true } +tokio = { features = ["macros", "net", "rt-multi-thread", "time"], workspace = true } +tracing = { workspace = true } [package.metadata.cargo-machete] ignored = ["chain-service"] diff --git a/testing-framework/workflows/src/expectations/consensus_liveness.rs b/testing-framework/workflows/src/expectations/consensus_liveness.rs index 434ef4f..1cdabfc 100644 --- a/testing-framework/workflows/src/expectations/consensus_liveness.rs +++ b/testing-framework/workflows/src/expectations/consensus_liveness.rs @@ -1,7 +1,7 @@ use std::time::Duration; use async_trait::async_trait; -use nomos_core::header::HeaderId; +use lb_core::header::HeaderId; use testing_framework_core::{ nodes::ApiClient, scenario::{DynError, Expectation, RunContext}, diff --git a/testing-framework/workflows/src/util/tx.rs b/testing-framework/workflows/src/util/tx.rs index 4f60210..181e9a1 100644 --- a/testing-framework/workflows/src/util/tx.rs +++ b/testing-framework/workflows/src/util/tx.rs @@ -1,9 +1,9 @@ -use key_management_system_service::keys::{Ed25519Key, ZkKey}; -use nomos_core::mantle::{ +use lb_core::mantle::{ MantleTx, Op, OpProof, SignedMantleTx, Transaction as _, ledger::Tx as LedgerTx, ops::channel::{ChannelId, MsgId, inscribe::InscriptionOp}, }; +use lb_key_management_system_service::keys::{Ed25519Key, ZkKey}; use testing_framework_core::scenario::DynError; /// Builds a signed inscription transaction with deterministic payload for diff --git a/testing-framework/workflows/src/workloads/transaction/expectation.rs b/testing-framework/workflows/src/workloads/transaction/expectation.rs index eb258da..4aa62af 100644 --- a/testing-framework/workflows/src/workloads/transaction/expectation.rs +++ b/testing-framework/workflows/src/workloads/transaction/expectation.rs @@ -9,8 +9,8 @@ use std::{ }; use async_trait::async_trait; -use key_management_system_service::keys::ZkPublicKey; -use nomos_core::{header::HeaderId, mantle::AuthenticatedMantleTx as _}; +use lb_core::{header::HeaderId, mantle::AuthenticatedMantleTx as _}; +use lb_key_management_system_service::keys::ZkPublicKey; use testing_framework_core::scenario::{DynError, Expectation, RunContext}; use thiserror::Error; use tokio::{sync::broadcast, time::sleep}; diff --git a/testing-framework/workflows/src/workloads/transaction/workload.rs b/testing-framework/workflows/src/workloads/transaction/workload.rs index da6e077..389e771 100644 --- a/testing-framework/workflows/src/workloads/transaction/workload.rs +++ b/testing-framework/workflows/src/workloads/transaction/workload.rs @@ -6,10 +6,10 @@ use std::{ }; use async_trait::async_trait; -use key_management_system_service::keys::{ZkKey, ZkPublicKey}; -use nomos_core::mantle::{ +use lb_core::mantle::{ GenesisTx as _, Note, SignedMantleTx, Transaction as _, Utxo, tx_builder::MantleTxBuilder, }; +use lb_key_management_system_service::keys::{ZkKey, ZkPublicKey}; use testing_framework_config::topology::configs::wallet::WalletAccount; use testing_framework_core::{ scenario::{DynError, Expectation, RunContext, RunMetrics, Workload as ScenarioWorkload}, diff --git a/testing-framework/workflows/src/workloads/util.rs b/testing-framework/workflows/src/workloads/util.rs index b000f3d..95cc53f 100644 --- a/testing-framework/workflows/src/workloads/util.rs +++ b/testing-framework/workflows/src/workloads/util.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use nomos_core::{ +use lb_core::{ block::Block, mantle::{ AuthenticatedMantleTx as _, SignedMantleTx, Transaction as MantleTx, diff --git a/versions.env b/versions.env index 0bebacd..a316c07 100644 --- a/versions.env +++ b/versions.env @@ -1,7 +1,7 @@ VERSION=v0.3.2 LOGOS_BLOCKCHAIN_BUNDLE_VERSION=v4 # Pinned logos-blockchain-node revision used for CI builds and binary bundles. -LOGOS_BLOCKCHAIN_NODE_REV=2392190d88e8ae8271fa9321014ea33324be7c28 +LOGOS_BLOCKCHAIN_NODE_REV=a075fdf3209947572069e7b7b2ff6250576c8831 # Optional: local logos-blockchain-node checkout override (do not commit absolute paths). # LOGOS_BLOCKCHAIN_NODE_PATH=