From a775613af8922305a565ae2cfca376dbca954215 Mon Sep 17 00:00:00 2001 From: andrussal Date: Sat, 13 Dec 2025 12:36:05 +0100 Subject: [PATCH] CI: drop local Cargo.toml patch overrides --- Cargo.lock | 67 +++++++++++++++++++++++++++----- Cargo.toml | 42 -------------------- scripts/update-nomos-rev.sh | 77 +------------------------------------ 3 files changed, 59 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f888b0..5a63473 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -836,6 +836,7 @@ dependencies = [ [[package]] name = "broadcast-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "derivative", @@ -994,6 +995,7 @@ dependencies = [ [[package]] name = "chain-common" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "nomos-core", "serde", @@ -1002,6 +1004,7 @@ dependencies = [ [[package]] name = "chain-leader" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "chain-common", @@ -1028,6 +1031,7 @@ dependencies = [ [[package]] name = "chain-network" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "chain-common", @@ -1056,6 +1060,7 @@ dependencies = [ [[package]] name = "chain-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "broadcast-service", @@ -1128,6 +1133,7 @@ dependencies = [ [[package]] name = "circuits-prover" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "circuits-utils", "tempfile", @@ -1136,6 +1142,7 @@ dependencies = [ [[package]] name = "circuits-utils" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "dirs", ] @@ -1205,6 +1212,7 @@ dependencies = [ [[package]] name = "common-http-client" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "broadcast-service", "futures", @@ -1355,6 +1363,7 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] name = "cryptarchia-engine" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "cfg_eval", "nomos-utils", @@ -1369,6 +1378,7 @@ dependencies = [ [[package]] name = "cryptarchia-sync" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "bytes", "cryptarchia-engine", @@ -1843,6 +1853,7 @@ dependencies = [ [[package]] name = "executor-http-client" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "common-http-client", "futures", @@ -1850,8 +1861,6 @@ dependencies = [ "nomos-http-api-common", "reqwest", "serde", - "serde_json", - "tracing", ] [[package]] @@ -2224,6 +2233,7 @@ dependencies = [ [[package]] name = "groth16" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-bn254 0.4.0", "ark-ec 0.4.2", @@ -3119,13 +3129,13 @@ dependencies = [ [[package]] name = "key-management-system-keys" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "bytes", "ed25519-dalek", "generic-array 1.3.5", "groth16", - "hex", "key-management-system-macros", "nomos-blend-proofs", "nomos-utils", @@ -3144,6 +3154,7 @@ dependencies = [ [[package]] name = "key-management-system-macros" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "proc-macro2", "quote", @@ -3153,6 +3164,7 @@ dependencies = [ [[package]] name = "key-management-system-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "key-management-system-keys", @@ -3258,6 +3270,7 @@ dependencies = [ [[package]] name = "kzgrs" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-bls12-381", "ark-ec 0.4.2", @@ -3276,6 +3289,7 @@ dependencies = [ [[package]] name = "kzgrs-backend" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-ff 0.4.2", "ark-poly 0.4.2", @@ -3899,6 +3913,7 @@ dependencies = [ [[package]] name = "mmr" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-ff 0.4.2", "groth16", @@ -4185,6 +4200,7 @@ dependencies = [ [[package]] name = "nomos-api" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "broadcast-service", @@ -4217,6 +4233,7 @@ dependencies = [ [[package]] name = "nomos-blend" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "nomos-blend-crypto", "nomos-blend-message", @@ -4228,6 +4245,7 @@ dependencies = [ [[package]] name = "nomos-blend-crypto" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "blake2", "groth16", @@ -4245,6 +4263,7 @@ dependencies = [ [[package]] name = "nomos-blend-message" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "blake2", "derivative", @@ -4266,6 +4285,7 @@ dependencies = [ [[package]] name = "nomos-blend-network" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "either", "futures", @@ -4283,6 +4303,7 @@ dependencies = [ [[package]] name = "nomos-blend-proofs" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ed25519-dalek", "generic-array 1.3.5", @@ -4297,6 +4318,7 @@ dependencies = [ [[package]] name = "nomos-blend-scheduling" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "derivative", @@ -4320,6 +4342,7 @@ dependencies = [ [[package]] name = "nomos-blend-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "broadcast-service", @@ -4354,6 +4377,7 @@ dependencies = [ [[package]] name = "nomos-core" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-ff 0.4.2", "async-trait", @@ -4383,6 +4407,7 @@ dependencies = [ [[package]] name = "nomos-da-dispersal" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "broadcast-service", @@ -4408,6 +4433,7 @@ dependencies = [ [[package]] name = "nomos-da-messages" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "blake2", "futures", @@ -4420,6 +4446,7 @@ dependencies = [ [[package]] name = "nomos-da-network-core" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "cached", "either", @@ -4447,6 +4474,7 @@ dependencies = [ [[package]] name = "nomos-da-network-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "arc-swap", "async-trait", @@ -4483,6 +4511,7 @@ dependencies = [ [[package]] name = "nomos-da-sampling" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "bytes", @@ -4510,6 +4539,7 @@ dependencies = [ [[package]] name = "nomos-da-verifier" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "futures", @@ -4536,6 +4566,7 @@ dependencies = [ [[package]] name = "nomos-executor" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "axum", @@ -4574,22 +4605,22 @@ dependencies = [ [[package]] name = "nomos-http-api-common" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "axum", "governor", - "hex", "key-management-system-keys", "nomos-core", "serde", "serde_json", "serde_with", "tower_governor", - "tracing", ] [[package]] name = "nomos-ledger" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "cryptarchia-engine", "groth16", @@ -4612,6 +4643,7 @@ dependencies = [ [[package]] name = "nomos-libp2p" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "backon", @@ -4640,6 +4672,7 @@ dependencies = [ [[package]] name = "nomos-network" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "cryptarchia-sync", @@ -4658,6 +4691,7 @@ dependencies = [ [[package]] name = "nomos-node" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "axum", @@ -4722,6 +4756,7 @@ dependencies = [ [[package]] name = "nomos-sdp" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "futures", @@ -4739,6 +4774,7 @@ dependencies = [ [[package]] name = "nomos-storage" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "bytes", @@ -4758,6 +4794,7 @@ dependencies = [ [[package]] name = "nomos-system-sig" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-ctrlc", "async-trait", @@ -4768,6 +4805,7 @@ dependencies = [ [[package]] name = "nomos-time" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "cfg_eval", @@ -4789,6 +4827,7 @@ dependencies = [ [[package]] name = "nomos-tracing" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "opentelemetry", "opentelemetry-http", @@ -4811,6 +4850,7 @@ dependencies = [ [[package]] name = "nomos-tracing-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "nomos-tracing", @@ -4824,6 +4864,7 @@ dependencies = [ [[package]] name = "nomos-utils" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "blake2", @@ -4840,6 +4881,7 @@ dependencies = [ [[package]] name = "nomos-wallet" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "bytes", @@ -5354,6 +5396,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "pol" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "circuits-prover", "circuits-utils", @@ -5383,6 +5426,7 @@ dependencies = [ [[package]] name = "poq" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "circuits-prover", "circuits-utils", @@ -5404,6 +5448,7 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" [[package]] name = "poseidon2" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-bn254 0.4.0", "ark-ff 0.4.2", @@ -6424,6 +6469,7 @@ dependencies = [ [[package]] name = "services-utils" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "futures", @@ -6611,6 +6657,7 @@ dependencies = [ [[package]] name = "subnetworks-assignations" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "counter", "libp2p-identity", @@ -6910,6 +6957,7 @@ dependencies = [ [[package]] name = "tests" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "blst", @@ -7533,6 +7581,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tx-service" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "async-trait", "futures", @@ -7692,6 +7741,7 @@ checksum = "e2eebbbfe4093922c2b6734d7c679ebfebd704a0d7e56dfcb0d05818ce28977d" [[package]] name = "utxotree" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "ark-ff 0.4.2", "groth16", @@ -7744,6 +7794,7 @@ dependencies = [ [[package]] name = "wallet" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "key-management-system-keys", "nomos-core", @@ -8296,6 +8347,7 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" [[package]] name = "witness-generator" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "circuits-utils", "tempfile", @@ -8505,6 +8557,7 @@ dependencies = [ [[package]] name = "zksign" version = "0.1.0" +source = "git+https://github.com/logos-co/nomos-node.git?rev=365b36469c34a19c607eed7d8f7a3e5380dac36e#365b36469c34a19c607eed7d8f7a3e5380dac36e" dependencies = [ "circuits-prover", "circuits-utils", @@ -8516,7 +8569,3 @@ dependencies = [ "thiserror 2.0.17", "witness-generator", ] - -[[patch.unused]] -name = "poc" -version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 7eacac4..2135cc7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -99,45 +99,3 @@ tempfile = { default-features = false, version = "3" } thiserror = { default-features = false, version = "2.0" } tokio = { default-features = false, version = "1" } tracing = { default-features = false, version = "0.1" } - -[patch."https://github.com/logos-co/nomos-node"] -broadcast-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/broadcast-service" } -chain-leader = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-leader" } -chain-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-network" } -chain-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-service" } -common-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/http-client" } -cryptarchia-engine = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-engine" } -cryptarchia-sync = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-sync" } -executor-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/http-client" } -groth16 = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/groth16" } -key-management-system-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/key-management-system" } -kzgrs = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs" } -kzgrs-backend = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs-backend" } -nomos-api = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/api" } -nomos-blend-message = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-blend/message" } -nomos-blend-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/blend" } -nomos-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-core/chain-defs" } -nomos-da-dispersal = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/dispersal" } -nomos-da-network-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/core" } -nomos-da-network-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/network" } -nomos-da-sampling = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/sampling" } -nomos-da-verifier = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/verifier" } -nomos-executor = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/executor" } -nomos-http-api-common = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/api-common" } -nomos-ledger = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/ledger/nomos-ledger" } -nomos-libp2p = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-libp2p" } -nomos-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/network" } -nomos-node = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/node" } -nomos-sdp = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/sdp" } -nomos-time = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/time" } -nomos-tracing = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-tracing" } -nomos-tracing-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tracing" } -nomos-utils = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-utils" } -nomos-wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/wallet" } -poc = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/poc" } -pol = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/pol" } -subnetworks-assignations = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/subnetworks-assignations" } -tests = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/tests" } -tx-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tx-service" } -wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/wallet" } -zksign = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/zksign" } diff --git a/scripts/update-nomos-rev.sh b/scripts/update-nomos-rev.sh index 494a661..5c3deb6 100755 --- a/scripts/update-nomos-rev.sh +++ b/scripts/update-nomos-rev.sh @@ -67,7 +67,7 @@ if [ -n "${REV}" ]; then "${ROOT_DIR}/versions.env" rm -f "${ROOT_DIR}/versions.env.bak" - # Update all rev fields in Cargo.toml pointing to nomos-node and strip any patch block. + # Update all rev fields in Cargo.toml pointing to nomos-node. python3 - "$ROOT_DIR" "$REV" <<'PY' import pathlib, re, sys root = pathlib.Path(sys.argv[1]) @@ -75,11 +75,6 @@ rev = sys.argv[2] cargo_toml = root / "Cargo.toml" txt = cargo_toml.read_text() txt = txt.replace("\\n", "\n") -txt = re.sub( - r'(?ms)^\[patch\."https://github\.com/logos-co/nomos-node"\].*?(?=^\[|\Z)', - "", - txt, -) txt = re.sub( r'(git = "https://github\.com/logos-co/nomos-node\.git", rev = ")[^"]+(")', r"\g<1>" + rev + r"\2", @@ -100,76 +95,6 @@ else -e "s/^#?[[:space:]]*NOMOS_NODE_REV=.*/# NOMOS_NODE_REV=${CURRENT_REV}/" \ "${ROOT_DIR}/versions.env" rm -f "${ROOT_DIR}/versions.env.bak" - - # Generate a patch block for all nomos-node crates we depend on. - PYTHON_BIN="${PYTHON_BIN:-python3}" - if ! command -v "${PYTHON_BIN}" >/dev/null 2>&1; then - echo "ERROR: python3 is required to patch Cargo.toml for local paths" >&2 - exit 1 - fi - "${PYTHON_BIN}" - "$ROOT_DIR" "$LOCAL_PATH" <<'PY' -import pathlib, subprocess, json, sys, re -root = pathlib.Path(sys.argv[1]) -node_path = pathlib.Path(sys.argv[2]) - -targets = [ - "broadcast-service", "chain-leader", "chain-network", "chain-service", - "common-http-client", "cryptarchia-engine", "cryptarchia-sync", - "executor-http-client", "groth16", "key-management-system-service", - "kzgrs", "kzgrs-backend", "nomos-api", "nomos-blend-message", - "nomos-blend-service", "nomos-core", "nomos-da-dispersal", - "nomos-da-network-core", "nomos-da-network-service", "nomos-da-sampling", - "nomos-da-verifier", "nomos-executor", "nomos-http-api-common", - "nomos-ledger", "nomos-libp2p", "nomos-network", "nomos-node", - "nomos-sdp", "nomos-time", "nomos-tracing", "nomos-tracing-service", - "nomos-utils", "nomos-wallet", "poc", "pol", "subnetworks-assignations", - "tests", "tx-service", "wallet", "zksign", -] - -try: - meta = subprocess.check_output( - ["cargo", "metadata", "--format-version", "1", "--no-deps"], - cwd=node_path, - ) -except subprocess.CalledProcessError as exc: - sys.stderr.write(f"Failed to run cargo metadata in {node_path}: {exc}\\n") - sys.exit(1) - -data = json.loads(meta) -paths = {} -for pkg in data.get("packages", []): - paths[pkg["name"]] = str(pathlib.Path(pkg["manifest_path"]).parent) - -patch_lines = ['[patch."https://github.com/logos-co/nomos-node"]'] -missing = [] -for name in targets: - if name in paths: - patch_lines.append(f'{name} = {{ path = "{paths[name]}" }}') - else: - missing.append(name) - -cargo_toml = root / "Cargo.toml" -txt = cargo_toml.read_text() -# Normalize any accidental literal escape sequences. -txt = txt.replace("\\n", "\n") -# Strip existing patch block for this URL if present (non-greedy). -txt = re.sub( - r'(?ms)^\[patch\."https://github\.com/logos-co/nomos-node"\].*?(?=^\[|\Z)', - "", - txt, -) -# Ensure a trailing newline and append new patch. -txt = txt.rstrip() + "\n\n" + "\n".join(patch_lines) + "\n" -cargo_toml.write_text(txt) - -if missing: - sys.stderr.write( - "Warning: missing crates in local nomos-node checkout: " - + ", ".join(missing) - + "\\n" - ) -PY - fi echo "Done. Consider updating Cargo.lock if needed (cargo fetch)."