From 30b4ddb5f9053af40df78e02be2c8a302d02eb22 Mon Sep 17 00:00:00 2001
From: Dan Cline <6798349+Rjected@users.noreply.github.com>
Date: Wed, 20 Sep 2023 19:09:18 -0400
Subject: [PATCH] fix: add CANCUN to revm_spec_by_timestamp_after_merge (#4699)

---
 crates/revm/revm-primitives/src/config.rs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/crates/revm/revm-primitives/src/config.rs b/crates/revm/revm-primitives/src/config.rs
index 22d5a15cf0e4..1ea528d1ed51 100644
--- a/crates/revm/revm-primitives/src/config.rs
+++ b/crates/revm/revm-primitives/src/config.rs
@@ -10,7 +10,9 @@ pub fn revm_spec_by_timestamp_after_merge(
     chain_spec: &ChainSpec,
     timestamp: u64,
 ) -> revm::primitives::SpecId {
-    if chain_spec.is_fork_active_at_timestamp(Hardfork::Shanghai, timestamp) {
+    if chain_spec.is_cancun_activated_at_timestamp(timestamp) {
+        revm::primitives::CANCUN
+    } else if chain_spec.is_shanghai_activated_at_timestamp(timestamp) {
         revm::primitives::SHANGHAI
     } else {
         revm::primitives::MERGE
@@ -57,6 +59,14 @@ mod tests {
     use reth_primitives::{ChainSpecBuilder, Head, MAINNET, U256};
     #[test]
     fn test_to_revm_spec() {
+        assert_eq!(
+            revm_spec(&ChainSpecBuilder::mainnet().cancun_activated().build(), Head::default()),
+            revm::primitives::CANCUN
+        );
+        assert_eq!(
+            revm_spec(&ChainSpecBuilder::mainnet().shanghai_activated().build(), Head::default()),
+            revm::primitives::SHANGHAI
+        );
         assert_eq!(
             revm_spec(&ChainSpecBuilder::mainnet().paris_activated().build(), Head::default()),
             revm::primitives::MERGE