@lodestar/beacon-node 1.23.0-dev.2a7f7e6afd → 1.23.0-dev.2e8b8bb478
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/api.js.map +1 -1
- package/lib/api/impl/beacon/blocks/index.js +28 -31
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/blocks/utils.d.ts +1 -1
- package/lib/api/impl/beacon/blocks/utils.js +2 -2
- package/lib/api/impl/beacon/blocks/utils.js.map +1 -1
- package/lib/api/impl/beacon/index.js +1 -1
- package/lib/api/impl/beacon/index.js.map +1 -1
- package/lib/api/impl/beacon/pool/index.js +5 -5
- package/lib/api/impl/beacon/pool/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts +1 -1
- package/lib/api/impl/beacon/state/index.js +4 -10
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/beacon/state/utils.d.ts +2 -2
- package/lib/api/impl/beacon/state/utils.js +1 -1
- package/lib/api/impl/beacon/state/utils.js.map +1 -1
- package/lib/api/impl/config/constants.js +1 -1
- package/lib/api/impl/config/constants.js.map +1 -1
- package/lib/api/impl/config/index.js.map +1 -1
- package/lib/api/impl/debug/index.js +1 -1
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/lightclient/index.js +1 -1
- package/lib/api/impl/lightclient/index.js.map +1 -1
- package/lib/api/impl/lodestar/index.js +5 -5
- package/lib/api/impl/lodestar/index.js.map +1 -1
- package/lib/api/impl/node/index.d.ts +1 -1
- package/lib/api/impl/node/index.js +2 -4
- package/lib/api/impl/node/index.js.map +1 -1
- package/lib/api/impl/proof/index.d.ts +1 -1
- package/lib/api/impl/proof/index.js +2 -2
- package/lib/api/impl/proof/index.js.map +1 -1
- package/lib/api/impl/types.d.ts +2 -2
- package/lib/api/impl/validator/index.d.ts +32 -1
- package/lib/api/impl/validator/index.js +116 -68
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/api/impl/validator/utils.d.ts +4 -3
- package/lib/api/impl/validator/utils.js +17 -9
- package/lib/api/impl/validator/utils.js.map +1 -1
- package/lib/api/options.js.map +1 -1
- package/lib/api/rest/base.d.ts +1 -1
- package/lib/api/rest/base.js +3 -3
- package/lib/api/rest/base.js.map +1 -1
- package/lib/api/rest/index.d.ts +2 -2
- package/lib/api/rest/index.js.map +1 -1
- package/lib/chain/archiver/archiveBlocks.d.ts +2 -2
- package/lib/chain/archiver/archiveBlocks.js +1 -1
- package/lib/chain/archiver/archiveBlocks.js.map +1 -1
- package/lib/chain/archiver/archiver.d.ts +40 -0
- package/lib/chain/archiver/archiver.js +117 -0
- package/lib/chain/archiver/archiver.js.map +1 -0
- package/lib/chain/archiver/index.d.ts +2 -54
- package/lib/chain/archiver/index.js +2 -104
- package/lib/chain/archiver/index.js.map +1 -1
- package/lib/chain/archiver/interface.d.ts +39 -0
- package/lib/chain/archiver/interface.js +8 -0
- package/lib/chain/archiver/interface.js.map +1 -0
- package/lib/chain/archiver/{archiveStates.d.ts → strategies/frequencyStateArchiveStrategy.d.ts} +17 -15
- package/lib/chain/archiver/{archiveStates.js → strategies/frequencyStateArchiveStrategy.js} +8 -6
- package/lib/chain/archiver/strategies/frequencyStateArchiveStrategy.js.map +1 -0
- package/lib/chain/balancesCache.d.ts +1 -1
- package/lib/chain/balancesCache.js +1 -1
- package/lib/chain/balancesCache.js.map +1 -1
- package/lib/chain/beaconProposerCache.d.ts +1 -1
- package/lib/chain/blocks/importBlock.js +8 -8
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/index.d.ts +2 -2
- package/lib/chain/blocks/index.js +4 -6
- package/lib/chain/blocks/index.js.map +1 -1
- package/lib/chain/blocks/types.d.ts +4 -4
- package/lib/chain/blocks/types.js +1 -1
- package/lib/chain/blocks/types.js.map +1 -1
- package/lib/chain/blocks/utils/checkpoint.js +1 -1
- package/lib/chain/blocks/utils/checkpoint.js.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts +2 -2
- package/lib/chain/blocks/verifyBlock.js +8 -8
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksDataAvailability.d.ts +2 -2
- package/lib/chain/blocks/verifyBlocksDataAvailability.js +19 -9
- package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts +6 -6
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.js +5 -5
- package/lib/chain/blocks/verifyBlocksExecutionPayloads.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksSanityChecks.js +5 -13
- package/lib/chain/blocks/verifyBlocksSanityChecks.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksSignatures.d.ts +1 -1
- package/lib/chain/blocks/verifyBlocksSignatures.js +1 -1
- package/lib/chain/blocks/verifyBlocksSignatures.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +2 -2
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.js +1 -1
- package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
- package/lib/chain/bls/multithread/index.d.ts +1 -1
- package/lib/chain/bls/multithread/index.js +8 -7
- package/lib/chain/bls/multithread/index.js.map +1 -1
- package/lib/chain/bls/multithread/jobItem.d.ts +2 -2
- package/lib/chain/bls/multithread/jobItem.js +1 -1
- package/lib/chain/bls/multithread/jobItem.js.map +1 -1
- package/lib/chain/bls/multithread/worker.js +1 -1
- package/lib/chain/bls/multithread/worker.js.map +1 -1
- package/lib/chain/chain.d.ts +24 -24
- package/lib/chain/chain.js +51 -55
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +1 -1
- package/lib/chain/errors/attestationError.d.ts +1 -1
- package/lib/chain/errors/blobSidecarError.d.ts +1 -1
- package/lib/chain/errors/blockError.d.ts +1 -1
- package/lib/chain/errors/blockError.js.map +1 -1
- package/lib/chain/errors/syncCommitteeError.d.ts +1 -1
- package/lib/chain/forkChoice/index.d.ts +1 -1
- package/lib/chain/forkChoice/index.js +3 -3
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/genesis/genesis.d.ts +3 -3
- package/lib/chain/genesis/genesis.js +4 -8
- package/lib/chain/genesis/genesis.js.map +1 -1
- package/lib/chain/genesis/interface.d.ts +1 -1
- package/lib/chain/historicalState/getHistoricalState.d.ts +1 -1
- package/lib/chain/historicalState/getHistoricalState.js.map +1 -1
- package/lib/chain/historicalState/index.js +1 -1
- package/lib/chain/historicalState/index.js.map +1 -1
- package/lib/chain/historicalState/worker.js +4 -4
- package/lib/chain/historicalState/worker.js.map +1 -1
- package/lib/chain/initState.d.ts +2 -2
- package/lib/chain/initState.js.map +1 -1
- package/lib/chain/interface.d.ts +21 -21
- package/lib/chain/interface.js.map +1 -1
- package/lib/chain/lightClient/index.d.ts +2 -2
- package/lib/chain/lightClient/index.js +9 -11
- package/lib/chain/lightClient/index.js.map +1 -1
- package/lib/chain/lightClient/proofs.d.ts +1 -1
- package/lib/chain/lightClient/proofs.js +1 -1
- package/lib/chain/lightClient/proofs.js.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +3 -3
- package/lib/chain/opPools/aggregatedAttestationPool.js +38 -42
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/attestationPool.d.ts +2 -2
- package/lib/chain/opPools/attestationPool.js +5 -7
- package/lib/chain/opPools/attestationPool.js.map +1 -1
- package/lib/chain/opPools/opPool.d.ts +2 -2
- package/lib/chain/opPools/opPool.js +4 -6
- package/lib/chain/opPools/opPool.js.map +1 -1
- package/lib/chain/opPools/syncCommitteeMessagePool.d.ts +1 -1
- package/lib/chain/opPools/syncCommitteeMessagePool.js +4 -6
- package/lib/chain/opPools/syncCommitteeMessagePool.js.map +1 -1
- package/lib/chain/opPools/syncContributionAndProofPool.d.ts +1 -1
- package/lib/chain/opPools/syncContributionAndProofPool.js +4 -6
- package/lib/chain/opPools/syncContributionAndProofPool.js.map +1 -1
- package/lib/chain/options.d.ts +3 -1
- package/lib/chain/options.js +4 -0
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/prepareNextSlot.d.ts +1 -1
- package/lib/chain/prepareNextSlot.js +5 -5
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +4 -4
- package/lib/chain/produceBlock/produceBlockBody.js +21 -20
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/errors.d.ts +1 -1
- package/lib/chain/regen/interface.d.ts +2 -2
- package/lib/chain/regen/queued.d.ts +3 -3
- package/lib/chain/regen/queued.js +2 -2
- package/lib/chain/regen/queued.js.map +1 -1
- package/lib/chain/regen/regen.d.ts +5 -5
- package/lib/chain/regen/regen.js +3 -3
- package/lib/chain/regen/regen.js.map +1 -1
- package/lib/chain/reprocess.d.ts +1 -1
- package/lib/chain/rewards/attestationsRewards.d.ts +2 -2
- package/lib/chain/rewards/attestationsRewards.js.map +1 -1
- package/lib/chain/rewards/blockRewards.d.ts +1 -1
- package/lib/chain/rewards/blockRewards.js +2 -4
- package/lib/chain/rewards/blockRewards.js.map +1 -1
- package/lib/chain/rewards/syncCommitteeRewards.d.ts +1 -1
- package/lib/chain/rewards/syncCommitteeRewards.js +1 -3
- package/lib/chain/rewards/syncCommitteeRewards.js.map +1 -1
- package/lib/chain/seenCache/seenAttestationData.d.ts +1 -1
- package/lib/chain/seenCache/seenCommittee.d.ts +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +2 -2
- package/lib/chain/seenCache/seenGossipBlockInput.js +23 -27
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/shufflingCache.js +2 -4
- package/lib/chain/shufflingCache.js.map +1 -1
- package/lib/chain/stateCache/blockStateCacheImpl.d.ts +2 -2
- package/lib/chain/stateCache/datastore/file.js.map +1 -1
- package/lib/chain/stateCache/fifoBlockStateCache.d.ts +2 -2
- package/lib/chain/stateCache/inMemoryCheckpointsCache.d.ts +2 -2
- package/lib/chain/stateCache/inMemoryCheckpointsCache.js.map +1 -1
- package/lib/chain/stateCache/persistentCheckpointsCache.d.ts +5 -5
- package/lib/chain/stateCache/persistentCheckpointsCache.js +3 -3
- package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
- package/lib/chain/stateCache/types.d.ts +1 -1
- package/lib/chain/validation/aggregateAndProof.d.ts +1 -1
- package/lib/chain/validation/aggregateAndProof.js +2 -2
- package/lib/chain/validation/aggregateAndProof.js.map +1 -1
- package/lib/chain/validation/attestation.d.ts +5 -5
- package/lib/chain/validation/attestation.js +28 -34
- package/lib/chain/validation/attestation.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/blobSidecar.d.ts +1 -1
- package/lib/chain/validation/blobSidecar.js +5 -5
- package/lib/chain/validation/blobSidecar.js.map +1 -1
- package/lib/chain/validation/block.js +3 -3
- package/lib/chain/validation/block.js.map +1 -1
- package/lib/chain/validation/blsToExecutionChange.js +1 -1
- package/lib/chain/validation/blsToExecutionChange.js.map +1 -1
- package/lib/chain/validation/lightClientFinalityUpdate.js +3 -3
- package/lib/chain/validation/lightClientFinalityUpdate.js.map +1 -1
- package/lib/chain/validation/lightClientOptimisticUpdate.js +3 -3
- package/lib/chain/validation/lightClientOptimisticUpdate.js.map +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.d.ts +2 -2
- 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 +1 -1
- package/lib/chain/validation/signatureSets/contributionAndProof.js +1 -1
- package/lib/chain/validation/signatureSets/contributionAndProof.js.map +1 -1
- package/lib/chain/validation/signatureSets/selectionProof.d.ts +2 -2
- package/lib/chain/validation/signatureSets/selectionProof.js +1 -1
- package/lib/chain/validation/signatureSets/selectionProof.js.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommittee.d.ts +1 -1
- package/lib/chain/validation/signatureSets/syncCommittee.js +1 -1
- package/lib/chain/validation/signatureSets/syncCommittee.js.map +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeContribution.d.ts +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 +1 -1
- package/lib/chain/validation/signatureSets/syncCommitteeSelectionProof.js +1 -1
- 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 +1 -1
- package/lib/chain/validation/syncCommitteeContributionAndProof.js +2 -2
- package/lib/chain/validation/syncCommitteeContributionAndProof.js.map +1 -1
- package/lib/chain/validation/voluntaryExit.js +2 -2
- package/lib/chain/validation/voluntaryExit.js.map +1 -1
- package/lib/db/beacon.d.ts +3 -3
- package/lib/db/beacon.js +2 -2
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.js +3 -5
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +2 -2
- package/lib/db/repositories/attesterSlashing.d.ts +1 -1
- package/lib/db/repositories/attesterSlashing.js +1 -1
- package/lib/db/repositories/attesterSlashing.js.map +1 -1
- package/lib/db/repositories/backfilledRanges.d.ts +1 -1
- package/lib/db/repositories/backfilledRanges.js +1 -1
- package/lib/db/repositories/backfilledRanges.js.map +1 -1
- package/lib/db/repositories/blobSidecars.d.ts +1 -1
- package/lib/db/repositories/blobSidecars.js.map +1 -1
- package/lib/db/repositories/blobSidecarsArchive.js.map +1 -1
- package/lib/db/repositories/blockArchive.d.ts +2 -2
- package/lib/db/repositories/blockArchive.js +3 -3
- package/lib/db/repositories/blockArchive.js.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts +1 -1
- package/lib/db/repositories/blockArchiveIndex.js +1 -1
- package/lib/db/repositories/blockArchiveIndex.js.map +1 -1
- package/lib/db/repositories/blsToExecutionChange.d.ts +1 -1
- package/lib/db/repositories/blsToExecutionChange.js.map +1 -1
- package/lib/db/repositories/checkpointState.js +1 -0
- package/lib/db/repositories/checkpointState.js.map +1 -1
- package/lib/db/repositories/depositDataRoot.d.ts +2 -2
- package/lib/db/repositories/depositDataRoot.js +2 -2
- package/lib/db/repositories/depositDataRoot.js.map +1 -1
- package/lib/db/repositories/depositEvent.d.ts +1 -1
- package/lib/db/repositories/depositEvent.js +1 -1
- package/lib/db/repositories/depositEvent.js.map +1 -1
- package/lib/db/repositories/eth1Data.d.ts +1 -1
- package/lib/db/repositories/eth1Data.js +1 -1
- package/lib/db/repositories/eth1Data.js.map +1 -1
- package/lib/db/repositories/lightclientBestUpdate.js.map +1 -1
- package/lib/db/repositories/lightclientCheckpointHeader.js +1 -1
- package/lib/db/repositories/lightclientCheckpointHeader.js.map +1 -1
- package/lib/db/repositories/proposerSlashing.d.ts +1 -1
- package/lib/db/repositories/proposerSlashing.js +1 -1
- package/lib/db/repositories/proposerSlashing.js.map +1 -1
- package/lib/db/repositories/stateArchive.d.ts +2 -2
- package/lib/db/repositories/stateArchive.js +1 -1
- package/lib/db/repositories/stateArchive.js.map +1 -1
- package/lib/db/repositories/stateArchiveIndex.js.map +1 -1
- package/lib/db/repositories/voluntaryExit.d.ts +1 -1
- package/lib/db/repositories/voluntaryExit.js +1 -1
- package/lib/db/repositories/voluntaryExit.js.map +1 -1
- package/lib/db/single/preGenesisState.js.map +1 -1
- package/lib/db/single/preGenesisStateLastProcessedBlock.js.map +1 -1
- package/lib/eth1/eth1DataCache.js +1 -1
- package/lib/eth1/eth1DataCache.js.map +1 -1
- package/lib/eth1/eth1DepositDataTracker.js +14 -18
- package/lib/eth1/eth1DepositDataTracker.js.map +1 -1
- package/lib/eth1/eth1DepositsCache.d.ts +2 -2
- package/lib/eth1/eth1DepositsCache.js +4 -4
- package/lib/eth1/eth1DepositsCache.js.map +1 -1
- package/lib/eth1/eth1MergeBlockTracker.d.ts +1 -1
- package/lib/eth1/eth1MergeBlockTracker.js +41 -49
- package/lib/eth1/eth1MergeBlockTracker.js.map +1 -1
- package/lib/eth1/index.d.ts +1 -1
- package/lib/eth1/index.js +4 -8
- package/lib/eth1/index.js.map +1 -1
- package/lib/eth1/interface.d.ts +1 -1
- package/lib/eth1/provider/eth1Provider.d.ts +2 -2
- package/lib/eth1/provider/eth1Provider.js +5 -5
- package/lib/eth1/provider/eth1Provider.js.map +1 -1
- package/lib/eth1/provider/jsonRpcHttpClient.d.ts +5 -1
- package/lib/eth1/provider/jsonRpcHttpClient.js +6 -12
- package/lib/eth1/provider/jsonRpcHttpClient.js.map +1 -1
- package/lib/eth1/provider/utils.js +2 -2
- package/lib/eth1/provider/utils.js.map +1 -1
- package/lib/eth1/stream.d.ts +1 -1
- package/lib/eth1/stream.js +1 -1
- package/lib/eth1/stream.js.map +1 -1
- package/lib/eth1/utils/deposits.d.ts +1 -1
- package/lib/eth1/utils/deposits.js +4 -4
- package/lib/eth1/utils/deposits.js.map +1 -1
- package/lib/eth1/utils/eth1Data.js.map +1 -1
- package/lib/eth1/utils/eth1Vote.d.ts +1 -1
- package/lib/eth1/utils/eth1Vote.js +3 -5
- package/lib/eth1/utils/eth1Vote.js.map +1 -1
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.js +1 -3
- package/lib/eth1/utils/optimizeNextBlockDiffForGenesis.js.map +1 -1
- package/lib/execution/builder/http.d.ts +18 -3
- package/lib/execution/builder/http.js +33 -8
- package/lib/execution/builder/http.js.map +1 -1
- package/lib/execution/builder/interface.d.ts +3 -2
- package/lib/execution/engine/disabled.d.ts +1 -0
- package/lib/execution/engine/disabled.js +3 -0
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +6 -3
- package/lib/execution/engine/http.js +48 -12
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/index.d.ts +2 -2
- package/lib/execution/engine/index.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +4 -3
- package/lib/execution/engine/interface.js.map +1 -1
- package/lib/execution/engine/mock.d.ts +3 -2
- package/lib/execution/engine/mock.js +16 -14
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/payloadIdCache.d.ts +1 -1
- package/lib/execution/engine/types.d.ts +25 -25
- package/lib/execution/engine/types.js +41 -54
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/execution/engine/utils.d.ts +1 -1
- package/lib/execution/engine/utils.js +2 -2
- package/lib/execution/engine/utils.js.map +1 -1
- package/lib/metrics/metrics/beacon.d.ts +36 -3
- package/lib/metrics/metrics/beacon.js +122 -1
- package/lib/metrics/metrics/beacon.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +3 -3
- package/lib/metrics/metrics.d.ts +3 -3
- package/lib/metrics/metrics.js +1 -1
- package/lib/metrics/metrics.js.map +1 -1
- package/lib/metrics/nodeJsMetrics.js +1 -1
- package/lib/metrics/nodeJsMetrics.js.map +1 -1
- package/lib/metrics/server/http.d.ts +1 -1
- package/lib/metrics/server/http.js +1 -1
- package/lib/metrics/server/http.js.map +1 -1
- package/lib/metrics/utils/avgMinMax.d.ts +1 -1
- package/lib/metrics/utils/gauge.d.ts +1 -1
- package/lib/metrics/utils/gauge.js.map +1 -1
- package/lib/metrics/utils/registryMetricCreator.d.ts +1 -1
- package/lib/metrics/utils/registryMetricCreator.js +1 -1
- package/lib/metrics/utils/registryMetricCreator.js.map +1 -1
- package/lib/metrics/validatorMonitor.d.ts +2 -2
- package/lib/metrics/validatorMonitor.js +39 -51
- package/lib/metrics/validatorMonitor.js.map +1 -1
- package/lib/monitoring/properties.js +2 -4
- package/lib/monitoring/properties.js.map +1 -1
- package/lib/monitoring/service.js +3 -5
- package/lib/monitoring/service.js.map +1 -1
- package/lib/monitoring/system.js.map +1 -1
- package/lib/network/core/networkCore.d.ts +16 -16
- package/lib/network/core/networkCore.js +21 -20
- package/lib/network/core/networkCore.js.map +1 -1
- package/lib/network/core/networkCoreWorker.js +5 -7
- package/lib/network/core/networkCoreWorker.js.map +1 -1
- package/lib/network/core/networkCoreWorkerHandler.d.ts +2 -2
- package/lib/network/core/networkCoreWorkerHandler.js +3 -3
- package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
- package/lib/network/core/types.d.ts +3 -3
- package/lib/network/discv5/index.d.ts +4 -3
- package/lib/network/discv5/index.js +6 -5
- package/lib/network/discv5/index.js.map +1 -1
- package/lib/network/discv5/types.d.ts +1 -1
- package/lib/network/discv5/utils.js +1 -0
- package/lib/network/discv5/utils.js.map +1 -1
- package/lib/network/discv5/worker.js +12 -13
- package/lib/network/discv5/worker.js.map +1 -1
- package/lib/network/events.d.ts +3 -3
- package/lib/network/forks.d.ts +1 -1
- package/lib/network/gossip/encoding.d.ts +1 -1
- package/lib/network/gossip/encoding.js +4 -6
- package/lib/network/gossip/encoding.js.map +1 -1
- package/lib/network/gossip/gossipsub.d.ts +2 -2
- package/lib/network/gossip/gossipsub.js +11 -15
- package/lib/network/gossip/gossipsub.js.map +1 -1
- package/lib/network/gossip/interface.d.ts +6 -6
- package/lib/network/gossip/scoringParameters.js +1 -1
- package/lib/network/gossip/scoringParameters.js.map +1 -1
- package/lib/network/gossip/topic.d.ts +2 -2
- package/lib/network/gossip/topic.js +3 -3
- package/lib/network/gossip/topic.js.map +1 -1
- package/lib/network/interface.d.ts +6 -11
- package/lib/network/libp2p/index.d.ts +3 -3
- package/lib/network/libp2p/index.js +11 -11
- package/lib/network/libp2p/index.js.map +1 -1
- package/lib/network/metadata.d.ts +1 -1
- package/lib/network/metadata.js.map +1 -1
- package/lib/network/network.d.ts +13 -13
- package/lib/network/network.js +15 -17
- package/lib/network/network.js.map +1 -1
- package/lib/network/options.d.ts +1 -1
- package/lib/network/peers/datastore.d.ts +2 -3
- package/lib/network/peers/datastore.js +1 -1
- package/lib/network/peers/datastore.js.map +1 -1
- package/lib/network/peers/discover.d.ts +2 -4
- package/lib/network/peers/discover.js +14 -17
- package/lib/network/peers/discover.js.map +1 -1
- package/lib/network/peers/peerManager.d.ts +6 -7
- package/lib/network/peers/peerManager.js +11 -8
- package/lib/network/peers/peerManager.js.map +1 -1
- package/lib/network/peers/peersData.d.ts +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.js +1 -1
- package/lib/network/peers/utils/enrSubnetsDeserialize.js.map +1 -1
- package/lib/network/peers/utils/getConnectedPeerIds.js +2 -2
- package/lib/network/peers/utils/getConnectedPeerIds.js.map +1 -1
- package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
- package/lib/network/processor/extractSlotRootFns.js +1 -1
- package/lib/network/processor/extractSlotRootFns.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts +4 -4
- package/lib/network/processor/gossipHandlers.js +15 -11
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipQueues/index.js +3 -5
- package/lib/network/processor/gossipQueues/index.js.map +1 -1
- package/lib/network/processor/gossipQueues/indexed.js +1 -3
- package/lib/network/processor/gossipQueues/indexed.js.map +1 -1
- package/lib/network/processor/gossipQueues/linear.d.ts +1 -1
- package/lib/network/processor/gossipQueues/linear.js +5 -7
- package/lib/network/processor/gossipQueues/linear.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts +1 -1
- package/lib/network/processor/gossipValidatorFn.js +1 -1
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +4 -4
- package/lib/network/processor/index.js +5 -5
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/processor/types.d.ts +1 -1
- package/lib/network/reqresp/ReqRespBeaconNode.d.ts +2 -2
- package/lib/network/reqresp/ReqRespBeaconNode.js +2 -2
- package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +2 -2
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +2 -4
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +10 -3
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +145 -11
- package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js +1 -1
- package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.d.ts +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js +2 -2
- package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRoot.js +1 -1
- package/lib/network/reqresp/handlers/blobSidecarsByRoot.js.map +1 -1
- package/lib/network/reqresp/handlers/index.js +1 -1
- package/lib/network/reqresp/handlers/index.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientBootstrap.js +3 -5
- package/lib/network/reqresp/handlers/lightClientBootstrap.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js +7 -9
- package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js +8 -10
- package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js.map +1 -1
- package/lib/network/reqresp/handlers/lightClientUpdatesByRange.d.ts +1 -1
- package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js +3 -5
- package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js.map +1 -1
- package/lib/network/reqresp/handlers/status.js +1 -1
- package/lib/network/reqresp/handlers/status.js.map +1 -1
- package/lib/network/reqresp/protocols.js +1 -1
- package/lib/network/reqresp/protocols.js.map +1 -1
- package/lib/network/reqresp/rateLimit.js +1 -1
- package/lib/network/reqresp/rateLimit.js.map +1 -1
- package/lib/network/reqresp/types.js +3 -7
- package/lib/network/reqresp/types.js.map +1 -1
- package/lib/network/reqresp/utils/collect.d.ts +1 -1
- package/lib/network/reqresp/utils/collect.js +1 -1
- package/lib/network/reqresp/utils/collect.js.map +1 -1
- package/lib/network/reqresp/utils/collectSequentialBlocksInRange.d.ts +1 -2
- package/lib/network/reqresp/utils/collectSequentialBlocksInRange.js.map +1 -1
- package/lib/network/subnets/attnetsService.d.ts +3 -3
- package/lib/network/subnets/attnetsService.js +3 -3
- package/lib/network/subnets/attnetsService.js.map +1 -1
- package/lib/network/subnets/interface.d.ts +1 -1
- package/lib/network/subnets/syncnetsService.d.ts +1 -1
- package/lib/network/subnets/syncnetsService.js +1 -1
- package/lib/network/subnets/syncnetsService.js.map +1 -1
- package/lib/network/util.d.ts +1 -4
- package/lib/network/util.js +2 -1
- package/lib/network/util.js.map +1 -1
- package/lib/node/nodejs.d.ts +10 -10
- package/lib/node/nodejs.js +11 -11
- package/lib/node/nodejs.js.map +1 -1
- package/lib/node/notifier.js +18 -28
- package/lib/node/notifier.js.map +1 -1
- package/lib/node/options.d.ts +3 -3
- package/lib/node/options.js +3 -3
- package/lib/node/options.js.map +1 -1
- package/lib/node/utils/interop/deposits.d.ts +1 -1
- package/lib/node/utils/interop/deposits.js +3 -3
- 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.js +2 -2
- package/lib/node/utils/interop/state.js.map +1 -1
- package/lib/node/utils/state.js.map +1 -1
- package/lib/sync/backfill/backfill.d.ts +5 -5
- package/lib/sync/backfill/backfill.js +4 -3
- package/lib/sync/backfill/backfill.js.map +1 -1
- package/lib/sync/backfill/errors.d.ts +1 -1
- package/lib/sync/backfill/errors.js.map +1 -1
- package/lib/sync/backfill/verify.d.ts +2 -3
- package/lib/sync/backfill/verify.js +1 -1
- package/lib/sync/backfill/verify.js.map +1 -1
- package/lib/sync/interface.d.ts +5 -5
- package/lib/sync/range/batch.d.ts +2 -2
- package/lib/sync/range/batch.js +1 -1
- package/lib/sync/range/batch.js.map +1 -1
- package/lib/sync/range/chain.d.ts +1 -1
- package/lib/sync/range/chain.js +1 -1
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.d.ts +2 -2
- package/lib/sync/range/range.js +4 -8
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/range/utils/batches.js +1 -3
- package/lib/sync/range/utils/batches.js.map +1 -1
- package/lib/sync/range/utils/hashBlocks.d.ts +1 -1
- package/lib/sync/sync.d.ts +1 -1
- package/lib/sync/sync.js +31 -30
- package/lib/sync/sync.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +3 -1
- package/lib/sync/unknownBlock.js +15 -12
- 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/lib/sync/utils/remoteSyncType.d.ts +1 -1
- package/lib/sync/utils/remoteSyncType.js +25 -36
- package/lib/sync/utils/remoteSyncType.js.map +1 -1
- package/lib/util/binarySearch.js +1 -1
- package/lib/util/binarySearch.js.map +1 -1
- package/lib/util/bitArray.js +1 -2
- package/lib/util/bitArray.js.map +1 -1
- package/lib/util/blobs.d.ts +2 -2
- package/lib/util/blobs.js +2 -2
- package/lib/util/blobs.js.map +1 -1
- package/lib/util/clock.d.ts +2 -2
- package/lib/util/clock.js +1 -1
- package/lib/util/clock.js.map +1 -1
- package/lib/util/kzg.js +4 -4
- package/lib/util/kzg.js.map +1 -1
- package/lib/util/multifork.d.ts +1 -1
- package/lib/util/multifork.js.map +1 -1
- package/lib/util/peerId.js +2 -2
- package/lib/util/peerId.js.map +1 -1
- package/lib/util/queue/fnQueue.d.ts +1 -1
- package/lib/util/queue/itemQueue.d.ts +1 -1
- package/lib/util/queue/itemQueue.js +2 -2
- package/lib/util/queue/itemQueue.js.map +1 -1
- package/lib/util/sszBytes.d.ts +1 -1
- package/lib/util/sszBytes.js.map +1 -1
- package/package.json +34 -33
- package/lib/chain/archiver/archiveStates.js.map +0 -1
|
@@ -155,7 +155,7 @@ export class JsonRpcHttpClient {
|
|
|
155
155
|
clv: this.jwtVersion,
|
|
156
156
|
};
|
|
157
157
|
const token = encodeJwtToken(jwtClaim, this.jwtSecret);
|
|
158
|
-
headers
|
|
158
|
+
headers.Authorization = `Bearer ${token}`;
|
|
159
159
|
}
|
|
160
160
|
const res = await fetch(url, {
|
|
161
161
|
method: "post",
|
|
@@ -181,13 +181,9 @@ export class JsonRpcHttpClient {
|
|
|
181
181
|
if (this.opts?.signal?.aborted) {
|
|
182
182
|
throw new ErrorAborted("request");
|
|
183
183
|
}
|
|
184
|
-
|
|
185
|
-
throw new TimeoutError("request");
|
|
186
|
-
}
|
|
187
|
-
}
|
|
188
|
-
else {
|
|
189
|
-
throw e;
|
|
184
|
+
throw new TimeoutError("request");
|
|
190
185
|
}
|
|
186
|
+
throw e;
|
|
191
187
|
}
|
|
192
188
|
finally {
|
|
193
189
|
timer?.();
|
|
@@ -201,12 +197,10 @@ function parseRpcResponse(res, payload) {
|
|
|
201
197
|
if (res.result !== undefined) {
|
|
202
198
|
return res.result;
|
|
203
199
|
}
|
|
204
|
-
|
|
200
|
+
if (res.error !== undefined) {
|
|
205
201
|
throw new ErrorJsonRpcResponse(res, payload.method);
|
|
206
202
|
}
|
|
207
|
-
|
|
208
|
-
throw Error(`Invalid JSON RPC response, no result or error property: ${jsonSerializeTry(res)}`);
|
|
209
|
-
}
|
|
203
|
+
throw Error(`Invalid JSON RPC response, no result or error property: ${jsonSerializeTry(res)}`);
|
|
210
204
|
}
|
|
211
205
|
/**
|
|
212
206
|
* Util: Parse JSON but display the original source string in case of error
|
|
@@ -250,7 +244,7 @@ export class HttpRpcError extends Error {
|
|
|
250
244
|
/**
|
|
251
245
|
* JSON RPC spec errors https://www.jsonrpc.org/specification#response_object
|
|
252
246
|
*/
|
|
253
|
-
function parseJsonRpcErrorCode(code) {
|
|
247
|
+
export function parseJsonRpcErrorCode(code) {
|
|
254
248
|
if (code === -32700)
|
|
255
249
|
return "Parse request error";
|
|
256
250
|
if (code === -32600)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jsonRpcHttpClient.js","sourceRoot":"","sources":["../../../src/eth1/provider/jsonRpcHttpClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"jsonRpcHttpClient.js","sourceRoot":"","sources":["../../../src/eth1/provider/jsonRpcHttpClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { bytesToBigInt,
|
|
1
|
+
import { bigIntToBytes, bytesToBigInt, fromHex, toHex } from "@lodestar/utils";
|
|
2
2
|
import { ErrorParseJson } from "./jsonRpcHttpClient.js";
|
|
3
3
|
export const rootHexRegex = /^0x[a-fA-F0-9]{64}$/;
|
|
4
4
|
export function numberToHex(n) {
|
|
@@ -39,7 +39,7 @@ export function numToQuantity(num) {
|
|
|
39
39
|
*/
|
|
40
40
|
export function quantityToNum(hex, id = "") {
|
|
41
41
|
const num = parseInt(hex, 16);
|
|
42
|
-
if (isNaN(num) || num < 0)
|
|
42
|
+
if (Number.isNaN(num) || num < 0)
|
|
43
43
|
throw Error(`Invalid hex decimal ${id} '${hex}'`);
|
|
44
44
|
return num;
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/eth1/provider/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,aAAa,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/eth1/provider/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/eth1/stream.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { phase0 } from "@lodestar/types";
|
|
2
|
-
import {
|
|
2
|
+
import { BatchDepositEvents, Eth1Block, IEth1Provider, IEth1StreamParams } from "./interface.js";
|
|
3
3
|
/**
|
|
4
4
|
* Phase 1 of genesis building.
|
|
5
5
|
* Not enough validators, only stream deposits
|
package/lib/eth1/stream.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { sleep } from "@lodestar/utils";
|
|
2
|
+
import { parseEth1Block } from "./provider/eth1Provider.js";
|
|
2
3
|
import { groupDepositEventsByBlock } from "./utils/groupDepositEventsByBlock.js";
|
|
3
4
|
import { optimizeNextBlockDiffForGenesis } from "./utils/optimizeNextBlockDiffForGenesis.js";
|
|
4
|
-
import { parseEth1Block } from "./provider/eth1Provider.js";
|
|
5
5
|
/**
|
|
6
6
|
* Phase 1 of genesis building.
|
|
7
7
|
* Not enough validators, only stream deposits
|
package/lib/eth1/stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/eth1/stream.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/eth1/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { FilterOptions } from "@lodestar/db";
|
|
1
2
|
import { CachedBeaconStateAllForks } from "@lodestar/state-transition";
|
|
2
3
|
import { phase0 } from "@lodestar/types";
|
|
3
|
-
import { FilterOptions } from "@lodestar/db";
|
|
4
4
|
import { DepositTree } from "../../db/repositories/depositDataRoot.js";
|
|
5
5
|
export type DepositGetter<T> = (indexRange: FilterOptions<number>, eth1Data: phase0.Eth1Data) => Promise<T[]>;
|
|
6
6
|
export declare function getDeposits<T>(state: CachedBeaconStateAllForks, eth1Data: phase0.Eth1Data, depositsGetter: DepositGetter<T>): Promise<T[]>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { toRootHex } from "@lodestar/utils";
|
|
3
|
-
import { ssz } from "@lodestar/types";
|
|
1
|
+
import { Tree, toGindex } from "@chainsafe/persistent-merkle-tree";
|
|
4
2
|
import { getEth1DepositCount } from "@lodestar/state-transition";
|
|
3
|
+
import { ssz } from "@lodestar/types";
|
|
4
|
+
import { toRootHex } from "@lodestar/utils";
|
|
5
5
|
import { Eth1Error, Eth1ErrorCode } from "../errors.js";
|
|
6
6
|
export async function getDeposits(
|
|
7
7
|
// eth1_deposit_index represents the next deposit index to be added
|
|
@@ -20,7 +20,7 @@ state, eth1Data, depositsGetter) {
|
|
|
20
20
|
if (deposits.length < depositsLen) {
|
|
21
21
|
throw new Eth1Error({ code: Eth1ErrorCode.NOT_ENOUGH_DEPOSITS, len: deposits.length, expectedLen: depositsLen });
|
|
22
22
|
}
|
|
23
|
-
|
|
23
|
+
if (deposits.length > depositsLen) {
|
|
24
24
|
throw new Eth1Error({ code: Eth1ErrorCode.TOO_MANY_DEPOSITS, len: deposits.length, expectedLen: depositsLen });
|
|
25
25
|
}
|
|
26
26
|
return deposits;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../src/eth1/utils/deposits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"deposits.js","sourceRoot":"","sources":["../../../src/eth1/utils/deposits.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth1Data.js","sourceRoot":"","sources":["../../../src/eth1/utils/eth1Data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eth1Data.js","sourceRoot":"","sources":["../../../src/eth1/utils/eth1Data.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
-
import { phase0 } from "@lodestar/types";
|
|
3
2
|
import { BeaconStateAllForks } from "@lodestar/state-transition";
|
|
3
|
+
import { phase0 } from "@lodestar/types";
|
|
4
4
|
export type Eth1DataGetter = ({ timestampRange, }: {
|
|
5
5
|
timestampRange: {
|
|
6
6
|
gte: number;
|
|
@@ -48,14 +48,12 @@ export function pickEth1Vote(state, votesToConsider) {
|
|
|
48
48
|
return votesToConsider[votesToConsider.length - 1] ?? state.eth1Data;
|
|
49
49
|
}
|
|
50
50
|
// If there's a single winning vote with a majority vote that one
|
|
51
|
-
|
|
51
|
+
if (eth1DataRootsMaxVotes.length === 1) {
|
|
52
52
|
return eth1DataHashToEth1Data.get(eth1DataRootsMaxVotes[0]) ?? state.eth1Data;
|
|
53
53
|
}
|
|
54
54
|
// If there are multiple winning votes, vote for the latest one
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
return eth1DataHashToEth1Data.get(latestMostVotedRoot) ?? state.eth1Data;
|
|
58
|
-
}
|
|
55
|
+
const latestMostVotedRoot = eth1DataVotesOrder[Math.max(...eth1DataRootsMaxVotes.map((root) => eth1DataVotesOrder.indexOf(root)))];
|
|
56
|
+
return eth1DataHashToEth1Data.get(latestMostVotedRoot) ?? state.eth1Data;
|
|
59
57
|
}
|
|
60
58
|
/**
|
|
61
59
|
* Returns the array of keys with max value. May return 0, 1 or more keys
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eth1Vote.js","sourceRoot":"","sources":["../../../src/eth1/utils/eth1Vote.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eth1Vote.js","sourceRoot":"","sources":["../../../src/eth1/utils/eth1Vote.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,6BAA6B,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAsB,iBAAiB,EAAC,MAAM,4BAA4B,CAAC;AAElF,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAQ1C,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,MAAuB,EACvB,KAA0B,EAC1B,cAA8B;IAE9B,MAAM,WAAW,GAAG,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACzD,MAAM,EAAC,sBAAsB,EAAE,oBAAoB,EAAC,GAAG,MAAM,CAAC;IAE9D,yFAAyF;IACzF,OAAO,CACL,MAAM,cAAc,CAAC;QACnB,cAAc,EAAE;YACd,eAAe;YACf,uBAAuB;YACvB,uFAAuF;YACvF,wFAAwF;YACxF,GAAG,EAAE,WAAW,GAAG,sBAAsB,GAAG,oBAAoB;YAChE,GAAG,EAAE,WAAW,GAAG,sBAAsB,GAAG,oBAAoB,GAAG,CAAC;SACrE;KACF,CAAC,CACH,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAA0B,EAAE,eAAkC;IACzF,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9C,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;QACvC,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAA4B,CAAC;IACnE,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC3D,MAAM,kBAAkB,GAAc,EAAE,CAAC;IAEzC,4EAA4E;IAC5E,6DAA6D;IAC7D,gFAAgF;IAChF,4EAA4E;IAC5E,4FAA4F;IAC5F,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;IAC3D,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;QACzC,MAAM,OAAO,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC;QAE7C,IAAI,mBAAmB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,MAAM,aAAa,GAAG,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3D,uBAAuB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC,CAAC;YAE/D,oDAAoD;YACpD,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;gBAChC,sBAAsB,CAAC,GAAG,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBAClD,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;IAE3E,yCAAyC;IACzC,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC;IACvE,CAAC;IAED,iEAAiE;IACjE,IAAI,qBAAqB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvC,OAAO,sBAAsB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC;IAChF,CAAC;IAED,+DAA+D;IAC/D,MAAM,mBAAmB,GACvB,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,OAAO,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC;AAC3E,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAI,GAAmB;IACjD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;IAC1C,IAAI,OAAO,GAAQ,EAAE,CAAC;IACtB,IAAI,QAAQ,GAAG,CAAC,QAAQ,CAAC;IAEzB,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,OAAO,EAAE,CAAC;QACnC,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;YACrB,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;YAChB,QAAQ,GAAG,KAAK,CAAC;QACnB,CAAC;aAAM,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAS,cAAc,CAAC,QAAyB;IAC/C,OAAO,qBAAqB,CAAC,QAAQ,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,QAAyB;IAC7D,OAAO,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC9G,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAuB,EAAE,KAA0B;IACvF,MAAM,yBAAyB,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,6BAA6B,GAAG,eAAe,CAAC,CAAC,CAAC;IAChH,OAAO,iBAAiB,CAAC,MAAM,EAAE,yBAAyB,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;AACjF,CAAC"}
|
|
@@ -9,8 +9,6 @@ export function optimizeNextBlockDiffForGenesis(lastFetchedBlock, params) {
|
|
|
9
9
|
if (numBlocksToGenesis <= 2) {
|
|
10
10
|
return 1;
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
return Math.max(1, Math.floor(numBlocksToGenesis / 2));
|
|
14
|
-
}
|
|
12
|
+
return Math.max(1, Math.floor(numBlocksToGenesis / 2));
|
|
15
13
|
}
|
|
16
14
|
//# sourceMappingURL=optimizeNextBlockDiffForGenesis.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optimizeNextBlockDiffForGenesis.js","sourceRoot":"","sources":["../../../src/eth1/utils/optimizeNextBlockDiffForGenesis.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,gBAAqC,EACrC,MAA0F;IAE1F,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,GAAG,gBAAgB,CAAC,SAAS,CAAC;IAClG,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;IACrF,IAAI,kBAAkB,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;
|
|
1
|
+
{"version":3,"file":"optimizeNextBlockDiffForGenesis.js","sourceRoot":"","sources":["../../../src/eth1/utils/optimizeNextBlockDiffForGenesis.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,+BAA+B,CAC7C,gBAAqC,EACrC,MAA0F;IAE1F,MAAM,aAAa,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,aAAa,GAAG,gBAAgB,CAAC,SAAS,CAAC;IAClG,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAC;IACrF,IAAI,kBAAkB,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ApiClient as BuilderApi } from "@lodestar/api/builder";
|
|
2
2
|
import { ChainForkConfig } from "@lodestar/config";
|
|
3
3
|
import { Logger } from "@lodestar/logger";
|
|
4
|
-
import { ApiClient as BuilderApi } from "@lodestar/api/builder";
|
|
5
4
|
import { ForkExecution } from "@lodestar/params";
|
|
5
|
+
import { BLSPubkey, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
6
6
|
import { Metrics } from "../../metrics/metrics.js";
|
|
7
7
|
import { IExecutionBuilder } from "./interface.js";
|
|
8
8
|
export type ExecutionBuilderHttpOpts = {
|
|
@@ -15,6 +15,14 @@ export type ExecutionBuilderHttpOpts = {
|
|
|
15
15
|
userAgent?: string;
|
|
16
16
|
};
|
|
17
17
|
export declare const defaultExecutionBuilderHttpOpts: ExecutionBuilderHttpOpts;
|
|
18
|
+
/**
|
|
19
|
+
* Expected error if builder does not provide a bid. Most of the time, this
|
|
20
|
+
* is due to `min-bid` setting on the mev-boost side but in rare cases could
|
|
21
|
+
* also happen if there are no bids from any of the connected relayers.
|
|
22
|
+
*/
|
|
23
|
+
export declare class NoBidReceived extends Error {
|
|
24
|
+
constructor();
|
|
25
|
+
}
|
|
18
26
|
export declare class ExecutionBuilderHttp implements IExecutionBuilder {
|
|
19
27
|
readonly api: BuilderApi;
|
|
20
28
|
readonly config: ChainForkConfig;
|
|
@@ -22,6 +30,12 @@ export declare class ExecutionBuilderHttp implements IExecutionBuilder {
|
|
|
22
30
|
status: boolean;
|
|
23
31
|
faultInspectionWindow: number;
|
|
24
32
|
allowedFaults: number;
|
|
33
|
+
/**
|
|
34
|
+
* Determine if SSZ is supported by requesting an SSZ encoded response in the `getHeader` request.
|
|
35
|
+
* The builder responding with a SSZ serialized `SignedBuilderBid` indicates support to handle the
|
|
36
|
+
* `SignedBlindedBeaconBlock` as SSZ serialized bytes instead of JSON when calling `submitBlindedBlock`.
|
|
37
|
+
*/
|
|
38
|
+
private sszSupported;
|
|
25
39
|
constructor(opts: ExecutionBuilderHttpOpts, config: ChainForkConfig, metrics?: Metrics | null, logger?: Logger);
|
|
26
40
|
updateStatus(shouldEnable: boolean): void;
|
|
27
41
|
checkStatus(): Promise<void>;
|
|
@@ -30,7 +44,8 @@ export declare class ExecutionBuilderHttp implements IExecutionBuilder {
|
|
|
30
44
|
header: ExecutionPayloadHeader;
|
|
31
45
|
executionPayloadValue: Wei;
|
|
32
46
|
blobKzgCommitments?: deneb.BlobKzgCommitments;
|
|
47
|
+
executionRequests?: electra.ExecutionRequests;
|
|
33
48
|
}>;
|
|
34
|
-
submitBlindedBlock(signedBlindedBlock: SignedBlindedBeaconBlock): Promise<SignedBeaconBlockOrContents>;
|
|
49
|
+
submitBlindedBlock(signedBlindedBlock: WithOptionalBytes<SignedBlindedBeaconBlock>): Promise<SignedBeaconBlockOrContents>;
|
|
35
50
|
}
|
|
36
51
|
//# sourceMappingURL=http.d.ts.map
|
|
@@ -1,16 +1,38 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { WireFormat } from "@lodestar/api";
|
|
2
2
|
import { getClient } from "@lodestar/api/builder";
|
|
3
3
|
import { SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
4
|
+
import { parseExecutionPayloadAndBlobsBundle, reconstructFullBlockOrContents } from "@lodestar/state-transition";
|
|
4
5
|
import { toPrintableUrl } from "@lodestar/utils";
|
|
5
6
|
export const defaultExecutionBuilderHttpOpts = {
|
|
6
7
|
enabled: false,
|
|
7
8
|
url: "http://localhost:8661",
|
|
8
9
|
timeout: 12000,
|
|
9
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* Expected error if builder does not provide a bid. Most of the time, this
|
|
13
|
+
* is due to `min-bid` setting on the mev-boost side but in rare cases could
|
|
14
|
+
* also happen if there are no bids from any of the connected relayers.
|
|
15
|
+
*/
|
|
16
|
+
export class NoBidReceived extends Error {
|
|
17
|
+
constructor() {
|
|
18
|
+
super("No bid received");
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Duration given to the builder to provide a `SignedBuilderBid` before the deadline
|
|
23
|
+
* is reached, aborting the external builder flow in favor of the local build process.
|
|
24
|
+
*/
|
|
25
|
+
const BUILDER_PROPOSAL_DELAY_TOLERANCE = 1000;
|
|
10
26
|
export class ExecutionBuilderHttp {
|
|
11
27
|
constructor(opts, config, metrics = null, logger) {
|
|
12
28
|
// Builder needs to be explicity enabled using updateStatus
|
|
13
29
|
this.status = false;
|
|
30
|
+
/**
|
|
31
|
+
* Determine if SSZ is supported by requesting an SSZ encoded response in the `getHeader` request.
|
|
32
|
+
* The builder responding with a SSZ serialized `SignedBuilderBid` indicates support to handle the
|
|
33
|
+
* `SignedBlindedBeaconBlock` as SSZ serialized bytes instead of JSON when calling `submitBlindedBlock`.
|
|
34
|
+
*/
|
|
35
|
+
this.sszSupported = false;
|
|
14
36
|
const baseUrl = opts.url;
|
|
15
37
|
if (!baseUrl)
|
|
16
38
|
throw Error("No Url provided for executionBuilder");
|
|
@@ -20,7 +42,7 @@ export class ExecutionBuilderHttp {
|
|
|
20
42
|
timeoutMs: opts.timeout,
|
|
21
43
|
headers: opts.userAgent ? { "User-Agent": opts.userAgent } : undefined,
|
|
22
44
|
},
|
|
23
|
-
}, { config, metrics: metrics?.builderHttpClient });
|
|
45
|
+
}, { config, metrics: metrics?.builderHttpClient, logger });
|
|
24
46
|
logger?.info("External builder", { url: toPrintableUrl(baseUrl) });
|
|
25
47
|
this.config = config;
|
|
26
48
|
this.issueLocalFcUWithFeeRecipient = opts.issueLocalFcUWithFeeRecipient;
|
|
@@ -53,24 +75,27 @@ export class ExecutionBuilderHttp {
|
|
|
53
75
|
(await this.api.registerValidator({ registrations })).assertOk();
|
|
54
76
|
}
|
|
55
77
|
async getHeader(_fork, slot, parentHash, proposerPubkey) {
|
|
56
|
-
const
|
|
78
|
+
const res = await this.api.getHeader({ slot, parentHash, proposerPubkey }, { timeoutMs: BUILDER_PROPOSAL_DELAY_TOLERANCE });
|
|
79
|
+
const signedBuilderBid = res.value();
|
|
57
80
|
if (!signedBuilderBid) {
|
|
58
|
-
throw
|
|
81
|
+
throw new NoBidReceived();
|
|
59
82
|
}
|
|
83
|
+
this.sszSupported = res.wireFormat() === WireFormat.ssz;
|
|
60
84
|
const { header, value: executionPayloadValue } = signedBuilderBid.message;
|
|
61
85
|
const { blobKzgCommitments } = signedBuilderBid.message;
|
|
62
|
-
|
|
86
|
+
const { executionRequests } = signedBuilderBid.message;
|
|
87
|
+
return { header, executionPayloadValue, blobKzgCommitments, executionRequests };
|
|
63
88
|
}
|
|
64
89
|
async submitBlindedBlock(signedBlindedBlock) {
|
|
65
|
-
const
|
|
66
|
-
const { executionPayload, blobsBundle } = parseExecutionPayloadAndBlobsBundle(
|
|
90
|
+
const res = await this.api.submitBlindedBlock({ signedBlindedBlock }, { retries: 2, requestWireFormat: this.sszSupported ? WireFormat.ssz : WireFormat.json });
|
|
91
|
+
const { executionPayload, blobsBundle } = parseExecutionPayloadAndBlobsBundle(res.value());
|
|
67
92
|
// for the sake of timely proposals we can skip matching the payload with payloadHeader
|
|
68
93
|
// if the roots (transactions, withdrawals) don't match, this will likely lead to a block with
|
|
69
94
|
// invalid signature, but there is no recourse to this anyway so lets just proceed and will
|
|
70
95
|
// probably need diagonis if this block turns out to be invalid because of some bug
|
|
71
96
|
//
|
|
72
97
|
const contents = blobsBundle ? { blobs: blobsBundle.blobs, kzgProofs: blobsBundle.proofs } : null;
|
|
73
|
-
return reconstructFullBlockOrContents(signedBlindedBlock, { executionPayload, contents });
|
|
98
|
+
return reconstructFullBlockOrContents(signedBlindedBlock.data, { executionPayload, contents });
|
|
74
99
|
}
|
|
75
100
|
}
|
|
76
101
|
//# sourceMappingURL=http.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/execution/builder/http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../src/execution/builder/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { bellatrix, Root, Slot, BLSPubkey, deneb, Wei, SignedBeaconBlockOrContents, ExecutionPayloadHeader, SignedBlindedBeaconBlock } from "@lodestar/types";
|
|
2
1
|
import { ForkExecution } from "@lodestar/params";
|
|
2
|
+
import { BLSPubkey, ExecutionPayloadHeader, Root, SignedBeaconBlockOrContents, SignedBlindedBeaconBlock, Slot, Wei, WithOptionalBytes, bellatrix, deneb, electra } from "@lodestar/types";
|
|
3
3
|
export interface IExecutionBuilder {
|
|
4
4
|
/**
|
|
5
5
|
* This param is only to for testing scripts using merge-mock which need
|
|
@@ -19,7 +19,8 @@ export interface IExecutionBuilder {
|
|
|
19
19
|
header: ExecutionPayloadHeader;
|
|
20
20
|
executionPayloadValue: Wei;
|
|
21
21
|
blobKzgCommitments?: deneb.BlobKzgCommitments;
|
|
22
|
+
executionRequests?: electra.ExecutionRequests;
|
|
22
23
|
}>;
|
|
23
|
-
submitBlindedBlock(
|
|
24
|
+
submitBlindedBlock(signedBlindedBlock: WithOptionalBytes<SignedBlindedBeaconBlock>): Promise<SignedBeaconBlockOrContents>;
|
|
24
25
|
}
|
|
25
26
|
//# sourceMappingURL=interface.d.ts.map
|
|
@@ -8,5 +8,6 @@ export declare class ExecutionEngineDisabled implements IExecutionEngine {
|
|
|
8
8
|
getBlobsBundle(): Promise<never>;
|
|
9
9
|
getPayloadBodiesByHash(): Promise<never>;
|
|
10
10
|
getPayloadBodiesByRange(): Promise<never>;
|
|
11
|
+
getBlobs(): Promise<never>;
|
|
11
12
|
}
|
|
12
13
|
//# sourceMappingURL=disabled.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"disabled.js","sourceRoot":"","sources":["../../../src/execution/engine/disabled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAoB,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAEtF,MAAM,OAAO,uBAAuB;IAApC;QACE,UAAK,GAAG,oBAAoB,CAAC,OAAO,CAAC;QAE5B,mBAAc,GAAG,IAAI,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"disabled.js","sourceRoot":"","sources":["../../../src/execution/engine/disabled.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,oBAAoB,EAAoB,cAAc,EAAC,MAAM,gBAAgB,CAAC;AAEtF,MAAM,OAAO,uBAAuB;IAApC;QACE,UAAK,GAAG,oBAAoB,CAAC,OAAO,CAAC;QAE5B,mBAAc,GAAG,IAAI,cAAc,EAAE,CAAC;IA6BjD,CAAC;IA3BC,KAAK,CAAC,gBAAgB;QACpB,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,sBAAsB;QACpB,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,uBAAuB;QACrB,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ;QACN,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC3C,CAAC;CACF"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { ExecutionPayload, ExecutionRequests, Root, RootHex, Wei } from "@lodestar/types";
|
|
2
|
-
import { ForkName } from "@lodestar/params";
|
|
3
1
|
import { Logger } from "@lodestar/logger";
|
|
2
|
+
import { ForkName } from "@lodestar/params";
|
|
3
|
+
import { ExecutionPayload, ExecutionRequests, Root, RootHex, Wei } from "@lodestar/types";
|
|
4
|
+
import { BlobAndProof } from "@lodestar/types/deneb";
|
|
4
5
|
import { IJsonRpcHttpClient } from "../../eth1/provider/jsonRpcHttpClient.js";
|
|
5
6
|
import { Metrics } from "../../metrics/index.js";
|
|
6
|
-
import {
|
|
7
|
+
import { BlobsBundle, ClientVersion, ExecutePayloadResponse, ExecutionEngineState, IExecutionEngine, PayloadAttributes, PayloadId, VersionedHashes } from "./interface.js";
|
|
7
8
|
import { PayloadIdCache } from "./payloadIdCache.js";
|
|
8
9
|
import { ExecutionPayloadBody } from "./types.js";
|
|
9
10
|
export type ExecutionEngineModules = {
|
|
@@ -54,6 +55,7 @@ export declare class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
54
55
|
private readonly rpc;
|
|
55
56
|
private readonly opts?;
|
|
56
57
|
private logger;
|
|
58
|
+
private lastGetBlobsErrorTime;
|
|
57
59
|
state: ExecutionEngineState;
|
|
58
60
|
/** Cached EL client version from the latest getClientVersion call */
|
|
59
61
|
clientVersion?: ClientVersion | null;
|
|
@@ -144,6 +146,7 @@ export declare class ExecutionEngineHttp implements IExecutionEngine {
|
|
|
144
146
|
prunePayloadIdCache(): Promise<void>;
|
|
145
147
|
getPayloadBodiesByHash(_fork: ForkName, blockHashes: RootHex[]): Promise<(ExecutionPayloadBody | null)[]>;
|
|
146
148
|
getPayloadBodiesByRange(_fork: ForkName, startBlockNumber: number, blockCount: number): Promise<(ExecutionPayloadBody | null)[]>;
|
|
149
|
+
getBlobs(_fork: ForkName, versionedHashes: VersionedHashes): Promise<(BlobAndProof | null)[]>;
|
|
147
150
|
private getClientVersion;
|
|
148
151
|
private updateEngineState;
|
|
149
152
|
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ErrorJsonRpcResponse, HttpRpcError, JsonRpcHttpClientEvent, } from "../../eth1/provider/jsonRpcHttpClient.js";
|
|
3
|
-
import {
|
|
1
|
+
import { ForkSeq, SLOTS_PER_EPOCH } from "@lodestar/params";
|
|
2
|
+
import { ErrorJsonRpcResponse, HttpRpcError, JsonRpcHttpClientEvent, parseJsonRpcErrorCode, } from "../../eth1/provider/jsonRpcHttpClient.js";
|
|
3
|
+
import { bytesToData, numToQuantity } from "../../eth1/provider/utils.js";
|
|
4
4
|
import { EPOCHS_PER_BATCH } from "../../sync/constants.js";
|
|
5
|
-
import { numToQuantity } from "../../eth1/provider/utils.js";
|
|
6
5
|
import { getLodestarClientVersion } from "../../util/metadata.js";
|
|
7
|
-
import {
|
|
6
|
+
import { JobItemQueue } from "../../util/queue/index.js";
|
|
7
|
+
import { ClientCode, ExecutionEngineState, ExecutionPayloadStatus, } from "./interface.js";
|
|
8
8
|
import { PayloadIdCache } from "./payloadIdCache.js";
|
|
9
|
-
import {
|
|
9
|
+
import { assertReqSizeLimit, deserializeBlobAndProofs, deserializeExecutionPayloadBody, parseExecutionPayload, serializeBeaconBlockRoot, serializeExecutionPayload, serializeExecutionRequests, serializePayloadAttributes, serializeVersionedHashes, } from "./types.js";
|
|
10
10
|
import { getExecutionEngineState } from "./utils.js";
|
|
11
11
|
export const defaultExecutionEngineHttpOpts = {
|
|
12
12
|
/**
|
|
@@ -41,6 +41,7 @@ export class ExecutionEngineHttp {
|
|
|
41
41
|
constructor(rpc, { metrics, signal, logger }, opts) {
|
|
42
42
|
this.rpc = rpc;
|
|
43
43
|
this.opts = opts;
|
|
44
|
+
this.lastGetBlobsErrorTime = 0;
|
|
44
45
|
// The default state is ONLINE, it will be updated to SYNCING once we receive the first payload
|
|
45
46
|
// This assumption is better than the OFFLINE state, since we can't be sure if the EL is offline and being offline may trigger some notifications
|
|
46
47
|
// It's safer to to avoid false positives and assume that the EL is syncing until we receive the first payload
|
|
@@ -145,9 +146,7 @@ export class ExecutionEngineHttp {
|
|
|
145
146
|
if (e instanceof HttpRpcError || e instanceof ErrorJsonRpcResponse) {
|
|
146
147
|
return { status: ExecutionPayloadStatus.ELERROR, latestValidHash: null, validationError: e.message };
|
|
147
148
|
}
|
|
148
|
-
|
|
149
|
-
return { status: ExecutionPayloadStatus.UNAVAILABLE, latestValidHash: null, validationError: e.message };
|
|
150
|
-
}
|
|
149
|
+
return { status: ExecutionPayloadStatus.UNAVAILABLE, latestValidHash: null, validationError: e.message };
|
|
151
150
|
});
|
|
152
151
|
this.updateEngineState(getExecutionEngineState({ payloadStatus: status, oldState: this.state }));
|
|
153
152
|
switch (status) {
|
|
@@ -242,9 +241,7 @@ export class ExecutionEngineHttp {
|
|
|
242
241
|
if (payloadAttributes) {
|
|
243
242
|
throw Error("Execution Layer Syncing");
|
|
244
243
|
}
|
|
245
|
-
|
|
246
|
-
return null;
|
|
247
|
-
}
|
|
244
|
+
return null;
|
|
248
245
|
case ExecutionPayloadStatus.INVALID:
|
|
249
246
|
throw Error(`Invalid ${payloadAttributes ? "prepare payload" : "forkchoice request"}, validationError=${validationError ?? ""}`);
|
|
250
247
|
default:
|
|
@@ -289,6 +286,45 @@ export class ExecutionEngineHttp {
|
|
|
289
286
|
const response = await this.rpc.fetchWithRetries({ method, params: [start, count] });
|
|
290
287
|
return response.map(deserializeExecutionPayloadBody);
|
|
291
288
|
}
|
|
289
|
+
async getBlobs(_fork, versionedHashes) {
|
|
290
|
+
// retry only after a day may be
|
|
291
|
+
const GETBLOBS_RETRY_TIMEOUT = 256 * 32 * 12;
|
|
292
|
+
const timeNow = Date.now() / 1000;
|
|
293
|
+
const timeSinceLastFail = timeNow - this.lastGetBlobsErrorTime;
|
|
294
|
+
if (timeSinceLastFail < GETBLOBS_RETRY_TIMEOUT) {
|
|
295
|
+
// do not try getblobs since it might not be available
|
|
296
|
+
this.logger.debug(`disabled engine_getBlobsV1 api call since last failed < GETBLOBS_RETRY_TIMEOUT=${GETBLOBS_RETRY_TIMEOUT}`, timeSinceLastFail);
|
|
297
|
+
throw Error(`engine_getBlobsV1 call recently failed timeSinceLastFail=${timeSinceLastFail} < GETBLOBS_RETRY_TIMEOUT=${GETBLOBS_RETRY_TIMEOUT}`);
|
|
298
|
+
}
|
|
299
|
+
const method = "engine_getBlobsV1";
|
|
300
|
+
assertReqSizeLimit(versionedHashes.length, 128);
|
|
301
|
+
const versionedHashesHex = versionedHashes.map(bytesToData);
|
|
302
|
+
let response = await this.rpc
|
|
303
|
+
.fetchWithRetries({
|
|
304
|
+
method,
|
|
305
|
+
params: [versionedHashesHex],
|
|
306
|
+
})
|
|
307
|
+
.catch((e) => {
|
|
308
|
+
if (e instanceof ErrorJsonRpcResponse && parseJsonRpcErrorCode(e.response.error.code) === "Method not found") {
|
|
309
|
+
this.lastGetBlobsErrorTime = timeNow;
|
|
310
|
+
this.logger.debug("disabling engine_getBlobsV1 api call since engine responded with method not availeble", {
|
|
311
|
+
retryTimeout: GETBLOBS_RETRY_TIMEOUT,
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
throw e;
|
|
315
|
+
});
|
|
316
|
+
// handle nethermind buggy response
|
|
317
|
+
// see: https://discord.com/channels/595666850260713488/1293605631785304088/1298956894274060301
|
|
318
|
+
if (response.blobsAndProofs !== undefined) {
|
|
319
|
+
response = response.blobsAndProofs;
|
|
320
|
+
}
|
|
321
|
+
if (response.length !== versionedHashes.length) {
|
|
322
|
+
const error = `Invalid engine_getBlobsV1 response length=${response.length} versionedHashes=${versionedHashes.length}`;
|
|
323
|
+
this.logger.error(error);
|
|
324
|
+
throw Error(error);
|
|
325
|
+
}
|
|
326
|
+
return response.map(deserializeBlobAndProofs);
|
|
327
|
+
}
|
|
292
328
|
async getClientVersion(clientVersion) {
|
|
293
329
|
const method = "engine_getClientVersionV1";
|
|
294
330
|
const response = await this.rpc.fetchWithRetries({ method, params: [clientVersion] });
|