fix p2p incompatible forks for opbnb testnet and mainnet (#17)

* fix p2p incompatible forks for opbnb testnet and mainnet * fix blank line --------- Co-authored-by: Keefe Liu <[email protected]>
bnb-chain · May 24, 2024 · b636310 · b636310
1 parent 3c9d4a9
commit b636310
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/crates/ethereum-forks/src/forkid.rs b/crates/ethereum-forks/src/forkid.rs
@@ -229,6 +229,10 @@ impl ForkFilter {
         forks.remove(&ForkFilterKey::Time(0));
         forks.remove(&ForkFilterKey::Block(0));
 
+        // Skip Fermat hardfork for opbnb
+        forks.remove(&ForkFilterKey::Time(1698991506));
+        forks.remove(&ForkFilterKey::Time(1701151200));
+
         let forks = forks
             .into_iter()
             // filter out forks that are pre-genesis by timestamp

diff --git a/crates/primitives/src/chain/spec.rs b/crates/primitives/src/chain/spec.rs
@@ -526,6 +526,10 @@ pub static OPBNB_TESTNET: Lazy<Arc<ChainSpec>> = Lazy::new(|| {
             (Hardfork::Regolith, ForkCondition::Timestamp(0)),
             (Hardfork::PreContractForkBlock, ForkCondition::Block(5805494)),
             (Hardfork::Fermat, ForkCondition::Timestamp(1698991506)),
+            (Hardfork::Shanghai, ForkCondition::Timestamp(1715753400)),
+            (Hardfork::Canyon, ForkCondition::Timestamp(1715753400)),
+            (Hardfork::Cancun, ForkCondition::Timestamp(1715754600)),
+            (Hardfork::Ecotone, ForkCondition::Timestamp(1715754600)),
         ]),
         base_fee_params: BaseFeeParamsKind::Variable(
             vec![(Hardfork::London, BaseFeeParams::ethereum())].into(),
@@ -963,6 +967,11 @@ impl ChainSpec {
         }) {
             let cond = ForkCondition::Timestamp(timestamp);
             if cond.active_at_head(head) {
+                // Skip Fermat hardfork for opbnb
+                if timestamp == 1698991506 || timestamp == 1701151200 {
+                    continue;
+                }
+
                 if timestamp != current_applied {
                     forkhash += timestamp;
                     current_applied = timestamp;