Skip to content

Commit 4595cb5

Browse files
authored
Revert "Remove Fusaka related blob schedule params from l1_config (#45)" (#108)
This is only a partial revert of ca04a72, but the change described in the title is fully reverted. The BPO-stripping is done by the guest anyway, so we don't have to do it on the host. See also celo-org/celo-kona#121.
1 parent 75e0698 commit 4595cb5

File tree

1 file changed

+11
-30
lines changed

1 file changed

+11
-30
lines changed

utils/host/src/fetcher.rs

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -364,35 +364,16 @@ impl OPSuccinctDataFetcher {
364364
}
365365

366366
// Lookup the L1 config from the registry.
367-
let mut l1_config = L1_CONFIGS
368-
.get(&rollup_config.l1_chain_id)
369-
.ok_or_else(|| {
370-
anyhow::anyhow!(
371-
"No built-in L1 config exists for chain ID {}.\n\
372-
To proceed, either:\n\
373-
• Create a config file at: {}\n\
374-
• Or set L1_CONFIG_DIR to the directory containing <chain_id>.json",
375-
rollup_config.l1_chain_id,
376-
l1_config_path.display()
377-
)
378-
})?
379-
.clone();
380-
381-
// Override the L1 config to remove the BPOs and OSAKA timestamp and blob schedule for Celo,
382-
// until we're ready for Fusaka in op-geth.
383-
// This is done independently of the chain id, because updates are
384-
// required once Mainnet or Sepolia has further changes.
385-
// Also pay attention when bumping kona if there're any additions to
386-
// l1_config.blob_schedule. https://github.com/op-rs/kona/blob/kona-client/v1.1.6/crates/protocol/registry/src/l1/mod.rs#L63-L86
387-
l1_config.osaka_time = None;
388-
l1_config.bpo1_time = None;
389-
l1_config.bpo2_time = None;
390-
l1_config.bpo3_time = None;
391-
l1_config.bpo4_time = None;
392-
l1_config.bpo5_time = None;
393-
l1_config.blob_schedule.remove("osaka");
394-
l1_config.blob_schedule.remove("bpo1");
395-
l1_config.blob_schedule.remove("bpo2");
367+
let l1_config = L1_CONFIGS.get(&rollup_config.l1_chain_id).ok_or_else(|| {
368+
anyhow::anyhow!(
369+
"No built-in L1 config exists for chain ID {}.\n\
370+
To proceed, either:\n\
371+
• Create a config file at: {}\n\
372+
• Or set L1_CONFIG_DIR to the directory containing <chain_id>.json",
373+
rollup_config.l1_chain_id,
374+
l1_config_path.display()
375+
)
376+
})?;
396377

397378
tracing::debug!(
398379
"Fetched L1 config for chain ID {} from registry: {:?}",
@@ -405,7 +386,7 @@ impl OPSuccinctDataFetcher {
405386
.with_context(|| format!("creating {}", l1_config_dir.display()))?;
406387

407388
// Write the L1 config to the file
408-
let l1_config_str = serde_json::to_string_pretty(&l1_config)?;
389+
let l1_config_str = serde_json::to_string_pretty(l1_config)?;
409390
fs::write(&l1_config_path, l1_config_str)?;
410391

411392
tracing::info!(

0 commit comments

Comments
 (0)