diff --git a/Cargo.lock b/Cargo.lock index 72fd636d..30525ea6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1672,7 +1672,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "futures", "parity-scale-codec", @@ -1860,20 +1860,6 @@ dependencies = [ "cipher 0.4.4", ] -[[package]] -name = "cuckoofilter" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18" -dependencies = [ - "byteorder", - "fnv", - "rand 0.7.3", - "serde", - "serde_bytes", - "serde_derive", -] - [[package]] name = "curve25519-dalek" version = "2.1.3" @@ -2284,7 +2270,7 @@ dependencies = [ [[package]] name = "domain-block-builder" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -2301,7 +2287,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "domain-runtime-primitives", "parity-scale-codec", @@ -2325,7 +2311,7 @@ dependencies = [ [[package]] name = "domain-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "futures", @@ -2342,7 +2328,7 @@ dependencies = [ [[package]] name = "domain-client-message-relayer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-channel", "cross-domain-message-gossip", @@ -2368,7 +2354,7 @@ dependencies = [ [[package]] name = "domain-client-operator" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "crossbeam", "domain-block-builder", @@ -2410,7 +2396,7 @@ dependencies = [ [[package]] name = "domain-client-subnet-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "futures", "parity-scale-codec", @@ -2429,7 +2415,7 @@ dependencies = [ [[package]] name = "domain-eth-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "clap", "domain-runtime-primitives", @@ -2463,7 +2449,7 @@ dependencies = [ [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-executive", "frame-support", @@ -2480,7 +2466,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "scale-info", @@ -2496,7 +2482,7 @@ dependencies = [ [[package]] name = "domain-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "clap", @@ -2879,7 +2865,7 @@ dependencies = [ [[package]] name = "evm-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -6729,7 +6715,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -6807,7 +6793,7 @@ dependencies = [ [[package]] name = "pallet-domain-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -6819,7 +6805,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-benchmarking", "frame-support", @@ -6926,7 +6912,7 @@ dependencies = [ [[package]] name = "pallet-feeds" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -6942,7 +6928,7 @@ dependencies = [ [[package]] name = "pallet-grandpa-finality-verifier" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "finality-grandpa", "frame-support", @@ -6962,7 +6948,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-benchmarking", "frame-support", @@ -6981,7 +6967,7 @@ dependencies = [ [[package]] name = "pallet-object-store" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -6996,7 +6982,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -7011,7 +6997,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -7024,7 +7010,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -7036,7 +7022,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-benchmarking", "frame-support", @@ -7095,7 +7081,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "frame-system", @@ -7151,7 +7137,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -7764,7 +7750,7 @@ dependencies = [ [[package]] name = "pulsar" -version = "0.6.3" +version = "0.6.4" dependencies = [ "anyhow", "async-stream", @@ -8700,7 +8686,7 @@ dependencies = [ [[package]] name = "sc-consensus-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "parity-scale-codec", @@ -8738,7 +8724,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "fork-tree", @@ -8782,7 +8768,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-oneshot", "futures", @@ -9113,7 +9099,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "futures", @@ -9330,7 +9316,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-channel", "async-trait", @@ -9352,7 +9338,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "sc-chain-spec", "sc-service", @@ -9598,7 +9584,7 @@ dependencies = [ [[package]] name = "sdk-dsn" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "anyhow", "derivative", @@ -9613,7 +9599,6 @@ dependencies = [ "serde", "sp-blockchain", "sp-runtime", - "subspace-core-primitives", "subspace-farmer", "subspace-networking", "tracing", @@ -9622,7 +9607,7 @@ dependencies = [ [[package]] name = "sdk-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "anyhow", "async-trait", @@ -9654,7 +9639,7 @@ dependencies = [ [[package]] name = "sdk-node" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "anyhow", "backoff", @@ -9719,7 +9704,7 @@ dependencies = [ [[package]] name = "sdk-substrate" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "bytesize", "derivative", @@ -9743,7 +9728,7 @@ dependencies = [ [[package]] name = "sdk-traits" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "async-trait", "parking_lot 0.12.1", @@ -9757,7 +9742,7 @@ dependencies = [ [[package]] name = "sdk-utils" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "anyhow", "async-trait", @@ -9938,15 +9923,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_bytes" -version = "0.11.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" -dependencies = [ - "serde", -] - [[package]] name = "serde_derive" version = "1.0.183" @@ -10371,7 +10347,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "log", @@ -10488,7 +10464,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "sp-api", @@ -10500,7 +10476,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "blake2", "hexlit", @@ -10615,7 +10591,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "frame-support", "hash-db 0.16.0", @@ -10644,7 +10620,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "sp-api", "sp-std", @@ -11094,7 +11070,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "rayon", @@ -11107,7 +11083,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "blake2", "blake3", @@ -11132,7 +11108,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "blst_rust", "kzg", @@ -11142,7 +11118,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "anyhow", "async-trait", @@ -11153,7 +11129,6 @@ dependencies = [ "blake3", "bytesize", "clap", - "cuckoofilter", "derive_more", "event-listener-primitives", "fdlimit", @@ -11196,7 +11171,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "backoff", @@ -11226,7 +11201,7 @@ dependencies = [ [[package]] name = "subspace-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -11250,7 +11225,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "actix-web", "async-mutex", @@ -11292,7 +11267,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "chacha20 0.9.1", "derive_more", @@ -11305,7 +11280,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "aes 0.8.3", "subspace-core-primitives", @@ -11315,7 +11290,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "hex", "serde", @@ -11327,7 +11302,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11378,7 +11353,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "serde", @@ -11391,7 +11366,7 @@ dependencies = [ [[package]] name = "subspace-sdk" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=541afd9fd8dd6787202cb5eef69cfd568da06556#541afd9fd8dd6787202cb5eef69cfd568da06556" +source = "git+https://github.com/subspace/subspace-sdk?rev=e3dbebcc270af3c9fcd511718132cb1768ac7373#e3dbebcc270af3c9fcd511718132cb1768ac7373" dependencies = [ "sdk-dsn", "sdk-farmer", @@ -11405,7 +11380,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "atomic", @@ -11478,12 +11453,12 @@ dependencies = [ [[package]] name = "subspace-solving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" [[package]] name = "subspace-transaction-pool" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -11511,7 +11486,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f782f7297a6d61d8f22a3b10d201396fe30708fd#f782f7297a6d61d8f22a3b10d201396fe30708fd" +source = "git+https://github.com/subspace/subspace?rev=502e597f5724beaef405172f64c8cee8724b2a47#502e597f5724beaef405172f64c8cee8724b2a47" dependencies = [ "parity-scale-codec", "scale-info", diff --git a/Cargo.toml b/Cargo.toml index 371cc608..2ec43119 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pulsar" -version = "0.6.3" +version = "0.6.4" edition = "2021" [dependencies] @@ -29,7 +29,7 @@ single-instance = "0.3.3" sp-core = { version = "21.0.0", git = "https://github.com/subspace/substrate", rev = "55c157cff49b638a59d81a9f971f0f9a66829c71", features = ["full_crypto"] } strum = "0.24.1" strum_macros = "0.24.3" -subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "541afd9fd8dd6787202cb5eef69cfd568da06556" } +subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "e3dbebcc270af3c9fcd511718132cb1768ac7373" } thiserror = "1" tokio = { version = "1.27", features = ["macros", "rt-multi-thread", "tracing"] } toml = "0.7" diff --git a/src/commands/farm.rs b/src/commands/farm.rs index 4a27b47e..8ede5375 100644 --- a/src/commands/farm.rs +++ b/src/commands/farm.rs @@ -64,7 +64,7 @@ pub(crate) async fn farm(is_verbose: bool, enable_domains: bool, no_rotation: bo let node = Arc::new( node_config .clone() - .build(chain.clone(), is_verbose, farmer_config.farm_size) + .build(chain.clone(), is_verbose) .await .context("error building the node")?, ); diff --git a/src/config.rs b/src/config.rs index f04314f3..305568f6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -47,12 +47,7 @@ pub(crate) struct NodeConfig { } impl NodeConfig { - pub async fn build( - self, - chain: ChainConfig, - is_verbose: bool, - farmer_space_pledged: ByteSize, - ) -> Result { + pub async fn build(self, chain: ChainConfig, is_verbose: bool) -> Result { let Self { directory, name, advanced: AdvancedNodeSettings { enable_domains, extra } } = self; @@ -132,7 +127,6 @@ impl NodeConfig { directory, chain_spec, PotConfiguration { is_pot_enabled: false, is_node_time_keeper: false }, - farmer_space_pledged.to_u64() as usize, ) .await .into_eyre()