Skip to content

Fix Cancun activation on BSC testnet #36

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

Merged
loocapro merged 1 commit into from
Jul 23, 2025
Merged

Fix Cancun activation on BSC testnet #36

Show file tree
Hide file tree
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
17 changes: 8 additions & 9 deletions src/hardforks/bsc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,14 @@ impl BscHardfork {
|fork| match fork {
EthereumHardfork::Shanghai => Some(1705996800),
EthereumHardfork::Cancun => Some(1718863500),
EthereumHardfork::Prague => Some(1742436600),
_ => None,
},
|fork| match fork {
Self::Kepler => Some(1705996800),
Self::Feynman | Self::FeynmanFix => Some(1713419340),
Self::Haber => Some(1718863500),
Self::HaberFix => Some(1727316120),
_ => None,
},
)
Expand All @@ -183,6 +185,7 @@ impl BscHardfork {
|fork| match fork {
EthereumHardfork::Shanghai => Some(1702972800),
EthereumHardfork::Cancun => Some(1713330442),
EthereumHardfork::Prague => Some(1740452880),
_ => None,
},
|fork| match fork {
Expand Down Expand Up @@ -360,12 +363,8 @@ impl From<BscHardfork> for SpecId {
BscHardfork::Kepler | BscHardfork::Feynman | BscHardfork::FeynmanFix => {
SpecId::SHANGHAI
}
BscHardfork::Haber |
BscHardfork::HaberFix |
BscHardfork::Bohr |
BscHardfork::Pascal |
BscHardfork::Lorentz |
BscHardfork::Maxwell => SpecId::CANCUN,
BscHardfork::Haber | BscHardfork::HaberFix | BscHardfork::Bohr => SpecId::CANCUN,
BscHardfork::Pascal | BscHardfork::Lorentz | BscHardfork::Maxwell => SpecId::PRAGUE,
Comment on lines +366 to +367
Copy link
Owner

@loocapro loocapro Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this an expected change?

Copy link
Collaborator Author

@MatusKysel MatusKysel Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, after Pascal we are mapping to Prague ETH evm https://github.com/bnb-chain/bsc/blob/651069fd5104a495051fea70c1f62c5112d48eb4/params/config.go#L190

}
}
}
Expand All @@ -382,7 +381,7 @@ mod tests {
BscHardfork::bsc_mainnet_activation_timestamp(EthereumHardfork::Cancun),
Some(1718863500)
);
assert_eq!(BscHardfork::bsc_mainnet_activation_timestamp(BscHardfork::HaberFix), None);
assert_eq!(BscHardfork::bsc_mainnet_activation_timestamp(BscHardfork::HaberFix), Some(1727316120));
}

#[test]
Expand All @@ -400,7 +399,7 @@ mod tests {

// Test mainnet chain spec
let mainnet_spec = crate::chainspec::BscChainSpec::from(bsc_mainnet());

// Test blocks around the critical transition points
// Block 23846000: Should be Moran (before Gibbs activation)
assert_eq!(
Expand Down Expand Up @@ -444,7 +443,7 @@ mod tests {

// Test testnet chain spec
let testnet_spec = crate::chainspec::BscChainSpec::from(bsc_testnet());

// Test blocks around the critical transition points for testnet
// Block 23603939: Should be Nano (before Moran activation)
assert_eq!(
Expand Down
4 changes: 2 additions & 2 deletions src/node/evm/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ pub fn revm_spec_by_timestamp_and_block_number(
BscHardfork::Bohr
} else if chain_spec.is_haber_fix_active_at_timestamp(timestamp) {
BscHardfork::HaberFix
} else if chain_spec.is_haber_active_at_timestamp(timestamp) {
BscHardfork::Haber
} else if chain_spec.is_haber_active_at_timestamp(timestamp) || chain_spec.is_cancun_active_at_timestamp(timestamp) {
BscHardfork::Haber // Both Haber and Cancun map to SpecId::CANCUN, handle testnet case where Cancun activates before Haber
Comment on lines +321 to +322
Copy link
Owner

@loocapro loocapro Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this still work for mainnet?

Copy link
Collaborator Author

@MatusKysel MatusKysel Jul 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, as Haber activation time equals Cancun time

} else if chain_spec.is_feynman_fix_active_at_timestamp(timestamp) {
BscHardfork::FeynmanFix
} else if chain_spec.is_feynman_active_at_timestamp(timestamp) {
Expand Down
Loading