@lodestar/beacon-node 1.39.0-dev.b37f2bd1bd → 1.39.0-dev.c151a164f2
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/utils.js +1 -1
- package/lib/api/impl/beacon/blocks/utils.js.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.js +1 -1
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksSignatures.d.ts +2 -1
- package/lib/chain/blocks/verifyBlocksSignatures.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksSignatures.js +2 -2
- package/lib/chain/blocks/verifyBlocksSignatures.js.map +1 -1
- package/lib/chain/chain.d.ts +1 -4
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +8 -16
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/initState.d.ts +1 -14
- package/lib/chain/initState.d.ts.map +1 -1
- package/lib/chain/initState.js +1 -62
- package/lib/chain/initState.js.map +1 -1
- package/lib/chain/interface.d.ts +0 -2
- package/lib/chain/interface.d.ts.map +1 -1
- package/lib/chain/interface.js.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +4 -4
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js +4 -4
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/opPool.d.ts +3 -0
- package/lib/chain/opPools/opPool.d.ts.map +1 -1
- package/lib/chain/opPools/opPool.js +9 -8
- package/lib/chain/opPools/opPool.js.map +1 -1
- package/lib/chain/prepareNextSlot.d.ts +0 -4
- package/lib/chain/prepareNextSlot.d.ts.map +1 -1
- package/lib/chain/prepareNextSlot.js +1 -21
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +0 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +8 -11
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/rewards/attestationsRewards.d.ts +2 -1
- package/lib/chain/rewards/attestationsRewards.d.ts.map +1 -1
- package/lib/chain/rewards/attestationsRewards.js +8 -8
- package/lib/chain/rewards/attestationsRewards.js.map +1 -1
- package/lib/chain/rewards/blockRewards.d.ts +2 -1
- package/lib/chain/rewards/blockRewards.d.ts.map +1 -1
- package/lib/chain/rewards/blockRewards.js +5 -5
- package/lib/chain/rewards/blockRewards.js.map +1 -1
- package/lib/chain/rewards/syncCommitteeRewards.d.ts +2 -1
- package/lib/chain/rewards/syncCommitteeRewards.d.ts.map +1 -1
- package/lib/chain/rewards/syncCommitteeRewards.js +2 -2
- package/lib/chain/rewards/syncCommitteeRewards.js.map +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.d.ts +4 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.d.ts.map +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.js +4 -2
- package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
- package/lib/chain/validation/attesterSlashing.js +1 -1
- package/lib/chain/validation/attesterSlashing.js.map +1 -1
- package/lib/chain/validation/block.js +1 -1
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/chain/validation/blsToExecutionChange.js +1 -1
- package/lib/chain/validation/proposerSlashing.js +1 -1
- package/lib/chain/validation/proposerSlashing.js.map +1 -1
- package/lib/chain/validation/signatureSets/aggregateAndProof.js +1 -1
- package/lib/chain/validation/signatureSets/aggregateAndProof.js.map +1 -1
- package/lib/chain/validation/signatureSets/contributionAndProof.d.ts +2 -1
- package/lib/chain/validation/signatureSets/contributionAndProof.d.ts.map +1 -1
- package/lib/chain/validation/signatureSets/contributionAndProof.js +2 -2
- package/lib/chain/validation/signatureSets/contributionAndProof.js.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommittee.d.ts +2 -1
- package/lib/chain/validation/signatureSets/syncCommittee.d.ts.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommittee.js +2 -2
- package/lib/chain/validation/signatureSets/syncCommittee.js.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeContribution.d.ts +2 -1
- package/lib/chain/validation/signatureSets/syncCommitteeContribution.d.ts.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeContribution.js +2 -2
- package/lib/chain/validation/signatureSets/syncCommitteeContribution.js.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.d.ts +2 -1
- package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.d.ts.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.js +1 -2
- package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.js.map +1 -1
- package/lib/chain/validation/syncCommittee.js +1 -1
- package/lib/chain/validation/syncCommittee.js.map +1 -1
- package/lib/chain/validation/syncCommitteeContributionAndProof.d.ts.map +1 -1
- package/lib/chain/validation/syncCommitteeContributionAndProof.js +3 -3
- package/lib/chain/validation/syncCommitteeContributionAndProof.js.map +1 -1
- package/lib/chain/validation/voluntaryExit.js +1 -1
- package/lib/chain/validation/voluntaryExit.js.map +1 -1
- package/lib/db/beacon.d.ts +3 -7
- package/lib/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +33 -12
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +12 -6
- package/lib/db/buckets.d.ts.map +1 -1
- package/lib/db/buckets.js +6 -1
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +2 -7
- package/lib/db/interface.d.ts.map +1 -1
- package/lib/db/repositories/index.d.ts +0 -3
- package/lib/db/repositories/index.d.ts.map +1 -1
- package/lib/db/repositories/index.js +0 -3
- package/lib/db/repositories/index.js.map +1 -1
- package/lib/execution/engine/http.d.ts +1 -1
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +2 -3
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/index.d.ts.map +1 -1
- package/lib/execution/engine/index.js +1 -1
- package/lib/execution/engine/index.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +1 -1
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/{eth1/provider → execution/engine}/jsonRpcHttpClient.d.ts +1 -1
- package/lib/execution/engine/jsonRpcHttpClient.d.ts.map +1 -0
- package/lib/execution/engine/jsonRpcHttpClient.js.map +1 -0
- package/lib/execution/engine/jwt.d.ts.map +1 -0
- package/lib/execution/engine/jwt.js.map +1 -0
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +1 -1
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts.map +1 -1
- package/lib/execution/engine/types.d.ts +1 -1
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +1 -1
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/execution/engine/utils.d.ts +64 -2
- package/lib/execution/engine/utils.d.ts.map +1 -1
- package/lib/execution/engine/utils.js +91 -2
- package/lib/execution/engine/utils.js.map +1 -1
- package/lib/index.d.ts +1 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -2
- package/lib/index.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +0 -35
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +0 -90
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +10 -9
- package/lib/node/nodejs.js.map +1 -1
- package/lib/node/options.d.ts +0 -2
- package/lib/node/options.d.ts.map +1 -1
- package/lib/node/options.js +0 -2
- package/lib/node/options.js.map +1 -1
- package/lib/node/utils/interop/deposits.d.ts +2 -1
- package/lib/node/utils/interop/deposits.d.ts.map +1 -1
- package/lib/node/utils/interop/deposits.js.map +1 -1
- package/lib/node/utils/interop/state.d.ts +1 -1
- package/lib/node/utils/interop/state.d.ts.map +1 -1
- package/lib/node/utils/state.d.ts +1 -7
- package/lib/node/utils/state.d.ts.map +1 -1
- package/lib/node/utils/state.js +1 -14
- package/lib/node/utils/state.js.map +1 -1
- package/lib/sync/backfill/backfill.d.ts.map +1 -1
- package/lib/sync/backfill/backfill.js +2 -4
- package/lib/sync/backfill/backfill.js.map +1 -1
- package/lib/sync/backfill/verify.d.ts +1 -1
- package/lib/sync/backfill/verify.d.ts.map +1 -1
- package/lib/sync/backfill/verify.js +2 -2
- package/lib/sync/backfill/verify.js.map +1 -1
- package/package.json +14 -20
- package/src/api/impl/beacon/blocks/utils.ts +1 -1
- package/src/chain/blocks/verifyBlock.ts +1 -0
- package/src/chain/blocks/verifyBlocksSignatures.ts +3 -1
- package/src/chain/chain.ts +7 -19
- package/src/chain/initState.ts +1 -97
- package/src/chain/interface.ts +0 -2
- package/src/chain/opPools/aggregatedAttestationPool.ts +7 -7
- package/src/chain/opPools/opPool.ts +8 -8
- package/src/chain/prepareNextSlot.ts +1 -28
- package/src/chain/produceBlock/produceBlockBody.ts +8 -12
- package/src/chain/rewards/attestationsRewards.ts +13 -4
- package/src/chain/rewards/blockRewards.ts +6 -3
- package/src/chain/rewards/syncCommitteeRewards.ts +3 -1
- package/src/chain/stateCache/persistentCheckpointsCache.ts +15 -2
- package/src/chain/validation/attesterSlashing.ts +1 -1
- package/src/chain/validation/block.ts +1 -1
- package/src/chain/validation/blsToExecutionChange.ts +1 -1
- package/src/chain/validation/proposerSlashing.ts +1 -1
- package/src/chain/validation/signatureSets/aggregateAndProof.ts +1 -1
- package/src/chain/validation/signatureSets/contributionAndProof.ts +3 -1
- package/src/chain/validation/signatureSets/syncCommittee.ts +3 -1
- package/src/chain/validation/signatureSets/syncCommitteeContribution.ts +3 -1
- package/src/chain/validation/signatureSets/syncCommitteeSelectionProof.ts +2 -1
- package/src/chain/validation/syncCommittee.ts +1 -1
- package/src/chain/validation/syncCommitteeContributionAndProof.ts +8 -3
- package/src/chain/validation/voluntaryExit.ts +1 -1
- package/src/db/beacon.ts +38 -16
- package/src/db/buckets.ts +12 -7
- package/src/db/interface.ts +2 -13
- package/src/db/repositories/index.ts +0 -3
- package/src/execution/engine/http.ts +8 -9
- package/src/execution/engine/index.ts +1 -1
- package/src/execution/engine/interface.ts +1 -1
- package/src/{eth1/provider → execution/engine}/jsonRpcHttpClient.ts +1 -1
- package/src/execution/engine/mock.ts +1 -2
- package/src/execution/engine/payloadIdCache.ts +1 -1
- package/src/execution/engine/types.ts +9 -9
- package/src/execution/engine/utils.ts +111 -5
- package/src/index.ts +1 -2
- package/src/metrics/metrics/lodestar.ts +0 -92
- package/src/node/nodejs.ts +11 -9
- package/src/node/options.ts +0 -3
- package/src/node/utils/interop/deposits.ts +3 -1
- package/src/node/utils/interop/state.ts +1 -1
- package/src/node/utils/state.ts +3 -18
- package/src/sync/backfill/backfill.ts +8 -3
- package/src/sync/backfill/verify.ts +3 -1
- package/lib/chain/genesis/genesis.d.ts +0 -51
- package/lib/chain/genesis/genesis.d.ts.map +0 -1
- package/lib/chain/genesis/genesis.js +0 -123
- package/lib/chain/genesis/genesis.js.map +0 -1
- package/lib/chain/genesis/interface.d.ts +0 -13
- package/lib/chain/genesis/interface.d.ts.map +0 -1
- package/lib/chain/genesis/interface.js +0 -2
- package/lib/chain/genesis/interface.js.map +0 -1
- package/lib/db/repositories/depositDataRoot.d.ts +0 -22
- package/lib/db/repositories/depositDataRoot.d.ts.map +0 -1
- package/lib/db/repositories/depositDataRoot.js +0 -62
- package/lib/db/repositories/depositDataRoot.js.map +0 -1
- package/lib/db/repositories/depositEvent.d.ts +0 -13
- package/lib/db/repositories/depositEvent.d.ts.map +0 -1
- package/lib/db/repositories/depositEvent.js +0 -27
- package/lib/db/repositories/depositEvent.js.map +0 -1
- package/lib/db/repositories/eth1Data.d.ts +0 -13
- package/lib/db/repositories/eth1Data.d.ts.map +0 -1
- package/lib/db/repositories/eth1Data.js +0 -26
- package/lib/db/repositories/eth1Data.js.map +0 -1
- package/lib/db/single/index.d.ts +0 -3
- package/lib/db/single/index.d.ts.map +0 -1
- package/lib/db/single/index.js +0 -3
- package/lib/db/single/index.js.map +0 -1
- package/lib/db/single/preGenesisState.d.ts +0 -16
- package/lib/db/single/preGenesisState.d.ts.map +0 -1
- package/lib/db/single/preGenesisState.js +0 -29
- package/lib/db/single/preGenesisState.js.map +0 -1
- package/lib/db/single/preGenesisStateLastProcessedBlock.d.ts +0 -14
- package/lib/db/single/preGenesisStateLastProcessedBlock.d.ts.map +0 -1
- package/lib/db/single/preGenesisStateLastProcessedBlock.js +0 -27
- package/lib/db/single/preGenesisStateLastProcessedBlock.js.map +0 -1
- package/lib/eth1/errors.d.ts +0 -66
- package/lib/eth1/errors.d.ts.map +0 -1
- package/lib/eth1/errors.js +0 -27
- package/lib/eth1/errors.js.map +0 -1
- package/lib/eth1/eth1DataCache.d.ts +0 -19
- package/lib/eth1/eth1DataCache.d.ts.map +0 -1
- package/lib/eth1/eth1DataCache.js +0 -19
- package/lib/eth1/eth1DataCache.js.map +0 -1
- package/lib/eth1/eth1DepositDataTracker.d.ts +0 -80
- package/lib/eth1/eth1DepositDataTracker.d.ts.map +0 -1
- package/lib/eth1/eth1DepositDataTracker.js +0 -317
- package/lib/eth1/eth1DepositDataTracker.js.map +0 -1
- package/lib/eth1/eth1DepositsCache.d.ts +0 -42
- package/lib/eth1/eth1DepositsCache.d.ts.map +0 -1
- package/lib/eth1/eth1DepositsCache.js +0 -119
- package/lib/eth1/eth1DepositsCache.js.map +0 -1
- package/lib/eth1/index.d.ts +0 -31
- package/lib/eth1/index.d.ts.map +0 -1
- package/lib/eth1/index.js +0 -71
- package/lib/eth1/index.js.map +0 -1
- package/lib/eth1/interface.d.ts +0 -74
- package/lib/eth1/interface.d.ts.map +0 -1
- package/lib/eth1/interface.js +0 -8
- package/lib/eth1/interface.js.map +0 -1
- package/lib/eth1/options.d.ts +0 -22
- package/lib/eth1/options.d.ts.map +0 -1
- package/lib/eth1/options.js +0 -8
- package/lib/eth1/options.js.map +0 -1
- package/lib/eth1/provider/eth1Provider.d.ts +0 -39
- package/lib/eth1/provider/eth1Provider.d.ts.map +0 -1
- package/lib/eth1/provider/eth1Provider.js +0 -147
- package/lib/eth1/provider/eth1Provider.js.map +0 -1
- package/lib/eth1/provider/jsonRpcHttpClient.d.ts.map +0 -1
- package/lib/eth1/provider/jsonRpcHttpClient.js.map +0 -1
- package/lib/eth1/provider/jwt.d.ts.map +0 -1
- package/lib/eth1/provider/jwt.js.map +0 -1
- package/lib/eth1/provider/utils.d.ts +0 -65
- package/lib/eth1/provider/utils.d.ts.map +0 -1
- package/lib/eth1/provider/utils.js +0 -120
- package/lib/eth1/provider/utils.js.map +0 -1
- package/lib/eth1/stream.d.ts +0 -15
- package/lib/eth1/stream.d.ts.map +0 -1
- package/lib/eth1/stream.js +0 -54
- package/lib/eth1/stream.js.map +0 -1
- package/lib/eth1/utils/depositContract.d.ts +0 -14
- package/lib/eth1/utils/depositContract.d.ts.map +0 -1
- package/lib/eth1/utils/depositContract.js +0 -33
- package/lib/eth1/utils/depositContract.js.map +0 -1
- package/lib/eth1/utils/deposits.d.ts +0 -8
- package/lib/eth1/utils/deposits.d.ts.map +0 -1
- package/lib/eth1/utils/deposits.js +0 -47
- package/lib/eth1/utils/deposits.js.map +0 -1
- package/lib/eth1/utils/eth1Data.d.ts +0 -22
- package/lib/eth1/utils/eth1Data.d.ts.map +0 -1
- package/lib/eth1/utils/eth1Data.js +0 -77
- package/lib/eth1/utils/eth1Data.js.map +0 -1
- package/lib/eth1/utils/eth1DepositEvent.d.ts +0 -7
- package/lib/eth1/utils/eth1DepositEvent.d.ts.map +0 -1
- package/lib/eth1/utils/eth1DepositEvent.js +0 -13
- package/lib/eth1/utils/eth1DepositEvent.js.map +0 -1
- package/lib/eth1/utils/eth1Vote.d.ts +0 -17
- package/lib/eth1/utils/eth1Vote.d.ts.map +0 -1
- package/lib/eth1/utils/eth1Vote.js +0 -111
- package/lib/eth1/utils/eth1Vote.js.map +0 -1
- package/lib/eth1/utils/groupDepositEventsByBlock.d.ts +0 -9
- package/lib/eth1/utils/groupDepositEventsByBlock.d.ts.map +0 -1
- package/lib/eth1/utils/groupDepositEventsByBlock.js +0 -17
- package/lib/eth1/utils/groupDepositEventsByBlock.js.map +0 -1
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.d.ts +0 -10
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.d.ts.map +0 -1
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.js +0 -14
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.js.map +0 -1
- package/src/chain/genesis/genesis.ts +0 -190
- package/src/chain/genesis/interface.ts +0 -14
- package/src/db/repositories/depositDataRoot.ts +0 -80
- package/src/db/repositories/depositEvent.ts +0 -32
- package/src/db/repositories/eth1Data.ts +0 -33
- package/src/db/single/index.ts +0 -2
- package/src/db/single/preGenesisState.ts +0 -37
- package/src/db/single/preGenesisStateLastProcessedBlock.ts +0 -34
- package/src/eth1/errors.ts +0 -40
- package/src/eth1/eth1DataCache.ts +0 -26
- package/src/eth1/eth1DepositDataTracker.ts +0 -410
- package/src/eth1/eth1DepositsCache.ts +0 -141
- package/src/eth1/index.ts +0 -94
- package/src/eth1/interface.ts +0 -87
- package/src/eth1/options.ts +0 -28
- package/src/eth1/provider/eth1Provider.ts +0 -229
- package/src/eth1/provider/utils.ts +0 -136
- package/src/eth1/stream.ts +0 -75
- package/src/eth1/utils/depositContract.ts +0 -37
- package/src/eth1/utils/deposits.ts +0 -70
- package/src/eth1/utils/eth1Data.ts +0 -100
- package/src/eth1/utils/eth1DepositEvent.ts +0 -12
- package/src/eth1/utils/eth1Vote.ts +0 -142
- package/src/eth1/utils/groupDepositEventsByBlock.ts +0 -19
- package/src/eth1/utils/optimizeNextBlockDiffForGenesis.ts +0 -18
- /package/lib/{eth1/provider → execution/engine}/jsonRpcHttpClient.js +0 -0
- /package/lib/{eth1/provider → execution/engine}/jwt.d.ts +0 -0
- /package/lib/{eth1/provider → execution/engine}/jwt.js +0 -0
- /package/src/{eth1/provider → execution/engine}/jwt.ts +0 -0
|
@@ -1,100 +0,0 @@
|
|
|
1
|
-
import {Root, phase0} from "@lodestar/types";
|
|
2
|
-
import {DepositTree} from "../../db/repositories/depositDataRoot.js";
|
|
3
|
-
import {binarySearchLte} from "../../util/binarySearch.js";
|
|
4
|
-
import {Eth1Error, Eth1ErrorCode} from "../errors.js";
|
|
5
|
-
import {Eth1Block} from "../interface.js";
|
|
6
|
-
|
|
7
|
-
type BlockNumber = number;
|
|
8
|
-
|
|
9
|
-
/**
|
|
10
|
-
* Appends partial eth1 data (depositRoot, depositCount) in a sequence of blocks
|
|
11
|
-
* eth1 data deposit is inferred from sparse eth1 data obtained from the deposit logs
|
|
12
|
-
*/
|
|
13
|
-
export async function getEth1DataForBlocks(
|
|
14
|
-
blocks: Eth1Block[],
|
|
15
|
-
depositDescendingStream: AsyncIterable<phase0.DepositEvent>,
|
|
16
|
-
depositRootTree: DepositTree,
|
|
17
|
-
lastProcessedDepositBlockNumber: BlockNumber | null
|
|
18
|
-
): Promise<(phase0.Eth1Data & Eth1Block)[]> {
|
|
19
|
-
// Exclude blocks for which there is no valid eth1 data deposit
|
|
20
|
-
if (lastProcessedDepositBlockNumber !== null) {
|
|
21
|
-
blocks = blocks.filter((block) => block.blockNumber <= lastProcessedDepositBlockNumber);
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
// A valid block can be constructed using previous `state.eth1Data`, don't throw
|
|
25
|
-
if (blocks.length === 0) {
|
|
26
|
-
return [];
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
// Collect the latest deposit of each blockNumber in a block number range
|
|
30
|
-
const fromBlock = blocks[0].blockNumber;
|
|
31
|
-
const toBlock = blocks.at(-1)?.blockNumber as number;
|
|
32
|
-
const depositsByBlockNumber = await getDepositsByBlockNumber(fromBlock, toBlock, depositDescendingStream);
|
|
33
|
-
if (depositsByBlockNumber.length === 0) {
|
|
34
|
-
throw new Eth1Error({code: Eth1ErrorCode.NO_DEPOSITS_FOR_BLOCK_RANGE, fromBlock, toBlock});
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
// Precompute a map of depositCount => depositRoot (from depositRootTree)
|
|
38
|
-
const depositCounts = depositsByBlockNumber.map((event) => event.index + 1);
|
|
39
|
-
const depositRootByDepositCount = getDepositRootByDepositCount(depositCounts, depositRootTree);
|
|
40
|
-
|
|
41
|
-
const eth1Datas: (phase0.Eth1Data & Eth1Block)[] = [];
|
|
42
|
-
for (const block of blocks) {
|
|
43
|
-
const deposit = binarySearchLte(depositsByBlockNumber, block.blockNumber, (event) => event.blockNumber);
|
|
44
|
-
const depositCount = deposit.index + 1;
|
|
45
|
-
const depositRoot = depositRootByDepositCount.get(depositCount);
|
|
46
|
-
if (depositRoot === undefined) {
|
|
47
|
-
throw new Eth1Error({code: Eth1ErrorCode.NO_DEPOSIT_ROOT, depositCount});
|
|
48
|
-
}
|
|
49
|
-
eth1Datas.push({...block, depositCount, depositRoot});
|
|
50
|
-
}
|
|
51
|
-
return eth1Datas;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
/**
|
|
55
|
-
* Collect depositCount by blockNumber from a stream matching a block number range
|
|
56
|
-
* For a given blockNumber it's depositCount is equal to the index + 1 of the
|
|
57
|
-
* closest deposit event whose deposit.blockNumber <= blockNumber
|
|
58
|
-
* @returns array ascending by blockNumber
|
|
59
|
-
*/
|
|
60
|
-
export async function getDepositsByBlockNumber(
|
|
61
|
-
fromBlock: BlockNumber,
|
|
62
|
-
toBlock: BlockNumber,
|
|
63
|
-
depositEventDescendingStream: AsyncIterable<phase0.DepositEvent>
|
|
64
|
-
): Promise<phase0.DepositEvent[]> {
|
|
65
|
-
const depositCountMap = new Map<BlockNumber, phase0.DepositEvent>();
|
|
66
|
-
// Take blocks until the block under the range lower bound (included)
|
|
67
|
-
for await (const deposit of depositEventDescendingStream) {
|
|
68
|
-
if (deposit.blockNumber <= toBlock && !depositCountMap.has(deposit.blockNumber)) {
|
|
69
|
-
depositCountMap.set(deposit.blockNumber, deposit);
|
|
70
|
-
}
|
|
71
|
-
if (deposit.blockNumber < fromBlock) {
|
|
72
|
-
break;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
return Array.from(depositCountMap.values()).sort((a, b) => a.blockNumber - b.blockNumber);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
/**
|
|
80
|
-
* Precompute a map of depositCount => depositRoot from a depositRootTree filled beforehand
|
|
81
|
-
*/
|
|
82
|
-
export function getDepositRootByDepositCount(depositCounts: number[], depositRootTree: DepositTree): Map<number, Root> {
|
|
83
|
-
// Unique + sort numerically in descending order
|
|
84
|
-
depositCounts = [...new Set(depositCounts)].sort((a, b) => b - a);
|
|
85
|
-
|
|
86
|
-
if (depositCounts.length > 0) {
|
|
87
|
-
const maxIndex = depositCounts[0] - 1;
|
|
88
|
-
const treeLength = depositRootTree.length - 1;
|
|
89
|
-
if (maxIndex > treeLength) {
|
|
90
|
-
throw new Eth1Error({code: Eth1ErrorCode.NOT_ENOUGH_DEPOSIT_ROOTS, index: maxIndex, treeLength});
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
|
|
94
|
-
const depositRootByDepositCount = new Map<number, Root>();
|
|
95
|
-
for (const depositCount of depositCounts) {
|
|
96
|
-
depositRootTree = depositRootTree.sliceTo(depositCount - 1);
|
|
97
|
-
depositRootByDepositCount.set(depositCount, depositRootTree.hashTreeRoot());
|
|
98
|
-
}
|
|
99
|
-
return depositRootByDepositCount;
|
|
100
|
-
}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Assert that an array of deposits are consecutive and ascending
|
|
3
|
-
*/
|
|
4
|
-
export function assertConsecutiveDeposits(depositEvents: {index: number}[]): void {
|
|
5
|
-
for (let i = 0; i < depositEvents.length - 1; i++) {
|
|
6
|
-
const indexLeft = depositEvents[i].index;
|
|
7
|
-
const indexRight = depositEvents[i + 1].index;
|
|
8
|
-
if (indexLeft !== indexRight - 1) {
|
|
9
|
-
throw Error(`Non consecutive deposits. deposit[${i}] = ${indexLeft}, deposit[${i + 1}] ${indexRight}`);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
}
|
|
@@ -1,142 +0,0 @@
|
|
|
1
|
-
import {ChainForkConfig} from "@lodestar/config";
|
|
2
|
-
import {EPOCHS_PER_ETH1_VOTING_PERIOD, SLOTS_PER_EPOCH, isForkPostElectra} from "@lodestar/params";
|
|
3
|
-
import {BeaconStateAllForks, BeaconStateElectra, computeTimeAtSlot} from "@lodestar/state-transition";
|
|
4
|
-
import {RootHex, phase0} from "@lodestar/types";
|
|
5
|
-
import {toRootHex} from "@lodestar/utils";
|
|
6
|
-
|
|
7
|
-
export type Eth1DataGetter = ({
|
|
8
|
-
timestampRange,
|
|
9
|
-
}: {
|
|
10
|
-
timestampRange: {gte: number; lte: number};
|
|
11
|
-
}) => Promise<phase0.Eth1Data[]>;
|
|
12
|
-
|
|
13
|
-
export async function getEth1VotesToConsider(
|
|
14
|
-
config: ChainForkConfig,
|
|
15
|
-
state: BeaconStateAllForks,
|
|
16
|
-
eth1DataGetter: Eth1DataGetter
|
|
17
|
-
): Promise<phase0.Eth1Data[]> {
|
|
18
|
-
const fork = config.getForkName(state.slot);
|
|
19
|
-
if (isForkPostElectra(fork)) {
|
|
20
|
-
const {eth1DepositIndex, depositRequestsStartIndex} = state as BeaconStateElectra;
|
|
21
|
-
if (eth1DepositIndex === Number(depositRequestsStartIndex)) {
|
|
22
|
-
return state.eth1DataVotes.getAllReadonly();
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
const periodStart = votingPeriodStartTime(config, state);
|
|
27
|
-
const {SECONDS_PER_ETH1_BLOCK, ETH1_FOLLOW_DISTANCE} = config;
|
|
28
|
-
|
|
29
|
-
// Modified version of the spec function to fetch the required range directly from the DB
|
|
30
|
-
return (
|
|
31
|
-
await eth1DataGetter({
|
|
32
|
-
timestampRange: {
|
|
33
|
-
// Spec v0.12.2
|
|
34
|
-
// is_candidate_block =
|
|
35
|
-
// block.timestamp + SECONDS_PER_ETH1_BLOCK * ETH1_FOLLOW_DISTANCE <= period_start &&
|
|
36
|
-
// block.timestamp + SECONDS_PER_ETH1_BLOCK * ETH1_FOLLOW_DISTANCE * 2 >= period_start
|
|
37
|
-
lte: periodStart - SECONDS_PER_ETH1_BLOCK * ETH1_FOLLOW_DISTANCE,
|
|
38
|
-
gte: periodStart - SECONDS_PER_ETH1_BLOCK * ETH1_FOLLOW_DISTANCE * 2,
|
|
39
|
-
},
|
|
40
|
-
})
|
|
41
|
-
).filter((eth1Data) => eth1Data.depositCount >= state.eth1Data.depositCount);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
export function pickEth1Vote(state: BeaconStateAllForks, votesToConsider: phase0.Eth1Data[]): phase0.Eth1Data {
|
|
45
|
-
const votesToConsiderKeys = new Set<string>();
|
|
46
|
-
for (const eth1Data of votesToConsider) {
|
|
47
|
-
votesToConsiderKeys.add(getEth1DataKey(eth1Data));
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
const eth1DataHashToEth1Data = new Map<RootHex, phase0.Eth1Data>();
|
|
51
|
-
const eth1DataVoteCountByRoot = new Map<RootHex, number>();
|
|
52
|
-
const eth1DataVotesOrder: RootHex[] = [];
|
|
53
|
-
|
|
54
|
-
// BeaconStateAllForks is always represented as a tree with a hashing cache.
|
|
55
|
-
// To check equality its cheaper to use hashTreeRoot as keys.
|
|
56
|
-
// However `votesToConsider` is an array of values since those are read from DB.
|
|
57
|
-
// TODO: Optimize cache of known votes, to prevent re-hashing stored values.
|
|
58
|
-
// Note: for low validator counts it's not very important, since this runs once per proposal
|
|
59
|
-
const eth1DataVotes = state.eth1DataVotes.getAllReadonly();
|
|
60
|
-
for (const eth1DataVote of eth1DataVotes) {
|
|
61
|
-
const rootHex = getEth1DataKey(eth1DataVote);
|
|
62
|
-
|
|
63
|
-
if (votesToConsiderKeys.has(rootHex)) {
|
|
64
|
-
const prevVoteCount = eth1DataVoteCountByRoot.get(rootHex);
|
|
65
|
-
eth1DataVoteCountByRoot.set(rootHex, 1 + (prevVoteCount ?? 0));
|
|
66
|
-
|
|
67
|
-
// Cache eth1DataVote to root Map only once per root
|
|
68
|
-
if (prevVoteCount === undefined) {
|
|
69
|
-
eth1DataHashToEth1Data.set(rootHex, eth1DataVote);
|
|
70
|
-
eth1DataVotesOrder.push(rootHex);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
const eth1DataRootsMaxVotes = getKeysWithMaxValue(eth1DataVoteCountByRoot);
|
|
76
|
-
|
|
77
|
-
// No votes, vote for the last valid vote
|
|
78
|
-
if (eth1DataRootsMaxVotes.length === 0) {
|
|
79
|
-
return votesToConsider.at(-1) ?? state.eth1Data;
|
|
80
|
-
}
|
|
81
|
-
|
|
82
|
-
// If there's a single winning vote with a majority vote that one
|
|
83
|
-
if (eth1DataRootsMaxVotes.length === 1) {
|
|
84
|
-
return eth1DataHashToEth1Data.get(eth1DataRootsMaxVotes[0]) ?? state.eth1Data;
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
// If there are multiple winning votes, vote for the latest one
|
|
88
|
-
const latestMostVotedRoot =
|
|
89
|
-
eth1DataVotesOrder[Math.max(...eth1DataRootsMaxVotes.map((root) => eth1DataVotesOrder.indexOf(root)))];
|
|
90
|
-
return eth1DataHashToEth1Data.get(latestMostVotedRoot) ?? state.eth1Data;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
/**
|
|
94
|
-
* Returns the array of keys with max value. May return 0, 1 or more keys
|
|
95
|
-
*/
|
|
96
|
-
function getKeysWithMaxValue<T>(map: Map<T, number>): T[] {
|
|
97
|
-
const entries = Array.from(map.entries());
|
|
98
|
-
let keysMax: T[] = [];
|
|
99
|
-
let valueMax = -Infinity;
|
|
100
|
-
|
|
101
|
-
for (const [key, value] of entries) {
|
|
102
|
-
if (value > valueMax) {
|
|
103
|
-
keysMax = [key];
|
|
104
|
-
valueMax = value;
|
|
105
|
-
} else if (value === valueMax) {
|
|
106
|
-
keysMax.push(key);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
return keysMax;
|
|
111
|
-
}
|
|
112
|
-
|
|
113
|
-
/**
|
|
114
|
-
* Key-ed by fastSerializeEth1Data(). votesToConsider is read from DB as struct and always has a length of 2048.
|
|
115
|
-
* `state.eth1DataVotes` has a length between 0 and ETH1_FOLLOW_DISTANCE with an equal probability of each value.
|
|
116
|
-
* So to get the average faster time to key both votesToConsider and state.eth1DataVotes it's better to use
|
|
117
|
-
* fastSerializeEth1Data(). However, a long term solution is to cache valid votes in memory and prevent having
|
|
118
|
-
* to recompute their key on every proposal.
|
|
119
|
-
*
|
|
120
|
-
* With `fastSerializeEth1Data()`: avg time 20 ms/op
|
|
121
|
-
* ✓ pickEth1Vote - no votes 233.0587 ops/s 4.290764 ms/op - 121 runs 1.02 s
|
|
122
|
-
* ✓ pickEth1Vote - max votes 29.21546 ops/s 34.22845 ms/op - 25 runs 1.38 s
|
|
123
|
-
*
|
|
124
|
-
* With `toHexString(ssz.phase0.Eth1Data.hashTreeRoot(eth1Data))`: avg time 23 ms/op
|
|
125
|
-
* ✓ pickEth1Vote - no votes 46.12341 ops/s 21.68096 ms/op - 133 runs 3.40 s
|
|
126
|
-
* ✓ pickEth1Vote - max votes 37.89912 ops/s 26.38583 ms/op - 29 runs 1.27 s
|
|
127
|
-
*/
|
|
128
|
-
function getEth1DataKey(eth1Data: phase0.Eth1Data): string {
|
|
129
|
-
return fastSerializeEth1Data(eth1Data);
|
|
130
|
-
}
|
|
131
|
-
|
|
132
|
-
/**
|
|
133
|
-
* Serialize eth1Data types to a unique string ID. It is only used for comparison.
|
|
134
|
-
*/
|
|
135
|
-
export function fastSerializeEth1Data(eth1Data: phase0.Eth1Data): string {
|
|
136
|
-
return toRootHex(eth1Data.blockHash) + eth1Data.depositCount.toString(16) + toRootHex(eth1Data.depositRoot);
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
export function votingPeriodStartTime(config: ChainForkConfig, state: BeaconStateAllForks): number {
|
|
140
|
-
const eth1VotingPeriodStartSlot = state.slot - (state.slot % (EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH));
|
|
141
|
-
return computeTimeAtSlot(config, eth1VotingPeriodStartSlot, state.genesisTime);
|
|
142
|
-
}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
import {phase0} from "@lodestar/types";
|
|
2
|
-
import {BatchDepositEvents} from "../interface.js";
|
|
3
|
-
|
|
4
|
-
/**
|
|
5
|
-
* Return deposit events of blocks grouped/sorted by block number and deposit index
|
|
6
|
-
* Blocks without events are omitted
|
|
7
|
-
* @param depositEvents range deposit events
|
|
8
|
-
*/
|
|
9
|
-
export function groupDepositEventsByBlock(depositEvents: phase0.DepositEvent[]): BatchDepositEvents[] {
|
|
10
|
-
depositEvents.sort((event1, event2) => event1.index - event2.index);
|
|
11
|
-
const depositsByBlockMap = new Map<number, phase0.DepositEvent[]>();
|
|
12
|
-
for (const deposit of depositEvents) {
|
|
13
|
-
depositsByBlockMap.set(deposit.blockNumber, [...(depositsByBlockMap.get(deposit.blockNumber) || []), deposit]);
|
|
14
|
-
}
|
|
15
|
-
return Array.from(depositsByBlockMap.entries()).map(([blockNumber, depositEvents]) => ({
|
|
16
|
-
blockNumber,
|
|
17
|
-
depositEvents,
|
|
18
|
-
}));
|
|
19
|
-
}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import {ChainConfig} from "@lodestar/config";
|
|
2
|
-
|
|
3
|
-
/**
|
|
4
|
-
* Utility for fetching genesis min genesis time block
|
|
5
|
-
* Returns an approximation of the next block diff to fetch to progressively
|
|
6
|
-
* get closer to the block that satisfies min genesis time condition
|
|
7
|
-
*/
|
|
8
|
-
export function optimizeNextBlockDiffForGenesis(
|
|
9
|
-
lastFetchedBlock: {timestamp: number},
|
|
10
|
-
params: Pick<ChainConfig, "MIN_GENESIS_TIME" | "GENESIS_DELAY" | "SECONDS_PER_ETH1_BLOCK">
|
|
11
|
-
): number {
|
|
12
|
-
const timeToGenesis = params.MIN_GENESIS_TIME - params.GENESIS_DELAY - lastFetchedBlock.timestamp;
|
|
13
|
-
const numBlocksToGenesis = Math.floor(timeToGenesis / params.SECONDS_PER_ETH1_BLOCK);
|
|
14
|
-
if (numBlocksToGenesis <= 2) {
|
|
15
|
-
return 1;
|
|
16
|
-
}
|
|
17
|
-
return Math.max(1, Math.floor(numBlocksToGenesis / 2));
|
|
18
|
-
}
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|