Skip to content

Commit de6206c

Browse files
committed
fixes after merge
1 parent c37d896 commit de6206c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

Cargo.lock

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/node/src/args.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,12 @@ impl ScrollRollupNodeConfig {
194194
.await
195195
.expect("failed to perform migration");
196196
} else {
197-
scroll_migration::Migrator::<()>::up(db.get_connection(), None)
198-
.await
199-
.expect("failed to perform migration (custom chain)");
197+
scroll_migration::Migrator::<scroll_migration::ScrollDevMigrationInfo>::up(
198+
db.get_connection(),
199+
None,
200+
)
201+
.await
202+
.expect("failed to perform migration (custom chain)");
200203
}
201204

202205
// Wrap the database in an Arc
@@ -222,7 +225,7 @@ impl ScrollRollupNodeConfig {
222225
ctx.network.clone(),
223226
events,
224227
eth_wire_listener,
225-
td_constant(named_chain),
228+
td_constant(chain_spec.chain().named()),
226229
);
227230

228231
// On startup we replay the latest batch of blocks from the database as such we set the safe
@@ -653,10 +656,10 @@ pub struct GasPriceOracleArgs {
653656
}
654657

655658
/// Returns the total difficulty constant for the given chain.
656-
const fn td_constant(chain: NamedChain) -> U128 {
659+
const fn td_constant(chain: Option<NamedChain>) -> U128 {
657660
match chain {
658-
NamedChain::Scroll => constants::SCROLL_MAINNET_TD_CONSTANT,
659-
NamedChain::ScrollSepolia => constants::SCROLL_SEPOLIA_TD_CONSTANT,
661+
Some(NamedChain::Scroll) => constants::SCROLL_MAINNET_TD_CONSTANT,
662+
Some(NamedChain::ScrollSepolia) => constants::SCROLL_SEPOLIA_TD_CONSTANT,
660663
_ => U128::ZERO, // Default to zero for other chains
661664
}
662665
}

0 commit comments

Comments
 (0)