skip check nonce and valid when enable the tracing feature

AcalaNetwork · Jul 23, 2024 · 0b69378 · 0b69378
1 parent 33c1601
commit 0b69378
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 3 deletions.
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
@@ -2534,6 +2534,7 @@ 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);
 				}
@@ -2579,6 +2580,7 @@ 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);
 				}

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,6 +120,8 @@ where
 			let evm_nonce = module_evm::Accounts::<T>::get(address)
 				.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
@@ -155,6 +157,8 @@ where
 			let evm_nonce = module_evm::Accounts::<T>::get(address)
 				.map(|x| x.nonce)
 				.unwrap_or_default();
+
+			#[cfg(not(feature = "tracing"))]
 			if self.nonce < evm_nonce {
 				return InvalidTransaction::Stale.into();
 			}

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
@@ -2560,6 +2560,7 @@ 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);
 				}
@@ -2605,6 +2606,7 @@ 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);
 				}

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
@@ -1919,6 +1919,7 @@ 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);
 				}
@@ -1964,6 +1965,7 @@ 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);
 				}