update feature and fmt

.github/workflows/test.yml

@@ -38,6 +38,7 @@ jobs:
       - name: Install toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
+          toolchain: nightly-2024-07-22
           components: rustfmt
       - name: Setup cmake
         uses: jwlawson/[email protected]

modules/transaction-payment/src/lib.rs

@@ -961,7 +961,8 @@ where
 						// pre check before set OverrideChargeFeeMethod
 						ensure!(
 							fee_swap_path.len() <= T::TradingPathLimit::get() as usize
-								&& fee_swap_path.len() > 1 && fee_swap_path.first() != Some(&T::NativeCurrencyId::get())
+								&& fee_swap_path.len() > 1
+								&& fee_swap_path.first() != Some(&T::NativeCurrencyId::get())
 								&& fee_swap_path.last() == Some(&T::NativeCurrencyId::get()),
 							Error::<T>::InvalidSwapPath
 						);

node/service/src/chain_spec/mandala.rs

@@ -400,11 +400,11 @@ fn testnet_genesis(
 			collaterals_params: vec![
 				(
 					DOT,
-					Some(FixedU128::zero()),                             // interest rate per sec for this collateral
+					Some(FixedU128::zero()), // interest rate per sec for this collateral
 					Some(FixedU128::saturating_from_rational(150, 100)), // liquidation ratio
-					Some(FixedU128::saturating_from_rational(10, 100)),  // liquidation penalty rate
+					Some(FixedU128::saturating_from_rational(10, 100)), // liquidation penalty rate
 					Some(FixedU128::saturating_from_rational(150, 100)), // required liquidation ratio
-					10_000_000 * dollar(AUSD),                           // maximum debit value in aUSD (cap)
+					10_000_000 * dollar(AUSD), // maximum debit value in aUSD (cap)
 				),
 				(
 					LDOT,
@@ -576,11 +576,11 @@ fn mandala_genesis(
 			collaterals_params: vec![
 				(
 					DOT,
-					Some(FixedU128::zero()),                             // interest rate per sec for this collateral
+					Some(FixedU128::zero()), // interest rate per sec for this collateral
 					Some(FixedU128::saturating_from_rational(105, 100)), // liquidation ratio
-					Some(FixedU128::saturating_from_rational(3, 100)),   // liquidation penalty rate
+					Some(FixedU128::saturating_from_rational(3, 100)), // liquidation penalty rate
 					Some(FixedU128::saturating_from_rational(110, 100)), // required liquidation ratio
-					10_000_000 * dollar(AUSD),                           // maximum debit value in aUSD (cap)
+					10_000_000 * dollar(AUSD), // maximum debit value in aUSD (cap)
 				),
 				(
 					LDOT,

runtime/acala/src/lib.rs

@@ -2534,9 +2534,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				access_list,
 				valid_until,
 			}) => {
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
-					return Err(InvalidTransaction::Stale);
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 				}
 
 				let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone();
@@ -2580,9 +2583,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				let (tip, valid_until) =
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
-					return Err(InvalidTransaction::Stale);
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 				}
 
 				let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone();

runtime/common/src/check_nonce.rs

@@ -121,14 +121,17 @@ where
 				.map(|x| x.nonce)
 				.unwrap_or_default();
 
-			#[cfg(not(feature = "tracing"))]
-			if self.nonce != evm_nonce {
-				return Err(if self.nonce < evm_nonce {
-					InvalidTransaction::Stale
-				} else {
-					InvalidTransaction::Future
+			if cfg!(feature = "tracing") {
+				// skip check when enable tracing feature
+			} else {
+				if self.nonce != evm_nonce {
+					return Err(if self.nonce < evm_nonce {
+						InvalidTransaction::Stale
+					} else {
+						InvalidTransaction::Future
+					}
+					.into());
 				}
-				.into());
 			}
 		} else if self.nonce != account.nonce {
 			return Err(if self.nonce < account.nonce {
@@ -158,9 +161,12 @@ where
 				.map(|x| x.nonce)
 				.unwrap_or_default();
 
-			#[cfg(not(feature = "tracing"))]
-			if self.nonce < evm_nonce {
-				return InvalidTransaction::Stale.into();
+			if cfg!(feature = "tracing") {
+				// skip check when enable tracing feature
+			} else {
+				if self.nonce < evm_nonce {
+					return InvalidTransaction::Stale.into();
+				}
 			}
 
 			let provides = vec![Encode::encode(&(address, self.nonce))];

runtime/integration-tests/src/evm.rs

@@ -816,7 +816,8 @@ fn transaction_payment_module_works_with_evm_contract() {
 	let dollar = dollar(NATIVE_CURRENCY);
 	let alice_evm_account = MockAddressMapping::get_account_id(&alice_evm_addr());
 	let ed = NativeTokenExistentialDeposit::get(); // 100_000_000_000
-											   // new account
+
+	// new account
 	let empty_account = AccountId::new([1u8; 32]);
 	let empty_address = H160::from_slice(&[1u8; 20]);
 	let empty_address_account = MockAddressMapping::get_account_id(&empty_address);

runtime/karura/src/lib.rs

@@ -2560,9 +2560,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				access_list,
 				valid_until,
 			}) => {
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
-					return Err(InvalidTransaction::Stale);
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 				}
 
 				let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone();
@@ -2606,8 +2609,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				let (tip, valid_until) =
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 					return Err(InvalidTransaction::Stale);
 				}
 

runtime/mandala/src/lib.rs

@@ -1919,9 +1919,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				access_list,
 				valid_until,
 			}) => {
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
-					return Err(InvalidTransaction::Stale);
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 				}
 
 				let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone();
@@ -1965,9 +1968,12 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				let (tip, valid_until) =
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
-				#[cfg(not(feature = "tracing"))]
 				if System::block_number() > valid_until {
-					return Err(InvalidTransaction::Stale);
+					if cfg!(feature = "tracing") {
+						// skip check when enable tracing feature
+					} else {
+						return Err(InvalidTransaction::Stale);
+					}
 				}
 
 				let (_, _, _, _, mortality, check_nonce, _, _, charge) = extra.clone();