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

Jump to bottom

fix hash mismatch #1047

Merged
merged 2 commits into from
Jan 22, 2024
Merged

fix hash mismatch #1047

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee01506
remove db read only
Jan 18, 2024
bc6a92f
fix lint
Jan 18, 2024
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
74 changes: 2 additions & 72 deletions src/components/contracts/rpc/src/eth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use ethereum::{
};
use ethereum_types::{BigEndianHash, Bloom, H160, H256, H512, H64, U256, U64};
use evm::{ExitError, ExitReason};
use fin_db::{FinDB, RocksDB};
use fp_evm::{BlockId, Runner, TransactionStatus};
use fp_rpc_core::types::{
Block, BlockNumber, BlockTransactions, Bytes, CallRequest, Filter, FilteredParams,
Expand All @@ -34,15 +33,11 @@ use lazy_static::lazy_static;
use parking_lot::RwLock;
use sha3::{Digest, Keccak256};
use std::{collections::BTreeMap, convert::Into, ops::Range, sync::Arc};
use storage::state::{ChainState, State};
use tendermint::abci::Code;
use tendermint_rpc::{Client, HttpClient};
use tokio::runtime::{Handle, Runtime};
use tracing::{debug, warn};

const CHAIN_STATE_PATH: &str = "state.db";
const CHAIN_HISTORY_DATA_PATH: &str = "history.db";

lazy_static! {
static ref RT: Runtime =
Runtime::new().expect("Failed to create thread pool executor");
Expand Down Expand Up @@ -363,36 +358,7 @@ impl EthApi for EthApiImpl {
.read()
.create_context_at(block.header.number.as_u64())
.ok_or_else(|| internal_err("failed to create context"))?;
{
let (basedir, opts) = {
let app = account_base_app.read();
(app.basedir.clone(), app.opts.clone())
};

// Creates a fresh chain state db and history db
let fdb_path = basedir.join(CHAIN_STATE_PATH);
let fdb = FinDB::open_read_only(fdb_path.as_path())
.map_err(|e| internal_err(format!("failed to get block: {}", e)))?;

ctx.state = Arc::new(RwLock::new(State::new(
Arc::new(RwLock::new(ChainState::create_with_opts(fdb, opts, true))),
true,
)));

let rdb_path = basedir.join(CHAIN_HISTORY_DATA_PATH);
let rdb = RocksDB::open_read_only(rdb_path.as_path())
.map_err(|e| internal_err(format!("failed to get block: {}", e)))?;

ctx.db = Arc::new(RwLock::new(State::new(
Arc::new(RwLock::new(ChainState::new(
rdb,
"rocks_db".to_owned(),
0,
true,
))),
false,
)));
}

ctx.header
.mut_time()
.set_seconds(block.header.timestamp as i64);
Expand Down Expand Up @@ -886,49 +852,13 @@ impl EthApi for EthApiImpl {
let execute_call_or_create = move |request: CallRequest,
gas_limit|
-> Result<ExecuteResult> {
let mut ctx = account_base_app
let ctx = account_base_app
.read()
.create_query_context(if pending { None } else { Some(0) }, false)
.map_err(|err| {
internal_err(format!("create query context error: {err:?}"))
})?;
{
let (basedir, opts) = {
let app = account_base_app.read();
(app.basedir.clone(), app.opts.clone())
};

// Creates a fresh chain state db and history db
let fdb_path = basedir.join(CHAIN_STATE_PATH);
let fdb =
FinDB::open_read_only(fdb_path.as_path()).map_err(|e| {
internal_err(format!("failed to get block: {}", e))
})?;

ctx.state = Arc::new(RwLock::new(State::new(
Arc::new(RwLock::new(ChainState::create_with_opts(
fdb, opts, true,
))),
true,
)));

let rdb_path = basedir.join(CHAIN_HISTORY_DATA_PATH);

let rdb =
RocksDB::open_read_only(rdb_path.as_path()).map_err(|e| {
internal_err(format!("failed to get block: {}", e))
})?;

ctx.db = Arc::new(RwLock::new(State::new(
Arc::new(RwLock::new(ChainState::new(
rdb,
"rocks_db".to_owned(),
0,
true,
))),
false,
)));
}
let CallRequest {
from,
to,
Expand Down
Loading