Merge branch 'main' into toufeeq/fix-fee-payment

core/Cargo.toml

@@ -23,15 +23,14 @@ bounded-collections.workspace = true
 codec = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info.workspace = true
 
-# Polkadot SDK
 frame-support = { workspace = true, optional = true }
 sp-arithmetic.workspace = true
 sp-core.workspace = true
-sp-io.workspace = true
 sp-runtime = { workspace = true, optional = true }
 sp-runtime-interface = { workspace = true, optional = true }
 sp-std.workspace = true
 sp-trie.workspace = true
+sp-io.workspace = true
 
 [dev-dependencies]
 hex-literal.workspace = true
@@ -70,6 +69,7 @@ runtime = [
 	"sp-runtime",
 	"sp-runtime-interface",
 ]
+disable_panic_handler = [ "sp-io/disable_panic_handler" ]
 
 try-runtime = [ "runtime", "sp-runtime/try-runtime" ]
 serde = [ "dep:serde", "hex/serde", "log/serde" ]

core/src/lib.rs

@@ -1,8 +1,10 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(clippy::arithmetic_side_effects)]
 
+use core::fmt::Debug;
+
 use codec::{Decode, Encode, MaxEncodedLen};
-use derive_more::{Add, Constructor, Deref, Display, Into, Mul};
+use derive_more::{Add, Constructor, Deref, Into, Mul};
 use scale_info::TypeInfo;
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
@@ -88,11 +90,16 @@ pub enum InvalidTransactionCustomId {
 	Into,
 	MaxEncodedLen,
 	RuntimeDebug,
-	Display,
 )]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct AppId(#[codec(compact)] pub u32);
 
+impl core::fmt::Display for AppId {
+	fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+		write!(f, "{}", self.0)
+	}
+}
+
 impl Zero for AppId {
 	fn zero() -> Self {
 		AppId(Zero::zero())
@@ -119,7 +126,6 @@ impl Zero for AppId {
 	Into,
 	Constructor,
 	MaxEncodedLen,
-	Display,
 	Default,
 )]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize, Debug))]
@@ -143,7 +149,6 @@ pub struct BlockLengthColumns(#[codec(compact)] pub u32);
 	Ord,
 	Into,
 	Constructor,
-	Display,
 	Default,
 )]
 #[mul(forward)]