Merge pull request #104 from weaveVM/dev

merge: dev to main

Author: allnil

Cargo.lock

@@ -61,7 +61,7 @@ pub struct TxPoolArgs {
     pub blob_transaction_price_bump: u128,
 
     /// Max size in bytes of a single transaction allowed to enter the pool
-    #[arg(long = "txpool.max-tx-input-bytes", alias = "txpool.max_tx_input_bytes", default_value_t = DEFAULT_MAX_TX_INPUT_BYTES)]
+    #[arg(long = "txpool.max-tx-input-bytes", alias = "txpool.max_tx_input_bytes", default_value_t = internal_default_max_tx_bytes())]
     pub max_tx_input_bytes: usize,
 
     /// The maximum number of blobs to keep in the in memory blob cache.
@@ -90,6 +90,10 @@ pub struct TxPoolArgs {
     pub new_tx_listener_buffer_size: usize,
 }
 
+fn internal_default_max_tx_bytes() -> usize {
+    *DEFAULT_MAX_TX_INPUT_BYTES
+}
+
 impl Default for TxPoolArgs {
     fn default() -> Self {
         Self {
@@ -104,7 +108,7 @@ impl Default for TxPoolArgs {
             minimal_protocol_basefee: MIN_PROTOCOL_BASE_FEE.load(SeqCst),
             gas_limit: *ETHEREUM_BLOCK_GAS_LIMIT,
             blob_transaction_price_bump: REPLACE_BLOB_PRICE_BUMP,
-            max_tx_input_bytes: DEFAULT_MAX_TX_INPUT_BYTES,
+            max_tx_input_bytes: *DEFAULT_MAX_TX_INPUT_BYTES,
             max_cached_entries: DEFAULT_MAX_CACHED_BLOBS,
             no_locals: false,
             locals: Default::default(),

crates/node/core/src/args/txpool.rs

@@ -1,3 +1,7 @@
+use std::cell::LazyCell;
+use std::env::VarError;
+use reth_primitives::constants::ETHEREUM_BLOCK_GAS_LIMIT;
+
 /// [`TX_SLOT_BYTE_SIZE`] is used to calculate how many data slots a single transaction
 /// takes up based on its byte size. The slots are used as `DoS` protection, ensuring
 /// that validating a new transaction remains a constant operation (in reality
@@ -9,7 +13,25 @@ pub const TX_SLOT_BYTE_SIZE: usize = 32 * 1024;
 /// more expensive to propagate; larger transactions also take more resources
 /// to validate whether they fit into the pool or not. Default is 4 times [`TX_SLOT_BYTE_SIZE`],
 /// which defaults to 32 KiB, so 128 KiB.
-pub const DEFAULT_MAX_TX_INPUT_BYTES: usize = 4 * TX_SLOT_BYTE_SIZE; // 128KB
+pub const DEFAULT_MAX_TX_INPUT_BYTES: LazyCell<usize> = LazyCell::new(|| {
+    let default_value = {
+        // 20k (gas) ----> 128kb
+        // 500k (gas) ----> x // 3200
+        let gas_limit = (&*ETHEREUM_BLOCK_GAS_LIMIT).clone();
+
+        (((gas_limit * 128_000) / 20_000) / 1000) as usize // -> to bytes (3.2mb)
+    };
+
+    let env_var = std::env::var("WVM_DEFAULT_MAX_TX_INPUT_BYTES");
+    match env_var {
+        Ok(res) => {
+            res.parse::<usize>().unwrap_or(default_value)
+        }
+        Err(_) => {
+            default_value
+        }
+    }
+}); // 128KB
 
 /// This represents how big we want to allow a contract size to be in multiples of 24kb
 /// 2 = 48kb

crates/transaction-pool/src/validate/constants.rs

@@ -521,7 +521,7 @@ impl EthTransactionValidatorBuilder {
             additional_tasks: 1,
             kzg_settings: EnvKzgSettings::Default,
             local_transactions_config: Default::default(),
-            max_tx_input_bytes: DEFAULT_MAX_TX_INPUT_BYTES,
+            max_tx_input_bytes: *DEFAULT_MAX_TX_INPUT_BYTES,
 
             // by default all transaction types are allowed
             eip2718: true,

crates/transaction-pool/src/validate/eth.rs

@@ -131,8 +131,8 @@ async fn exex_etl_processor<Node: FullNodeComponents>(
 
 /// Main loop of the exexed WVM node
 fn main() -> eyre::Result<()> {
-    let _init_fee_manager = &*reth_primitives::constants::WVM_FEE_MANAGER;
     reth::cli::Cli::parse_args().run(|builder, _| async move {
+        let _init_fee_manager = &*reth_primitives::constants::WVM_FEE_MANAGER;
         // Original config
         let mut config = builder.config().clone();
         let pruning_args = config.pruning.clone();