From fb4574b968cb77403a73c32699a19521335d5837 Mon Sep 17 00:00:00 2001 From: andrussal Date: Sun, 22 Feb 2026 03:52:27 +0100 Subject: [PATCH] feed: initialize from full node client set --- Cargo.lock | 104 +++++++++--------- Cargo.toml | 71 ++++++------ logos/runtime/ext/src/cfgsync/mod.rs | 4 +- logos/runtime/ext/src/lib.rs | 14 ++- testing-framework/core/src/env.rs | 8 +- .../core/src/scenario/runtime/mod.rs | 4 +- .../compose/src/lifecycle/block_feed.rs | 14 +-- .../deployers/k8s/src/lifecycle/block_feed.rs | 14 +-- .../local/src/deployer/orchestrator.rs | 12 +- testing-framework/deployers/local/src/env.rs | 4 +- 10 files changed, 131 insertions(+), 118 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 49db93e..23419e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3418,7 +3418,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-api-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "bytes", @@ -3445,7 +3445,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-blend-crypto", "logos-blockchain-blend-message", @@ -3457,7 +3457,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -3471,7 +3471,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "blake2", "derivative", @@ -3493,7 +3493,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-network" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "either", "futures", @@ -3511,10 +3511,11 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", + "hex", "logos-blockchain-blend-crypto", "logos-blockchain-groth16", "logos-blockchain-pol", @@ -3528,7 +3529,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-scheduling" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "derivative", @@ -3552,11 +3553,12 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "fork_stream", "futures", + "hex", "libp2p", "libp2p-stream", "logos-blockchain-blend", @@ -3587,7 +3589,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "derivative", @@ -3603,7 +3605,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-leader-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -3631,7 +3633,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -3659,7 +3661,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "bytes", @@ -3689,7 +3691,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service-common" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-core", "serde", @@ -3698,7 +3700,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -3707,7 +3709,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "dirs", ] @@ -3715,7 +3717,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "futures", "hex", @@ -3735,7 +3737,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -3765,7 +3767,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "cfg_eval", "logos-blockchain-pol", @@ -3781,7 +3783,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "bytes", "futures", @@ -3800,7 +3802,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -3818,7 +3820,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "axum", "logos-blockchain-core", @@ -3832,12 +3834,13 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", + "hex", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", "logos-blockchain-poseidon2", @@ -3857,7 +3860,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "proc-macro2", "quote", @@ -3867,7 +3870,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -3883,7 +3886,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "log", @@ -3899,7 +3902,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -3923,7 +3926,7 @@ dependencies = [ [[package]] name = "logos-blockchain-libp2p" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "backon", @@ -3952,7 +3955,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -3971,7 +3974,7 @@ dependencies = [ [[package]] name = "logos-blockchain-node" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "axum", @@ -4033,7 +4036,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4049,7 +4052,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "astro-float", "logos-blockchain-circuits-prover", @@ -4068,7 +4071,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4085,7 +4088,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4096,7 +4099,7 @@ dependencies = [ [[package]] name = "logos-blockchain-sdp-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -4112,7 +4115,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -4127,7 +4130,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "bytes", @@ -4145,7 +4148,7 @@ dependencies = [ [[package]] name = "logos-blockchain-system-sig-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-ctrlc", "async-trait", @@ -4156,7 +4159,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "cfg_eval", @@ -4178,7 +4181,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "opentelemetry", "opentelemetry-appender-tracing", @@ -4201,12 +4204,13 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "logos-blockchain-tracing", "overwatch", "serde", + "time", "tracing", "tracing-appender", "tracing-subscriber 0.3.22", @@ -4215,7 +4219,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tui-zone" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "clap", "hex", @@ -4232,7 +4236,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tx-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "futures", @@ -4254,7 +4258,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "blake2", @@ -4271,7 +4275,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4285,7 +4289,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-core", "logos-blockchain-key-management-system-keys", @@ -4300,7 +4304,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet-service" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "async-trait", "bytes", @@ -4325,7 +4329,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "tempfile", ] @@ -4333,7 +4337,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4350,7 +4354,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zone-sdk" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "futures", "logos-blockchain-common-http-client", @@ -6595,7 +6599,7 @@ dependencies = [ [[package]] name = "testing_framework" version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=41ea1e3082526bb271e655cddb95a5b448e7de20#41ea1e3082526bb271e655cddb95a5b448e7de20" +source = "git+https://github.com/logos-blockchain/logos-blockchain.git?rev=5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667#5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 1fcc636..9e32eb1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ all = "allow" # Local testing framework crates cfgsync-core = { default-features = false, path = "testing-framework/tools/cfgsync-core" } lb-ext = { default-features = false, path = "logos/runtime/ext" } -lb-framework = { default-features = false, package = "testing_framework", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } +lb-framework = { default-features = false, package = "testing_framework", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } lb-workloads = { default-features = false, path = "logos/runtime/workloads" } testing-framework-core = { default-features = false, path = "testing-framework/core" } testing-framework-env = { default-features = false, path = "logos/runtime/env" } @@ -42,44 +42,44 @@ testing-framework-runner-k8s = { default-features = false, path = "testing-f testing-framework-runner-local = { default-features = false, path = "testing-framework/deployers/local" } # Logos dependencies (from logos-blockchain master @ deccbb2d2) -broadcast-service = { default-features = false, package = "logos-blockchain-chain-broadcast-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } +broadcast-service = { default-features = false, package = "logos-blockchain-chain-broadcast-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } cfgsync_runtime = { default-features = false, package = "cfgsync-runtime", path = "testing-framework/tools/cfgsync-runtime" } chain-leader = { default-features = false, features = [ "pol-dev-mode", -], package = "logos-blockchain-chain-leader-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -chain-network = { default-features = false, package = "logos-blockchain-chain-network-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -chain-service = { default-features = false, package = "logos-blockchain-chain-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -common-http-client = { default-features = false, package = "logos-blockchain-common-http-client", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -cryptarchia-engine = { default-features = false, package = "logos-blockchain-cryptarchia-engine", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -cryptarchia-sync = { default-features = false, package = "logos-blockchain-cryptarchia-sync", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -groth16 = { default-features = false, package = "logos-blockchain-groth16", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -key-management-system-service = { default-features = false, package = "logos-blockchain-key-management-system-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-api = { default-features = false, package = "logos-blockchain-api-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-blend-message = { default-features = false, package = "logos-blockchain-blend-message", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-blend-service = { default-features = false, package = "logos-blockchain-blend-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-core = { default-features = false, package = "logos-blockchain-core", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-http-api-common = { default-features = false, package = "logos-blockchain-http-api-common", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-ledger = { default-features = false, package = "logos-blockchain-ledger", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-libp2p = { default-features = false, package = "logos-blockchain-libp2p", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-network = { default-features = false, package = "logos-blockchain-network-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } +], package = "logos-blockchain-chain-leader-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +chain-network = { default-features = false, package = "logos-blockchain-chain-network-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +chain-service = { default-features = false, package = "logos-blockchain-chain-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +common-http-client = { default-features = false, package = "logos-blockchain-common-http-client", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +cryptarchia-engine = { default-features = false, package = "logos-blockchain-cryptarchia-engine", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +cryptarchia-sync = { default-features = false, package = "logos-blockchain-cryptarchia-sync", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +groth16 = { default-features = false, package = "logos-blockchain-groth16", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +key-management-system-service = { default-features = false, package = "logos-blockchain-key-management-system-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-api = { default-features = false, package = "logos-blockchain-api-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-blend-message = { default-features = false, package = "logos-blockchain-blend-message", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-blend-service = { default-features = false, package = "logos-blockchain-blend-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-core = { default-features = false, package = "logos-blockchain-core", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-http-api-common = { default-features = false, package = "logos-blockchain-http-api-common", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-ledger = { default-features = false, package = "logos-blockchain-ledger", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-libp2p = { default-features = false, package = "logos-blockchain-libp2p", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-network = { default-features = false, package = "logos-blockchain-network-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } nomos-node = { default-features = false, features = [ "testing", -], package = "logos-blockchain-node", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-sdp = { default-features = false, package = "logos-blockchain-sdp-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-time = { default-features = false, package = "logos-blockchain-time-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-tracing = { default-features = false, package = "logos-blockchain-tracing", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-tracing-service = { default-features = false, package = "logos-blockchain-tracing-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-utils = { default-features = false, package = "logos-blockchain-utils", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -nomos-wallet = { default-features = false, package = "logos-blockchain-wallet-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -poc = { default-features = false, package = "logos-blockchain-poc", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -pol = { default-features = false, package = "logos-blockchain-pol", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -tx-service = { default-features = false, package = "logos-blockchain-tx-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -wallet = { default-features = false, package = "logos-blockchain-wallet", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -zksign = { default-features = false, package = "logos-blockchain-zksign", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } +], package = "logos-blockchain-node", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-sdp = { default-features = false, package = "logos-blockchain-sdp-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-time = { default-features = false, package = "logos-blockchain-time-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-tracing = { default-features = false, package = "logos-blockchain-tracing", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-tracing-service = { default-features = false, package = "logos-blockchain-tracing-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-utils = { default-features = false, package = "logos-blockchain-utils", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +nomos-wallet = { default-features = false, package = "logos-blockchain-wallet-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +poc = { default-features = false, package = "logos-blockchain-poc", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +pol = { default-features = false, package = "logos-blockchain-pol", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +tx-service = { default-features = false, package = "logos-blockchain-tx-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +wallet = { default-features = false, package = "logos-blockchain-wallet", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +zksign = { default-features = false, package = "logos-blockchain-zksign", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } # lb_* aliases (nomos-node repo naming) -lb_http_api_common = { default-features = false, package = "logos-blockchain-http-api-common", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -lb_tracing = { default-features = false, package = "logos-blockchain-tracing", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } -lb_tracing_service = { default-features = false, package = "logos-blockchain-tracing-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "41ea1e3082526bb271e655cddb95a5b448e7de20" } +lb_http_api_common = { default-features = false, package = "logos-blockchain-http-api-common", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +lb_tracing = { default-features = false, package = "logos-blockchain-tracing", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } +lb_tracing_service = { default-features = false, package = "logos-blockchain-tracing-service", git = "https://github.com/logos-blockchain/logos-blockchain.git", rev = "5ebe88a6e89ec6d7dd89e123c46f6b26dd1e4667" } # External crates async-trait = { default-features = false, version = "0.1" } bytes = { default-features = false, version = "1.3" } @@ -107,3 +107,8 @@ uuid = { default-features = false, version = "1", features = ["v4 testing-framework-core = { path = "testing-framework/core" } testing-framework-env = { path = "logos/runtime/env" } testing-framework-runner-local = { path = "testing-framework/deployers/local" } + +[patch."https://github.com/logos-blockchain/logos-blockchain.git"] +testing-framework-core = { path = "testing-framework/core" } +testing-framework-env = { path = "logos/runtime/env" } +testing-framework-runner-local = { path = "testing-framework/deployers/local" } diff --git a/logos/runtime/ext/src/cfgsync/mod.rs b/logos/runtime/ext/src/cfgsync/mod.rs index 8271705..d1b809b 100644 --- a/logos/runtime/ext/src/cfgsync/mod.rs +++ b/logos/runtime/ext/src/cfgsync/mod.rs @@ -9,7 +9,7 @@ use cfgsync_runtime::{ render::{RenderedCfgsync, apply_timeout_floor, ensure_bundle_path, write_rendered_cfgsync}, }; use lb_tracing::metrics::otlp::OtlpMetricsConfig; -use lb_tracing_service::MetricsLayer; +use lb_tracing_service::MetricsLayerSettings; use reqwest::Url; use testing_framework_core::cfgsync::CfgsyncEnv; @@ -77,7 +77,7 @@ fn apply_render_options( fn apply_metrics_endpoint(cfg: &mut template::CfgSyncConfig, endpoint: Option) { if let Some(endpoint) = endpoint { - cfg.tracing_settings.metrics = MetricsLayer::Otlp(OtlpMetricsConfig { + cfg.tracing_settings.metrics = MetricsLayerSettings::Otlp(OtlpMetricsConfig { endpoint, host_identifier: "node".into(), }); diff --git a/logos/runtime/ext/src/lib.rs b/logos/runtime/ext/src/lib.rs index 49a7b8c..177823b 100644 --- a/logos/runtime/ext/src/lib.rs +++ b/logos/runtime/ext/src/lib.rs @@ -12,7 +12,8 @@ pub use scenario::{ ScenarioBuilderWith, }; use testing_framework_core::scenario::{ - Application, DynError, ExternalNodeSource, FeedRuntime, RunContext, StartNodeOptions, + Application, DynError, ExternalNodeSource, FeedRuntime, NodeClients, RunContext, + StartNodeOptions, }; use testing_framework_runner_local::{ BuiltNodeConfig, LocalDeployerEnv, NodeConfigEntry, @@ -48,9 +49,12 @@ impl Application for LbcExtEnv { } async fn prepare_feed( - client: Self::NodeClient, + node_clients: NodeClients, ) -> Result<(::Feed, Self::FeedRuntime), DynError> { - ::prepare_feed(client).await + let clients = node_clients.snapshot(); + let upstream_clients = NodeClients::::new(clients); + + ::prepare_feed(upstream_clients).await } } @@ -60,6 +64,10 @@ impl LbcBlockFeedEnv for LbcExtEnv { fn block_feed_subscription(ctx: &RunContext) -> broadcast::Receiver> { ctx.feed().subscribe() } + + fn block_feed(ctx: &RunContext) -> BlockFeed { + ctx.feed() + } } #[async_trait] diff --git a/testing-framework/core/src/env.rs b/testing-framework/core/src/env.rs index e7ad9d6..139f53b 100644 --- a/testing-framework/core/src/env.rs +++ b/testing-framework/core/src/env.rs @@ -3,7 +3,7 @@ use std::io; use async_trait::async_trait; use crate::{ - scenario::{DynError, ExternalNodeSource, FeedRuntime}, + scenario::{DynError, ExternalNodeSource, FeedRuntime, NodeClients}, topology::DeploymentDescriptor, }; @@ -26,6 +26,8 @@ pub trait Application: Send + Sync + 'static { } async fn prepare_feed( - client: Self::NodeClient, - ) -> Result<(::Feed, Self::FeedRuntime), DynError>; + node_clients: NodeClients, + ) -> Result<(::Feed, Self::FeedRuntime), DynError> + where + Self: Sized; } diff --git a/testing-framework/core/src/scenario/runtime/mod.rs b/testing-framework/core/src/scenario/runtime/mod.rs index 9f5f415..7e0804f 100644 --- a/testing-framework/core/src/scenario/runtime/mod.rs +++ b/testing-framework/core/src/scenario/runtime/mod.rs @@ -64,9 +64,9 @@ impl CleanupGuard for FeedHandle { /// Spawn a background task that drives the environment-provided feed. pub async fn spawn_feed( - client: E::NodeClient, + node_clients: NodeClients, ) -> Result<(::Feed, FeedHandle), DynError> { - let (feed, worker) = E::prepare_feed(client).await?; + let (feed, worker) = E::prepare_feed(node_clients).await?; let handle = tokio::spawn(async move { Box::new(worker).run().await; diff --git a/testing-framework/deployers/compose/src/lifecycle/block_feed.rs b/testing-framework/deployers/compose/src/lifecycle/block_feed.rs index 3898d2b..ff72aae 100644 --- a/testing-framework/deployers/compose/src/lifecycle/block_feed.rs +++ b/testing-framework/deployers/compose/src/lifecycle/block_feed.rs @@ -20,16 +20,14 @@ async fn spawn_block_feed_with( ), ComposeRunnerError, > { - debug!( - nodes = node_clients.len(), - "selecting node client for block feed" - ); + let node_count = node_clients.len(); + debug!(nodes = node_count, "starting compose block feed"); - let block_source_client = node_clients - .random_client() - .ok_or(ComposeRunnerError::BlockFeedMissing)?; + if node_count == 0 { + return Err(ComposeRunnerError::BlockFeedMissing); + } - spawn_feed::(block_source_client) + spawn_feed::(node_clients.clone()) .await .map_err(|source| ComposeRunnerError::BlockFeed { source }) } diff --git a/testing-framework/deployers/k8s/src/lifecycle/block_feed.rs b/testing-framework/deployers/k8s/src/lifecycle/block_feed.rs index 554a7fd..d50351e 100644 --- a/testing-framework/deployers/k8s/src/lifecycle/block_feed.rs +++ b/testing-framework/deployers/k8s/src/lifecycle/block_feed.rs @@ -14,17 +14,15 @@ pub async fn spawn_block_feed_with( ), K8sRunnerError, > { - debug!( - nodes = node_clients.len(), - "selecting node client for block feed" - ); + let node_count = node_clients.len(); + debug!(nodes = node_count, "starting k8s block feed"); - let block_source_client = node_clients - .random_client() - .ok_or(K8sRunnerError::BlockFeedMissing)?; + if node_count == 0 { + return Err(K8sRunnerError::BlockFeedMissing); + } info!("starting block feed"); - spawn_feed::(block_source_client) + spawn_feed::(node_clients.clone()) .await .map_err(|source| K8sRunnerError::BlockFeed { source }) } diff --git a/testing-framework/deployers/local/src/deployer/orchestrator.rs b/testing-framework/deployers/local/src/deployer/orchestrator.rs index 1dd991d..28cc01f 100644 --- a/testing-framework/deployers/local/src/deployer/orchestrator.rs +++ b/testing-framework/deployers/local/src/deployer/orchestrator.rs @@ -444,20 +444,18 @@ fn keep_tempdir(policy: DeploymentPolicy) -> bool { async fn spawn_feed_with( node_clients: &NodeClients, ) -> Result<(::Feed, FeedHandle), ProcessDeployerError> { - debug!( - nodes = node_clients.len(), - "selecting node client for local feed" - ); + let node_count = node_clients.len(); + debug!(nodes = node_count, "starting local feed"); - let Some(block_source_client) = node_clients.random_client() else { + if node_count == 0 { return Err(ProcessDeployerError::WorkloadFailed { source: "feed requires at least one node".into(), }); - }; + } info!("starting feed"); - spawn_feed::(block_source_client) + spawn_feed::(node_clients.clone()) .await .map_err(workload_error) } diff --git a/testing-framework/deployers/local/src/env.rs b/testing-framework/deployers/local/src/env.rs index 701cc23..2af7d06 100644 --- a/testing-framework/deployers/local/src/env.rs +++ b/testing-framework/deployers/local/src/env.rs @@ -112,7 +112,7 @@ mod tests { use async_trait::async_trait; use testing_framework_core::{ - scenario::{Application, DynError, Feed, FeedRuntime}, + scenario::{Application, DynError, Feed, FeedRuntime, NodeClients}, topology::DeploymentDescriptor, }; @@ -160,7 +160,7 @@ mod tests { type FeedRuntime = DummyFeedRuntime; async fn prepare_feed( - _client: Self::NodeClient, + _node_clients: NodeClients, ) -> Result<(::Feed, Self::FeedRuntime), DynError> { Ok((DummyFeed, DummyFeedRuntime))