tweak logs

substrate/frame/revive/rpc/examples/js/src/lib.ts

@@ -50,7 +50,6 @@ if (geth) {
 	child.unref()
 	await new Promise((resolve) => setTimeout(resolve, 500))
 }
-
 const rpcUrl = proxy
 	? 'http://localhost:8080'
 	: westend

substrate/frame/revive/rpc/examples/js/src/piggy-bank.ts

@@ -4,7 +4,7 @@ import { parseEther } from 'viem'
 
 const hash = await walletClient.deployContract({
 	abi: PiggyBankAbi,
-	bytecode: getByteCode('piggyBank'),
+	bytecode: getByteCode('PiggyBank'),
 })
 const deployReceipt = await walletClient.waitForTransactionReceipt({ hash })
 const contractAddress = deployReceipt.contractAddress
@@ -31,9 +31,7 @@ assert(contractAddress, 'Contract address should be set')
 		value: parseEther('10'),
 	})
 
-	request.nonce = 0
 	const hash = await walletClient.writeContract(request)
-
 	const receipt = await walletClient.waitForTransactionReceipt({ hash })
 	console.log(`Deposit receipt: ${receipt.status}`)
 }

substrate/frame/revive/rpc/src/client.rs

@@ -710,6 +710,7 @@ impl Client {
 			number: header.number.into(),
 			timestamp: timestamp.into(),
 			difficulty: Some(0u32.into()),
+			base_fee_per_gas: Some(crate::GAS_PRICE.into()),
 			gas_limit,
 			gas_used,
 			receipts_root: extrinsics_root,

substrate/frame/revive/src/evm/api/rpc_types.rs

@@ -192,7 +192,11 @@ impl GenericTransaction {
 				value: Some(tx.value),
 				to: Some(tx.to),
 				gas: Some(tx.gas),
-				gas_price: Some(tx.max_fee_per_blob_gas),
+				gas_price: Some(
+					U256::from(crate::GAS_PRICE)
+						.saturating_add(tx.max_priority_fee_per_gas)
+						.max(tx.max_fee_per_blob_gas),
+				),
 				access_list: Some(tx.access_list),
 				blob_versioned_hashes: tx.blob_versioned_hashes,
 				max_fee_per_blob_gas: Some(tx.max_fee_per_blob_gas),
@@ -209,7 +213,11 @@ impl GenericTransaction {
 				value: Some(tx.value),
 				to: tx.to,
 				gas: Some(tx.gas),
-				gas_price: Some(tx.gas_price),
+				gas_price: Some(
+					U256::from(crate::GAS_PRICE)
+						.saturating_add(tx.max_priority_fee_per_gas)
+						.max(tx.max_fee_per_gas),
+				),
 				access_list: Some(tx.access_list),
 				max_fee_per_gas: Some(tx.max_fee_per_gas),
 				max_priority_fee_per_gas: Some(tx.max_priority_fee_per_gas),

substrate/frame/revive/src/evm/runtime.rs

@@ -50,11 +50,11 @@ type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
 /// This let us calculate the gas estimate for a transaction with the formula:
 /// `estimate_gas = substrate_fee / gas_price`.
 ///
-/// The chosen constant value is balanced to ensure:
-/// - It is not too high, allowing components (ref_time, proof_size, and deposit) to be encoded in
-///   the lower digits of the gas value.
-/// - It is not too low, enabling users to adjust the gas price to define a tip.
-pub const GAS_PRICE: u32 = 1_000u32;
+/// The chosen constant value is:
+/// - Not too high, ensuring the gas value is large enough (at least 7 digits) to encode the
+///   ref_time, proof_size, and deposit into the less significant (6 lower) digits of the gas value.
+/// - Not too low, enabling users to adjust the gas price to define a tip.
+pub const GAS_PRICE: u32 = 100_000u32;
 
 /// Convert a `Balance` into a gas value, using the fixed `GAS_PRICE`.
 /// The gas is calculated as `balance / GAS_PRICE`, rounded up to the nearest integer.
@@ -401,7 +401,7 @@ pub trait EthExtra {
 				Default::default(),
 			)
 			.into();
-		log::debug!(target: LOG_TARGET, "try_into_checked_extrinsic: encoded_len: {encoded_len:?} actual_fee: {actual_fee:?} eth_fee: {eth_fee:?}");
+		log::debug!(target: LOG_TARGET, "try_into_checked_extrinsic: gas_price: {gas_price:?}, encoded_len: {encoded_len:?} actual_fee: {actual_fee:?} eth_fee: {eth_fee:?}");
 
 		// The fees from the Ethereum transaction should be greater or equal to the actual fees paid
 		// by the account.
@@ -411,12 +411,12 @@ pub trait EthExtra {
 		}
 
 		if eth_fee_no_tip > actual_fee.saturating_mul(2u32.into()) {
-			log::debug!(target: LOG_TARGET, "actual fees {actual_fee:?} too high, base eth fees: {eth_fee_no_tip:?}");
+			log::debug!(target: LOG_TARGET, "actual fees: {actual_fee:?} too high, base eth fees: {eth_fee_no_tip:?}");
 			return Err(InvalidTransaction::Call.into())
 		}
 
 		let tip = eth_fee.saturating_sub(eth_fee_no_tip);
-		log::debug!(target: LOG_TARGET, "Created checked Ethereum transaction with nonce {nonce:?} and tip: {tip:?}");
+		log::debug!(target: LOG_TARGET, "Created checked Ethereum transaction with nonce: {nonce:?} and tip: {tip:?}");
 		Ok(CheckedExtrinsic {
 			format: ExtrinsicFormat::Signed(signer.into(), Self::get_eth_extension(nonce, tip)),
 			function,

substrate/frame/revive/src/lib.rs

@@ -1420,19 +1420,17 @@ where
 				0u32.into(),
 			)
 			.into();
-			let eth_gas = gas_from_fee(fee);
+			let raw_eth_gas = gas_from_fee(fee);
 			let eth_gas =
-				T::EthGasEncoder::encode(eth_gas, result.gas_required, result.storage_deposit);
+				T::EthGasEncoder::encode(raw_eth_gas, result.gas_required, result.storage_deposit);
 
 			if eth_gas == result.eth_gas {
-				log::trace!(target: LOG_TARGET, "bare_eth_call: encoded_len: {encoded_len:?} eth_gas: {eth_gas:?}");
+				log::debug!(target: LOG_TARGET, "bare_eth_call: raw_eth_gas: {raw_eth_gas:?} eth_gas: {eth_gas:?}");
 				break;
 			}
 			result.eth_gas = eth_gas;
 			tx.gas = Some(eth_gas.into());
-			log::debug!(target: LOG_TARGET, "Adjusting Eth gas to: {eth_gas:?}");
 		}
-
 		Ok(result)
 	}