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

Commit c93fb62

Browse files
michalkucharczykmichalkucharczyk
committed
Merge remote-tracking branch 'origin/master' into mku-serialize-for-para-id
2 parents dd63ce1 + 26b4a21 commit c93fb62

File tree

16 files changed

+220
-214
lines changed

16 files changed

+220
-214
lines changed

‎Cargo.lock

+187-187
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎node/primitives/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
1919
polkadot-parachain = { path = "../../parachain", default-features = false }
2020
schnorrkel = "0.9.1"
2121
thiserror = "1.0.31"
22-
serde = { version = "1.0.137", features = ["derive"] }
22+
serde = { version = "1.0.163", features = ["derive"] }
2323

2424
[target.'cfg(not(target_os = "unknown"))'.dependencies]
2525
zstd = { version = "0.11.2", default-features = false }

‎node/service/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", bran
7070
futures = "0.3.21"
7171
hex-literal = "0.4.1"
7272
gum = { package = "tracing-gum", path = "../gum/" }
73-
serde = { version = "1.0.137", features = ["derive"] }
73+
serde = { version = "1.0.163", features = ["derive"] }
7474
serde_json = "1.0.96"
7575
thiserror = "1.0.31"
7676
kvdb = "0.13.0"

‎parachain/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ derive_more = "0.99.11"
2020
bounded-collections = { version = "0.1.7", default-features = false, features = ["serde"] }
2121

2222
# all optional crates.
23-
serde = { version = "1.0.137", default-features = false, features = ["derive", "alloc"] }
23+
serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
2424

2525
[features]
2626
default = ["std"]

‎primitives/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
99
hex-literal = "0.4.1"
1010
parity-scale-codec = { version = "3.4.0", default-features = false, features = ["bit-vec", "derive"] }
1111
scale-info = { version = "2.5.0", default-features = false, features = ["bit-vec", "derive", "serde"] }
12-
serde = { version = "1.0.137", default-features = false, features = ["derive", "alloc"] }
12+
serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
1313

1414
application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, features = ["serde"] }
1515
inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

‎runtime/common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1111
log = { version = "0.4.17", default-features = false }
1212
rustc-hex = { version = "2.1.0", default-features = false }
1313
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
14-
serde = { version = "1.0.139", default-features = false, features = ["alloc"] }
14+
serde = { version = "1.0.163", default-features = false, features = ["alloc"] }
1515
serde_derive = { version = "1.0.117" }
1616
static_assertions = "1.1.0"
1717

‎runtime/kusama/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1111
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
1212
log = { version = "0.4.17", default-features = false }
1313
rustc-hex = { version = "2.1.0", default-features = false }
14-
serde = { version = "1.0.139", default-features = false }
14+
serde = { version = "1.0.163", default-features = false }
1515
serde_derive = { version = "1.0.117", optional = true }
1616
static_assertions = "1.1.0"
1717
smallvec = "1.8.0"

‎runtime/parachains/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1010
log = { version = "0.4.17", default-features = false }
1111
rustc-hex = { version = "2.1.0", default-features = false }
1212
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
13-
serde = { version = "1.0.139", default-features = false, features = ["derive", "alloc"] }
13+
serde = { version = "1.0.163", default-features = false, features = ["derive", "alloc"] }
1414
derive_more = "0.99.17"
1515
bitflags = "1.3.2"
1616

‎runtime/polkadot/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1111
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
1212
log = { version = "0.4.17", default-features = false }
1313
rustc-hex = { version = "2.1.0", default-features = false }
14-
serde = { version = "1.0.139", default-features = false }
14+
serde = { version = "1.0.163", default-features = false }
1515
serde_derive = { version = "1.0.117", optional = true }
1616
static_assertions = "1.1.0"
1717
smallvec = "1.8.0"

‎runtime/rococo/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition.workspace = true
99
parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] }
1010
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
1111
log = { version = "0.4.17", default-features = false }
12-
serde = { version = "1.0.139", default-features = false }
12+
serde = { version = "1.0.163", default-features = false }
1313
serde_derive = { version = "1.0.117", optional = true }
1414
static_assertions = "1.1.0"
1515
smallvec = "1.8.0"

‎runtime/rococo/src/lib.rs

+19-13
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
7070
use pallet_session::historical as session_historical;
7171
use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo};
7272
use sp_core::{ConstU128, OpaqueMetadata, H256};
73-
use sp_mmr_primitives as mmr;
7473
use sp_runtime::{
7574
create_runtime_str, generic, impl_opaque_keys,
7675
traits::{
@@ -1281,6 +1280,16 @@ impl pallet_beefy::Config for Runtime {
12811280
pallet_beefy::EquivocationReportSystem<Self, Offences, Historical, ReportLongevity>;
12821281
}
12831282

1283+
/// MMR helper types.
1284+
mod mmr {
1285+
use super::Runtime;
1286+
pub use pallet_mmr::primitives::*;
1287+
1288+
pub type Leaf = <<Runtime as pallet_mmr::Config>::LeafData as LeafDataProvider>::LeafData;
1289+
pub type Hashing = <Runtime as pallet_mmr::Config>::Hashing;
1290+
pub type Hash = <Hashing as sp_runtime::traits::Hash>::Output;
1291+
}
1292+
12841293
impl pallet_mmr::Config for Runtime {
12851294
const INDEXING_PREFIX: &'static [u8] = mmr::INDEXING_PREFIX;
12861295
type Hashing = Keccak256;
@@ -1314,7 +1323,7 @@ impl BeefyDataProvider<H256> for ParasProvider {
13141323
.filter_map(|id| Paras::para_head(&id).map(|head| (id.into(), head.0)))
13151324
.collect();
13161325
para_heads.sort();
1317-
binary_merkle_tree::merkle_root::<<Runtime as pallet_mmr::Config>::Hashing, _>(
1326+
binary_merkle_tree::merkle_root::<mmr::Hashing, _>(
13181327
para_heads.into_iter().map(|pair| pair.encode()),
13191328
)
13201329
.into()
@@ -1731,8 +1740,6 @@ mod benches {
17311740
);
17321741
}
17331742

1734-
pub type MmrHashing = <Runtime as pallet_mmr::Config>::Hashing;
1735-
17361743
#[cfg(not(feature = "disable-runtime-api"))]
17371744
sp_api::impl_runtime_apis! {
17381745
impl sp_api::Core<Block> for Runtime {
@@ -1972,8 +1979,8 @@ sp_api::impl_runtime_apis! {
19721979
}
19731980

19741981
#[api_version(2)]
1975-
impl mmr::MmrApi<Block, Hash, BlockNumber> for Runtime {
1976-
fn mmr_root() -> Result<Hash, mmr::Error> {
1982+
impl mmr::MmrApi<Block, mmr::Hash, BlockNumber> for Runtime {
1983+
fn mmr_root() -> Result<mmr::Hash, mmr::Error> {
19771984
Ok(Mmr::mmr_root())
19781985
}
19791986

@@ -1984,7 +1991,7 @@ sp_api::impl_runtime_apis! {
19841991
fn generate_proof(
19851992
block_numbers: Vec<BlockNumber>,
19861993
best_known_block_number: Option<BlockNumber>,
1987-
) -> Result<(Vec<mmr::EncodableOpaqueLeaf>, mmr::Proof<Hash>), mmr::Error> {
1994+
) -> Result<(Vec<mmr::EncodableOpaqueLeaf>, mmr::Proof<mmr::Hash>), mmr::Error> {
19881995
Mmr::generate_proof(block_numbers, best_known_block_number).map(
19891996
|(leaves, proof)| {
19901997
(
@@ -1998,24 +2005,23 @@ sp_api::impl_runtime_apis! {
19982005
)
19992006
}
20002007

2001-
fn verify_proof(leaves: Vec<mmr::EncodableOpaqueLeaf>, proof: mmr::Proof<Hash>)
2008+
fn verify_proof(leaves: Vec<mmr::EncodableOpaqueLeaf>, proof: mmr::Proof<mmr::Hash>)
20022009
-> Result<(), mmr::Error>
20032010
{
2004-
pub type MmrLeaf = <<Runtime as pallet_mmr::Config>::LeafData as mmr::LeafDataProvider>::LeafData;
20052011
let leaves = leaves.into_iter().map(|leaf|
20062012
leaf.into_opaque_leaf()
20072013
.try_decode()
2008-
.ok_or(mmr::Error::Verify)).collect::<Result<Vec<MmrLeaf>, mmr::Error>>()?;
2014+
.ok_or(mmr::Error::Verify)).collect::<Result<Vec<mmr::Leaf>, mmr::Error>>()?;
20092015
Mmr::verify_leaves(leaves, proof)
20102016
}
20112017

20122018
fn verify_proof_stateless(
2013-
root: Hash,
2019+
root: mmr::Hash,
20142020
leaves: Vec<mmr::EncodableOpaqueLeaf>,
2015-
proof: mmr::Proof<Hash>
2021+
proof: mmr::Proof<mmr::Hash>
20162022
) -> Result<(), mmr::Error> {
20172023
let nodes = leaves.into_iter().map(|leaf|mmr::DataOrHash::Data(leaf.into_opaque_leaf())).collect();
2018-
pallet_mmr::verify_leaves_proof::<MmrHashing, _>(root, nodes, proof)
2024+
pallet_mmr::verify_leaves_proof::<mmr::Hashing, _>(root, nodes, proof)
20192025
}
20202026
}
20212027

‎runtime/test-runtime/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1111
log = { version = "0.4.17", default-features = false }
1212
rustc-hex = { version = "2.1.0", default-features = false }
1313
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
14-
serde = { version = "1.0.139", default-features = false }
14+
serde = { version = "1.0.163", default-features = false }
1515
serde_derive = { version = "1.0.117", optional = true }
1616
smallvec = "1.8.0"
1717

‎runtime/westend/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parity-scale-codec = { version = "3.4.0", default-features = false, features = [
1111
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
1212
log = { version = "0.4.17", default-features = false }
1313
rustc-hex = { version = "2.1.0", default-features = false }
14-
serde = { version = "1.0.139", default-features = false }
14+
serde = { version = "1.0.163", default-features = false }
1515
serde_derive = { version = "1.0.117", optional = true }
1616
smallvec = "1.8.0"
1717

‎utils/staking-miner/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
1515
jsonrpsee = { version = "0.16.2", features = ["ws-client", "macros"] }
1616
log = "0.4.17"
1717
paste = "1.0.7"
18-
serde = "1.0.137"
18+
serde = "1.0.163"
1919
serde_json = "1.0"
2020
thiserror = "1.0.31"
2121
tokio = { version = "1.24.2", features = ["macros", "rt-multi-thread", "sync"] }

‎xcm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ log = { version = "0.4.17", default-features = false }
1313
parity-scale-codec = { version = "3.4.0", default-features = false, features = [ "derive", "max-encoded-len" ] }
1414
scale-info = { version = "2.5.0", default-features = false, features = ["derive", "serde"] }
1515
sp-weights = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, feature = ["serde "] }
16-
serde = { version = "1.0.136", default-features = false, features = ["alloc", "derive"] }
16+
serde = { version = "1.0.163", default-features = false, features = ["alloc", "derive"] }
1717
xcm-procedural = { path = "procedural" }
1818

1919
[dev-dependencies]

‎xcm/pallet-xcm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version.workspace = true
99
bounded-collections = { version = "0.1.7", default-features = false }
1010
codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }
1111
scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
12-
serde = { version = "1.0.137", optional = true, features = ["derive"] }
12+
serde = { version = "1.0.163", optional = true, features = ["derive"] }
1313
log = { version = "0.4.17", default-features = false }
1414

1515
frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false, optional = true }

0 commit comments

Comments
 (0)