Skip to content

Commit 14762e4

Browse files
committed
Merge branch 'main' of github.com:subspace/subspace into oldest-er-number
2 parents cbe218f + b735521 commit 14762e4

File tree

39 files changed

+920
-866
lines changed

39 files changed

+920
-866
lines changed

Cargo.lock

Lines changed: 789 additions & 707 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ inherits = "release"
9090
lto = "fat"
9191

9292
[patch.crates-io]
93+
# TODO: Switch to release once v1.0.0-alpha.2 or newer is out
94+
hwlocality = { git = "https://github.com/HadrienG2/hwlocality", rev = "0f248573bcad584960fe20293c826203a265b833" }
9395
# TODO: Switch to stable release once https://github.com/paritytech/substrate-bip39/pull/20 is published
9496
substrate-bip39 = { git = "https://github.com/paritytech/substrate-bip39", rev = "03f02a7225d9bc5add92b7657790ee1ac8ab90a4" }
9597

crates/pallet-subspace/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ subspace-runtime-primitives = { version = "0.1.0", default-features = false, pat
3131
subspace-verification = { version = "0.1.0", path = "../subspace-verification", default-features = false }
3232

3333
[dev-dependencies]
34-
env_logger = "0.10.0"
34+
env_logger = "0.10.2"
3535
futures = "0.3.29"
3636
pallet-balances = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
3737
pallet-offences-subspace = { version = "0.1.0", path = "../pallet-offences-subspace" }

crates/sc-consensus-subspace-rpc/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ readme = "README.md"
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
async-oneshot = "0.5.0"
16+
async-oneshot = "0.5.9"
1717
futures = "0.3.29"
1818
futures-timer = "3.0.2"
1919
jsonrpsee = { version = "0.16.3", features = ["server", "macros"] }
20-
lru = "0.11.0"
21-
parity-scale-codec = "3.6.5"
20+
lru = "0.12.1"
21+
parity-scale-codec = "3.6.9"
2222
parking_lot = "0.12.1"
2323
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
2424
sc-consensus-subspace = { version = "0.1.0", path = "../sc-consensus-subspace" }
@@ -36,4 +36,4 @@ subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primiti
3636
subspace-farmer-components = { version = "0.1.0", path = "../subspace-farmer-components" }
3737
subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
3838
subspace-rpc-primitives = { version = "0.1.0", path = "../subspace-rpc-primitives" }
39-
tracing = "0.1.37"
39+
tracing = "0.1.40"

crates/sc-consensus-subspace/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ documentation = "https://docs.rs/sc-consensus-subspace"
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
async-trait = "0.1.73"
16+
async-trait = "0.1.77"
1717
codec = { package = "parity-scale-codec", version = "3.6.5", features = ["derive"] }
1818
futures = "0.3.29"
19-
lru = "0.11.0"
19+
lru = "0.12.1"
2020
parking_lot = "0.12.1"
2121
rand = "0.8.5"
2222
rand_chacha = "0.3.1"
23-
rayon = "1.8.0"
23+
rayon = "1.8.1"
2424
schnorrkel = "0.11.4"
2525
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
2626
sc-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -43,9 +43,9 @@ subspace-archiving = { version = "0.1.0", path = "../subspace-archiving" }
4343
subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
4444
subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space" }
4545
subspace-verification = { version = "0.1.0", path = "../subspace-verification" }
46-
thiserror = "1.0.48"
47-
tokio = { version = "1.34.0", features = ["sync"] }
48-
tracing = "0.1.37"
46+
thiserror = "1.0.56"
47+
tokio = { version = "1.35.1", features = ["sync"] }
48+
tracing = "0.1.40"
4949

5050
[dev-dependencies]
5151
# TODO: Restore in the future, currently tests are mostly broken and useless

crates/sc-proof-of-time/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ atomic = "0.5.3"
1515
core_affinity = "0.8.1"
1616
derive_more = "0.99.17"
1717
futures = "0.3.29"
18-
lru = "0.11.0"
19-
parity-scale-codec = { version = "3.6.1", features = ["derive"] }
18+
lru = "0.12.1"
19+
parity-scale-codec = { version = "3.6.9", features = ["derive"] }
2020
sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
2121
sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
2222
sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
@@ -31,5 +31,5 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-s
3131
subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
3232
subspace-proof-of-time = { version = "0.1.0", path = "../subspace-proof-of-time" }
3333
parking_lot = "0.12.1"
34-
rayon = "1.8.0"
35-
tracing = "0.1.37"
34+
rayon = "1.8.1"
35+
tracing = "0.1.40"

crates/sc-subspace-block-relay/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ include = [
1212

1313
[dependencies]
1414
async-channel = "1.9.0"
15-
async-trait = "0.1.73"
15+
async-trait = "0.1.77"
1616
codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false, features = ["derive"] }
1717
derive_more = "0.99.17"
1818
futures = "0.3.29"
@@ -25,8 +25,8 @@ sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sd
2525
sp-consensus-subspace = { version = "0.1.0", path = "../sp-consensus-subspace" }
2626
sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
2727
sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
28-
strum_macros = "0.25.2"
28+
strum_macros = "0.25.3"
2929
substrate-prometheus-endpoint = { git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }
30-
thiserror = "1.0.48"
31-
tracing = "0.1.37"
30+
thiserror = "1.0.56"
31+
tracing = "0.1.40"
3232

crates/sp-consensus-subspace/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ readme = "README.md"
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
async-trait = { version = "0.1.73", optional = true }
16+
async-trait = { version = "0.1.77", optional = true }
1717
codec = { package = "parity-scale-codec", version = "3.6.5", default-features = false }
1818
log = { version = "0.4.20", default-features = false }
1919
scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
@@ -32,7 +32,7 @@ sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polka
3232
subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives", default-features = false }
3333
subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space", default-features = false }
3434
subspace-verification = { version = "0.1.0", path = "../subspace-verification", default-features = false }
35-
thiserror = { version = "1.0.48", optional = true }
35+
thiserror = { version = "1.0.56", optional = true }
3636

3737
[features]
3838
default = ["std"]

crates/sp-domains-fraud-proof/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sp-trie = { version = "22.0.0", default-features = false, git = "https://github.
3535
subspace-core-primitives = { version = "0.1.0", default-features = false, path = "../subspace-core-primitives" }
3636
subspace-runtime-primitives = { version = "0.1.0", default-features = false, path = "../subspace-runtime-primitives" }
3737
trie-db = { version = "0.28.0", default-features = false }
38-
thiserror = { version = "1.0.48", optional = true }
38+
thiserror = { version = "1.0.56", optional = true }
3939

4040
[dev-dependencies]
4141
domain-block-builder = { version = "0.1.0", path = "../../domains/client/block-builder" }
@@ -60,8 +60,8 @@ sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkad
6060
subspace-test-client = { version = "0.1.0", path = "../../test/subspace-test-client" }
6161
subspace-test-service = { version = "0.1.0", path = "../../test/subspace-test-service" }
6262
subspace-runtime-primitives = { version = "0.1.0", path = "../../crates/subspace-runtime-primitives" }
63-
tempfile = "3.8.0"
64-
tokio = "1.34.0"
63+
tempfile = "3.9.0"
64+
tokio = "1.35.1"
6565

6666
[features]
6767
default = ["std"]

crates/sp-domains/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ frame-support = { version = "4.0.0-dev", default-features = false, git = "https:
1818
hash-db = { version = "0.16.0", default-features = false }
1919
memory-db = { version = "0.32.0", default-features = false }
2020
hexlit = "0.5.5"
21-
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["derive"] }
21+
parity-scale-codec = { version = "3.6.9", default-features = false, features = ["derive"] }
2222
rand = { version = "0.8.5", default-features = false }
2323
rand_chacha = { version = "0.3.1", default-features = false }
24-
rs_merkle = { version = "1.4.1", default-features = false }
24+
rs_merkle = { version = "1.4.2", default-features = false }
2525
scale-info = { version = "2.7.0", default-features = false, features = ["derive"] }
2626
serde = { version = "1.0.195", default-features = false, features = ["alloc", "derive"] }
2727
sp-api = { version = "4.0.0-dev", default-features = false, git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" }

0 commit comments

Comments
 (0)