Skip check nonce and valid when enable the tracing feature (#2778)

* skip check nonce and valid when enable the tracing feature * update feature and fmt * fix clippy * update * Apply suggestions
AcalaNetwork · Jul 23, 2024 · c224c18 · c224c18
1 parent 33c1601
commit c224c18
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 21 deletions.
diff --git a/ecosystem-modules/stable-asset b/ecosystem-modules/stable-asset
diff --git a/evm-tests b/evm-tests
diff --git a/modules/transaction-payment/src/lib.rs b/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
 						);

diff --git a/node/service/src/chain_spec/mandala.rs b/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,

diff --git a/runtime/acala/Cargo.toml b/runtime/acala/Cargo.toml
@@ -415,4 +415,4 @@ 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"]
+tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
diff --git a/runtime/acala/src/lib.rs b/runtime/acala/src/lib.rs
@@ -2535,7 +2535,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				valid_until,
 			}) => {
 				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,7 +2584,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
 				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();

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
@@ -179,3 +179,4 @@ wasm-bench = [
 runtime-benchmarks = [
 	"orml-oracle/runtime-benchmarks"
 ]
+tracing = []
diff --git a/runtime/common/src/check_nonce.rs b/runtime/common/src/check_nonce.rs
@@ -120,7 +120,10 @@ where
 			let evm_nonce = module_evm::Accounts::<T>::get(address)
 				.map(|x| x.nonce)
 				.unwrap_or_default();
-			if self.nonce != evm_nonce {
+
+			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 {
@@ -155,7 +158,10 @@ where
 			let evm_nonce = module_evm::Accounts::<T>::get(address)
 				.map(|x| x.nonce)
 				.unwrap_or_default();
-			if self.nonce < evm_nonce {
+
+			if cfg!(feature = "tracing") {
+				// skip check when enable tracing feature
+			} else if self.nonce < evm_nonce {
 				return InvalidTransaction::Stale.into();
 			}
 

diff --git a/runtime/integration-tests/src/evm.rs b/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);

diff --git a/runtime/karura/Cargo.toml b/runtime/karura/Cargo.toml
@@ -423,4 +423,4 @@ 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"]
+tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
diff --git a/runtime/karura/src/lib.rs b/runtime/karura/src/lib.rs
@@ -2561,7 +2561,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				valid_until,
 			}) => {
 				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,7 +2610,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
 				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();

diff --git a/runtime/mandala/Cargo.toml b/runtime/mandala/Cargo.toml
@@ -447,4 +447,4 @@ 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"]
+tracing = ["module-evm/tracing", "module-evm-rpc-runtime-api/tracing", "runtime-common/tracing"]
diff --git a/runtime/mandala/src/lib.rs b/runtime/mandala/src/lib.rs
@@ -1920,7 +1920,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 				valid_until,
 			}) => {
 				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,7 +1969,11 @@ impl Convert<(RuntimeCall, SignedExtra), Result<(EthereumTransactionMessage, Sig
 					decode_gas_price(gas_price, gas_limit, TxFeePerGasV2::get()).ok_or(InvalidTransaction::Stale)?;
 
 				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();