chore(evm): update deps (#1243)

* update deps

* fix compile errors

* fix

* store raw bytecode

* replace `AccountInfo` with `StoredAccountInfo`

Author: oXtxNt9U

packages/evm/Cargo.lock

@@ -4,7 +4,7 @@ members = ["core", "bindings"]
 
 [workspace.package]
 version = "0.1.0"
-rust-version = "1.91"
+rust-version = "1.93"
 edition = "2024"
 license = "GPL-3.0-only"
 authors = [""]
@@ -15,19 +15,19 @@ bincode = { version = "1.3.3" }
 ethers-contract = { version = "2.0.14" }
 ethers-core = { version = "2.0.14" }
 ethers-providers = { version = "2.0.14" }
-revm = { version = "34.0.0", features = ["alloydb", "serde", "serde-json"] }
-alloy-sol-types = { version = "1.5.2", default-features = false, features = [
+revm = { version = "36.0.0", features = ["alloydb", "serde", "serde-json"] }
+alloy-sol-types = { version = "1.5.7", default-features = false, features = [
     "std",
 ] }
-alloy-primitives = { version = "1.5.2", default-features = false, features = [
+alloy-primitives = { version = "1.5.7", default-features = false, features = [
     "rlp",
     "map",
 ] }
-alloy-provider = { version = "1.4.3", default-features = false }
+alloy-provider = { version = "1.7.3", default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 thiserror = { version = "1.0" }
-tokio = { version = "1.47" }
+tokio = { version = "1.50" }
 
 [profile.release]
 lto = true

packages/evm/Cargo.toml

@@ -37,7 +37,7 @@ use revm::{
     database::{State, TransitionAccount, WrapDatabaseRef, bal::EvmDatabaseError},
     handler::EvmTr,
     primitives::{Address, B256, Bytes, TxKind, U256, hex::ToHexExt, map::HashMap},
-    state::{AccountInfo, Bytecode},
+    state::AccountInfo,
 };
 
 mod ctx;
@@ -173,10 +173,7 @@ impl EvmInner {
                         EVMError::Database(format!("code lookup failed: {}", err).into())
                     })?;
 
-                Ok(match code {
-                    Bytecode::LegacyAnalyzed(code) => code.original_bytes(),
-                    Bytecode::Eip7702(code) => code.raw.clone(),
-                })
+                Ok(code.original_bytes())
             }
             None => Ok(Default::default()),
         }

packages/evm/bindings/src/lib.rs

@@ -1,3 +1,4 @@
+use alloy_primitives::{B256, U256};
 use revm::{primitives::Address, state::AccountInfo};
 use serde::{Deserialize, Serialize};
 
@@ -23,3 +24,32 @@ impl AccountInfoExtended {
         )
     }
 }
+
+#[derive(Default, Debug, Serialize, Deserialize)]
+pub(crate) struct StoredAccountInfo {
+    pub balance: U256,
+    pub nonce: u64,
+    pub code_hash: B256,
+}
+
+impl StoredAccountInfo {
+    pub fn new(balance: U256, nonce: u64, code_hash: B256) -> Self {
+        Self {
+            balance,
+            nonce,
+            code_hash,
+        }
+    }
+}
+
+impl From<StoredAccountInfo> for AccountInfo {
+    fn from(stored: StoredAccountInfo) -> Self {
+        AccountInfo {
+            balance: stored.balance,
+            nonce: stored.nonce,
+            code_hash: stored.code_hash,
+            account_id: None,
+            code: None,
+        }
+    }
+}

packages/evm/core/src/account.rs

@@ -0,0 +1,24 @@
+use alloy_primitives::Bytes;
+use revm::{bytecode::BytecodeDecodeError, state::Bytecode};
+use serde::{Deserialize, Serialize};
+
+#[derive(Default, Debug, Serialize, Deserialize)]
+pub struct StoredBytecode {
+    pub raw: Bytes,
+}
+
+impl From<Bytecode> for StoredBytecode {
+    fn from(code: Bytecode) -> Self {
+        Self {
+            raw: code.original_bytes(),
+        }
+    }
+}
+
+impl TryFrom<StoredBytecode> for Bytecode {
+    type Error = BytecodeDecodeError;
+
+    fn try_from(stored: StoredBytecode) -> Result<Self, Self::Error> {
+        Bytecode::new_raw_checked(stored.raw)
+    }
+}

packages/evm/core/src/bytecode.rs

@@ -21,7 +21,8 @@ use revm::{
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    account::AccountInfoExtended,
+    account::{AccountInfoExtended, StoredAccountInfo},
+    bytecode::StoredBytecode,
     compression::CompressedBincode,
     historical::{AccountHistory, HistoricalAccountData},
     legacy::{LegacyAccountAttributes, LegacyAddress, LegacyColdWallet},
@@ -155,15 +156,15 @@ pub(crate) struct CommitReceipts {
 }
 
 pub(crate) struct InnerStorage {
-    pub accounts: heed::Database<AddressWrapper, CompressedBincode<AccountInfo>>,
+    pub accounts: heed::Database<AddressWrapper, CompressedBincode<StoredAccountInfo>>,
     pub accounts_history: Option<
         heed::Database<
             HeedBlockNumber,
             CompressedBincode<BTreeMap<Address, HistoricalAccountData>>,
         >,
     >,
     pub commits: heed::Database<HeedBlockNumber, CompressedBincode<CommitReceipts>>,
-    pub contracts: heed::Database<HashWrapper, CompressedBincode<Bytecode>>,
+    pub contracts: heed::Database<HashWrapper, CompressedBincode<StoredBytecode>>,
     pub legacy_attributes:
         heed::Database<AddressWrapper, CompressedBincode<LegacyAccountAttributes>>,
     pub legacy_cold_wallets:
@@ -316,6 +317,8 @@ impl PersistentDBOptions {
 pub enum Error {
     #[error("IO error: {0}")]
     IO(#[from] std::io::Error),
+    #[error("BytecodeDecode error: {0}")]
+    BytecodeDecode(#[from] revm::bytecode::BytecodeDecodeError),
     #[error("heed error: {0}")]
     Heed(#[from] heed::Error),
     #[error("state error: {0}")]
@@ -376,10 +379,11 @@ impl PersistentDB {
         let tx_env = env.clone();
         let mut wtxn = tx_env.write_txn()?;
 
-        let accounts = env.create_database::<AddressWrapper, CompressedBincode<AccountInfo>>(
-            &mut wtxn,
-            Some("accounts"),
-        )?;
+        let accounts = env
+            .create_database::<AddressWrapper, CompressedBincode<StoredAccountInfo>>(
+                &mut wtxn,
+                Some("accounts"),
+            )?;
 
         let (accounts_history_db, accounts_history) = match opts.history_size {
             Some(history_size) if history_size > 0 => {
@@ -394,7 +398,7 @@ impl PersistentDB {
             &mut wtxn,
             Some("commits"),
         )?;
-        let contracts = env.create_database::<HashWrapper, CompressedBincode<Bytecode>>(
+        let contracts = env.create_database::<HashWrapper, CompressedBincode<StoredBytecode>>(
             &mut wtxn,
             Some("contracts"),
         )?;
@@ -757,7 +761,7 @@ impl DatabaseRef for PersistentDB {
         let inner = self.inner.borrow();
 
         let basic = match inner.accounts.get(&txn, &AddressWrapper(address))? {
-            Some(account) => account.0,
+            Some(account) => account.0.into(),
             None => match &self.genesis_info {
                 Some(genesis) if genesis.account == address => revm::state::AccountInfo {
                     balance: genesis.initial_supply,
@@ -779,7 +783,7 @@ impl DatabaseRef for PersistentDB {
             None => Default::default(),
         };
 
-        Ok(contract)
+        Ok(contract.try_into()?)
     }
 
     fn storage_ref(&self, address: Address, index: U256) -> Result<U256, Self::Error> {
@@ -858,9 +862,15 @@ impl PersistentDB {
                 let address = AddressWrapper(*address);
 
                 if let Some(account) = account {
-                    inner
-                        .accounts
-                        .put(rwtxn, &address, &CompressedBincode(account))?;
+                    inner.accounts.put(
+                        rwtxn,
+                        &address,
+                        &CompressedBincode(&StoredAccountInfo::new(
+                            account.balance,
+                            account.nonce,
+                            account.code_hash,
+                        )),
+                    )?;
                 } else {
                     inner.accounts.delete(rwtxn, &address)?;
                 }
@@ -904,9 +914,11 @@ impl PersistentDB {
 
             // Update contracts
             for (hash, bytecode) in contracts.into_iter() {
-                inner
-                    .contracts
-                    .put(rwtxn, &HashWrapper(*hash), &CompressedBincode(&bytecode))?;
+                inner.contracts.put(
+                    rwtxn,
+                    &HashWrapper(*hash),
+                    &CompressedBincode(&bytecode.clone().into()),
+                )?;
             }
 
             // Update storage
@@ -1656,7 +1668,7 @@ fn test_read_accounts() {
                 .put(
                     &mut wtxn,
                     &AddressWrapper(*address),
-                    &CompressedBincode(&AccountInfo {
+                    &CompressedBincode(&StoredAccountInfo {
                         balance: U256::from(index),
                         nonce: index as u64,
                         ..Default::default()

packages/evm/core/src/db.rs

@@ -1,4 +1,5 @@
 pub mod account;
+mod bytecode;
 mod compression;
 pub mod db;
 mod events;

packages/evm/core/src/lib.rs

@@ -40,8 +40,7 @@ fn test_calculate_logs_bloom() {
                     )
                 })
                 .collect::<Vec<revm::primitives::Log>>(),
-            gas_refunded: 0,
-            gas_used: 0,
+            gas: revm::context::result::ResultGas::default(),
             output: revm::context::result::Output::Call(Default::default()),
             reason: revm::context::result::SuccessReason::Stop,
         };

packages/evm/core/src/logs_bloom.rs

@@ -18,42 +18,38 @@ pub struct TxReceipt {
 pub fn map_execution_result(result: ExecutionResult, cumulative_gas_used: u64) -> TxReceipt {
     match result {
         ExecutionResult::Success {
-            gas_used,
-            gas_refunded,
-            output,
-            logs,
-            ..
+            gas, output, logs, ..
         } => match output {
             Output::Call(output) => TxReceipt {
-                gas_used,
-                gas_refunded,
+                gas_used: gas.used(),
+                gas_refunded: gas.inner_refunded(),
                 cumulative_gas_used,
                 success: 1,
                 contract_address: None,
                 logs: Some(logs),
                 output: Some(output),
             },
             Output::Create(output, address) => TxReceipt {
-                gas_used,
-                gas_refunded,
+                gas_used: gas.used(),
+                gas_refunded: gas.inner_refunded(),
                 cumulative_gas_used,
                 success: 1,
                 contract_address: address.map(|address| address.to_string()),
                 logs: Some(logs),
                 output: Some(output),
             },
         },
-        ExecutionResult::Revert { gas_used, output } => TxReceipt {
-            gas_used,
+        ExecutionResult::Revert { gas, output, .. } => TxReceipt {
+            gas_used: gas.used(),
             success: 0,
             cumulative_gas_used,
             gas_refunded: 0,
             contract_address: None,
             logs: None,
             output: Some(output),
         },
-        ExecutionResult::Halt { gas_used, .. } => TxReceipt {
-            gas_used,
+        ExecutionResult::Halt { gas, .. } => TxReceipt {
+            gas_used: gas.used(),
             success: 0,
             cumulative_gas_used,
             gas_refunded: 0,