Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore/upgrade polkadot v1.11.0 to v1.13.0 #2131

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
rust 1.70
rust 1.77.0
make 4.3
cmake 3.24.1
1,219 changes: 613 additions & 606 deletions Cargo.lock

Large diffs are not rendered by default.

198 changes: 98 additions & 100 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions node/cli/src/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ pub fn inherent_benchmark_data() -> Result<InherentData> {
let timestamp = sp_timestamp::InherentDataProvider::new(d.into());
let mock_para_inherent_provider =
cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
para_id: 1000.into(),
current_para_block_head: Default::default(),
current_para_block: 0,
relay_offset: 1,
relay_blocks_per_para_block: 2,
Expand Down
2 changes: 1 addition & 1 deletion node/service/src/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use sp_core::{Pair, Public};
use sp_runtime::traits::{IdentifyAccount, Verify};

/// Dummy chain spec for building and checking
pub type DummyChainSpec = sc_service::GenericChainSpec<(), Extensions>;
pub type DummyChainSpec = sc_service::GenericChainSpec<Extensions>;

#[cfg(feature = "frequency")]
pub mod frequency;
Expand Down
3 changes: 1 addition & 2 deletions node/service/src/chain_spec/frequency_dev.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ use sc_service::ChainType;
use sp_core::sr25519;
use sp_runtime::traits::AccountIdConversion;
/// Specialized `ChainSpec` for the normal parachain runtime.
pub type ChainSpec =
sc_service::GenericChainSpec<frequency_runtime::RuntimeGenesisConfig, Extensions>;
pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;

use super::{get_account_id_from_seed, get_collator_keys_from_seed, get_properties, Extensions};

Expand Down
3 changes: 1 addition & 2 deletions node/service/src/chain_spec/frequency_paseo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ use sp_runtime::traits::AccountIdConversion;
use super::{get_account_id_from_seed, get_collator_keys_from_seed, get_properties, Extensions};

/// Specialized `ChainSpec` for the normal parachain runtime.
pub type ChainSpec =
sc_service::GenericChainSpec<frequency_runtime::RuntimeGenesisConfig, Extensions>;
pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
use sp_core::sr25519;

// Generic chain spec, in case when we don't have the native runtime.
Expand Down
4 changes: 1 addition & 3 deletions node/service/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ use cumulus_relay_chain_interface::{OverseerHandle, RelayChainError, RelayChainI
use frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE;
use futures::FutureExt;
use sc_consensus::{ImportQueue, LongestChain};
use sc_executor::{
HeapAllocStrategy, NativeElseWasmExecutor, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY,
};
use sc_executor::{HeapAllocStrategy, WasmExecutor, DEFAULT_HEAP_ALLOC_STRATEGY};

use sc_network::{NetworkBackend, NetworkBlock, NetworkService};
use sc_network_sync::SyncingService;
Expand Down
18 changes: 18 additions & 0 deletions runtime/common/src/weights/pallet_balances.rs
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,24 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for SubstrateWeight<T>
// Minimum execution time: 4_955_000 picoseconds.
Weight::from_parts(5_331_000, 0)
}
fn burn_allow_death() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 27_491_000 picoseconds.
Weight::from_parts(28_444_000, 0)
.saturating_add(Weight::from_parts(0, 0))
}

fn burn_keep_alive() -> Weight {
// Proof Size summary in bytes:
// Measured: `0`
// Estimated: `0`
// Minimum execution time: 18_290_000 picoseconds.
Weight::from_parts(19_227_000, 0)
.saturating_add(Weight::from_parts(0, 0))

}
}


Expand Down
1 change: 1 addition & 0 deletions runtime/frequency/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ std = [
"sp-runtime/std",
"sp-session/std",
"sp-std/std",
"cumulus-pallet-session-benchmarking/std",
"sp-transaction-pool/std",
"sp-genesis-builder/std",
"common-runtime/std",
Expand Down
1 change: 0 additions & 1 deletion runtime/frequency/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
type CheckAssociatedRelayNumber = RelayNumberMonotonicallyIncreases;
type WeightInfo = ();
// TODO: Remove this when Async Backing is activated and the feature is set for cumulus-pallet-parachain-system
#[cfg(feature = "parameterized-consensus-hook")]
type ConsensusHook = ConsensusHook;
}

Expand Down
Loading