Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions packages/state-transition/src/stateView/abstractBeaconStateView.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import {BitArray} from "@chainsafe/ssz";

/**
* Base class for `BeaconStateView` implementations (NodeJS and future native).
*
* Subclasses surface a minimal `{uint8Array, bitLen}` shape via the abstract
* `_executionPayloadAvailability` getter. The public `executionPayloadAvailability`
* getter wraps that shape into a `BitArray` so beacon-node consumers are unaffected.
*/
export abstract class AbstractBeaconStateView {
private _executionPayloadAvailabilityBitArray: BitArray | null = null;

/** Raw shape that every backing implementation must provide. Throws before gloas. */
protected abstract get _executionPayloadAvailability(): {uint8Array: Uint8Array; bitLen: number};

get executionPayloadAvailability(): BitArray {
if (this._executionPayloadAvailabilityBitArray === null) {
const raw = this._executionPayloadAvailability;
this._executionPayloadAvailabilityBitArray = new BitArray(raw.uint8Array, raw.bitLen);
}
return this._executionPayloadAvailabilityBitArray;
}
Comment thread
wemeetagain marked this conversation as resolved.
Resolved
}
19 changes: 7 additions & 12 deletions packages/state-transition/src/stateView/beaconStateView.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {CompactMultiProof, ProofType, Tree, createProof} from "@chainsafe/persistent-merkle-tree";
import {BitArray, ByteViews} from "@chainsafe/ssz";
import {ByteViews} from "@chainsafe/ssz";
import {BeaconConfig} from "@lodestar/config";
import {ForkName, ForkSeq, SLOTS_PER_HISTORICAL_ROOT} from "@lodestar/params";
import {
Expand Down Expand Up @@ -68,9 +68,10 @@ import {canBuilderCoverBid} from "../util/gloas.js";
import {loadState} from "../util/loadState/loadState.js";
import {getRandaoMix} from "../util/seed.js";
import {getLatestWeakSubjectivityCheckpointEpoch} from "../util/weakSubjectivity.js";
import {AbstractBeaconStateView} from "./abstractBeaconStateView.js";
import {IBeaconStateView, IBeaconStateViewGloas, IBeaconStateViewLatestFork, isStatePostGloas} from "./interface.js";

export class BeaconStateView implements IBeaconStateViewLatestFork {
export class BeaconStateView extends AbstractBeaconStateView implements IBeaconStateViewLatestFork {
private readonly config: BeaconConfig;
// Cached values extracted from the tree
// phase0
Expand All @@ -92,11 +93,11 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
// fulu
private _proposerLookahead: fulu.ProposerLookahead | null = null;
// gloas
private _executionPayloadAvailability: BitArray | null = null;
private _latestExecutionPayloadBid: ExecutionPayloadBid | null = null;
private _payloadExpectedWithdrawals: capella.Withdrawal[] | null = null;

constructor(readonly cachedState: CachedBeaconStateAllForks) {
super();
this.config = cachedState.config;
}

Expand Down Expand Up @@ -349,18 +350,12 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
return (this.cachedState as CachedBeaconStateGloas).latestBlockHash;
}

get executionPayloadAvailability(): BitArray {
protected get _executionPayloadAvailability(): {uint8Array: Uint8Array; bitLen: number} {
if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
throw new Error("executionPayloadAvailability is not available before Gloas");
}

if (this._executionPayloadAvailability === null) {
this._executionPayloadAvailability = (
this.cachedState as CachedBeaconStateGloas
).executionPayloadAvailability.toValue();
}

return this._executionPayloadAvailability;
const ba = (this.cachedState as CachedBeaconStateGloas).executionPayloadAvailability.toValue();
return {uint8Array: ba.uint8Array, bitLen: ba.bitLen};
}
Comment thread
wemeetagain marked this conversation as resolved.
Resolved

get latestExecutionPayloadBid(): ExecutionPayloadBid {
Expand Down
Loading