@lodestar/fork-choice 1.48.0-dev.b0ce010779 → 1.48.0-dev.b0ddac0ac2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/forkChoice/safeBlocks.d.ts +1 -1
  2. package/lib/forkChoice/safeBlocks.d.ts.map +1 -1
  3. package/lib/forkChoice/safeBlocks.js +6 -1
  4. package/lib/forkChoice/safeBlocks.js.map +1 -1
  5. package/package.json +8 -8
  6. package/src/forkChoice/safeBlocks.ts +10 -2
package/lib/forkChoice/safeBlocks.d.ts CHANGED
@@ -11,7 +11,7 @@ import { IForkChoice } from "./interface.js";
11
11
  *
12
12
  * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.14/specs/bellatrix/fast-confirmation.md#new-get_safe_execution_block_hash
13
13
  */
14
- export declare function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.debug>): RootHex;
14
+ export declare function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.debug | LogLevel.warn>): RootHex;
15
15
  /**
16
16
  * Get execution payload hash to report as `finalizedBlockHash` in `engine_forkchoiceUpdated`.
17
17
  * Mirrors `getSafeExecutionBlockHash`: post-Gloas returns the bid `parent_block_hash`.
package/lib/forkChoice/safeBlocks.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"safeBlocks.d.ts","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,OAAO,CAejH;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAE/E"}
1
+ {"version":3,"file":"safeBlocks.d.ts","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,WAAW,EACvB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GACpD,OAAO,CAoBT;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAE/E"}
package/lib/forkChoice/safeBlocks.js CHANGED
@@ -15,7 +15,12 @@ export function getSafeExecutionBlockHash(forkChoice, logger) {
15
15
  const confirmedRoot = forkChoice.getConfirmedRoot();
16
16
  const confirmedBlock = forkChoice.getConfirmedBlock();
17
17
  if (confirmedBlock === null) {
18
- throw new ForkChoiceError({ code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK, root: confirmedRoot });
18
+ const finalizedBlock = forkChoice.getFinalizedBlock();
19
+ logger?.warn("Confirmed block unavailable, using finalized block", {
20
+ confirmedRoot,
21
+ finalizedRoot: finalizedBlock.blockRoot,
22
+ });
23
+ return getExecutionBlockHash(finalizedBlock);
19
24
  }
20
25
  if (confirmedBlock.blockRoot === forkChoice.getFinalizedBlock().blockRoot) {
21
26
  logger?.debug("Confirmed block is the finalized block", {
package/lib/forkChoice/safeBlocks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"safeBlocks.js","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAC,eAAe,EAAE,aAAa,EAAc,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAGjE;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CAAC,UAAuB,EAAE,MAAqC;IACtG,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;IACtD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,eAAe,CAAC,EAAC,IAAI,EAAE,mBAAmB,CAAC,yBAAyB,EAAE,IAAI,EAAE,aAAa,EAAC,CAAC,CAAC;IACxG,CAAC;IAED,IAAI,cAAc,CAAC,SAAS,KAAK,UAAU,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;QAC1E,MAAM,EAAE,KAAK,CAAC,wCAAwC,EAAE;YACtD,SAAS,EAAE,cAAc,CAAC,SAAS;YACnC,IAAI,EAAE,cAAc,CAAC,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,qBAAqB,CAAC,cAAc,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,UAAuB;IACpE,OAAO,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAiB;IAC9C,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,8FAA8F;IAC9F,0FAA0F;IAC1F,yEAAyE;IACzE,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,EAAC,SAAS,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC;IAChC,IAAI,KAAK,CAAC,yBAAyB,KAAK,IAAI,IAAI,KAAK,CAAC,eAAe,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;QACnG,MAAM,IAAI,eAAe,CAAC;YACxB,IAAI,EAAE,mBAAmB,CAAC,oCAAoC;YAC9D,IAAI,EAAE,SAAS;YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC,yBAAyB,IAAI,aAAa,CAAC;AAC1D,CAAC"}
1
+ {"version":3,"file":"safeBlocks.js","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAC,eAAe,EAAE,aAAa,EAAc,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACpG,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAGjE;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CACvC,UAAuB,EACvB,MAAqD;IAErD,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;IACpD,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;IACtD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QAC5B,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;QACtD,MAAM,EAAE,IAAI,CAAC,oDAAoD,EAAE;YACjE,aAAa;YACb,aAAa,EAAE,cAAc,CAAC,SAAS;SACxC,CAAC,CAAC;QACH,OAAO,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,cAAc,CAAC,SAAS,KAAK,UAAU,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,CAAC;QAC1E,MAAM,EAAE,KAAK,CAAC,wCAAwC,EAAE;YACtD,SAAS,EAAE,cAAc,CAAC,SAAS;YACnC,IAAI,EAAE,cAAc,CAAC,IAAI;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,OAAO,qBAAqB,CAAC,cAAc,CAAC,CAAC;AAC/C,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,UAAuB;IACpE,OAAO,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC/D,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAiB;IAC9C,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,8FAA8F;IAC9F,0FAA0F;IAC1F,yEAAyE;IACzE,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,EAAC,SAAS,EAAE,IAAI,EAAC,GAAG,KAAK,CAAC;IAChC,IAAI,KAAK,CAAC,yBAAyB,KAAK,IAAI,IAAI,KAAK,CAAC,eAAe,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;QACnG,MAAM,IAAI,eAAe,CAAC;YACxB,IAAI,EAAE,mBAAmB,CAAC,oCAAoC;YAC9D,IAAI,EAAE,SAAS;YACf,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC,yBAAyB,IAAI,aAAa,CAAC;AAC1D,CAAC"}
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "bugs": {
12
12
  "url": "https://github.com/ChainSafe/lodestar/issues"
13
13
  },
14
- "version": "1.48.0-dev.b0ce010779",
14
+ "version": "1.48.0-dev.b0ddac0ac2",
15
15
  "type": "module",
16
16
  "exports": {
17
17
  ".": {
@@ -39,12 +39,12 @@
39
39
  "check-readme": "pnpm exec tsx ../../scripts/check_readme.ts"
40
40
  },
41
41
  "dependencies": {
42
- "@chainsafe/ssz": "^1.6.3",
43
- "@lodestar/config": "^1.48.0-dev.b0ce010779",
44
- "@lodestar/params": "^1.48.0-dev.b0ce010779",
45
- "@lodestar/state-transition": "^1.48.0-dev.b0ce010779",
46
- "@lodestar/types": "^1.48.0-dev.b0ce010779",
47
- "@lodestar/utils": "^1.48.0-dev.b0ce010779"
42
+ "@chainsafe/ssz": "^1.7.0",
43
+ "@lodestar/config": "^1.48.0-dev.b0ddac0ac2",
44
+ "@lodestar/params": "^1.48.0-dev.b0ddac0ac2",
45
+ "@lodestar/state-transition": "^1.48.0-dev.b0ddac0ac2",
46
+ "@lodestar/types": "^1.48.0-dev.b0ddac0ac2",
47
+ "@lodestar/utils": "^1.48.0-dev.b0ddac0ac2"
48
48
  },
49
49
  "keywords": [
50
50
  "ethereum",
@@ -52,5 +52,5 @@
52
52
  "beacon",
53
53
  "blockchain"
54
54
  ],
55
- "gitHead": "f92bab2a1cac36007e7c63d1504219c92b95407c"
55
+ "gitHead": "fcd0494c4012c5756427bf6c40d3092d068256d6"
56
56
  }
package/src/forkChoice/safeBlocks.ts CHANGED
@@ -15,11 +15,19 @@ import {IForkChoice} from "./interface.js";
15
15
  *
16
16
  * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.14/specs/bellatrix/fast-confirmation.md#new-get_safe_execution_block_hash
17
17
  */
18
- export function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.debug>): RootHex {
18
+ export function getSafeExecutionBlockHash(
19
+ forkChoice: IForkChoice,
20
+ logger?: Pick<Logger, LogLevel.debug | LogLevel.warn>
21
+ ): RootHex {
19
22
  const confirmedRoot = forkChoice.getConfirmedRoot();
20
23
  const confirmedBlock = forkChoice.getConfirmedBlock();
21
24
  if (confirmedBlock === null) {
22
- throw new ForkChoiceError({code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK, root: confirmedRoot});
25
+ const finalizedBlock = forkChoice.getFinalizedBlock();
26
+ logger?.warn("Confirmed block unavailable, using finalized block", {
27
+ confirmedRoot,
28
+ finalizedRoot: finalizedBlock.blockRoot,
29
+ });
30
+ return getExecutionBlockHash(finalizedBlock);
23
31
  }
24
32
 
25
33
  if (confirmedBlock.blockRoot === forkChoice.getFinalizedBlock().blockRoot) {