logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-05-20 08:39:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update config and crate naming

Browse Source 
- 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<PathBuf>) -> std::io::Result<TempDir> {`.
- Wired in optional `persist_dir` when using the local deployer.

**Note:** Unsure about the `service_params` mapping in `pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeploymentSettings {`
This commit is contained in:
hansieodendaal 2026-02-07 09:43:31 +02:00
parent 70dbef96c2
commit d1f36f70a8
No known key found for this signature in database
GPG Key ID: 4B3B15868823687C
61 changed files with 430 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
Cargo.lock generated
View File

@ -601,7 +601,6 @@ dependencies = [
"tower 0.5.3", "tower 0.5.3",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
@ -622,7 +621,6 @@ dependencies = [
"sync_wrapper", "sync_wrapper",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
@ -1218,19 +1216,6 @@ dependencies = [
"syn 2.0.114", "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]] [[package]]
name = "data-encoding" name = "data-encoding"
version = "2.10.0" version = "2.10.0"
@ -1685,16 +1670,6 @@ dependencies = [
"percent-encoding", "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]] [[package]]
name = "futures" name = "futures"
version = "0.3.31" version = "0.3.31"
@ -1919,26 +1894,6 @@ dependencies = [
"wasm-bindgen", "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]] [[package]]
name = "group" name = "group"
version = "0.13.0" version = "0.13.0"
@ -3389,12 +3344,13 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]] [[package]]
name = "logos-blockchain-api-service" name = "logos-blockchain-api-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
"futures", "futures",
"logos-blockchain-chain-broadcast-service", "logos-blockchain-chain-broadcast-service",
"logos-blockchain-chain-leader-service",
"logos-blockchain-chain-service", "logos-blockchain-chain-service",
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-network-service", "logos-blockchain-network-service",
@ -3415,7 +3371,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend" name = "logos-blockchain-blend"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-blend-crypto", "logos-blockchain-blend-crypto",
"logos-blockchain-blend-message", "logos-blockchain-blend-message",
@ -3427,7 +3383,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-crypto" name = "logos-blockchain-blend-crypto"
version = "0.1.0" 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 = [ dependencies = [
"blake2", "blake2",
"logos-blockchain-groth16", "logos-blockchain-groth16",
@ -3441,7 +3397,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-message" name = "logos-blockchain-blend-message"
version = "0.1.0" 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 = [ dependencies = [
"blake2", "blake2",
"derivative", "derivative",
@ -3463,7 +3419,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-network" name = "logos-blockchain-blend-network"
version = "0.1.0" 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 = [ dependencies = [
"either", "either",
"futures", "futures",
@ -3481,7 +3437,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-proofs" name = "logos-blockchain-blend-proofs"
version = "0.1.0" 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 = [ dependencies = [
"ed25519-dalek", "ed25519-dalek",
"generic-array 1.3.5", "generic-array 1.3.5",
@ -3496,7 +3452,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-scheduling" name = "logos-blockchain-blend-scheduling"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"derivative", "derivative",
@ -3513,13 +3469,14 @@ dependencies = [
"thiserror 1.0.69", "thiserror 1.0.69",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-util",
"tracing", "tracing",
] ]
[[package]] [[package]]
name = "logos-blockchain-blend-service" name = "logos-blockchain-blend-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"fork_stream", "fork_stream",
@ -3554,7 +3511,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-broadcast-service" name = "logos-blockchain-chain-broadcast-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"derivative", "derivative",
@ -3570,7 +3527,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-leader-service" name = "logos-blockchain-chain-leader-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3598,7 +3555,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-network-service" name = "logos-blockchain-chain-network-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3626,7 +3583,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-service" name = "logos-blockchain-chain-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3656,7 +3613,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-service-common" name = "logos-blockchain-chain-service-common"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-core", "logos-blockchain-core",
"serde", "serde",
@ -3665,7 +3622,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-circuits-prover" name = "logos-blockchain-circuits-prover"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
"tempfile", "tempfile",
@ -3674,7 +3631,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-circuits-utils" name = "logos-blockchain-circuits-utils"
version = "0.1.0" 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 = [ dependencies = [
"dirs", "dirs",
] ]
@ -3682,13 +3639,16 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-common-http-client" name = "logos-blockchain-common-http-client"
version = "0.1.0" 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 = [ dependencies = [
"futures", "futures",
"hex",
"logos-blockchain-chain-broadcast-service", "logos-blockchain-chain-broadcast-service",
"logos-blockchain-chain-service", "logos-blockchain-chain-service",
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-groth16",
"logos-blockchain-http-api-common", "logos-blockchain-http-api-common",
"logos-blockchain-key-management-system-keys",
"reqwest", "reqwest",
"serde", "serde",
"serde_json", "serde_json",
@ -3699,7 +3659,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-core" name = "logos-blockchain-core"
version = "0.1.0" 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 = [ dependencies = [
"ark-ff 0.4.2", "ark-ff 0.4.2",
"bincode", "bincode",
@ -3729,7 +3689,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-cryptarchia-engine" name = "logos-blockchain-cryptarchia-engine"
version = "0.1.0" 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 = [ dependencies = [
"cfg_eval", "cfg_eval",
"logos-blockchain-utils", "logos-blockchain-utils",
@ -3744,7 +3704,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-cryptarchia-sync" name = "logos-blockchain-cryptarchia-sync"
version = "0.1.0" 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 = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
@ -3763,7 +3723,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-groth16" name = "logos-blockchain-groth16"
version = "0.1.0" 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 = [ dependencies = [
"ark-bn254 0.4.0", "ark-bn254 0.4.0",
"ark-ec 0.4.2", "ark-ec 0.4.2",
@ -3781,22 +3741,20 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-http-api-common" name = "logos-blockchain-http-api-common"
version = "0.1.0" 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 = [ dependencies = [
"axum", "axum",
"governor",
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-key-management-system-keys", "logos-blockchain-key-management-system-keys",
"serde", "serde",
"serde_json", "serde_json",
"serde_with", "serde_with",
"tower_governor",
] ]
[[package]] [[package]]
name = "logos-blockchain-key-management-system-keys" name = "logos-blockchain-key-management-system-keys"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3821,7 +3779,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-macros" name = "logos-blockchain-key-management-system-macros"
version = "0.1.0" 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 = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3831,7 +3789,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-operators" name = "logos-blockchain-key-management-system-operators"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"logos-blockchain-blend-proofs", "logos-blockchain-blend-proofs",
@ -3847,7 +3805,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-service" name = "logos-blockchain-key-management-system-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"log", "log",
@ -3863,7 +3821,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-ledger" name = "logos-blockchain-ledger"
version = "0.1.0" 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 = [ dependencies = [
"derivative", "derivative",
"logos-blockchain-blend-crypto", "logos-blockchain-blend-crypto",
@ -3887,7 +3845,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-libp2p" name = "logos-blockchain-libp2p"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"backon", "backon",
@ -3916,7 +3874,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-network-service" name = "logos-blockchain-network-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3935,7 +3893,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-node" name = "logos-blockchain-node"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
@ -3991,7 +3949,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-poc" name = "logos-blockchain-poc"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4006,7 +3964,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-pol" name = "logos-blockchain-pol"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4022,7 +3980,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-poq" name = "logos-blockchain-poq"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4038,7 +3996,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-poseidon2" name = "logos-blockchain-poseidon2"
version = "0.1.0" 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 = [ dependencies = [
"ark-bn254 0.4.0", "ark-bn254 0.4.0",
"ark-ff 0.4.2", "ark-ff 0.4.2",
@ -4049,7 +4007,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-sdp-service" name = "logos-blockchain-sdp-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -4065,7 +4023,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-services-utils" name = "logos-blockchain-services-utils"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -4080,7 +4038,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-storage-service" name = "logos-blockchain-storage-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -4098,7 +4056,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-system-sig-service" name = "logos-blockchain-system-sig-service"
version = "0.1.0" 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 = [ dependencies = [
"async-ctrlc", "async-ctrlc",
"async-trait", "async-trait",
@ -4109,7 +4067,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-time-service" name = "logos-blockchain-time-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"cfg_eval", "cfg_eval",
@ -4131,7 +4089,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tracing" name = "logos-blockchain-tracing"
version = "0.1.0" 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 = [ dependencies = [
"opentelemetry", "opentelemetry",
"opentelemetry-http", "opentelemetry-http",
@ -4154,7 +4112,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tracing-service" name = "logos-blockchain-tracing-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"logos-blockchain-tracing", "logos-blockchain-tracing",
@ -4168,7 +4126,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tx-service" name = "logos-blockchain-tx-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -4190,7 +4148,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-utils" name = "logos-blockchain-utils"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"blake2", "blake2",
@ -4207,7 +4165,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-utxotree" name = "logos-blockchain-utxotree"
version = "0.1.0" 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 = [ dependencies = [
"ark-ff 0.4.2", "ark-ff 0.4.2",
"logos-blockchain-groth16", "logos-blockchain-groth16",
@ -4221,7 +4179,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-wallet" name = "logos-blockchain-wallet"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-key-management-system-keys", "logos-blockchain-key-management-system-keys",
@ -4236,7 +4194,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-wallet-service" name = "logos-blockchain-wallet-service"
version = "0.1.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -4261,7 +4219,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-witness-generator" name = "logos-blockchain-witness-generator"
version = "0.1.0" 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 = [ dependencies = [
"tempfile", "tempfile",
] ]
@ -4269,7 +4227,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-zksign" name = "logos-blockchain-zksign"
version = "0.1.0" 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 = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4644,12 +4602,6 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "no-std-compat"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
[[package]] [[package]]
name = "nom" name = "nom"
version = "7.1.3" version = "7.1.3"
@ -4669,18 +4621,6 @@ dependencies = [
"memchr", "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]] [[package]]
name = "nu-ansi-term" name = "nu-ansi-term"
version = "0.50.3" version = "0.50.3"
@ -5351,21 +5291,6 @@ dependencies = [
"prost", "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]] [[package]]
name = "quick-protobuf" name = "quick-protobuf"
version = "0.8.1" version = "0.8.1"
@ -5527,15 +5452,6 @@ dependencies = [
"rand_core 0.9.5", "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]] [[package]]
name = "rcgen" name = "rcgen"
version = "0.13.2" version = "0.13.2"
@ -6262,15 +6178,6 @@ dependencies = [
"windows-sys 0.60.2", "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]] [[package]]
name = "spki" name = "spki"
version = "0.7.3" version = "0.7.3"
@ -6458,6 +6365,7 @@ dependencies = [
"hex", "hex",
"logos-blockchain-api-service", "logos-blockchain-api-service",
"logos-blockchain-blend-service", "logos-blockchain-blend-service",
"logos-blockchain-chain-leader-service",
"logos-blockchain-chain-network-service", "logos-blockchain-chain-network-service",
"logos-blockchain-chain-service", "logos-blockchain-chain-service",
"logos-blockchain-core", "logos-blockchain-core",
@ -6910,7 +6818,6 @@ dependencies = [
"tokio", "tokio",
"tower-layer", "tower-layer",
"tower-service", "tower-service",
"tracing",
] ]
[[package]] [[package]]
@ -6982,22 +6889,6 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" 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]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.44" version = "0.1.44"

62
Cargo.toml
View File

@ -40,37 +40,37 @@ testing-framework-runner-local = { default-features = false, path = "testing-f
testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" } testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" }
# Logos git dependencies (pinned to latest master) # 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" }
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" }
chain-leader = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-chain-broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-chain-leader-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
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" } lb-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } 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" }
nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-network-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-sdp-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-time-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-wallet-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "2392190d88e8ae8271fa9321014ea33324be7c28" } lb-zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" }
# External crates # External crates
async-trait = { default-features = false, version = "0.1" } async-trait = { default-features = false, version = "0.1" }

14
book/src/environment-variables.md
View File

@ -127,13 +127,13 @@ ls /tmp/test-logs/
**Common filter targets:** **Common filter targets:**
| Target Prefix | Subsystem | | Target Prefix | Subsystem |
|---------------|-----------| |---------------------------|-----------|
| `cryptarchia` | Consensus (Cryptarchia) | | `lb_cryptarchia` | Consensus (Cryptarchia) |
| `nomos_blend` | Mix network/privacy layer | | `lb_blend` | Mix network/privacy layer |
| `chain_service` | Chain service (node APIs/state) | | `lb_chain_service` | Chain service (node APIs/state) |
| `chain_network` | P2P networking | | `lb_chain_network` | P2P networking |
| `chain_leader` | Leader election | | `lb_chain_leader_service` | Leader election |
--- ---

18
book/src/logging-observability.md
View File

@ -45,7 +45,7 @@ See [Environment Variables Reference](environment-variables.md) for complete det
LOGOS_BLOCKCHAIN_TESTS_TRACING=true \ LOGOS_BLOCKCHAIN_TESTS_TRACING=true \
LOGOS_BLOCKCHAIN_LOG_DIR=/tmp/test-logs \ LOGOS_BLOCKCHAIN_LOG_DIR=/tmp/test-logs \
LOGOS_BLOCKCHAIN_LOG_LEVEL=debug \ 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 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`: Common target prefixes for `LOGOS_BLOCKCHAIN_LOG_FILTER`:
| Target Prefix | Subsystem | | Target Prefix | Subsystem |
|---------------|-----------| |---------------------------|-----------|
| `cryptarchia` | Consensus (Cryptarchia) | | `lb_cryptarchia` | Consensus (Cryptarchia) |
| `nomos_blend` | Mix network/privacy layer | | `lb_blend` | Mix network/privacy layer |
| `chain_service` | Chain service (node APIs/state) | | `lb_chain_service` | Chain service (node APIs/state) |
| `chain_network` | P2P networking | | `lb_chain_network` | P2P networking |
| `chain_leader` | Leader election | | `lb_chain_leader_service` | Leader election |
**Example filter:** **Example filter:**
```bash ```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"
``` ```
--- ---

53
testing-framework/configs/Cargo.toml
View File

@ -10,32 +10,33 @@ repository.workspace = true
version = "0.1.0" version = "0.1.0"
[dependencies] [dependencies]
chain-network = { workspace = true } hex = { default-features = false, version = "0.4.3" }
chain-service = { workspace = true } lb-api-service = { workspace = true }
cryptarchia-engine = { features = ["serde"], workspace = true } lb-blend-service = { features = ["libp2p"], workspace = true }
cryptarchia-sync = { workspace = true } lb-chain-leader-service = { workspace = true }
groth16 = { workspace = true } lb-chain-network = { workspace = true }
hex = { default-features = false, version = "0.4.3" } lb-chain-service = { workspace = true }
key-management-system-service = { workspace = true } lb-core = { workspace = true }
nomos-api = { workspace = true } lb-cryptarchia-engine = { features = ["serde"], workspace = true }
nomos-blend-service = { features = ["libp2p"], workspace = true } lb-cryptarchia-sync = { workspace = true }
nomos-core = { workspace = true } lb-groth16 = { workspace = true }
nomos-ledger = { features = ["serde"], workspace = true } lb-key-management-system-service = { workspace = true }
nomos-libp2p = { workspace = true } lb-ledger = { features = ["serde"], workspace = true }
nomos-node = { default-features = false, features = ["testing"], workspace = true } lb-libp2p = { workspace = true }
nomos-sdp = { workspace = true } lb-node = { default-features = false, features = ["testing"], workspace = true }
nomos-time = { workspace = true } lb-sdp-service = { workspace = true }
nomos-tracing = { workspace = true } lb-time-service = { workspace = true }
nomos-tracing-service = { workspace = true } lb-tracing = { workspace = true }
nomos-utils = { workspace = true } lb-tracing-service = { workspace = true }
nomos-wallet = { workspace = true } lb-utils = { workspace = true }
num-bigint = { default-features = false, version = "0.4" } lb-wallet-service = { workspace = true }
rand = { workspace = true } num-bigint = { default-features = false, version = "0.4" }
serde = { features = ["derive"], workspace = true } rand = { workspace = true }
testing-framework-env = { workspace = true } serde = { features = ["derive"], workspace = true }
thiserror = { workspace = true } testing-framework-env = { workspace = true }
time = { default-features = true, version = "0.3" } thiserror = { workspace = true }
tracing = { workspace = true } time = { default-features = true, version = "0.3" }
tracing = { workspace = true }
[lints] [lints]
workspace = true workspace = true

16
testing-framework/configs/src/lib.rs
View File

@ -1,7 +1,7 @@
use std::{net::Ipv4Addr, ops::Mul as _, sync::LazyLock, time::Duration}; use std::{net::Ipv4Addr, ops::Mul as _, sync::LazyLock, time::Duration};
use nomos_core::sdp::ProviderId; use lb_core::sdp::ProviderId;
use nomos_libp2p::{Multiaddr, PeerId, multiaddr}; use lb_libp2p::{Multiaddr, PeerId, multiaddr};
use testing_framework_env as tf_env; use testing_framework_env as tf_env;
pub mod constants; pub mod constants;
@ -31,17 +31,13 @@ pub fn node_address_from_port(port: u16) -> Multiaddr {
} }
#[must_use] #[must_use]
pub fn secret_key_to_peer_id(node_key: nomos_libp2p::ed25519::SecretKey) -> PeerId { pub fn secret_key_to_peer_id(node_key: lb_libp2p::ed25519::SecretKey) -> PeerId {
PeerId::from_public_key( PeerId::from_public_key(&lb_libp2p::ed25519::Keypair::from(node_key).public().into())
&nomos_libp2p::ed25519::Keypair::from(node_key)
.public()
.into(),
)
} }
#[must_use] #[must_use]
pub fn secret_key_to_provider_id(node_key: nomos_libp2p::ed25519::SecretKey) -> ProviderId { pub fn secret_key_to_provider_id(node_key: lb_libp2p::ed25519::SecretKey) -> ProviderId {
let bytes = nomos_libp2p::ed25519::Keypair::from(node_key) let bytes = lb_libp2p::ed25519::Keypair::from(node_key)
.public() .public()
.to_bytes(); .to_bytes();
match ProviderId::try_from(bytes) { match ProviderId::try_from(bytes) {

16
testing-framework/configs/src/nodes/blend.rs
View File

@ -1,19 +1,19 @@
use std::{num::NonZeroU64, path::PathBuf, time::Duration}; use std::{num::NonZeroU64, path::PathBuf, time::Duration};
use blend_serde::Config as BlendUserConfig; use blend_serde::Config as BlendUserConfig;
use key_management_system_service::keys::Key; use lb_blend_service::{
use nomos_blend_service::{
core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings, ZkSettings}, core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings, ZkSettings},
settings::TimingSettings, settings::TimingSettings,
}; };
use nomos_node::config::{ use lb_key_management_system_service::keys::Key;
use lb_node::config::{
blend::{ blend::{
deployment::{self as blend_deployment, Settings as BlendDeploymentSettings}, deployment::{self as blend_deployment, Settings as BlendDeploymentSettings},
serde as blend_serde, serde as blend_serde,
}, },
network::deployment::Settings as NetworkDeploymentSettings, network::deployment::Settings as NetworkDeploymentSettings,
}; };
use nomos_utils::math::NonNegativeF64; use lb_utils::math::NonNegativeF64;
use crate::{ use crate::{
nodes::kms::key_id_for_preload_backend, 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 MESSAGE_FREQUENCY_PER_ROUND: f64 = 1.0;
const MAX_RELEASE_DELAY_ROUNDS: u64 = 3; const MAX_RELEASE_DELAY_ROUNDS: u64 = 3;
const DATA_REPLICATION_FACTOR: u64 = 0; const DATA_REPLICATION_FACTOR: u64 = 0;
pub const ACTIVITY_THRESHOLD_SENSITIVITY: u64 = 1;
pub(crate) fn build_blend_service_config( pub(crate) fn build_blend_service_config(
config: &TopologyBlendConfig, config: &TopologyBlendConfig,
@ -138,19 +139,20 @@ fn build_blend_deployment_settings(
}, },
minimum_messages_coefficient: backend_core.minimum_messages_coefficient, minimum_messages_coefficient: backend_core.minimum_messages_coefficient,
normalization_constant: backend_core.normalization_constant, normalization_constant: backend_core.normalization_constant,
activity_threshold_sensitivity: ACTIVITY_THRESHOLD_SENSITIVITY,
}, },
} }
} }
fn build_network_deployment_settings() -> NetworkDeploymentSettings { fn build_network_deployment_settings() -> NetworkDeploymentSettings {
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", "/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", "/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", "/integration/nomos/cryptarchia/sync/1.0.0",
), ),
} }

75
testing-framework/configs/src/nodes/common.rs
View File

@ -5,19 +5,23 @@ use std::{
time::Duration, time::Duration,
}; };
use chain_network::{BootstrapConfig as ChainBootstrapConfig, OrphanConfig, SyncConfig}; use lb_api_service::ApiServiceSettings;
use chain_service::StartingState; use lb_chain_leader_service::LeaderWalletConfig;
use key_management_system_service::keys::Key; use lb_chain_network::{BootstrapConfig as ChainBootstrapConfig, OrphanConfig, SyncConfig};
use nomos_api::ApiServiceSettings; use lb_chain_service::StartingState;
use nomos_node::{ use lb_core::mantle::Value;
use lb_key_management_system_service::keys::{Key, secured_key::SecuredKey};
use lb_node::{
api::backend::AxumBackendSettings as NodeAxumBackendSettings, api::backend::AxumBackendSettings as NodeAxumBackendSettings,
config::{ config::{
cryptarchia::{ cryptarchia::{
deployment::{ deployment::{
SdpConfig as DeploymentSdpConfig, Settings as CryptarchiaDeploymentSettings, SdpConfig as DeploymentSdpConfig, ServiceParameters,
Settings as CryptarchiaDeploymentSettings,
}, },
serde::{ serde::{
Config as CryptarchiaConfig, NetworkConfig as CryptarchiaNetworkConfig, Config as CryptarchiaConfig, LeaderConfig,
NetworkConfig as CryptarchiaNetworkConfig,
ServiceConfig as CryptarchiaServiceConfig, ServiceConfig as CryptarchiaServiceConfig,
}, },
}, },
@ -25,7 +29,7 @@ use nomos_node::{
time::{deployment::Settings as TimeDeploymentSettings, serde::Config as TimeConfig}, 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}; 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 STATE_RECORDING_INTERVAL_SECS: u64 = 60;
const IBD_DOWNLOAD_DELAY_SECS: u64 = 10; const IBD_DOWNLOAD_DELAY_SECS: u64 = 10;
const MAX_ORPHAN_CACHE_SIZE: NonZeroUsize = unsafe { NonZeroUsize::new_unchecked(5) }; 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; const API_MAX_CONCURRENT_REQUESTS: usize = 1000;
pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeploymentSettings { 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::<HashMap<_, _>>();
CryptarchiaDeploymentSettings { CryptarchiaDeploymentSettings {
epoch_config: config.consensus_config.ledger_config.epoch_config, epoch_config: config.consensus_config.ledger_config.epoch_config,
security_param: config security_param: config
@ -48,12 +70,7 @@ pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeplo
.consensus_config .consensus_config
.security_param(), .security_param(),
sdp_config: DeploymentSdpConfig { sdp_config: DeploymentSdpConfig {
service_params: config service_params: node_service_params,
.consensus_config
.ledger_config
.sdp_config
.service_params
.clone(),
min_stake: config.consensus_config.ledger_config.sdp_config.min_stake, min_stake: config.consensus_config.ledger_config.sdp_config.min_stake,
}, },
gossipsub_protocol: CRYPTARCHIA_GOSSIPSUB_PROTOCOL.to_owned(), 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(), genesis_tx: config.consensus_config.genesis_tx.clone(),
}, },
recovery_file: PathBuf::from("recovery/cryptarchia.json"), 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, prolonged_bootstrap_period: config.bootstrapping_config.prolonged_bootstrap_period,
force_bootstrap: false, force_bootstrap: false,
offline_grace_period: chain_service::OfflineGracePeriodConfig { offline_grace_period: lb_chain_service::OfflineGracePeriodConfig {
grace_period: timeouts::grace_period(), grace_period: timeouts::grace_period(),
state_recording_interval: Duration::from_secs(STATE_RECORDING_INTERVAL_SECS), state_recording_interval: Duration::from_secs(STATE_RECORDING_INTERVAL_SECS),
}, },
@ -90,7 +107,7 @@ pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig {
}, },
network: CryptarchiaNetworkConfig { network: CryptarchiaNetworkConfig {
bootstrap: ChainBootstrapConfig { bootstrap: ChainBootstrapConfig {
ibd: chain_network::IbdConfig { ibd: lb_chain_network::IbdConfig {
peers: HashSet::new(), peers: HashSet::new(),
delay_before_new_download: Duration::from_secs(IBD_DOWNLOAD_DELAY_SECS), 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 { pub(crate) fn time_config(config: &GeneralConfig) -> TimeConfig {
TimeConfig { TimeConfig {
backend: nomos_time::backends::NtpTimeBackendSettings { backend: lb_time_service::backends::NtpTimeBackendSettings {
ntp_server: config.time_config.ntp_server.clone(), 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, timeout: config.time_config.timeout,
listening_interface: config.time_config.interface.clone(), 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 { pub(crate) fn mempool_config() -> lb_node::config::mempool::serde::Config {
nomos_node::config::mempool::serde::Config { lb_node::config::mempool::serde::Config {
recovery_path: PathBuf::from("recovery/mempool.json"), 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() config.tracing_config.tracing_settings.clone()
} }
@ -132,8 +155,6 @@ pub(crate) fn http_config(config: &GeneralConfig) -> ApiServiceSettings<NodeAxum
ApiServiceSettings { ApiServiceSettings {
backend_settings: NodeAxumBackendSettings { backend_settings: NodeAxumBackendSettings {
address: config.api_config.address, address: config.api_config.address,
rate_limit_per_second: API_RATE_LIMIT_PER_SECOND,
rate_limit_burst: API_RATE_LIMIT_BURST,
max_concurrent_requests: API_MAX_CONCURRENT_REQUESTS, max_concurrent_requests: API_MAX_CONCURRENT_REQUESTS,
..Default::default() ..Default::default()
}, },
@ -146,8 +167,6 @@ pub(crate) fn testing_http_config(
ApiServiceSettings { ApiServiceSettings {
backend_settings: NodeAxumBackendSettings { backend_settings: NodeAxumBackendSettings {
address: config.api_config.testing_http_address, address: config.api_config.testing_http_address,
rate_limit_per_second: API_RATE_LIMIT_PER_SECOND,
rate_limit_burst: API_RATE_LIMIT_BURST,
max_concurrent_requests: API_MAX_CONCURRENT_REQUESTS, max_concurrent_requests: API_MAX_CONCURRENT_REQUESTS,
..Default::default() ..Default::default()
}, },

4
testing-framework/configs/src/nodes/kms.rs
View File

@ -1,5 +1,5 @@
use groth16::fr_to_bytes; use lb_groth16::fr_to_bytes;
use key_management_system_service::{ use lb_key_management_system_service::{
backend::preload::KeyId, backend::preload::KeyId,
keys::{Key, secured_key::SecuredKey as _}, keys::{Key, secured_key::SecuredKey as _},
}; };

12
testing-framework/configs/src/nodes/node.rs
View File

@ -1,10 +1,10 @@
use key_management_system_service::keys::secured_key::SecuredKey as _; use lb_core::mantle::Value;
use nomos_core::mantle::Value; use lb_key_management_system_service::keys::secured_key::SecuredKey as _;
use nomos_node::{ use lb_node::{
RocksBackendSettings, UserConfig, RocksBackendSettings, UserConfig,
config::{RunConfig, deployment::DeploymentSettings}, config::{RunConfig, deployment::DeploymentSettings},
}; };
use nomos_sdp::{SdpSettings, wallet::SdpWalletConfig}; use lb_sdp_service::{SdpSettings, wallet::SdpWalletConfig};
use crate::{ use crate::{
nodes::{ nodes::{
@ -56,8 +56,8 @@ pub fn create_node_config(config: GeneralConfig) -> RunConfig {
fn build_node_deployment_settings( fn build_node_deployment_settings(
config: &GeneralConfig, config: &GeneralConfig,
blend_deployment: nomos_node::config::blend::deployment::Settings, blend_deployment: lb_node::config::blend::deployment::Settings,
network_deployment: nomos_node::config::network::deployment::Settings, network_deployment: lb_node::config::network::deployment::Settings,
) -> DeploymentSettings { ) -> DeploymentSettings {
DeploymentSettings { DeploymentSettings {
blend: blend_deployment, blend: blend_deployment,

2
testing-framework/configs/src/topology/configs/api.rs
View File

@ -1,6 +1,6 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use nomos_utils::net::get_available_tcp_port; use lb_utils::net::get_available_tcp_port;
use thiserror::Error; use thiserror::Error;
const LOCALHOST: [u8; 4] = [127, 0, 0, 1]; const LOCALHOST: [u8; 4] = [127, 0, 0, 1];

8
testing-framework/configs/src/topology/configs/blend.rs
View File

@ -1,13 +1,13 @@
use core::time::Duration; use core::time::Duration;
use std::{net::Ipv4Addr, num::NonZeroU64}; use std::{net::Ipv4Addr, num::NonZeroU64};
use key_management_system_service::keys::{Ed25519Key, UnsecuredEd25519Key, ZkKey}; use lb_blend_service::{
use nomos_blend_service::{
core::backends::libp2p::Libp2pBlendBackendSettings as Libp2pCoreBlendBackendSettings, core::backends::libp2p::Libp2pBlendBackendSettings as Libp2pCoreBlendBackendSettings,
edge::backends::libp2p::Libp2pBlendBackendSettings as Libp2pEdgeBlendBackendSettings, edge::backends::libp2p::Libp2pBlendBackendSettings as Libp2pEdgeBlendBackendSettings,
}; };
use nomos_libp2p::{Multiaddr, Protocol, protocol_name::StreamProtocol}; use lb_key_management_system_service::keys::{Ed25519Key, UnsecuredEd25519Key, ZkKey};
use nomos_utils::math::NonNegativeF64; use lb_libp2p::{Multiaddr, Protocol, protocol_name::StreamProtocol};
use lb_utils::math::NonNegativeF64;
use num_bigint::BigUint; use num_bigint::BigUint;
const EDGE_NODE_CONNECTION_TIMEOUT: Duration = Duration::from_secs(1); const EDGE_NODE_CONNECTION_TIMEOUT: Duration = Duration::from_secs(1);

38
testing-framework/configs/src/topology/configs/consensus.rs
View File

@ -5,12 +5,7 @@ use std::{
sync::Arc, sync::Arc,
}; };
use cryptarchia_engine::EpochConfig; use lb_core::{
use groth16::CompressedGroth16Proof;
use key_management_system_service::keys::{
Ed25519Key, UnsecuredZkKey, ZkKey, ZkPublicKey, ZkSignature,
};
use nomos_core::{
mantle::{ mantle::{
GenesisTx as GenesisTxTrait, MantleTx, Note, OpProof, Utxo, GenesisTx as GenesisTxTrait, MantleTx, Note, OpProof, Utxo,
genesis_tx::GenesisTx, genesis_tx::GenesisTx,
@ -22,11 +17,17 @@ use nomos_core::{
}, },
sdp::{DeclarationMessage, Locator, ProviderId, ServiceParameters, ServiceType}, sdp::{DeclarationMessage, Locator, ProviderId, ServiceParameters, ServiceType},
}; };
use nomos_node::{SignedMantleTx, Transaction as _}; use lb_cryptarchia_engine::EpochConfig;
use nomos_utils::math::NonNegativeF64; 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 num_bigint::BigUint;
use super::wallet::{WalletAccount, WalletConfig}; use super::wallet::{WalletAccount, WalletConfig};
use crate::nodes::blend::ACTIVITY_THRESHOLD_SENSITIVITY;
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
pub enum ConsensusConfigError { pub enum ConsensusConfigError {
@ -101,7 +102,7 @@ impl ProviderInfo {
pub struct GeneralConsensusConfig { pub struct GeneralConsensusConfig {
pub leader_pk: ZkPublicKey, pub leader_pk: ZkPublicKey,
pub leader_sk: UnsecuredZkKey, pub leader_sk: UnsecuredZkKey,
pub ledger_config: nomos_ledger::Config, pub ledger_config: lb_ledger::Config,
pub genesis_tx: GenesisTx, pub genesis_tx: GenesisTx,
pub utxos: Vec<Utxo>, pub utxos: Vec<Utxo>,
pub blend_notes: Vec<ServiceNote>, pub blend_notes: Vec<ServiceNote>,
@ -161,18 +162,18 @@ fn create_genesis_tx(utxos: &mut [Utxo]) -> Result<GenesisTx, ConsensusConfigErr
fn build_ledger_config( fn build_ledger_config(
consensus_params: &ConsensusParams, consensus_params: &ConsensusParams,
) -> Result<nomos_ledger::Config, ConsensusConfigError> { ) -> Result<lb_ledger::Config, ConsensusConfigError> {
Ok(nomos_ledger::Config { Ok(lb_ledger::Config {
epoch_config: EpochConfig { epoch_config: EpochConfig {
epoch_stake_distribution_stabilization: unsafe { NonZero::new_unchecked(3) }, epoch_stake_distribution_stabilization: unsafe { NonZero::new_unchecked(3) },
epoch_period_nonce_buffer: unsafe { NonZero::new_unchecked(3) }, epoch_period_nonce_buffer: unsafe { NonZero::new_unchecked(3) },
epoch_period_nonce_stabilization: unsafe { NonZero::new_unchecked(4) }, 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.security_param,
consensus_params.active_slot_coeff, consensus_params.active_slot_coeff,
), ),
sdp_config: nomos_ledger::mantle::sdp::Config { sdp_config: lb_ledger::mantle::sdp::Config {
service_params: Arc::new( service_params: Arc::new(
[( [(
ServiceType::BlendNetwork, ServiceType::BlendNetwork,
@ -186,12 +187,12 @@ fn build_ledger_config(
)] )]
.into(), .into(),
), ),
min_stake: nomos_core::sdp::MinStake { min_stake: lb_core::sdp::MinStake {
threshold: 1, threshold: 1,
timestamp: 0, timestamp: 0,
}, },
service_rewards_params: nomos_ledger::mantle::sdp::ServiceRewardsParameters { service_rewards_params: lb_ledger::mantle::sdp::ServiceRewardsParameters {
blend: nomos_ledger::mantle::sdp::rewards::blend::RewardsParameters { blend: lb_ledger::mantle::sdp::rewards::blend::RewardsParameters {
rounds_per_session: unsafe { NonZeroU64::new_unchecked(10) }, rounds_per_session: unsafe { NonZeroU64::new_unchecked(10) },
message_frequency_per_round: NonNegativeF64::try_from(1.0).map_err(|_| { message_frequency_per_round: NonNegativeF64::try_from(1.0).map_err(|_| {
ConsensusConfigError::LedgerConfig { ConsensusConfigError::LedgerConfig {
@ -201,6 +202,7 @@ fn build_ledger_config(
num_blend_layers: unsafe { NonZeroU64::new_unchecked(3) }, num_blend_layers: unsafe { NonZeroU64::new_unchecked(3) },
minimum_network_size: unsafe { NonZeroU64::new_unchecked(1) }, minimum_network_size: unsafe { NonZeroU64::new_unchecked(1) },
data_replication_factor: 0, data_replication_factor: 0,
activity_threshold_sensitivity: ACTIVITY_THRESHOLD_SENSITIVITY,
}, },
}, },
}, },
@ -397,7 +399,7 @@ fn build_genesis_inscription() -> Result<InscriptionOp, ConsensusConfigError> {
fn build_genesis_ops( fn build_genesis_ops(
inscription: InscriptionOp, inscription: InscriptionOp,
ledger_tx_hash: nomos_core::mantle::TxHash, ledger_tx_hash: lb_core::mantle::TxHash,
providers: &[ProviderInfo], providers: &[ProviderInfo],
) -> Vec<Op> { ) -> Vec<Op> {
let mut ops = Vec::with_capacity(1 + providers.len()); let mut ops = Vec::with_capacity(1 + providers.len());
@ -423,7 +425,7 @@ fn build_genesis_ops(
} }
fn build_genesis_ops_proofs( fn build_genesis_ops_proofs(
mantle_tx_hash: nomos_core::mantle::TxHash, mantle_tx_hash: lb_core::mantle::TxHash,
providers: Vec<ProviderInfo>, providers: Vec<ProviderInfo>,
) -> Result<Vec<OpProof>, ConsensusConfigError> { ) -> Result<Vec<OpProof>, ConsensusConfigError> {
let mut ops_proofs = Vec::with_capacity(1 + providers.len()); let mut ops_proofs = Vec::with_capacity(1 + providers.len());

8
testing-framework/configs/src/topology/configs/deployment.rs
View File

@ -1,11 +1,11 @@
use core::{num::NonZeroU64, time::Duration}; use core::{num::NonZeroU64, time::Duration};
use nomos_blend_service::{ use lb_blend_service::{
core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings}, core::settings::{CoverTrafficSettings, MessageDelayerSettings, SchedulerSettings},
settings::TimingSettings, settings::TimingSettings,
}; };
use nomos_libp2p::protocol_name::StreamProtocol; use lb_libp2p::protocol_name::StreamProtocol;
use nomos_node::config::{ use lb_node::config::{
blend::deployment::{ blend::deployment::{
CommonSettings as BlendCommonSettings, CoreSettings as BlendCoreSettings, CommonSettings as BlendCommonSettings, CoreSettings as BlendCoreSettings,
Settings as BlendDeploymentSettings, Settings as BlendDeploymentSettings,
@ -13,7 +13,7 @@ use nomos_node::config::{
deployment::{CustomDeployment, Settings as DeploymentSettings}, deployment::{CustomDeployment, Settings as DeploymentSettings},
network::deployment::Settings as NetworkDeploymentSettings, network::deployment::Settings as NetworkDeploymentSettings,
}; };
use nomos_utils::math::NonNegativeF64; use lb_utils::math::NonNegativeF64;
const DEFAULT_ROUND_DURATION: Duration = Duration::from_secs(1); const DEFAULT_ROUND_DURATION: Duration = Duration::from_secs(1);

10
testing-framework/configs/src/topology/configs/mod.rs
View File

@ -16,13 +16,13 @@ use consensus::{
ConsensusConfigError, GeneralConsensusConfig, ProviderInfo, ConsensusConfigError, GeneralConsensusConfig, ProviderInfo,
create_genesis_tx_with_declarations, sync_utxos_with_genesis, create_genesis_tx_with_declarations, sync_utxos_with_genesis,
}; };
use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; use lb_core::{
use network::GeneralNetworkConfig;
use nomos_core::{
mantle::GenesisTx as _, mantle::GenesisTx as _,
sdp::{Locator, ServiceType}, 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 rand::{Rng as _, thread_rng};
use tracing::GeneralTracingConfig; use tracing::GeneralTracingConfig;
use wallet::WalletConfig; use wallet::WalletConfig;
@ -200,7 +200,7 @@ fn collect_blend_core_providers(
fn apply_consensus_genesis_tx( fn apply_consensus_genesis_tx(
consensus_configs: &mut [GeneralConsensusConfig], consensus_configs: &mut [GeneralConsensusConfig],
genesis_tx: &nomos_core::mantle::genesis_tx::GenesisTx, genesis_tx: &lb_core::mantle::genesis_tx::GenesisTx,
) -> Result<(), ConsensusConfigError> { ) -> Result<(), ConsensusConfigError> {
for c in consensus_configs { for c in consensus_configs {
c.genesis_tx = genesis_tx.clone(); c.genesis_tx = genesis_tx.clone();

12
testing-framework/configs/src/topology/configs/network.rs
View File

@ -1,10 +1,10 @@
use std::time::Duration; use std::time::Duration;
use nomos_libp2p::{ use lb_libp2p::{
IdentifySettings, KademliaSettings, Multiaddr, NatSettings, Protocol, ed25519, gossipsub, IdentifySettings, KademliaSettings, Multiaddr, NatSettings, Protocol, ed25519, gossipsub,
}; };
use nomos_node::config::network::serde::{BackendSettings, Config, SwarmConfig}; use lb_node::config::network::serde::{BackendSettings, Config, SwarmConfig};
use nomos_utils::net::get_available_udp_port; use lb_utils::net::get_available_udp_port;
use testing_framework_env as tf_env; use testing_framework_env as tf_env;
use thiserror::Error; use thiserror::Error;
@ -45,7 +45,7 @@ fn default_swarm_config() -> SwarmConfig {
gossipsub_config: gossipsub::Config::default(), gossipsub_config: gossipsub::Config::default(),
kademlia_config: KademliaSettings::default(), kademlia_config: KademliaSettings::default(),
identify_config: IdentifySettings::default(), identify_config: IdentifySettings::default(),
chain_sync_config: cryptarchia_sync::Config::default(), chain_sync_config: lb_cryptarchia_sync::Config::default(),
nat_config: NatSettings::default(), nat_config: NatSettings::default(),
} }
} }
@ -85,7 +85,7 @@ pub fn create_network_configs(
Ok(SwarmConfig { Ok(SwarmConfig {
node_key, node_key,
port, port,
chain_sync_config: cryptarchia_sync::Config { chain_sync_config: lb_cryptarchia_sync::Config {
peer_response_timeout: PEER_RESPONSE_TIMEOUT, peer_response_timeout: PEER_RESPONSE_TIMEOUT,
}, },
nat_config: nat_settings(port)?, nat_config: nat_settings(port)?,
@ -123,7 +123,7 @@ pub fn build_network_config_for_node(
let swarm_config = SwarmConfig { let swarm_config = SwarmConfig {
node_key, node_key,
port, port,
chain_sync_config: cryptarchia_sync::Config { chain_sync_config: lb_cryptarchia_sync::Config {
peer_response_timeout: PEER_RESPONSE_TIMEOUT, peer_response_timeout: PEER_RESPONSE_TIMEOUT,
}, },
nat_config: nat_settings(port)?, nat_config: nat_settings(port)?,

4
testing-framework/configs/src/topology/configs/runtime.rs
View File

@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key};
use nomos_libp2p::Multiaddr; use lb_libp2p::Multiaddr;
use crate::{ use crate::{
node_address_from_port, node_address_from_port,

10
testing-framework/configs/src/topology/configs/tracing.rs
View File

@ -1,9 +1,9 @@
use nomos_tracing::{ use lb_tracing::{
logging::{local::FileConfig, loki::LokiConfig}, logging::{local::FileConfig, loki::LokiConfig},
metrics::otlp::OtlpMetricsConfig, metrics::otlp::OtlpMetricsConfig,
tracing::otlp::OtlpTracingConfig, tracing::otlp::OtlpTracingConfig,
}; };
use nomos_tracing_service::{ use lb_tracing_service::{
ConsoleLayer, FilterLayer, LoggerLayer, MetricsLayer, TracingLayer, TracingSettings, ConsoleLayer, FilterLayer, LoggerLayer, MetricsLayer, TracingLayer, TracingSettings,
}; };
use testing_framework_env as tf_env; use testing_framework_env as tf_env;
@ -40,7 +40,7 @@ impl GeneralTracingConfig {
.unwrap_or(MetricsLayer::None); .unwrap_or(MetricsLayer::None);
let filter = file_filter_override().unwrap_or_else(|| { let filter = file_filter_override().unwrap_or_else(|| {
nomos_tracing::filter::envfilter::EnvFilterConfig { lb_tracing::filter::envfilter::EnvFilterConfig {
filters: std::iter::once(&("nomos", "debug")) filters: std::iter::once(&("nomos", "debug"))
.map(|(k, v)| ((*k).to_owned(), (*v).to_owned())) .map(|(k, v)| ((*k).to_owned(), (*v).to_owned()))
.collect(), .collect(),
@ -121,8 +121,8 @@ fn file_log_level() -> Level {
.unwrap_or(Level::INFO) .unwrap_or(Level::INFO)
} }
fn file_filter_override() -> Option<nomos_tracing::filter::envfilter::EnvFilterConfig> { fn file_filter_override() -> Option<lb_tracing::filter::envfilter::EnvFilterConfig> {
tf_env::nomos_log_filter().map(|raw| nomos_tracing::filter::envfilter::EnvFilterConfig { tf_env::nomos_log_filter().map(|raw| lb_tracing::filter::envfilter::EnvFilterConfig {
filters: raw filters: raw
.split(',') .split(',')
.filter_map(|pair| { .filter_map(|pair| {

2
testing-framework/configs/src/topology/configs/wallet.rs
View File

@ -1,6 +1,6 @@
use std::num::NonZeroUsize; 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; use num_bigint::BigUint;
/// Collection of wallet accounts that should be funded at genesis. /// Collection of wallet accounts that should be funded at genesis.

58
testing-framework/core/Cargo.toml
View File

@ -16,32 +16,32 @@ workspace = true
default = [] default = []
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
async-trait = "0.1" async-trait = "0.1"
chain-service = { workspace = true } futures = { default-features = false, version = "0.3" }
common-http-client = { workspace = true } hex = { default-features = false, version = "0.4.3" }
futures = { default-features = false, version = "0.3" } lb-chain-service = { workspace = true }
groth16 = { workspace = true } lb-common-http-client = { workspace = true }
hex = { default-features = false, version = "0.4.3" } lb-core = { workspace = true }
key-management-system-service = { workspace = true } lb-groth16 = { workspace = true }
nomos-core = { workspace = true } lb-http-api-common = { workspace = true }
nomos-http-api-common = { workspace = true } lb-key-management-system-service = { workspace = true }
nomos-libp2p = { workspace = true } lb-libp2p = { workspace = true }
nomos-network = { features = ["libp2p"], workspace = true } lb-network-service = { features = ["libp2p"], workspace = true }
nomos-node = { default-features = false, features = ["testing"], workspace = true } lb-node = { default-features = false, features = ["testing"], workspace = true }
nomos-tracing = { workspace = true } lb-tracing = { workspace = true }
nomos-tracing-service = { workspace = true } lb-tracing-service = { workspace = true }
nomos-utils = { workspace = true } lb-utils = { workspace = true }
prometheus-http-query = "0.8" prometheus-http-query = "0.8"
rand = { workspace = true } rand = { workspace = true }
reqwest = { features = ["json"], workspace = true } reqwest = { features = ["json"], workspace = true }
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_with = { workspace = true } serde_with = { workspace = true }
serde_yaml = { workspace = true } serde_yaml = { workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
testing-framework-config = { workspace = true } testing-framework-config = { workspace = true }
testing-framework-env = { workspace = true } testing-framework-env = { workspace = true }
thiserror = { workspace = true } thiserror = { workspace = true }
tokio = { features = ["macros", "process", "rt-multi-thread", "time"], workspace = true } tokio = { features = ["macros", "process", "rt-multi-thread", "time"], workspace = true }
tracing = { workspace = true } tracing = { workspace = true }

12
testing-framework/core/src/nodes/api_client.rs
View File

@ -1,14 +1,14 @@
use std::net::SocketAddr; use std::net::SocketAddr;
use chain_service::CryptarchiaInfo;
use common_http_client::CommonHttpClient;
use hex; use hex;
use nomos_core::{block::Block, mantle::SignedMantleTx}; use lb_chain_service::CryptarchiaInfo;
use nomos_http_api_common::paths::{ 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, CRYPTARCHIA_HEADERS, CRYPTARCHIA_INFO, MEMPOOL_ADD_TX, NETWORK_INFO, STORAGE_BLOCK,
}; };
use nomos_network::backends::libp2p::Libp2pInfo; use lb_network_service::backends::libp2p::Libp2pInfo;
use nomos_node::HeaderId; use lb_node::HeaderId;
use reqwest::{Client, RequestBuilder, Response, Url}; use reqwest::{Client, RequestBuilder, Response, Url};
use serde::{Serialize, de::DeserializeOwned}; use serde::{Serialize, de::DeserializeOwned};
use serde_json::Value; use serde_json::Value;

2
testing-framework/core/src/nodes/common/config/injection.rs
View File

@ -1,5 +1,5 @@
use hex; 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 serde_yaml::{Mapping, Number as YamlNumber, Value};
use testing_framework_config::nodes::kms::key_id_for_preload_backend; use testing_framework_config::nodes::kms::key_id_for_preload_backend;

2
testing-framework/core/src/nodes/common/lifecycle/spawn.rs
View File

@ -4,7 +4,7 @@ use std::{
path::Path, path::Path,
}; };
use nomos_tracing::logging::local::FileConfig; use lb_tracing::logging::local::FileConfig;
use serde::Serialize; use serde::Serialize;
use serde_yaml::Value; use serde_yaml::Value;
use testing_framework_env as tf_env; use testing_framework_env as tf_env;

2
testing-framework/core/src/nodes/common/node.rs
View File

@ -6,7 +6,7 @@ use std::{
time::Duration, time::Duration,
}; };
use nomos_tracing_service::LoggerLayer; use lb_tracing_service::LoggerLayer;
use reqwest::Url; use reqwest::Url;
use serde::Serialize; use serde::Serialize;
use tempfile::TempDir; use tempfile::TempDir;

11
testing-framework/core/src/nodes/mod.rs
View File

@ -3,6 +3,7 @@ pub mod common;
pub mod node; pub mod node;
use std::{ use std::{
fs,
io::{Error, ErrorKind}, io::{Error, ErrorKind},
path::PathBuf, path::PathBuf,
sync::LazyLock, sync::LazyLock,
@ -20,7 +21,7 @@ pub(crate) fn create_tempdir(custom_work_dir: Option<PathBuf>) -> std::io::Resul
let final_dir_name = dir let final_dir_name = dir
.components() .components()
.last() .last()
.ok_or(Error::new(ErrorKind::Other, "invalid final directory"))? .ok_or(Error::new(ErrorKind::Other, "Invalid final directory"))?
.as_os_str() .as_os_str()
.display() .display()
.to_string() .to_string()
@ -28,7 +29,13 @@ pub(crate) fn create_tempdir(custom_work_dir: Option<PathBuf>) -> std::io::Resul
+ "_"; + "_";
let parent_dir = dir let parent_dir = dir
.parent() .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)?; let mut temp_dir = TempDir::with_prefix_in(final_dir_name, parent_dir)?;
if should_persist_tempdir() { if should_persist_tempdir() {
temp_dir.disable_cleanup(true); temp_dir.disable_cleanup(true);

4
testing-framework/core/src/nodes/node.rs
View File

@ -1,7 +1,7 @@
use std::{ops::Deref, path::PathBuf, time::Duration}; use std::{ops::Deref, path::PathBuf, time::Duration};
use nomos_node::config::RunConfig; use lb_node::config::RunConfig;
use nomos_tracing_service::LoggerLayer; use lb_tracing_service::LoggerLayer;
pub use testing_framework_config::nodes::node::create_node_config; pub use testing_framework_config::nodes::node::create_node_config;
use tracing::{debug, info}; use tracing::{debug, info};

2
testing-framework/core/src/scenario/capabilities.rs
View File

@ -58,7 +58,7 @@ impl Default for StartNodeOptions {
impl StartNodeOptions { impl StartNodeOptions {
pub fn create_patch<F>(mut self, f: F) -> Self pub fn create_patch<F>(mut self, f: F) -> Self
where where
F: Fn(nomos_node::config::RunConfig) -> Result<nomos_node::config::RunConfig, DynError> F: Fn(lb_node::config::RunConfig) -> Result<lb_node::config::RunConfig, DynError>
+ Send + Send
+ Sync + Sync
+ 'static, + 'static,

4
testing-framework/core/src/scenario/cfgsync.rs
View File

@ -1,8 +1,8 @@
use std::{fs::File, num::NonZero, path::Path, time::Duration}; use std::{fs::File, num::NonZero, path::Path, time::Duration};
use anyhow::{Context as _, Result}; use anyhow::{Context as _, Result};
use nomos_tracing_service::TracingSettings; use lb_tracing_service::TracingSettings;
use nomos_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; use lb_utils::bounded_duration::{MinimalBoundedDuration, SECOND};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::serde_as; use serde_with::serde_as;
use tracing::debug; use tracing::debug;

18
testing-framework/core/src/scenario/definition.rs
View File

@ -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 thiserror::Error;
use tracing::{debug, info}; use tracing::{debug, info};
@ -107,6 +107,7 @@ pub struct TopologyConfigurator<Caps> {
builder: Builder<Caps>, builder: Builder<Caps>,
nodes: usize, nodes: usize,
network_star: bool, network_star: bool,
scenario_base_dir: Option<PathBuf>,
} }
impl<Caps: Default> Builder<Caps> { impl<Caps: Default> Builder<Caps> {
@ -286,6 +287,7 @@ impl<Caps> TopologyConfigurator<Caps> {
builder, builder,
nodes: 0, nodes: 0,
network_star: false, network_star: false,
scenario_base_dir: None,
} }
} }
@ -296,6 +298,13 @@ impl<Caps> TopologyConfigurator<Caps> {
self 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. /// Use a star libp2p network layout.
#[must_use] #[must_use]
pub fn network_star(mut self) -> Self { pub fn network_star(mut self) -> Self {
@ -327,7 +336,10 @@ impl<Caps> TopologyConfigurator<Caps> {
#[must_use] #[must_use]
pub fn apply(self) -> Builder<Caps> { pub fn apply(self) -> Builder<Caps> {
let mut builder = 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 { if self.network_star {
builder.topology = builder builder.topology = builder

2
testing-framework/core/src/scenario/http_probe.rs
View File

@ -1,7 +1,7 @@
use std::time::Duration; use std::time::Duration;
use futures::future::try_join_all; use futures::future::try_join_all;
use nomos_http_api_common::paths; use lb_http_api_common::paths;
use reqwest::Client as ReqwestClient; use reqwest::Client as ReqwestClient;
use thiserror::Error; use thiserror::Error;
use tokio::time::{Instant, sleep}; use tokio::time::{Instant, sleep};

6
testing-framework/core/src/scenario/runtime/block_feed.rs
View File

@ -8,9 +8,9 @@ use std::{
}; };
use anyhow::{Context as _, Result}; use anyhow::{Context as _, Result};
use nomos_core::{block::Block, mantle::SignedMantleTx}; use lb_core::{block::Block, mantle::SignedMantleTx};
use nomos_http_api_common::paths::STORAGE_BLOCK; use lb_http_api_common::paths::STORAGE_BLOCK;
use nomos_node::HeaderId; use lb_node::HeaderId;
use tokio::{sync::broadcast, task::JoinHandle, time::sleep}; use tokio::{sync::broadcast, task::JoinHandle, time::sleep};
use tracing::{debug, error}; use tracing::{debug, error};

35
testing-framework/core/src/topology/config.rs
View File

@ -1,10 +1,10 @@
use std::{collections::HashMap, path::PathBuf, sync::Arc}; use std::{collections::HashMap, path::PathBuf, sync::Arc};
use nomos_core::{ use lb_core::{
mantle::GenesisTx as _, mantle::GenesisTx as _,
sdp::{Locator, ServiceType}, sdp::{Locator, ServiceType},
}; };
use nomos_node::config::RunConfig; use lb_node::config::RunConfig;
use testing_framework_config::topology::{ use testing_framework_config::topology::{
configs::{ configs::{
api::{ApiConfigError, create_api_configs}, api::{ApiConfigError, create_api_configs},
@ -126,11 +126,6 @@ impl TopologyConfig {
self self
} }
#[must_use]
pub fn persist_dir(&self, index: usize) -> Option<&PathBuf> {
self.persist_dirs.get(&index)
}
#[must_use] #[must_use]
pub fn with_persist_dir(mut self, index: usize, dir: PathBuf) -> Self { pub fn with_persist_dir(mut self, index: usize, dir: PathBuf) -> Self {
self.persist_dirs.insert(index, dir); self.persist_dirs.insert(index, dir);
@ -144,6 +139,7 @@ pub struct TopologyBuilder {
config: TopologyConfig, config: TopologyConfig,
ids: Option<Vec<[u8; 32]>>, ids: Option<Vec<[u8; 32]>>,
blend_ports: Option<Vec<u16>>, blend_ports: Option<Vec<u16>>,
scenario_base_dir: Option<PathBuf>,
} }
impl TopologyBuilder { impl TopologyBuilder {
@ -154,6 +150,7 @@ impl TopologyBuilder {
config, config,
ids: None, ids: None,
blend_ports: None, blend_ports: None,
scenario_base_dir: None,
} }
} }
@ -192,6 +189,11 @@ impl TopologyBuilder {
self self
} }
pub fn with_scenario_base_dir(mut self, scenario_base_dir: Option<PathBuf>) -> Self {
self.scenario_base_dir = scenario_base_dir;
self
}
#[must_use] #[must_use]
/// Configure the libp2p network layout. /// Configure the libp2p network layout.
pub const fn with_network_layout(mut self, layout: Libp2pNetworkLayout) -> Self { pub const fn with_network_layout(mut self, layout: Libp2pNetworkLayout) -> Self {
@ -208,12 +210,19 @@ impl TopologyBuilder {
/// Finalize and generate topology and node descriptors. /// Finalize and generate topology and node descriptors.
pub fn build(self) -> Result<GeneratedTopology, TopologyBuildError> { pub fn build(self) -> Result<GeneratedTopology, TopologyBuildError> {
let Self { let Self {
config, mut config,
ids, ids,
blend_ports, blend_ports,
scenario_base_dir,
} = self; } = self;
let n_participants = participant_count(&config)?; 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)?; let (ids, blend_ports) = resolve_and_validate_vectors(ids, blend_ports, n_participants)?;
@ -262,7 +271,6 @@ impl TopologyBuilder {
&kms_configs, &kms_configs,
&time_config, &time_config,
&config.node_config_patches, &config.node_config_patches,
&config.persist_dirs,
)?; )?;
Ok(GeneratedTopology { config, nodes }) Ok(GeneratedTopology { config, nodes })
@ -322,14 +330,14 @@ fn collect_provider_infos(
fn create_consensus_genesis_tx( fn create_consensus_genesis_tx(
first_consensus: &testing_framework_config::topology::configs::consensus::GeneralConsensusConfig, first_consensus: &testing_framework_config::topology::configs::consensus::GeneralConsensusConfig,
providers: Vec<ProviderInfo>, providers: Vec<ProviderInfo>,
) -> Result<nomos_core::mantle::genesis_tx::GenesisTx, TopologyBuildError> { ) -> Result<lb_core::mantle::genesis_tx::GenesisTx, TopologyBuildError> {
let ledger_tx = first_consensus.genesis_tx.mantle_tx().ledger_tx.clone(); let ledger_tx = first_consensus.genesis_tx.mantle_tx().ledger_tx.clone();
Ok(create_genesis_tx_with_declarations(ledger_tx, providers)?) Ok(create_genesis_tx_with_declarations(ledger_tx, providers)?)
} }
fn apply_consensus_genesis_tx( fn apply_consensus_genesis_tx(
consensus_configs: &mut [testing_framework_config::topology::configs::consensus::GeneralConsensusConfig], 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> { ) -> Result<(), TopologyBuildError> {
for c in consensus_configs { for c in consensus_configs {
c.genesis_tx = genesis_tx.clone(); c.genesis_tx = genesis_tx.clone();
@ -350,10 +358,9 @@ fn build_node_descriptors(
blend_configs: &[testing_framework_config::topology::configs::blend::GeneralBlendConfig], blend_configs: &[testing_framework_config::topology::configs::blend::GeneralBlendConfig],
api_configs: &[testing_framework_config::topology::configs::api::GeneralApiConfig], api_configs: &[testing_framework_config::topology::configs::api::GeneralApiConfig],
tracing_configs: &[testing_framework_config::topology::configs::tracing::GeneralTracingConfig], 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, time_config: &testing_framework_config::topology::configs::time::GeneralTimeConfig,
node_config_patches: &HashMap<usize, NodeConfigPatch>, node_config_patches: &HashMap<usize, NodeConfigPatch>,
persist_dirs: &HashMap<usize, PathBuf>,
) -> Result<Vec<GeneratedNodeConfig>, TopologyBuildError> { ) -> Result<Vec<GeneratedNodeConfig>, TopologyBuildError> {
let mut nodes = Vec::with_capacity(config.n_nodes); let mut nodes = Vec::with_capacity(config.n_nodes);
@ -388,7 +395,7 @@ fn build_node_descriptors(
general, general,
blend_port, blend_port,
config_patch: node_config_patches.get(&i).cloned(), 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); nodes.push(descriptor);

8
testing-framework/core/src/topology/readiness/network.rs
View File

@ -1,5 +1,5 @@
use nomos_libp2p::PeerId; use lb_libp2p::PeerId;
use nomos_network::backends::libp2p::Libp2pInfo; use lb_network_service::backends::libp2p::Libp2pInfo;
use reqwest::{Client, Url}; use reqwest::{Client, Url};
use thiserror::Error; use thiserror::Error;
use tracing::warn; use tracing::warn;
@ -135,12 +135,12 @@ pub async fn try_fetch_network_info(
client: &Client, client: &Client,
base: &Url, base: &Url,
) -> Result<Libp2pInfo, NetworkInfoError> { ) -> Result<Libp2pInfo, NetworkInfoError> {
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 let url = base
.join(path) .join(path)
.map_err(|source| NetworkInfoError::JoinUrl { .map_err(|source| NetworkInfoError::JoinUrl {
base: base.clone(), base: base.clone(),
path: nomos_http_api_common::paths::NETWORK_INFO, path: lb_http_api_common::paths::NETWORK_INFO,
message: source.to_string(), message: source.to_string(),
})?; })?;

10
testing-framework/core/src/topology/utils.rs
View File

@ -1,8 +1,8 @@
use std::{collections::HashMap, iter}; use std::{collections::HashMap, iter};
use groth16::fr_to_bytes; use lb_groth16::fr_to_bytes;
use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key};
use nomos_utils::net::get_available_udp_port; use lb_utils::net::get_available_udp_port;
use rand::{Rng, thread_rng}; use rand::{Rng, thread_rng};
use thiserror::Error; use thiserror::Error;
@ -120,10 +120,10 @@ pub fn resolve_ports(
Ok(resolved) Ok(resolved)
} }
pub fn multiaddr_port(addr: &nomos_libp2p::Multiaddr) -> Option<u16> { pub fn multiaddr_port(addr: &lb_libp2p::Multiaddr) -> Option<u16> {
for protocol in addr { for protocol in addr {
match protocol { 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); return Some(port);
} }
_ => {} _ => {}

14
testing-framework/deployers/compose/Cargo.toml
View File

@ -16,8 +16,8 @@ workspace = true
anyhow = "1" anyhow = "1"
async-trait = { workspace = true } async-trait = { workspace = true }
cfgsync_tf = { workspace = true } cfgsync_tf = { workspace = true }
nomos-tracing = { workspace = true } lb-tracing = { workspace = true }
nomos-tracing-service = { workspace = true } lb-tracing-service = { workspace = true }
reqwest = { features = ["json"], workspace = true } reqwest = { features = ["json"], workspace = true }
serde = { features = ["derive"], workspace = true } serde = { features = ["derive"], workspace = true }
tempfile = { workspace = true } tempfile = { workspace = true }
@ -32,8 +32,8 @@ url = { version = "2" }
uuid = { features = ["v4"], version = "1" } uuid = { features = ["v4"], version = "1" }
[dev-dependencies] [dev-dependencies]
groth16 = { workspace = true } lb-core = { workspace = true }
key-management-system-service = { workspace = true } lb-groth16 = { workspace = true }
nomos-core = { workspace = true } lb-key-management-system-service = { workspace = true }
nomos-ledger = { workspace = true } lb-ledger = { workspace = true }
zksign = { workspace = true } lb-zksign = { workspace = true }

10
testing-framework/deployers/compose/src/deployer/mod.rs
View File

@ -91,14 +91,14 @@ mod tests {
config::builder::create_node_configs, config::builder::create_node_configs,
host::{Host, PortOverrides}, host::{Host, PortOverrides},
}; };
use groth16::Fr; use lb_core::{
use key_management_system_service::keys::ZkPublicKey;
use nomos_core::{
mantle::{GenesisTx as GenesisTxTrait, ledger::NoteId}, mantle::{GenesisTx as GenesisTxTrait, ledger::NoteId},
sdp::{ProviderId, ServiceType}, sdp::{ProviderId, ServiceType},
}; };
use nomos_ledger::LedgerState; use lb_groth16::Fr;
use nomos_tracing_service::TracingSettings; use lb_key_management_system_service::keys::ZkPublicKey;
use lb_ledger::LedgerState;
use lb_tracing_service::TracingSettings;
use testing_framework_core::{ use testing_framework_core::{
scenario::ScenarioBuilder, scenario::ScenarioBuilder,
topology::{ topology::{

2
testing-framework/deployers/compose/src/descriptor/mod.rs
View File

@ -121,7 +121,7 @@ fn default_extra_hosts() -> Vec<String> {
fn base_environment(cfgsync_port: u16) -> Vec<EnvEntry> { fn base_environment(cfgsync_port: u16) -> Vec<EnvEntry> {
let rust_log = tf_env::rust_log().unwrap_or_else(|| "info".to_string()); 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 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![ vec![
EnvEntry::new("RUST_LOG", rust_log), EnvEntry::new("RUST_LOG", rust_log),
EnvEntry::new("LOGOS_BLOCKCHAIN_LOG_LEVEL", nomos_log_level), EnvEntry::new("LOGOS_BLOCKCHAIN_LOG_LEVEL", nomos_log_level),

4
testing-framework/deployers/compose/src/infrastructure/cfgsync.rs
View File

@ -1,7 +1,7 @@
use std::{path::Path, process::Command as StdCommand}; use std::{path::Path, process::Command as StdCommand};
use nomos_tracing::metrics::otlp::OtlpMetricsConfig; use lb_tracing::metrics::otlp::OtlpMetricsConfig;
use nomos_tracing_service::MetricsLayer; use lb_tracing_service::MetricsLayer;
use reqwest::Url; use reqwest::Url;
use testing_framework_core::{ use testing_framework_core::{
scenario::cfgsync::{apply_topology_overrides, load_cfgsync_template, write_cfgsync_template}, scenario::cfgsync::{apply_topology_overrides, load_cfgsync_template, write_cfgsync_template},

4
testing-framework/deployers/k8s/Cargo.toml
View File

@ -17,8 +17,8 @@ anyhow = "1"
async-trait = { workspace = true } async-trait = { workspace = true }
k8s-openapi = { features = ["latest"], version = "0.20" } k8s-openapi = { features = ["latest"], version = "0.20" }
kube = { default-features = false, features = ["client", "runtime", "rustls-tls"], version = "0.87" } kube = { default-features = false, features = ["client", "runtime", "rustls-tls"], version = "0.87" }
nomos-tracing = { workspace = true } lb-tracing = { workspace = true }
nomos-tracing-service = { workspace = true } lb-tracing-service = { workspace = true }
reqwest = { features = ["json"], workspace = true } reqwest = { features = ["json"], workspace = true }
serde = { features = ["derive"], version = "1" } serde = { features = ["derive"], version = "1" }
serde_yaml = { workspace = true } serde_yaml = { workspace = true }

4
testing-framework/deployers/k8s/src/infrastructure/assets.rs
View File

@ -5,8 +5,8 @@ use std::{
}; };
use anyhow::{Context as _, Result as AnyResult}; use anyhow::{Context as _, Result as AnyResult};
use nomos_tracing::metrics::otlp::OtlpMetricsConfig; use lb_tracing::metrics::otlp::OtlpMetricsConfig;
use nomos_tracing_service::MetricsLayer; use lb_tracing_service::MetricsLayer;
use reqwest::Url; use reqwest::Url;
use serde::Serialize; use serde::Serialize;
use tempfile::TempDir; use tempfile::TempDir;

8
testing-framework/deployers/local/Cargo.toml
View File

@ -14,10 +14,10 @@ workspace = true
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1"
nomos-libp2p = { workspace = true } lb-libp2p = { workspace = true }
nomos-network = { workspace = true } lb-network-service = { workspace = true }
nomos-node = { workspace = true } lb-node = { workspace = true }
nomos-utils = { workspace = true } lb-utils = { workspace = true }
rand = { workspace = true } rand = { workspace = true }
testing-framework-config = { workspace = true } testing-framework-config = { workspace = true }
testing-framework-core = { path = "../../core" } testing-framework-core = { path = "../../core" }

2
testing-framework/deployers/local/src/manual/readiness.rs
View File

@ -1,6 +1,6 @@
use std::time::Duration; 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 testing_framework_core::topology::readiness::ReadinessCheck;
use tokio::time::timeout; use tokio::time::timeout;

4
testing-framework/deployers/local/src/node_control/config.rs
View File

@ -1,7 +1,7 @@
use std::collections::HashMap; use std::collections::HashMap;
use nomos_libp2p::Multiaddr; use lb_libp2p::Multiaddr;
use nomos_utils::net::get_available_udp_port; use lb_utils::net::get_available_udp_port;
use rand::Rng as _; use rand::Rng as _;
use testing_framework_config::topology::configs::{ use testing_framework_config::topology::configs::{
consensus, consensus,

2
testing-framework/deployers/local/src/node_control/mod.rs
View File

@ -3,7 +3,7 @@ use std::{
sync::Mutex, sync::Mutex,
}; };
use nomos_node::config::RunConfig; use lb_node::config::RunConfig;
use testing_framework_config::topology::configs::{consensus, time}; use testing_framework_config::topology::configs::{consensus, time};
use testing_framework_core::{ use testing_framework_core::{
nodes::{ nodes::{

2
testing-framework/env/src/lib.rs vendored
View File

@ -58,7 +58,7 @@ pub fn rust_log() -> Option<String> {
} }
#[must_use] #[must_use]
pub fn nomos_time_backend() -> Option<String> { pub fn lb_time_service_backend() -> Option<String> {
env::var("LOGOS_BLOCKCHAIN_TIME_BACKEND").ok() env::var("LOGOS_BLOCKCHAIN_TIME_BACKEND").ok()
} }

46
testing-framework/tools/cfgsync_tf/Cargo.toml
View File

@ -13,26 +13,26 @@ version = { workspace = true }
workspace = true workspace = true
[dependencies] [dependencies]
anyhow = "1" anyhow = "1"
axum = { default-features = false, features = ["http1", "http2", "json", "tokio"], version = "0.7.5" } axum = { default-features = false, features = ["http1", "http2", "json", "tokio"], version = "0.7.5" }
clap = { default-features = false, version = "4" } clap = { default-features = false, version = "4" }
groth16 = { workspace = true } hex = { workspace = true }
hex = { workspace = true } lb-core = { workspace = true }
key-management-system-service = { workspace = true } lb-groth16 = { workspace = true }
nomos-core = { workspace = true } lb-key-management-system-service = { workspace = true }
nomos-libp2p = { workspace = true } lb-libp2p = { workspace = true }
nomos-node = { workspace = true } lb-node = { workspace = true }
nomos-tracing-service = { workspace = true } lb-tracing-service = { workspace = true }
nomos-utils = { workspace = true } lb-utils = { workspace = true }
rand = { workspace = true } rand = { workspace = true }
reqwest = { workspace = true } reqwest = { workspace = true }
serde = { default-features = false, version = "1" } serde = { default-features = false, version = "1" }
serde_json = { default-features = false, version = "1.0" } serde_json = { default-features = false, version = "1.0" }
serde_path_to_error = "0.1" serde_path_to_error = "0.1"
serde_with = { workspace = true } serde_with = { workspace = true }
serde_yaml = "0.9" serde_yaml = "0.9"
testing-framework-config = { workspace = true } testing-framework-config = { workspace = true }
testing-framework-core = { path = "../../core" } testing-framework-core = { path = "../../core" }
thiserror = { workspace = true } thiserror = { workspace = true }
tokio = { default-features = false, features = ["macros", "net", "rt-multi-thread"], version = "1" } tokio = { default-features = false, features = ["macros", "net", "rt-multi-thread"], version = "1" }
tracing = { workspace = true } tracing = { workspace = true }

2
testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs
View File

@ -4,7 +4,7 @@ use cfgsync_tf::{
client::{FetchedConfig, get_config}, client::{FetchedConfig, get_config},
server::ClientIp, server::ClientIp,
}; };
use nomos_node::UserConfig; use lb_node::UserConfig;
use serde::{Serialize, de::DeserializeOwned}; use serde::{Serialize, de::DeserializeOwned};
use testing_framework_config::constants::cfgsync_port as default_cfgsync_port; use testing_framework_config::constants::cfgsync_port as default_cfgsync_port;
use testing_framework_core::nodes::common::config::injection::{ use testing_framework_core::nodes::common::config::injection::{

8
testing-framework/tools/cfgsync_tf/src/config/builder.rs
View File

@ -1,8 +1,8 @@
use std::{collections::HashMap, net::Ipv4Addr, str::FromStr as _}; use std::{collections::HashMap, net::Ipv4Addr, str::FromStr as _};
use nomos_core::mantle::GenesisTx as _; use lb_core::mantle::GenesisTx as _;
use nomos_libp2p::{Multiaddr, PeerId, ed25519}; use lb_libp2p::{Multiaddr, PeerId, ed25519};
use nomos_tracing_service::TracingSettings; use lb_tracing_service::TracingSettings;
use rand::{Rng as _, thread_rng}; use rand::{Rng as _, thread_rng};
use testing_framework_config::topology::configs::{ use testing_framework_config::topology::configs::{
GeneralConfig, GeneralConfig,
@ -165,7 +165,7 @@ pub fn try_create_node_configs(
message: source.to_string(), 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, external_address: nat_addr,
}; };

4
testing-framework/tools/cfgsync_tf/src/config/kms.rs
View File

@ -1,5 +1,5 @@
use groth16::fr_to_bytes; use lb_groth16::fr_to_bytes;
use key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key}; use lb_key_management_system_service::{backend::preload::PreloadKMSBackendSettings, keys::Key};
use testing_framework_config::topology::configs::blend::GeneralBlendConfig; use testing_framework_config::topology::configs::blend::GeneralBlendConfig;
pub fn create_kms_configs(blend_configs: &[GeneralBlendConfig]) -> Vec<PreloadKMSBackendSettings> { pub fn create_kms_configs(blend_configs: &[GeneralBlendConfig]) -> Vec<PreloadKMSBackendSettings> {

4
testing-framework/tools/cfgsync_tf/src/config/providers.rs
View File

@ -1,7 +1,7 @@
use std::str::FromStr; use std::str::FromStr;
use nomos_core::sdp::{Locator, ServiceType}; use lb_core::sdp::{Locator, ServiceType};
use nomos_libp2p::Multiaddr; use lb_libp2p::Multiaddr;
use testing_framework_config::topology::configs::{ use testing_framework_config::topology::configs::{
blend::GeneralBlendConfig, blend::GeneralBlendConfig,
consensus::{GeneralConsensusConfig, ProviderInfo}, consensus::{GeneralConsensusConfig, ProviderInfo},

2
testing-framework/tools/cfgsync_tf/src/config/tracing.rs
View File

@ -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; use testing_framework_config::topology::configs::tracing::GeneralTracingConfig;
pub fn update_tracing_identifier( pub fn update_tracing_identifier(

2
testing-framework/tools/cfgsync_tf/src/network/address.rs
View File

@ -1,4 +1,4 @@
use nomos_libp2p::{Multiaddr, Protocol}; use lb_libp2p::{Multiaddr, Protocol};
pub fn extract_udp_port(addr: &Multiaddr) -> Option<u16> { pub fn extract_udp_port(addr: &Multiaddr) -> Option<u16> {
addr.iter().find_map(|protocol| { addr.iter().find_map(|protocol| {

2
testing-framework/tools/cfgsync_tf/src/network/peers.rs
View File

@ -1,4 +1,4 @@
use nomos_libp2p::{Multiaddr, PeerId, Protocol}; use lb_libp2p::{Multiaddr, PeerId, Protocol};
use thiserror::Error; use thiserror::Error;
use super::address::find_matching_host; use super::address::find_matching_host;

2
testing-framework/tools/cfgsync_tf/src/repo.rs
View File

@ -1,6 +1,6 @@
use std::{collections::HashMap, sync::Arc, time::Duration}; use std::{collections::HashMap, sync::Arc, time::Duration};
use nomos_tracing_service::TracingSettings; use lb_tracing_service::TracingSettings;
use testing_framework_config::topology::configs::{ use testing_framework_config::topology::configs::{
GeneralConfig, consensus::ConsensusParams, wallet::WalletConfig, GeneralConfig, consensus::ConsensusParams, wallet::WalletConfig,
}; };

4
testing-framework/tools/cfgsync_tf/src/server.rs
View File

@ -5,8 +5,8 @@ const DEFAULT_DELAY_BEFORE_NEW_DOWNLOAD_SECS: u64 = 10;
const DEFAULT_MAX_ORPHAN_CACHE_SIZE: usize = 5; const DEFAULT_MAX_ORPHAN_CACHE_SIZE: usize = 5;
use axum::{Json, Router, extract::State, http::StatusCode, response::IntoResponse, routing::post}; use axum::{Json, Router, extract::State, http::StatusCode, response::IntoResponse, routing::post};
use nomos_tracing_service::TracingSettings; use lb_tracing_service::TracingSettings;
use nomos_utils::bounded_duration::{MinimalBoundedDuration, SECOND}; use lb_utils::bounded_duration::{MinimalBoundedDuration, SECOND};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::{Value, json, to_value}; use serde_json::{Value, json, to_value};
use serde_with::serde_as; use serde_with::serde_as;

21
testing-framework/workflows/Cargo.toml
View File

@ -13,17 +13,16 @@ version = "0.1.0"
workspace = true workspace = true
[dependencies] [dependencies]
async-trait = "0.1" async-trait = "0.1"
chain-service = { workspace = true } lb-core = { workspace = true }
key-management-system-service = { workspace = true } lb-key-management-system-service = { workspace = true }
nomos-core = { workspace = true } rand = { workspace = true }
rand = { workspace = true } reqwest = { workspace = true }
reqwest = { workspace = true } testing-framework-config = { workspace = true }
testing-framework-config = { workspace = true } testing-framework-core = { workspace = true }
testing-framework-core = { workspace = true } thiserror = { workspace = true }
thiserror = { workspace = true } tokio = { features = ["macros", "net", "rt-multi-thread", "time"], workspace = true }
tokio = { features = ["macros", "net", "rt-multi-thread", "time"], workspace = true } tracing = { workspace = true }
tracing = { workspace = true }
[package.metadata.cargo-machete] [package.metadata.cargo-machete]
ignored = ["chain-service"] ignored = ["chain-service"]

2
testing-framework/workflows/src/expectations/consensus_liveness.rs
View File

@ -1,7 +1,7 @@
use std::time::Duration; use std::time::Duration;
use async_trait::async_trait; use async_trait::async_trait;
use nomos_core::header::HeaderId; use lb_core::header::HeaderId;
use testing_framework_core::{ use testing_framework_core::{
nodes::ApiClient, nodes::ApiClient,
scenario::{DynError, Expectation, RunContext}, scenario::{DynError, Expectation, RunContext},

4
testing-framework/workflows/src/util/tx.rs
View File

@ -1,9 +1,9 @@
use key_management_system_service::keys::{Ed25519Key, ZkKey}; use lb_core::mantle::{
use nomos_core::mantle::{
MantleTx, Op, OpProof, SignedMantleTx, Transaction as _, MantleTx, Op, OpProof, SignedMantleTx, Transaction as _,
ledger::Tx as LedgerTx, ledger::Tx as LedgerTx,
ops::channel::{ChannelId, MsgId, inscribe::InscriptionOp}, ops::channel::{ChannelId, MsgId, inscribe::InscriptionOp},
}; };
use lb_key_management_system_service::keys::{Ed25519Key, ZkKey};
use testing_framework_core::scenario::DynError; use testing_framework_core::scenario::DynError;
/// Builds a signed inscription transaction with deterministic payload for /// Builds a signed inscription transaction with deterministic payload for

4
testing-framework/workflows/src/workloads/transaction/expectation.rs
View File

@ -9,8 +9,8 @@ use std::{
}; };
use async_trait::async_trait; use async_trait::async_trait;
use key_management_system_service::keys::ZkPublicKey; use lb_core::{header::HeaderId, mantle::AuthenticatedMantleTx as _};
use nomos_core::{header::HeaderId, mantle::AuthenticatedMantleTx as _}; use lb_key_management_system_service::keys::ZkPublicKey;
use testing_framework_core::scenario::{DynError, Expectation, RunContext}; use testing_framework_core::scenario::{DynError, Expectation, RunContext};
use thiserror::Error; use thiserror::Error;
use tokio::{sync::broadcast, time::sleep}; use tokio::{sync::broadcast, time::sleep};

4
testing-framework/workflows/src/workloads/transaction/workload.rs
View File

@ -6,10 +6,10 @@ use std::{
}; };
use async_trait::async_trait; use async_trait::async_trait;
use key_management_system_service::keys::{ZkKey, ZkPublicKey}; use lb_core::mantle::{
use nomos_core::mantle::{
GenesisTx as _, Note, SignedMantleTx, Transaction as _, Utxo, tx_builder::MantleTxBuilder, 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_config::topology::configs::wallet::WalletAccount;
use testing_framework_core::{ use testing_framework_core::{
scenario::{DynError, Expectation, RunContext, RunMetrics, Workload as ScenarioWorkload}, scenario::{DynError, Expectation, RunContext, RunMetrics, Workload as ScenarioWorkload},

2
testing-framework/workflows/src/workloads/util.rs
View File

@ -1,6 +1,6 @@
use std::{sync::Arc, time::Duration}; use std::{sync::Arc, time::Duration};
use nomos_core::{ use lb_core::{
block::Block, block::Block,
mantle::{ mantle::{
AuthenticatedMantleTx as _, SignedMantleTx, Transaction as MantleTx, AuthenticatedMantleTx as _, SignedMantleTx, Transaction as MantleTx,