diff --git a/Cargo.lock b/Cargo.lock index 685cdb08..9ed35317 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1987,7 +1987,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "futures", "parity-scale-codec", @@ -2474,7 +2474,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2503,7 +2503,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "fp-account", "frame-support", @@ -6696,7 +6696,7 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-support", "frame-system", @@ -6748,7 +6748,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -6774,7 +6774,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-benchmarking", "frame-support", @@ -6811,7 +6811,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-support", "frame-system", @@ -6825,7 +6825,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-support", "frame-system", @@ -6837,7 +6837,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-benchmarking", "frame-support", @@ -6851,7 +6851,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-benchmarking", "frame-support", @@ -6874,7 +6874,7 @@ dependencies = [ [[package]] name = "pallet-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-support", "frame-system", @@ -6926,7 +6926,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "frame-support", "frame-system", @@ -6982,7 +6982,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -8561,7 +8561,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "futures", @@ -8601,7 +8601,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-oneshot", "futures", @@ -8632,7 +8632,7 @@ dependencies = [ [[package]] name = "sc-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "sc-client-api", "sc-executor", @@ -8971,7 +8971,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "atomic", "core_affinity", @@ -9193,7 +9193,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-channel", "async-trait", @@ -9218,7 +9218,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" [[package]] name = "sc-sysinfo" @@ -9944,7 +9944,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -10038,7 +10038,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "log", @@ -10174,7 +10174,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10183,7 +10183,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -10215,7 +10215,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -10233,6 +10233,7 @@ dependencies = [ "sp-domain-digests", "sp-domains", "sp-externalities", + "sp-messenger", "sp-runtime", "sp-runtime-interface", "sp-state-machine", @@ -10247,7 +10248,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "parity-scale-codec", @@ -10338,8 +10339,9 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ + "async-trait", "frame-support", "hash-db", "log", @@ -10349,6 +10351,7 @@ dependencies = [ "sp-api", "sp-core", "sp-domains", + "sp-inherents", "sp-mmr-primitives", "sp-runtime", "sp-trie", @@ -10357,7 +10360,7 @@ dependencies = [ [[package]] name = "sp-messenger-host-functions" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "domain-block-preprocessor", "parity-scale-codec", @@ -10417,7 +10420,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "sp-api", "subspace-core-primitives", @@ -10604,7 +10607,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "parity-scale-codec", "scale-info", @@ -10748,7 +10751,7 @@ dependencies = [ [[package]] name = "space-acres" -version = "0.1.8" +version = "0.1.9" dependencies = [ "anyhow", "arc-swap", @@ -10944,7 +10947,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "parity-scale-codec", "rayon", @@ -10957,7 +10960,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "blake3", "derive_more", @@ -10980,7 +10983,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "kzg", "rust-kzg-blst", @@ -10990,7 +10993,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "anyhow", "async-lock 3.3.0", @@ -11048,7 +11051,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-lock 3.3.0", "async-trait", @@ -11079,7 +11082,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "actix-web", "prometheus", @@ -11090,7 +11093,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-mutex", "async-trait", @@ -11128,7 +11131,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "chacha20", "derive_more", @@ -11141,7 +11144,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "aes", "subspace-core-primitives", @@ -11151,7 +11154,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "hex", "serde", @@ -11163,7 +11166,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11218,7 +11221,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "pallet-transaction-payment", "sp-core", @@ -11229,7 +11232,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -11306,7 +11309,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=d049b53e8d368b2c4e222df5f8b0cb510cab2387#d049b53e8d368b2c4e222df5f8b0cb510cab2387" +source = "git+https://github.com/subspace/subspace?rev=21194a8d07e1068b08f89fb5fca31a6c827b0416#21194a8d07e1068b08f89fb5fca31a6c827b0416" dependencies = [ "parity-scale-codec", "schnorrkel", diff --git a/Cargo.toml b/Cargo.toml index 122f0d75..b0a7692b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "space-acres" description = "Space Acres is an opinionated GUI application for farming on Subspace Network" license = "0BSD" -version = "0.1.8" +version = "0.1.9" authors = ["Nazar Mokrynskyi "] repository = "https://github.com/subspace/space-acres" edition = "2021" @@ -72,25 +72,25 @@ sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500 sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } semver = "1.0.22" serde = { version = "1.0.197", features = ["derive"] } serde_json = "1.0.114" simple_moving_average = "1.0.2" sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "d049b53e8d368b2c4e222df5f8b0cb510cab2387" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "21194a8d07e1068b08f89fb5fca31a6c827b0416" } supports-color = "3.0.0" thiserror = "1.0.57" thread-priority = "0.16.0" diff --git a/res/app.css b/res/app.css index d6326c1c..d1e133a2 100644 --- a/res/app.css +++ b/res/app.css @@ -19,16 +19,16 @@ progressbar progress { color: #ff3800; } -.free-disk-space > trough > block.low { +.free-disk-space > trough > block.low { background-color: #ff3800; } -.free-disk-space > trough > block.high { +.free-disk-space > trough > block.high { background-color: #ffA400; } -.auditing-performance > trough > block.low, -.proving-performance > trough > block.low { +.auditing-performance > trough > block.low, +.proving-performance > trough > block.low { background-color: #ffA400; } @@ -90,6 +90,5 @@ farm-sector.writing { } .folder-button { - padding-right: 0px; - padding-left: 0px; + padding: 0; } diff --git a/src/backend.rs b/src/backend.rs index b6ce59bd..7db4be50 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -212,8 +212,6 @@ pub enum BackendNotification { reward_address_balance: Balance, initial_farm_states: Vec, farm_during_initial_plotting: bool, - /// Whether one of the farms was resized during initialization - resized: bool, chain_info: ChainInfo, }, Node(NodeNotification), @@ -488,7 +486,6 @@ async fn run( reward_address_balance: consensus_node.account_balance(&config.reward_address), initial_farm_states: farmer.initial_farm_states().to_vec(), farm_during_initial_plotting: farmer.farm_during_initial_plotting(), - resized: farmer.resized(), chain_info: consensus_node.chain_info().clone(), }) .await?; diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs index 9273afcc..a9468716 100644 --- a/src/backend/farmer.rs +++ b/src/backend/farmer.rs @@ -14,7 +14,6 @@ use futures::{select, FutureExt, StreamExt}; use parking_lot::Mutex; use std::num::{NonZeroU8, NonZeroUsize}; use std::path::PathBuf; -use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use std::{fmt, fs}; use subspace_core_primitives::crypto::kzg::Kzg; @@ -23,8 +22,7 @@ use subspace_erasure_coding::ErasureCoding; use subspace_farmer::farmer_cache::{FarmerCache, FarmerCacheWorker}; use subspace_farmer::single_disk_farm::farming::FarmingNotification; use subspace_farmer::single_disk_farm::{ - SectorPlottingDetails, SectorUpdate, SingleDiskFarm, SingleDiskFarmError, - SingleDiskFarmOptions, SingleDiskFarmSummary, + SectorPlottingDetails, SectorUpdate, SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmOptions, }; use subspace_farmer::utils::plotted_pieces::PlottedPieces; use subspace_farmer::utils::{ @@ -74,8 +72,6 @@ pub(super) struct Farmer { initial_farm_states: Vec, farm_during_initial_plotting: bool, notifications: Arc, - /// Whether one of the farms was resized during initialization - resized: bool, } impl Farmer { @@ -124,11 +120,6 @@ impl Farmer { self.farm_during_initial_plotting } - /// Whether one of the farms was resized during initialization - pub(super) fn resized(&self) -> bool { - self.resized - } - pub(super) fn on_notification(&self, callback: HandlerFn) -> HandlerId { self.notifications.add(callback) } @@ -271,7 +262,7 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu Some(ThreadPriority::Min), )?; - let (single_disk_farms, plotting_delay_senders, resized) = { + let (single_disk_farms, plotting_delay_senders) = { let global_mutex = Arc::default(); let info_mutex = &AsyncMutex::new(()); let faster_read_sector_record_chunks_mode_barrier = @@ -280,7 +271,6 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu let (plotting_delay_senders, plotting_delay_receivers) = (0..disk_farms.len()) .map(|_| oneshot::channel()) .unzip::<_, _, Vec<_>, Vec<_>>(); - let resized = &AtomicBool::new(false); let mut single_disk_farms = Vec::with_capacity(disk_farms.len()); let mut single_disk_farms_stream = disk_farms @@ -303,18 +293,6 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu Arc::clone(&faster_read_sector_record_chunks_mode_concurrency); async move { - let resized_local = - match SingleDiskFarm::collect_summary(disk_farm.directory.clone()) { - SingleDiskFarmSummary::Found { info, .. } => { - info.allocated_space() != disk_farm.allocated_plotting_space - } - SingleDiskFarmSummary::NotFound { .. } => true, - SingleDiskFarmSummary::Error { .. } => true, - }; - if resized_local { - resized.store(true, Ordering::Release); - } - let single_disk_farm_fut = SingleDiskFarm::new::<_, _, PosTable>( SingleDiskFarmOptions { directory: disk_farm.directory.clone(), @@ -405,11 +383,7 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu .map(|(_disk_farm_index, single_disk_farm)| single_disk_farm) .collect::>(); - ( - single_disk_farms, - plotting_delay_senders, - resized.load(Ordering::Acquire), - ) + (single_disk_farms, plotting_delay_senders) }; { @@ -619,6 +593,5 @@ pub(super) async fn create_farmer(farmer_options: FarmerOptions) -> anyhow::Resu initial_farm_states, farm_during_initial_plotting, notifications, - resized, }) } diff --git a/src/main.rs b/src/main.rs index 630b02a2..c776591a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -631,21 +631,8 @@ impl App { reward_address_balance, initial_farm_states, farm_during_initial_plotting, - resized, chain_info, } => { - // TODO: Workaround for - // https://github.com/al8n/fs4-rs/issues/13 - // https://learn.microsoft.com/en-us/answers/questions/1608540/getfileinformationbyhandle-followed-by-read-with-f - if resized && cfg!(windows) { - self.status_bar_notification = StatusBarNotification::Warning { - message: - "One of the farms was resized, restart is needed on Windows for best \ - performance" - .to_string(), - restart: true, - }; - } self.current_raw_config.replace(raw_config.clone()); self.current_view = View::Running; self.running_view.emit(RunningInput::Initialize {