Skip to content

Commit cc79edb

Browse files
authored
fix: spec id (#361)
* fix: spec id Signed-off-by: Gregory Edison <[email protected]> * tests: fix Signed-off-by: Gregory Edison <[email protected]> --------- Signed-off-by: Gregory Edison <[email protected]>
1 parent bb68f01 commit cc79edb

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

crates/scroll/evm/src/lib.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ pub fn spec_id_at_timestamp_and_number(
114114
chain_spec: impl ScrollHardforks,
115115
) -> ScrollSpecId {
116116
if chain_spec
117+
.scroll_fork_activation(ScrollHardfork::Galileo)
118+
.active_at_timestamp_or_number(timestamp, number)
119+
{
120+
ScrollSpecId::GALILEO
121+
} else if chain_spec
117122
.scroll_fork_activation(ScrollHardfork::Feynman)
118123
.active_at_timestamp_or_number(timestamp, number)
119124
{

crates/scroll/node/src/builder/pool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ mod tests {
345345
err.kind,
346346
PoolErrorKind::InvalidTransaction(
347347
InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
348-
) if *expected == GotExpected{ got: U256::from(400000), expected: U256::from(4205858031847u64) }
348+
) if *expected == GotExpected{ got: U256::from(400000), expected: U256::from(483673629772436u64) }
349349
));
350350

351351
// explicitly drop the manager here otherwise the `TransactionValidationTaskExecutor` will

0 commit comments

Comments
 (0)