Skip to content

fix(ethereum): add consensus_rpc fallback cascade; error on missing execution_rpc #709

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

Open
sashass1315 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −8
Open

fix(ethereum): add consensus_rpc fallback cascade; error on missing execution_rpc #709

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
25 changes: 17 additions & 8 deletions ethereum/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ impl<DB: Database> EthereumClientBuilder<DB> {
config.to_base_config()
};

let consensus_rpc = self.consensus_rpc.unwrap_or_else(|| {
self.config
.as_ref()
.expect("missing consensus rpc")
.consensus_rpc
.clone()
});
let consensus_rpc = if let Some(url) = self.consensus_rpc {
url
} else if let Some(cfg) = &self.config {
cfg.consensus_rpc.clone()
} else if let Some(url) = base_config.consensus_rpc.clone() {
url
} else {
return Err(eyre!("missing consensus rpc"));
};

let execution_rpc = self
.execution_rpc
Expand Down Expand Up @@ -269,9 +271,16 @@ impl<DB: Database> EthereumClientBuilder<DB> {
rpc_address,
))
} else {
// Ensure execution rpc is present when verifiable API is not configured
let rpc_url = config
.execution_rpc
.as_ref()
.ok_or_else(|| {
eyre!("missing execution rpc; provide execution_rpc or verifiable_api")
})?
.clone();
let block_provider = BlockCache::<Ethereum>::new();
// Create EIP-2935 historical block provider
let rpc_url = config.execution_rpc.as_ref().unwrap().clone();
let historical_provider = Eip2935Provider::new();
let execution = RpcExecutionProvider::with_historical_provider(
rpc_url,
Expand Down