@lodestar/state-transition 1.49.0 → 1.50.0-dev.1f38fe79fb
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/rewards/attestationsRewards.d.ts.map +1 -1
- package/lib/rewards/attestationsRewards.js +7 -5
- package/lib/rewards/attestationsRewards.js.map +1 -1
- package/lib/stateView/beaconStateView.d.ts +4 -0
- package/lib/stateView/beaconStateView.d.ts.map +1 -1
- package/lib/stateView/beaconStateView.js +20 -0
- package/lib/stateView/beaconStateView.js.map +1 -1
- package/lib/stateView/interface.d.ts +2 -0
- package/lib/stateView/interface.d.ts.map +1 -1
- package/lib/stateView/interface.js.map +1 -1
- package/lib/stateView/nativeBeaconStateView.d.ts +4 -0
- package/lib/stateView/nativeBeaconStateView.d.ts.map +1 -1
- package/lib/stateView/nativeBeaconStateView.js +14 -0
- package/lib/stateView/nativeBeaconStateView.js.map +1 -1
- package/lib/stateView/stateViewFactory.d.ts +5 -13
- package/lib/stateView/stateViewFactory.d.ts.map +1 -1
- package/lib/stateView/stateViewFactory.js +5 -5
- package/lib/stateView/stateViewFactory.js.map +1 -1
- package/lib/util/index.d.ts +1 -0
- package/lib/util/index.d.ts.map +1 -1
- package/lib/util/index.js +1 -0
- package/lib/util/index.js.map +1 -1
- package/lib/util/sszBytes.d.ts +14 -17
- package/lib/util/sszBytes.d.ts.map +1 -1
- package/lib/util/sszBytes.js +80 -20
- package/lib/util/sszBytes.js.map +1 -1
- package/lib/util/weakSubjectivity.d.ts +11 -6
- package/lib/util/weakSubjectivity.d.ts.map +1 -1
- package/lib/util/weakSubjectivity.js +22 -28
- package/lib/util/weakSubjectivity.js.map +1 -1
- package/package.json +7 -7
- package/src/rewards/attestationsRewards.ts +9 -4
- package/src/stateView/beaconStateView.ts +26 -0
- package/src/stateView/interface.ts +2 -0
- package/src/stateView/nativeBeaconStateView.ts +16 -0
- package/src/stateView/stateViewFactory.ts +9 -16
- package/src/util/index.ts +5 -0
- package/src/util/sszBytes.ts +111 -22
- package/src/util/weakSubjectivity.ts +43 -40
package/lib/util/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EACvB,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,eAAe,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
|
package/lib/util/index.js
CHANGED
|
@@ -28,6 +28,7 @@ export * from "./signatureSets.js";
|
|
|
28
28
|
export * from "./signingRoot.js";
|
|
29
29
|
export * from "./slot.js";
|
|
30
30
|
export * from "./ssz.js";
|
|
31
|
+
export { getValidatorCountFromStateBytes, readBeaconStateBytesMetadata, } from "./sszBytes.js";
|
|
31
32
|
export * from "./syncCommittee.js";
|
|
32
33
|
export * from "./validator.js";
|
|
33
34
|
export * from "./weakSubjectivity.js";
|
package/lib/util/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,sBAAsB,CAAC;AACrC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,WAAW,CAAC;AAC1B,cAAc,UAAU,CAAC;AACzB,OAAO,EAEL,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,eAAe,CAAC;AACvB,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}
|
package/lib/util/sszBytes.d.ts
CHANGED
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
import { ChainForkConfig } from "@lodestar/config";
|
|
2
2
|
import { ForkAll, ForkSeq } from "@lodestar/params";
|
|
3
|
-
import { SSZTypesFor, Slot } from "@lodestar/types";
|
|
4
|
-
|
|
5
|
-
* 48 + 32 + 8 + 1 + 8 + 8 + 8 + 8 = 121
|
|
6
|
-
* ```
|
|
7
|
-
* class Validator(Container):
|
|
8
|
-
pubkey: BLSPubkey [fixed - 48 bytes]
|
|
9
|
-
withdrawal_credentials: Bytes32 [fixed - 32 bytes]
|
|
10
|
-
effective_balance: Gwei [fixed - 8 bytes]
|
|
11
|
-
slashed: boolean [fixed - 1 byte]
|
|
12
|
-
# Status epochs
|
|
13
|
-
activation_eligibility_epoch: Epoch [fixed - 8 bytes]
|
|
14
|
-
activation_epoch: Epoch [fixed - 8 bytes]
|
|
15
|
-
exit_epoch: Epoch [fixed - 8 bytes]
|
|
16
|
-
withdrawable_epoch: Epoch [fixed - 8 bytes]
|
|
17
|
-
```
|
|
18
|
-
*/
|
|
19
|
-
export declare const VALIDATOR_BYTES_SIZE = 121;
|
|
3
|
+
import { Epoch, SSZTypesFor, Slot } from "@lodestar/types";
|
|
4
|
+
export declare const VALIDATOR_BYTES_SIZE: number;
|
|
20
5
|
export declare function getForkFromStateBytes(config: ChainForkConfig, bytes: Uint8Array): ForkSeq;
|
|
21
6
|
export declare function getStateTypeFromBytes(config: ChainForkConfig, bytes: Uint8Array): SSZTypesFor<ForkAll, "BeaconState">;
|
|
22
7
|
export declare function getStateSlotFromBytes(bytes: Uint8Array): Slot;
|
|
8
|
+
export type StateBytesMetadata = {
|
|
9
|
+
slot: Slot;
|
|
10
|
+
genesisTime: number;
|
|
11
|
+
genesisValidatorsRoot: Uint8Array;
|
|
12
|
+
};
|
|
13
|
+
export declare function readBeaconStateBytesMetadata(bytes: Uint8Array): StateBytesMetadata | null;
|
|
14
|
+
/** Read only the validator fields needed for weak subjectivity, without allocating validator objects. */
|
|
15
|
+
export declare function scanActiveValidatorsFromStateBytes(stateBytes: Uint8Array, stateType: SSZTypesFor<ForkAll, "BeaconState">, epoch: Epoch): {
|
|
16
|
+
activeValidatorCount: number;
|
|
17
|
+
totalActiveBalanceIncrements: number;
|
|
18
|
+
} | null;
|
|
19
|
+
export declare function getValidatorCountFromStateBytes(config: ChainForkConfig, stateBytes: Uint8Array): number | null;
|
|
23
20
|
//# sourceMappingURL=sszBytes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sszBytes.d.ts","sourceRoot":"","sources":["../../src/util/sszBytes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"sszBytes.d.ts","sourceRoot":"","sources":["../../src/util/sszBytes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAA8B,OAAO,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAM,MAAM,iBAAiB,CAAC;AAsB9D,eAAO,MAAM,oBAAoB,QAA0D,CAAC;AAe5F,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAGzF;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,UAAU,GAAG,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAGrH;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,CAE7D;AAED,MAAM,MAAM,kBAAkB,GAAG;IAAC,IAAI,EAAE,IAAI,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,UAAU,CAAA;CAAC,CAAC;AAEtG,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,kBAAkB,GAAG,IAAI,CAgBzF;AAED,yGAAyG;AACzG,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,WAAW,CAAC,OAAO,EAAE,aAAa,CAAC,EAC9C,KAAK,EAAE,KAAK,GACX;IAAC,oBAAoB,EAAE,MAAM,CAAC;IAAC,4BAA4B,EAAE,MAAM,CAAA;CAAC,GAAG,IAAI,CAkC7E;AAED,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAI9G"}
|
package/lib/util/sszBytes.js
CHANGED
|
@@ -1,26 +1,26 @@
|
|
|
1
|
+
import { EFFECTIVE_BALANCE_INCREMENT } from "@lodestar/params";
|
|
2
|
+
import { ssz } from "@lodestar/types";
|
|
1
3
|
import { bytesToInt } from "@lodestar/utils";
|
|
4
|
+
const UINT64_SIZE = 8;
|
|
5
|
+
const ROOT_SIZE = 32;
|
|
2
6
|
/**
|
|
3
|
-
* Slot uint64
|
|
4
|
-
*/
|
|
5
|
-
const SLOT_BYTE_COUNT = 8;
|
|
6
|
-
/**
|
|
7
|
-
* 48 + 32 + 8 + 1 + 8 + 8 + 8 + 8 = 121
|
|
8
7
|
* ```
|
|
9
8
|
* class Validator(Container):
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
```
|
|
9
|
+
* pubkey: BLSPubkey [fixed - 48 bytes]
|
|
10
|
+
* withdrawal_credentials: Bytes32 [fixed - 32 bytes]
|
|
11
|
+
* effective_balance: Gwei [fixed - 8 bytes]
|
|
12
|
+
* slashed: boolean [fixed - 1 byte]
|
|
13
|
+
* activation_eligibility_epoch: Epoch [fixed - 8 bytes]
|
|
14
|
+
* activation_epoch: Epoch [fixed - 8 bytes]
|
|
15
|
+
* exit_epoch: Epoch [fixed - 8 bytes]
|
|
16
|
+
* withdrawable_epoch: Epoch [fixed - 8 bytes]
|
|
17
|
+
* ```
|
|
20
18
|
*/
|
|
21
|
-
|
|
19
|
+
const VALIDATOR_EFFECTIVE_BALANCE_OFFSET = 48 + ROOT_SIZE;
|
|
20
|
+
const VALIDATOR_ACTIVATION_EPOCH_OFFSET = VALIDATOR_EFFECTIVE_BALANCE_OFFSET + UINT64_SIZE + 1 + UINT64_SIZE;
|
|
21
|
+
const VALIDATOR_EXIT_EPOCH_OFFSET = VALIDATOR_ACTIVATION_EPOCH_OFFSET + UINT64_SIZE;
|
|
22
|
+
export const VALIDATOR_BYTES_SIZE = VALIDATOR_EXIT_EPOCH_OFFSET + UINT64_SIZE + UINT64_SIZE;
|
|
22
23
|
/**
|
|
23
|
-
* 8 + 32 = 40
|
|
24
24
|
* ```
|
|
25
25
|
* class BeaconState(Container):
|
|
26
26
|
* genesis_time: uint64 [fixed - 8 bytes]
|
|
@@ -29,9 +29,11 @@ export const VALIDATOR_BYTES_SIZE = 121;
|
|
|
29
29
|
* ...
|
|
30
30
|
* ```
|
|
31
31
|
*/
|
|
32
|
-
const
|
|
32
|
+
const STATE_GENESIS_TIME_OFFSET = 0;
|
|
33
|
+
const STATE_GENESIS_VALIDATORS_ROOT_OFFSET = STATE_GENESIS_TIME_OFFSET + UINT64_SIZE;
|
|
34
|
+
const STATE_SLOT_OFFSET = STATE_GENESIS_VALIDATORS_ROOT_OFFSET + ROOT_SIZE;
|
|
33
35
|
export function getForkFromStateBytes(config, bytes) {
|
|
34
|
-
const slot = bytesToInt(bytes.subarray(
|
|
36
|
+
const slot = bytesToInt(bytes.subarray(STATE_SLOT_OFFSET, STATE_SLOT_OFFSET + UINT64_SIZE));
|
|
35
37
|
return config.getForkSeq(slot);
|
|
36
38
|
}
|
|
37
39
|
export function getStateTypeFromBytes(config, bytes) {
|
|
@@ -39,6 +41,64 @@ export function getStateTypeFromBytes(config, bytes) {
|
|
|
39
41
|
return config.getForkTypes(slot).BeaconState;
|
|
40
42
|
}
|
|
41
43
|
export function getStateSlotFromBytes(bytes) {
|
|
42
|
-
return bytesToInt(bytes.subarray(
|
|
44
|
+
return bytesToInt(bytes.subarray(STATE_SLOT_OFFSET, STATE_SLOT_OFFSET + UINT64_SIZE));
|
|
45
|
+
}
|
|
46
|
+
export function readBeaconStateBytesMetadata(bytes) {
|
|
47
|
+
if (bytes.length < STATE_SLOT_OFFSET + UINT64_SIZE) {
|
|
48
|
+
return null;
|
|
49
|
+
}
|
|
50
|
+
const data = { uint8Array: bytes, dataView: new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength) };
|
|
51
|
+
return {
|
|
52
|
+
genesisTime: ssz.UintNum64.value_deserializeFromBytes(data, STATE_GENESIS_TIME_OFFSET, STATE_GENESIS_TIME_OFFSET + UINT64_SIZE),
|
|
53
|
+
genesisValidatorsRoot: Uint8Array.from(bytes.subarray(STATE_GENESIS_VALIDATORS_ROOT_OFFSET, STATE_GENESIS_VALIDATORS_ROOT_OFFSET + ROOT_SIZE)),
|
|
54
|
+
slot: ssz.Slot.value_deserializeFromBytes(data, STATE_SLOT_OFFSET, STATE_SLOT_OFFSET + UINT64_SIZE),
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
/** Read only the validator fields needed for weak subjectivity, without allocating validator objects. */
|
|
58
|
+
export function scanActiveValidatorsFromStateBytes(stateBytes, stateType, epoch) {
|
|
59
|
+
const range = getValidatorsRangeFromStateBytes(stateBytes, stateType);
|
|
60
|
+
if (range === null) {
|
|
61
|
+
return null;
|
|
62
|
+
}
|
|
63
|
+
const data = {
|
|
64
|
+
uint8Array: stateBytes,
|
|
65
|
+
dataView: new DataView(stateBytes.buffer, stateBytes.byteOffset, stateBytes.byteLength),
|
|
66
|
+
};
|
|
67
|
+
let activeValidatorCount = 0;
|
|
68
|
+
let totalActiveBalanceIncrements = 0;
|
|
69
|
+
for (let offset = range.start; offset < range.end; offset += VALIDATOR_BYTES_SIZE) {
|
|
70
|
+
const activationEpoch = ssz.EpochInf.value_deserializeFromBytes(data, offset + VALIDATOR_ACTIVATION_EPOCH_OFFSET, offset + VALIDATOR_ACTIVATION_EPOCH_OFFSET + UINT64_SIZE);
|
|
71
|
+
const exitEpoch = ssz.EpochInf.value_deserializeFromBytes(data, offset + VALIDATOR_EXIT_EPOCH_OFFSET, offset + VALIDATOR_EXIT_EPOCH_OFFSET + UINT64_SIZE);
|
|
72
|
+
if (activationEpoch <= epoch && epoch < exitEpoch) {
|
|
73
|
+
activeValidatorCount++;
|
|
74
|
+
const effectiveBalance = ssz.UintNum64.value_deserializeFromBytes(data, offset + VALIDATOR_EFFECTIVE_BALANCE_OFFSET, offset + VALIDATOR_EFFECTIVE_BALANCE_OFFSET + UINT64_SIZE);
|
|
75
|
+
totalActiveBalanceIncrements += Math.floor(effectiveBalance / EFFECTIVE_BALANCE_INCREMENT);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return { activeValidatorCount, totalActiveBalanceIncrements: Math.max(1, totalActiveBalanceIncrements) };
|
|
79
|
+
}
|
|
80
|
+
export function getValidatorCountFromStateBytes(config, stateBytes) {
|
|
81
|
+
const range = getValidatorsRangeFromStateBytes(stateBytes, getStateTypeFromBytes(config, stateBytes));
|
|
82
|
+
// A non-null range always holds a whole number of validator records, so the division is exact
|
|
83
|
+
return range === null ? null : (range.end - range.start) / VALIDATOR_BYTES_SIZE;
|
|
84
|
+
}
|
|
85
|
+
function getValidatorsRangeFromStateBytes(stateBytes, stateType) {
|
|
86
|
+
let range;
|
|
87
|
+
try {
|
|
88
|
+
const containerType = stateType;
|
|
89
|
+
const dataView = new DataView(stateBytes.buffer, stateBytes.byteOffset, stateBytes.byteLength);
|
|
90
|
+
const ranges = containerType.getFieldRanges(dataView, 0, stateBytes.length);
|
|
91
|
+
range = ranges[Object.keys(containerType.fields).indexOf("validators")];
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
if (!range || range.start < 0 || range.end > stateBytes.length || range.end < range.start) {
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
if ((range.end - range.start) % VALIDATOR_BYTES_SIZE !== 0) {
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
return range;
|
|
43
103
|
}
|
|
44
104
|
//# sourceMappingURL=sszBytes.js.map
|
package/lib/util/sszBytes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sszBytes.js","sourceRoot":"","sources":["../../src/util/sszBytes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sszBytes.js","sourceRoot":"","sources":["../../src/util/sszBytes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Epoch, Root } from "@lodestar/types";
|
|
3
|
-
import { Checkpoint } from "@lodestar/types/phase0";
|
|
1
|
+
import { ChainForkConfig } from "@lodestar/config";
|
|
2
|
+
import { Epoch, Root, TimeSeconds } from "@lodestar/types";
|
|
4
3
|
import { BeaconStateAllForks, CachedBeaconStateAllForks } from "../types.js";
|
|
4
|
+
import { StateBytesMetadata } from "./sszBytes.js";
|
|
5
5
|
export declare const ETH_TO_GWEI: number;
|
|
6
6
|
/**
|
|
7
7
|
* Returns the epoch of the latest weak subjectivity checkpoint for the given
|
|
@@ -19,13 +19,18 @@ export declare function getLatestWeakSubjectivityCheckpointEpoch(config: ChainFo
|
|
|
19
19
|
export declare function computeWeakSubjectivityPeriodCachedState(config: ChainForkConfig, state: CachedBeaconStateAllForks): number;
|
|
20
20
|
/**
|
|
21
21
|
* Same to computeWeakSubjectivityPeriodCachedState but for normal state
|
|
22
|
-
* This is called only 1 time at app startup so it's ok to calculate totalActiveBalanceIncrements manually
|
|
23
22
|
*/
|
|
24
23
|
export declare function computeWeakSubjectivityPeriod(config: ChainForkConfig, state: BeaconStateAllForks): number;
|
|
25
24
|
export declare function computeWeakSubjectivityPeriodFromConstituentsPhase0(activeValidatorCount: number, totalBalanceByIncrement: number, churnLimit: number, minWithdrawabilityDelay: number): number;
|
|
26
25
|
export declare function computeWeakSubjectivityPeriodFromConstituentsElectra(totalBalanceByIncrement: number, balanceChurnLimit: number, minWithdrawabilityDelay: number): number;
|
|
27
26
|
export declare function computeWeakSubjectivityPeriodFromConstituentsGloas(totalBalanceByIncrement: number, exitChurnLimit: number, activationChurnLimit: number, consolidationChurnLimit: number, minWithdrawabilityDelay: number): number;
|
|
28
27
|
export declare function getLatestBlockRoot(state: BeaconStateAllForks): Root;
|
|
29
|
-
export
|
|
30
|
-
|
|
28
|
+
export type WeakSubjectivitySummary = {
|
|
29
|
+
checkpointEpoch: Epoch;
|
|
30
|
+
genesisTime: number;
|
|
31
|
+
period: number;
|
|
32
|
+
};
|
|
33
|
+
/** The metadata must describe the supplied state bytes. */
|
|
34
|
+
export declare function computeWeakSubjectivitySummaryFromStateBytes(config: ChainForkConfig, bytes: Uint8Array, metadata: StateBytesMetadata): WeakSubjectivitySummary | null;
|
|
35
|
+
export declare function isWithinWeakSubjectivityPeriodFromSummary(config: ChainForkConfig, summary: WeakSubjectivitySummary, now?: TimeSeconds): boolean;
|
|
31
36
|
//# sourceMappingURL=weakSubjectivity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weakSubjectivity.d.ts","sourceRoot":"","sources":["../../src/util/weakSubjectivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"weakSubjectivity.d.ts","sourceRoot":"","sources":["../../src/util/weakSubjectivity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAWjD,OAAO,EAAC,KAAK,EAAE,IAAI,EAAQ,WAAW,EAAM,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EAAC,mBAAmB,EAAE,yBAAyB,EAAC,MAAM,aAAa,CAAC;AAE3E,OAAO,EAAC,kBAAkB,EAA4D,MAAM,eAAe,CAAC;AAY5G,eAAO,MAAM,WAAW,QAAU,CAAC;AAGnC;;;GAGG;AACH,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,yBAAyB,GAC/B,KAAK,CAEP;AAED;;;;;;;GAOG;AACH,wBAAgB,wCAAwC,CACtD,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,yBAAyB,GAC/B,MAAM,CAwBR;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAgBzG;AAwCD,wBAAgB,mDAAmD,CACjE,oBAAoB,EAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAM,EAC/B,UAAU,EAAE,MAAM,EAClB,uBAAuB,EAAE,MAAM,GAC9B,MAAM,CAuBR;AAED,wBAAgB,oDAAoD,CAClE,uBAAuB,EAAE,MAAM,EAE/B,iBAAiB,EAAE,MAAM,EACzB,uBAAuB,EAAE,MAAM,GAC9B,MAAM,CAOR;AAED,wBAAgB,kDAAkD,CAChE,uBAAuB,EAAE,MAAM,EAC/B,cAAc,EAAE,MAAM,EACtB,oBAAoB,EAAE,MAAM,EAC5B,uBAAuB,EAAE,MAAM,EAC/B,uBAAuB,EAAE,MAAM,GAC9B,MAAM,CAOR;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAMnE;AAED,MAAM,MAAM,uBAAuB,GAAG;IAAC,eAAe,EAAE,KAAK,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,CAAC;AAEpG,2DAA2D;AAC3D,wBAAgB,4CAA4C,CAC1D,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,kBAAkB,GAC3B,uBAAuB,GAAG,IAAI,CAOhC;AAED,wBAAgB,yCAAyC,CACvD,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,uBAAuB,EAChC,GAAG,GAAE,WAA+B,GACnC,OAAO,CAGT"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, MAX_DEPOSITS, MAX_EFFECTIVE_BALANCE, SLOTS_PER_EPOCH, isForkPostElectra, isForkPostGloas, } from "@lodestar/params";
|
|
1
|
+
import { EFFECTIVE_BALANCE_INCREMENT, ForkSeq, GENESIS_SLOT, MAX_DEPOSITS, MAX_EFFECTIVE_BALANCE, SLOTS_PER_EPOCH, isForkPostElectra, isForkPostGloas, } from "@lodestar/params";
|
|
2
2
|
import { ssz } from "@lodestar/types";
|
|
3
|
-
import { toRootHex } from "@lodestar/utils";
|
|
4
3
|
import { ZERO_HASH } from "../constants/constants.js";
|
|
5
4
|
import { computeCheckpointEpochAtStateSlot, computeEpochAtSlot, getCurrentEpoch } from "./epoch.js";
|
|
6
|
-
import {
|
|
5
|
+
import { getStateTypeFromBytes, scanActiveValidatorsFromStateBytes } from "./sszBytes.js";
|
|
7
6
|
import { getActivationChurnLimit, getActiveValidatorIndices, getBalanceChurnLimit, getBalanceChurnLimitFromCache, getChurnLimit, getConsolidationChurnLimit, getExitChurnLimit, getGloasChurnLimits, } from "./validator.js";
|
|
8
7
|
export const ETH_TO_GWEI = 10 ** 9;
|
|
9
8
|
const SAFETY_DECAY = 10;
|
|
@@ -33,12 +32,10 @@ export function computeWeakSubjectivityPeriodCachedState(config, state) {
|
|
|
33
32
|
}
|
|
34
33
|
/**
|
|
35
34
|
* Same to computeWeakSubjectivityPeriodCachedState but for normal state
|
|
36
|
-
* This is called only 1 time at app startup so it's ok to calculate totalActiveBalanceIncrements manually
|
|
37
35
|
*/
|
|
38
36
|
export function computeWeakSubjectivityPeriod(config, state) {
|
|
39
37
|
const activeIndices = getActiveValidatorIndices(state, getCurrentEpoch(state));
|
|
40
38
|
const validators = state.validators.getAllReadonlyValues();
|
|
41
|
-
const fork = config.getForkName(state.slot);
|
|
42
39
|
let totalActiveBalanceIncrements = 0;
|
|
43
40
|
for (const index of activeIndices) {
|
|
44
41
|
totalActiveBalanceIncrements += Math.floor(validators[index].effectiveBalance / EFFECTIVE_BALANCE_INCREMENT);
|
|
@@ -46,12 +43,19 @@ export function computeWeakSubjectivityPeriod(config, state) {
|
|
|
46
43
|
if (totalActiveBalanceIncrements <= 1) {
|
|
47
44
|
totalActiveBalanceIncrements = 1;
|
|
48
45
|
}
|
|
46
|
+
return computeWeakSubjectivityPeriodFromActiveValidators(config, state.slot, {
|
|
47
|
+
activeValidatorCount: activeIndices.length,
|
|
48
|
+
totalActiveBalanceIncrements,
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
function computeWeakSubjectivityPeriodFromActiveValidators(config, slot, { activeValidatorCount, totalActiveBalanceIncrements, }) {
|
|
52
|
+
const fork = config.getForkName(slot);
|
|
49
53
|
const churnLimitsGloas = getGloasChurnLimits(config, totalActiveBalanceIncrements);
|
|
50
54
|
return isForkPostGloas(fork)
|
|
51
55
|
? computeWeakSubjectivityPeriodFromConstituentsGloas(totalActiveBalanceIncrements, churnLimitsGloas.exit, churnLimitsGloas.activation, churnLimitsGloas.consolidation, config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY)
|
|
52
56
|
: isForkPostElectra(fork)
|
|
53
57
|
? computeWeakSubjectivityPeriodFromConstituentsElectra(totalActiveBalanceIncrements, getBalanceChurnLimit(totalActiveBalanceIncrements, config.CHURN_LIMIT_QUOTIENT, config.MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA), config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY)
|
|
54
|
-
: computeWeakSubjectivityPeriodFromConstituentsPhase0(
|
|
58
|
+
: computeWeakSubjectivityPeriodFromConstituentsPhase0(activeValidatorCount, totalActiveBalanceIncrements, getChurnLimit(config, activeValidatorCount), config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY);
|
|
55
59
|
}
|
|
56
60
|
export function computeWeakSubjectivityPeriodFromConstituentsPhase0(activeValidatorCount, totalBalanceByIncrement, churnLimit, minWithdrawabilityDelay) {
|
|
57
61
|
const N = activeValidatorCount;
|
|
@@ -98,28 +102,18 @@ export function getLatestBlockRoot(state) {
|
|
|
98
102
|
}
|
|
99
103
|
return ssz.phase0.BeaconBlockHeader.hashTreeRoot(header);
|
|
100
104
|
}
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
return
|
|
108
|
-
|
|
105
|
+
/** The metadata must describe the supplied state bytes. */
|
|
106
|
+
export function computeWeakSubjectivitySummaryFromStateBytes(config, bytes, metadata) {
|
|
107
|
+
const { slot, genesisTime } = metadata;
|
|
108
|
+
const stateType = getStateTypeFromBytes(config, bytes);
|
|
109
|
+
const activeValidators = scanActiveValidatorsFromStateBytes(bytes, stateType, computeEpochAtSlot(slot));
|
|
110
|
+
if (activeValidators === null)
|
|
111
|
+
return null;
|
|
112
|
+
const period = computeWeakSubjectivityPeriodFromActiveValidators(config, slot, activeValidators);
|
|
113
|
+
return { checkpointEpoch: computeCheckpointEpochAtStateSlot(slot), genesisTime, period };
|
|
109
114
|
}
|
|
110
|
-
export function
|
|
111
|
-
const
|
|
112
|
-
|
|
113
|
-
if (!ssz.Root.equals(blockRoot, wsCheckpoint.root)) {
|
|
114
|
-
throw new Error(`Roots do not match. expected=${toRootHex(wsCheckpoint.root)}, actual=${toRootHex(blockRoot)}`);
|
|
115
|
-
}
|
|
116
|
-
if (!ssz.Epoch.equals(wsStateEpoch, wsCheckpoint.epoch)) {
|
|
117
|
-
throw new Error(`Epochs do not match. expected=${wsCheckpoint.epoch}, actual=${wsStateEpoch}`);
|
|
118
|
-
}
|
|
119
|
-
const wsPeriod = computeWeakSubjectivityPeriod(config, wsState);
|
|
120
|
-
const clockEpoch = computeEpochAtSlot(getCurrentSlot(config, wsState.genesisTime));
|
|
121
|
-
if (clockEpoch > wsStateEpoch + wsPeriod) {
|
|
122
|
-
throw new Error(`The downloaded state with epoch ${wsStateEpoch} is not within weak subjectivity period of ${wsPeriod} from the current epoch ${clockEpoch}. Please verify your checkpoint source`);
|
|
123
|
-
}
|
|
115
|
+
export function isWithinWeakSubjectivityPeriodFromSummary(config, summary, now = Date.now() / 1000) {
|
|
116
|
+
const clockSlot = GENESIS_SLOT + Math.floor((now - summary.genesisTime) / (config.SLOT_DURATION_MS / 1000));
|
|
117
|
+
return computeEpochAtSlot(clockSlot) <= summary.checkpointEpoch + summary.period;
|
|
124
118
|
}
|
|
125
119
|
//# sourceMappingURL=weakSubjectivity.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weakSubjectivity.js","sourceRoot":"","sources":["../../src/util/weakSubjectivity.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,EAC3B,OAAO,EACP,YAAY,EACZ,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EACjB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"weakSubjectivity.js","sourceRoot":"","sources":["../../src/util/weakSubjectivity.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bugs": {
|
|
12
12
|
"url": "https://github.com/ChainSafe/lodestar/issues"
|
|
13
13
|
},
|
|
14
|
-
"version": "1.
|
|
14
|
+
"version": "1.50.0-dev.1f38fe79fb",
|
|
15
15
|
"type": "module",
|
|
16
16
|
"exports": {
|
|
17
17
|
".": {
|
|
@@ -69,14 +69,14 @@
|
|
|
69
69
|
"@chainsafe/lodestar-z": "catalog:",
|
|
70
70
|
"@chainsafe/persistent-merkle-tree": "^1.3.1",
|
|
71
71
|
"@chainsafe/ssz": "^1.8.0",
|
|
72
|
-
"@lodestar/config": "^1.
|
|
73
|
-
"@lodestar/params": "^1.
|
|
74
|
-
"@lodestar/types": "^1.
|
|
75
|
-
"@lodestar/utils": "^1.
|
|
72
|
+
"@lodestar/config": "^1.50.0-dev.1f38fe79fb",
|
|
73
|
+
"@lodestar/params": "^1.50.0-dev.1f38fe79fb",
|
|
74
|
+
"@lodestar/types": "^1.50.0-dev.1f38fe79fb",
|
|
75
|
+
"@lodestar/utils": "^1.50.0-dev.1f38fe79fb",
|
|
76
76
|
"@vekexasia/bigint-buffer2": "^1.1.1"
|
|
77
77
|
},
|
|
78
78
|
"devDependencies": {
|
|
79
|
-
"@lodestar/test-utils": "^1.
|
|
79
|
+
"@lodestar/test-utils": "^1.50.0-dev.1f38fe79fb"
|
|
80
80
|
},
|
|
81
81
|
"keywords": [
|
|
82
82
|
"ethereum",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"beacon",
|
|
85
85
|
"blockchain"
|
|
86
86
|
],
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "9a33d9d331de55a20740f4d737b6751081d9d93c"
|
|
88
88
|
}
|
|
@@ -3,7 +3,9 @@ import {BeaconConfig} from "@lodestar/config";
|
|
|
3
3
|
import {
|
|
4
4
|
EFFECTIVE_BALANCE_INCREMENT,
|
|
5
5
|
ForkName,
|
|
6
|
+
ForkSeq,
|
|
6
7
|
INACTIVITY_PENALTY_QUOTIENT_ALTAIR,
|
|
8
|
+
INACTIVITY_PENALTY_QUOTIENT_BELLATRIX,
|
|
7
9
|
MAX_EFFECTIVE_BALANCE,
|
|
8
10
|
MAX_EFFECTIVE_BALANCE_ELECTRA,
|
|
9
11
|
PARTICIPATION_FLAG_WEIGHTS,
|
|
@@ -122,9 +124,8 @@ function computeIdealAttestationsRewardsAndPenaltiesAltair(
|
|
|
122
124
|
) {
|
|
123
125
|
const baseReward = effectiveBalanceByIncrement * baseRewardPerIncrement;
|
|
124
126
|
const rewardNumerator = baseReward * weight * unslashedStakeByIncrement;
|
|
125
|
-
|
|
126
|
-
const
|
|
127
|
-
const penalty = Math.round((baseReward * weight) / WEIGHT_DENOMINATOR); // Positive number indicates penalty
|
|
127
|
+
const idealReward = Math.floor(rewardNumerator / (activeBalanceByIncrement * WEIGHT_DENOMINATOR));
|
|
128
|
+
const penalty = Math.floor((baseReward * weight) / WEIGHT_DENOMINATOR); // Positive number indicates penalty
|
|
128
129
|
|
|
129
130
|
const idealAttestationsReward = idealRewards[effectiveBalanceByIncrement];
|
|
130
131
|
idealAttestationsReward[flagName] = isInInactivityLeak(state) ? 0 : idealReward; // No attestations rewards during inactivity leak
|
|
@@ -156,7 +157,11 @@ function computeTotalAttestationsRewardsAltair(
|
|
|
156
157
|
.map((id) => (typeof id === "number" ? id : pubkeyCache.getIndex(fromHex(id))))
|
|
157
158
|
.filter((index) => index !== undefined); // Validator indices to include in the result
|
|
158
159
|
|
|
159
|
-
const
|
|
160
|
+
const inactivityPenaltyQuotient =
|
|
161
|
+
config.getForkSeq(state.slot) === ForkSeq.altair
|
|
162
|
+
? INACTIVITY_PENALTY_QUOTIENT_ALTAIR
|
|
163
|
+
: INACTIVITY_PENALTY_QUOTIENT_BELLATRIX;
|
|
164
|
+
const inactivityPenaltyDenominator = config.INACTIVITY_SCORE_BIAS * inactivityPenaltyQuotient;
|
|
160
165
|
|
|
161
166
|
for (let i = 0; i < flags.length; i++) {
|
|
162
167
|
if (validatorIndices.length && !validatorIndices.includes(i)) {
|
|
@@ -104,6 +104,8 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
|
|
|
104
104
|
private _executionPayloadAvailability: BitArray | null = null;
|
|
105
105
|
private _latestExecutionPayloadBid: ExecutionPayloadBid | null = null;
|
|
106
106
|
private _payloadExpectedWithdrawals: capella.Withdrawal[] | null = null;
|
|
107
|
+
private _builderPendingPayments: gloas.BuilderPendingPayments | null = null;
|
|
108
|
+
private _builderPendingWithdrawals: gloas.BuilderPendingWithdrawals | null = null;
|
|
107
109
|
|
|
108
110
|
constructor(readonly cachedState: CachedBeaconStateAllForks) {
|
|
109
111
|
this.config = cachedState.config;
|
|
@@ -414,6 +416,30 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
|
|
|
414
416
|
return this._payloadExpectedWithdrawals;
|
|
415
417
|
}
|
|
416
418
|
|
|
419
|
+
get builderPendingPayments(): gloas.BuilderPendingPayments {
|
|
420
|
+
if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
|
|
421
|
+
throw new Error("Pending builder payments are not supported before Gloas");
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
if (this._builderPendingPayments === null) {
|
|
425
|
+
this._builderPendingPayments = (this.cachedState as CachedBeaconStateGloas).builderPendingPayments.toValue();
|
|
426
|
+
}
|
|
427
|
+
return this._builderPendingPayments;
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
get builderPendingWithdrawals(): gloas.BuilderPendingWithdrawals {
|
|
431
|
+
if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
|
|
432
|
+
throw new Error("Pending builder withdrawals are not supported before Gloas");
|
|
433
|
+
}
|
|
434
|
+
|
|
435
|
+
if (this._builderPendingWithdrawals === null) {
|
|
436
|
+
this._builderPendingWithdrawals = (
|
|
437
|
+
this.cachedState as CachedBeaconStateGloas
|
|
438
|
+
).builderPendingWithdrawals.toValue();
|
|
439
|
+
}
|
|
440
|
+
return this._builderPendingWithdrawals;
|
|
441
|
+
}
|
|
442
|
+
|
|
417
443
|
getBuilder(index: BuilderIndex): gloas.Builder {
|
|
418
444
|
if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
|
|
419
445
|
throw new Error("Builders are not supported before Gloas");
|
|
@@ -277,6 +277,8 @@ export interface IBeaconStateViewGloas extends IBeaconStateViewFulu {
|
|
|
277
277
|
executionPayloadAvailability: BitArray;
|
|
278
278
|
latestExecutionPayloadBid: ExecutionPayloadBid;
|
|
279
279
|
payloadExpectedWithdrawals: capella.Withdrawal[];
|
|
280
|
+
builderPendingPayments: gloas.BuilderPendingPayments;
|
|
281
|
+
builderPendingWithdrawals: gloas.BuilderPendingWithdrawals;
|
|
280
282
|
getBuilder(index: BuilderIndex): gloas.Builder;
|
|
281
283
|
getBuildersLength(): number;
|
|
282
284
|
canBuilderCoverBid(builderIndex: BuilderIndex, bidAmount: number): boolean;
|
|
@@ -118,6 +118,8 @@ export class NativeBeaconStateView implements IBeaconStateViewLatestFork {
|
|
|
118
118
|
private _latestBlockHash: Bytes32 | null = null;
|
|
119
119
|
private _latestExecutionPayloadBid: ExecutionPayloadBid | null = null;
|
|
120
120
|
private _payloadExpectedWithdrawals: capella.Withdrawal[] | null = null;
|
|
121
|
+
private _builderPendingPayments: gloas.BuilderPendingPayments | null = null;
|
|
122
|
+
private _builderPendingWithdrawals: gloas.BuilderPendingWithdrawals | null = null;
|
|
121
123
|
|
|
122
124
|
// Per-argument caches for argument-taking methods. The binding is treated as
|
|
123
125
|
// immutable for the view's lifetime, so a given argument always yields the
|
|
@@ -892,6 +894,20 @@ export class NativeBeaconStateView implements IBeaconStateViewLatestFork {
|
|
|
892
894
|
return this._payloadExpectedWithdrawals;
|
|
893
895
|
}
|
|
894
896
|
|
|
897
|
+
get builderPendingPayments(): gloas.BuilderPendingPayments {
|
|
898
|
+
if (this._builderPendingPayments === null) {
|
|
899
|
+
this._builderPendingPayments = this.binding.builderPendingPayments;
|
|
900
|
+
}
|
|
901
|
+
return this._builderPendingPayments;
|
|
902
|
+
}
|
|
903
|
+
|
|
904
|
+
get builderPendingWithdrawals(): gloas.BuilderPendingWithdrawals {
|
|
905
|
+
if (this._builderPendingWithdrawals === null) {
|
|
906
|
+
this._builderPendingWithdrawals = this.binding.builderPendingWithdrawals;
|
|
907
|
+
}
|
|
908
|
+
return this._builderPendingWithdrawals;
|
|
909
|
+
}
|
|
910
|
+
|
|
895
911
|
getBuilder(index: BuilderIndex): gloas.Builder {
|
|
896
912
|
let cached = this._getBuilder.get(index);
|
|
897
913
|
if (cached === undefined) {
|
|
@@ -1,40 +1,33 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {pubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
|
|
2
2
|
import {BeaconConfig} from "@lodestar/config";
|
|
3
3
|
import {createCachedBeaconState} from "../cache/stateCache.js";
|
|
4
|
-
import {BeaconStateAllForks} from "../cache/types.js";
|
|
5
4
|
import {getStateTypeFromBytes} from "../util/sszBytes.js";
|
|
6
5
|
import {BeaconStateView} from "./beaconStateView.js";
|
|
7
6
|
import {IBeaconStateView} from "./interface.js";
|
|
8
7
|
|
|
9
8
|
// ---- createBeaconStateView (startup path) ----
|
|
10
9
|
|
|
11
|
-
type
|
|
12
|
-
useNative:
|
|
13
|
-
anchorState: BeaconStateAllForks;
|
|
10
|
+
type CreateBeaconStateViewOpts = {
|
|
11
|
+
useNative: boolean;
|
|
14
12
|
config: BeaconConfig;
|
|
15
|
-
pubkeyCache: PubkeyCache;
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
type NativeOpts = {
|
|
19
|
-
useNative: true;
|
|
20
13
|
stateBytes: Uint8Array;
|
|
21
14
|
};
|
|
22
15
|
|
|
23
16
|
/**
|
|
24
|
-
* Create a BeaconStateView from
|
|
17
|
+
* Create a BeaconStateView from raw SSZ bytes. Used at node startup.
|
|
25
18
|
*
|
|
26
|
-
*
|
|
27
|
-
* passed separately to BeaconNode.init, so it must live outside this factory).
|
|
19
|
+
* Caller must reserve pubkey capacity before calling this function.
|
|
28
20
|
*
|
|
29
21
|
* Set `useNative: true` to use the native (Zig) implementation once available.
|
|
30
22
|
*/
|
|
31
|
-
export function createBeaconStateView(opts:
|
|
23
|
+
export function createBeaconStateView(opts: CreateBeaconStateViewOpts): IBeaconStateView {
|
|
32
24
|
if (opts.useNative) {
|
|
33
25
|
throw new Error("Native (Zig) BeaconStateView not yet implemented");
|
|
34
26
|
// TODO: return a new instance of NativeBeaconStateView
|
|
35
27
|
}
|
|
36
|
-
const {
|
|
37
|
-
const
|
|
28
|
+
const {config, stateBytes} = opts;
|
|
29
|
+
const state = getStateTypeFromBytes(config, stateBytes).deserializeToViewDU(stateBytes);
|
|
30
|
+
const cachedState = createCachedBeaconState(state, {config, pubkeyCache}, {skipSyncPubkeys: false});
|
|
38
31
|
return new BeaconStateView(cachedState);
|
|
39
32
|
}
|
|
40
33
|
|
package/src/util/index.ts
CHANGED
|
@@ -28,6 +28,11 @@ export * from "./signatureSets.js";
|
|
|
28
28
|
export * from "./signingRoot.js";
|
|
29
29
|
export * from "./slot.js";
|
|
30
30
|
export * from "./ssz.js";
|
|
31
|
+
export {
|
|
32
|
+
type StateBytesMetadata,
|
|
33
|
+
getValidatorCountFromStateBytes,
|
|
34
|
+
readBeaconStateBytesMetadata,
|
|
35
|
+
} from "./sszBytes.js";
|
|
31
36
|
export * from "./syncCommittee.js";
|
|
32
37
|
export * from "./validator.js";
|
|
33
38
|
export * from "./weakSubjectivity.js";
|