DEBUG: log the original validation error & one more place for Undefined

gluwa · Jan 30, 2025 · 950862c · 950862c
1 parent bb47ba7
commit 950862c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/frame/ethereum/Cargo.toml b/frame/ethereum/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 ethereum = { workspace = true, features = ["with-codec"] }
 ethereum-types = { workspace = true }
 evm = { workspace = true, features = ["with-codec"] }
+log = { workspace = true }
 scale-codec = { package = "parity-scale-codec", workspace = true }
 scale-info = { workspace = true }
 # Substrate
@@ -47,6 +48,7 @@ std = [
 	"ethereum/std",
 	"evm/std",
 	"ethereum-types/std",
+	"log/std",
 	"rlp/std",
 	"scale-codec/std",
 	"scale-info/std",

diff --git a/frame/ethereum/src/lib.rs b/frame/ethereum/src/lib.rs
@@ -676,7 +676,7 @@ impl<T: Config> Pallet<T> {
 		};
 
 		Pending::<T>::append((transaction, status, receipt));
-
+                log::info!("**** FRONTIER, apply_validated_transaction: before ethereum.Executed event");
 		Self::deposit_event(Event::Executed {
 			from: source,
 			to: dest.unwrap_or_default(),
@@ -985,6 +985,7 @@ pub struct InvalidTransactionWrapper(InvalidTransaction);
 
 impl From<TransactionValidationError> for InvalidTransactionWrapper {
 	fn from(validation_error: TransactionValidationError) -> Self {
+	        log::info!("*** FRONTIER, ethereum, validation_error={:?}", validation_error);
 		match validation_error {
 			TransactionValidationError::GasLimitTooLow => InvalidTransactionWrapper(
 				InvalidTransaction::Custom(TransactionValidationError::GasLimitTooLow as u8),

diff --git a/frame/evm/src/lib.rs b/frame/evm/src/lib.rs
@@ -255,9 +255,11 @@ pub mod pallet {
 
 			match info.exit_reason {
 				ExitReason::Succeed(_) => {
+				        log::info!("***** FRONTIER evm, before evm.Executed event");
 					Pallet::<T>::deposit_event(Event::<T>::Executed { address: target });
 				}
 				_ => {
+				        log::info!("***** FRONTIER evm, before evm.ExecutedFailed event");
 					Pallet::<T>::deposit_event(Event::<T>::ExecutedFailed { address: target });
 				}
 			};
@@ -334,6 +336,7 @@ pub mod pallet {
 					value: create_address,
 					..
 				} => {
+				        log::info!("***** FRONTIER evm, before evm.Created event");
 					Pallet::<T>::deposit_event(Event::<T>::Created {
 						address: create_address,
 					});
@@ -343,6 +346,7 @@ pub mod pallet {
 					value: create_address,
 					..
 				} => {
+				        log::info!("***** FRONTIER evm, before evm.CreatedFailed event");
 					Pallet::<T>::deposit_event(Event::<T>::CreatedFailed {
 						address: create_address,
 					});
@@ -422,6 +426,7 @@ pub mod pallet {
 					value: create_address,
 					..
 				} => {
+				        log::info!("***** FRONTIER evm, before evm.Created 2 event");
 					Pallet::<T>::deposit_event(Event::<T>::Created {
 						address: create_address,
 					});
@@ -431,6 +436,7 @@ pub mod pallet {
 					value: create_address,
 					..
 				} => {
+				        log::info!("***** FRONTIER evm, before evm.CreatedFailed 2 event");
 					Pallet::<T>::deposit_event(Event::<T>::CreatedFailed {
 						address: create_address,
 					});
@@ -498,6 +504,7 @@ pub mod pallet {
 
 	impl<T> From<TransactionValidationError> for Error<T> {
 		fn from(validation_error: TransactionValidationError) -> Self {
+		        log::info!("**** FRONTIER, frame/evm/src/lib.rs validation_error={:?}", validation_error);
 			match validation_error {
 				TransactionValidationError::GasLimitTooLow => Error::<T>::GasLimitTooLow,
 				TransactionValidationError::GasLimitTooHigh => Error::<T>::GasLimitTooHigh,

diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs
@@ -152,12 +152,19 @@ where
 		) -> (ExitReason, R),
 		R: Default,
 	{
+		log::info!("****** FRONTIER: running execute_inner: weight_limit={:?}, proof_size_base_cost={:?}", weight_limit, proof_size_base_cost);
+		log::info!("****** FRONTIER: running execute_inner: weight_limit.proof_size={:?}", weight_limit.unwrap().proof_size());
+
 		// Used to record the external costs in the evm through the StackState implementation
 		let maybe_weight_info =
 			WeightInfo::new_from_weight_limit(weight_limit, proof_size_base_cost).map_err(
-				|_| RunnerError {
-					error: Error::<T>::Undefined,
-					weight,
+				|err| {
+				        log::info!("**** FRONTIER, execute_inner. ERROR={:?}", err);
+
+				        RunnerError {
+					    error: Error::<T>::Undefined,
+					    weight,
+				        }
 				},
 			)?;
 		// The precompile check is only used for transactional invocations. However, here we always
@@ -330,6 +337,7 @@ where
 				log.data.len(),
 				log.data
 			);
+			log::info!("**** FRONTIER, evm, before evm.Log event");
 			Pallet::<T>::deposit_event(Event::<T>::Log {
 				log: Log {
 					address: log.address,