Add debug info

darwinia-network · Nov 1, 2023 · 56f56f9 · 56f56f9
1 parent dab26a6
commit 56f56f9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/client/rpc/src/eth/execute.rs b/client/rpc/src/eth/execute.rs
@@ -866,8 +866,8 @@ where
 						}
 						previous_highest = highest;
 					}
-					// ExitReason::Revert(_)
-					// | ExitReason::Error(ExitError::InvalidCode(_)) => {
+					ExitReason::Revert(_)
+					| ExitReason::Error(ExitError::InvalidCode(_)) |
 					ExitReason::Error(ExitError::OutOfGas) => {
 						lowest = mid;
 					}

diff --git a/frame/evm/src/runner/stack.rs b/frame/evm/src/runner/stack.rs
@@ -996,8 +996,10 @@ where
 							.try_record_proof_size_or_fail(ACCOUNT_CODES_METADATA_PROOF_SIZE)?;
 
 						if let Some(meta) = <AccountCodesMetadata<T>>::get(address) {
+							frame_support::log::debug!(target: "bear", "bear: --- record_external_operation, hit metadata: {:?}",  meta.size);
 							weight_info.try_record_proof_size_or_fail(meta.size)?;
 						} else {
+							frame_support::log::debug!(target: "bear", "bear: --- record_external_operation, doesn't hit metadata");
 							// If it does not exist, try to record `create_contract_limit` first.
 							weight_info.try_record_proof_size_or_fail(size_limit)?;
 							let meta = Pallet::<T>::account_code_metadata(address);
@@ -1025,7 +1027,7 @@ where
 		_gas_cost: GasCost,
 		target: evm::gasometer::StorageTarget,
 	) -> Result<(), ExitError> {
-		frame_support::log::debug!(target: "bear", "bear: --- record_external_dynamic_opcode_cost, op: {:?}, target: {:?}", opcode, target);
+		// frame_support::log::debug!(target: "bear", "bear: --- record_external_dynamic_opcode_cost, op: {:?}, target: {:?}", opcode, target);
 
 		// If account code or storage slot is in the overlay it is already accounted for and early exit
 		let mut accessed_storage: Option<AccessedStorage> = match target {
@@ -1095,12 +1097,18 @@ where
 			weight_info.try_record_proof_size_or_fail(base_cost)?;
 
 			if let Some(meta) = <AccountCodesMetadata<T>>::get(address) {
+				frame_support::log::debug!(target: "bear", "bear: --- record_external_dynamic_opcode_cost, hit metadata: {:?}",  meta.size);
 				weight_info.try_record_proof_size_or_fail(meta.size)?;
 			} else {
+				frame_support::log::debug!(target: "bear", "bear: --- record_external_dynamic_opcode_cost, doesn't hit metadata");
 				// If it does not exist, try to record `create_contract_limit` first.
+
+				// weight_info.try_record_proof_size_or_fail(self.proof_size_left)?;
 				weight_info.try_record_proof_size_or_fail(size_limit)?;
+
 				let meta = Pallet::<T>::account_code_metadata(address);
 				let actual_size = meta.size;
+
 				// Refund if applies
 				weight_info.refund_proof_size(size_limit.saturating_sub(actual_size));
 			}

diff --git a/primitives/evm/src/lib.rs b/primitives/evm/src/lib.rs
@@ -109,7 +109,7 @@ impl WeightInfo {
 		})
 	}
 	fn try_consume(&self, cost: u64, limit: u64, usage: u64) -> Result<u64, ExitError> {
-		frame_support::log::debug!(target: "bear", "bear: --- try_consume, original_usage: {:?}, cost: {:?}, after that: {:?}", usage, cost, usage + cost);
+		// frame_support::log::debug!(target: "bear", "bear: --- try_consume, original_usage: {:?}, cost: {:?}, after that: {:?}", usage, cost, usage + cost);
 		let usage = usage.checked_add(cost).ok_or(ExitError::OutOfGas)?;
 		if usage > limit {
 			frame_support::log::debug!(target: "bear", "bear: --- out of gas at try_consume, usage: {:?}, limit: {:?}", usage, limit);