logos-blockchain/logos-blockchain-testing
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-blockchain-testing.git synced 2026-04-07 19:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge master into dev and update configs after merge (#17)

Browse Source 
* Sdp config structs from logos blockchain (#15)

* Update configs after main repo merge

---------

Co-authored-by: gusto <bacv@users.noreply.github.com>
This commit is contained in:
Hansie Odendaal 2026-01-29 09:33:25 +02:00 committed by GitHub
parent 3977a90682
commit e2df69b0d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 166 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
Cargo.lock generated
View File

@ -3389,7 +3389,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]] [[package]]
name = "logos-blockchain-api-service" name = "logos-blockchain-api-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3415,7 +3415,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend" name = "logos-blockchain-blend"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-blend-crypto", "logos-blockchain-blend-crypto",
"logos-blockchain-blend-message", "logos-blockchain-blend-message",
@ -3427,7 +3427,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-crypto" name = "logos-blockchain-blend-crypto"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"blake2", "blake2",
"logos-blockchain-groth16", "logos-blockchain-groth16",
@ -3441,7 +3441,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-message" name = "logos-blockchain-blend-message"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"blake2", "blake2",
"derivative", "derivative",
@ -3463,7 +3463,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-network" name = "logos-blockchain-blend-network"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"either", "either",
"futures", "futures",
@ -3481,7 +3481,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-proofs" name = "logos-blockchain-blend-proofs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ed25519-dalek", "ed25519-dalek",
"generic-array 1.3.5", "generic-array 1.3.5",
@ -3496,7 +3496,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-scheduling" name = "logos-blockchain-blend-scheduling"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"derivative", "derivative",
@ -3519,7 +3519,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-blend-service" name = "logos-blockchain-blend-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"fork_stream", "fork_stream",
@ -3554,7 +3554,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-broadcast-service" name = "logos-blockchain-chain-broadcast-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"derivative", "derivative",
@ -3570,7 +3570,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-leader-service" name = "logos-blockchain-chain-leader-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3586,6 +3586,7 @@ dependencies = [
"logos-blockchain-tx-service", "logos-blockchain-tx-service",
"logos-blockchain-wallet-service", "logos-blockchain-wallet-service",
"overwatch", "overwatch",
"rand 0.8.5",
"serde", "serde",
"thiserror 1.0.69", "thiserror 1.0.69",
"tokio", "tokio",
@ -3596,7 +3597,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-network-service" name = "logos-blockchain-chain-network-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3624,7 +3625,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-service" name = "logos-blockchain-chain-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3654,7 +3655,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-chain-service-common" name = "logos-blockchain-chain-service-common"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-core", "logos-blockchain-core",
"serde", "serde",
@ -3663,7 +3664,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-circuits-prover" name = "logos-blockchain-circuits-prover"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
"tempfile", "tempfile",
@ -3672,7 +3673,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-circuits-utils" name = "logos-blockchain-circuits-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"dirs", "dirs",
] ]
@ -3680,7 +3681,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-common-http-client" name = "logos-blockchain-common-http-client"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"futures", "futures",
"logos-blockchain-chain-broadcast-service", "logos-blockchain-chain-broadcast-service",
@ -3697,7 +3698,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-core" name = "logos-blockchain-core"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ark-ff 0.4.2", "ark-ff 0.4.2",
"bincode", "bincode",
@ -3726,7 +3727,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-cryptarchia-engine" name = "logos-blockchain-cryptarchia-engine"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"cfg_eval", "cfg_eval",
"logos-blockchain-utils", "logos-blockchain-utils",
@ -3741,7 +3742,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-cryptarchia-sync" name = "logos-blockchain-cryptarchia-sync"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
@ -3760,7 +3761,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-groth16" name = "logos-blockchain-groth16"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ark-bn254 0.4.0", "ark-bn254 0.4.0",
"ark-ec 0.4.2", "ark-ec 0.4.2",
@ -3778,7 +3779,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-http-api-common" name = "logos-blockchain-http-api-common"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"axum", "axum",
"governor", "governor",
@ -3793,7 +3794,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-keys" name = "logos-blockchain-key-management-system-keys"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -3819,7 +3820,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-macros" name = "logos-blockchain-key-management-system-macros"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3829,7 +3830,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-key-management-system-service" name = "logos-blockchain-key-management-system-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"log", "log",
@ -3844,8 +3845,9 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-ledger" name = "logos-blockchain-ledger"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"derivative",
"logos-blockchain-blend-crypto", "logos-blockchain-blend-crypto",
"logos-blockchain-blend-message", "logos-blockchain-blend-message",
"logos-blockchain-blend-proofs", "logos-blockchain-blend-proofs",
@ -3867,7 +3869,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-libp2p" name = "logos-blockchain-libp2p"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"backon", "backon",
@ -3896,7 +3898,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-mmr" name = "logos-blockchain-mmr"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ark-ff 0.4.2", "ark-ff 0.4.2",
"logos-blockchain-groth16", "logos-blockchain-groth16",
@ -3908,7 +3910,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-network-service" name = "logos-blockchain-network-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -3927,7 +3929,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-node" name = "logos-blockchain-node"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum", "axum",
@ -3984,7 +3986,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-pol" name = "logos-blockchain-pol"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4000,7 +4002,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-poq" name = "logos-blockchain-poq"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",
@ -4016,7 +4018,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-poseidon2" name = "logos-blockchain-poseidon2"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ark-bn254 0.4.0", "ark-bn254 0.4.0",
"ark-ff 0.4.2", "ark-ff 0.4.2",
@ -4027,25 +4029,23 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-sdp-service" name = "logos-blockchain-sdp-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-key-management-system-keys", "logos-blockchain-key-management-system-keys",
"logos-blockchain-tx-service",
"overwatch", "overwatch",
"serde", "serde",
"thiserror 2.0.18", "thiserror 2.0.18",
"tokio", "tokio",
"tokio-stream",
"tracing", "tracing",
] ]
[[package]] [[package]]
name = "logos-blockchain-services-utils" name = "logos-blockchain-services-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -4060,7 +4060,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-storage-service" name = "logos-blockchain-storage-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -4078,7 +4078,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-system-sig-service" name = "logos-blockchain-system-sig-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-ctrlc", "async-ctrlc",
"async-trait", "async-trait",
@ -4089,7 +4089,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-time-service" name = "logos-blockchain-time-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"cfg_eval", "cfg_eval",
@ -4111,7 +4111,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tracing" name = "logos-blockchain-tracing"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"opentelemetry", "opentelemetry",
"opentelemetry-http", "opentelemetry-http",
@ -4134,7 +4134,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tracing-service" name = "logos-blockchain-tracing-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"logos-blockchain-tracing", "logos-blockchain-tracing",
@ -4148,7 +4148,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-tx-service" name = "logos-blockchain-tx-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"futures", "futures",
@ -4170,7 +4170,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-utils" name = "logos-blockchain-utils"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"blake2", "blake2",
@ -4187,7 +4187,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-utxotree" name = "logos-blockchain-utxotree"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"ark-ff 0.4.2", "ark-ff 0.4.2",
"logos-blockchain-core", "logos-blockchain-core",
@ -4202,7 +4202,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-wallet" name = "logos-blockchain-wallet"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-core", "logos-blockchain-core",
"logos-blockchain-key-management-system-keys", "logos-blockchain-key-management-system-keys",
@ -4216,7 +4216,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-wallet-service" name = "logos-blockchain-wallet-service"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"bytes", "bytes",
@ -4240,7 +4240,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-witness-generator" name = "logos-blockchain-witness-generator"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"tempfile", "tempfile",
] ]
@ -4248,7 +4248,7 @@ dependencies = [
[[package]] [[package]]
name = "logos-blockchain-zksign" name = "logos-blockchain-zksign"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3" source = "git+https://github.com/logos-co/nomos-node.git?rev=3f15894f8b4df377e8d3cd9d92ddee9f648046dc#3f15894f8b4df377e8d3cd9d92ddee9f648046dc"
dependencies = [ dependencies = [
"logos-blockchain-circuits-prover", "logos-blockchain-circuits-prover",
"logos-blockchain-circuits-utils", "logos-blockchain-circuits-utils",

60
Cargo.toml
View File

@ -40,39 +40,39 @@ testing-framework-runner-local = { default-features = false, path = "testing-f
testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" } testing-framework-workflows = { default-features = false, path = "testing-framework/workflows" }
# Logos git dependencies (pinned to latest master) # Logos git dependencies (pinned to latest master)
broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" } cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" }
chain-leader = { default-features = false, features = [ chain-leader = { default-features = false, features = [
"pol-dev-mode", "pol-dev-mode",
], git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } ], git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" } zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "3f15894f8b4df377e8d3cd9d92ddee9f648046dc" }
# External crates # External crates
async-trait = { default-features = false, version = "0.1" } async-trait = { default-features = false, version = "0.1" }

10
examples/tests/node_config_override.rs
View File

@ -37,9 +37,10 @@ async fn manual_cluster_api_port_override() -> Result<()> {
.create_patch(move |mut config| { .create_patch(move |mut config| {
println!("overriding API port to {api_port}"); println!("overriding API port to {api_port}");
let current_addr = config.http.backend_settings.address; let current_addr = config.user.http.backend_settings.address;
config.http.backend_settings.address = SocketAddr::new(current_addr.ip(), api_port); config.user.http.backend_settings.address =
SocketAddr::new(current_addr.ip(), api_port);
Ok(config) Ok(config)
}), }),
@ -73,9 +74,10 @@ async fn scenario_builder_api_port_override() -> Result<()> {
.node_config_patch_with(0, move |mut config| { .node_config_patch_with(0, move |mut config| {
println!("overriding API port to {api_port}"); println!("overriding API port to {api_port}");
let current_addr = config.http.backend_settings.address; let current_addr = config.user.http.backend_settings.address;
config.http.backend_settings.address = SocketAddr::new(current_addr.ip(), api_port); config.user.http.backend_settings.address =
SocketAddr::new(current_addr.ip(), api_port);
Ok(config) Ok(config)
}) })

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

@ -1,7 +1,10 @@
use key_management_system_service::keys::secured_key::SecuredKey as _;
use nomos_core::mantle::Value;
use nomos_node::{ use nomos_node::{
Config as NodeConfig, RocksBackendSettings, config::deployment::DeploymentSettings, RocksBackendSettings, UserConfig,
config::{RunConfig, deployment::DeploymentSettings},
}; };
use nomos_sdp::SdpSettings; use nomos_sdp::{SdpSettings, wallet::SdpWalletConfig};
use crate::{ use crate::{
nodes::{ nodes::{
@ -16,7 +19,7 @@ use crate::{
}; };
#[must_use] #[must_use]
pub fn create_node_config(config: GeneralConfig) -> NodeConfig { pub fn create_node_config(config: GeneralConfig) -> RunConfig {
let network_config = config.network_config.clone(); let network_config = config.network_config.clone();
let (blend_user_config, blend_deployment, network_deployment) = let (blend_user_config, blend_deployment, network_deployment) =
build_blend_service_config(&config.blend_config); build_blend_service_config(&config.blend_config);
@ -24,20 +27,30 @@ pub fn create_node_config(config: GeneralConfig) -> NodeConfig {
let deployment_settings = let deployment_settings =
build_node_deployment_settings(&config, blend_deployment, network_deployment); build_node_deployment_settings(&config, blend_deployment, network_deployment);
NodeConfig { let user_settings = UserConfig {
network: network_config, network: network_config,
blend: blend_user_config, blend: blend_user_config,
deployment: deployment_settings,
cryptarchia: cryptarchia_config(&config), cryptarchia: cryptarchia_config(&config),
tracing: tracing_settings(&config), tracing: tracing_settings(&config),
http: http_config(&config), http: http_config(&config),
storage: rocks_storage_settings(), storage: rocks_storage_settings(),
time: time_config(&config), time: time_config(&config),
mempool: mempool_config(), mempool: mempool_config(),
sdp: SdpSettings { declaration: None }, sdp: SdpSettings {
declaration: None,
wallet_config: SdpWalletConfig {
max_tx_fee: Value::MAX,
funding_pk: config.consensus_config.funding_sk.as_public_key(),
},
},
testing_http: testing_http_config(&config), testing_http: testing_http_config(&config),
wallet: wallet_settings(&config), wallet: wallet_settings(&config),
key_management: config.kms_config.clone(), key_management: config.kms_config.clone(),
};
RunConfig {
deployment: deployment_settings,
user: user_settings,
} }
} }
@ -46,13 +59,13 @@ fn build_node_deployment_settings(
blend_deployment: nomos_node::config::blend::deployment::Settings, blend_deployment: nomos_node::config::blend::deployment::Settings,
network_deployment: nomos_node::config::network::deployment::Settings, network_deployment: nomos_node::config::network::deployment::Settings,
) -> DeploymentSettings { ) -> DeploymentSettings {
DeploymentSettings::new_custom( DeploymentSettings {
blend_deployment, blend: blend_deployment,
network_deployment, network: network_deployment,
cryptarchia_deployment(config), cryptarchia: cryptarchia_deployment(config),
time_deployment(config), time: time_deployment(config),
mempool_deployment(), mempool: mempool_deployment(),
) }
} }
fn rocks_storage_settings() -> RocksBackendSettings { fn rocks_storage_settings() -> RocksBackendSettings {

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

@ -104,6 +104,7 @@ pub struct GeneralConsensusConfig {
pub utxos: Vec<Utxo>, pub utxos: Vec<Utxo>,
pub blend_notes: Vec<ServiceNote>, pub blend_notes: Vec<ServiceNote>,
pub wallet_accounts: Vec<WalletAccount>, pub wallet_accounts: Vec<WalletAccount>,
pub funding_sk: ZkKey,
} }
#[derive(Clone)] #[derive(Clone)]
@ -205,21 +206,29 @@ pub fn create_consensus_configs(
) -> Result<Vec<GeneralConsensusConfig>, ConsensusConfigError> { ) -> Result<Vec<GeneralConsensusConfig>, ConsensusConfigError> {
let mut leader_keys = Vec::new(); let mut leader_keys = Vec::new();
let mut blend_notes = Vec::new(); let mut blend_notes = Vec::new();
let mut sdp_notes = Vec::new();
let utxos = create_utxos_for_leader_and_services(ids, &mut leader_keys, &mut blend_notes); let utxos = create_utxos_for_leader_and_services(
ids,
&mut leader_keys,
&mut blend_notes,
&mut sdp_notes,
);
let utxos = append_wallet_utxos(utxos, wallet); let utxos = append_wallet_utxos(utxos, wallet);
let genesis_tx = create_genesis_tx(&utxos)?; let genesis_tx = create_genesis_tx(&utxos)?;
let ledger_config = build_ledger_config(consensus_params)?; let ledger_config = build_ledger_config(consensus_params)?;
Ok(leader_keys Ok(leader_keys
.into_iter() .into_iter()
.map(|(pk, sk)| GeneralConsensusConfig { .enumerate()
.map(|(i, (pk, sk))| GeneralConsensusConfig {
leader_config: LeaderConfig { pk, sk }, leader_config: LeaderConfig { pk, sk },
ledger_config: ledger_config.clone(), ledger_config: ledger_config.clone(),
genesis_tx: genesis_tx.clone(), genesis_tx: genesis_tx.clone(),
utxos: utxos.clone(), utxos: utxos.clone(),
blend_notes: blend_notes.clone(), blend_notes: blend_notes.clone(),
wallet_accounts: wallet.accounts.clone(), wallet_accounts: wallet.accounts.clone(),
funding_sk: sdp_notes[i].sk.clone(),
}) })
.collect()) .collect())
} }
@ -228,6 +237,7 @@ fn create_utxos_for_leader_and_services(
ids: &[[u8; 32]], ids: &[[u8; 32]],
leader_keys: &mut Vec<(ZkPublicKey, UnsecuredZkKey)>, leader_keys: &mut Vec<(ZkPublicKey, UnsecuredZkKey)>,
blend_notes: &mut Vec<ServiceNote>, blend_notes: &mut Vec<ServiceNote>,
sdp_notes: &mut Vec<ServiceNote>,
) -> Vec<Utxo> { ) -> Vec<Utxo> {
let mut utxos = Vec::new(); let mut utxos = Vec::new();
@ -238,6 +248,7 @@ fn create_utxos_for_leader_and_services(
for &id in ids { for &id in ids {
output_index = push_leader_utxo(id, leader_keys, &mut utxos, output_index); output_index = push_leader_utxo(id, leader_keys, &mut utxos, output_index);
output_index = push_service_note(b"bn", id, blend_notes, &mut utxos, output_index); output_index = push_service_note(b"bn", id, blend_notes, &mut utxos, output_index);
output_index = push_service_note(b"sdp", id, sdp_notes, &mut utxos, output_index);
} }
utxos utxos

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

@ -1,6 +1,6 @@
use std::{ops::Deref, path::PathBuf, time::Duration}; use std::{ops::Deref, path::PathBuf, time::Duration};
use nomos_node::Config; use nomos_node::config::RunConfig;
use nomos_tracing_service::LoggerLayer; use nomos_tracing_service::LoggerLayer;
pub use testing_framework_config::nodes::node::create_node_config; pub use testing_framework_config::nodes::node::create_node_config;
use tracing::{debug, info}; use tracing::{debug, info};
@ -33,13 +33,13 @@ fn binary_path() -> PathBuf {
} }
pub struct Node { pub struct Node {
handle: NodeHandle<Config>, handle: NodeHandle<RunConfig>,
} }
pub fn apply_node_config_patches<'a>( pub fn apply_node_config_patches<'a>(
mut config: Config, mut config: RunConfig,
patches: impl IntoIterator<Item = &'a NodeConfigPatch>, patches: impl IntoIterator<Item = &'a NodeConfigPatch>,
) -> Result<Config, DynError> { ) -> Result<RunConfig, DynError> {
for patch in patches { for patch in patches {
config = patch(config)?; config = patch(config)?;
} }
@ -47,14 +47,14 @@ pub fn apply_node_config_patches<'a>(
} }
pub fn apply_node_config_patch( pub fn apply_node_config_patch(
config: Config, config: RunConfig,
patch: &NodeConfigPatch, patch: &NodeConfigPatch,
) -> Result<Config, DynError> { ) -> Result<RunConfig, DynError> {
apply_node_config_patches(config, [patch]) apply_node_config_patches(config, [patch])
} }
impl Deref for Node { impl Deref for Node {
type Target = NodeHandle<Config>; type Target = NodeHandle<RunConfig>;
fn deref(&self) -> &Self::Target { fn deref(&self) -> &Self::Target {
&self.handle &self.handle
@ -86,7 +86,7 @@ impl Node {
self.handle.wait_for_exit(timeout).await self.handle.wait_for_exit(timeout).await
} }
pub async fn spawn(config: Config, label: &str) -> Result<Self, SpawnNodeError> { pub async fn spawn(config: RunConfig, label: &str) -> Result<Self, SpawnNodeError> {
let log_prefix = format!("{LOGS_PREFIX}-{label}"); let log_prefix = format!("{LOGS_PREFIX}-{label}");
let handle = spawn_node( let handle = spawn_node(
config, config,
@ -103,19 +103,19 @@ impl Node {
} }
} }
impl NodeConfigCommon for Config { impl NodeConfigCommon for RunConfig {
fn set_logger(&mut self, logger: LoggerLayer) { fn set_logger(&mut self, logger: LoggerLayer) {
self.tracing.logger = logger; self.user.tracing.logger = logger;
} }
fn set_paths(&mut self, base: &std::path::Path) { fn set_paths(&mut self, base: &std::path::Path) {
self.storage.db_path = base.join("db"); self.user.storage.db_path = base.join("db");
} }
fn addresses(&self) -> NodeAddresses { fn addresses(&self) -> NodeAddresses {
( (
self.http.backend_settings.address, self.user.http.backend_settings.address,
Some(self.testing_http.backend_settings.address), Some(self.user.testing_http.backend_settings.address),
) )
} }
} }

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

@ -56,7 +56,10 @@ impl Default for StartNodeOptions {
impl StartNodeOptions { impl StartNodeOptions {
pub fn create_patch<F>(mut self, f: F) -> Self pub fn create_patch<F>(mut self, f: F) -> Self
where where
F: Fn(nomos_node::Config) -> Result<nomos_node::Config, DynError> + Send + Sync + 'static, F: Fn(nomos_node::config::RunConfig) -> Result<nomos_node::config::RunConfig, DynError>
+ Send
+ Sync
+ 'static,
{ {
self.config_patch = Some(Arc::new(f)); self.config_patch = Some(Arc::new(f));
self self

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

@ -1,6 +1,6 @@
use std::{num::NonZeroUsize, sync::Arc, time::Duration}; use std::{num::NonZeroUsize, sync::Arc, time::Duration};
use nomos_node::Config as NodeConfig; use nomos_node::config::RunConfig;
use thiserror::Error; use thiserror::Error;
use tracing::{debug, info}; use tracing::{debug, info};
@ -314,7 +314,7 @@ impl<Caps> TopologyConfigurator<Caps> {
#[must_use] #[must_use]
pub fn node_config_patch_with<F>(mut self, index: usize, f: F) -> Self pub fn node_config_patch_with<F>(mut self, index: usize, f: F) -> Self
where where
F: Fn(NodeConfig) -> Result<NodeConfig, DynError> + Send + Sync + 'static, F: Fn(RunConfig) -> Result<RunConfig, DynError> + Send + Sync + 'static,
{ {
self.builder.topology = self self.builder.topology = self
.builder .builder

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

@ -4,7 +4,7 @@ use nomos_core::{
mantle::GenesisTx as _, mantle::GenesisTx as _,
sdp::{Locator, ServiceType}, sdp::{Locator, ServiceType},
}; };
use nomos_node::Config as NodeConfig; use nomos_node::config::RunConfig;
use testing_framework_config::topology::{ use testing_framework_config::topology::{
configs::{ configs::{
api::{ApiConfigError, create_api_configs}, api::{ApiConfigError, create_api_configs},
@ -31,7 +31,7 @@ use crate::{
}; };
/// Per-node config patch applied after the default node config is generated. /// Per-node config patch applied after the default node config is generated.
pub type NodeConfigPatch = Arc<dyn Fn(NodeConfig) -> Result<NodeConfig, DynError> + Send + Sync>; pub type NodeConfigPatch = Arc<dyn Fn(RunConfig) -> Result<RunConfig, DynError> + Send + Sync>;
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum TopologyBuildError { pub enum TopologyBuildError {

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

@ -110,7 +110,7 @@ impl Topology {
fn node_listen_ports(&self) -> Vec<u16> { fn node_listen_ports(&self) -> Vec<u16> {
self.nodes self.nodes
.iter() .iter()
.map(|node| node.config().network.backend.swarm.port) .map(|node| node.config().user.network.backend.swarm.port)
.collect() .collect()
} }
@ -119,6 +119,7 @@ impl Topology {
.iter() .iter()
.map(|node| { .map(|node| {
node.config() node.config()
.user
.network .network
.backend .backend
.initial_peers .initial_peers
@ -133,7 +134,12 @@ impl Topology {
self.nodes self.nodes
.iter() .iter()
.enumerate() .enumerate()
.map(|(idx, node)| format!("node#{idx}@{}", node.config().network.backend.swarm.port)) .map(|(idx, node)| {
format!(
"node#{idx}@{}",
node.config().user.network.backend.swarm.port
)
})
.collect() .collect()
} }
} }

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

@ -3,7 +3,7 @@ use std::{
sync::Mutex, sync::Mutex,
}; };
use nomos_node::Config as NodeConfig; use nomos_node::config::RunConfig;
use testing_framework_config::topology::configs::{consensus, time}; use testing_framework_config::topology::configs::{consensus, time};
use testing_framework_core::{ use testing_framework_core::{
nodes::{ nodes::{
@ -169,7 +169,7 @@ impl LocalDynamicNodes {
let listen_ports = state let listen_ports = state
.nodes .nodes
.iter() .iter()
.map(|node| node.config().network.backend.swarm.port) .map(|node| node.config().user.network.backend.swarm.port)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let initial_peer_ports = state let initial_peer_ports = state
@ -177,6 +177,7 @@ impl LocalDynamicNodes {
.iter() .iter()
.map(|node| { .map(|node| {
node.config() node.config()
.user
.network .network
.backend .backend
.initial_peers .initial_peers
@ -193,7 +194,10 @@ impl LocalDynamicNodes {
.iter() .iter()
.enumerate() .enumerate()
.map(|(idx, node)| ReadinessNode { .map(|(idx, node)| ReadinessNode {
label: format!("node#{idx}@{}", node.config().network.backend.swarm.port), label: format!(
"node#{idx}@{}",
node.config().user.network.backend.swarm.port
),
expected_peers: expected_peer_counts.get(idx).copied(), expected_peers: expected_peer_counts.get(idx).copied(),
api: node.api().clone(), api: node.api().clone(),
}) })
@ -262,7 +266,7 @@ impl LocalDynamicNodes {
&self, &self,
node_name: &str, node_name: &str,
network_port: u16, network_port: u16,
config: NodeConfig, config: RunConfig,
) -> Result<ApiClient, LocalDynamicError> { ) -> Result<ApiClient, LocalDynamicError> {
let node = Node::spawn(config, node_name) let node = Node::spawn(config, node_name)
.await .await
@ -286,7 +290,7 @@ fn build_node_config(
general_config: testing_framework_config::topology::configs::GeneralConfig, general_config: testing_framework_config::topology::configs::GeneralConfig,
descriptor_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, descriptor_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
options_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, options_patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
) -> Result<NodeConfig, LocalDynamicError> { ) -> Result<RunConfig, LocalDynamicError> {
let mut config = create_node_config(general_config); let mut config = create_node_config(general_config);
config = apply_patch_if_needed(config, descriptor_patch)?; config = apply_patch_if_needed(config, descriptor_patch)?;
config = apply_patch_if_needed(config, options_patch)?; config = apply_patch_if_needed(config, options_patch)?;
@ -295,9 +299,9 @@ fn build_node_config(
} }
fn apply_patch_if_needed( fn apply_patch_if_needed(
config: NodeConfig, config: RunConfig,
patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>, patch: Option<&testing_framework_core::topology::config::NodeConfigPatch>,
) -> Result<NodeConfig, LocalDynamicError> { ) -> Result<RunConfig, LocalDynamicError> {
let Some(patch) = patch else { let Some(patch) = patch else {
return Ok(config); return Ok(config);
}; };

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

@ -4,7 +4,7 @@ use cfgsync_tf::{
client::{FetchedConfig, get_config}, client::{FetchedConfig, get_config},
server::ClientIp, server::ClientIp,
}; };
use nomos_node::Config as NodeConfig; use nomos_node::UserConfig;
use serde::{Serialize, de::DeserializeOwned}; use serde::{Serialize, de::DeserializeOwned};
use testing_framework_config::constants::cfgsync_port as default_cfgsync_port; use testing_framework_config::constants::cfgsync_port as default_cfgsync_port;
use testing_framework_core::nodes::common::config::injection::{ use testing_framework_core::nodes::common::config::injection::{
@ -70,7 +70,7 @@ async fn main() {
let node_config_endpoint = format!("{server_addr}/node"); let node_config_endpoint = format!("{server_addr}/node");
let config_result = let config_result =
pull_to_file::<NodeConfig>(payload, &node_config_endpoint, &config_file_path).await; pull_to_file::<UserConfig>(payload, &node_config_endpoint, &config_file_path).await;
// Handle error if the config request fails // Handle error if the config request fails
if let Err(err) = config_result { if let Err(err) = config_result {

2
versions.env
View File

@ -1,7 +1,7 @@
VERSION=v0.3.2 VERSION=v0.3.2
LOGOS_BLOCKCHAIN_BUNDLE_VERSION=v4 LOGOS_BLOCKCHAIN_BUNDLE_VERSION=v4
# Pinned logos-blockchain-node revision used for CI builds and binary bundles. # Pinned logos-blockchain-node revision used for CI builds and binary bundles.
LOGOS_BLOCKCHAIN_NODE_REV=47ae18e95f643bde563b4769212b37f6f018fed3 LOGOS_BLOCKCHAIN_NODE_REV=3f15894f8b4df377e8d3cd9d92ddee9f648046dc
# Optional: local logos-blockchain-node checkout override (do not commit absolute paths). # Optional: local logos-blockchain-node checkout override (do not commit absolute paths).
# LOGOS_BLOCKCHAIN_NODE_PATH= # LOGOS_BLOCKCHAIN_NODE_PATH=