feat: scale gasprice by 1e12 (#663)

Closes #629 

changes all relevant code to calculate transaction cost as `(gas *
gas_price).div_ceil(1e12)`

Author: klkvr

Cargo.lock

@@ -32,7 +32,7 @@
     "pragueTime": 0,
     "adagioTime": 0
   },
-  "baseFeePerGas": "0x2c",
+  "baseFeePerGas": "0x28048c5ec000",
   "gasLimit": 50000000,
   "alloc": {
     "0x7702c00000000000000000000000000000000000": {

crates/chainspec/src/genesis/adagio.json

@@ -16,7 +16,7 @@ use std::sync::{Arc, LazyLock};
 use tempo_contracts::DEFAULT_7702_DELEGATE_ADDRESS;
 use tempo_primitives::TempoHeader;
 
-pub const TEMPO_BASE_FEE: u64 = 44;
+pub const TEMPO_BASE_FEE: u64 = 44_000_000_000_000;
 
 /// Tempo genesis info extracted from genesis extra_fields
 #[derive(Debug, Clone, Default, serde::Deserialize, serde::Serialize)]

crates/chainspec/src/spec.rs

@@ -13,7 +13,6 @@ workspace = true
 [dependencies]
 tempo-alloy = { workspace = true, features = ["tempo-compat"] }
 tempo-evm = { workspace = true, features = ["rpc"] }
-tempo-revm.workspace = true
 tempo-transaction-pool.workspace = true
 tempo-faucet.workspace = true
 tempo-chainspec.workspace = true

crates/node/Cargo.toml

@@ -357,7 +357,7 @@ where
             .with_max_tx_input_bytes(ctx.config().txpool.max_tx_input_bytes)
             .kzg_settings(ctx.kzg_settings()?)
             .with_local_transactions_config(pool_config.local_transactions_config.clone())
-            .set_tx_fee_cap(ctx.config().rpc.rpc_tx_fee_cap)
+            .set_tx_fee_cap(0)
             .with_max_tx_gas_limit(ctx.config().txpool.max_tx_gas_limit)
             .disable_balance_check()
             .with_minimum_priority_fee(ctx.config().txpool.minimum_priority_fee)

crates/node/src/node.rs

@@ -16,7 +16,6 @@ pub use token::{TempoToken, TempoTokenApiServer};
 
 use crate::node::TempoNode;
 use alloy::{consensus::TxReceipt, primitives::U256};
-use alloy_primitives::Address;
 use reth_ethereum::tasks::{
     TaskSpawner,
     pool::{BlockingTaskGuard, BlockingTaskPool},
@@ -30,7 +29,7 @@ use reth_node_builder::{
     NodeAdapter,
     rpc::{EthApiBuilder, EthApiCtx},
 };
-use reth_provider::ChainSpecProvider;
+use reth_provider::{ChainSpecProvider, ProviderError};
 use reth_rpc::{DynRpcConverter, eth::EthApi};
 use reth_rpc_eth_api::{
     EthApiTypes, RpcConverter, RpcNodeCore, RpcNodeCoreExt,
@@ -47,8 +46,7 @@ use reth_rpc_eth_types::{
 use tempo_alloy::TempoNetwork;
 use tempo_evm::TempoEvmConfig;
 use tempo_precompiles::provider::TIPFeeDatabaseExt;
-use tempo_primitives::TempoReceipt;
-use tempo_revm::TempoTxEnv;
+use tempo_primitives::{TEMPO_GAS_PRICE_SCALING_FACTOR, TempoReceipt};
 use tokio::sync::Mutex;
 
 /// Tempo `Eth` API implementation.
@@ -74,24 +72,6 @@ impl<N: FullNodeTypes<Types = TempoNode>> TempoEthApi<N> {
     ) -> Self {
         Self { inner: eth_api }
     }
-
-    /// Returns the feeToken balance of the tx caller in the token's native decimals
-    pub fn caller_fee_token_allowance<DB>(
-        &self,
-        db: &mut DB,
-        env: &TempoTxEnv,
-        validator: Address,
-    ) -> Result<U256, EthApiError>
-    where
-        DB: Database<Error: Into<EthApiError>>,
-    {
-        db.get_fee_token_balance(
-            env.fee_payer().map_err(EVMError::<DB::Error, _>::from)?,
-            validator,
-            env.fee_token,
-        )
-        .map_err(Into::into)
-    }
 }
 
 impl<N: FullNodeTypes<Types = TempoNode>> EthApiTypes for TempoEthApi<N> {
@@ -230,10 +210,19 @@ impl<N: FullNodeTypes<Types = TempoNode>> Call for TempoEthApi<N> {
         evm_env: &EvmEnvFor<Self::Evm>,
         tx_env: &TxEnvFor<Self::Evm>,
     ) -> Result<u64, Self::Error> {
-        let fee_token_balance =
-            self.caller_fee_token_allowance(&mut db, tx_env, evm_env.block_env.beneficiary)?;
+        let fee_token_balance = db
+            .get_fee_token_balance(
+                tx_env
+                    .fee_payer()
+                    .map_err(EVMError::<ProviderError, _>::from)?,
+                evm_env.block_env.beneficiary,
+                tx_env.fee_token,
+            )
+            .map_err(Into::into)?;
 
         Ok(fee_token_balance
+            // multiply by the scaling factor
+            .saturating_mul(TEMPO_GAS_PRICE_SCALING_FACTOR)
             // Calculate the amount of gas the caller can afford with the specified gas price.
             .checked_div(U256::from(tx_env.inner.gas_price))
             // This will be 0 if gas price is 0. It is fine, because we check it before.

crates/node/src/rpc/mod.rs

@@ -334,5 +334,5 @@
       }
     }
   },
-  "baseFeePerGas": "0x2c"
+  "baseFeePerGas": "0x28048c5ec000"
 }

crates/node/tests/assets/base-fee-test.json

@@ -1504,5 +1504,5 @@
       }
     }
   },
-  "baseFeePerGas": "0x2c"
+  "baseFeePerGas": "0x28048c5ec000"
 }

crates/node/tests/assets/test-genesis.json

@@ -1,14 +1,18 @@
 use alloy::{
+    consensus::{SignableTransaction, TxEip1559, TxEnvelope},
     network::EthereumWallet,
     providers::{Provider, ProviderBuilder},
     signers::local::MnemonicBuilder,
 };
-use alloy_eips::BlockNumberOrTag;
+use alloy_eips::{BlockNumberOrTag, Encodable2718};
+use alloy_network::TxSignerSync;
+use alloy_primitives::Address;
 use alloy_rpc_types_engine::ForkchoiceState;
-use reth_e2e_test_utils::{transaction::TransactionTestContext, wallet::Wallet};
+use reth_e2e_test_utils::wallet::Wallet;
 use reth_node_api::EngineApiMessageVersion;
 use reth_node_metrics::recorder::install_prometheus_recorder;
 use reth_primitives_traits::AlloyBlockHeader as _;
+use tempo_chainspec::spec::TEMPO_BASE_FEE;
 
 /// Test that verifies backfill sync works correctly.
 ///
@@ -65,7 +69,20 @@ async fn test_backfill_sync() -> eyre::Result<()> {
         let wallet_signer = wallets[i as usize].clone();
 
         // Create a new transaction for this block
-        let raw_tx = TransactionTestContext::transfer_tx_bytes(chain_id, wallet_signer).await;
+        let raw_tx = {
+            let mut tx = TxEip1559 {
+                chain_id,
+                gas_limit: 21000,
+                to: Address::ZERO.into(),
+                max_fee_per_gas: TEMPO_BASE_FEE as u128,
+                max_priority_fee_per_gas: TEMPO_BASE_FEE as u128,
+                ..Default::default()
+            };
+            let signature = wallet_signer.sign_transaction_sync(&mut tx).unwrap();
+            TxEnvelope::Eip1559(tx.into_signed(signature))
+                .encoded_2718()
+                .into()
+        };
 
         // Send the transaction
         let tx_hash = node1.rpc.inject_tx(raw_tx).await?;

crates/node/tests/it/backfill.rs

@@ -1,16 +1,16 @@
 use alloy::{
-    consensus::Transaction,
+    consensus::{SignableTransaction, Transaction, TxEip1559, TxEnvelope},
     network::{EthereumWallet, TransactionBuilder},
-    primitives::U256,
+    primitives::{Address, U256},
     providers::{Provider, ProviderBuilder},
     signers::local::MnemonicBuilder,
     sol_types::SolEvent,
 };
 use alloy_eips::eip2718::Encodable2718;
-use alloy_network::Ethereum;
+use alloy_network::{Ethereum, TxSignerSync};
 use alloy_primitives::Bytes;
 use alloy_rpc_types_eth::TransactionRequest;
-use reth_e2e_test_utils::transaction::TransactionTestContext;
+use tempo_chainspec::spec::TEMPO_BASE_FEE;
 use tempo_contracts::precompiles::{IRolesAuth, ITIP20, ITIP20Factory};
 use tempo_node::node::TempoNode;
 use tempo_precompiles::{
@@ -40,9 +40,10 @@ where
             tx_req.nonce = Some(nonce);
             tx_req.chain_id = Some(chain_id);
             tx_req.gas = tx_req.gas.or(Some(200_000));
-            tx_req.max_fee_per_gas = tx_req.max_fee_per_gas.or(Some(20e9 as u128));
-            tx_req.max_priority_fee_per_gas =
-                tx_req.max_priority_fee_per_gas.or(Some(20e9 as u128));
+            tx_req.max_fee_per_gas = tx_req.max_fee_per_gas.or(Some(TEMPO_BASE_FEE as u128));
+            tx_req.max_priority_fee_per_gas = tx_req
+                .max_priority_fee_per_gas
+                .or(Some(TEMPO_BASE_FEE as u128));
 
             let signed =
                 <TransactionRequest as TransactionBuilder<Ethereum>>::build(tx_req, &signer_clone)
@@ -113,8 +114,23 @@ async fn inject_non_payment_txs(
         let wallet_signer = MnemonicBuilder::from_phrase(crate::utils::TEST_MNEMONIC)
             .index(start_index + i as u32)?
             .build()?;
-        let raw_tx = TransactionTestContext::transfer_tx_bytes(chain_id, wallet_signer).await;
-        node.rpc.inject_tx(raw_tx).await?;
+        let mut tx = TxEip1559 {
+            chain_id,
+            gas_limit: 21000,
+            to: Address::ZERO.into(),
+            max_fee_per_gas: TEMPO_BASE_FEE as u128,
+            max_priority_fee_per_gas: TEMPO_BASE_FEE as u128,
+            ..Default::default()
+        };
+        let signature = wallet_signer.sign_transaction_sync(&mut tx).unwrap();
+
+        node.rpc
+            .inject_tx(
+                TxEnvelope::Eip1559(tx.into_signed(signature))
+                    .encoded_2718()
+                    .into(),
+            )
+            .await?;
     }
     Ok(())
 }
@@ -140,8 +156,8 @@ where
         tx_request.nonce = Some(current_nonce + i as u64);
         tx_request.chain_id = Some(chain_id);
         tx_request.gas = Some(100_000);
-        tx_request.max_fee_per_gas = Some(20e9 as u128);
-        tx_request.max_priority_fee_per_gas = Some(20e9 as u128);
+        tx_request.max_fee_per_gas = Some(TEMPO_BASE_FEE as u128);
+        tx_request.max_priority_fee_per_gas = Some(TEMPO_BASE_FEE as u128);
 
         let signed_tx =
             <TransactionRequest as TransactionBuilder<Ethereum>>::build(tx_request, &signer)
@@ -336,7 +352,20 @@ async fn test_block_building_only_non_payment_txs() -> eyre::Result<()> {
         .with_chain_id(chain_id)
         .wallet_gen();
     for wallet_signer in wallets {
-        let raw_tx = TransactionTestContext::transfer_tx_bytes(chain_id, wallet_signer).await;
+        let raw_tx = {
+            let mut tx = TxEip1559 {
+                chain_id,
+                gas_limit: 21000,
+                to: Address::ZERO.into(),
+                max_fee_per_gas: TEMPO_BASE_FEE as u128,
+                max_priority_fee_per_gas: TEMPO_BASE_FEE as u128,
+                ..Default::default()
+            };
+            let signature = wallet_signer.sign_transaction_sync(&mut tx).unwrap();
+            TxEnvelope::Eip1559(tx.into_signed(signature))
+                .encoded_2718()
+                .into()
+        };
         setup.node.rpc.inject_tx(raw_tx).await?;
     }