diff --git a/Cargo.lock b/Cargo.lock index 9e534cb..c8f915a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3344,7 +3344,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "logos-blockchain-api-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "bytes", @@ -3371,7 +3371,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-blend-crypto", "logos-blockchain-blend-message", @@ -3383,7 +3383,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-crypto" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "blake2", "logos-blockchain-groth16", @@ -3397,7 +3397,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-message" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "blake2", "derivative", @@ -3419,7 +3419,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-network" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "either", "futures", @@ -3437,7 +3437,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-proofs" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -3452,7 +3452,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-scheduling" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "derivative", @@ -3476,7 +3476,7 @@ dependencies = [ [[package]] name = "logos-blockchain-blend-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "fork_stream", @@ -3511,7 +3511,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-broadcast-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "derivative", @@ -3527,7 +3527,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-leader-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -3555,7 +3555,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -3583,7 +3583,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "bytes", @@ -3613,7 +3613,7 @@ dependencies = [ [[package]] name = "logos-blockchain-chain-service-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-core", "serde", @@ -3622,7 +3622,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-prover" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-circuits-utils", "tempfile", @@ -3631,7 +3631,7 @@ dependencies = [ [[package]] name = "logos-blockchain-circuits-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "dirs", ] @@ -3639,7 +3639,7 @@ dependencies = [ [[package]] name = "logos-blockchain-common-http-client" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "futures", "hex", @@ -3659,7 +3659,7 @@ dependencies = [ [[package]] name = "logos-blockchain-core" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "ark-ff 0.4.2", "bincode", @@ -3689,7 +3689,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-engine" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "cfg_eval", "logos-blockchain-utils", @@ -3704,7 +3704,7 @@ dependencies = [ [[package]] name = "logos-blockchain-cryptarchia-sync" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "bytes", "futures", @@ -3723,7 +3723,7 @@ dependencies = [ [[package]] name = "logos-blockchain-groth16" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -3741,7 +3741,7 @@ dependencies = [ [[package]] name = "logos-blockchain-http-api-common" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "axum", "logos-blockchain-core", @@ -3754,7 +3754,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-keys" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "bytes", @@ -3779,7 +3779,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-macros" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "proc-macro2", "quote", @@ -3789,7 +3789,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-operators" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "logos-blockchain-blend-proofs", @@ -3805,7 +3805,7 @@ dependencies = [ [[package]] name = "logos-blockchain-key-management-system-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "log", @@ -3821,7 +3821,7 @@ dependencies = [ [[package]] name = "logos-blockchain-ledger" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "derivative", "logos-blockchain-blend-crypto", @@ -3845,7 +3845,7 @@ dependencies = [ [[package]] name = "logos-blockchain-libp2p" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "backon", @@ -3874,7 +3874,7 @@ dependencies = [ [[package]] name = "logos-blockchain-network-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -3893,7 +3893,7 @@ dependencies = [ [[package]] name = "logos-blockchain-node" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "axum", @@ -3949,7 +3949,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poc" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -3964,7 +3964,7 @@ dependencies = [ [[package]] name = "logos-blockchain-pol" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -3980,7 +3980,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poq" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", @@ -3996,7 +3996,7 @@ dependencies = [ [[package]] name = "logos-blockchain-poseidon2" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -4007,7 +4007,7 @@ dependencies = [ [[package]] name = "logos-blockchain-sdp-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -4023,7 +4023,7 @@ dependencies = [ [[package]] name = "logos-blockchain-services-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -4038,7 +4038,7 @@ dependencies = [ [[package]] name = "logos-blockchain-storage-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "bytes", @@ -4056,7 +4056,7 @@ dependencies = [ [[package]] name = "logos-blockchain-system-sig-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-ctrlc", "async-trait", @@ -4067,7 +4067,7 @@ dependencies = [ [[package]] name = "logos-blockchain-time-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "cfg_eval", @@ -4089,7 +4089,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "opentelemetry", "opentelemetry-http", @@ -4112,7 +4112,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tracing-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "logos-blockchain-tracing", @@ -4126,7 +4126,7 @@ dependencies = [ [[package]] name = "logos-blockchain-tx-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "futures", @@ -4148,7 +4148,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utils" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "blake2", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "logos-blockchain-utxotree" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "ark-ff 0.4.2", "logos-blockchain-groth16", @@ -4179,7 +4179,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-core", "logos-blockchain-key-management-system-keys", @@ -4194,7 +4194,7 @@ dependencies = [ [[package]] name = "logos-blockchain-wallet-service" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "async-trait", "bytes", @@ -4219,7 +4219,7 @@ dependencies = [ [[package]] name = "logos-blockchain-witness-generator" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "tempfile", ] @@ -4227,7 +4227,7 @@ dependencies = [ [[package]] name = "logos-blockchain-zksign" version = "0.1.0" -source = "git+https://github.com/logos-co/nomos-node.git?rev=a075fdf3209947572069e7b7b2ff6250576c8831#a075fdf3209947572069e7b7b2ff6250576c8831" +source = "git+https://github.com/logos-co/nomos-node.git?rev=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050#19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" dependencies = [ "logos-blockchain-circuits-prover", "logos-blockchain-circuits-utils", diff --git a/Cargo.toml b/Cargo.toml index 675f508..c014882 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,36 +41,36 @@ testing-framework-workflows = { default-features = false, path = "testing-f # Logos git dependencies (pinned to latest master) cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" } -lb-api-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-chain-broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-chain-leader-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-network-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-sdp-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-time-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-wallet-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } -lb-zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "a075fdf3209947572069e7b7b2ff6250576c8831" } +lb-api-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-chain-broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-chain-leader-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +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 = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-network-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-sdp-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-time-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-wallet-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } +lb-zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050" } # 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 0f5afe2..666aa61 100644 --- a/testing-framework/configs/src/nodes/common.rs +++ b/testing-framework/configs/src/nodes/common.rs @@ -8,7 +8,6 @@ use std::{ use lb_api_service::ApiServiceSettings; use lb_chain_leader_service::LeaderWalletConfig; use lb_chain_network::{BootstrapConfig as ChainBootstrapConfig, OrphanConfig, SyncConfig}; -use lb_chain_service::StartingState; use lb_core::mantle::Value; use lb_key_management_system_service::keys::{Key, secured_key::SecuredKey}; use lb_node::{ @@ -74,6 +73,7 @@ pub(crate) fn cryptarchia_deployment(config: &GeneralConfig) -> CryptarchiaDeplo min_stake: config.consensus_config.ledger_config.sdp_config.min_stake, }, gossipsub_protocol: CRYPTARCHIA_GOSSIPSUB_PROTOCOL.to_owned(), + genesis_state: config.consensus_config.genesis_tx.clone(), } } @@ -92,9 +92,6 @@ pub(crate) fn mempool_deployment() -> MempoolDeploymentSettings { pub(crate) fn cryptarchia_config(config: &GeneralConfig) -> CryptarchiaConfig { CryptarchiaConfig { service: CryptarchiaServiceConfig { - starting_state: StartingState::Genesis { - genesis_tx: config.consensus_config.genesis_tx.clone(), - }, recovery_file: PathBuf::from("recovery/cryptarchia.json"), bootstrap: lb_chain_service::BootstrapConfig { prolonged_bootstrap_period: config.bootstrapping_config.prolonged_bootstrap_period, diff --git a/testing-framework/configs/src/topology/configs/time.rs b/testing-framework/configs/src/topology/configs/time.rs index fe6a528..3f29c4e 100644 --- a/testing-framework/configs/src/topology/configs/time.rs +++ b/testing-framework/configs/src/topology/configs/time.rs @@ -8,7 +8,7 @@ use time::OffsetDateTime; 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_SERVER: &str = "pool.ntp.org:123"; const DEFAULT_NTP_TIMEOUT: Duration = Duration::from_secs(5); const DEFAULT_NTP_UPDATE_INTERVAL: Duration = Duration::from_secs(16); diff --git a/testing-framework/core/src/nodes/common/node.rs b/testing-framework/core/src/nodes/common/node.rs index 1bc05a8..0955d1c 100644 --- a/testing-framework/core/src/nodes/common/node.rs +++ b/testing-framework/core/src/nodes/common/node.rs @@ -1,5 +1,5 @@ use std::{ - io, + fs, io, net::SocketAddr, path::{Path, PathBuf}, process::{Child, Command, Stdio}, @@ -9,6 +9,7 @@ use std::{ use lb_tracing_service::LoggerLayer; use reqwest::Url; use serde::Serialize; +use serde_yaml::Value; use tempfile::TempDir; use tokio::time; use tracing::{debug, info}; @@ -194,7 +195,43 @@ fn write_node_config(config: &C, config_path: &Path) -> Result<(), .map_err(|source| SpawnNodeError::WriteConfig { path: config_path.to_path_buf(), source, - }) + })?; + + write_deployment_config_if_present(config_path).map_err(|source| { + SpawnNodeError::WriteConfig { + path: config_path.to_path_buf(), + source, + } + })?; + + Ok(()) +} + +fn write_deployment_config_if_present(config_path: &Path) -> io::Result<()> { + let config_contents = fs::read_to_string(config_path)?; + let yaml_value: Value = serde_yaml::from_str(&config_contents).map_err(io::Error::other)?; + + let Value::Mapping(mut root) = yaml_value else { + return Ok(()); + }; + + let deployment_key = Value::String("deployment".into()); + + let Some(deployment) = root.remove(&deployment_key) else { + return Ok(()); + }; + + let Some(config_dir) = config_path.parent() else { + return Ok(()); + }; + + let deployment_path = config_dir.join("deployment.yaml"); + let deployment_contents = serde_yaml::to_string(&deployment).map_err(io::Error::other)?; + fs::write(deployment_path, deployment_contents)?; + + let updated_config = Value::Mapping(root); + let updated_contents = serde_yaml::to_string(&updated_config).map_err(io::Error::other)?; + fs::write(config_path, updated_contents) } pub(crate) fn spawn_node_process( @@ -202,9 +239,15 @@ pub(crate) fn spawn_node_process( config_path: &Path, workdir: &Path, ) -> Result { - Command::new(binary_path) - .arg(config_path) - .current_dir(workdir) + let mut cmd = Command::new(binary_path); + cmd.arg(config_path); + + let deployment_path = workdir.join("deployment.yaml"); + if deployment_path.is_file() { + cmd.arg("--deployment").arg(deployment_path); + } + + cmd.current_dir(workdir) .stdin(Stdio::null()) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()) diff --git a/versions.env b/versions.env index a316c07..d294ec0 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=a075fdf3209947572069e7b7b2ff6250576c8831 +LOGOS_BLOCKCHAIN_NODE_REV=19d0dfc5b24f3b6fdf9c9b3000fe79db114e4050 # Optional: local logos-blockchain-node checkout override (do not commit absolute paths). # LOGOS_BLOCKCHAIN_NODE_PATH=