Merge 5969436 into 510f310

ChainSafe · May 31, 2022 · 1ae9adf · 1ae9adf
2 parents 510f310 + 5969436
commit 1ae9adf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -27,18 +27,11 @@ module.exports = {
     "prettier/prettier": "error",
     //doesnt work, it reports false errors
     "constructor-super": "off",
-    "import/order" : [
+    "import/order": [
       "error",
-      { "groups":
-          [
-            "builtin",
-            "external",
-            "internal",
-            "parent",
-            "sibling",
-            "index",
-          ],
-      }
+      {
+        groups: ["builtin", "external", "internal", "parent", "sibling", "index"],
+      },
     ],
     "@typescript-eslint/await-thenable": "error",
     "@typescript-eslint/naming-convention": [
@@ -127,6 +120,7 @@ module.exports = {
     "import/no-relative-packages": "error",
     "@chainsafe/node/no-deprecated-api": "error",
     "new-parens": "error",
+    "no-loss-of-precision": "error",
     "no-caller": "error",
     "no-bitwise": "off",
     "no-cond-assign": "error",
@@ -166,13 +160,7 @@ module.exports = {
     // TEMP Disabled while eslint-plugin-import support ESM (Typescript does support it) https://github.com/import-js/eslint-plugin-import/issues/2170
     "import/no-unresolved": "off",
 
-    "@chainsafe/node/file-extension-in-import": [
-      "error",
-      "always",
-      {
-        "esm": true
-      }
-    ],
+    "@chainsafe/node/file-extension-in-import": ["error", "always", {esm: true}],
   },
   settings: {
     "import/internal-regex": "^@chainsafe/",

diff --git a/packages/config/src/chainConfig/networks/kiln.ts b/packages/config/src/chainConfig/networks/kiln.ts
@@ -22,7 +22,7 @@ export const kilnChainConfig: IChainConfig = {
   // Bellatrix
   BELLATRIX_FORK_VERSION: b("0x70000071"),
   BELLATRIX_FORK_EPOCH: 150,
-  TERMINAL_TOTAL_DIFFICULTY: BigInt(20000000000000),
+  TERMINAL_TOTAL_DIFFICULTY: BigInt("20000000000000"),
   // Sharding
   SHARDING_FORK_VERSION: b("0x03000000"),
   SHARDING_FORK_EPOCH: Infinity,

diff --git a/packages/config/src/chainConfig/networks/ropsten.ts b/packages/config/src/chainConfig/networks/ropsten.ts
@@ -26,7 +26,7 @@ export const ropstenChainConfig: IChainConfig = {
   // # Merge
   BELLATRIX_FORK_VERSION: b("0x80000071"),
   BELLATRIX_FORK_EPOCH: 750,
-  TERMINAL_TOTAL_DIFFICULTY: BigInt(100000000000000000000000),
+  TERMINAL_TOTAL_DIFFICULTY: BigInt("100000000000000000000000"),
   // # Sharding
   SHARDING_FORK_VERSION: b("0x03001020"),
   SHARDING_FORK_EPOCH: Infinity,

diff --git a/packages/validator/src/util/params.ts b/packages/validator/src/util/params.ts
@@ -78,9 +78,11 @@ function getSpecCriticalParams(localConfig: IChainConfig): Record<keyof ConfigWi
     ///////////
 
     PRESET_BASE: false, // Not relevant, each preset value is checked below
-    TERMINAL_TOTAL_DIFFICULTY: bellatrixForkRelevant,
-    TERMINAL_BLOCK_HASH: bellatrixForkRelevant,
-    TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: bellatrixForkRelevant,
+    // validator client behaviour does not change with this parameters, so it's not concerned about them.
+    // However, with the override ttd flag, the validator and beacon could be out of sync and prevent it from running.
+    TERMINAL_TOTAL_DIFFICULTY: false,
+    TERMINAL_BLOCK_HASH: false,
+    TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: false,
 
     // Genesis
     MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: true,