Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 27364b1

Browse files
brunopgalvaobrunopgalvao
committed
Merge branch 'master' into bar/refactor-ocw-examples
2 parents d4b76cb + fe1f8ba commit 27364b1

File tree

205 files changed

+307
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+307
-244
lines changed

‎.cargo/config.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,4 @@ rustflags = [
3030
"-Aclippy::derivable_impls", # false positives
3131
"-Aclippy::stable_sort_primitive", # prefer stable sort
3232
"-Aclippy::extra-unused-type-parameters", # stylistic
33-
"-Aclippy::let_with_type_underscore" # used as a workaround for an infinite macro expansion loop in clippy
34-
# specifying this as an attribute directly in the affected macro
35-
# triggers other weird rust 1.70 bugs
3633
]

‎Cargo.lock

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

‎bin/node-template/pallets/template/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository = "https://github.com/substrate-developer-hub/substrate-node-template
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
16+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
1717
"derive",
1818
] }
1919
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }

‎bin/node-template/runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ repository = "https://github.com/substrate-developer-hub/substrate-node-template
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive"] }
16+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
1717
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
1818

1919
pallet-aura = { version = "4.0.0-dev", default-features = false, path = "../../../frame/aura" }

‎bin/node/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ crate-type = ["cdylib", "rlib"]
3737
# third-party dependencies
3838
array-bytes = "4.1"
3939
clap = { version = "4.2.5", features = ["derive"], optional = true }
40-
codec = { package = "parity-scale-codec", version = "3.2.2" }
40+
codec = { package = "parity-scale-codec", version = "3.6.1" }
4141
serde = { version = "1.0.163", features = ["derive"] }
4242
jsonrpsee = { version = "0.16.2", features = ["server"] }
4343
futures = "0.3.21"

‎bin/node/executor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { package = "parity-scale-codec", version = "3.2.2" }
16+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1717
scale-info = { version = "2.5.0", features = ["derive"] }
1818
frame-benchmarking = { version = "4.0.0-dev", path = "../../../frame/benchmarking" }
1919
node-primitives = { version = "2.0.0", path = "../primitives" }

‎bin/node/inspect/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
1616
clap = { version = "4.2.5", features = ["derive"] }
17-
codec = { package = "parity-scale-codec", version = "3.2.2" }
17+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1818
thiserror = "1.0"
1919
sc-cli = { version = "0.10.0-dev", path = "../../../client/cli" }
2020
sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }

‎bin/node/primitives/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
16+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
1717
"derive",
1818
] }
1919
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }

‎bin/node/runtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1616
[dependencies]
1717

1818
# third-party dependencies
19-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
19+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
2020
"derive",
2121
"max-encoded-len",
2222
] }

‎bin/node/testing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish = false
1313
targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
16-
codec = { package = "parity-scale-codec", version = "3.2.2" }
16+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1717
fs_extra = "1"
1818
futures = "0.3.21"
1919
log = "0.4.17"

‎client/api/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ readme = "README.md"
1414
targets = ["x86_64-unknown-linux-gnu"]
1515

1616
[dependencies]
17-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
17+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
1818
"derive",
1919
] }
2020
fnv = "1.0.6"

‎client/authority-discovery/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1717
prost-build = "0.11"
1818

1919
[dependencies]
20-
codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
20+
codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
2121
futures = "0.3.21"
2222
futures-timer = "3.0.1"
2323
ip_network = "0.4.1"

‎client/basic-authorship/Cargo.toml

Lines changed: 1 addition & 1 deletion
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-
codec = { package = "parity-scale-codec", version = "3.2.2" }
16+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1717
futures = "0.3.21"
1818
futures-timer = "3.0.1"
1919
log = "0.4.17"

‎client/block-builder/Cargo.toml

Lines changed: 1 addition & 1 deletion
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-
codec = { package = "parity-scale-codec", version = "3.2.2", features = [
16+
codec = { package = "parity-scale-codec", version = "3.6.1", features = [
1717
"derive",
1818
] }
1919
sc-client-api = { version = "4.0.0-dev", path = "../api" }

‎client/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ futures = "0.3.21"
2121
libp2p-identity = { version = "0.1.2", features = ["peerid", "ed25519"]}
2222
log = "0.4.17"
2323
names = { version = "0.13.0", default-features = false }
24-
parity-scale-codec = "3.2.2"
24+
parity-scale-codec = "3.6.1"
2525
rand = "0.8.5"
2626
regex = "1.6.0"
2727
rpassword = "7.0.0"

‎client/cli/src/params/network_params.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use sc_service::{
2828
config::{Multiaddr, MultiaddrWithPeerId},
2929
ChainSpec, ChainType,
3030
};
31-
use std::{borrow::Cow, path::PathBuf};
31+
use std::{borrow::Cow, num::NonZeroUsize, path::PathBuf};
3232

3333
/// Parameters used to create the network configuration.
3434
#[derive(Debug, Clone, Args)]
@@ -121,6 +121,13 @@ pub struct NetworkParams {
121121
#[arg(long)]
122122
pub kademlia_disjoint_query_paths: bool,
123123

124+
/// Kademlia replication factor determines to how many closest peers a record is replicated to.
125+
///
126+
/// Discovery mechanism requires successful replication to all
127+
/// `kademlia_replication_factor` peers to consider record successfully put.
128+
#[arg(long, default_value = "20")]
129+
pub kademlia_replication_factor: NonZeroUsize,
130+
124131
/// Join the IPFS network and serve transactions over bitswap protocol.
125132
#[arg(long)]
126133
pub ipfs_server: bool,
@@ -233,6 +240,7 @@ impl NetworkParams {
233240
enable_dht_random_walk: !self.reserved_only,
234241
allow_non_globals_in_dht,
235242
kademlia_disjoint_query_paths: self.kademlia_disjoint_query_paths,
243+
kademlia_replication_factor: self.kademlia_replication_factor,
236244
yamux_window_size: None,
237245
ipfs_server: self.ipfs_server,
238246
sync_mode: self.sync.into(),

‎client/consensus/aura/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
1616
async-trait = "0.1.57"
17-
codec = { package = "parity-scale-codec", version = "3.2.2" }
17+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1818
futures = "0.3.21"
1919
log = "0.4.17"
2020
thiserror = "1.0"

‎client/consensus/babe/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1616
[dependencies]
1717
async-trait = "0.1.57"
1818
scale-info = { version = "2.5.0", features = ["derive"] }
19-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
19+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
2020
futures = "0.3.21"
2121
log = "0.4.17"
2222
num-bigint = "0.4.3"

‎client/consensus/beefy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ homepage = "https://substrate.io"
1212
array-bytes = "4.1"
1313
async-channel = "1.8.0"
1414
async-trait = "0.1.57"
15-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
15+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
1616
fnv = "1.0.6"
1717
futures = "0.3"
1818
log = "0.4"

‎client/consensus/beefy/rpc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description = "RPC for the BEEFY Client gadget for substrate"
99
homepage = "https://substrate.io"
1010

1111
[dependencies]
12-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
12+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
1313
futures = "0.3.21"
1414
jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
1515
log = "0.4"

‎client/consensus/epochs/Cargo.toml

Lines changed: 1 addition & 1 deletion
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-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
16+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
1717
fork-tree = { version = "3.0.0", path = "../../../utils/fork-tree" }
1818
sc-client-api = { version = "4.0.0-dev", path = "../../api" }
1919
sc-consensus = { version = "0.10.0-dev", path = "../common" }

‎client/consensus/grandpa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
2222
futures = "0.3.21"
2323
futures-timer = "3.0.1"
2424
log = "0.4.17"
25-
parity-scale-codec = { version = "3.2.2", features = ["derive"] }
25+
parity-scale-codec = { version = "3.6.1", features = ["derive"] }
2626
parking_lot = "0.12.1"
2727
rand = "0.8.5"
2828
serde_json = "1.0.85"

‎client/consensus/grandpa/rpc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ finality-grandpa = { version = "0.16.2", features = ["derive-codec"] }
1414
futures = "0.3.16"
1515
jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
1616
log = "0.4.8"
17-
parity-scale-codec = { version = "3.2.2", features = ["derive"] }
17+
parity-scale-codec = { version = "3.6.1", features = ["derive"] }
1818
serde = { version = "1.0.163", features = ["derive"] }
1919
thiserror = "1.0"
2020
sc-client-api = { version = "4.0.0-dev", path = "../../../api" }

‎client/consensus/manual-seal/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1616
jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
1717
assert_matches = "1.3.0"
1818
async-trait = "0.1.57"
19-
codec = { package = "parity-scale-codec", version = "3.2.2" }
19+
codec = { package = "parity-scale-codec", version = "3.6.1" }
2020
futures = "0.3.21"
2121
futures-timer = "3.0.1"
2222
log = "0.4.17"

‎client/consensus/pow/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1414

1515
[dependencies]
1616
async-trait = "0.1.57"
17-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
17+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
1818
futures = "0.3.21"
1919
futures-timer = "3.0.1"
2020
log = "0.4.17"

‎client/consensus/slots/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ targets = ["x86_64-unknown-linux-gnu"]
1515

1616
[dependencies]
1717
async-trait = "0.1.57"
18-
codec = { package = "parity-scale-codec", version = "3.2.2" }
18+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1919
futures = "0.3.21"
2020
futures-timer = "3.0.1"
2121
log = "0.4.17"

‎client/db/Cargo.toml

Lines changed: 1 addition & 1 deletion
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-
codec = { package = "parity-scale-codec", version = "3.2.2", features = [
16+
codec = { package = "parity-scale-codec", version = "3.6.1", features = [
1717
"derive",
1818
] }
1919
hash-db = "0.16.0"

‎client/executor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ lru = "0.10.0"
1818
parking_lot = "0.12.1"
1919
tracing = "0.1.29"
2020

21-
codec = { package = "parity-scale-codec", version = "3.2.2" }
21+
codec = { package = "parity-scale-codec", version = "3.6.1" }
2222
sc-executor-common = { version = "0.10.0-dev", path = "common" }
2323
sc-executor-wasmtime = { version = "0.10.0-dev", path = "wasmtime" }
2424
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }

‎client/executor/wasmtime/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ sc-runtime-test = { version = "2.0.0", path = "../runtime-test" }
4747
sp-io = { version = "23.0.0", path = "../../../primitives/io" }
4848
tempfile = "3.3.0"
4949
paste = "1.0"
50-
codec = { package = "parity-scale-codec", version = "3.2.2" }
50+
codec = { package = "parity-scale-codec", version = "3.6.1" }
5151
cargo_metadata = "0.15.4"

‎client/merkle-mountain-range/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ homepage = "https://substrate.io"
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
codec = { package = "parity-scale-codec", version = "3.2.2" }
14+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1515
futures = "0.3"
1616
log = "0.4"
1717
sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }

‎client/merkle-mountain-range/rpc/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ description = "Node-specific RPC methods for interaction with Merkle Mountain Ra
1212
targets = ["x86_64-unknown-linux-gnu"]
1313

1414
[dependencies]
15-
codec = { package = "parity-scale-codec", version = "3.2.2" }
15+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1616
jsonrpsee = { version = "0.16.2", features = ["client-core", "server", "macros"] }
1717
serde = { version = "1.0.163", features = ["derive"] }
1818
sp-api = { version = "4.0.0-dev", path = "../../../primitives/api" }

‎client/network/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ async-channel = "1.8.0"
1919
async-trait = "0.1"
2020
asynchronous-codec = "0.6"
2121
bytes = "1"
22-
codec = { package = "parity-scale-codec", version = "3.2.2", features = ["derive"] }
22+
codec = { package = "parity-scale-codec", version = "3.6.1", features = ["derive"] }
2323
either = "1.5.3"
2424
fnv = "1.0.6"
2525
futures = "0.3.21"

‎client/network/common/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ array-bytes = "4.1"
2020
async-trait = "0.1.57"
2121
bitflags = "1.3.2"
2222
bytes = "1"
23-
codec = { package = "parity-scale-codec", version = "3.2.2", features = [
23+
codec = { package = "parity-scale-codec", version = "3.6.1", features = [
2424
"derive",
2525
] }
2626
futures = "0.3.21"

‎client/network/light/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ prost-build = "0.11"
1818
[dependencies]
1919
async-channel = "1.8.0"
2020
array-bytes = "4.1"
21-
codec = { package = "parity-scale-codec", version = "3.2.2", features = [
21+
codec = { package = "parity-scale-codec", version = "3.6.1", features = [
2222
"derive",
2323
] }
2424
futures = "0.3.21"

0 commit comments

Comments
 (0)