diff --git a/Cargo.lock b/Cargo.lock index e8bcd12..59b2df5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1992,7 +1992,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "futures", "parity-scale-codec", @@ -2551,7 +2551,7 @@ dependencies = [ [[package]] name = "domain-block-builder" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2596,7 +2596,7 @@ dependencies = [ [[package]] name = "domain-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "sc-consensus", @@ -2610,7 +2610,7 @@ dependencies = [ [[package]] name = "domain-client-message-relayer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-channel", "cross-domain-message-gossip", @@ -2632,7 +2632,7 @@ dependencies = [ [[package]] name = "domain-client-operator" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-block-builder", "domain-block-preprocessor", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "domain-eth-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "clap", "domain-runtime-primitives", @@ -2708,7 +2708,7 @@ dependencies = [ [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-executive", @@ -2727,7 +2727,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -2745,7 +2745,7 @@ dependencies = [ [[package]] name = "domain-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -3137,7 +3137,7 @@ dependencies = [ [[package]] name = "evm-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -7101,7 +7101,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7157,7 +7157,7 @@ dependencies = [ [[package]] name = "pallet-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-support", @@ -7173,7 +7173,7 @@ dependencies = [ [[package]] name = "pallet-domain-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7186,7 +7186,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -7298,7 +7298,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-support", @@ -7335,7 +7335,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7349,7 +7349,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7361,7 +7361,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7374,7 +7374,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-support", @@ -7397,7 +7397,7 @@ dependencies = [ [[package]] name = "pallet-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7449,7 +7449,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7505,7 +7505,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -9056,7 +9056,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "futures", @@ -9096,7 +9096,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-oneshot", "futures", @@ -9448,7 +9448,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "atomic", "core_affinity", @@ -9669,7 +9669,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-channel", "async-trait", @@ -9694,7 +9694,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" [[package]] name = "sc-sysinfo" @@ -10622,7 +10622,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -10733,7 +10733,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "log", @@ -10869,7 +10869,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10878,7 +10878,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -10910,7 +10910,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -10942,7 +10942,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "parity-scale-codec", @@ -11034,7 +11034,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "hash-db", @@ -11094,7 +11094,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "sp-api", "sp-std", @@ -11282,7 +11282,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "scale-info", @@ -11557,7 +11557,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "rayon", @@ -11570,7 +11570,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "blake3", "derive_more", @@ -11593,7 +11593,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "kzg", "rust-kzg-blst", @@ -11603,7 +11603,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "anyhow", "async-lock 3.3.0", @@ -11659,7 +11659,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-lock 3.3.0", "async-trait", @@ -11689,7 +11689,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "actix-web", "parking_lot 0.12.1", @@ -11701,7 +11701,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-mutex", "async-trait", @@ -11739,7 +11739,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "chacha20", "derive_more", @@ -11752,7 +11752,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "aes", "subspace-core-primitives", @@ -11762,7 +11762,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "hex", "serde", @@ -11774,7 +11774,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11828,7 +11828,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "pallet-transaction-payment", "serde", @@ -11869,7 +11869,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -11944,7 +11944,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "schnorrkel", diff --git a/sdk/dsn/Cargo.toml b/sdk/dsn/Cargo.toml index ac467a3..28b447a 100644 --- a/sdk/dsn/Cargo.toml +++ b/sdk/dsn/Cargo.toml @@ -14,11 +14,11 @@ hex = "0.4.3" parking_lot = "0.12" prometheus-client = "0.22.0" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tracing = "0.1" diff --git a/sdk/farmer/Cargo.toml b/sdk/farmer/Cargo.toml index 07d0cfd..df6c499 100644 --- a/sdk/farmer/Cargo.toml +++ b/sdk/farmer/Cargo.toml @@ -20,13 +20,13 @@ rayon = "1.7.0" sdk-traits = { path = "../traits" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", features = ["parallel"] } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", features = ["parallel"] } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } diff --git a/sdk/farmer/src/lib.rs b/sdk/farmer/src/lib.rs index 609a742..bcc2ce2 100644 --- a/sdk/farmer/src/lib.rs +++ b/sdk/farmer/src/lib.rs @@ -907,7 +907,7 @@ impl Farm { plotting_thread_pool_manager, }: FarmOptions< '_, - impl subspace_farmer_components::plotting::PieceGetter + Clone + Send + Sync + 'static, + impl subspace_farmer_components::PieceGetter + Clone + Send + Sync + 'static, impl sdk_traits::Node, >, ) -> Result<(Self, SingleDiskFarm), BuildError> { diff --git a/sdk/node/Cargo.toml b/sdk/node/Cargo.toml index bf58a20..bd79dc6 100644 --- a/sdk/node/Cargo.toml +++ b/sdk/node/Cargo.toml @@ -7,34 +7,34 @@ edition = "2021" [dependencies] anyhow = "1" backoff = "0.4" -cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } derivative = "2.2.0" derive_builder = "0.12" derive_more = "0.99" -domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "7627e61d80275a4cf24d06f27491f6c31eadb7b7" } frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } futures = "0.3" hex-literal = "0.4" -pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } parity-scale-codec = "3.6.3" parking_lot = "0.12" pin-project = "1" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } @@ -46,20 +46,20 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sp-domains = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -sp-messenger = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-domains = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +sp-messenger = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } tracing = "0.1" diff --git a/sdk/node/src/builder.rs b/sdk/node/src/builder.rs index 32ba0eb..6464b3d 100644 --- a/sdk/node/src/builder.rs +++ b/sdk/node/src/builder.rs @@ -5,10 +5,9 @@ use std::path::Path; use derivative::Derivative; use derive_builder::Builder; use derive_more::{Deref, DerefMut, Display, From}; -use sc_service::BlocksPruning; use sdk_dsn::{Dsn, DsnBuilder}; use sdk_substrate::{ - Base, BaseBuilder, NetworkBuilder, PruningMode, Role, RpcBuilder, StorageMonitor, + Base, BaseBuilder, BlocksPruning, NetworkBuilder, PruningMode, Role, RpcBuilder, StorageMonitor, }; use sdk_utils::ByteSize; use serde::{Deserialize, Serialize}; @@ -128,7 +127,7 @@ impl Builder { .rpc(RpcBuilder::gemini_3h()) .role(Role::Authority) .state_pruning(PruningMode::ArchiveCanonical) - .blocks_pruning(BlocksPruning::Some(256)) + .blocks_pruning(BlocksPruning::Number(256)) } /// Devnet chain configuration @@ -139,7 +138,7 @@ impl Builder { .rpc(RpcBuilder::devnet()) .role(Role::Authority) .state_pruning(PruningMode::ArchiveCanonical) - .blocks_pruning(BlocksPruning::Some(256)) + .blocks_pruning(BlocksPruning::Number(256)) } /// Get configuration for saving on disk diff --git a/sdk/node/src/lib.rs b/sdk/node/src/lib.rs index 032d3fd..811f0b0 100644 --- a/sdk/node/src/lib.rs +++ b/sdk/node/src/lib.rs @@ -211,6 +211,7 @@ impl Config { sync_from_dsn, is_timekeeper, timekeeper_cpu_cores, + dsn_piece_getter: None, // TODO: Use custom piece getter for better performance }; let node_runner_future = subspace_farmer::utils::run_future_in_dedicated_thread( diff --git a/sdk/subspace-sdk/Cargo.toml b/sdk/subspace-sdk/Cargo.toml index 22220eb..2d74251 100644 --- a/sdk/subspace-sdk/Cargo.toml +++ b/sdk/subspace-sdk/Cargo.toml @@ -11,7 +11,7 @@ sdk-substrate = { path = "../substrate" } sdk-utils = { path = "../utils" } static_assertions = "1.1.0" -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } [dev-dependencies] anyhow = "1" @@ -22,7 +22,7 @@ fdlimit = "0.2" futures = "0.3" mimalloc = { version = "*", default-features = false } serde_json = "1" -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tempfile = "3" tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros"] } tracing = "0.1" diff --git a/sdk/subspace-sdk/examples/complete.rs b/sdk/subspace-sdk/examples/complete.rs index 5c39b86..4a3525e 100644 --- a/sdk/subspace-sdk/examples/complete.rs +++ b/sdk/subspace-sdk/examples/complete.rs @@ -8,7 +8,7 @@ use subspace_sdk::{chain_spec, node, ByteSize, FarmDescription, Farmer, Node, Pu async fn main() { let plots = [FarmDescription::new("plot", ByteSize::gb(10))]; let node: Node = Node::builder() - .blocks_pruning(node::BlocksPruning::Some(1000)) + .blocks_pruning(node::BlocksPruning::Number(1000)) .state_pruning(node::PruningMode::ArchiveCanonical) .network(NetworkBuilder::new().name("i1i1")) .build("node", chain_spec::dev_config()) @@ -56,7 +56,7 @@ async fn main() { // Restarting let node = Node::builder() - .blocks_pruning(node::BlocksPruning::Some(1000)) + .blocks_pruning(node::BlocksPruning::Number(1000)) .state_pruning(node::PruningMode::ArchiveCanonical) .build("node", chain_spec::dev_config()) .await diff --git a/sdk/substrate/Cargo.toml b/sdk/substrate/Cargo.toml index 7e7023e..edacb50 100644 --- a/sdk/substrate/Cargo.toml +++ b/sdk/substrate/Cargo.toml @@ -19,4 +19,4 @@ sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/pol sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } diff --git a/sdk/substrate/src/lib.rs b/sdk/substrate/src/lib.rs index f4e87a1..5046dff 100644 --- a/sdk/substrate/src/lib.rs +++ b/sdk/substrate/src/lib.rs @@ -212,7 +212,7 @@ impl Base { impl_version, transaction_pool: Default::default(), network, - state_pruning: Some(state_pruning.into()), + state_pruning: state_pruning.into(), blocks_pruning: blocks_pruning.into(), rpc_options: SubstrateRpcConfiguration { listen_on: rpc_addr.unwrap_or(SocketAddr::new( diff --git a/sdk/substrate/src/types.rs b/sdk/substrate/src/types.rs index 7b68114..782b774 100644 --- a/sdk/substrate/src/types.rs +++ b/sdk/substrate/src/types.rs @@ -8,20 +8,20 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Copy, PartialEq, Default, Serialize, Deserialize, Eq, PartialOrd, Ord)] pub enum BlocksPruning { #[default] - /// Keep full block history, of every block that was ever imported. - KeepAll, /// Keep full finalized block history. - KeepFinalized, + ArchiveCanonical, + /// Keep full block history, of every block that was ever imported. + Archive, /// Keep N recent finalized blocks. - Some(u32), + Number(u32), } impl From for BlocksPruning { fn from(value: sc_service::BlocksPruning) -> Self { match value { - sc_service::BlocksPruning::KeepAll => Self::KeepAll, - sc_service::BlocksPruning::KeepFinalized => Self::KeepFinalized, - sc_service::BlocksPruning::Some(n) => Self::Some(n), + sc_service::BlocksPruning::KeepAll => Self::Archive, + sc_service::BlocksPruning::KeepFinalized => Self::ArchiveCanonical, + sc_service::BlocksPruning::Some(n) => Self::Number(n), } } } @@ -29,9 +29,9 @@ impl From for BlocksPruning { impl From for sc_service::BlocksPruning { fn from(value: BlocksPruning) -> Self { match value { - BlocksPruning::KeepAll => Self::KeepAll, - BlocksPruning::KeepFinalized => Self::KeepFinalized, - BlocksPruning::Some(n) => Self::Some(n), + BlocksPruning::Archive => Self::KeepAll, + BlocksPruning::ArchiveCanonical => Self::KeepFinalized, + BlocksPruning::Number(n) => Self::Some(n), } } } @@ -59,14 +59,12 @@ impl From for Constraints { /// Pruning mode. #[derive(Debug, Clone, Eq, PartialEq, Default, Serialize, Deserialize)] pub enum PruningMode { - /// No pruning. Canonicalization is a no-op. - #[default] - ArchiveAll, /// Canonicalization discards non-canonical nodes. All the canonical /// nodes are kept in the DB. + #[default] ArchiveCanonical, - /// Maintain a pruning window. - Constrained(Constraints), + /// No pruning. Canonicalization is a no-op. + ArchiveAll, } impl From for sc_service::PruningMode { @@ -74,17 +72,6 @@ impl From for sc_service::PruningMode { match value { PruningMode::ArchiveAll => Self::ArchiveAll, PruningMode::ArchiveCanonical => Self::ArchiveCanonical, - PruningMode::Constrained(c) => Self::Constrained(c.into()), - } - } -} - -impl From for PruningMode { - fn from(value: sc_service::PruningMode) -> Self { - match value { - sc_service::PruningMode::ArchiveAll => Self::ArchiveAll, - sc_service::PruningMode::ArchiveCanonical => Self::ArchiveCanonical, - sc_service::PruningMode::Constrained(c) => Self::Constrained(c.into()), } } } diff --git a/sdk/traits/Cargo.toml b/sdk/traits/Cargo.toml index 90b0564..4a95a48 100644 --- a/sdk/traits/Cargo.toml +++ b/sdk/traits/Cargo.toml @@ -9,7 +9,7 @@ async-trait = "0.1" parking_lot = "0.12" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sdk-dsn = { path = "../dsn" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } diff --git a/sdk/utils/Cargo.toml b/sdk/utils/Cargo.toml index f4b1fb0..84fffb0 100644 --- a/sdk/utils/Cargo.toml +++ b/sdk/utils/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3" jsonrpsee-core = "0.16" libp2p-core = { git = "https://github.com/subspace/rust-libp2p", rev = "d6339da35589d86bae6ecb25a5121c02f2e5b90e" } parity-scale-codec = "3.6.3" -sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } @@ -32,11 +32,11 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-s sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } ss58-registry = "1.33" # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver` -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tracing = "0.1"