From 4927c74e487af02d8c6341b088ee8195a782a33a Mon Sep 17 00:00:00 2001 From: andrussal Date: Tue, 3 Feb 2026 17:22:06 +0100 Subject: [PATCH] Update node rev and align wallet/KMS configs --- Cargo.lock | 119 ++++++++++-------- Cargo.toml | 60 ++++----- testing-framework/configs/src/nodes/common.rs | 30 +++-- .../configs/src/topology/configs/consensus.rs | 16 ++- .../configs/src/topology/configs/runtime.rs | 4 + .../configs/src/topology/configs/time.rs | 2 +- .../core/src/nodes/common/config/paths.rs | 10 ++ testing-framework/core/src/topology/utils.rs | 6 + versions.env | 2 +- 9 files changed, 150 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 91246ef..bc6326b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -801,9 +801,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" dependencies = [ "serde", ] @@ -1254,7 +1254,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 2.0.114", + "syn 1.0.109", ] [[package]] @@ -3389,7 +3389,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-api-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "bytes", @@ -3415,7 +3415,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-blend-crypto", "logos-blockchain-blend-message", @@ -3427,7 +3427,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -3441,7 +3441,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "blake2", "derivative", @@ -3463,7 +3463,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-network" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "either", "futures", @@ -3481,7 +3481,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-scheduling" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "derivative", @@ -3519,7 +3519,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "fork_stream", @@ -3554,7 +3554,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "derivative", @@ -3570,11 +3570,12 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-leader-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", "logos-blockchain-blend-service", + "logos-blockchain-chain-network-service", "logos-blockchain-chain-service", "logos-blockchain-chain-service-common", "logos-blockchain-core", @@ -3597,7 +3598,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", @@ -3625,7 +3626,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "bytes", @@ -3655,7 +3656,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-core", "serde", @@ -3664,7 +3665,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -3673,7 +3674,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "dirs", ] @@ -3681,7 +3682,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "futures", "logos-blockchain-chain-broadcast-service", @@ -3698,7 +3699,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -3728,7 +3729,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "cfg_eval", "logos-blockchain-utils", @@ -3743,7 +3744,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "bytes", "futures", @@ -3762,7 +3763,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -3780,7 +3781,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "axum", "governor", @@ -3795,13 +3796,12 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", - "logos-blockchain-blend-proofs", "logos-blockchain-groth16", "logos-blockchain-key-management-system-macros", "logos-blockchain-poseidon2", @@ -3821,21 +3821,38 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "proc-macro2", "quote", "syn 2.0.114", ] +[[package]] +name = "logos-blockchain-key-management-system-operators" +version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" +dependencies = [ + "async-trait", + "logos-blockchain-blend-proofs", + "logos-blockchain-core", + "logos-blockchain-groth16", + "logos-blockchain-key-management-system-keys", + "logos-blockchain-poseidon2", + "logos-blockchain-utxotree", + "tokio", + "tracing", +] + [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "log", "logos-blockchain-key-management-system-keys", + "logos-blockchain-key-management-system-operators", "overwatch", "serde", "thiserror 2.0.18", @@ -3846,7 +3863,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -3870,7 +3887,7 @@ dependencies = [ [[package]] name = "logos-blockchain-libp2p" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "backon", @@ -3899,7 +3916,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", @@ -3918,7 +3935,7 @@ dependencies = [ [[package]] name = "logos-blockchain-node" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "axum", @@ -3974,7 +3991,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -3989,7 +4006,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4005,7 +4022,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -4021,7 +4038,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4032,7 +4049,7 @@ dependencies = [ [[package]] name = "logos-blockchain-sdp-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", @@ -4048,7 +4065,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", @@ -4063,7 +4080,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "bytes", @@ -4081,7 +4098,7 @@ dependencies = [ [[package]] name = "logos-blockchain-system-sig-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-ctrlc", "async-trait", @@ -4092,7 +4109,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "cfg_eval", @@ -4114,7 +4131,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "opentelemetry", "opentelemetry-http", @@ -4137,7 +4154,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "logos-blockchain-tracing", @@ -4151,7 +4168,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tx-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "futures", @@ -4173,7 +4190,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "blake2", @@ -4190,7 +4207,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4204,13 +4221,14 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-core", "logos-blockchain-key-management-system-keys", "logos-blockchain-ledger", "num-bigint", "rpds", + "serde", "thiserror 2.0.18", "tracing", ] @@ -4218,7 +4236,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "async-trait", "bytes", @@ -4234,7 +4252,6 @@ dependencies = [ "logos-blockchain-utxotree", "logos-blockchain-wallet", "overwatch", - "rand 0.8.5", "serde", "thiserror 1.0.69", "tokio", @@ -4244,7 +4261,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "tempfile", ] @@ -4252,7 +4269,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=ea98ac1ad09ac29fe8350614a260c20d8de12bfe#ea98ac1ad09ac29fe8350614a260c20d8de12bfe" +source = "git+https://github.com/logos-co/nomos-node.git?rev=d40db90e8b1649735e4c981ec4cd84063d0d0bfe#d40db90e8b1649735e4c981ec4cd84063d0d0bfe" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", diff --git a/Cargo.toml b/Cargo.toml index 2497b8b..bfd699b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,37 +40,37 @@ testing-framework-runner-local = { default-features = false, path = "testing-f testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" } # Logos git dependencies (pinned to latest master) -broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } +broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" } -chain-leader = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } -zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "ea98ac1ad09ac29fe8350614a260c20d8de12bfe" } +chain-leader = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } +zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "d40db90e8b1649735e4c981ec4cd84063d0d0bfe" } # External crates async-trait = { default-features = false, version = "0.1" } diff --git a/testing-framework/configs/src/nodes/common.rs b/testing-framework/configs/src/nodes/common.rs index 2c53076..4fe836c 100644 --- a/testing-framework/configs/src/nodes/common.rs +++ b/testing-framework/configs/src/nodes/common.rs @@ -78,9 +78,7 @@ pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig { starting_state: StartingState::Genesis { genesis_tx: config.consensus_config.genesis_tx.clone(), }, - // Disable on-disk recovery in compose tests to avoid serde errors on - // non-string keys and keep services alive. - recovery_file: PathBuf::new(), + recovery_file: PathBuf::from("recovery/cryptarchia.json"), bootstrap: chain_service::BootstrapConfig { prolonged_bootstrap_period: config.bootstrapping_config.prolonged_bootstrap_period, force_bootstrap: false, @@ -122,8 +120,7 @@ pub(crate) fn time_config(config: &GeneralConfig) -> TimeConfig { pub(crate) fn mempool_config() -> nomos_node::config::mempool::serde::Config { nomos_node::config::mempool::serde::Config { - // Disable mempool recovery for hermetic tests. - recovery_path: PathBuf::new(), + recovery_path: PathBuf::from("recovery/mempool.json"), } } @@ -173,11 +170,22 @@ fn wallet_settings_with_leader( keys.insert(leader_key_id, config.consensus_config.leader_pk); } - for account in &config.consensus_config.wallet_accounts { - let key = Key::Zk(account.secret_key.clone()); - let key_id = key_id_for_preload_backend(&key); - keys.insert(key_id, account.public_key()); - } + let funding_key = Key::Zk(config.consensus_config.funding_sk.clone()); + let funding_key_id = key_id_for_preload_backend(&funding_key); + keys.insert( + funding_key_id, + config.consensus_config.funding_sk.to_public_key(), + ); - WalletServiceSettings { known_keys: keys } + // Note: wallet accounts are used by the transaction workload directly and + // don't need to be registered for leader eligibility. + + let voucher_master_key_id = + key_id_for_preload_backend(&Key::Zk(config.consensus_config.leader_sk.clone().into())); + + WalletServiceSettings { + known_keys: keys, + voucher_master_key_id, + recovery_path: PathBuf::from("recovery/wallet.json"), + } } diff --git a/testing-framework/configs/src/topology/configs/consensus.rs b/testing-framework/configs/src/topology/configs/consensus.rs index ec7715e..eca32ac 100644 --- a/testing-framework/configs/src/topology/configs/consensus.rs +++ b/testing-framework/configs/src/topology/configs/consensus.rs @@ -48,7 +48,7 @@ pub struct ConsensusParams { } impl ConsensusParams { - const DEFAULT_ACTIVE_SLOT_COEFF: f64 = 0.9; + const DEFAULT_ACTIVE_SLOT_COEFF: f64 = 1.0; const CONSENSUS_ACTIVE_SLOT_COEFF_VAR: &str = "CONSENSUS_ACTIVE_SLOT_COEFF"; #[must_use] @@ -115,7 +115,7 @@ pub struct ServiceNote { pub output_index: usize, } -fn create_genesis_tx(utxos: &[Utxo]) -> Result { +fn create_genesis_tx(utxos: &mut [Utxo]) -> Result { // Create a genesis inscription op (similar to config.yaml) let inscription = InscriptionOp { channel_id: ChannelId::from([0; 32]), @@ -131,6 +131,12 @@ fn create_genesis_tx(utxos: &[Utxo]) -> Result // Create ledger transaction with the utxos as outputs let outputs: Vec = utxos.iter().map(|u| u.note).collect(); let ledger_tx = LedgerTx::new(vec![], outputs); + let ledger_tx_hash = ledger_tx.hash(); + + // Ensure utxo IDs match the ledger tx hash used at genesis. + for utxo in utxos { + utxo.tx_hash = ledger_tx_hash; + } // Create the mantle transaction let mantle_tx = MantleTx { @@ -215,8 +221,8 @@ pub fn create_consensus_configs( &mut blend_notes, &mut sdp_notes, ); - let utxos = append_wallet_utxos(utxos, wallet); - let genesis_tx = create_genesis_tx(&utxos)?; + let mut utxos = append_wallet_utxos(utxos, wallet); + let genesis_tx = create_genesis_tx(&mut utxos)?; let ledger_config = build_ledger_config(consensus_params)?; Ok(leader_keys @@ -276,7 +282,7 @@ fn push_leader_utxo( let pk = sk.to_public_key(); leader_keys.push((pk, sk)); utxos.push(Utxo { - note: Note::new(1_000, pk), + note: Note::new(100_000, pk), tx_hash: BigUint::from(0u8).into(), output_index, }); diff --git a/testing-framework/configs/src/topology/configs/runtime.rs b/testing-framework/configs/src/topology/configs/runtime.rs index 469ac2d..62fd17f 100644 --- a/testing-framework/configs/src/topology/configs/runtime.rs +++ b/testing-framework/configs/src/topology/configs/runtime.rs @@ -120,6 +120,10 @@ fn build_kms_config_for_node( key_id_for_preload_backend(&Key::Zk(consensus_config.leader_sk.clone().into())), Key::Zk(consensus_config.leader_sk.clone().into()), ), + ( + key_id_for_preload_backend(&Key::Zk(consensus_config.funding_sk.clone())), + Key::Zk(consensus_config.funding_sk.clone()), + ), ]); for account in &wallet_config.accounts { diff --git a/testing-framework/configs/src/topology/configs/time.rs b/testing-framework/configs/src/topology/configs/time.rs index fda61bc..fe6a528 100644 --- a/testing-framework/configs/src/topology/configs/time.rs +++ b/testing-framework/configs/src/topology/configs/time.rs @@ -6,7 +6,7 @@ use std::{ use time::OffsetDateTime; -const DEFAULT_SLOT_TIME: u64 = 2; +const DEFAULT_SLOT_TIME: u64 = 1; const CONSENSUS_SLOT_TIME_VAR: &str = "CONSENSUS_SLOT_TIME"; const DEFAULT_NTP_SERVER: &str = "pool.ntp.org"; const DEFAULT_NTP_TIMEOUT: Duration = Duration::from_secs(5); diff --git a/testing-framework/core/src/nodes/common/config/paths.rs b/testing-framework/core/src/nodes/common/config/paths.rs index 74b39c9..01a499d 100644 --- a/testing-framework/core/src/nodes/common/config/paths.rs +++ b/testing-framework/core/src/nodes/common/config/paths.rs @@ -11,6 +11,16 @@ pub fn ensure_recovery_paths(base_dir: &Path) -> io::Result<()> { fs::write(&mempool_path, "{}")?; } + let cryptarchia_path = recovery_dir.join("cryptarchia.json"); + if !cryptarchia_path.exists() { + fs::write(&cryptarchia_path, "{}")?; + } + + let wallet_path = recovery_dir.join("wallet.json"); + if !wallet_path.exists() { + fs::write(&wallet_path, "{}")?; + } + let blend_core_path = recovery_dir.join("blend").join("core.json"); if let Some(parent) = blend_core_path.parent() { fs::create_dir_all(parent)?; diff --git a/testing-framework/core/src/topology/utils.rs b/testing-framework/core/src/topology/utils.rs index 57d2933..a9e6038 100644 --- a/testing-framework/core/src/topology/utils.rs +++ b/testing-framework/core/src/topology/utils.rs @@ -38,6 +38,12 @@ pub fn create_kms_configs( )), Key::Zk(consensus_conf.leader_sk.clone().into()), ), + ( + hex::encode(fr_to_bytes( + consensus_conf.funding_sk.to_public_key().as_fr(), + )), + Key::Zk(consensus_conf.funding_sk.clone()), + ), ]); for account in wallet_accounts { diff --git a/versions.env b/versions.env index 3942a5d..4ce9df3 100644 --- a/versions.env +++ b/versions.env @@ -1,7 +1,7 @@ VERSION=v0.3.2 LOGOS_BLOCKCHAIN_BUNDLE_VERSION=v4 # Pinned logos-blockchain-node revision used for CI builds and binary bundles. -LOGOS_BLOCKCHAIN_NODE_REV=ea98ac1ad09ac29fe8350614a260c20d8de12bfe +LOGOS_BLOCKCHAIN_NODE_REV=d40db90e8b1649735e4c981ec4cd84063d0d0bfe # Optional: local logos-blockchain-node checkout override (do not commit absolute paths). # LOGOS_BLOCKCHAIN_NODE_PATH=