@lodestar/state-transition 1.23.0-dev.404f13abfd → 1.23.0-dev.4722b6618e
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/block/isValidIndexedAttestation.js +2 -6
- package/lib/block/isValidIndexedAttestation.js.map +1 -1
- package/lib/block/processAttestationPhase0.js +4 -8
- package/lib/block/processAttestationPhase0.js.map +1 -1
- package/lib/block/processConsolidationRequest.js +54 -8
- package/lib/block/processConsolidationRequest.js.map +1 -1
- package/lib/block/processDeposit.d.ts +4 -1
- package/lib/block/processDeposit.js +33 -37
- package/lib/block/processDeposit.js.map +1 -1
- package/lib/block/processDepositRequest.d.ts +1 -2
- package/lib/block/processDepositRequest.js +11 -3
- package/lib/block/processDepositRequest.js.map +1 -1
- package/lib/block/processEth1Data.js +1 -3
- package/lib/block/processEth1Data.js.map +1 -1
- package/lib/block/processOperations.js +4 -4
- package/lib/block/processOperations.js.map +1 -1
- package/lib/block/processSyncCommittee.js +1 -3
- package/lib/block/processSyncCommittee.js.map +1 -1
- package/lib/block/processWithdrawalRequest.js +1 -1
- package/lib/block/processWithdrawalRequest.js.map +1 -1
- package/lib/block/processWithdrawals.js +3 -2
- package/lib/block/processWithdrawals.js.map +1 -1
- package/lib/cache/epochCache.d.ts +57 -24
- package/lib/cache/epochCache.js +198 -90
- package/lib/cache/epochCache.js.map +1 -1
- package/lib/cache/epochTransitionCache.d.ts +4 -9
- package/lib/cache/epochTransitionCache.js +19 -6
- package/lib/cache/epochTransitionCache.js.map +1 -1
- package/lib/cache/pubkeyCache.d.ts +1 -9
- package/lib/cache/pubkeyCache.js +0 -18
- package/lib/cache/pubkeyCache.js.map +1 -1
- package/lib/cache/stateCache.js +4 -1
- package/lib/cache/stateCache.js.map +1 -1
- package/lib/cache/syncCommitteeCache.d.ts +1 -1
- package/lib/cache/syncCommitteeCache.js +1 -1
- package/lib/cache/syncCommitteeCache.js.map +1 -1
- package/lib/constants/constants.d.ts +3 -4
- package/lib/constants/constants.js +4 -4
- package/lib/constants/constants.js.map +1 -1
- package/lib/epoch/index.d.ts +3 -3
- package/lib/epoch/index.js +5 -5
- package/lib/epoch/index.js.map +1 -1
- package/lib/epoch/processEffectiveBalanceUpdates.js +4 -7
- package/lib/epoch/processEffectiveBalanceUpdates.js.map +1 -1
- package/lib/epoch/processPendingConsolidations.js +7 -12
- package/lib/epoch/processPendingConsolidations.js.map +1 -1
- package/lib/epoch/{processPendingBalanceDeposits.d.ts → processPendingDeposits.d.ts} +4 -4
- package/lib/epoch/processPendingDeposits.js +102 -0
- package/lib/epoch/processPendingDeposits.js.map +1 -0
- package/lib/epoch/processSlashings.js +8 -2
- package/lib/epoch/processSlashings.js.map +1 -1
- package/lib/epoch/processSyncCommitteeUpdates.js +1 -1
- package/lib/epoch/processSyncCommitteeUpdates.js.map +1 -1
- package/lib/index.d.ts +2 -1
- package/lib/index.js +2 -1
- package/lib/index.js.map +1 -1
- package/lib/metrics.js +2 -0
- package/lib/metrics.js.map +1 -1
- package/lib/signatureSets/attesterSlashings.js +1 -3
- package/lib/signatureSets/attesterSlashings.js.map +1 -1
- package/lib/signatureSets/proposerSlashings.js +1 -3
- package/lib/signatureSets/proposerSlashings.js.map +1 -1
- package/lib/slot/upgradeStateToAltair.js +2 -1
- package/lib/slot/upgradeStateToAltair.js.map +1 -1
- package/lib/slot/upgradeStateToCapella.js +1 -0
- package/lib/slot/upgradeStateToCapella.js.map +1 -1
- package/lib/slot/upgradeStateToDeneb.js +1 -0
- package/lib/slot/upgradeStateToDeneb.js.map +1 -1
- package/lib/slot/upgradeStateToElectra.d.ts +0 -1
- package/lib/slot/upgradeStateToElectra.js +20 -44
- package/lib/slot/upgradeStateToElectra.js.map +1 -1
- package/lib/stateTransition.js +19 -0
- package/lib/stateTransition.js.map +1 -1
- package/lib/util/balance.d.ts +1 -1
- package/lib/util/blindedBlock.js +17 -13
- package/lib/util/blindedBlock.js.map +1 -1
- package/lib/util/calculateCommitteeAssignments.d.ts +12 -0
- package/lib/util/calculateCommitteeAssignments.js +26 -0
- package/lib/util/calculateCommitteeAssignments.js.map +1 -0
- package/lib/util/computeAnchorCheckpoint.d.ts +8 -0
- package/lib/util/computeAnchorCheckpoint.js +32 -0
- package/lib/util/computeAnchorCheckpoint.js.map +1 -0
- package/lib/util/deposit.js +2 -6
- package/lib/util/deposit.js.map +1 -1
- package/lib/util/electra.d.ts +0 -1
- package/lib/util/electra.js +19 -27
- package/lib/util/electra.js.map +1 -1
- package/lib/util/epochShuffling.d.ts +43 -2
- package/lib/util/epochShuffling.js +45 -21
- package/lib/util/epochShuffling.js.map +1 -1
- package/lib/util/execution.js +6 -17
- package/lib/util/execution.js.map +1 -1
- package/lib/util/genesis.js +8 -3
- package/lib/util/genesis.js.map +1 -1
- package/lib/util/index.d.ts +2 -1
- package/lib/util/index.js +2 -1
- package/lib/util/index.js.map +1 -1
- package/lib/util/loadState/loadValidator.js +1 -3
- package/lib/util/loadState/loadValidator.js.map +1 -1
- package/lib/util/seed.js +1 -1
- package/lib/util/seed.js.map +1 -1
- package/lib/util/shufflingDecisionRoot.js +5 -11
- package/lib/util/shufflingDecisionRoot.js.map +1 -1
- package/lib/util/validator.d.ts +0 -1
- package/lib/util/validator.js +2 -10
- package/lib/util/validator.js.map +1 -1
- package/lib/util/weakSubjectivity.js +0 -1
- package/lib/util/weakSubjectivity.js.map +1 -1
- package/package.json +11 -9
- package/lib/epoch/processPendingBalanceDeposits.js +0 -68
- package/lib/epoch/processPendingBalanceDeposits.js.map +0 -1
- package/lib/util/shuffle.d.ts +0 -9
- package/lib/util/shuffle.js +0 -197
- package/lib/util/shuffle.js.map +0 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { intDiv } from "@lodestar/utils";
|
|
2
|
-
import { EPOCHS_PER_SLASHINGS_VECTOR, FAR_FUTURE_EPOCH, ForkSeq, MIN_ACTIVATION_BALANCE } from "@lodestar/params";
|
|
1
|
+
import { intDiv, toRootHex } from "@lodestar/utils";
|
|
2
|
+
import { EPOCHS_PER_SLASHINGS_VECTOR, FAR_FUTURE_EPOCH, ForkSeq, SLOTS_PER_HISTORICAL_ROOT, MIN_ACTIVATION_BALANCE, } from "@lodestar/params";
|
|
3
3
|
import { hasMarkers, FLAG_UNSLASHED, FLAG_ELIGIBLE_ATTESTER, FLAG_PREV_SOURCE_ATTESTER, FLAG_PREV_TARGET_ATTESTER, FLAG_PREV_HEAD_ATTESTER, FLAG_CURR_SOURCE_ATTESTER, FLAG_CURR_TARGET_ATTESTER, FLAG_CURR_HEAD_ATTESTER, } from "../util/attesterStatus.js";
|
|
4
4
|
import { computeBaseRewardPerIncrement } from "../util/altair.js";
|
|
5
5
|
import { processPendingAttestations } from "../epoch/processPendingAttestations.js";
|
|
@@ -142,6 +142,21 @@ export function beforeProcessEpoch(state, opts) {
|
|
|
142
142
|
nextEpochShufflingActiveValidatorIndices[nextEpochShufflingActiveIndicesLength++] = i;
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
|
+
// Trigger async build of shuffling for epoch after next (nextShuffling post epoch transition)
|
|
146
|
+
const epochAfterNext = state.epochCtx.nextEpoch + 1;
|
|
147
|
+
// cannot call calculateShufflingDecisionRoot here because spec prevent getting current slot
|
|
148
|
+
// as a decision block. we are part way through the transition though and this was added in
|
|
149
|
+
// process slot beforeProcessEpoch happens so it available and valid
|
|
150
|
+
const nextShufflingDecisionRoot = toRootHex(state.blockRoots.get(state.slot % SLOTS_PER_HISTORICAL_ROOT));
|
|
151
|
+
const nextShufflingActiveIndices = new Uint32Array(nextEpochShufflingActiveIndicesLength);
|
|
152
|
+
if (nextEpochShufflingActiveIndicesLength > nextEpochShufflingActiveValidatorIndices.length) {
|
|
153
|
+
throw new Error(`Invalid activeValidatorCount: ${nextEpochShufflingActiveIndicesLength} > ${nextEpochShufflingActiveValidatorIndices.length}`);
|
|
154
|
+
}
|
|
155
|
+
// only the first `activeValidatorCount` elements are copied to `activeIndices`
|
|
156
|
+
for (let i = 0; i < nextEpochShufflingActiveIndicesLength; i++) {
|
|
157
|
+
nextShufflingActiveIndices[i] = nextEpochShufflingActiveValidatorIndices[i];
|
|
158
|
+
}
|
|
159
|
+
state.epochCtx.shufflingCache?.build(epochAfterNext, nextShufflingDecisionRoot, state, nextShufflingActiveIndices);
|
|
145
160
|
if (totalActiveStakeByIncrement < 1) {
|
|
146
161
|
totalActiveStakeByIncrement = 1;
|
|
147
162
|
}
|
|
@@ -235,8 +250,8 @@ export function beforeProcessEpoch(state, opts) {
|
|
|
235
250
|
indicesEligibleForActivationQueue,
|
|
236
251
|
indicesEligibleForActivation,
|
|
237
252
|
indicesToEject,
|
|
238
|
-
|
|
239
|
-
|
|
253
|
+
nextShufflingDecisionRoot,
|
|
254
|
+
nextShufflingActiveIndices,
|
|
240
255
|
// to be updated in processEffectiveBalanceUpdates
|
|
241
256
|
nextEpochTotalActiveBalanceByIncrement: 0,
|
|
242
257
|
isActivePrevEpoch,
|
|
@@ -246,8 +261,6 @@ export function beforeProcessEpoch(state, opts) {
|
|
|
246
261
|
inclusionDelays,
|
|
247
262
|
flags,
|
|
248
263
|
validators,
|
|
249
|
-
// will be assigned in processPendingConsolidations()
|
|
250
|
-
newCompoundingValidators: undefined,
|
|
251
264
|
// Will be assigned in processRewardsAndPenalties()
|
|
252
265
|
balances: undefined,
|
|
253
266
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epochTransitionCache.js","sourceRoot":"","sources":["../../src/cache/epochTransitionCache.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"epochTransitionCache.js","sourceRoot":"","sources":["../../src/cache/epochTransitionCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PublicKey } from "@chainsafe/blst";
|
|
2
|
+
import { PubkeyIndexMap } from "@chainsafe/pubkey-index-map";
|
|
2
3
|
import * as immutable from "immutable";
|
|
3
4
|
import { ValidatorIndex, phase0 } from "@lodestar/types";
|
|
4
5
|
export type Index2PubkeyCache = PublicKey[];
|
|
@@ -23,15 +24,6 @@ export declare function toMemoryEfficientHexStr(hex: Uint8Array | string): strin
|
|
|
23
24
|
* A wrapper for calling immutable.js. To abstract the initialization of UnfinalizedPubkeyIndexMap
|
|
24
25
|
*/
|
|
25
26
|
export declare function newUnfinalizedPubkeyIndexMap(): UnfinalizedPubkeyIndexMap;
|
|
26
|
-
export declare class PubkeyIndexMap {
|
|
27
|
-
readonly map: Map<string, number>;
|
|
28
|
-
get size(): number;
|
|
29
|
-
/**
|
|
30
|
-
* Must support reading with string for API support where pubkeys are already strings
|
|
31
|
-
*/
|
|
32
|
-
get(key: Uint8Array | PubkeyHex): ValidatorIndex | undefined;
|
|
33
|
-
set(key: Uint8Array | PubkeyHex, value: ValidatorIndex): void;
|
|
34
|
-
}
|
|
35
27
|
/**
|
|
36
28
|
* Checks the pubkey indices against a state and adds missing pubkeys
|
|
37
29
|
*
|
package/lib/cache/pubkeyCache.js
CHANGED
|
@@ -23,24 +23,6 @@ export function toMemoryEfficientHexStr(hex) {
|
|
|
23
23
|
export function newUnfinalizedPubkeyIndexMap() {
|
|
24
24
|
return immutable.Map();
|
|
25
25
|
}
|
|
26
|
-
export class PubkeyIndexMap {
|
|
27
|
-
constructor() {
|
|
28
|
-
// We don't really need the full pubkey. We could just use the first 20 bytes like an Ethereum address
|
|
29
|
-
this.map = new Map();
|
|
30
|
-
}
|
|
31
|
-
get size() {
|
|
32
|
-
return this.map.size;
|
|
33
|
-
}
|
|
34
|
-
/**
|
|
35
|
-
* Must support reading with string for API support where pubkeys are already strings
|
|
36
|
-
*/
|
|
37
|
-
get(key) {
|
|
38
|
-
return this.map.get(toMemoryEfficientHexStr(key));
|
|
39
|
-
}
|
|
40
|
-
set(key, value) {
|
|
41
|
-
this.map.set(toMemoryEfficientHexStr(key), value);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
26
|
/**
|
|
45
27
|
* Checks the pubkey indices against a state and adds missing pubkeys
|
|
46
28
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pubkeyCache.js","sourceRoot":"","sources":["../../src/cache/pubkeyCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"pubkeyCache.js","sourceRoot":"","sources":["../../src/cache/pubkeyCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAcvC;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAwB;IAC9D,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACjF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,4BAA4B;IAC1C,OAAO,SAAS,CAAC,GAAG,EAA6B,CAAC;AACpD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CACzB,UAA8B,EAC9B,YAA4B,EAC5B,YAA+B;IAE/B,IAAI,YAAY,CAAC,IAAI,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;QAC9C,MAAM,IAAI,KAAK,CAAC,2CAA2C,YAAY,CAAC,IAAI,OAAO,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5G,CAAC;IAED,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC;IACnC,YAAY,CAAC,MAAM,GAAG,QAAQ,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACpC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC5B,gHAAgH;QAChH,6DAA6D;QAC7D,kCAAkC;QAClC,YAAY,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,2BAA2B;IAC5E,CAAC;AACH,CAAC"}
|
package/lib/cache/stateCache.js
CHANGED
|
@@ -26,7 +26,7 @@ export function createCachedBeaconState(state, immutableData, opts) {
|
|
|
26
26
|
*/
|
|
27
27
|
export function loadCachedBeaconState(cachedSeedState, stateBytes, opts, seedValidatorsBytes) {
|
|
28
28
|
const { state: migratedState, modifiedValidators } = loadState(cachedSeedState.config, cachedSeedState, stateBytes, seedValidatorsBytes);
|
|
29
|
-
const { pubkey2index, index2pubkey } = cachedSeedState.epochCtx;
|
|
29
|
+
const { pubkey2index, index2pubkey, shufflingCache } = cachedSeedState.epochCtx;
|
|
30
30
|
// Get the validators sub tree once for all the loop
|
|
31
31
|
const validators = migratedState.validators;
|
|
32
32
|
for (const validatorIndex of modifiedValidators) {
|
|
@@ -39,6 +39,7 @@ export function loadCachedBeaconState(cachedSeedState, stateBytes, opts, seedVal
|
|
|
39
39
|
config: cachedSeedState.config,
|
|
40
40
|
pubkey2index,
|
|
41
41
|
index2pubkey,
|
|
42
|
+
shufflingCache,
|
|
42
43
|
}, { ...(opts ?? {}), ...{ skipSyncPubkeys: true } });
|
|
43
44
|
}
|
|
44
45
|
/**
|
|
@@ -84,9 +85,11 @@ export function isCachedBeaconState(state) {
|
|
|
84
85
|
// This cache is populated during epoch transition, and should be preserved for performance.
|
|
85
86
|
// If the cache is missing too often, means that our clone strategy is not working well.
|
|
86
87
|
export function isStateValidatorsNodesPopulated(state) {
|
|
88
|
+
// biome-ignore lint/complexity/useLiteralKeys: It is a private attribute
|
|
87
89
|
return state.validators["nodesPopulated"] === true;
|
|
88
90
|
}
|
|
89
91
|
export function isStateBalancesNodesPopulated(state) {
|
|
92
|
+
// biome-ignore lint/complexity/useLiteralKeys: It is a private attribute
|
|
90
93
|
return state.balances["nodesPopulated"] === true;
|
|
91
94
|
}
|
|
92
95
|
//# sourceMappingURL=stateCache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stateCache.js","sourceRoot":"","sources":["../../src/cache/stateCache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAAC,SAAS,EAAC,MAAM,gCAAgC,CAAC;AACzD,OAAO,EAAC,UAAU,EAA0C,MAAM,iBAAiB,CAAC;AAWpF,OAAO,EAAc,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AA2HrE;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CACrC,KAAQ,EACR,aAAsC,EACtC,IAAqB;IAErB,MAAM,UAAU,GAAG,UAAU,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG,oBAAoB,CAAC,KAAK,EAAE;QAC9C,MAAM,EAAE,aAAa,CAAC,MAAM;QAC5B,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,CAAC;QACd,4BAA4B,EAAE,CAAC;QAC/B,wBAAwB,EAAE,KAAK;QAC/B,eAAe,EAAE,sBAAsB,EAAE;KAC1C,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,eAAkB,EAClB,UAAsB,EACtB,IAAqB,EACrB,mBAAgC;IAEhC,MAAM,EAAC,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAC,GAAG,SAAS,CAC1D,eAAe,CAAC,MAAM,EACtB,eAAe,EACf,UAAU,EACV,mBAAmB,CACpB,CAAC;IACF,MAAM,EAAC,YAAY,EAAE,YAAY,EAAC,GAAG,eAAe,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"stateCache.js","sourceRoot":"","sources":["../../src/cache/stateCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CompositeViewDU } from "@chainsafe/ssz";
|
|
2
|
+
import { PubkeyIndexMap } from "@chainsafe/pubkey-index-map";
|
|
2
3
|
import { ssz, ValidatorIndex } from "@lodestar/types";
|
|
3
|
-
import { PubkeyIndexMap } from "./pubkeyCache.js";
|
|
4
4
|
type SyncComitteeValidatorIndexMap = Map<ValidatorIndex, number[]>;
|
|
5
5
|
export type SyncCommitteeCache = {
|
|
6
6
|
/**
|
|
@@ -50,7 +50,7 @@ function computeSyncCommitteeIndices(syncCommittee, pubkey2index) {
|
|
|
50
50
|
const pubkeys = syncCommittee.pubkeys.getAllReadonly();
|
|
51
51
|
for (const pubkey of pubkeys) {
|
|
52
52
|
const validatorIndex = pubkey2index.get(pubkey);
|
|
53
|
-
if (validatorIndex ===
|
|
53
|
+
if (validatorIndex === null) {
|
|
54
54
|
throw Error(`SyncCommittee pubkey is unknown ${toPubkeyHex(pubkey)}`);
|
|
55
55
|
}
|
|
56
56
|
validatorIndices.push(validatorIndex);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncCommitteeCache.js","sourceRoot":"","sources":["../../src/cache/syncCommitteeCache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"syncCommitteeCache.js","sourceRoot":"","sources":["../../src/cache/syncCommitteeCache.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAiB5C,6CAA6C;AAC7C,MAAM,OAAO,uBAAuB;IAClC,IAAI,gBAAgB;QAClB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,iBAAiB;QACnB,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC1C,CAAC;CACF;AAED,MAAM,UAAU,qBAAqB,CAAC,gBAAkC;IACtE,OAAO;QACL,gBAAgB;QAChB,iBAAiB,EAAE,sBAAsB,CAAC,gBAAgB,CAAC;KAC5D,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CACvC,aAA+D,EAC/D,YAA4B;IAE5B,MAAM,gBAAgB,GAAG,2BAA2B,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAClF,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;IACnE,OAAO;QACL,gBAAgB;QAChB,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,oBAAsC;IAC3E,MAAM,GAAG,GAAG,IAAI,GAAG,EAA4B,CAAC;IAEhD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAChE,MAAM,cAAc,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAC/C,IAAI,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QACnC,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACzB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;GAEG;AACH,SAAS,2BAA2B,CAClC,aAA+D,EAC/D,YAA4B;IAE5B,MAAM,gBAAgB,GAAqB,EAAE,CAAC;IAC9C,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IACvD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,cAAc,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;YAC5B,MAAM,KAAK,CAAC,mCAAmC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxE,CAAC;QAED,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const
|
|
3
|
-
export declare const EMPTY_SIGNATURE: Buffer;
|
|
1
|
+
export declare const ZERO_HASH: Uint8Array;
|
|
2
|
+
export declare const EMPTY_SIGNATURE: Uint8Array;
|
|
4
3
|
export declare const SECONDS_PER_DAY = 86400;
|
|
5
4
|
export declare const BASE_REWARDS_PER_EPOCH = 4;
|
|
6
|
-
export declare const G2_POINT_AT_INFINITY:
|
|
5
|
+
export declare const G2_POINT_AT_INFINITY: Uint8Array;
|
|
7
6
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
export const ZERO_HASH =
|
|
2
|
-
export const EMPTY_SIGNATURE =
|
|
1
|
+
export const ZERO_HASH = new Uint8Array(32).fill(0);
|
|
2
|
+
export const EMPTY_SIGNATURE = new Uint8Array(96).fill(0);
|
|
3
3
|
export const SECONDS_PER_DAY = 86400;
|
|
4
4
|
export const BASE_REWARDS_PER_EPOCH = 4;
|
|
5
|
-
export const G2_POINT_AT_INFINITY = Buffer.from("c000000000000000000000000000000000000000000000000000000000000000" +
|
|
5
|
+
export const G2_POINT_AT_INFINITY = new Uint8Array(Buffer.from("c000000000000000000000000000000000000000000000000000000000000000" +
|
|
6
6
|
"0000000000000000000000000000000000000000000000000000000000000000" +
|
|
7
|
-
"0000000000000000000000000000000000000000000000000000000000000000", "hex");
|
|
7
|
+
"0000000000000000000000000000000000000000000000000000000000000000", "hex"));
|
|
8
8
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACpD,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC1D,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC;AACrC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,UAAU,CAChD,MAAM,CAAC,IAAI,CACT,kEAAkE;IAChE,kEAAkE;IAClE,kEAAkE,EACpE,KAAK,CACN,CACF,CAAC"}
|
package/lib/epoch/index.d.ts
CHANGED
|
@@ -15,10 +15,10 @@ import { processRewardsAndPenalties } from "./processRewardsAndPenalties.js";
|
|
|
15
15
|
import { processSlashings } from "./processSlashings.js";
|
|
16
16
|
import { processSlashingsReset } from "./processSlashingsReset.js";
|
|
17
17
|
import { processSyncCommitteeUpdates } from "./processSyncCommitteeUpdates.js";
|
|
18
|
-
import {
|
|
18
|
+
import { processPendingDeposits } from "./processPendingDeposits.js";
|
|
19
19
|
import { processPendingConsolidations } from "./processPendingConsolidations.js";
|
|
20
20
|
export { getRewardsAndPenalties } from "./processRewardsAndPenalties.js";
|
|
21
|
-
export { processJustificationAndFinalization, processInactivityUpdates, processRewardsAndPenalties, processRegistryUpdates, processSlashings, processEth1DataReset, processEffectiveBalanceUpdates, processSlashingsReset, processRandaoMixesReset, processHistoricalRootsUpdate, processParticipationRecordUpdates, processParticipationFlagUpdates, processSyncCommitteeUpdates, processHistoricalSummariesUpdate,
|
|
21
|
+
export { processJustificationAndFinalization, processInactivityUpdates, processRewardsAndPenalties, processRegistryUpdates, processSlashings, processEth1DataReset, processEffectiveBalanceUpdates, processSlashingsReset, processRandaoMixesReset, processHistoricalRootsUpdate, processParticipationRecordUpdates, processParticipationFlagUpdates, processSyncCommitteeUpdates, processHistoricalSummariesUpdate, processPendingDeposits, processPendingConsolidations, };
|
|
22
22
|
export { computeUnrealizedCheckpoints } from "./computeUnrealizedCheckpoints.js";
|
|
23
23
|
/**
|
|
24
24
|
* Epoch transition steps tracked in metrics
|
|
@@ -34,7 +34,7 @@ export declare enum EpochTransitionStep {
|
|
|
34
34
|
processEffectiveBalanceUpdates = "processEffectiveBalanceUpdates",
|
|
35
35
|
processParticipationFlagUpdates = "processParticipationFlagUpdates",
|
|
36
36
|
processSyncCommitteeUpdates = "processSyncCommitteeUpdates",
|
|
37
|
-
|
|
37
|
+
processPendingDeposits = "processPendingDeposits",
|
|
38
38
|
processPendingConsolidations = "processPendingConsolidations"
|
|
39
39
|
}
|
|
40
40
|
export declare function processEpoch(fork: ForkSeq, state: CachedBeaconStateAllForks, cache: EpochTransitionCache, metrics?: BeaconStateTransitionMetrics | null): void;
|
package/lib/epoch/index.js
CHANGED
|
@@ -13,11 +13,11 @@ import { processRewardsAndPenalties } from "./processRewardsAndPenalties.js";
|
|
|
13
13
|
import { processSlashings } from "./processSlashings.js";
|
|
14
14
|
import { processSlashingsReset } from "./processSlashingsReset.js";
|
|
15
15
|
import { processSyncCommitteeUpdates } from "./processSyncCommitteeUpdates.js";
|
|
16
|
-
import {
|
|
16
|
+
import { processPendingDeposits } from "./processPendingDeposits.js";
|
|
17
17
|
import { processPendingConsolidations } from "./processPendingConsolidations.js";
|
|
18
18
|
// For spec tests
|
|
19
19
|
export { getRewardsAndPenalties } from "./processRewardsAndPenalties.js";
|
|
20
|
-
export { processJustificationAndFinalization, processInactivityUpdates, processRewardsAndPenalties, processRegistryUpdates, processSlashings, processEth1DataReset, processEffectiveBalanceUpdates, processSlashingsReset, processRandaoMixesReset, processHistoricalRootsUpdate, processParticipationRecordUpdates, processParticipationFlagUpdates, processSyncCommitteeUpdates, processHistoricalSummariesUpdate,
|
|
20
|
+
export { processJustificationAndFinalization, processInactivityUpdates, processRewardsAndPenalties, processRegistryUpdates, processSlashings, processEth1DataReset, processEffectiveBalanceUpdates, processSlashingsReset, processRandaoMixesReset, processHistoricalRootsUpdate, processParticipationRecordUpdates, processParticipationFlagUpdates, processSyncCommitteeUpdates, processHistoricalSummariesUpdate, processPendingDeposits, processPendingConsolidations, };
|
|
21
21
|
export { computeUnrealizedCheckpoints } from "./computeUnrealizedCheckpoints.js";
|
|
22
22
|
const maxValidatorsPerStateSlashing = SLOTS_PER_EPOCH * MAX_ATTESTER_SLASHINGS * MAX_VALIDATORS_PER_COMMITTEE;
|
|
23
23
|
const maxSafeValidators = Math.floor(Number.MAX_SAFE_INTEGER / MAX_EFFECTIVE_BALANCE);
|
|
@@ -36,7 +36,7 @@ export var EpochTransitionStep;
|
|
|
36
36
|
EpochTransitionStep["processEffectiveBalanceUpdates"] = "processEffectiveBalanceUpdates";
|
|
37
37
|
EpochTransitionStep["processParticipationFlagUpdates"] = "processParticipationFlagUpdates";
|
|
38
38
|
EpochTransitionStep["processSyncCommitteeUpdates"] = "processSyncCommitteeUpdates";
|
|
39
|
-
EpochTransitionStep["
|
|
39
|
+
EpochTransitionStep["processPendingDeposits"] = "processPendingDeposits";
|
|
40
40
|
EpochTransitionStep["processPendingConsolidations"] = "processPendingConsolidations";
|
|
41
41
|
})(EpochTransitionStep || (EpochTransitionStep = {}));
|
|
42
42
|
export function processEpoch(fork, state, cache, metrics) {
|
|
@@ -84,9 +84,9 @@ export function processEpoch(fork, state, cache, metrics) {
|
|
|
84
84
|
const stateElectra = state;
|
|
85
85
|
{
|
|
86
86
|
const timer = metrics?.epochTransitionStepTime.startTimer({
|
|
87
|
-
step: EpochTransitionStep.
|
|
87
|
+
step: EpochTransitionStep.processPendingDeposits,
|
|
88
88
|
});
|
|
89
|
-
|
|
89
|
+
processPendingDeposits(stateElectra, cache);
|
|
90
90
|
timer?.();
|
|
91
91
|
}
|
|
92
92
|
{
|
package/lib/epoch/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/epoch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAC5B,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAU1B,OAAO,EAAC,8BAA8B,EAAC,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAC,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAC,gCAAgC,EAAC,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAC,mCAAmC,EAAC,MAAM,0CAA0C,CAAC;AAC7F,OAAO,EAAC,+BAA+B,EAAC,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAC,iCAAiC,EAAC,MAAM,wCAAwC,CAAC;AACzF,OAAO,EAAC,uBAAuB,EAAC,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAC,sBAAsB,EAAC,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAC,0BAA0B,EAAC,MAAM,iCAAiC,CAAC;AAC3E,OAAO,EAAC,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAC,qBAAqB,EAAC,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAC,2BAA2B,EAAC,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/epoch/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, HYSTERESIS_DOWNWARD_MULTIPLIER, HYSTERESIS_QUOTIENT, HYSTERESIS_UPWARD_MULTIPLIER, MAX_EFFECTIVE_BALANCE,
|
|
2
|
-
import {
|
|
1
|
+
import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, HYSTERESIS_DOWNWARD_MULTIPLIER, HYSTERESIS_QUOTIENT, HYSTERESIS_UPWARD_MULTIPLIER, MAX_EFFECTIVE_BALANCE, TIMELY_TARGET_FLAG_INDEX, } from "@lodestar/params";
|
|
2
|
+
import { getMaxEffectiveBalance } from "../util/validator.js";
|
|
3
3
|
/** Same to https://github.com/ethereum/eth2.0-specs/blob/v1.1.0-alpha.5/specs/altair/beacon-chain.md#has_flag */
|
|
4
4
|
const TIMELY_TARGET = 1 << TIMELY_TARGET_FLAG_INDEX;
|
|
5
5
|
/**
|
|
@@ -24,11 +24,10 @@ export function processEffectiveBalanceUpdates(fork, state, cache) {
|
|
|
24
24
|
let nextEpochTotalActiveBalanceByIncrement = 0;
|
|
25
25
|
// update effective balances with hysteresis
|
|
26
26
|
// epochTransitionCache.balances is initialized in processRewardsAndPenalties()
|
|
27
|
-
// and updated in
|
|
27
|
+
// and updated in processPendingDeposits() and processPendingConsolidations()
|
|
28
28
|
// so it's recycled here for performance.
|
|
29
29
|
const balances = cache.balances ?? state.balances.getAll();
|
|
30
30
|
const currentEpochValidators = cache.validators;
|
|
31
|
-
const newCompoundingValidators = cache.newCompoundingValidators ?? new Set();
|
|
32
31
|
let numUpdate = 0;
|
|
33
32
|
for (let i = 0, len = balances.length; i < len; i++) {
|
|
34
33
|
const balance = balances[i];
|
|
@@ -41,9 +40,7 @@ export function processEffectiveBalanceUpdates(fork, state, cache) {
|
|
|
41
40
|
}
|
|
42
41
|
else {
|
|
43
42
|
// from electra, effectiveBalanceLimit is per validator
|
|
44
|
-
|
|
45
|
-
newCompoundingValidators.has(i);
|
|
46
|
-
effectiveBalanceLimit = isCompoundingValidator ? MAX_EFFECTIVE_BALANCE_ELECTRA : MIN_ACTIVATION_BALANCE;
|
|
43
|
+
effectiveBalanceLimit = getMaxEffectiveBalance(currentEpochValidators[i].withdrawalCredentials);
|
|
47
44
|
}
|
|
48
45
|
if (
|
|
49
46
|
// Too big
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processEffectiveBalanceUpdates.js","sourceRoot":"","sources":["../../src/epoch/processEffectiveBalanceUpdates.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,OAAO,EACP,8BAA8B,EAC9B,mBAAmB,EACnB,4BAA4B,EAC5B,qBAAqB,EACrB,
|
|
1
|
+
{"version":3,"file":"processEffectiveBalanceUpdates.js","sourceRoot":"","sources":["../../src/epoch/processEffectiveBalanceUpdates.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { decreaseBalance, increaseBalance } from "../util/balance.js";
|
|
2
|
-
import {
|
|
3
|
-
import { switchToCompoundingValidator } from "../util/electra.js";
|
|
2
|
+
import { getMaxEffectiveBalance } from "../util/validator.js";
|
|
4
3
|
/**
|
|
5
4
|
* Starting from Electra:
|
|
6
5
|
* Process every `pendingConsolidation` in `state.pendingConsolidations`.
|
|
@@ -19,7 +18,6 @@ export function processPendingConsolidations(state, cache) {
|
|
|
19
18
|
let nextPendingConsolidation = 0;
|
|
20
19
|
const validators = state.validators;
|
|
21
20
|
const cachedBalances = cache.balances;
|
|
22
|
-
const newCompoundingValidators = new Set();
|
|
23
21
|
for (const pendingConsolidation of state.pendingConsolidations.getAllReadonly()) {
|
|
24
22
|
const { sourceIndex, targetIndex } = pendingConsolidation;
|
|
25
23
|
const sourceValidator = validators.getReadonly(sourceIndex);
|
|
@@ -30,20 +28,17 @@ export function processPendingConsolidations(state, cache) {
|
|
|
30
28
|
if (sourceValidator.withdrawableEpoch > nextEpoch) {
|
|
31
29
|
break;
|
|
32
30
|
}
|
|
33
|
-
// Churn any target excess active balance of target and raise its max
|
|
34
|
-
switchToCompoundingValidator(state, targetIndex);
|
|
35
|
-
newCompoundingValidators.add(targetIndex);
|
|
36
31
|
// Move active balance to target. Excess balance is withdrawable.
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
32
|
+
const maxEffectiveBalance = getMaxEffectiveBalance(state.validators.getReadonly(sourceIndex).withdrawalCredentials);
|
|
33
|
+
const sourceEffectiveBalance = Math.min(state.balances.get(sourceIndex), maxEffectiveBalance);
|
|
34
|
+
decreaseBalance(state, sourceIndex, sourceEffectiveBalance);
|
|
35
|
+
increaseBalance(state, targetIndex, sourceEffectiveBalance);
|
|
40
36
|
if (cachedBalances) {
|
|
41
|
-
cachedBalances[sourceIndex] -=
|
|
42
|
-
cachedBalances[targetIndex] +=
|
|
37
|
+
cachedBalances[sourceIndex] -= sourceEffectiveBalance;
|
|
38
|
+
cachedBalances[targetIndex] += sourceEffectiveBalance;
|
|
43
39
|
}
|
|
44
40
|
nextPendingConsolidation++;
|
|
45
41
|
}
|
|
46
|
-
cache.newCompoundingValidators = newCompoundingValidators;
|
|
47
42
|
state.pendingConsolidations = state.pendingConsolidations.sliceFrom(nextPendingConsolidation);
|
|
48
43
|
}
|
|
49
44
|
//# sourceMappingURL=processPendingConsolidations.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processPendingConsolidations.js","sourceRoot":"","sources":["../../src/epoch/processPendingConsolidations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processPendingConsolidations.js","sourceRoot":"","sources":["../../src/epoch/processPendingConsolidations.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,eAAe,EAAE,eAAe,EAAC,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAC,sBAAsB,EAAC,MAAM,sBAAsB,CAAC;AAE5D;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,4BAA4B,CAAC,KAA+B,EAAE,KAA2B;IACvG,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC;IAC3C,IAAI,wBAAwB,GAAG,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;IACpC,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC;IAEtC,KAAK,MAAM,oBAAoB,IAAI,KAAK,CAAC,qBAAqB,CAAC,cAAc,EAAE,EAAE,CAAC;QAChF,MAAM,EAAC,WAAW,EAAE,WAAW,EAAC,GAAG,oBAAoB,CAAC;QACxD,MAAM,eAAe,GAAG,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE5D,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;YAC5B,wBAAwB,EAAE,CAAC;YAC3B,SAAS;QACX,CAAC;QAED,IAAI,eAAe,CAAC,iBAAiB,GAAG,SAAS,EAAE,CAAC;YAClD,MAAM;QACR,CAAC;QACD,iEAAiE;QACjE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,qBAAqB,CAAC,CAAC;QACpH,MAAM,sBAAsB,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,mBAAmB,CAAC,CAAC;QAC9F,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAC5D,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAC5D,IAAI,cAAc,EAAE,CAAC;YACnB,cAAc,CAAC,WAAW,CAAC,IAAI,sBAAsB,CAAC;YACtD,cAAc,CAAC,WAAW,CAAC,IAAI,sBAAsB,CAAC;QACxD,CAAC;QAED,wBAAwB,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,qBAAqB,GAAG,KAAK,CAAC,qBAAqB,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;AAChG,CAAC"}
|
|
@@ -3,10 +3,10 @@ import { CachedBeaconStateElectra, EpochTransitionCache } from "../types.js";
|
|
|
3
3
|
* Starting from Electra:
|
|
4
4
|
* Process pending balance deposits from state subject to churn limit and depsoitBalanceToConsume.
|
|
5
5
|
* For each eligible `deposit`, call `increaseBalance()`.
|
|
6
|
-
* Remove the processed deposits from `state.
|
|
6
|
+
* Remove the processed deposits from `state.pendingDeposits`.
|
|
7
7
|
* Update `state.depositBalanceToConsume` for the next epoch
|
|
8
8
|
*
|
|
9
|
-
* TODO Electra: Update ssz library to support batch push to `
|
|
9
|
+
* TODO Electra: Update ssz library to support batch push to `pendingDeposits`
|
|
10
10
|
*/
|
|
11
|
-
export declare function
|
|
12
|
-
//# sourceMappingURL=
|
|
11
|
+
export declare function processPendingDeposits(state: CachedBeaconStateElectra, cache: EpochTransitionCache): void;
|
|
12
|
+
//# sourceMappingURL=processPendingDeposits.d.ts.map
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
import { FAR_FUTURE_EPOCH, ForkSeq, GENESIS_SLOT, MAX_PENDING_DEPOSITS_PER_EPOCH } from "@lodestar/params";
|
|
2
|
+
import { increaseBalance } from "../util/balance.js";
|
|
3
|
+
import { getActivationExitChurnLimit } from "../util/validator.js";
|
|
4
|
+
import { computeStartSlotAtEpoch } from "../util/epoch.js";
|
|
5
|
+
import { addValidatorToRegistry, isValidDepositSignature } from "../block/processDeposit.js";
|
|
6
|
+
/**
|
|
7
|
+
* Starting from Electra:
|
|
8
|
+
* Process pending balance deposits from state subject to churn limit and depsoitBalanceToConsume.
|
|
9
|
+
* For each eligible `deposit`, call `increaseBalance()`.
|
|
10
|
+
* Remove the processed deposits from `state.pendingDeposits`.
|
|
11
|
+
* Update `state.depositBalanceToConsume` for the next epoch
|
|
12
|
+
*
|
|
13
|
+
* TODO Electra: Update ssz library to support batch push to `pendingDeposits`
|
|
14
|
+
*/
|
|
15
|
+
export function processPendingDeposits(state, cache) {
|
|
16
|
+
const nextEpoch = state.epochCtx.epoch + 1;
|
|
17
|
+
const availableForProcessing = state.depositBalanceToConsume + BigInt(getActivationExitChurnLimit(state.epochCtx));
|
|
18
|
+
let processedAmount = 0;
|
|
19
|
+
let nextDepositIndex = 0;
|
|
20
|
+
const depositsToPostpone = [];
|
|
21
|
+
let isChurnLimitReached = false;
|
|
22
|
+
const finalizedSlot = computeStartSlotAtEpoch(state.finalizedCheckpoint.epoch);
|
|
23
|
+
for (const deposit of state.pendingDeposits.getAllReadonly()) {
|
|
24
|
+
// Do not process deposit requests if Eth1 bridge deposits are not yet applied.
|
|
25
|
+
if (
|
|
26
|
+
// Is deposit request
|
|
27
|
+
deposit.slot > GENESIS_SLOT &&
|
|
28
|
+
// There are pending Eth1 bridge deposits
|
|
29
|
+
state.eth1DepositIndex < state.depositRequestsStartIndex) {
|
|
30
|
+
break;
|
|
31
|
+
}
|
|
32
|
+
// Check if deposit has been finalized, otherwise, stop processing.
|
|
33
|
+
if (deposit.slot > finalizedSlot) {
|
|
34
|
+
break;
|
|
35
|
+
}
|
|
36
|
+
// Check if number of processed deposits has not reached the limit, otherwise, stop processing.
|
|
37
|
+
if (nextDepositIndex >= MAX_PENDING_DEPOSITS_PER_EPOCH) {
|
|
38
|
+
break;
|
|
39
|
+
}
|
|
40
|
+
// Read validator state
|
|
41
|
+
let isValidatorExited = false;
|
|
42
|
+
let isValidatorWithdrawn = false;
|
|
43
|
+
const validatorIndex = state.epochCtx.getValidatorIndex(deposit.pubkey);
|
|
44
|
+
if (validatorIndex !== null) {
|
|
45
|
+
const validator = state.validators.getReadonly(validatorIndex);
|
|
46
|
+
isValidatorExited = validator.exitEpoch < FAR_FUTURE_EPOCH;
|
|
47
|
+
isValidatorWithdrawn = validator.withdrawableEpoch < nextEpoch;
|
|
48
|
+
}
|
|
49
|
+
if (isValidatorWithdrawn) {
|
|
50
|
+
// Deposited balance will never become active. Increase balance but do not consume churn
|
|
51
|
+
applyPendingDeposit(state, deposit, cache);
|
|
52
|
+
}
|
|
53
|
+
else if (isValidatorExited) {
|
|
54
|
+
// Validator is exiting, postpone the deposit until after withdrawable epoch
|
|
55
|
+
depositsToPostpone.push(deposit);
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
// Check if deposit fits in the churn, otherwise, do no more deposit processing in this epoch.
|
|
59
|
+
isChurnLimitReached = processedAmount + deposit.amount > availableForProcessing;
|
|
60
|
+
if (isChurnLimitReached) {
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
// Consume churn and apply deposit.
|
|
64
|
+
processedAmount += deposit.amount;
|
|
65
|
+
applyPendingDeposit(state, deposit, cache);
|
|
66
|
+
}
|
|
67
|
+
// Regardless of how the deposit was handled, we move on in the queue.
|
|
68
|
+
nextDepositIndex++;
|
|
69
|
+
}
|
|
70
|
+
const remainingPendingDeposits = state.pendingDeposits.sliceFrom(nextDepositIndex);
|
|
71
|
+
state.pendingDeposits = remainingPendingDeposits;
|
|
72
|
+
// TODO Electra: add a function in ListCompositeTreeView to support batch push operation
|
|
73
|
+
for (const deposit of depositsToPostpone) {
|
|
74
|
+
state.pendingDeposits.push(deposit);
|
|
75
|
+
}
|
|
76
|
+
// Accumulate churn only if the churn limit has been hit.
|
|
77
|
+
if (isChurnLimitReached) {
|
|
78
|
+
state.depositBalanceToConsume = availableForProcessing - BigInt(processedAmount);
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
state.depositBalanceToConsume = 0n;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
function applyPendingDeposit(state, deposit, cache) {
|
|
85
|
+
const validatorIndex = state.epochCtx.getValidatorIndex(deposit.pubkey);
|
|
86
|
+
const { pubkey, withdrawalCredentials, amount, signature } = deposit;
|
|
87
|
+
const cachedBalances = cache.balances;
|
|
88
|
+
if (validatorIndex === null) {
|
|
89
|
+
// Verify the deposit signature (proof of possession) which is not checked by the deposit contract
|
|
90
|
+
if (isValidDepositSignature(state.config, pubkey, withdrawalCredentials, amount, signature)) {
|
|
91
|
+
addValidatorToRegistry(ForkSeq.electra, state, pubkey, withdrawalCredentials, amount);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
// Increase balance
|
|
96
|
+
increaseBalance(state, validatorIndex, amount);
|
|
97
|
+
if (cachedBalances) {
|
|
98
|
+
cachedBalances[validatorIndex] += amount;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=processPendingDeposits.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"processPendingDeposits.js","sourceRoot":"","sources":["../../src/epoch/processPendingDeposits.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,14 +31,20 @@ export function processSlashings(state, cache, updateBalance = true) {
|
|
|
31
31
|
const { effectiveBalanceIncrements } = state.epochCtx;
|
|
32
32
|
const adjustedTotalSlashingBalanceByIncrement = Math.min(state.epochCtx.totalSlashingsByIncrement * proportionalSlashingMultiplier, totalBalanceByIncrement);
|
|
33
33
|
const increment = EFFECTIVE_BALANCE_INCREMENT;
|
|
34
|
+
const penaltyPerEffectiveBalanceIncrement = Math.floor((adjustedTotalSlashingBalanceByIncrement * increment) / totalBalanceByIncrement);
|
|
34
35
|
const penalties = [];
|
|
35
36
|
const penaltiesByEffectiveBalanceIncrement = new Map();
|
|
36
37
|
for (const index of cache.indicesToSlash) {
|
|
37
38
|
const effectiveBalanceIncrement = effectiveBalanceIncrements[index];
|
|
38
39
|
let penalty = penaltiesByEffectiveBalanceIncrement.get(effectiveBalanceIncrement);
|
|
39
40
|
if (penalty === undefined) {
|
|
40
|
-
|
|
41
|
-
|
|
41
|
+
if (fork < ForkSeq.electra) {
|
|
42
|
+
const penaltyNumeratorByIncrement = effectiveBalanceIncrement * adjustedTotalSlashingBalanceByIncrement;
|
|
43
|
+
penalty = Math.floor(penaltyNumeratorByIncrement / totalBalanceByIncrement) * increment;
|
|
44
|
+
}
|
|
45
|
+
else {
|
|
46
|
+
penalty = penaltyPerEffectiveBalanceIncrement * effectiveBalanceIncrement;
|
|
47
|
+
}
|
|
42
48
|
penaltiesByEffectiveBalanceIncrement.set(effectiveBalanceIncrement, penalty);
|
|
43
49
|
}
|
|
44
50
|
if (updateBalance) {
|