From 0c1fa9f4a884908146ed2db00dc55abea56e1dfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCn=20=C3=96zerk?= Date: Tue, 28 Mar 2023 17:17:40 +0300 Subject: [PATCH] fix farmer silent exit (#157) * fix farmer silent exit --- Cargo.lock | 196 +++++++++++++++++++++---------------------- Cargo.toml | 4 +- src/commands/farm.rs | 86 +++++++++++-------- src/commands/init.rs | 2 +- 4 files changed, 154 insertions(+), 134 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15575a6f..27f9a120 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1320,7 +1320,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "core-payments-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -1514,7 +1514,7 @@ dependencies = [ [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "futures 0.3.26", "parity-scale-codec", @@ -2056,7 +2056,7 @@ dependencies = [ [[package]] name = "domain-block-builder" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -2073,7 +2073,7 @@ dependencies = [ [[package]] name = "domain-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-trait", "parking_lot 0.12.1", @@ -2089,7 +2089,7 @@ dependencies = [ [[package]] name = "domain-client-executor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "crossbeam", "domain-block-builder", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "domain-client-executor-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "futures 0.3.26", "parity-scale-codec", @@ -2154,7 +2154,7 @@ dependencies = [ [[package]] name = "domain-client-message-relayer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "cross-domain-message-gossip", "domain-runtime-primitives", @@ -2179,7 +2179,7 @@ dependencies = [ [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-executive", "frame-support", @@ -2196,7 +2196,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "sp-api", @@ -2208,7 +2208,7 @@ dependencies = [ [[package]] name = "domain-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "clap", "cross-domain-message-gossip", @@ -4065,14 +4065,14 @@ dependencies = [ [[package]] name = "libp2p" version = "0.51.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "bytes", "futures 0.3.26", "futures-timer", "getrandom 0.2.7", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-dns 0.39.0", "libp2p-gossipsub", "libp2p-identify 0.42.0", @@ -4165,7 +4165,7 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.39.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "asn1_der", "bs58", @@ -4178,14 +4178,14 @@ dependencies = [ "log", "multiaddr 0.17.0", "multihash 0.17.0", - "multistream-select 0.12.1 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "multistream-select 0.12.1 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "sec1", "serde", "sha2 0.10.2", @@ -4213,10 +4213,10 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.39.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "futures 0.3.26", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "log", "parking_lot 0.12.1", "smallvec", @@ -4226,7 +4226,7 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.44.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "asynchronous-codec", "base64 0.20.0", @@ -4236,13 +4236,13 @@ dependencies = [ "futures 0.3.26", "hex_fmt", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "prometheus-client 0.19.0", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "rand 0.8.5", "regex", "serde", @@ -4277,19 +4277,19 @@ dependencies = [ [[package]] name = "libp2p-identify" version = "0.42.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "asynchronous-codec", "either", "futures 0.3.26", "futures-timer", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "lru 0.9.0", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "smallvec", "thiserror", "void", @@ -4326,7 +4326,7 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.43.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", @@ -4336,7 +4336,7 @@ dependencies = [ "futures 0.3.26", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "parking_lot 0.12.1", @@ -4375,12 +4375,12 @@ dependencies = [ [[package]] name = "libp2p-mdns" version = "0.43.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "data-encoding", "futures 0.3.26", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "rand 0.8.5", @@ -4408,9 +4408,9 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.12.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-gossipsub", "libp2p-identify 0.42.0", "libp2p-kad 0.43.0", @@ -4463,12 +4463,12 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.42.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "bytes", "curve25519-dalek 3.2.0", "futures 0.3.26", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "log", "once_cell", "prost", @@ -4501,13 +4501,13 @@ dependencies = [ [[package]] name = "libp2p-ping" version = "0.42.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "either", "futures 0.3.26", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "rand 0.8.5", @@ -4538,13 +4538,13 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.7.0-alpha.2" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "bytes", "futures 0.3.26", "futures-timer", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-tls 0.1.0-alpha.2", "log", "parking_lot 0.12.1", @@ -4576,13 +4576,13 @@ dependencies = [ [[package]] name = "libp2p-request-response" version = "0.24.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "async-trait", "bytes", "futures 0.3.26", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm 0.42.0", "log", "rand 0.8.5", @@ -4615,14 +4615,14 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.42.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "either", "fnv", "futures 0.3.26", "futures-timer", "instant", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-swarm-derive 0.32.0", "log", "pin-project", @@ -4647,7 +4647,7 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.32.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "heck", "quote", @@ -4673,13 +4673,13 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.39.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "futures 0.3.26", "futures-timer", "if-watch", "libc", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "log", "socket2", "tokio", @@ -4706,11 +4706,11 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.1.0-alpha.2" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "futures 0.3.26", "futures-rustls", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "rcgen 0.10.0", "ring", "rustls 0.20.7", @@ -4768,7 +4768,7 @@ dependencies = [ [[package]] name = "libp2p-webrtc" version = "0.4.0-alpha.2" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "async-trait", "asynchronous-codec", @@ -4777,13 +4777,13 @@ dependencies = [ "futures-timer", "hex", "if-watch", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "libp2p-noise 0.42.0", "log", "multihash 0.17.0", "prost", "prost-build", - "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -4817,16 +4817,16 @@ dependencies = [ [[package]] name = "libp2p-websocket" version = "0.41.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "either", "futures 0.3.26", "futures-rustls", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "log", "parking_lot 0.12.1", "quicksink", - "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "soketto", "url", "webpki-roots", @@ -4849,10 +4849,10 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.43.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "futures 0.3.26", - "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475)", + "libp2p-core 0.39.0 (git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad)", "log", "parking_lot 0.12.1", "thiserror", @@ -5384,7 +5384,7 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.12.1" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "bytes", "futures 0.3.26", @@ -5717,7 +5717,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5820,7 +5820,7 @@ dependencies = [ [[package]] name = "pallet-domain-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5841,7 +5841,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5858,7 +5858,7 @@ dependencies = [ [[package]] name = "pallet-executor-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5876,7 +5876,7 @@ dependencies = [ [[package]] name = "pallet-feeds" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5892,7 +5892,7 @@ dependencies = [ [[package]] name = "pallet-grandpa-finality-verifier" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "finality-grandpa", "frame-support", @@ -5912,7 +5912,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5932,7 +5932,7 @@ dependencies = [ [[package]] name = "pallet-object-store" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5947,7 +5947,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5962,7 +5962,7 @@ dependencies = [ [[package]] name = "pallet-receipts" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5978,7 +5978,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -5991,7 +5991,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -6003,7 +6003,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -6059,7 +6059,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -6115,7 +6115,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "frame-system", @@ -6687,7 +6687,7 @@ dependencies = [ [[package]] name = "prost-codec" version = "0.3.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "asynchronous-codec", "bytes", @@ -7260,7 +7260,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/subspace/rust-libp2p?rev=2de61da642888e3c4deac9925be90d56cdef1475#2de61da642888e3c4deac9925be90d56cdef1475" +source = "git+https://github.com/subspace/rust-libp2p?rev=917b388b0549810903946664a61c9b313b2e9fad#917b388b0549810903946664a61c9b313b2e9fad" dependencies = [ "futures 0.3.26", "pin-project", @@ -7476,7 +7476,7 @@ dependencies = [ [[package]] name = "sc-consensus-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-trait", "parity-scale-codec", @@ -7514,7 +7514,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-trait", "fork-tree", @@ -7555,7 +7555,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-oneshot", "futures 0.3.26", @@ -8075,7 +8075,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "sc-chain-spec", "sc-service", @@ -8843,7 +8843,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-trait", "log", @@ -8957,7 +8957,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "sp-api", @@ -8969,7 +8969,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "blake2", "merlin 2.0.1", @@ -8995,7 +8995,7 @@ dependencies = [ [[package]] name = "sp-executor-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "sp-domains", @@ -9110,7 +9110,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "frame-support", "parity-scale-codec", @@ -9125,7 +9125,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "sp-api", "sp-std", @@ -9556,7 +9556,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "reed-solomon-erasure", @@ -9567,7 +9567,7 @@ dependencies = [ [[package]] name = "subspace-cli" -version = "0.1.11" +version = "0.1.12" dependencies = [ "bytesize", "bytesize-serde", @@ -9599,7 +9599,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "ark-bls12-381", "ark-ff", @@ -9627,7 +9627,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "anyhow", "async-trait", @@ -9676,7 +9676,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "async-trait", "fs2", @@ -9699,7 +9699,7 @@ dependencies = [ [[package]] name = "subspace-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "hash-db", "parity-scale-codec", @@ -9718,7 +9718,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "actix-web", "anyhow", @@ -9755,7 +9755,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "hex", "serde", @@ -9767,7 +9767,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -9820,7 +9820,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "serde", @@ -9833,7 +9833,7 @@ dependencies = [ [[package]] name = "subspace-sdk" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=a6163728e303001ecba09328eb6206b8ae89f728#a6163728e303001ecba09328eb6206b8ae89f728" +source = "git+https://github.com/subspace/subspace-sdk?rev=ed89479c0ca7baa5e488ad120fb760f295d2f00c#ed89479c0ca7baa5e488ad120fb760f295d2f00c" dependencies = [ "anyhow", "async-trait", @@ -9919,7 +9919,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "derive_more", "domain-runtime-primitives", @@ -9982,7 +9982,7 @@ dependencies = [ [[package]] name = "subspace-solving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "merlin 2.0.1", "schnorrkel", @@ -9992,7 +9992,7 @@ dependencies = [ [[package]] name = "subspace-transaction-pool" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "domain-runtime-primitives", "futures 0.3.26", @@ -10019,7 +10019,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "merlin 2.0.1", "parity-scale-codec", @@ -10036,7 +10036,7 @@ dependencies = [ [[package]] name = "subspace-wasm-tools" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "sc-executor-common", "sp-domains", @@ -10173,7 +10173,7 @@ dependencies = [ [[package]] name = "system-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "core-payments-domain-runtime", "domain-pallet-executive", @@ -10216,7 +10216,7 @@ dependencies = [ [[package]] name = "system-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=c0dbb1739a85080701e66a21b05027d85949e914#c0dbb1739a85080701e66a21b05027d85949e914" +source = "git+https://github.com/subspace/subspace?rev=14f0b5185de034548245f0c77a0ce7da5d478f37#14f0b5185de034548245f0c77a0ce7da5d478f37" dependencies = [ "parity-scale-codec", "sp-api", diff --git a/Cargo.toml b/Cargo.toml index 3f237b0a..1be67a9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subspace-cli" -version = "0.1.11" +version = "0.1.12" edition = "2021" [dependencies] @@ -30,7 +30,7 @@ tracing-error = "0.2.0" tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } whoami = "1" -subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "a6163728e303001ecba09328eb6206b8ae89f728" } +subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "ed89479c0ca7baa5e488ad120fb760f295d2f00c" } # The only triple tested and confirmed as working in `jemallocator` crate is `x86_64-unknown-linux-gnu` [target.'cfg(all(target_arch = "x86_64", target_vendor = "unknown", target_os = "linux", target_env = "gnu"))'.dependencies] diff --git a/src/commands/farm.rs b/src/commands/farm.rs index 04c67b6b..58d8d225 100644 --- a/src/commands/farm.rs +++ b/src/commands/farm.rs @@ -10,6 +10,7 @@ use single_instance::SingleInstance; use subspace_sdk::node::SyncingProgress; use subspace_sdk::{Farmer, Node}; use tokio::signal; +use tokio::task::JoinHandle; use tracing::instrument; use crate::config::{validate_config, ChainConfig, Config}; @@ -70,56 +71,75 @@ pub(crate) async fn farm(is_verbose: bool, executor: bool) -> Result<()> { let farmer = Arc::new(farmer); println!("Farmer started successfully!"); - if !is_verbose { + let maybe_handles = if !is_verbose { let is_initial_progress_finished = Arc::new(AtomicBool::new(false)); let sector_size_bytes = farmer.get_info().await.map_err(Report::msg)?.sector_size; - let plotting_subscribe_handle = tokio::spawn(subscribe_to_plotting_progress( + let plotting_sub_handle = tokio::spawn(subscribe_to_plotting_progress( summary.clone(), farmer.clone(), is_initial_progress_finished.clone(), sector_size_bytes, )); - let solution_subscribe_handle = tokio::spawn(subscribe_to_solutions( + let solution_sub_handle = tokio::spawn(subscribe_to_solutions( summary.clone(), farmer.clone(), is_initial_progress_finished.clone(), )); - // node subscription can be gracefully closed with `ctrl_c` without any problem - // (no code needed). We need graceful closing for farmer subscriptions. - signal::ctrl_c().await?; - println!( - "\nWill try to gracefully exit the application now. If you press ctrl+c again, it \ - will try to forcefully close the app!" - ); + Some((plotting_sub_handle, solution_sub_handle)) + } else { + // we don't have handles if it is verbose + None + }; - // closing the subscriptions - plotting_subscribe_handle.abort(); - solution_subscribe_handle.abort(); - - // shutting down the farmer and the node - let handle = tokio::spawn(async move { - // if one of the subscriptions have not aborted yet, wait - // Plotting might end, so we ignore result here - let _ = plotting_subscribe_handle.await; - solution_subscribe_handle.await.expect_err("Solution subscription never ends"); - - Arc::try_unwrap(farmer) - .expect("there should have been only 1 strong farmer counter") - .close() - .await - .expect("cannot close farmer"); - node.close().await.expect("cannot close node"); - }); - - tokio::select! { - _ = handle => println!("gracefully closed the app!"), - _ = signal::ctrl_c() => println!("\nforcefully closing the app!"), - } + wait_on_farmer(maybe_handles, farmer, node).await?; + + Ok(()) +} + +async fn wait_on_farmer( + maybe_handles: Option<(JoinHandle<()>, JoinHandle<()>)>, + farmer: Arc, + node: Node, +) -> Result<()> { + // node subscription can be gracefully closed with `ctrl_c` without any problem + // (no code needed). We need graceful closing for farmer subscriptions. + signal::ctrl_c().await?; + println!( + "\nWill try to gracefully exit the application now. If you press ctrl+c again, it will \ + try to forcefully close the app!" + ); + + // closing the subscriptions if there are any + if let Some((plotting_handle, solution_handle)) = maybe_handles.as_ref() { + plotting_handle.abort(); + solution_handle.abort(); } + // shutting down the farmer and the node + let handle = tokio::spawn(async move { + // if one of the subscriptions have not aborted yet, wait + // Plotting might end, so we ignore result here + + if let Some((plotting_handle, solution_handle)) = maybe_handles { + let _ = plotting_handle.await; + solution_handle.await.expect_err("Solution subscription never ends"); + } + + Arc::try_unwrap(farmer) + .expect("there should have been only 1 strong farmer counter") + .close() + .await + .expect("cannot close farmer"); + node.close().await.expect("cannot close node"); + }); + + tokio::select! { + _ = handle => println!("gracefully closed the app!"), + _ = signal::ctrl_c() => println!("\nforcefully closing the app!"), + } Ok(()) } diff --git a/src/commands/init.rs b/src/commands/init.rs index c0b4da09..69548e64 100644 --- a/src/commands/init.rs +++ b/src/commands/init.rs @@ -85,7 +85,7 @@ fn get_config_from_user_inputs() -> Result { * {:?}: ",` TODO: uncomment this when gemini3d * releases: `ChainConfig::iter().collect::>()` */ ), - Some(crate::config::ChainConfig::Gemini3c), + Some(default_chain), ChainConfig::from_str, )?;