Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Import autonomys/subspace#1441,autonomys/subspace#1448,autonomys/subs…
Browse files Browse the repository at this point in the history 
…pace#1450,autonomys/subspace#1453,autonomys/subspace#1454,autonomys/subspace#1455,autonomys/subspace#1456
  • Loading branch information
@i1i1
i1i1 committed May 16, 2023
1 parent 1fb2259 commit 36e9fa9
Show file tree
Hide file tree
Showing 9 changed files with 160 additions and 138 deletions.
175 changes: 101 additions & 74 deletions Cargo.lock
View file

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sdk-dsn = { path = "dsn" }
sdk-substrate = { path = "substrate" }
sdk-farmer = { path = "farmer" }

subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }

# The only triple tested and confirmed as working in `jemallocator` crate is `x86_64-unknown-linux-gnu`
[target.'cfg(all(target_arch = "x86_64", target_vendor = "unknown", target_os = "linux", target_env = "gnu"))'.dev-dependencies]
Expand Down Expand Up @@ -43,7 +43,7 @@ tracing = "0.1"
tracing-futures = "0.2"
tracing-subscriber = "0.3"

subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }

# The list of dependencies below (which can be both direct and indirect dependencies) are crates
# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
Expand All @@ -53,10 +53,13 @@ subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev
#
# This list is ordered alphabetically.
[profile.dev.package]
bitvec = { opt-level = 3 }
blake2 = { opt-level = 3 }
blake3 = { opt-level = 3 }
blake2b_simd = { opt-level = 3 }
blst = { opt-level = 3 }
blst_from_scratch = { opt-level = 3 }
blst_rust = { opt-level = 3 }
chacha20 = { opt-level = 3 }
chacha20poly1305 = { opt-level = 3 }
cranelift-codegen = { opt-level = 3 }
cranelift-wasm = { opt-level = 3 }
Expand Down Expand Up @@ -93,7 +96,6 @@ sha3 = { opt-level = 3 }
smallvec = { opt-level = 3 }
snow = { opt-level = 3 }
subspace-archiving = { opt-level = 3 }
subspace-chiapos = { opt-level = 3 }
subspace-core-primitives = { opt-level = 3 }
subspace-erasure-coding = { opt-level = 3 }
subspace-farmer-components = { opt-level = 3 }
Expand Down
12 changes: 6 additions & 6 deletions dsn/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/subs
sp-runtime = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }

subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
14 changes: 7 additions & 7 deletions farmer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ sdk-utils = { path = "../utils" }
sdk-dsn = { path = "../dsn" }
sdk-traits = { path = "../traits" }

subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", features = ["parallel", "chia"] }
subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
48 changes: 24 additions & 24 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,30 @@ sp-session = { version = "4.0.0-dev", git = "https://github.com/subspace/substra
sp-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
sp-version = { version = "5.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }

core-eth-relay-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
core-evm-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
core-payments-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
domain-client-executor = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
system-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12", optional = true }
core-eth-relay-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
core-evm-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
core-payments-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
domain-client-executor = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }
domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
domain-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sp-domains = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
sp-messenger = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-service = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-transaction-pool = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
system-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10", optional = true }

fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier/", rev = "e60f3f8617cabd3473bd5e197b7c0c1991fbcd9b", optional = true }

Expand Down
1 change: 1 addition & 0 deletions tests/integration/farmer.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ async fn progress_restart() {
}

#[tokio::test(flavor = "multi_thread")]
#[ignore = "Stack overflows for now"]
async fn farmer_restart() {
crate::common::setup();

Expand Down
16 changes: 4 additions & 12 deletions tests/integration/node.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ async fn sync_block_inner() {
}

#[tokio::test(flavor = "multi_thread")]
// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
// linux")]
#[ignore = "Test is too slow for now for CI"]
#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
async fn sync_block() {
tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_block_inner()).await.unwrap()
}
Expand Down Expand Up @@ -95,9 +93,7 @@ async fn sync_plot_inner() {
}

#[tokio::test(flavor = "multi_thread")]
// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
// linux")]
#[ignore = "Test is too slow for now for CI"]
#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
async fn sync_plot() {
tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_plot_inner()).await.unwrap()
}
Expand All @@ -115,9 +111,7 @@ async fn node_restart() {
}

#[tokio::test(flavor = "multi_thread")]
// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
// linux")]
#[ignore = "Test is too slow for now for CI"]
#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
async fn node_events() {
crate::common::setup();

Expand Down Expand Up @@ -148,9 +142,7 @@ async fn node_events() {
}

#[tokio::test(flavor = "multi_thread")]
// #[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on
// linux")]
#[ignore = "Test is too slow for now for CI"]
#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")]
async fn fetch_block_author() {
crate::common::setup();

Expand Down
8 changes: 4 additions & 4 deletions traits/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ async-trait = "0.1"
parking_lot = "0.12"
sdk-dsn = { path = "../dsn" }

subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }

sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
14 changes: 7 additions & 7 deletions utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ sp-core-hashing = { version = "5.0.0", git = "https://github.com/subspace/substr
sp-runtime = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }
sp-storage = { version = "7.0.0", git = "https://github.com/subspace/substrate", rev = "9cf78129a2638d3f370868863d16f4fe32b4ad30" }

sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }
subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }

# Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver`
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "40570762c7f9fac3600599a52273ca7327699c12" }
subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e2acdebb0b2798943ab0871e4bbd2ec51f677f10" }

0 comments on commit 36e9fa9

Please sign in to comment.