@lodestar/beacon-node 1.20.0-dev.79a008f0c8 → 1.20.0-dev.7e35c924e7
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.
- package/lib/api/impl/beacon/blocks/index.js +10 -4
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/validator/index.js +17 -2
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/blocks/importBlock.js +7 -7
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/index.js +1 -2
- package/lib/chain/blocks/index.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +43 -37
- package/lib/chain/blocks/types.js +31 -15
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts +3 -3
- package/lib/chain/blocks/verifyBlock.js +1 -1
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.d.ts +2 -2
- package/lib/chain/blocks/verifyBlocksDataAvailability.js +17 -14
- package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.js +6 -6
- package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
- package/lib/chain/forkChoice/index.js +2 -1
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +34 -18
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/network/processor/gossipHandlers.js +2 -2
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +9 -3
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +10 -7
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
- package/lib/sync/interface.d.ts +1 -1
- package/lib/sync/range/chain.js +2 -2
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/unknownBlock.js +2 -2
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/sync/utils/pendingBlocksTree.js +1 -1
- package/lib/sync/utils/pendingBlocksTree.js.map +1 -1
- package/package.json +14 -14
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import { CachedBeaconStateAllForks
|
|
2
|
-
import { MaybeValidExecutionStatus } from "@lodestar/fork-choice";
|
|
1
|
+
import { CachedBeaconStateAllForks } from "@lodestar/state-transition";
|
|
2
|
+
import { MaybeValidExecutionStatus, DataAvailabilityStatus } from "@lodestar/fork-choice";
|
|
3
3
|
import { allForks, deneb, Slot, RootHex } from "@lodestar/types";
|
|
4
|
+
import { ForkName } from "@lodestar/params";
|
|
4
5
|
import { ChainForkConfig } from "@lodestar/config";
|
|
5
6
|
export declare enum BlockInputType {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
preData = "preData",
|
|
8
|
+
outOfRangeData = "outOfRangeData",
|
|
9
|
+
availableData = "availableData",
|
|
10
|
+
dataPromise = "dataPromise"
|
|
9
11
|
}
|
|
10
12
|
/** Enum to represent where blocks come from */
|
|
11
13
|
export declare enum BlockSource {
|
|
@@ -25,59 +27,63 @@ export declare enum GossipedInputType {
|
|
|
25
27
|
block = "block",
|
|
26
28
|
blob = "blob"
|
|
27
29
|
}
|
|
28
|
-
|
|
30
|
+
type BlobsCacheMap = Map<number, {
|
|
29
31
|
blobSidecar: deneb.BlobSidecar;
|
|
30
32
|
blobBytes: Uint8Array | null;
|
|
31
33
|
}>;
|
|
34
|
+
type ForkBlobsInfo = {
|
|
35
|
+
fork: ForkName.deneb;
|
|
36
|
+
};
|
|
37
|
+
type BlobsData = {
|
|
38
|
+
blobs: deneb.BlobSidecars;
|
|
39
|
+
blobsBytes: (Uint8Array | null)[];
|
|
40
|
+
blobsSource: BlobsSource;
|
|
41
|
+
};
|
|
42
|
+
export type BlockInputDataBlobs = ForkBlobsInfo & BlobsData;
|
|
43
|
+
export type BlockInputData = BlockInputDataBlobs;
|
|
32
44
|
export type BlockInputBlobs = {
|
|
33
45
|
blobs: deneb.BlobSidecars;
|
|
34
46
|
blobsBytes: (Uint8Array | null)[];
|
|
35
47
|
blobsSource: BlobsSource;
|
|
36
48
|
};
|
|
37
|
-
type
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
resolveAvailability: (blobs: BlockInputBlobs) => void;
|
|
49
|
+
type Availability<T> = {
|
|
50
|
+
availabilityPromise: Promise<T>;
|
|
51
|
+
resolveAvailability: (data: T) => void;
|
|
41
52
|
};
|
|
53
|
+
type CachedBlobs = {
|
|
54
|
+
blobsCache: BlobsCacheMap;
|
|
55
|
+
} & Availability<BlockInputDataBlobs>;
|
|
56
|
+
export type CachedData = ForkBlobsInfo & CachedBlobs;
|
|
42
57
|
export type BlockInput = {
|
|
43
58
|
block: allForks.SignedBeaconBlock;
|
|
44
59
|
source: BlockSource;
|
|
45
60
|
blockBytes: Uint8Array | null;
|
|
46
61
|
} & ({
|
|
47
|
-
type: BlockInputType.
|
|
62
|
+
type: BlockInputType.preData | BlockInputType.outOfRangeData;
|
|
48
63
|
} | ({
|
|
49
|
-
type: BlockInputType.
|
|
50
|
-
} &
|
|
51
|
-
|
|
52
|
-
}
|
|
64
|
+
type: BlockInputType.availableData;
|
|
65
|
+
} & {
|
|
66
|
+
blockData: BlockInputData;
|
|
67
|
+
}) | ({
|
|
68
|
+
type: BlockInputType.dataPromise;
|
|
69
|
+
} & {
|
|
70
|
+
cachedData: CachedData;
|
|
71
|
+
}));
|
|
53
72
|
export type NullBlockInput = {
|
|
54
73
|
block: null;
|
|
55
74
|
blockRootHex: RootHex;
|
|
56
75
|
blockInputPromise: Promise<BlockInput>;
|
|
57
|
-
} &
|
|
76
|
+
} & {
|
|
77
|
+
cachedData: CachedData;
|
|
78
|
+
};
|
|
58
79
|
export declare function blockRequiresBlobs(config: ChainForkConfig, blockSlot: Slot, clockSlot: Slot): boolean;
|
|
59
80
|
export declare const getBlockInput: {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
kzgCommitment: import("@chainsafe/ssz").ByteVectorType;
|
|
65
|
-
kzgProof: import("@chainsafe/ssz").ByteVectorType;
|
|
66
|
-
signedBlockHeader: import("@chainsafe/ssz").ContainerType<{
|
|
67
|
-
message: import("@chainsafe/ssz").ContainerType<{
|
|
68
|
-
slot: import("@chainsafe/ssz").UintNumberType;
|
|
69
|
-
proposerIndex: import("@chainsafe/ssz").UintNumberType;
|
|
70
|
-
parentRoot: import("@chainsafe/ssz").ByteVectorType;
|
|
71
|
-
stateRoot: import("@chainsafe/ssz").ByteVectorType;
|
|
72
|
-
bodyRoot: import("@chainsafe/ssz").ByteVectorType;
|
|
73
|
-
}>;
|
|
74
|
-
signature: import("@chainsafe/ssz").ByteVectorType;
|
|
75
|
-
}>;
|
|
76
|
-
kzgCommitmentInclusionProof: import("@chainsafe/ssz").VectorCompositeType<import("@chainsafe/ssz").ByteVectorType>;
|
|
77
|
-
}>[], blobsSource: BlobsSource, blockBytes: Uint8Array | null, blobsBytes: (Uint8Array | null)[]): BlockInput;
|
|
78
|
-
blobsPromise(config: ChainForkConfig, block: allForks.SignedBeaconBlock, source: BlockSource, blobsCache: BlobsCache, blockBytes: Uint8Array | null, availabilityPromise: Promise<BlockInputBlobs>, resolveAvailability: (blobs: BlockInputBlobs) => void): BlockInput;
|
|
81
|
+
preData(config: ChainForkConfig, block: allForks.SignedBeaconBlock, source: BlockSource, blockBytes: Uint8Array | null): BlockInput;
|
|
82
|
+
outOfRangeData(config: ChainForkConfig, block: allForks.SignedBeaconBlock, source: BlockSource, blockBytes: Uint8Array | null): BlockInput;
|
|
83
|
+
availableData(config: ChainForkConfig, block: allForks.SignedBeaconBlock, source: BlockSource, blockBytes: Uint8Array | null, blockData: BlockInputData): BlockInput;
|
|
84
|
+
dataPromise(config: ChainForkConfig, block: allForks.SignedBeaconBlock, source: BlockSource, blockBytes: Uint8Array | null, cachedData: CachedData): BlockInput;
|
|
79
85
|
};
|
|
80
|
-
export declare function getBlockInputBlobs(blobsCache:
|
|
86
|
+
export declare function getBlockInputBlobs(blobsCache: BlobsCacheMap): Omit<BlobsData, "blobsSource">;
|
|
81
87
|
export declare enum AttestationImportOpt {
|
|
82
88
|
Skip = 0,
|
|
83
89
|
Force = 1
|
|
@@ -145,7 +151,7 @@ export type FullyVerifiedBlock = {
|
|
|
145
151
|
* used in optimistic sync or for merge block
|
|
146
152
|
*/
|
|
147
153
|
executionStatus: MaybeValidExecutionStatus;
|
|
148
|
-
|
|
154
|
+
dataAvailabilityStatus: DataAvailabilityStatus;
|
|
149
155
|
/** Seen timestamp seconds */
|
|
150
156
|
seenTimestampSec: number;
|
|
151
157
|
};
|
|
@@ -2,9 +2,12 @@ import { computeEpochAtSlot } from "@lodestar/state-transition";
|
|
|
2
2
|
import { ForkSeq } from "@lodestar/params";
|
|
3
3
|
export var BlockInputType;
|
|
4
4
|
(function (BlockInputType) {
|
|
5
|
-
|
|
6
|
-
BlockInputType["
|
|
7
|
-
|
|
5
|
+
// preData is preDeneb
|
|
6
|
+
BlockInputType["preData"] = "preData";
|
|
7
|
+
// data is out of available window, can be used to sync forward and keep adding to forkchoice
|
|
8
|
+
BlockInputType["outOfRangeData"] = "outOfRangeData";
|
|
9
|
+
BlockInputType["availableData"] = "availableData";
|
|
10
|
+
BlockInputType["dataPromise"] = "dataPromise";
|
|
8
11
|
})(BlockInputType || (BlockInputType = {}));
|
|
9
12
|
/** Enum to represent where blocks come from */
|
|
10
13
|
export var BlockSource;
|
|
@@ -33,43 +36,56 @@ export function blockRequiresBlobs(config, blockSlot, clockSlot) {
|
|
|
33
36
|
computeEpochAtSlot(blockSlot) >= computeEpochAtSlot(clockSlot) - config.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS);
|
|
34
37
|
}
|
|
35
38
|
export const getBlockInput = {
|
|
36
|
-
|
|
39
|
+
preData(config, block, source, blockBytes) {
|
|
37
40
|
if (config.getForkSeq(block.message.slot) >= ForkSeq.deneb) {
|
|
38
41
|
throw Error(`Post Deneb block slot ${block.message.slot}`);
|
|
39
42
|
}
|
|
40
43
|
return {
|
|
41
|
-
type: BlockInputType.
|
|
44
|
+
type: BlockInputType.preData,
|
|
42
45
|
block,
|
|
43
46
|
source,
|
|
44
47
|
blockBytes,
|
|
45
48
|
};
|
|
46
49
|
},
|
|
47
|
-
|
|
50
|
+
// This isn't used right now but we might enable importing blobs into forkchoice from a point
|
|
51
|
+
// where data is not guaranteed to be available to hopefully reach a point where we have
|
|
52
|
+
// available data. Hence the validator duties can't be performed on outOfRangeData
|
|
53
|
+
//
|
|
54
|
+
// This can help with some of the requests of syncing without data for some use cases for e.g.
|
|
55
|
+
// building states or where importing data isn't important if valid child exists like ILs
|
|
56
|
+
outOfRangeData(config, block, source, blockBytes) {
|
|
48
57
|
if (config.getForkSeq(block.message.slot) < ForkSeq.deneb) {
|
|
49
58
|
throw Error(`Pre Deneb block slot ${block.message.slot}`);
|
|
50
59
|
}
|
|
51
60
|
return {
|
|
52
|
-
type: BlockInputType.
|
|
61
|
+
type: BlockInputType.outOfRangeData,
|
|
53
62
|
block,
|
|
54
63
|
source,
|
|
55
|
-
blobs,
|
|
56
|
-
blobsSource,
|
|
57
64
|
blockBytes,
|
|
58
|
-
blobsBytes,
|
|
59
65
|
};
|
|
60
66
|
},
|
|
61
|
-
|
|
67
|
+
availableData(config, block, source, blockBytes, blockData) {
|
|
62
68
|
if (config.getForkSeq(block.message.slot) < ForkSeq.deneb) {
|
|
63
69
|
throw Error(`Pre Deneb block slot ${block.message.slot}`);
|
|
64
70
|
}
|
|
65
71
|
return {
|
|
66
|
-
type: BlockInputType.
|
|
72
|
+
type: BlockInputType.availableData,
|
|
67
73
|
block,
|
|
68
74
|
source,
|
|
69
|
-
blobsCache,
|
|
70
75
|
blockBytes,
|
|
71
|
-
|
|
72
|
-
|
|
76
|
+
blockData,
|
|
77
|
+
};
|
|
78
|
+
},
|
|
79
|
+
dataPromise(config, block, source, blockBytes, cachedData) {
|
|
80
|
+
if (config.getForkSeq(block.message.slot) < ForkSeq.deneb) {
|
|
81
|
+
throw Error(`Pre Deneb block slot ${block.message.slot}`);
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
type: BlockInputType.dataPromise,
|
|
85
|
+
block,
|
|
86
|
+
source,
|
|
87
|
+
blockBytes,
|
|
88
|
+
cachedData,
|
|
73
89
|
};
|
|
74
90
|
},
|
|
75
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/chain/blocks/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,kBAAkB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/chain/blocks/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { CachedBeaconStateAllForks
|
|
2
|
-
import { ProtoBlock } from "@lodestar/fork-choice";
|
|
1
|
+
import { CachedBeaconStateAllForks } from "@lodestar/state-transition";
|
|
2
|
+
import { ProtoBlock, DataAvailabilityStatus } from "@lodestar/fork-choice";
|
|
3
3
|
import { BlockProcessOpts } from "../options.js";
|
|
4
4
|
import type { BeaconChain } from "../chain.js";
|
|
5
5
|
import { BlockInput, ImportBlockOpts } from "./types.js";
|
|
@@ -19,7 +19,7 @@ export declare function verifyBlocksInEpoch(this: BeaconChain, parentBlock: Prot
|
|
|
19
19
|
postStates: CachedBeaconStateAllForks[];
|
|
20
20
|
proposerBalanceDeltas: number[];
|
|
21
21
|
segmentExecStatus: SegmentExecStatus;
|
|
22
|
-
dataAvailabilityStatuses:
|
|
22
|
+
dataAvailabilityStatuses: DataAvailabilityStatus[];
|
|
23
23
|
availableBlockInputs: BlockInput[];
|
|
24
24
|
}>;
|
|
25
25
|
//# sourceMappingURL=verifyBlock.d.ts.map
|
|
@@ -117,7 +117,7 @@ export async function verifyBlocksInEpoch(parentBlock, blocksInput, opts) {
|
|
|
117
117
|
if (blocksInput.length === 1 &&
|
|
118
118
|
// gossip blocks have seenTimestampSec
|
|
119
119
|
opts.seenTimestampSec !== undefined &&
|
|
120
|
-
blocksInput[0].type !== BlockInputType.
|
|
120
|
+
blocksInput[0].type !== BlockInputType.preData &&
|
|
121
121
|
executionStatuses[0] === ExecutionStatus.Valid) {
|
|
122
122
|
// Find the max time when the block was actually verified
|
|
123
123
|
const fullyVerifiedTime = Math.max(executionTime, verifyStateTime, verifySignaturesTime);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyBlock.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAEL,kBAAkB,EAClB,+BAA+B,EAC/B,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAa,eAAe,
|
|
1
|
+
{"version":3,"file":"verifyBlock.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { DataAvailabilityStatus } from "@lodestar/fork-choice";
|
|
2
2
|
import { ChainForkConfig } from "@lodestar/config";
|
|
3
3
|
import { UintNum64 } from "@lodestar/types";
|
|
4
4
|
import { Logger } from "@lodestar/utils";
|
|
@@ -22,7 +22,7 @@ export declare function verifyBlocksDataAvailability(chain: {
|
|
|
22
22
|
logger: Logger;
|
|
23
23
|
metrics: Metrics | null;
|
|
24
24
|
}, blocks: BlockInput[], opts: ImportBlockOpts): Promise<{
|
|
25
|
-
dataAvailabilityStatuses:
|
|
25
|
+
dataAvailabilityStatuses: DataAvailabilityStatus[];
|
|
26
26
|
availableTime: number;
|
|
27
27
|
availableBlockInputs: BlockInput[];
|
|
28
28
|
}>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { computeTimeAtSlot
|
|
1
|
+
import { computeTimeAtSlot } from "@lodestar/state-transition";
|
|
2
|
+
import { DataAvailabilityStatus } from "@lodestar/fork-choice";
|
|
2
3
|
import { BlockError, BlockErrorCode } from "../errors/index.js";
|
|
3
4
|
import { validateBlobSidecars } from "../validation/blobSidecar.js";
|
|
4
5
|
import { BlockInputType, BlobSidecarValidation, getBlockInput } from "./types.js";
|
|
@@ -31,8 +32,8 @@ export async function verifyBlocksDataAvailability(chain, blocks, opts) {
|
|
|
31
32
|
dataAvailabilityStatuses.push(dataAvailabilityStatus);
|
|
32
33
|
availableBlockInputs.push(availableBlockInput);
|
|
33
34
|
}
|
|
34
|
-
const availableTime = blocks[blocks.length - 1].type === BlockInputType.
|
|
35
|
-
if (blocks.length === 1 && opts.seenTimestampSec !== undefined && blocks[0].type !== BlockInputType.
|
|
35
|
+
const availableTime = blocks[blocks.length - 1].type === BlockInputType.dataPromise ? Date.now() : seenTime;
|
|
36
|
+
if (blocks.length === 1 && opts.seenTimestampSec !== undefined && blocks[0].type !== BlockInputType.preData) {
|
|
36
37
|
const recvToAvailableTime = availableTime / 1000 - opts.seenTimestampSec;
|
|
37
38
|
const numBlobs = blocks[0].block.message.body.blobKzgCommitments.length;
|
|
38
39
|
chain.metrics?.gossipBlock.receivedToBlobsAvailabilityTime.observe({ numBlobs }, recvToAvailableTime);
|
|
@@ -46,29 +47,31 @@ export async function verifyBlocksDataAvailability(chain, blocks, opts) {
|
|
|
46
47
|
}
|
|
47
48
|
async function maybeValidateBlobs(chain, blockInput, opts) {
|
|
48
49
|
switch (blockInput.type) {
|
|
49
|
-
case BlockInputType.
|
|
50
|
-
return { dataAvailabilityStatus:
|
|
51
|
-
case BlockInputType.
|
|
50
|
+
case BlockInputType.preData:
|
|
51
|
+
return { dataAvailabilityStatus: DataAvailabilityStatus.PreData, availableBlockInput: blockInput };
|
|
52
|
+
case BlockInputType.outOfRangeData:
|
|
53
|
+
return { dataAvailabilityStatus: DataAvailabilityStatus.OutOfRange, availableBlockInput: blockInput };
|
|
54
|
+
case BlockInputType.availableData:
|
|
52
55
|
if (opts.validBlobSidecars === BlobSidecarValidation.Full) {
|
|
53
|
-
return { dataAvailabilityStatus:
|
|
56
|
+
return { dataAvailabilityStatus: DataAvailabilityStatus.Available, availableBlockInput: blockInput };
|
|
54
57
|
}
|
|
55
58
|
// eslint-disable-next-line no-fallthrough
|
|
56
|
-
case BlockInputType.
|
|
59
|
+
case BlockInputType.dataPromise: {
|
|
57
60
|
// run full validation
|
|
58
61
|
const { block } = blockInput;
|
|
59
62
|
const blockSlot = block.message.slot;
|
|
60
|
-
const blobsData = blockInput.type === BlockInputType.
|
|
61
|
-
? blockInput
|
|
62
|
-
: await raceWithCutoff(chain, blockInput, blockInput.availabilityPromise);
|
|
63
|
-
const { blobs
|
|
63
|
+
const blobsData = blockInput.type === BlockInputType.availableData
|
|
64
|
+
? blockInput.blockData
|
|
65
|
+
: await raceWithCutoff(chain, blockInput, blockInput.cachedData.availabilityPromise);
|
|
66
|
+
const { blobs } = blobsData;
|
|
64
67
|
const { blobKzgCommitments } = block.message.body;
|
|
65
68
|
const beaconBlockRoot = chain.config.getForkTypes(blockSlot).BeaconBlock.hashTreeRoot(block.message);
|
|
66
69
|
// if the blob siddecars have been individually verified then we can skip kzg proof check
|
|
67
70
|
// but other checks to match blobs with block data still need to be performed
|
|
68
71
|
const skipProofsCheck = opts.validBlobSidecars === BlobSidecarValidation.Individual;
|
|
69
72
|
validateBlobSidecars(blockSlot, beaconBlockRoot, blobKzgCommitments, blobs, { skipProofsCheck });
|
|
70
|
-
const availableBlockInput = getBlockInput.
|
|
71
|
-
return { dataAvailabilityStatus:
|
|
73
|
+
const availableBlockInput = getBlockInput.availableData(chain.config, blockInput.block, blockInput.source, blockInput.blockBytes, blobsData);
|
|
74
|
+
return { dataAvailabilityStatus: DataAvailabilityStatus.Available, availableBlockInput: availableBlockInput };
|
|
72
75
|
}
|
|
73
76
|
}
|
|
74
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"verifyBlocksDataAvailability.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksDataAvailability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"verifyBlocksDataAvailability.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksDataAvailability.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,11 +26,11 @@ export async function writeBlockInputToDb(blocksInput) {
|
|
|
26
26
|
slot: block.message.slot,
|
|
27
27
|
root: blockRootHex,
|
|
28
28
|
});
|
|
29
|
-
if (blockInput.type === BlockInputType.
|
|
30
|
-
const blobSidecars = blockInput.type == BlockInputType.
|
|
31
|
-
? blockInput.blobs
|
|
29
|
+
if (blockInput.type === BlockInputType.availableData || blockInput.type === BlockInputType.dataPromise) {
|
|
30
|
+
const blobSidecars = blockInput.type == BlockInputType.availableData
|
|
31
|
+
? blockInput.blockData.blobs
|
|
32
32
|
: // At this point of import blobs are available and can be safely awaited
|
|
33
|
-
(await blockInput.availabilityPromise).blobs;
|
|
33
|
+
(await blockInput.cachedData.availabilityPromise).blobs;
|
|
34
34
|
// NOTE: Old blobs are pruned on archive
|
|
35
35
|
fnPromises.push(this.db.blobSidecars.add({ blockRoot, slot: block.message.slot, blobSidecars }));
|
|
36
36
|
this.logger.debug("Persisted blobSidecars to hot DB", {
|
|
@@ -54,8 +54,8 @@ export async function removeEagerlyPersistedBlockInputs(blockInputs) {
|
|
|
54
54
|
const blockRootHex = toHex(blockRoot);
|
|
55
55
|
if (!this.forkChoice.hasBlockHex(blockRootHex)) {
|
|
56
56
|
blockToRemove.push(block);
|
|
57
|
-
if (type === BlockInputType.
|
|
58
|
-
const blobSidecars = blockInput.blobs;
|
|
57
|
+
if (type === BlockInputType.availableData) {
|
|
58
|
+
const blobSidecars = blockInput.blockData.blobs;
|
|
59
59
|
blobsToRemove.push({ blockRoot, slot: block.message.slot, blobSidecars });
|
|
60
60
|
}
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAEtC,OAAO,EAAa,cAAc,EAAC,MAAM,YAAY,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAoB,WAAyB;IACpF,MAAM,UAAU,GAAoB,EAAE,CAAC;IAEvC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;QACrC,MAAM,EAAC,KAAK,EAAE,UAAU,EAAC,GAAG,UAAU,CAAC;QACvC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvG,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,UAAU,EAAE,CAAC;YACf,8CAA8C;YAC9C,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,mCAAmC,CAAC,GAAG,EAAE,CAAC;YACpE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC;QACnF,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,iCAAiC,CAAC,GAAG,EAAE,CAAC;YAClE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;YAC3C,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;YACxB,IAAI,EAAE,YAAY;SACnB,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { toHexString } from "@chainsafe/ssz";
|
|
2
|
-
import { ForkChoice, ProtoArray, ForkChoiceStore, ExecutionStatus, } from "@lodestar/fork-choice";
|
|
2
|
+
import { ForkChoice, ProtoArray, ForkChoiceStore, ExecutionStatus, DataAvailabilityStatus, } from "@lodestar/fork-choice";
|
|
3
3
|
import { getEffectiveBalanceIncrementsZeroInactive, isExecutionStateType, isMergeTransitionComplete, } from "@lodestar/state-transition";
|
|
4
4
|
import { computeAnchorCheckpoint } from "../initState.js";
|
|
5
5
|
import { ChainEvent } from "../emitter.js";
|
|
@@ -46,6 +46,7 @@ export function initializeForkChoice(config, emitter, currentSlot, state, opts,
|
|
|
46
46
|
executionStatus: blockHeader.slot === GENESIS_SLOT ? ExecutionStatus.Valid : ExecutionStatus.Syncing,
|
|
47
47
|
}
|
|
48
48
|
: { executionPayloadBlockHash: null, executionStatus: ExecutionStatus.PreMerge }),
|
|
49
|
+
dataAvailabilityStatus: DataAvailabilityStatus.PreData,
|
|
49
50
|
}, currentSlot), opts, logger);
|
|
50
51
|
}
|
|
51
52
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,eAAe,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chain/forkChoice/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { toHexString } from "@chainsafe/ssz";
|
|
2
2
|
import { ssz } from "@lodestar/types";
|
|
3
3
|
import { pruneSetToMax } from "@lodestar/utils";
|
|
4
|
-
import { BLOBSIDECAR_FIXED_SIZE,
|
|
4
|
+
import { BLOBSIDECAR_FIXED_SIZE, isForkBlobs } from "@lodestar/params";
|
|
5
5
|
import { getBlockInput, BlockSource, GossipedInputType, getBlockInputBlobs, BlobsSource, } from "../blocks/types.js";
|
|
6
6
|
export var BlockInputAvailabilitySource;
|
|
7
7
|
(function (BlockInputAvailabilitySource) {
|
|
@@ -33,20 +33,23 @@ export class SeenGossipBlockInput {
|
|
|
33
33
|
getGossipBlockInput(config, gossipedInput, metrics) {
|
|
34
34
|
let blockHex;
|
|
35
35
|
let blockCache;
|
|
36
|
+
let fork;
|
|
36
37
|
if (gossipedInput.type === GossipedInputType.block) {
|
|
37
38
|
const { signedBlock, blockBytes } = gossipedInput;
|
|
39
|
+
fork = config.getForkName(signedBlock.message.slot);
|
|
38
40
|
blockHex = toHexString(config.getForkTypes(signedBlock.message.slot).BeaconBlock.hashTreeRoot(signedBlock.message));
|
|
39
|
-
blockCache = this.blockInputCache.get(blockHex) ?? getEmptyBlockInputCacheEntry();
|
|
41
|
+
blockCache = this.blockInputCache.get(blockHex) ?? getEmptyBlockInputCacheEntry(fork);
|
|
40
42
|
blockCache.block = signedBlock;
|
|
41
43
|
blockCache.blockBytes = blockBytes;
|
|
42
44
|
}
|
|
43
45
|
else {
|
|
44
46
|
const { blobSidecar, blobBytes } = gossipedInput;
|
|
45
47
|
const blockRoot = ssz.phase0.BeaconBlockHeader.hashTreeRoot(blobSidecar.signedBlockHeader.message);
|
|
48
|
+
fork = config.getForkName(blobSidecar.signedBlockHeader.message.slot);
|
|
46
49
|
blockHex = toHexString(blockRoot);
|
|
47
|
-
blockCache = this.blockInputCache.get(blockHex) ?? getEmptyBlockInputCacheEntry();
|
|
50
|
+
blockCache = this.blockInputCache.get(blockHex) ?? getEmptyBlockInputCacheEntry(fork);
|
|
48
51
|
// TODO: freetheblobs check if its the same blob or a duplicate and throw/take actions
|
|
49
|
-
blockCache.blobsCache.set(blobSidecar.index, {
|
|
52
|
+
blockCache.cachedData?.blobsCache.set(blobSidecar.index, {
|
|
50
53
|
blobSidecar,
|
|
51
54
|
// easily splice out the unsigned message as blob is a fixed length type
|
|
52
55
|
blobBytes: blobBytes?.slice(0, BLOBSIDECAR_FIXED_SIZE) ?? null,
|
|
@@ -55,14 +58,18 @@ export class SeenGossipBlockInput {
|
|
|
55
58
|
if (!this.blockInputCache.has(blockHex)) {
|
|
56
59
|
this.blockInputCache.set(blockHex, blockCache);
|
|
57
60
|
}
|
|
58
|
-
const { block: signedBlock, blockBytes,
|
|
61
|
+
const { block: signedBlock, blockBytes, blockInputPromise, resolveBlockInput, cachedData } = blockCache;
|
|
59
62
|
if (signedBlock !== undefined) {
|
|
60
|
-
if (
|
|
63
|
+
if (!isForkBlobs(fork)) {
|
|
61
64
|
return {
|
|
62
|
-
blockInput: getBlockInput.
|
|
65
|
+
blockInput: getBlockInput.preData(config, signedBlock, BlockSource.gossip, blockBytes ?? null),
|
|
63
66
|
blockInputMeta: { pending: null, haveBlobs: 0, expectedBlobs: 0 },
|
|
64
67
|
};
|
|
65
68
|
}
|
|
69
|
+
if (cachedData === undefined || !isForkBlobs(cachedData.fork)) {
|
|
70
|
+
throw Error("Missing or Invalid fork cached Data for deneb+ block");
|
|
71
|
+
}
|
|
72
|
+
const { blobsCache, resolveAvailability } = cachedData;
|
|
66
73
|
// block is available, check if all blobs have shown up
|
|
67
74
|
const { slot, body } = signedBlock.message;
|
|
68
75
|
const { blobKzgCommitments } = body;
|
|
@@ -72,18 +79,18 @@ export class SeenGossipBlockInput {
|
|
|
72
79
|
}
|
|
73
80
|
if (blobKzgCommitments.length === blobsCache.size) {
|
|
74
81
|
const allBlobs = getBlockInputBlobs(blobsCache);
|
|
75
|
-
|
|
82
|
+
const blockData = { ...allBlobs, blobsSource: BlobsSource.gossip, fork: cachedData.fork };
|
|
83
|
+
resolveAvailability(blockData);
|
|
76
84
|
metrics?.syncUnknownBlock.resolveAvailabilitySource.inc({ source: BlockInputAvailabilitySource.GOSSIP });
|
|
77
|
-
const
|
|
78
|
-
const blockInput = getBlockInput.postDeneb(config, signedBlock, BlockSource.gossip, blobs, BlobsSource.gossip, blockBytes ?? null, blobsBytes);
|
|
85
|
+
const blockInput = getBlockInput.availableData(config, signedBlock, BlockSource.gossip, blockBytes ?? null, blockData);
|
|
79
86
|
resolveBlockInput(blockInput);
|
|
80
87
|
return {
|
|
81
88
|
blockInput,
|
|
82
|
-
blockInputMeta: { pending: null, haveBlobs: blobs.length, expectedBlobs: blobKzgCommitments.length },
|
|
89
|
+
blockInputMeta: { pending: null, haveBlobs: allBlobs.blobs.length, expectedBlobs: blobKzgCommitments.length },
|
|
83
90
|
};
|
|
84
91
|
}
|
|
85
92
|
else {
|
|
86
|
-
const blockInput = getBlockInput.
|
|
93
|
+
const blockInput = getBlockInput.dataPromise(config, signedBlock, BlockSource.gossip, blockBytes ?? null, cachedData);
|
|
87
94
|
resolveBlockInput(blockInput);
|
|
88
95
|
return {
|
|
89
96
|
blockInput,
|
|
@@ -97,13 +104,15 @@ export class SeenGossipBlockInput {
|
|
|
97
104
|
}
|
|
98
105
|
else {
|
|
99
106
|
// will need to wait for the block to showup
|
|
107
|
+
if (cachedData === undefined) {
|
|
108
|
+
throw Error("Missing cachedData for deneb+ blobs");
|
|
109
|
+
}
|
|
110
|
+
const { blobsCache } = cachedData;
|
|
100
111
|
return {
|
|
101
112
|
blockInput: {
|
|
102
113
|
block: null,
|
|
103
114
|
blockRootHex: blockHex,
|
|
104
|
-
|
|
105
|
-
availabilityPromise,
|
|
106
|
-
resolveAvailability,
|
|
115
|
+
cachedData,
|
|
107
116
|
blockInputPromise,
|
|
108
117
|
},
|
|
109
118
|
blockInputMeta: { pending: GossipedInputType.block, haveBlobs: blobsCache.size, expectedBlobs: null },
|
|
@@ -111,21 +120,28 @@ export class SeenGossipBlockInput {
|
|
|
111
120
|
}
|
|
112
121
|
}
|
|
113
122
|
}
|
|
114
|
-
function getEmptyBlockInputCacheEntry() {
|
|
123
|
+
function getEmptyBlockInputCacheEntry(fork) {
|
|
115
124
|
// Capture both the promise and its callbacks for blockInput and final availability
|
|
116
125
|
// It is not spec'ed but in tests in Firefox and NodeJS the promise constructor is run immediately
|
|
117
126
|
let resolveBlockInput = null;
|
|
118
127
|
const blockInputPromise = new Promise((resolveCB) => {
|
|
119
128
|
resolveBlockInput = resolveCB;
|
|
120
129
|
});
|
|
130
|
+
if (resolveBlockInput === null) {
|
|
131
|
+
throw Error("Promise Constructor was not executed immediately");
|
|
132
|
+
}
|
|
133
|
+
if (!isForkBlobs(fork)) {
|
|
134
|
+
return { fork, blockInputPromise, resolveBlockInput };
|
|
135
|
+
}
|
|
121
136
|
let resolveAvailability = null;
|
|
122
137
|
const availabilityPromise = new Promise((resolveCB) => {
|
|
123
138
|
resolveAvailability = resolveCB;
|
|
124
139
|
});
|
|
125
|
-
if (resolveAvailability === null
|
|
140
|
+
if (resolveAvailability === null) {
|
|
126
141
|
throw Error("Promise Constructor was not executed immediately");
|
|
127
142
|
}
|
|
128
143
|
const blobsCache = new Map();
|
|
129
|
-
|
|
144
|
+
const cachedData = { fork, blobsCache, availabilityPromise, resolveAvailability };
|
|
145
|
+
return { fork, blockInputPromise, resolveBlockInput, cachedData };
|
|
130
146
|
}
|
|
131
147
|
//# sourceMappingURL=seenGossipBlockInput.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAiB,GAAG,EAAW,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"seenGossipBlockInput.js","sourceRoot":"","sources":["../../../src/chain/seenCache/seenGossipBlockInput.ts"],"names":[],"mappings":"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"}
|