From 125509e483326d77eb810fdc33a64d30ed98e18f Mon Sep 17 00:00:00 2001
From: Andrew Ashikhmin <34320705+yperbasis@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:07:00 +0100
Subject: [PATCH] Finalize cancun/napoli HF block number for polygon mainnet
 (#9674)

Cherry pick PR #9603

Block number: 54876000 (March 20th, 2024 at around 10.30 AM UTC)

---------

Co-authored-by: Manav Darji <manavdarji.india@gmail.com>
---
 core/forkid/forkid_test.go         | 3 ++-
 params/chainspecs/bor-devnet.json  | 3 ++-
 params/chainspecs/bor-mainnet.json | 3 ++-
 params/version.go                  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go
index 200940e9206..cfd08e1d3c9 100644
--- a/core/forkid/forkid_test.go
+++ b/core/forkid/forkid_test.go
@@ -185,7 +185,8 @@ func TestCreation(t *testing.T) {
 				{3395000, 0, ID{Hash: checksumToBytes(0x27806576), Next: 14750000}},  // First Istanbul block
 				{14750000, 0, ID{Hash: checksumToBytes(0x66e26adb), Next: 23850000}}, // First Berlin block
 				{23850000, 0, ID{Hash: checksumToBytes(0x4f2f71cc), Next: 50523000}}, // First London block
-				{50523000, 0, ID{Hash: checksumToBytes(0xdc08865c), Next: 0}},        // First Agra block
+				{50523000, 0, ID{Hash: checksumToBytes(0xdc08865c), Next: 54876000}}, // First Agra block
+				{54876000, 0, ID{Hash: checksumToBytes(0xf097bc13), Next: 0}},        // First Napoli block
 			},
 		},
 	}
diff --git a/params/chainspecs/bor-devnet.json b/params/chainspecs/bor-devnet.json
index e41007f9535..a032cd8a96a 100644
--- a/params/chainspecs/bor-devnet.json
+++ b/params/chainspecs/bor-devnet.json
@@ -51,6 +51,7 @@
     "jaipurBlock": 0,
     "delhiBlock": 0,
     "indoreBlock": 0,
-    "agraBlock": 100
+    "agraBlock": 100,
+    "napoliBlock": 100
   }
 }
diff --git a/params/chainspecs/bor-mainnet.json b/params/chainspecs/bor-mainnet.json
index 31bfe8da041..ec487e571e5 100644
--- a/params/chainspecs/bor-mainnet.json
+++ b/params/chainspecs/bor-mainnet.json
@@ -64,6 +64,7 @@
     "jaipurBlock": 23850000,
     "delhiBlock": 38189056,
     "indoreBlock": 44934656,
-    "agraBlock": 50523000
+    "agraBlock": 50523000,
+    "napoliBlock": 54876000
   }
 }
diff --git a/params/version.go b/params/version.go
index 255d9a534d2..71e5c071480 100644
--- a/params/version.go
+++ b/params/version.go
@@ -33,7 +33,7 @@ var (
 const (
 	VersionMajor       = 2  // Major version component of the current release
 	VersionMinor       = 58 // Minor version component of the current release
-	VersionMicro       = 1  // Patch version component of the current release
+	VersionMicro       = 2  // Patch version component of the current release
 	VersionModifier    = "" // Modifier component of the current release
 	VersionKeyCreated  = "ErigonVersionCreated"
 	VersionKeyFinished = "ErigonVersionFinished"