jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 19:09:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(revm): simplify fill_tx_env (#9206)

Browse Source
This commit is contained in:
Thomas Coratger
2024-07-01 11:46:43 +02:00
committed by GitHub
parent 84e385753e
commit 91d45871b2
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/primitives/src/revm/env.rs
View File

@ -245,10 +245,7 @@ where
tx_env.gas_limit = tx.gas_limit; tx_env.gas_limit = tx.gas_limit;
tx_env.gas_price = U256::from(tx.gas_price); tx_env.gas_price = U256::from(tx.gas_price);
tx_env.gas_priority_fee = None; tx_env.gas_priority_fee = None;
tx_env.transact_to = match tx.to { tx_env.transact_to = tx.to;
TxKind::Call(to) => TxKind::Call(to),
TxKind::Create => TxKind::Create,
};
tx_env.value = tx.value; tx_env.value = tx.value;
tx_env.data = tx.input.clone(); tx_env.data = tx.input.clone();
tx_env.chain_id = tx.chain_id; tx_env.chain_id = tx.chain_id;
@ -261,17 +258,13 @@ where
tx_env.gas_limit = tx.gas_limit; tx_env.gas_limit = tx.gas_limit;
tx_env.gas_price = U256::from(tx.gas_price); tx_env.gas_price = U256::from(tx.gas_price);
tx_env.gas_priority_fee = None; tx_env.gas_priority_fee = None;
tx_env.transact_to = match tx.to { tx_env.transact_to = tx.to;
TxKind::Call(to) => TxKind::Call(to),
TxKind::Create => TxKind::Create,
};
tx_env.value = tx.value; tx_env.value = tx.value;
tx_env.data = tx.input.clone(); tx_env.data = tx.input.clone();
tx_env.chain_id = Some(tx.chain_id); tx_env.chain_id = Some(tx.chain_id);
tx_env.nonce = Some(tx.nonce); tx_env.nonce = Some(tx.nonce);
tx_env.access_list = tx tx_env.access_list = tx
.access_list .access_list
.0
.iter() .iter()
.map(|l| { .map(|l| {
(l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect()) (l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect())
@ -284,17 +277,13 @@ where
tx_env.gas_limit = tx.gas_limit; tx_env.gas_limit = tx.gas_limit;
tx_env.gas_price = U256::from(tx.max_fee_per_gas); tx_env.gas_price = U256::from(tx.max_fee_per_gas);
tx_env.gas_priority_fee = Some(U256::from(tx.max_priority_fee_per_gas)); tx_env.gas_priority_fee = Some(U256::from(tx.max_priority_fee_per_gas));
tx_env.transact_to = match tx.to { tx_env.transact_to = tx.to;
TxKind::Call(to) => TxKind::Call(to),
TxKind::Create => TxKind::Create,
};
tx_env.value = tx.value; tx_env.value = tx.value;
tx_env.data = tx.input.clone(); tx_env.data = tx.input.clone();
tx_env.chain_id = Some(tx.chain_id); tx_env.chain_id = Some(tx.chain_id);
tx_env.nonce = Some(tx.nonce); tx_env.nonce = Some(tx.nonce);
tx_env.access_list = tx tx_env.access_list = tx
.access_list .access_list
.0
.iter() .iter()
.map(|l| { .map(|l| {
(l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect()) (l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect())
@ -314,7 +303,6 @@ where
tx_env.nonce = Some(tx.nonce); tx_env.nonce = Some(tx.nonce);
tx_env.access_list = tx tx_env.access_list = tx
.access_list .access_list
.0
.iter() .iter()
.map(|l| { .map(|l| {
(l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect()) (l.address, l.storage_keys.iter().map(|k| U256::from_be_bytes(k.0)).collect())