Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ethersdb): basic_ref return none instead of panic #935

Merged
merged 1 commit into from
Dec 29, 2023
Merged

feat(ethersdb): basic_ref return none instead of panic #935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions crates/revm/src/db/ethersdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl<M: Middleware> EthersDB<M> {
}

impl<M: Middleware> DatabaseRef for EthersDB<M> {
type Error = ();
type Error = M::Error;

fn basic_ref(&self, address: Address) -> Result<Option<AccountInfo>, Self::Error> {
let add = eH160::from(address.0 .0);
Expand All @@ -60,22 +60,12 @@ impl<M: Middleware> DatabaseRef for EthersDB<M> {
tokio::join!(nonce, balance, code)
};
let (nonce, balance, code) = self.block_on(f);
// panic on not getting data?
let bytecode = code.unwrap_or_else(|e| panic!("ethers get code error: {e:?}"));
let bytecode = Bytecode::new_raw(bytecode.0.into());

let balance = U256::from_limbs(balance?.0);
let nonce = nonce?.as_u64();
let bytecode = Bytecode::new_raw(code?.0.into());
let code_hash = bytecode.hash_slow();
Ok(Some(AccountInfo::new(
U256::from_limbs(
balance
.unwrap_or_else(|e| panic!("ethers get balance error: {e:?}"))
.0,
),
nonce
.unwrap_or_else(|e| panic!("ethers get nonce error: {e:?}"))
.as_u64(),
code_hash,
bytecode,
)))
Ok(Some(AccountInfo::new(balance, nonce, code_hash, bytecode)))
}

fn code_by_hash_ref(&self, _code_hash: B256) -> Result<Bytecode, Self::Error> {
Expand Down Expand Up @@ -115,7 +105,7 @@ impl<M: Middleware> DatabaseRef for EthersDB<M> {
}

impl<M: Middleware> Database for EthersDB<M> {
type Error = ();
type Error = M::Error;

#[inline]
fn basic(&mut self, address: Address) -> Result<Option<AccountInfo>, Self::Error> {
Expand Down
Loading