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.

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(engine, tree): witness invalid block hook #10685

Merged
merged 23 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8a557f4
feat(engine, tree): witness invalid block hook
shekhirin Sep 4, 2024
9018c21
ok proper witness
shekhirin Sep 4, 2024
fc92bb6
query parent header state
shekhirin Sep 4, 2024
069df9a
add a comment about unifying the logic with RPC
shekhirin Sep 4, 2024
e232bdc
bad block hook -> invalid block hook
shekhirin Sep 4, 2024
6f61a3c
feat(engine): support `debug.etherscan` on experimental engine
shekhirin Sep 4, 2024
59be1b3
add a todo note
shekhirin Sep 4, 2024
6c85323
compare trie updates
shekhirin Sep 4, 2024
9b424af
Merge branch 'alexey/engine-experimental-etherscan' into alexey/inval…
shekhirin Sep 4, 2024
eeedb63
sanity checks to compare outputs after re-execution
shekhirin Sep 5, 2024
6f32102
init evm in a more sane way
shekhirin Sep 5, 2024
b668bba
Merge remote-tracking branch 'origin/main' into alexey/invalid-block-…
shekhirin Sep 5, 2024
3f27a1b
Revert "Merge branch 'alexey/engine-experimental-etherscan' into alex…
shekhirin Sep 5, 2024
22a7fff
newline at the end of Cargo.toml
shekhirin Sep 5, 2024
1b91e73
clarify bounds
shekhirin Sep 5, 2024
a7ee7c6
Merge remote-tracking branch 'origin/main' into alexey/invalid-block-…
shekhirin Sep 5, 2024
3306332
ok another types fix
shekhirin Sep 5, 2024
e1981d8
always save mismatched bundle state / state root / trie updates
shekhirin Sep 6, 2024
9fdfed0
field comments
shekhirin Sep 6, 2024
3c22f3e
fixes after Roman's review
shekhirin Sep 6, 2024
0ad18f6
handle hook error inside the impl
shekhirin Sep 6, 2024
335fbf4
clarify save_diff doc
shekhirin Sep 6, 2024
149a257
ok no cool expressions
shekhirin Sep 6, 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
38 changes: 38 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion crates/engine/invalid-block-hooks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@ workspace = true

[dependencies]
# reth
reth-chainspec.workspace = true
reth-engine-primitives.workspace = true
reth-evm.workspace = true
reth-primitives.workspace = true
reth-provider.workspace = true
reth-trie.workspace = true
reth-revm.workspace = true
reth-tracing.workspace = true
reth-trie = { workspace = true, features = ["serde"] }

# alloy
alloy-rlp.workspace = true
alloy-rpc-types-debug.workspace = true

# misc
eyre.workspace = true
pretty_assertions = "1.4"
serde_json.workspace = true
2 changes: 1 addition & 1 deletion crates/engine/invalid-block-hooks/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

mod witness;

pub use witness::witness;
pub use witness::Witness;
231 changes: 221 additions & 10 deletions crates/engine/invalid-block-hooks/src/witness.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,224 @@
use reth_primitives::{Receipt, SealedBlockWithSenders, SealedHeader, B256};
use reth_provider::BlockExecutionOutput;
use reth_trie::updates::TrieUpdates;
use std::{collections::HashMap, fmt::Debug, fs::File, io::Write, path::PathBuf};

use alloy_rpc_types_debug::ExecutionWitness;
use eyre::OptionExt;
use pretty_assertions::Comparison;
use reth_chainspec::ChainSpec;
use reth_engine_primitives::InvalidBlockHook;
use reth_evm::{
system_calls::{apply_beacon_root_contract_call, apply_blockhashes_contract_call},
ConfigureEvm,
};
use reth_primitives::{keccak256, Receipt, SealedBlockWithSenders, SealedHeader, B256, U256};
use reth_provider::{BlockExecutionOutput, ChainSpecProvider, StateProviderFactory};
use reth_revm::{
database::StateProviderDatabase,
db::states::bundle_state::BundleRetention,
primitives::{BlockEnv, CfgEnvWithHandlerCfg, EnvWithHandlerCfg},
DatabaseCommit, StateBuilder,
};
use reth_tracing::tracing::warn;
use reth_trie::{updates::TrieUpdates, HashedPostState, HashedStorage};

/// Generates a witness for the given block and saves it to a file.
pub fn witness(
_block: &SealedBlockWithSenders,
_header: &SealedHeader,
_output: &BlockExecutionOutput<Receipt>,
_trie_updates: Option<(&TrieUpdates, B256)>,
) {
unimplemented!("witness generation is not supported")
#[derive(Debug)]
pub struct Witness<P, EvmConfig> {
/// The directory to write the witness to. Additionally, diff files will be written to this
shekhirin marked this conversation as resolved.
Show resolved Hide resolved
/// directory in case of failed sanity checks.
output_directory: PathBuf,
/// The provider to read the historical state and do the EVM execution.
provider: P,
/// The EVM configuration to use for the execution.
evm_config: EvmConfig,
}

impl<P, EvmConfig> Witness<P, EvmConfig> {
/// Creates a new witness hook.
pub const fn new(output_directory: PathBuf, provider: P, evm_config: EvmConfig) -> Self {
Self { output_directory, provider, evm_config }
}
}

impl<P, EvmConfig> Witness<P, EvmConfig> {
/// Compares two values and saves the diff if they are different.
///
/// Returns the path of the saved diff file if the values are different.
fn compare_and_save_diff<T: PartialEq + Debug>(
&self,
filename: String,
original: &T,
new: &T,
) -> Option<PathBuf> {
if original == new {
return None
}

shekhirin marked this conversation as resolved.
Show resolved Hide resolved
let path = self.output_directory.join(filename);
let diff = Comparison::new(original, new);
File::options()
.write(true)
.create_new(true)
.open(&path)
.unwrap()
.write_all(diff.to_string().as_bytes())
.unwrap();

shekhirin marked this conversation as resolved.
Show resolved Hide resolved
Some(path)
}
}

impl<P, EvmConfig> InvalidBlockHook for Witness<P, EvmConfig>
where
P: StateProviderFactory + ChainSpecProvider<ChainSpec = ChainSpec> + Send + Sync + 'static,
EvmConfig: ConfigureEvm,
{
fn on_invalid_block(
&self,
parent_header: &SealedHeader,
block: &SealedBlockWithSenders,
output: &BlockExecutionOutput<Receipt>,
trie_updates: Option<(&TrieUpdates, B256)>,
) -> eyre::Result<()> {
// TODO(alexey): unify with `DebugApi::debug_execution_witness`

// Setup database.
let mut db = StateBuilder::new()
.with_database(StateProviderDatabase::new(
shekhirin marked this conversation as resolved.
Show resolved Hide resolved
self.provider.state_by_block_hash(parent_header.hash())?,
))
shekhirin marked this conversation as resolved.
Show resolved Hide resolved
.with_bundle_update()
.build();

// Setup environment for the execution.
let mut cfg = CfgEnvWithHandlerCfg::new(Default::default(), Default::default());
let mut block_env = BlockEnv::default();
self.evm_config.fill_cfg_and_block_env(
&mut cfg,
&mut block_env,
&self.provider.chain_spec(),
block.header(),
U256::MAX,
);

// Setup EVM
let mut evm = self.evm_config.evm_with_env(
&mut db,
EnvWithHandlerCfg::new_with_cfg_env(cfg, block_env, Default::default()),
);

// Apply pre-block system contract calls.
apply_beacon_root_contract_call(
&self.evm_config,
&self.provider.chain_spec(),
block.timestamp,
block.number,
block.parent_beacon_block_root,
&mut evm,
)?;
apply_blockhashes_contract_call(
&self.evm_config,
&self.provider.chain_spec(),
block.timestamp,
block.number,
block.parent_hash,
&mut evm,
)?;

// Re-execute all of the transactions in the block to load all touched accounts into
// the cache DB.
for tx in block.transactions() {
self.evm_config.fill_tx_env(
evm.tx_mut(),
tx,
tx.recover_signer().ok_or_eyre("failed to recover sender")?,
);
let result = evm.transact()?;
evm.db_mut().commit(result.state);
}

drop(evm);

// Merge all state transitions
db.merge_transitions(BundleRetention::Reverts);

// Take the bundle state
let bundle_state = db.take_bundle();

// Initialize a map of preimages.
let mut state_preimages = HashMap::new();

// Grab all account proofs for the data accessed during block execution.
//
// Note: We grab *all* accounts in the cache here, as the `BundleState` prunes
// referenced accounts + storage slots.
let mut hashed_state = HashedPostState::from_bundle_state(&bundle_state.state);
for (address, account) in db.cache.accounts {
let hashed_address = keccak256(address);
hashed_state
.accounts
.insert(hashed_address, account.account.as_ref().map(|a| a.info.clone().into()));

let storage = hashed_state
.storages
.entry(hashed_address)
.or_insert_with(|| HashedStorage::new(account.status.was_destroyed()));

if let Some(account) = account.account {
state_preimages.insert(hashed_address, alloy_rlp::encode(address).into());

for (slot, value) in account.storage {
let slot = B256::from(slot);
let hashed_slot = keccak256(slot);
storage.storage.insert(hashed_slot, value);

state_preimages.insert(hashed_slot, alloy_rlp::encode(slot).into());
}
}
}

// Generate an execution witness for the aggregated state of accessed accounts.
// Destruct the cache database to retrieve the state provider.
let state_provider = db.database.into_inner();
let witness = state_provider.witness(HashedPostState::default(), hashed_state.clone())?;

// Write the witness to the output directory.
let mut file = File::options()
.write(true)
.create_new(true)
.open(self.output_directory.join(format!("{}_{}.json", block.number, block.hash())))?;
let response = ExecutionWitness { witness, state_preimages: Some(state_preimages) };
file.write_all(serde_json::to_string(&response)?.as_bytes())?;

// The bundle state after re-execution should match the original one.
if let Some(path) = self.compare_and_save_diff(
format!("{}_{}.bundle_state.diff", block.number, block.hash()),
&bundle_state,
&output.state,
) {
warn!(target: "engine::invalid_block_hooks::witness", path = %path.display(), "Bundle state mismatch after re-execution");
}

// Calculate the state root and trie updates after re-execution. They should match
// the original ones.
let (state_root, trie_output) = state_provider.state_root_with_updates(hashed_state)?;
if let Some(trie_updates) = trie_updates {
if let Some(path) = self.compare_and_save_diff(
format!("{}_{}.state_root.diff", block.number, block.hash()),
&state_root,
&trie_updates.1,
) {
warn!(target: "engine::invalid_block_hooks::witness", path = %path.display(), "State root mismatch after re-execution");
}

if let Some(path) = self.compare_and_save_diff(
format!("{}_{}.trie_updates.diff", block.number, block.hash()),
&trie_output,
trie_updates.0,
) {
warn!(target: "engine::invalid_block_hooks::witness", path = %path.display(), "Trie updates mismatch after re-execution");
}
}

Ok(())
}
}
6 changes: 5 additions & 1 deletion crates/engine/primitives/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ workspace = true
[dependencies]
# reth
reth-chainspec.workspace = true
reth-execution-types.workspace = true
reth-payload-primitives.workspace = true
reth-primitives.workspace = true
reth-trie.workspace = true

# misc
serde.workspace = true
eyre.workspace = true
serde.workspace = true
Loading
Loading