From c1e61c592318f34f51e23cfe233b63044542fb15 Mon Sep 17 00:00:00 2001
From: Jorge Mederos <46798594+jmederosalvarado@users.noreply.github.com>
Date: Wed, 9 Nov 2022 04:24:09 -0500
Subject: [PATCH] Set chiado and xdai `Merge.SecondsPerSlot=5` (#4880)

* Set chiado `Merge.SecondsPerSlot=5`

* Update xdai configs with `Merge.SecondsPerSlot=5`

This commit is not relevant before the merge.
---
 src/Nethermind/Nethermind.Runner/configs/chiado.cfg      | 5 ++++-
 .../Nethermind.Runner/configs/chiado_archive.cfg         | 4 ++--
 src/Nethermind/Nethermind.Runner/configs/xdai.cfg        | 5 ++++-
 src/Nethermind/Nethermind.Runner/configs/xdai_aa.cfg     | 5 ++++-
 .../Nethermind.Runner/configs/xdai_archive.cfg           | 3 +++
 src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg    | 5 ++++-
 .../configs/xdai_nethermind_testnet.cfg                  | 5 ++++-
 .../Nethermind.Runner/configs/xdai_testnet.cfg           | 7 +++++--
 .../Nethermind.Runner/configs/xdai_themerge.cfg          | 3 +++
 .../Nethermind.Runner/configs/xdai_validator.cfg         | 9 ++++++---
 10 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/Nethermind/Nethermind.Runner/configs/chiado.cfg b/src/Nethermind/Nethermind.Runner/configs/chiado.cfg
index 673e95fb3c3..6c56d4fd3c0 100644
--- a/src/Nethermind/Nethermind.Runner/configs/chiado.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/chiado.cfg
@@ -18,6 +18,9 @@
     "PivotTotalDifficulty": "173544007129678616366321049790201787508836548",
     "FastSyncCatchUpHeightDelta": "10000000000"
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Aura": {
     "TxPriorityContractAddress": "0x4100000000000000000000000000000000000000",
     "ForceSealing": true
@@ -35,4 +38,4 @@
       16
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg
index 68951addc96..bb0e091fdd2 100644
--- a/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/chiado_archive.cfg
@@ -18,7 +18,7 @@
     "ForceSealing": true
   },
   "Merge": {
-    "Enabled": false
+    "SecondsPerSlot": 5
   },
   "AuRaMerge": {
     "Enabled": false
@@ -36,4 +36,4 @@
       16
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai.cfg
index ff76b659a76..5769d7b4965 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai.cfg
@@ -15,6 +15,9 @@
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Mining": {
     "MinGasPrice": "1000000000"
   },
@@ -31,4 +34,4 @@
       16
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_aa.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_aa.cfg
index a8eaa9117af..be278650565 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_aa.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_aa.cfg
@@ -16,6 +16,9 @@
       "AccountAbstraction"
     ]
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "AccountAbstraction": {
     "Enabled": true,
     "EntryPointContractAddresses": "0xD3ebD80aFf10B54795708Ece1d6D3253e3258A05"
@@ -45,4 +48,4 @@
       16
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg
index 76ebac51dae..344c054cc3e 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_archive.cfg
@@ -9,6 +9,9 @@
   "Mining": {
     "MinGasPrice": "1000000000"
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "EthStats": {
     "Name": "Nethermind xDai"
   },
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg
index dda9f02fba7..80dec10455c 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_mev.cfg
@@ -15,6 +15,9 @@
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Mining": {
     "MinGasPrice": "1000000000"
   },
@@ -35,4 +38,4 @@
     "Enabled": true,
     "MaxMergedBundles": 3
   }
-}
\ No newline at end of file
+}
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_nethermind_testnet.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_nethermind_testnet.cfg
index 709c716cd82..a3329ff8d09 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_nethermind_testnet.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_nethermind_testnet.cfg
@@ -1,5 +1,5 @@
 {
-  "Init": { 
+  "Init": {
     "IsMining": true,
     "ChainSpecPath": "chainspec/xdai_nethermind_testnet.json",
     "GenesisHash": "0x0ae5a04b393944ed5c796c8a8c7bf49e163b4073c52e53d7aed7390842d0077c",
@@ -33,6 +33,9 @@
     "UseGethLimitsInFastBlocks": false,
     "FastSyncCatchUpHeightDelta": 10000000000
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Mining": {
     "MinGasPrice": "1000000000"
   },
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_testnet.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_testnet.cfg
index bd5e6982607..af22cc16090 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_testnet.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_testnet.cfg
@@ -1,5 +1,5 @@
 {
-  "Init": { 
+  "Init": {
     "ChainSpecPath": "chainspec/xdai_testnet.json",
     "GenesisHash": "0xe3a527b7597f94a4c5ffd7808d2542b011c6c21c7e8df6f7564deb7614e89fe7",
     "BaseDbPath": "nethermind_db/xdai_testnet",
@@ -41,13 +41,16 @@
     "Secret": "NCVJlJOl4Z",
     "Contact": "security@poanetwork.com"
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Metrics": {
     "NodeName": "Validator4 on xdaitestnet",
     "Enabled": true,
     "PushGatewayUrl": "https://metrics.nethermind.io/metrics/validators-Ifa0eigee0deigah8doo5aisaeNa8huichahk5baip2daitholaeh4xiey0iec1vai6Nahxae1aeregul5Diehae7aeThengei7X",
     "IntervalSeconds": 30
   },
-  "Aura": {   
+  "Aura": {
     "TxPriorityContractAddress": "0x4100000000000000000000000000000000000000"
   },
   "Mining": {
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_themerge.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_themerge.cfg
index 6cf06425b3f..3dc69e2d46f 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_themerge.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_themerge.cfg
@@ -41,6 +41,9 @@
     "Secret": "secret",
     "Contact": "hello@nethermind.io"
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Metrics": {
     "NodeName": "xDai TheMerge",
     "Enabled": false,
diff --git a/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg b/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg
index b7f2d987cb6..ae2a44a7815 100644
--- a/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg
+++ b/src/Nethermind/Nethermind.Runner/configs/xdai_validator.cfg
@@ -1,5 +1,5 @@
 {
-  "Init": {      
+  "Init": {
     "StoreReceipts" : false,
     "IsMining": true,
     "ChainSpecPath": "chainspec/xdai.json",
@@ -10,7 +10,7 @@
   },
   "Sync": {
     "FastSync": true,
-    "DownloadReceiptsInFastSync": false,    
+    "DownloadReceiptsInFastSync": false,
     "PivotNumber" : 8000000,
     "PivotHash" : "0xb27a82d1cd3cdbfd5cdb276bfb46bc4fd71776b47045081f83c732e78e3e1089",
     "PivotTotalDifficulty" : "2722258935367507707706996859000000000000000000",
@@ -24,10 +24,13 @@
   "EthStats": {
     "Name": "Nethermind xDai"
   },
+  "Merge": {
+    "SecondsPerSlot": 5
+  },
   "Metrics": {
     "NodeName": "xDai Validator"
   },
   "Bloom": {
     "Index" : false
-  }  
+  }
 }