set Osaka fork configurations for mainnet (#3807)

Author: tersec

execution_chain/common/chain_config.nim

@@ -7,7 +7,7 @@
 # This file may not be copied, modified, or distributed except according to
 # those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   std/[tables, strutils, times, macros],
@@ -103,7 +103,7 @@ type
     address: Address
     account: GenesisAccount
 
-proc read*(rlp: var Rlp, T: type AddressBalance): T {.gcsafe, raises: [RlpError].}=
+proc read*(rlp: var Rlp, T: type AddressBalance): T {.raises: [RlpError].}=
   let listLen = rlp.listLen
   rlp.tryEnterList()
   let abytes = rlp.read(UInt256).to(Bytes32)
@@ -544,6 +544,9 @@ func chainConfigForNetwork*(id: NetworkId): ChainConfig =
       shanghaiTime:        Opt.some(1_681_338_455.EthTime),  # 2023-04-12 10:27:35 UTC
       cancunTime:          Opt.some(1_710_338_135.EthTime),  # 2024-03-13 13:55:35 UTC
       pragueTime:          Opt.some(1_746_612_311.EthTime),  # 2025-05-07 10:05:11 UTC
+      osakaTime:           Opt.some(1_764_798_551.EthTime),  # 2025-12-03 21:49:11 UTC
+      bpo1Time:            Opt.some(1_765_290_071.EthTime),  # 2025-12-09 14:21:11 UTC
+      bpo2Time:            Opt.some(1_767_747_671.EthTime),  # 2026-01-07 01:01:11 UTC
       depositContractAddress: Opt.some(MAINNET_DEPOSIT_CONTRACT_ADDRESS),
       blobSchedule:        defaultBlobSchedule(),
     )

execution_chain/nimbus.nim

@@ -42,7 +42,6 @@ import
     conf as ecconf,
     el_sync,
     nimbus_desc,
-    el_sync,
     nimbus_execution_client,
     version_info,
   ]
@@ -354,7 +353,7 @@ proc main() {.noinline, raises: [CatchableError].} =
     setupLogging(config.logLevel, config.logStdout, none OutFile)
     setupFileLimits()
 
-    if not (checkAndCreateDataDir(string(config.dataDir))):
+    if not (checkAndCreateDataDir(config.dataDir)):
       # We are unable to access/create data folder or data folder's
       # permissions are insecure.
       quit QuitFailure

portal/rpc/portal_rpc_client.nim

@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   json_serialization,
@@ -40,7 +40,7 @@ proc init*(T: type PortalRpcClient, rpcClient: RpcClient): T =
 func toPortalRpcError*(error: string): PortalErrorResponse =
   try:
     Json.decode(error, PortalErrorResponse)
-  except SerializationError as e:
+  except SerializationError:
     PortalErrorResponse(code: InvalidJsonRpcError, message: error)
 
 template toBytes(content: string): seq[byte] =

tests/test_forkid.nim

@@ -8,6 +8,8 @@
 # at your option. This file may not be copied, modified, or distributed except
 # according to those terms.
 
+{.push raises: [], gcsafe.}
+
 import
   std/strutils,
   unittest2,
@@ -47,8 +49,14 @@ const
     (number: 15050000'u64, time: 1710338134'u64, id: (crc: 0xdce96c2d'u32, next: 1710338135'u64)), # Last Shanghai time
     (number: 15050000'u64, time: 1710338135'u64, id: (crc: 0x9f3d2254'u32, next: 1746612311'u64)), # First Cancun time
     (number: 15050000'u64, time: 1746612310'u64, id: (crc: 0x9f3d2254'u32, next: 1746612311'u64)), # Last Cancun time
-    (number: 15050000'u64, time: 1746612311'u64, id: (crc: 0xc376cf8b'u32, next: 0'u64)),          # First Prague time
-    (number: 15050000'u64, time: 2746612311'u64, id: (crc: 0xc376cf8b'u32, next: 0'u64)),          # Future Prague time
+    (number: 15050000'u64, time: 1746612311'u64, id: (crc: 0xc376cf8b'u32, next: 1764798551'u64)), # First Prague time
+    (number: 15050000'u64, time: 1764798550'u64, id: (crc: 0xc376cf8b'u32, next: 1764798551'u64)), # Last Prague time
+    (number: 15050000'u64, time: 1764798551'u64, id: (crc: 0x5167e2a6'u32, next: 1765290071'u64)), # First Osaka time
+    (number: 15050000'u64, time: 1765290070'u64, id: (crc: 0x5167e2a6'u32, next: 1765290071'u64)), # Last Osaka time
+    (number: 15050000'u64, time: 1765290071'u64, id: (crc: 0xcba2a1c0'u32, next: 1767747671'u64)), # First BPO1 time
+    (number: 15050000'u64, time: 1767747670'u64, id: (crc: 0xcba2a1c0'u32, next: 1767747671'u64)), # Last BPO1 time
+    (number: 15050000'u64, time: 1767747671'u64, id: (crc: 0x07c9462e'u32, next: 0'u64)),          # First BPO2 time
+    (number: 15050000'u64, time: 1767747672'u64, id: (crc: 0x07c9462e'u32, next: 0'u64)),          # Future BPO2 time
   ]
 
   SepoliaNetIDs = [