refactor: make stricter database trait bounds for user ergonomics

crates/database/interface/Cargo.toml

@@ -34,7 +34,7 @@ serde = { version = "1.0", default-features = false, features = [
 ], optional = true }
 
 # asyncdb
-tokio = { version = "1.40", optional = true }
+tokio = { version = "1.40", optional = true, features = ["rt", "rt-multi-thread"] }
 
 
 [dev-dependencies]

crates/database/interface/src/async_db.rs

@@ -13,7 +13,7 @@ use crate::{Database, DatabaseRef};
 /// Use [WrapDatabaseAsync] to provide [Database] implementation for a type that only implements this trait.
 pub trait DatabaseAsync {
     /// The database error type.
-    type Error: Send;
+    type Error: core::error::Error + Send;
 
     /// Get basic account information.
     fn basic_async(
@@ -48,7 +48,7 @@ pub trait DatabaseAsync {
 /// Use [WrapDatabaseAsync] to provide [DatabaseRef] implementation for a type that only implements this trait.
 pub trait DatabaseAsyncRef {
     /// The database error type.
-    type Error: Send;
+    type Error: core::error::Error + Send;
 
     /// Get basic account information.
     fn basic_async_ref(

crates/database/interface/src/empty_db.rs

@@ -52,7 +52,7 @@ impl<E> EmptyDBTyped<E> {
     }
 }
 
-impl<E> Database for EmptyDBTyped<E> {
+impl<E: core::error::Error> Database for EmptyDBTyped<E> {
     type Error = E;
 
     #[inline]
@@ -76,7 +76,7 @@ impl<E> Database for EmptyDBTyped<E> {
     }
 }
 
-impl<E> DatabaseRef for EmptyDBTyped<E> {
+impl<E: core::error::Error> DatabaseRef for EmptyDBTyped<E> {
     type Error = E;
 
     #[inline]

crates/database/interface/src/lib.rs

@@ -21,7 +21,7 @@ pub use empty_db::{EmptyDB, EmptyDBTyped};
 #[auto_impl(&mut, Box)]
 pub trait Database {
     /// The database error type.
-    type Error;
+    type Error: core::error::Error;
 
     /// Get basic account information.
     fn basic(&mut self, address: Address) -> Result<Option<AccountInfo>, Self::Error>;
@@ -38,7 +38,7 @@ pub trait Database {
 
 /// EVM database commit interface.
 #[auto_impl(&mut, Box)]
-pub trait DatabaseCommit {
+pub trait DatabaseCommit: Database {
     /// Commit changes to the database.
     fn commit(&mut self, changes: HashMap<Address, Account>);
 }
@@ -52,7 +52,7 @@ pub trait DatabaseCommit {
 #[auto_impl(&, &mut, Box, Rc, Arc)]
 pub trait DatabaseRef {
     /// The database error type.
-    type Error;
+    type Error: core::error::Error;
 
     /// Get basic account information.
     fn basic_ref(&self, address: Address) -> Result<Option<AccountInfo>, Self::Error>;

crates/database/src/in_memory_db.rs

@@ -125,7 +125,7 @@ impl<ExtDB: DatabaseRef> CacheDB<ExtDB> {
     }
 }
 
-impl<ExtDB> DatabaseCommit for CacheDB<ExtDB> {
+impl<ExtDB: DatabaseRef> DatabaseCommit for CacheDB<ExtDB> {
     fn commit(&mut self, changes: HashMap<Address, Account>) {
         for (address, mut account) in changes {
             if !account.is_touched() {

crates/database/src/states/state_builder.rs

@@ -81,7 +81,7 @@ impl<DB: Database> StateBuilder<DB> {
     }
 
     /// With boxed version of database.
-    pub fn with_database_boxed<Error>(
+    pub fn with_database_boxed<Error: core::error::Error>(
         self,
         database: DBBox<'_, Error>,
     ) -> StateBuilder<DBBox<'_, Error>> {

examples/database_components/src/block_hash.rs

@@ -7,15 +7,15 @@ use std::sync::Arc;
 
 #[auto_impl(&mut, Box)]
 pub trait BlockHash {
-    type Error;
+    type Error: core::error::Error + 'static;
 
     /// Get block hash by block number
     fn block_hash(&mut self, number: u64) -> Result<B256, Self::Error>;
 }
 
 #[auto_impl(&, &mut, Box, Rc, Arc)]
 pub trait BlockHashRef {
-    type Error;
+    type Error: core::error::Error + 'static;
 
     /// Get block hash by block number
     fn block_hash(&self, number: u64) -> Result<B256, Self::Error>;

examples/database_components/src/lib.rs

@@ -1,4 +1,3 @@
-//! Optimism-specific constants, types, and helpers.
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
 //! Database that is split on State and BlockHash traits.
@@ -26,7 +25,33 @@ pub enum DatabaseComponentError<SE, BHE> {
     BlockHash(BHE),
 }
 
-impl<S: State, BH: BlockHash> Database for DatabaseComponents<S, BH> {
+impl<SE, BHE> core::fmt::Display for DatabaseComponentError<SE, BHE>
+where
+    SE: core::fmt::Display,
+    BHE: core::fmt::Display,
+{
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+        match self {
+            DatabaseComponentError::State(e) => write!(f, "State error: {}", e),
+            DatabaseComponentError::BlockHash(e) => write!(f, "BlockHash error: {}", e),
+        }
+    }
+}
+
+impl<SE, BHE> core::error::Error for DatabaseComponentError<SE, BHE>
+where
+    SE: core::error::Error + 'static,
+    BHE: core::error::Error + 'static,
+{
+    fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
+        match self {
+            DatabaseComponentError::State(e) => Some(e),
+            DatabaseComponentError::BlockHash(e) => Some(e),
+        }
+    }
+}
+
+impl<S: State, BH: BlockHashRef> Database for DatabaseComponents<S, BH> {
     type Error = DatabaseComponentError<S::Error, BH::Error>;
 
     fn basic(&mut self, address: Address) -> Result<Option<AccountInfo>, Self::Error> {
@@ -78,7 +103,7 @@ impl<S: StateRef, BH: BlockHashRef> DatabaseRef for DatabaseComponents<S, BH> {
     }
 }
 
-impl<S: DatabaseCommit, BH: BlockHashRef> DatabaseCommit for DatabaseComponents<S, BH> {
+impl<S: State + DatabaseCommit, BH: BlockHashRef> DatabaseCommit for DatabaseComponents<S, BH> {
     fn commit(&mut self, changes: HashMap<Address, Account>) {
         self.state.commit(changes);
     }

examples/database_components/src/state.rs

@@ -10,7 +10,7 @@ use std::sync::Arc;
 
 #[auto_impl(&mut, Box)]
 pub trait State {
-    type Error;
+    type Error: core::error::Error + 'static;
 
     /// Get basic account information.
     fn basic(&mut self, address: Address) -> Result<Option<AccountInfo>, Self::Error>;
@@ -24,7 +24,7 @@ pub trait State {
 
 #[auto_impl(&, &mut, Box, Rc, Arc)]
 pub trait StateRef {
-    type Error;
+    type Error: core::error::Error + 'static;
 
     /// Get basic account information.
     fn basic(&self, address: Address) -> Result<Option<AccountInfo>, Self::Error>;