From 8ca602bca3512a2b93b52eea6b6e2f323b6b693d Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Tue, 5 Aug 2025 08:47:45 +0800
Subject: [PATCH 1/6] add DecodeWithMemTracking features

---
 nft/src/lib.rs          |  6 +++---
 oracle/src/lib.rs       | 17 +++++++++++++++--
 payments/src/types.rs   | 10 +++++-----
 rewards/src/lib.rs      |  2 +-
 tokens/src/lib.rs       |  8 +++++---
 traits/src/auction.rs   |  4 ++--
 traits/src/lib.rs       |  6 +++---
 xtokens/src/mock/mod.rs |  3 ++-
 8 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/nft/src/lib.rs b/nft/src/lib.rs
index 2b8bf2891..bc527e437 100644
--- a/nft/src/lib.rs
+++ b/nft/src/lib.rs
@@ -23,7 +23,7 @@
 
 use frame_support::{ensure, pallet_prelude::*, traits::Get, BoundedVec, Parameter};
 use frame_system::pallet_prelude::*;
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{AtLeast32BitUnsigned, CheckedAdd, CheckedSub, MaybeSerializeDeserialize, Member, One, Zero},
@@ -35,7 +35,7 @@ mod mock;
 mod tests;
 
 /// Class info
-#[derive(Encode, Decode, Clone, Eq, PartialEq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Clone, Eq, PartialEq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
 pub struct ClassInfo<TokenId, AccountId, Data, ClassMetadataOf> {
 	/// Class metadata
 	pub metadata: ClassMetadataOf,
@@ -48,7 +48,7 @@ pub struct ClassInfo<TokenId, AccountId, Data, ClassMetadataOf> {
 }
 
 /// Token info
-#[derive(Encode, Decode, Clone, Eq, PartialEq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Clone, Eq, PartialEq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
 pub struct TokenInfo<AccountId, Data, TokenMetadataOf> {
 	/// Token metadata
 	pub metadata: TokenMetadataOf,
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
index 3c51dde96..c0c9faf9c 100644
--- a/oracle/src/lib.rs
+++ b/oracle/src/lib.rs
@@ -19,7 +19,7 @@
 #![allow(clippy::string_lit_as_bytes)]
 #![allow(clippy::unused_unit)]
 
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
@@ -77,7 +77,20 @@ pub mod module {
 	pub(crate) type MomentOf<T, I = ()> = <<T as Config<I>>::Time as Time>::Moment;
 	pub(crate) type TimestampedValueOf<T, I = ()> = TimestampedValue<<T as Config<I>>::OracleValue, MomentOf<T, I>>;
 
-	#[derive(Encode, Decode, RuntimeDebug, Eq, PartialEq, Clone, Copy, Ord, PartialOrd, TypeInfo, MaxEncodedLen)]
+	#[derive(
+		Encode,
+		Decode,
+		DecodeWithMemTracking,
+		RuntimeDebug,
+		Eq,
+		PartialEq,
+		Clone,
+		Copy,
+		Ord,
+		PartialOrd,
+		TypeInfo,
+		MaxEncodedLen,
+	)]
 	#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 	pub struct TimestampedValue<Value, Moment> {
 		pub value: Value,
diff --git a/payments/src/types.rs b/payments/src/types.rs
index 2dd780066..06c87e9d6 100644
--- a/payments/src/types.rs
+++ b/payments/src/types.rs
@@ -1,7 +1,7 @@
 #![allow(unused_qualifications)]
 use crate::{pallet, AssetIdOf, BalanceOf};
 use frame_system::pallet_prelude::*;
-use parity_scale_codec::{Decode, Encode, HasCompact, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, HasCompact, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{DispatchResult, Percent};
 
@@ -13,7 +13,7 @@ use serde::{Deserialize, Serialize};
 /// guarantee proof of funds and can be released once an agreed upon condition
 /// has reached between the payment creator and recipient. The payment lifecycle
 /// is tracked using the state field.
-#[derive(Encode, Decode, Debug, Clone, PartialEq, Eq, MaxEncodedLen, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Debug, Clone, PartialEq, Eq, MaxEncodedLen, TypeInfo)]
 #[scale_info(skip_type_params(T))]
 #[codec(mel_bound(T: pallet::Config))]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
@@ -38,7 +38,7 @@ pub struct PaymentDetail<T: pallet::Config> {
 /// The `PaymentState` enum tracks the possible states that a payment can be in.
 /// When a payment is 'completed' or 'cancelled' it is removed from storage and
 /// hence not tracked by a state.
-#[derive(Encode, Decode, Debug, Clone, PartialEq, Eq, MaxEncodedLen, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Debug, Clone, PartialEq, Eq, MaxEncodedLen, TypeInfo)]
 #[scale_info(skip_type_params(T))]
 #[codec(mel_bound(T: pallet::Config))]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
@@ -109,14 +109,14 @@ pub trait FeeHandler<T: pallet::Config> {
 }
 
 /// Types of Tasks that can be scheduled in the pallet
-#[derive(PartialEq, Eq, Clone, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, DecodeWithMemTracking, Debug, TypeInfo, MaxEncodedLen)]
 pub enum Task {
 	// payment `from` to `to` has to be cancelled
 	Cancel,
 }
 
 /// The details of a scheduled task
-#[derive(PartialEq, Eq, Clone, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(PartialEq, Eq, Clone, Encode, Decode, DecodeWithMemTracking, Debug, TypeInfo, MaxEncodedLen)]
 pub struct ScheduledTask<Time: HasCompact> {
 	/// the type of scheduled task
 	pub task: Task,
diff --git a/rewards/src/lib.rs b/rewards/src/lib.rs
index ab33f8683..5a7f78d95 100644
--- a/rewards/src/lib.rs
+++ b/rewards/src/lib.rs
@@ -17,7 +17,7 @@ use sp_runtime::{
 use sp_std::{borrow::ToOwned, collections::btree_map::BTreeMap, fmt::Debug, prelude::*};
 
 /// The Reward Pool Info.
-#[derive(Clone, Encode, Decode, PartialEq, Eq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking, PartialEq, Eq, RuntimeDebug, TypeInfo)]
 pub struct PoolInfo<Share: HasCompact, Balance: HasCompact, CurrencyId: Ord> {
 	/// Total shares amount
 	pub total_shares: Share,
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
index 3bb23e767..27ffc844e 100644
--- a/tokens/src/lib.rs
+++ b/tokens/src/lib.rs
@@ -114,7 +114,7 @@ impl<T: Config> OnDust<T::AccountId, T::CurrencyId, T::Balance> for BurnDust<T>
 
 /// A single lock on a balance. There can be many of these on an account and
 /// they "overlap", so the same balance is frozen by multiple locks.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Clone, PartialEq, Eq, MaxEncodedLen, RuntimeDebug, TypeInfo)]
 pub struct BalanceLock<Balance> {
 	/// An identifier for this lock. Only one lock may be in existence for
 	/// each identifier.
@@ -125,7 +125,7 @@ pub struct BalanceLock<Balance> {
 }
 
 /// Store named reserved balance.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Clone, PartialEq, Eq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
 pub struct ReserveData<ReserveIdentifier, Balance> {
 	/// The identifier for the named reserve.
 	pub id: ReserveIdentifier,
@@ -134,7 +134,9 @@ pub struct ReserveData<ReserveIdentifier, Balance> {
 }
 
 /// balance information for an account.
-#[derive(Encode, Decode, Clone, PartialEq, Eq, Default, MaxEncodedLen, RuntimeDebug, TypeInfo)]
+#[derive(
+	Encode, Decode, DecodeWithMemTracking, Clone, PartialEq, Eq, Default, MaxEncodedLen, RuntimeDebug, TypeInfo,
+)]
 pub struct AccountData<Balance> {
 	/// Non-reserved part of the balance. There may still be restrictions on
 	/// this, but it is the total pool what may in principle be transferred,
diff --git a/traits/src/auction.rs b/traits/src/auction.rs
index 7096129f3..2531ef8da 100644
--- a/traits/src/auction.rs
+++ b/traits/src/auction.rs
@@ -1,5 +1,5 @@
 use crate::Change;
-use parity_scale_codec::{Decode, Encode, FullCodec, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, FullCodec, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{
 	traits::{AtLeast32Bit, Bounded, MaybeSerializeDeserialize},
@@ -13,7 +13,7 @@ use sp_std::{
 
 /// Auction info.
 #[cfg_attr(feature = "std", derive(PartialEq, Eq))]
-#[derive(Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, DecodeWithMemTracking, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct AuctionInfo<AccountId, Balance, BlockNumber> {
 	/// Current bidder and bid price.
 	pub bid: Option<(AccountId, Balance)>,
diff --git a/traits/src/lib.rs b/traits/src/lib.rs
index c59e7340b..53f2e05e8 100644
--- a/traits/src/lib.rs
+++ b/traits/src/lib.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use impl_trait_for_tuples::impl_for_tuples;
-use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use sp_runtime::{DispatchResult, RuntimeDebug};
 use sp_std::{
 	cmp::{Eq, PartialEq},
@@ -60,7 +60,7 @@ pub trait CombineData<Key, TimestampedValue> {
 }
 
 /// Indicate if should change a value
-#[derive(Encode, Decode, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+#[derive(Encode, Decode, DecodeWithMemTracking, Clone, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub enum Change<Value> {
 	/// No change.
 	NoChange,
@@ -68,7 +68,7 @@ pub enum Change<Value> {
 	NewValue(Value),
 }
 
-#[derive(Encode, Decode, RuntimeDebug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
+#[derive(Encode, Decode, DecodeWithMemTracking, RuntimeDebug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct TimestampedValue<Value: Ord + PartialOrd, Moment> {
 	pub value: Value,
diff --git a/xtokens/src/mock/mod.rs b/xtokens/src/mock/mod.rs
index 2da76c071..2bcdc5490 100644
--- a/xtokens/src/mock/mod.rs
+++ b/xtokens/src/mock/mod.rs
@@ -26,6 +26,7 @@ pub const CHARLIE: AccountId32 = AccountId32::new([2u8; 32]);
 #[derive(
 	Encode,
 	Decode,
+	DecodeWithMemTracking,
 	Eq,
 	PartialEq,
 	Copy,
@@ -36,7 +37,7 @@ pub const CHARLIE: AccountId32 = AccountId32::new([2u8; 32]);
 	parity_scale_codec::MaxEncodedLen,
 	TypeInfo,
 )]
-#[cfg_attr(feature = "std", derive(Serialize, Deserialize, DecodeWithMemTracking))]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum CurrencyId {
 	/// Relay chain token.
 	R,

From b115390ad7d68aaa8bf0d0c419401efa83d41327 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Tue, 5 Aug 2025 09:05:33 +0800
Subject: [PATCH 2/6] fix clippy

---
 payments/src/types.rs | 5 ++++-
 rewards/src/lib.rs    | 7 ++++++-
 traits/src/lib.rs     | 5 ++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/payments/src/types.rs b/payments/src/types.rs
index 06c87e9d6..da6091d06 100644
--- a/payments/src/types.rs
+++ b/payments/src/types.rs
@@ -117,7 +117,10 @@ pub enum Task {
 
 /// The details of a scheduled task
 #[derive(PartialEq, Eq, Clone, Encode, Decode, DecodeWithMemTracking, Debug, TypeInfo, MaxEncodedLen)]
-pub struct ScheduledTask<Time: HasCompact> {
+pub struct ScheduledTask<Time>
+where
+	Time: HasCompact,
+{
 	/// the type of scheduled task
 	pub task: Task,
 	/// the 'time' at which the task should be executed
diff --git a/rewards/src/lib.rs b/rewards/src/lib.rs
index 5a7f78d95..f373d610c 100644
--- a/rewards/src/lib.rs
+++ b/rewards/src/lib.rs
@@ -18,7 +18,12 @@ use sp_std::{borrow::ToOwned, collections::btree_map::BTreeMap, fmt::Debug, prel
 
 /// The Reward Pool Info.
 #[derive(Clone, Encode, Decode, DecodeWithMemTracking, PartialEq, Eq, RuntimeDebug, TypeInfo)]
-pub struct PoolInfo<Share: HasCompact, Balance: HasCompact, CurrencyId: Ord> {
+pub struct PoolInfo<Share, Balance, CurrencyId>
+where
+	Share: HasCompact,
+	Balance: HasCompact,
+	CurrencyId: Ord,
+{
 	/// Total shares amount
 	pub total_shares: Share,
 	/// Reward infos <reward_currency, (total_reward, total_withdrawn_reward)>
diff --git a/traits/src/lib.rs b/traits/src/lib.rs
index 53f2e05e8..aac970d9a 100644
--- a/traits/src/lib.rs
+++ b/traits/src/lib.rs
@@ -70,7 +70,10 @@ pub enum Change<Value> {
 
 #[derive(Encode, Decode, DecodeWithMemTracking, RuntimeDebug, Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
-pub struct TimestampedValue<Value: Ord + PartialOrd, Moment> {
+pub struct TimestampedValue<Value, Moment>
+where
+	Value: Ord + PartialOrd,
+{
 	pub value: Value,
 	pub timestamp: Moment,
 }

From d30863f2af2f78966cf6e0ec4a420c466a9577d6 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Fri, 15 Aug 2025 12:08:26 +0800
Subject: [PATCH 3/6] downgrade pallet-revive-proc-macro@0.3.0

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dff8d9700..c228a8e99 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,6 +37,7 @@ jobs:
       run: |
         cargo update
         cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
+        cargo update pallet-revive-proc-macro@0.3.1 --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
     - name: Run clippy
       run: cargo clippy -- -D warnings
     - name: Check for Wasm

From c7401ce0eb741830f3b9b5abe52036e334ebc838 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Fri, 15 Aug 2025 12:12:52 +0800
Subject: [PATCH 4/6] fix ci

---
 .github/workflows/coverage.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 66c71195f..7cfc4375a 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -38,6 +38,7 @@ jobs:
           make Cargo.toml
           cargo update
           cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
+          cargo update pallet-revive-proc-macro@0.3.1 --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
           cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v5

From 6c2abdb851892c35b98c20517c20cc685d756ed8 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Fri, 15 Aug 2025 12:20:02 +0800
Subject: [PATCH 5/6] fix ci

---
 .github/workflows/coverage.yml | 2 +-
 .github/workflows/test.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 7cfc4375a..e555a9934 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -38,7 +38,7 @@ jobs:
           make Cargo.toml
           cargo update
           cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
-          cargo update pallet-revive-proc-macro@0.3.1 --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
+          cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
           cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
       - name: Upload to codecov.io
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c228a8e99..d92349b1f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
       run: |
         cargo update
         cargo update base64ct --precise 1.6.0 # 1.8.0 requires the Cargo feature called `edition2024`
-        cargo update pallet-revive-proc-macro@0.3.1 --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
+        cargo update pallet-revive-proc-macro --precise 0.3.0 # TODO: https://github.com/paritytech/polkadot-sdk/issues/9425
     - name: Run clippy
       run: cargo clippy -- -D warnings
     - name: Check for Wasm

From b1b14e7890a3d8bba25dbad643f12453d27b3a53 Mon Sep 17 00:00:00 2001
From: zjb0807 <zjb0807@qq.com>
Date: Fri, 15 Aug 2025 12:44:25 +0800
Subject: [PATCH 6/6] fix ci

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 7caff90a1..e5acc0608 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
 channel = "1.84.1"
-components = ["rustfmt", "clippy"]
+components = ["rust-src", "rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]