fix bug

bluealloy · Dec 26, 2024 · eb09c36 · eb09c36
1 parent bf35974
commit eb09c36
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/crates/context/interface/src/transaction/access_list.rs b/crates/context/interface/src/transaction/access_list.rs
@@ -9,7 +9,7 @@ use primitives::{Address, B256};
 ///
 /// Number of account and storage slots is used to calculate initial tx gas cost.
 #[auto_impl(&, Box, Arc, Rc)]
-pub trait AccessListTrait: Clone {
+pub trait AccessListTrait {
     /// Iterate over access list.
     fn iter(&self) -> impl Iterator<Item = (Address, impl Iterator<Item = B256>)>;
 

diff --git a/crates/context/interface/src/transaction/transaction_type.rs b/crates/context/interface/src/transaction/transaction_type.rs
@@ -15,3 +15,19 @@ pub enum TransactionType {
     /// Custom type means that transaction trait was extend and have custom types
     Custom,
 }
+
+impl TransactionType {
+    pub fn from_u8(ty: Option<u8>) -> Option<Self> {
+        let Some(ty) = ty else {
+            return Some(Self::Legacy);
+        };
+        let ty = match ty {
+            1 => Self::Eip2930,
+            2 => Self::Eip1559,
+            3 => Self::Eip4844,
+            4 => Self::Eip7702,
+            _ => return None,
+        };
+        Some(ty)
+    }
+}
diff --git a/crates/handler/src/post_execution.rs b/crates/handler/src/post_execution.rs
@@ -74,7 +74,7 @@ where
         let caller_account = context.journal().load_account(caller)?;
 
         let reimbursed =
-            effective_gas_price.saturating_add((gas.remaining() + gas.refunded() as u64) as u128);
+            effective_gas_price.saturating_mul((gas.remaining() + gas.refunded() as u64) as u128);
         caller_account.data.info.balance = caller_account
             .data
             .info

diff --git a/crates/handler/src/pre_execution.rs b/crates/handler/src/pre_execution.rs
@@ -12,7 +12,7 @@ use context_interface::{
     Block, BlockGetter, Cfg, CfgGetter, JournalDBError, JournalGetter, TransactionGetter,
 };
 use handler_interface::PreExecutionHandler;
-use primitives::{Address, BLOCKHASH_STORAGE_ADDRESS, U256};
+use primitives::{Address, B256, BLOCKHASH_STORAGE_ADDRESS, U256};
 use specification::{eip7702, hardfork::SpecId};
 use std::{boxed::Box, vec::Vec};
 
@@ -60,8 +60,9 @@ where
         }
 
         // Load access list
-        if let Some(access_list) = context.tx().access_list().cloned() {
-            for access_list in access_list.iter() {
+        if let Some(access_list) = context.tx().access_list() {
+            let access_list = access_list.iter().collect::<Vec<(Address, Vec<B256>)>>();
+            for access_list in access_list {
                 context.journal().warm_account_and_storage(
                     access_list.0,
                     access_list.1.map(|i| U256::from_be_bytes(i.0)),