Merge branch 'master' into update-stable2407

AcalaNetwork · Aug 14, 2024 · 3bbd52c · 3bbd52c
2 parents 9892bcd + 3802117
commit 3bbd52c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml
@@ -415,4 +415,9 @@ no-metadata-docs = ["frame-support/no-metadata-docs"]
 # more types in the metadata.
 full-metadata-docs = ["frame-support/full-metadata-docs"]
 
-tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
+tracing = [
+	"module-evm/tracing",
+	"module-evm-bridge/tracing",
+	"module-evm-rpc-runtime-api/tracing",
+	"runtime-common/tracing"
+]
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
@@ -323,7 +323,7 @@ impl pallet_session::Config for Runtime {
 }
 
 parameter_types! {
-	pub const CollatorKickThreshold: Permill = Permill::from_percent(60);
+	pub const CollatorKickThreshold: Permill = Permill::from_percent(75);
 }
 
 impl module_collator_selection::Config for Runtime {

diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml
@@ -423,4 +423,9 @@ no-metadata-docs = ["frame-support/no-metadata-docs"]
 # more types in the metadata.
 full-metadata-docs = ["frame-support/full-metadata-docs"]
 
-tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
+tracing = [
+	"module-evm/tracing",
+	"module-evm-bridge/tracing",
+	"module-evm-rpc-runtime-api/tracing",
+	"runtime-common/tracing"
+]
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
@@ -330,7 +330,7 @@ impl pallet_session::Config for Runtime {
 }
 
 parameter_types! {
-	pub const CollatorKickThreshold: Permill = Permill::from_percent(65);
+	pub const CollatorKickThreshold: Permill = Permill::from_percent(75);
 }
 
 impl module_collator_selection::Config for Runtime {

diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml
@@ -447,4 +447,9 @@ no-metadata-docs = ["frame-support/no-metadata-docs"]
 # more types in the metadata.
 full-metadata-docs = ["frame-support/full-metadata-docs"]
 
-tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
+tracing = [
+	"module-evm/tracing",
+	"module-evm-bridge/tracing",
+	"module-evm-rpc-runtime-api/tracing",
+	"runtime-common/tracing"
+]