Merge branch 'master' into dm-sign-tx-version

paritytech · May 13, 2020 · 4fdb813 · 4fdb813
2 parents a018068 + cd8e5ca
commit 4fdb813
Show file tree

Hide file tree

Showing 9 changed files with 224 additions and 210 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/src/command.rs b/cli/src/command.rs
@@ -61,8 +61,6 @@ impl SubstrateCli for Cli {
 
 /// Parses polkadot specific CLI arguments and run the service.
 pub fn run() -> Result<()> {
-	sc_cli::reset_signal_pipe_handler()?;
-
 	let cli = Cli::from_args();
 
 	match &cli.subcommand {

diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs
@@ -86,8 +86,8 @@ pub struct TargetedFeeAdjustment<T, R>(sp_std::marker::PhantomData<(T, R)>);
 
 impl<T: Get<Perquintill>, R: system::Trait> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<T, R> {
 	fn convert(multiplier: Fixed128) -> Fixed128 {
-		let block_weight = <system::Module<R>>::all_extrinsics_weight();
 		let max_weight = MaximumBlockWeight::get();
+		let block_weight = <system::Module<R>>::all_extrinsics_weight().total().min(max_weight);
 		let target_weight = (T::get() * max_weight) as u128;
 		let block_weight = block_weight as u128;
 

diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
@@ -51,7 +51,7 @@ pub use impls::{CurrencyToVoteHandler, TargetedFeeAdjustment, ToAuthor};
 pub type NegativeImbalance<T> = <balances::Module<T> as Currency<<T as system::Trait>::AccountId>>::NegativeImbalance;
 
 parameter_types! {
-	pub const BlockHashCount: BlockNumber = 250;
+	pub const BlockHashCount: BlockNumber = 2400;
 	pub const MaximumBlockWeight: Weight = 2 * WEIGHT_PER_SECOND;
 	pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
 	pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;

diff --git a/runtime/common/src/parachains.rs b/runtime/common/src/parachains.rs
@@ -217,7 +217,7 @@ pub trait GetSessionNumber {
 
 impl GetSessionNumber for sp_session::MembershipProof {
 	fn session(&self) -> SessionIndex {
-		self.session()
+		self.session
 	}
 }
 

diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("kusama"),
 	impl_name: create_runtime_str!("parity-kusama"),
 	authoring_version: 2,
-	spec_version: 1063,
+	spec_version: 1064,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
@@ -86,7 +86,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("polkadot"),
 	impl_name: create_runtime_str!("parity-polkadot"),
 	authoring_version: 2,
-	spec_version: 1010,
+	spec_version: 1011,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/westend/src/lib.rs b/runtime/westend/src/lib.rs
@@ -83,7 +83,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("westend"),
 	impl_name: create_runtime_str!("parity-westend"),
 	authoring_version: 2,
-	spec_version: 9,
+	spec_version: 10,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/scripts/gitlab/check_tags.sh b/scripts/gitlab/check_tags.sh
@@ -6,7 +6,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/lib.sh
 # Must have one of the following labels
 labels=(
   'B1-releasenotes'
-  'B1-runtimeworthy'
+  'B1-runtimenoteworthy'
   'B1-silent'
 )