properly fetch gas limit and gas base fee

Author: lukeiannucci

timeboost-utils/src/load_generation.rs

@@ -5,7 +5,6 @@ use alloy::{
     network::TxSignerSync,
     primitives::{TxKind, U256},
     rlp::Encodable,
-    rpc::types::AccessList,
     signers::local::PrivateKeySigner,
 };
 use arbitrary::Unstructured;
@@ -19,6 +18,10 @@ use timeboost_crypto::{
 };
 use timeboost_types::{Address, Bundle, BundleVariant, Epoch, PriorityBundle, SeqNo, Signer};
 
+// Private key from pre funded dev account on test node
+// https://docs.arbitrum.io/run-arbitrum-node/run-local-full-chain-simulation#default-endpoints-and-addresses
+const DEV_ACCT_PRIV_KEY: &str = "b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659";
+
 pub fn make_bundle(pubkey: &ThresholdEncKeyCell) -> anyhow::Result<BundleVariant> {
     let mut rng = rand::thread_rng();
     let mut v = [0; 256];
@@ -55,16 +58,19 @@ pub fn make_bundle(pubkey: &ThresholdEncKeyCell) -> anyhow::Result<BundleVariant
 
 pub fn make_dev_acct_bundle(
     pubkey: &ThresholdEncKeyCell,
+    chain_id: u64,
     nonce: u64,
     to: alloy::primitives::Address,
+    gas_limit: u64,
+    max_base_fee: u128,
 ) -> anyhow::Result<BundleVariant> {
     let mut rng = rand::thread_rng();
     let mut v = [0; 256];
     rng.fill(&mut v);
     let mut u = Unstructured::new(&v);
 
     let max_seqno = 10;
-    let mut bundle = create_dev_acct_txn_bundle(nonce, to)?;
+    let mut bundle = create_dev_acct_txn_bundle(chain_id, nonce, to, gas_limit, max_base_fee)?;
 
     if let Some(pubkey) = &*pubkey.get_ref()
         && rng.gen_bool(0.5)
@@ -92,29 +98,25 @@ pub fn make_dev_acct_bundle(
 }
 
 pub fn create_dev_acct_txn_bundle(
+    chain_id: u64,
     nonce: u64,
     to: alloy::primitives::Address,
+    gas_limit: u64,
+    max_fee_per_gas: u128,
 ) -> anyhow::Result<Bundle> {
-    // Chain id from l2 chain
-    // https://docs.arbitrum.io/run-arbitrum-node/run-local-full-chain-simulation#default-endpoints-and-addresses
-    let chain_id = 412346;
     let mut tx = TxEip1559 {
         chain_id,
         nonce,
-        max_priority_fee_per_gas: 1000000000,
-        max_fee_per_gas: 1000000000,
-        gas_limit: 21000,
+        max_fee_per_gas,
+        gas_limit,
         to: TxKind::Call(to),
         value: U256::from(1),
-        input: alloy::primitives::Bytes::new(),
-        access_list: AccessList::default(),
+        ..Default::default()
     };
 
     // Private key from pre funded dev account on test node
     // https://docs.arbitrum.io/run-arbitrum-node/run-local-full-chain-simulation#default-endpoints-and-addresses
-    let signer = PrivateKeySigner::from_str(
-        "b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659",
-    )?;
+    let signer = PrivateKeySigner::from_str(DEV_ACCT_PRIV_KEY)?;
     let sig = signer.sign_transaction_sync(&mut tx)?;
     let signed_tx = tx.into_signed(sig);
     let env = TxEnvelope::Eip1559(signed_tx);

yapper/src/yapper.rs

@@ -1,9 +1,10 @@
 use std::time::Duration;
 
 use alloy::{
-    network::Ethereum,
-    primitives::{Address, address},
+    network::{Ethereum, TransactionBuilder},
+    primitives::{Address, U256, address},
     providers::{Provider, RootProvider},
+    rpc::types::TransactionRequest,
 };
 use anyhow::{Context, Result};
 use futures::future::join_all;
@@ -89,10 +90,34 @@ impl Yapper {
         loop {
             let b = if let Some(ref p) = self.provider {
                 let nonce = p.get_transaction_count(DEV_ACCT_ADDRESS).await?;
+                // Chain id from l2 chain
+                // https://docs.arbitrum.io/run-arbitrum-node/run-local-full-chain-simulation#default-endpoints-and-addresses
+                let chain_id = 412346;
+                let tx = TransactionRequest::default()
+                    .with_chain_id(chain_id)
+                    .with_nonce(nonce)
+                    .with_from(DEV_ACCT_ADDRESS)
+                    .with_to(VALIDATOR_ADDRESS)
+                    .with_value(U256::from(1));
+
+                let Ok(estimate) = p.estimate_gas(tx).await else {
+                    warn!("failed to get estimate");
+                    continue;
+                };
+                let Ok(price) = p.get_gas_price().await else {
+                    warn!("failed to get gas price");
+                    continue;
+                };
                 // For testing just send from the dev account to the validator address
-                let Ok(b) = make_dev_acct_bundle(acc.enc_key().await, nonce, VALIDATOR_ADDRESS)
-                else {
-                    warn!("failed to dev account generate bundle");
+                let Ok(b) = make_dev_acct_bundle(
+                    acc.enc_key().await,
+                    chain_id,
+                    nonce,
+                    VALIDATOR_ADDRESS,
+                    estimate,
+                    price,
+                ) else {
+                    warn!("failed to generate dev account bundle");
                     continue;
                 };
                 b