@lodestar/beacon-node 1.50.0-dev.fef46df5ba → 1.50.0-rc.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/impl/beacon/blocks/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/blocks/index.js +6 -1
- package/lib/api/impl/beacon/blocks/index.js.map +1 -1
- package/lib/api/impl/beacon/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/index.js +13 -0
- package/lib/api/impl/beacon/index.js.map +1 -1
- package/lib/api/impl/beacon/pool/index.js +4 -4
- package/lib/api/impl/beacon/pool/index.js.map +1 -1
- package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
- package/lib/api/impl/beacon/state/index.js +28 -6
- package/lib/api/impl/beacon/state/index.js.map +1 -1
- package/lib/api/impl/debug/index.d.ts.map +1 -1
- package/lib/api/impl/debug/index.js +26 -18
- package/lib/api/impl/debug/index.js.map +1 -1
- package/lib/api/impl/validator/index.d.ts +1 -0
- package/lib/api/impl/validator/index.d.ts.map +1 -1
- package/lib/api/impl/validator/index.js +49 -1
- package/lib/api/impl/validator/index.js.map +1 -1
- package/lib/chain/archiveStore/archiveStore.d.ts +5 -0
- package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
- package/lib/chain/archiveStore/archiveStore.js +14 -24
- package/lib/chain/archiveStore/archiveStore.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/getHistoricalState.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js +5 -7
- package/lib/chain/archiveStore/historicalState/getHistoricalState.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +1 -1
- package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
- package/lib/chain/archiveStore/historicalState/types.d.ts +2 -2
- package/lib/chain/archiveStore/historicalState/types.d.ts.map +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js +1 -1
- package/lib/chain/archiveStore/historicalState/worker.js.map +1 -1
- package/lib/chain/archiveStore/interface.d.ts +1 -1
- package/lib/chain/archiveStore/interface.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js +2 -1
- package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
- package/lib/chain/beaconProposerCache.d.ts +6 -0
- package/lib/chain/beaconProposerCache.d.ts.map +1 -1
- package/lib/chain/beaconProposerCache.js +16 -0
- package/lib/chain/beaconProposerCache.js.map +1 -1
- package/lib/chain/blocks/importBlock.d.ts.map +1 -1
- package/lib/chain/blocks/importBlock.js +18 -8
- package/lib/chain/blocks/importBlock.js.map +1 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts +2 -1
- package/lib/chain/blocks/payloadEnvelopeInput/types.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlock.js +7 -7
- package/lib/chain/blocks/verifyBlock.js.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts +2 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts.map +1 -1
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +5 -4
- package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
- package/lib/chain/chain.d.ts +10 -5
- package/lib/chain/chain.d.ts.map +1 -1
- package/lib/chain/chain.js +105 -36
- package/lib/chain/chain.js.map +1 -1
- package/lib/chain/emitter.d.ts +7 -1
- package/lib/chain/emitter.d.ts.map +1 -1
- package/lib/chain/emitter.js +5 -0
- package/lib/chain/emitter.js.map +1 -1
- package/lib/chain/errors/envelopeReconstructionError.d.ts +5 -0
- package/lib/chain/errors/envelopeReconstructionError.d.ts.map +1 -1
- package/lib/chain/errors/envelopeReconstructionError.js +2 -0
- package/lib/chain/errors/envelopeReconstructionError.js.map +1 -1
- package/lib/chain/errors/gossipValidation.d.ts +3 -1
- package/lib/chain/errors/gossipValidation.d.ts.map +1 -1
- package/lib/chain/errors/gossipValidation.js +2 -0
- package/lib/chain/errors/gossipValidation.js.map +1 -1
- package/lib/chain/forkChoice/index.d.ts.map +1 -1
- package/lib/chain/forkChoice/index.js +2 -0
- package/lib/chain/forkChoice/index.js.map +1 -1
- package/lib/chain/interface.d.ts +5 -2
- package/lib/chain/interface.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts +4 -2
- package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
- package/lib/chain/opPools/aggregatedAttestationPool.js +30 -8
- package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
- package/lib/chain/opPools/opPool.d.ts +5 -4
- package/lib/chain/opPools/opPool.d.ts.map +1 -1
- package/lib/chain/opPools/opPool.js +60 -38
- package/lib/chain/opPools/opPool.js.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.d.ts +8 -4
- package/lib/chain/opPools/proposerPreferencesPool.d.ts.map +1 -1
- package/lib/chain/opPools/proposerPreferencesPool.js +27 -12
- package/lib/chain/opPools/proposerPreferencesPool.js.map +1 -1
- package/lib/chain/opPools/utils.d.ts +15 -1
- package/lib/chain/opPools/utils.d.ts.map +1 -1
- package/lib/chain/opPools/utils.js +33 -1
- package/lib/chain/opPools/utils.js.map +1 -1
- package/lib/chain/options.d.ts +2 -1
- package/lib/chain/options.d.ts.map +1 -1
- package/lib/chain/options.js +1 -1
- package/lib/chain/options.js.map +1 -1
- package/lib/chain/prepareNextSlot.d.ts.map +1 -1
- package/lib/chain/prepareNextSlot.js +16 -5
- package/lib/chain/prepareNextSlot.js.map +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js +1 -1
- package/lib/chain/produceBlock/computeNewStateRoot.js.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts +11 -1
- package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
- package/lib/chain/produceBlock/produceBlockBody.js +46 -30
- package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
- package/lib/chain/regen/regen.d.ts +2 -0
- package/lib/chain/regen/regen.d.ts.map +1 -1
- package/lib/chain/regen/regen.js +10 -4
- package/lib/chain/regen/regen.js.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts +7 -0
- package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenGossipBlockInput.js +21 -0
- package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts +9 -2
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.d.ts.map +1 -1
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.js +23 -13
- package/lib/chain/seenCache/seenPayloadEnvelopeInput.js.map +1 -1
- package/lib/chain/shufflingCache.d.ts +18 -8
- package/lib/chain/shufflingCache.d.ts.map +1 -1
- package/lib/chain/shufflingCache.js +72 -18
- package/lib/chain/shufflingCache.js.map +1 -1
- package/lib/chain/validation/attesterSlashing.d.ts +4 -4
- package/lib/chain/validation/attesterSlashing.d.ts.map +1 -1
- package/lib/chain/validation/attesterSlashing.js +3 -0
- package/lib/chain/validation/attesterSlashing.js.map +1 -1
- package/lib/chain/validation/proposerSlashing.d.ts +3 -3
- package/lib/chain/validation/proposerSlashing.d.ts.map +1 -1
- package/lib/chain/validation/proposerSlashing.js +3 -0
- package/lib/chain/validation/proposerSlashing.js.map +1 -1
- package/lib/chain/validatorMonitor.d.ts +5 -1
- package/lib/chain/validatorMonitor.d.ts.map +1 -1
- package/lib/chain/validatorMonitor.js +64 -54
- package/lib/chain/validatorMonitor.js.map +1 -1
- package/lib/db/beacon.d.ts +4 -1
- package/lib/db/beacon.d.ts.map +1 -1
- package/lib/db/beacon.js +6 -1
- package/lib/db/beacon.js.map +1 -1
- package/lib/db/buckets.d.ts +3 -1
- package/lib/db/buckets.d.ts.map +1 -1
- package/lib/db/buckets.js +2 -0
- package/lib/db/buckets.js.map +1 -1
- package/lib/db/interface.d.ts +4 -1
- package/lib/db/interface.d.ts.map +1 -1
- package/lib/db/repositories/blockArchiveIndex.d.ts +2 -2
- package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
- package/lib/db/repositories/earliestAvailableSlot.d.ts +11 -0
- package/lib/db/repositories/earliestAvailableSlot.d.ts.map +1 -0
- package/lib/db/repositories/earliestAvailableSlot.js +19 -0
- package/lib/db/repositories/earliestAvailableSlot.js.map +1 -0
- package/lib/db/repositories/index.d.ts +1 -0
- package/lib/db/repositories/index.d.ts.map +1 -1
- package/lib/db/repositories/index.js +1 -0
- package/lib/db/repositories/index.js.map +1 -1
- package/lib/db/repositories/proposerPreferences.d.ts +14 -0
- package/lib/db/repositories/proposerPreferences.d.ts.map +1 -0
- package/lib/db/repositories/proposerPreferences.js +21 -0
- package/lib/db/repositories/proposerPreferences.js.map +1 -0
- package/lib/db/repositories/proposerSlashing.d.ts +1 -0
- package/lib/db/repositories/proposerSlashing.d.ts.map +1 -1
- package/lib/db/repositories/proposerSlashing.js +5 -1
- package/lib/db/repositories/proposerSlashing.js.map +1 -1
- package/lib/execution/engine/blobVersionedHashes.d.ts +9 -0
- package/lib/execution/engine/blobVersionedHashes.d.ts.map +1 -0
- package/lib/execution/engine/blobVersionedHashes.js +74 -0
- package/lib/execution/engine/blobVersionedHashes.js.map +1 -0
- package/lib/execution/engine/disabled.d.ts +0 -2
- package/lib/execution/engine/disabled.d.ts.map +1 -1
- package/lib/execution/engine/disabled.js +0 -6
- package/lib/execution/engine/disabled.js.map +1 -1
- package/lib/execution/engine/http.d.ts +46 -16
- package/lib/execution/engine/http.d.ts.map +1 -1
- package/lib/execution/engine/http.js +236 -213
- package/lib/execution/engine/http.js.map +1 -1
- package/lib/execution/engine/index.d.ts +3 -2
- package/lib/execution/engine/index.d.ts.map +1 -1
- package/lib/execution/engine/index.js +33 -8
- package/lib/execution/engine/index.js.map +1 -1
- package/lib/execution/engine/interface.d.ts +2 -4
- package/lib/execution/engine/interface.d.ts.map +1 -1
- package/lib/execution/engine/jsonRpcTransport.d.ts +25 -0
- package/lib/execution/engine/jsonRpcTransport.d.ts.map +1 -0
- package/lib/execution/engine/jsonRpcTransport.js +158 -0
- package/lib/execution/engine/jsonRpcTransport.js.map +1 -0
- package/lib/execution/engine/mock.d.ts +0 -2
- package/lib/execution/engine/mock.d.ts.map +1 -1
- package/lib/execution/engine/mock.js +0 -8
- package/lib/execution/engine/mock.js.map +1 -1
- package/lib/execution/engine/restHttpClient.d.ts +71 -0
- package/lib/execution/engine/restHttpClient.d.ts.map +1 -0
- package/lib/execution/engine/restHttpClient.js +201 -0
- package/lib/execution/engine/restHttpClient.js.map +1 -0
- package/lib/execution/engine/restTransport.d.ts +46 -0
- package/lib/execution/engine/restTransport.d.ts.map +1 -0
- package/lib/execution/engine/restTransport.js +399 -0
- package/lib/execution/engine/restTransport.js.map +1 -0
- package/lib/execution/engine/sszTypes.d.ts +1261 -0
- package/lib/execution/engine/sszTypes.d.ts.map +1 -0
- package/lib/execution/engine/sszTypes.js +216 -0
- package/lib/execution/engine/sszTypes.js.map +1 -0
- package/lib/execution/engine/transport.d.ts +39 -0
- package/lib/execution/engine/transport.d.ts.map +1 -0
- package/lib/execution/engine/transport.js +2 -0
- package/lib/execution/engine/transport.js.map +1 -0
- package/lib/execution/engine/types.d.ts +2 -8
- package/lib/execution/engine/types.d.ts.map +1 -1
- package/lib/execution/engine/types.js +24 -57
- package/lib/execution/engine/types.js.map +1 -1
- package/lib/execution/engine/utils.d.ts.map +1 -1
- package/lib/execution/engine/utils.js +9 -2
- package/lib/execution/engine/utils.js.map +1 -1
- package/lib/metrics/metrics/lodestar.d.ts +10 -0
- package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
- package/lib/metrics/metrics/lodestar.js +22 -0
- package/lib/metrics/metrics/lodestar.js.map +1 -1
- package/lib/metrics/metrics.d.ts +7 -3
- package/lib/metrics/metrics.d.ts.map +1 -1
- package/lib/metrics/metrics.js +4 -4
- package/lib/metrics/metrics.js.map +1 -1
- package/lib/network/core/events.d.ts +5 -1
- package/lib/network/core/events.d.ts.map +1 -1
- package/lib/network/core/events.js +8 -0
- package/lib/network/core/events.js.map +1 -1
- package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
- package/lib/network/processor/gossipHandlers.js +67 -68
- package/lib/network/processor/gossipHandlers.js.map +1 -1
- package/lib/network/processor/gossipValidatorFn.d.ts +7 -3
- package/lib/network/processor/gossipValidatorFn.d.ts.map +1 -1
- package/lib/network/processor/gossipValidatorFn.js +7 -3
- package/lib/network/processor/gossipValidatorFn.js.map +1 -1
- package/lib/network/processor/index.d.ts +9 -0
- package/lib/network/processor/index.d.ts.map +1 -1
- package/lib/network/processor/index.js +77 -10
- package/lib/network/processor/index.js.map +1 -1
- package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.js +1 -1
- package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.js.map +1 -1
- package/lib/node/nodejs.d.ts +3 -1
- package/lib/node/nodejs.d.ts.map +1 -1
- package/lib/node/nodejs.js +27 -4
- package/lib/node/nodejs.js.map +1 -1
- package/lib/node/options.d.ts +3 -2
- package/lib/node/options.d.ts.map +1 -1
- package/lib/node/options.js +2 -2
- package/lib/node/options.js.map +1 -1
- package/lib/sync/range/batch.d.ts +11 -5
- package/lib/sync/range/batch.d.ts.map +1 -1
- package/lib/sync/range/batch.js +21 -17
- package/lib/sync/range/batch.js.map +1 -1
- package/lib/sync/range/chain.d.ts +4 -4
- package/lib/sync/range/chain.d.ts.map +1 -1
- package/lib/sync/range/chain.js +12 -6
- package/lib/sync/range/chain.js.map +1 -1
- package/lib/sync/range/range.d.ts.map +1 -1
- package/lib/sync/range/range.js +75 -29
- package/lib/sync/range/range.js.map +1 -1
- package/lib/sync/unknownBlock.d.ts +5 -2
- package/lib/sync/unknownBlock.d.ts.map +1 -1
- package/lib/sync/unknownBlock.js +49 -24
- package/lib/sync/unknownBlock.js.map +1 -1
- package/lib/sync/utils/downloadByRange.d.ts +38 -14
- package/lib/sync/utils/downloadByRange.d.ts.map +1 -1
- package/lib/sync/utils/downloadByRange.js +84 -39
- package/lib/sync/utils/downloadByRange.js.map +1 -1
- package/lib/util/asyncIterableToEvents.d.ts +10 -2
- package/lib/util/asyncIterableToEvents.d.ts.map +1 -1
- package/lib/util/asyncIterableToEvents.js +29 -3
- package/lib/util/asyncIterableToEvents.js.map +1 -1
- package/lib/util/execution.d.ts +9 -11
- package/lib/util/execution.d.ts.map +1 -1
- package/lib/util/execution.js +5 -1
- package/lib/util/execution.js.map +1 -1
- package/lib/util/metadata.d.ts.map +1 -1
- package/lib/util/metadata.js +2 -1
- package/lib/util/metadata.js.map +1 -1
- package/package.json +18 -17
- package/src/api/impl/beacon/blocks/index.ts +7 -4
- package/src/api/impl/beacon/index.ts +15 -0
- package/src/api/impl/beacon/pool/index.ts +4 -4
- package/src/api/impl/beacon/state/index.ts +43 -6
- package/src/api/impl/debug/index.ts +28 -19
- package/src/api/impl/validator/index.ts +61 -2
- package/src/chain/archiveStore/archiveStore.ts +19 -25
- package/src/chain/archiveStore/historicalState/getHistoricalState.ts +5 -7
- package/src/chain/archiveStore/historicalState/historicalStateRegen.ts +1 -1
- package/src/chain/archiveStore/historicalState/types.ts +2 -2
- package/src/chain/archiveStore/historicalState/worker.ts +1 -2
- package/src/chain/archiveStore/interface.ts +1 -1
- package/src/chain/archiveStore/utils/pruneHistory.ts +4 -1
- package/src/chain/beaconProposerCache.ts +19 -1
- package/src/chain/blocks/importBlock.ts +21 -7
- package/src/chain/blocks/payloadEnvelopeInput/types.ts +2 -1
- package/src/chain/blocks/verifyBlock.ts +8 -6
- package/src/chain/blocks/verifyBlocksStateTransitionOnly.ts +6 -3
- package/src/chain/chain.ts +135 -38
- package/src/chain/emitter.ts +7 -1
- package/src/chain/errors/envelopeReconstructionError.ts +3 -0
- package/src/chain/errors/gossipValidation.ts +2 -0
- package/src/chain/forkChoice/index.ts +2 -0
- package/src/chain/interface.ts +5 -2
- package/src/chain/opPools/aggregatedAttestationPool.ts +34 -10
- package/src/chain/opPools/opPool.ts +89 -46
- package/src/chain/opPools/proposerPreferencesPool.ts +34 -11
- package/src/chain/opPools/utils.ts +62 -3
- package/src/chain/options.ts +3 -3
- package/src/chain/prepareNextSlot.ts +21 -6
- package/src/chain/produceBlock/computeNewStateRoot.ts +1 -1
- package/src/chain/produceBlock/produceBlockBody.ts +76 -35
- package/src/chain/regen/regen.ts +12 -4
- package/src/chain/seenCache/seenGossipBlockInput.ts +23 -0
- package/src/chain/seenCache/seenPayloadEnvelopeInput.ts +31 -13
- package/src/chain/shufflingCache.ts +84 -22
- package/src/chain/validation/attesterSlashing.ts +7 -4
- package/src/chain/validation/proposerSlashing.ts +7 -4
- package/src/chain/validatorMonitor.ts +75 -57
- package/src/db/beacon.ts +6 -0
- package/src/db/buckets.ts +2 -0
- package/src/db/interface.ts +4 -0
- package/src/db/repositories/earliestAvailableSlot.ts +19 -0
- package/src/db/repositories/index.ts +1 -0
- package/src/db/repositories/proposerPreferences.ts +23 -0
- package/src/db/repositories/proposerSlashing.ts +6 -1
- package/src/execution/engine/blobVersionedHashes.ts +72 -0
- package/src/execution/engine/disabled.ts +0 -8
- package/src/execution/engine/http.ts +304 -300
- package/src/execution/engine/index.ts +41 -7
- package/src/execution/engine/interface.ts +2 -6
- package/src/execution/engine/jsonRpcTransport.ts +247 -0
- package/src/execution/engine/mock.ts +1 -19
- package/src/execution/engine/restHttpClient.ts +269 -0
- package/src/execution/engine/restTransport.ts +544 -0
- package/src/execution/engine/sszTypes.ts +354 -0
- package/src/execution/engine/transport.ts +61 -0
- package/src/execution/engine/types.ts +34 -84
- package/src/execution/engine/utils.ts +12 -2
- package/src/metrics/metrics/lodestar.ts +23 -0
- package/src/metrics/metrics.ts +21 -6
- package/src/network/core/events.ts +16 -1
- package/src/network/processor/gossipHandlers.ts +98 -81
- package/src/network/processor/gossipValidatorFn.ts +13 -3
- package/src/network/processor/index.ts +89 -10
- package/src/network/reqresp/handlers/executionPayloadEnvelopesByRoot.ts +1 -1
- package/src/node/nodejs.ts +35 -3
- package/src/node/options.ts +10 -1
- package/src/sync/range/batch.ts +25 -19
- package/src/sync/range/chain.ts +15 -8
- package/src/sync/range/range.ts +76 -30
- package/src/sync/unknownBlock.ts +62 -25
- package/src/sync/utils/downloadByRange.ts +123 -58
- package/src/util/asyncIterableToEvents.ts +44 -5
- package/src/util/execution.ts +16 -8
- package/src/util/metadata.ts +2 -1
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { toRootHex } from "@lodestar/utils";
|
|
1
|
+
import { toHex, toRootHex } from "@lodestar/utils";
|
|
2
|
+
import { persistDiff } from "./utils.js";
|
|
2
3
|
/**
|
|
3
4
|
* Pool of validated `SignedProposerPreferences` indexed by `(slot, dependent_root)`.
|
|
4
5
|
*
|
|
5
6
|
* The primary consumer is `validateExecutionPayloadBid`, which looks up the matching
|
|
6
7
|
* preferences via `get(bid.slot, dependent_root)` to enforce the IGNORE-existence and
|
|
7
|
-
* REJECT-equality rules from the gloas spec. The beacon API
|
|
8
|
-
*
|
|
8
|
+
* REJECT-equality rules from the gloas spec. The beacon API `getProposerPreferences`
|
|
9
|
+
* endpoint reads from the same pool via `getAll`.
|
|
9
10
|
*
|
|
10
11
|
* `validator_index` is intentionally not part of the key: gossip validation enforces
|
|
11
12
|
* `proposers[proposalSlot % SLOTS_PER_EPOCH] === validatorIndex` against the shuffling
|
|
@@ -31,16 +32,19 @@ export class ProposerPreferencesPool {
|
|
|
31
32
|
}
|
|
32
33
|
byRoot.set(rootHex, signed);
|
|
33
34
|
}
|
|
34
|
-
/** API read-out: flatten across branches, optionally filtered by slot. */
|
|
35
|
-
getAll(slot) {
|
|
36
|
-
if (slot !== undefined) {
|
|
37
|
-
const byRoot = this.bySlot.get(slot);
|
|
38
|
-
return byRoot ? Array.from(byRoot.values()) : [];
|
|
39
|
-
}
|
|
35
|
+
/** API read-out: flatten across branches, optionally filtered by slot and dependent root. */
|
|
36
|
+
getAll(slot, dependentRootHex) {
|
|
40
37
|
const out = [];
|
|
41
|
-
for (const byRoot of this.bySlot
|
|
42
|
-
|
|
43
|
-
|
|
38
|
+
for (const [s, byRoot] of this.bySlot) {
|
|
39
|
+
if (slot !== undefined && s !== slot) {
|
|
40
|
+
continue;
|
|
41
|
+
}
|
|
42
|
+
for (const [root, signed] of byRoot) {
|
|
43
|
+
if (dependentRootHex !== undefined && root !== dependentRootHex) {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
out.push(signed);
|
|
47
|
+
}
|
|
44
48
|
}
|
|
45
49
|
return out;
|
|
46
50
|
}
|
|
@@ -55,5 +59,16 @@ export class ProposerPreferencesPool {
|
|
|
55
59
|
this.bySlot.delete(slot);
|
|
56
60
|
}
|
|
57
61
|
}
|
|
62
|
+
/** Restore the preferences of upcoming slots, they were validated before they were persisted */
|
|
63
|
+
async fromPersisted(db, currentSlot) {
|
|
64
|
+
for (const signed of await db.proposerPreferences.values()) {
|
|
65
|
+
if (signed.message.proposalSlot >= currentSlot) {
|
|
66
|
+
this.add(signed);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
async toPersisted(db) {
|
|
71
|
+
await persistDiff(db.proposerPreferences, this.getAll().map((signed) => ({ key: db.proposerPreferences.getId(signed), value: signed })), toHex);
|
|
72
|
+
}
|
|
58
73
|
}
|
|
59
74
|
//# sourceMappingURL=proposerPreferencesPool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposerPreferencesPool.js","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"proposerPreferencesPool.js","sourceRoot":"","sources":["../../../src/chain/opPools/proposerPreferencesPool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import { Signature } from "@chainsafe/lodestar-z/blst";
|
|
2
|
+
import { BeaconConfig } from "@lodestar/config";
|
|
3
|
+
import { Id, Repository } from "@lodestar/db";
|
|
2
4
|
import { IBeaconStateView } from "@lodestar/state-transition";
|
|
3
|
-
import { Slot, capella } from "@lodestar/types";
|
|
5
|
+
import { AttesterSlashing, Domain, Slot, capella, phase0 } from "@lodestar/types";
|
|
4
6
|
import { AggregateFast, AggregateFastElectra } from "./attestationPool.js";
|
|
7
|
+
export declare function getProposerSlashingSignatureDomain(config: BeaconConfig, stateSlot: Slot, slashing: phase0.ProposerSlashing): Domain;
|
|
8
|
+
export declare function getAttesterSlashingSignatureDomains(config: BeaconConfig, stateSlot: Slot, slashing: AttesterSlashing): [Domain, Domain];
|
|
5
9
|
/**
|
|
6
10
|
* Prune a Map indexed by slot to keep the most recent slots, up to `slotsRetained`
|
|
7
11
|
*/
|
|
@@ -17,4 +21,14 @@ export declare function signatureFromBytesNoCheck(signature: Uint8Array): Signat
|
|
|
17
21
|
*/
|
|
18
22
|
export declare function isValidBlsToExecutionChangeForBlockInclusion(state: IBeaconStateView, signedBLSToExecutionChange: capella.SignedBLSToExecutionChange): boolean;
|
|
19
23
|
export declare function isElectraAggregate(aggregate: AggregateFast): aggregate is AggregateFastElectra;
|
|
24
|
+
/**
|
|
25
|
+
* Persist target items `items` in `dbRepo` doing minimum put and delete writes.
|
|
26
|
+
* Reads all keys in repository to compute the diff between current persisted data and target data.
|
|
27
|
+
*/
|
|
28
|
+
export declare function persistDiff<K extends Id, V>(dbRepo: Repository<K, V>, items: {
|
|
29
|
+
key: K;
|
|
30
|
+
value: V;
|
|
31
|
+
}[], serializeKey: (key: K) => number | string, opts?: {
|
|
32
|
+
updateExisting?: boolean;
|
|
33
|
+
}): Promise<void>;
|
|
20
34
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AAErD,OAAO,EAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/chain/opPools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAU,EAAE,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAErD,OAAO,EAAC,gBAAgB,EAA0B,MAAM,4BAA4B,CAAC;AACrF,OAAO,EAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAChF,OAAO,EAAC,aAAa,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAEzE,wBAAgB,kCAAkC,CAChD,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,MAAM,CAAC,gBAAgB,GAChC,MAAM,CAER;AAED,wBAAgB,mCAAmC,CACjD,MAAM,EAAE,YAAY,EACpB,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,gBAAgB,GACzB,CAAC,MAAM,EAAE,MAAM,CAAC,CAalB;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,GAAG,IAAI,CAgB1F;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,UAAU,GAAG,SAAS,CAE1E;AAED;;;GAGG;AACH,wBAAgB,4CAA4C,CAC1D,KAAK,EAAE,gBAAgB,EACvB,0BAA0B,EAAE,OAAO,CAAC,0BAA0B,GAC7D,OAAO,CAkBT;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,IAAI,oBAAoB,CAE9F;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,EAC/C,MAAM,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,KAAK,EAAE;IAAC,GAAG,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAC,EAAE,EAC3B,YAAY,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,GAAG,MAAM,EACzC,IAAI,GAAE;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAM,GACpC,OAAO,CAAC,IAAI,CAAC,CAmBf"}
|
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import { Signature } from "@chainsafe/lodestar-z/blst";
|
|
2
|
-
import { BLS_WITHDRAWAL_PREFIX } from "@lodestar/params";
|
|
2
|
+
import { BLS_WITHDRAWAL_PREFIX, DOMAIN_BEACON_ATTESTER, DOMAIN_BEACON_PROPOSER } from "@lodestar/params";
|
|
3
|
+
import { computeStartSlotAtEpoch } from "@lodestar/state-transition";
|
|
4
|
+
export function getProposerSlashingSignatureDomain(config, stateSlot, slashing) {
|
|
5
|
+
return config.getDomain(stateSlot, DOMAIN_BEACON_PROPOSER, Number(slashing.signedHeader1.message.slot));
|
|
6
|
+
}
|
|
7
|
+
export function getAttesterSlashingSignatureDomains(config, stateSlot, slashing) {
|
|
8
|
+
return [
|
|
9
|
+
config.getDomain(stateSlot, DOMAIN_BEACON_ATTESTER, computeStartSlotAtEpoch(Number(slashing.attestation1.data.target.epoch))),
|
|
10
|
+
config.getDomain(stateSlot, DOMAIN_BEACON_ATTESTER, computeStartSlotAtEpoch(Number(slashing.attestation2.data.target.epoch))),
|
|
11
|
+
];
|
|
12
|
+
}
|
|
3
13
|
/**
|
|
4
14
|
* Prune a Map indexed by slot to keep the most recent slots, up to `slotsRetained`
|
|
5
15
|
*/
|
|
@@ -48,4 +58,26 @@ export function isValidBlsToExecutionChangeForBlockInclusion(state, signedBLSToE
|
|
|
48
58
|
export function isElectraAggregate(aggregate) {
|
|
49
59
|
return aggregate.committeeBits !== undefined;
|
|
50
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Persist target items `items` in `dbRepo` doing minimum put and delete writes.
|
|
63
|
+
* Reads all keys in repository to compute the diff between current persisted data and target data.
|
|
64
|
+
*/
|
|
65
|
+
export async function persistDiff(dbRepo, items, serializeKey, opts = {}) {
|
|
66
|
+
const persistedKeys = await dbRepo.keys();
|
|
67
|
+
const batch = [];
|
|
68
|
+
const persistedKeysSerialized = new Set(persistedKeys.map(serializeKey));
|
|
69
|
+
for (const item of items) {
|
|
70
|
+
if (opts.updateExisting || !persistedKeysSerialized.has(serializeKey(item.key))) {
|
|
71
|
+
batch.push({ type: "put", key: item.key, value: item.value });
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
const targetKeysSerialized = new Set(items.map((item) => serializeKey(item.key)));
|
|
75
|
+
for (const persistedKey of persistedKeys) {
|
|
76
|
+
if (!targetKeysSerialized.has(serializeKey(persistedKey))) {
|
|
77
|
+
batch.push({ type: "del", key: persistedKey });
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
if (batch.length > 0)
|
|
81
|
+
await dbRepo.batch(batch);
|
|
82
|
+
}
|
|
51
83
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/chain/opPools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/chain/opPools/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/chain/options.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export type IChainOptions = BlockProcessOpts & PoolOpts & SeenCacheOpts & ForkCh
|
|
|
12
12
|
blsVerifyAllMultiThread?: boolean;
|
|
13
13
|
blacklistedBlocks?: string[];
|
|
14
14
|
persistProducedBlocks?: boolean;
|
|
15
|
+
persistProducedPayloadEnvelopes?: boolean;
|
|
15
16
|
/** Archive finalized Gloas payload envelopes as headers (bodies reconstructed from the EL on read) */
|
|
16
17
|
dedupePayloads?: boolean;
|
|
17
18
|
persistInvalidSszObjects?: boolean;
|
|
@@ -35,7 +36,7 @@ export type IChainOptions = BlockProcessOpts & PoolOpts & SeenCacheOpts & ForkCh
|
|
|
35
36
|
minSameMessageSignatureSetsToBatch: number;
|
|
36
37
|
archiveDateEpochs?: number;
|
|
37
38
|
nHistoricalStatesFileDataStore?: boolean;
|
|
38
|
-
|
|
39
|
+
nativeStateTransition?: boolean;
|
|
39
40
|
/** Builder circuit breaker fault inspection window in slots */
|
|
40
41
|
faultInspectionWindow?: number;
|
|
41
42
|
/** Canonical EMPTY blocks allowed per `faultInspectionWindow` observed blocks */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAA2B,uBAAuB,EAAC,MAAM,qCAAqC,CAAC;AACtG,OAAO,EAGL,kCAAkC,EACnC,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAE3C,MAAM,MAAM,aAAa,GAAG,gBAAgB,GAC1C,QAAQ,GACR,aAAa,GACb,cAAc,GACd,gBAAgB,GAChB,uBAAuB,GACvB,kCAAkC,GAClC,kBAAkB,GAClB,oBAAoB,GACpB,qBAAqB,GAAG;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"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"}
|
package/lib/chain/options.js
CHANGED
|
@@ -35,7 +35,7 @@ export const defaultChainOptions = {
|
|
|
35
35
|
// - users can prune the persisted checkpoint state files manually to save disc space
|
|
36
36
|
// - it helps debug easier when network is unfinalized
|
|
37
37
|
nHistoricalStatesFileDataStore: true,
|
|
38
|
-
|
|
38
|
+
nativeStateTransition: false,
|
|
39
39
|
maxBlockStates: DEFAULT_MAX_BLOCK_STATES,
|
|
40
40
|
maxCPStateEpochsInMemory: DEFAULT_MAX_CP_STATE_EPOCHS_IN_MEMORY,
|
|
41
41
|
maxCPStateEpochsOnDisk: DEFAULT_MAX_CP_STATE_ON_DISK,
|
package/lib/chain/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,IAAI,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAI1E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,qCAAqC,CAAC;AACtG,OAAO,EACL,qCAAqC,EACrC,4BAA4B,GAE7B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAwF3C,MAAM,CAAC,MAAM,mBAAmB,GAAkB;IAChD,sBAAsB,EAAE,KAAK;IAC7B,uBAAuB,EAAE,KAAK;IAC9B,iBAAiB,EAAE,EAAE;IACrB,qBAAqB,EAAE,KAAK;IAC5B,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,KAAK;IACvB,qBAAqB,EAAE,uBAAuB,CAAC,qBAAqB;IACpE,cAAc,EAAE,IAAI;IACpB,oBAAoB,EAAE,KAAK;IAC3B,0BAA0B,EAAE,IAAI;IAChC,WAAW,EAAE,oBAAoB;IACjC,YAAY,EAAE,KAAK;IACnB,qBAAqB,EAAE,KAAK;IAC5B,0EAA0E;IAC1E,uGAAuG;IACvG,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,KAAK;IAC/B,6BAA6B,EAAE,MAAM;IACrC,qEAAqE;IACrE,gGAAgG;IAChG,wGAAwG;IACxG,kCAAkC,EAAE,CAAC;IACrC,4DAA4D;IAC5D,qEAAqE;IACrE,uFAAuF;IACvF,wDAAwD;IACxD,8BAA8B,EAAE,IAAI;IACpC,
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/chain/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,IAAI,uBAAuB,EAAC,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,WAAW,EAAmB,MAAM,6BAA6B,CAAC;AAI1E,OAAO,EAAC,wBAAwB,EAA0B,MAAM,qCAAqC,CAAC;AACtG,OAAO,EACL,qCAAqC,EACrC,4BAA4B,GAE7B,MAAM,4CAA4C,CAAC;AAGpD,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAwF3C,MAAM,CAAC,MAAM,mBAAmB,GAAkB;IAChD,sBAAsB,EAAE,KAAK;IAC7B,uBAAuB,EAAE,KAAK;IAC9B,iBAAiB,EAAE,EAAE;IACrB,qBAAqB,EAAE,KAAK;IAC5B,aAAa,EAAE,IAAI;IACnB,kBAAkB,EAAE,IAAI;IACxB,cAAc,EAAE,IAAI;IACpB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,KAAK;IACvB,qBAAqB,EAAE,uBAAuB,CAAC,qBAAqB;IACpE,cAAc,EAAE,IAAI;IACpB,oBAAoB,EAAE,KAAK;IAC3B,0BAA0B,EAAE,IAAI;IAChC,WAAW,EAAE,oBAAoB;IACjC,YAAY,EAAE,KAAK;IACnB,qBAAqB,EAAE,KAAK;IAC5B,0EAA0E;IAC1E,uGAAuG;IACvG,YAAY,EAAE,EAAE;IAChB,wBAAwB,EAAE,KAAK;IAC/B,6BAA6B,EAAE,MAAM;IACrC,qEAAqE;IACrE,gGAAgG;IAChG,wGAAwG;IACxG,kCAAkC,EAAE,CAAC;IACrC,4DAA4D;IAC5D,qEAAqE;IACrE,uFAAuF;IACvF,wDAAwD;IACxD,8BAA8B,EAAE,IAAI;IACpC,qBAAqB,EAAE,KAAK;IAC5B,cAAc,EAAE,wBAAwB;IACxC,wBAAwB,EAAE,qCAAqC;IAC/D,sBAAsB,EAAE,4BAA4B;CACrD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.d.ts","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAUjD,OAAO,EAEL,gBAAgB,EASjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAU,IAAI,EAAiB,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAC,MAAM,EAAwC,MAAM,iBAAiB,CAAC;AAI9E,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;AAI5C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAU5C,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAkB1C;;;;;;;;;;GAUG;AACH,qBAAa,wBAAwB;IAEjC,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IALzB,YACmB,KAAK,EAAE,YAAY,EACnB,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,OAAO,GAAG,IAAI,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,EAUrC;IAED;;OAEG;IACH,kBAAkB,cAAqB,IAAI,KAAG,OAAO,CAAC,IAAI,CAAC,CAsUzD;IAEF;;;OAGG;IACH,OAAO,CAAC,4BAA4B;IAYpC,wBAAwB,CAAC,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,OAAO,GAAG,IAAI,CAQlF;CACF"}
|
|
@@ -2,13 +2,13 @@ import { routes } from "@lodestar/api";
|
|
|
2
2
|
import { getFinalizedExecutionBlockHash, getSafeExecutionBlockHash } from "@lodestar/fork-choice";
|
|
3
3
|
import { ForkSeq, SLOTS_PER_EPOCH, isForkPostBellatrix, isForkPostFulu, isForkPostGloas, } from "@lodestar/params";
|
|
4
4
|
import { GLOAS_PREVERIFY_WINDOW_EPOCHS, MAX_BUILDER_DEPOSITS_PER_SLOT, StateHashTreeRootSource, computeEpochAtSlot, computeTimeAtSlot, isStatePostBellatrix, isStatePostFulu, isStatePostGloas, } from "@lodestar/state-transition";
|
|
5
|
-
import { fromHex, isErrorAborted, sleep } from "@lodestar/utils";
|
|
5
|
+
import { fromHex, isErrorAborted, sleep, toHex } from "@lodestar/utils";
|
|
6
6
|
import { GENESIS_SLOT } from "../constants/constants.js";
|
|
7
7
|
import { BuilderStatus } from "../execution/builder/http.js";
|
|
8
8
|
import { ClockEvent } from "../util/clock.js";
|
|
9
9
|
import { isQueueErrorAborted } from "../util/queue/index.js";
|
|
10
10
|
import { ForkchoiceCaller } from "./forkChoice/index.js";
|
|
11
|
-
import { getPayloadAttributesForSSE, prepareExecutionPayload } from "./produceBlock/produceBlockBody.js";
|
|
11
|
+
import { getPayloadAttributesForSSE, getPooledProposerPreferences, prepareExecutionPayload, } from "./produceBlock/produceBlockBody.js";
|
|
12
12
|
import { RegenCaller } from "./regen/index.js";
|
|
13
13
|
// TODO GLOAS: re-evaluate this timing
|
|
14
14
|
/* With 12s slot times, this scheduler will run 4s before the start of each slot (`12 - 0.6667 * 12 = 4`). */
|
|
@@ -116,7 +116,15 @@ export class PrepareNextSlotScheduler {
|
|
|
116
116
|
return preparedState.getBeaconProposer(prepareSlot);
|
|
117
117
|
};
|
|
118
118
|
const proposerIndex = await getProposerIndex();
|
|
119
|
-
|
|
119
|
+
if (this.chain.beaconProposerCache.has(proposerIndex)) {
|
|
120
|
+
const pooledPreferences = isForkPostGloas(fork)
|
|
121
|
+
? getPooledProposerPreferences(this.chain, prepareSlot, headRoot)
|
|
122
|
+
: null;
|
|
123
|
+
feeRecipient =
|
|
124
|
+
pooledPreferences !== null
|
|
125
|
+
? toHex(pooledPreferences.feeRecipient)
|
|
126
|
+
: this.chain.beaconProposerCache.getOrDefault(proposerIndex);
|
|
127
|
+
}
|
|
120
128
|
// Predict the proposer head of the next slot when either:
|
|
121
129
|
// - we are proposing the next slot (single-slot proposer-boost-reorg), or
|
|
122
130
|
// - this is an epoch transition: post-Fulu the next proposer may reorg a weak
|
|
@@ -191,6 +199,9 @@ export class PrepareNextSlotScheduler {
|
|
|
191
199
|
else {
|
|
192
200
|
parentBlockHash = preparedState.latestExecutionPayloadHeader.blockHash;
|
|
193
201
|
}
|
|
202
|
+
// The payload_attributes event must carry the same hashes we send to the EL
|
|
203
|
+
const safeBlockHash = getSafeExecutionBlockHash(this.chain.forkChoice, this.logger);
|
|
204
|
+
const finalizedBlockHash = getFinalizedExecutionBlockHash(this.chain.forkChoice);
|
|
194
205
|
let payloadAttributes;
|
|
195
206
|
// If emitPayloadAttributes is true emit a SSE payloadAttributes event for
|
|
196
207
|
// every slot. Without the flag, only emit the event if we are proposing in the next slot.
|
|
@@ -201,6 +212,8 @@ export class PrepareNextSlotScheduler {
|
|
|
201
212
|
prepareSlot,
|
|
202
213
|
parentBlockRoot: fromHex(updatedHead.blockRoot),
|
|
203
214
|
parentBlockHash,
|
|
215
|
+
safeBlockHash,
|
|
216
|
+
finalizedBlockHash,
|
|
204
217
|
feeRecipient: feeRecipient ?? "0x0000000000000000000000000000000000000000",
|
|
205
218
|
});
|
|
206
219
|
this.chain.emitter.emit(routes.events.EventType.payloadAttributes, { data, version: fork });
|
|
@@ -209,8 +222,6 @@ export class PrepareNextSlotScheduler {
|
|
|
209
222
|
if (feeRecipient) {
|
|
210
223
|
const preparationTime = computeTimeAtSlot(this.config, prepareSlot, this.chain.genesisTime) - Date.now() / 1000;
|
|
211
224
|
this.metrics?.blockPayload.payloadAdvancePrepTime.observe(preparationTime);
|
|
212
|
-
const safeBlockHash = getSafeExecutionBlockHash(this.chain.forkChoice, this.logger);
|
|
213
|
-
const finalizedBlockHash = getFinalizedExecutionBlockHash(this.chain.forkChoice);
|
|
214
225
|
// awaiting here instead of throwing an async call because there is no other task
|
|
215
226
|
// left for scheduler and this gives nice semantics to catch and log errors in the
|
|
216
227
|
// try/catch wrapper here.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"prepareNextSlot.js","sourceRoot":"","sources":["../../src/chain/prepareNextSlot.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import { EMPTY_SIGNATURE, StateHashTreeRootSource } from "@lodestar/state-transi
|
|
|
7
7
|
export function computeNewStateRoot(metrics, state, block) {
|
|
8
8
|
// Set signature to zero to re-use stateTransition() function which requires the SignedBeaconBlock type
|
|
9
9
|
const signedBlock = { message: block, signature: EMPTY_SIGNATURE };
|
|
10
|
-
const { newStateRoot, proposerReward, postState, hashTreeRootTime } = state.computeNewStateRoot({ block: signedBlock }, { metrics });
|
|
10
|
+
const { newStateRoot, proposerReward, postState, hashTreeRootTime } = state.computeNewStateRoot({ block: signedBlock }, { metrics: metrics?.stateTransition });
|
|
11
11
|
metrics?.stateHashTreeRootTime.observe({ source: StateHashTreeRootSource.computeNewStateRoot }, hashTreeRootTime);
|
|
12
12
|
return { newStateRoot, proposerReward, postState };
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAItG;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,KAAuB,EACvB,KAAuC;IAEvC,uGAAuG;IACvG,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAC,CAAC;IACjE,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,mBAAmB,CAC3F,EAAC,KAAK,EAAE,WAAW,EAAC,EACpB,EAAC,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"computeNewStateRoot.js","sourceRoot":"","sources":["../../../src/chain/produceBlock/computeNewStateRoot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAoB,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAItG;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAuB,EACvB,KAAuB,EACvB,KAAuC;IAEvC,uGAAuG;IACvG,MAAM,WAAW,GAAG,EAAC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAC,CAAC;IACjE,MAAM,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,gBAAgB,EAAC,GAAG,KAAK,CAAC,mBAAmB,CAC3F,EAAC,KAAK,EAAE,WAAW,EAAC,EACpB,EAAC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAC,CACpC,CAAC;IAEF,OAAO,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,uBAAuB,CAAC,mBAAmB,EAAC,EAAE,gBAAgB,CAAC,CAAC;IAEhH,OAAO,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAC,CAAC;AACnD,CAAC"}
|
|
@@ -113,7 +113,7 @@ export declare function getPayloadAttributesForSSE(fork: ForkPostBellatrix, chai
|
|
|
113
113
|
config: ChainForkConfig;
|
|
114
114
|
forkChoice: IForkChoice;
|
|
115
115
|
proposerPreferencesPool: ProposerPreferencesPool;
|
|
116
|
-
}, { prepareState, prepareSlot, parentBlockRoot, parentBlockHash, feeRecipient, }: {
|
|
116
|
+
}, { prepareState, prepareSlot, parentBlockRoot, parentBlockHash, safeBlockHash, finalizedBlockHash, feeRecipient, }: {
|
|
117
117
|
/**
|
|
118
118
|
* Post-gloas, when extending a full parent, callers must apply
|
|
119
119
|
* parent execution payload first (see `withParentPayloadApplied`).
|
|
@@ -122,7 +122,17 @@ export declare function getPayloadAttributesForSSE(fork: ForkPostBellatrix, chai
|
|
|
122
122
|
prepareSlot: Slot;
|
|
123
123
|
parentBlockRoot: Root;
|
|
124
124
|
parentBlockHash: Bytes32;
|
|
125
|
+
safeBlockHash: RootHex;
|
|
126
|
+
finalizedBlockHash: RootHex;
|
|
125
127
|
feeRecipient: string;
|
|
126
128
|
}): SSEPayloadAttributes;
|
|
129
|
+
/**
|
|
130
|
+
* The preferences the proposer of `slot` signed for the branch of `parentBlockRoot`, the same
|
|
131
|
+
* `(slot, dependent_root)` lookup as gossip bid validation. Null if none are pooled.
|
|
132
|
+
*/
|
|
133
|
+
export declare function getPooledProposerPreferences(chain: {
|
|
134
|
+
forkChoice: IForkChoice;
|
|
135
|
+
proposerPreferencesPool: ProposerPreferencesPool;
|
|
136
|
+
}, slot: Slot, parentBlockRootHex: RootHex): gloas.ProposerPreferences | null;
|
|
127
137
|
export declare function produceCommonBlockBody<T extends BlockType>(this: BeaconChain, blockType: T, currentState: IBeaconStateView, { randaoReveal, graffiti, slot, parentBlock }: BlockAttributes): Promise<CommonBlockBody>;
|
|
128
138
|
//# sourceMappingURL=produceBlockBody.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,WAAW,EACX,UAAU,EAGX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAEL,QAAQ,EACR,iBAAiB,EAEjB,aAAa,EACb,YAAY,EACZ,aAAa,EAOd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAEL,gBAAgB,EAChB,KAAK,yBAAyB,EAO/B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,SAAS,EACT,YAAY,EACZ,WAAW,EACX,eAAe,EACf,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACX,OAAO,EACP,gBAAgB,EAEhB,IAAI,EACJ,OAAO,EACP,oBAAoB,EACpB,IAAI,EACJ,cAAc,EACd,GAAG,EAMH,IAAI,EACJ,KAAK,EAGN,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,MAAM,EASP,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAoB,gBAAgB,EAAE,iBAAiB,EAAE,SAAS,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"produceBlockBody.d.ts","sourceRoot":"","sources":["../../../src/chain/produceBlock/produceBlockBody.ts"],"names":[],"mappings":"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"}
|
|
@@ -106,10 +106,8 @@ export async function produceBlockBody(blockType, currentState, blockAttr) {
|
|
|
106
106
|
// this into a completely separate function and have pre/post gloas more separated
|
|
107
107
|
const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
|
|
108
108
|
const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
// see https://github.com/ChainSafe/lodestar/issues/9379
|
|
112
|
-
const feeRecipient = requestedFeeRecipient ?? this.beaconProposerCache.getOrDefault(proposerIndex);
|
|
109
|
+
const { feeRecipient, feeRecipientType } = getProposerFeeRecipient(requestedFeeRecipient, getPooledProposerPreferences(this, blockSlot, parentBlock.blockRoot), this.beaconProposerCache, proposerIndex);
|
|
110
|
+
Object.assign(logMeta, { feeRecipientType, feeRecipient });
|
|
113
111
|
const endExecutionPayload = this.metrics?.executionBlockProductionTimeSteps.startTimer();
|
|
114
112
|
// Get execution payload from EL
|
|
115
113
|
let parentBlockHash;
|
|
@@ -226,12 +224,7 @@ export async function produceBlockBody(blockType, currentState, blockAttr) {
|
|
|
226
224
|
}
|
|
227
225
|
const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
|
|
228
226
|
const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
|
|
229
|
-
const feeRecipient = requestedFeeRecipient
|
|
230
|
-
const feeRecipientType = requestedFeeRecipient
|
|
231
|
-
? "requested"
|
|
232
|
-
: this.beaconProposerCache.get(proposerIndex)
|
|
233
|
-
? "cached"
|
|
234
|
-
: "default";
|
|
227
|
+
const { feeRecipient, feeRecipientType } = getProposerFeeRecipient(requestedFeeRecipient, null, this.beaconProposerCache, proposerIndex);
|
|
235
228
|
Object.assign(logMeta, { feeRecipientType, feeRecipient });
|
|
236
229
|
if (blockType === BlockType.Blinded) {
|
|
237
230
|
if (!this.executionBuilder)
|
|
@@ -516,7 +509,7 @@ async function prepareExecutionPayloadHeader(chain, fork, state, proposerPubKey)
|
|
|
516
509
|
const parentHash = state.latestExecutionPayloadHeader.blockHash;
|
|
517
510
|
return chain.executionBuilder.getHeader(fork, state.slot, parentHash, proposerPubKey);
|
|
518
511
|
}
|
|
519
|
-
export function getPayloadAttributesForSSE(fork, chain, { prepareState, prepareSlot, parentBlockRoot, parentBlockHash, feeRecipient, }) {
|
|
512
|
+
export function getPayloadAttributesForSSE(fork, chain, { prepareState, prepareSlot, parentBlockRoot, parentBlockHash, safeBlockHash, finalizedBlockHash, feeRecipient, }) {
|
|
520
513
|
const payloadAttributes = preparePayloadAttributes(fork, chain, {
|
|
521
514
|
prepareState,
|
|
522
515
|
prepareSlot,
|
|
@@ -531,7 +524,11 @@ export function getPayloadAttributesForSSE(fork, chain, { prepareState, prepareS
|
|
|
531
524
|
parentBlockHash,
|
|
532
525
|
payloadAttributes,
|
|
533
526
|
};
|
|
534
|
-
if (
|
|
527
|
+
if (isForkPostGloas(fork)) {
|
|
528
|
+
ssePayloadAttributes.safeBlockHash = fromHex(safeBlockHash);
|
|
529
|
+
ssePayloadAttributes.finalizedBlockHash = fromHex(finalizedBlockHash);
|
|
530
|
+
}
|
|
531
|
+
else {
|
|
535
532
|
// Removed in Gloas, builders can get the block number from the EL via the block hash if required
|
|
536
533
|
ssePayloadAttributes.parentBlockNumber = prepareState.payloadBlockNumber;
|
|
537
534
|
}
|
|
@@ -589,9 +586,8 @@ function preparePayloadAttributes(fork, chain, { prepareState, prepareSlot, pare
|
|
|
589
586
|
* Resolve the proposer's preferred (target) gas limit for the Gloas `PayloadAttributesV4`
|
|
590
587
|
* `targetGasLimit` field (consensus-specs#5235, execution-apis#796).
|
|
591
588
|
*
|
|
592
|
-
* Sourced from the `SignedProposerPreferences` the proposer's VC submitted to the pool
|
|
593
|
-
*
|
|
594
|
-
* preferences are pooled, target the parent payload's gas limit so the gas limit stays
|
|
589
|
+
* Sourced from the `SignedProposerPreferences` the proposer's VC submitted to the pool. When no
|
|
590
|
+
* matching preferences are pooled, target the parent payload's gas limit so the gas limit stays
|
|
595
591
|
* unchanged (`is_gas_limit_target_compatible` then requires `gas_limit == parent_gas_limit`).
|
|
596
592
|
*
|
|
597
593
|
* The parent payload's gas_limit is read from fork choice — the variant matching
|
|
@@ -601,21 +597,9 @@ function preparePayloadAttributes(fork, chain, { prepareState, prepareSlot, pare
|
|
|
601
597
|
*/
|
|
602
598
|
function getProposerTargetGasLimit(chain, prepareSlot, parentBlockRoot, parentBlockHash) {
|
|
603
599
|
const parentBlockRootHex = toRootHex(parentBlockRoot);
|
|
604
|
-
const
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
return null;
|
|
608
|
-
}
|
|
609
|
-
try {
|
|
610
|
-
return getShufflingDependentRoot(chain.forkChoice, computeEpochAtSlot(prepareSlot), computeEpochAtSlot(parentBlock.slot), parentBlock);
|
|
611
|
-
}
|
|
612
|
-
catch {
|
|
613
|
-
return null;
|
|
614
|
-
}
|
|
615
|
-
})();
|
|
616
|
-
const pref = dependentRootHex !== null ? chain.proposerPreferencesPool.get(prepareSlot, dependentRootHex) : null;
|
|
617
|
-
if (pref !== null) {
|
|
618
|
-
return pref.message.targetGasLimit;
|
|
600
|
+
const preferences = getPooledProposerPreferences(chain, prepareSlot, parentBlockRootHex);
|
|
601
|
+
if (preferences !== null) {
|
|
602
|
+
return preferences.targetGasLimit;
|
|
619
603
|
}
|
|
620
604
|
const parentPayloadVariant = chain.forkChoice.getBlockHexAndBlockHash(parentBlockRootHex, toRootHex(parentBlockHash));
|
|
621
605
|
if (parentPayloadVariant === null || parentPayloadVariant.executionPayloadBlockHash === null) {
|
|
@@ -623,6 +607,38 @@ function getProposerTargetGasLimit(chain, prepareSlot, parentBlockRoot, parentBl
|
|
|
623
607
|
}
|
|
624
608
|
return BigInt(parentPayloadVariant.executionPayloadGasLimit);
|
|
625
609
|
}
|
|
610
|
+
/** The proposer's request wins over its signed preferences, which win over its registered proposer data */
|
|
611
|
+
function getProposerFeeRecipient(requestedFeeRecipient, pooledPreferences, beaconProposerCache, proposerIndex) {
|
|
612
|
+
if (requestedFeeRecipient !== undefined) {
|
|
613
|
+
return { feeRecipient: requestedFeeRecipient, feeRecipientType: "requested" };
|
|
614
|
+
}
|
|
615
|
+
if (pooledPreferences !== null) {
|
|
616
|
+
return { feeRecipient: toHex(pooledPreferences.feeRecipient), feeRecipientType: "preferences" };
|
|
617
|
+
}
|
|
618
|
+
const cachedFeeRecipient = beaconProposerCache.get(proposerIndex);
|
|
619
|
+
if (cachedFeeRecipient !== undefined) {
|
|
620
|
+
return { feeRecipient: cachedFeeRecipient, feeRecipientType: "cached" };
|
|
621
|
+
}
|
|
622
|
+
return { feeRecipient: beaconProposerCache.getOrDefault(proposerIndex), feeRecipientType: "default" };
|
|
623
|
+
}
|
|
624
|
+
/**
|
|
625
|
+
* The preferences the proposer of `slot` signed for the branch of `parentBlockRoot`, the same
|
|
626
|
+
* `(slot, dependent_root)` lookup as gossip bid validation. Null if none are pooled.
|
|
627
|
+
*/
|
|
628
|
+
export function getPooledProposerPreferences(chain, slot, parentBlockRootHex) {
|
|
629
|
+
const parentBlock = chain.forkChoice.getBlockHexDefaultStatus(parentBlockRootHex);
|
|
630
|
+
if (parentBlock === null) {
|
|
631
|
+
return null;
|
|
632
|
+
}
|
|
633
|
+
let dependentRootHex;
|
|
634
|
+
try {
|
|
635
|
+
dependentRootHex = getShufflingDependentRoot(chain.forkChoice, computeEpochAtSlot(slot), computeEpochAtSlot(parentBlock.slot), parentBlock);
|
|
636
|
+
}
|
|
637
|
+
catch {
|
|
638
|
+
return null;
|
|
639
|
+
}
|
|
640
|
+
return chain.proposerPreferencesPool.get(slot, dependentRootHex)?.message ?? null;
|
|
641
|
+
}
|
|
626
642
|
export async function produceCommonBlockBody(blockType, currentState, { randaoReveal, graffiti, slot, parentBlock }) {
|
|
627
643
|
const stepsMetrics = blockType === BlockType.Full
|
|
628
644
|
? this.metrics?.executionBlockProductionTimeSteps
|