Update frontier to address pov underestimations

runtime/common/src/apis.rs

@@ -340,22 +340,23 @@ macro_rules! impl_runtime_apis_plus_common {
 							let without_base_extrinsic_weight = true;
 
 
-							// Estimated encoded transaction size must be based on the heaviest transaction
-							// type (EIP1559Transaction) to be compatible with all transaction types.
+							// Estimated encoded transaction size must be based on the transaction
+							// type (TransactionData) to be compatible with all transaction types.
+							// TODO: remove, since we will get rid of base_cost
 							let mut estimated_transaction_len = data.len() +
-							// pallet ethereum index: 1
-							// transact call index: 1
-							// Transaction enum variant: 1
-							// chain_id 8 bytes
-							// nonce: 32
-							// max_priority_fee_per_gas: 32
-							// max_fee_per_gas: 32
-							// gas_limit: 32
-							// action: 21 (enum varianrt + call address)
-							// value: 32
-							// access_list: 1 (empty vec size)
-							// 65 bytes signature
-							258;
+								// pallet ethereum index: 1
+								// transact call index: 1
+								// Transaction enum variant: 1
+								// chain_id 8 bytes
+								// nonce: 32
+								// max_priority_fee_per_gas: 32
+								// max_fee_per_gas: 32
+								// gas_limit: 32
+								// action: 21 (enum varianrt + call address)
+								// value: 32
+								// access_list: 1 (empty vec size)
+								// 65 bytes signature
+								258;
 
 							if access_list.is_some() {
 								estimated_transaction_len += access_list.encoded_size();
@@ -475,8 +476,9 @@ macro_rules! impl_runtime_apis_plus_common {
 					let is_transactional = false;
 					let validate = true;
 
-					// Estimated encoded transaction size must be based on the heaviest transaction
-					// type (EIP1559Transaction) to be compatible with all transaction types.
+					// Estimated encoded transaction size must be based on the transaction
+					// type (TransactionData) to be compatible with all transaction types.
+					// TODO: remove, since we will get rid of base_cost
 					let mut estimated_transaction_len = data.len() +
 						// pallet ethereum index: 1
 						// transact call index: 1

test/helpers/block.ts

@@ -193,15 +193,29 @@ export const verifyBlockFees = async (
                   gasFee = ethTxWrapper.asEip1559.maxFeePerGas.toBigInt();
                 }
 
+                const hash = events
+                  .find((event) => event.section === "ethereum" && event.method === "Executed")!
+                  .data[2].toHex();
+                await context.viem("public").getTransactionReceipt({ hash });
                 let effectiveTipPerGas = gasFee - baseFeePerGas;
                 if (effectiveTipPerGas > priorityFee) {
                   effectiveTipPerGas = priorityFee;
                 }
 
                 // Calculate the fees paid for the base fee and tip fee independently.
                 // Only the base fee is subject to the split between burn and treasury.
-                const baseFeesPaid = gasUsed * baseFeePerGas;
-                const tipAsFeesPaid = gasUsed * effectiveTipPerGas;
+                let baseFeesPaid = gasUsed * baseFeePerGas;
+                let tipAsFeesPaid = gasUsed * effectiveTipPerGas;
+                const actualPaidFees = (
+                  events.find(
+                    (event) => event.section === "balances" && event.method === "Withdraw"
+                  )!.data[1] as u128
+                ).toBigInt();
+                if (actualPaidFees < baseFeesPaid + tipAsFeesPaid) {
+                  baseFeesPaid = actualPaidFees < baseFeesPaid ? actualPaidFees : baseFeesPaid;
+                  tipAsFeesPaid =
+                    actualPaidFees < baseFeesPaid ? 0n : actualPaidFees - baseFeesPaid;
+                }
 
                 const { burnt: baseFeePortionsBurnt } = calculateFeePortions(
                   feesTreasuryProportion,

test/suites/dev/moonbase/test-parameters/test-parameters-runtime-FeesTreasuryProportion.ts

@@ -1,4 +1,4 @@
-import { describeSuite, expect, extractInfo, TransactionTypes } from "@moonwall/cli";
+import { describeSuite, expect, TransactionTypes } from "@moonwall/cli";
 import {
   alith,
   ALITH_ADDRESS,
@@ -172,16 +172,29 @@ describeSuite({
               const treasuryIncrease = balAfter - balBefore;
               const issuanceDecrease = issuanceBefore - issuanceAfter;
               const collatorIncrease = collatorBalAfter - collatorBalBefore;
+              const fee = extractFee(result?.events)!.amount.toBigInt();
+              const min = (a: bigint, b: bigint) => (a < b ? a : b);
               const tipPaid = withTip
                 ? (() => {
-                    let priorityPerGas = GENESIS_BASE_FEE - baseFee;
-                    if (priorityPerGas > t.priorityFeePerGas) {
-                      priorityPerGas = t.priorityFeePerGas;
+                    const max_fee_per_gas = GENESIS_BASE_FEE;
+                    const max_priority_fee_per_gas = t.priorityFeePerGas;
+                    const actual_priority_fee_per_gas = min(
+                      max_fee_per_gas - baseFee,
+                      max_priority_fee_per_gas
+                    );
+                    const total_fee_per_gas = BigInt(baseFee) + BigInt(actual_priority_fee_per_gas);
+                    const effective_gas = receipt!.gasUsed;
+                    const actual_fee = effective_gas * total_fee_per_gas;
+                    const actual_base_fee = effective_gas * baseFee;
+                    const already_paid = fee;
+
+                    if (already_paid < actual_base_fee) {
+                      return 0n;
                     }
-                    return BigInt(priorityPerGas) * BigInt(receipt!.gasUsed);
+
+                    return actual_fee - actual_base_fee;
                   })()
                 : 0n;
-              const fee = extractFee(result?.events)!.amount.toBigInt();
               const feeWithoutTip = fee - tipPaid;
 
               expect(

test/suites/dev/moonbase/test-precompile/test-precompile-assets-erc20d.ts

@@ -138,7 +138,7 @@ describeSuite({
         });
 
         // Snapshot estimated gas
-        expect(estimatedGas).toMatchInlineSnapshot(`55823n`);
+        expect(estimatedGas).toMatchInlineSnapshot(`56099n`);
 
         // this time we call directly from Baltathar the ERC20 contract
         const directBlock = await context.createBlock(