@lodestar/state-transition 1.39.0 → 1.40.0-dev.3715a82f3f
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/index.d.ts +1 -0
- package/lib/block/index.d.ts.map +1 -1
- package/lib/block/index.js +1 -0
- package/lib/block/index.js.map +1 -1
- package/lib/block/isValidIndexedAttestation.d.ts +4 -5
- package/lib/block/isValidIndexedAttestation.d.ts.map +1 -1
- package/lib/block/isValidIndexedAttestation.js +9 -10
- package/lib/block/isValidIndexedAttestation.js.map +1 -1
- package/lib/block/processAttestationPhase0.d.ts.map +1 -1
- package/lib/block/processAttestationPhase0.js +1 -1
- package/lib/block/processAttestationPhase0.js.map +1 -1
- package/lib/block/processAttesterSlashing.d.ts +3 -2
- package/lib/block/processAttesterSlashing.d.ts.map +1 -1
- package/lib/block/processAttesterSlashing.js +3 -3
- package/lib/block/processAttesterSlashing.js.map +1 -1
- package/lib/block/processBlsToExecutionChange.d.ts +3 -1
- package/lib/block/processBlsToExecutionChange.d.ts.map +1 -1
- package/lib/block/processBlsToExecutionChange.js +7 -11
- package/lib/block/processBlsToExecutionChange.js.map +1 -1
- package/lib/block/processDepositRequest.d.ts +8 -2
- package/lib/block/processDepositRequest.d.ts.map +1 -1
- package/lib/block/processDepositRequest.js +81 -8
- package/lib/block/processDepositRequest.js.map +1 -1
- package/lib/block/processExecutionPayloadBid.d.ts.map +1 -1
- package/lib/block/processExecutionPayloadBid.js +14 -27
- package/lib/block/processExecutionPayloadBid.js.map +1 -1
- package/lib/block/processExecutionPayloadEnvelope.d.ts.map +1 -1
- package/lib/block/processExecutionPayloadEnvelope.js +25 -24
- package/lib/block/processExecutionPayloadEnvelope.js.map +1 -1
- package/lib/block/processOperations.js +1 -1
- package/lib/block/processOperations.js.map +1 -1
- package/lib/block/processProposerSlashing.d.ts +5 -2
- package/lib/block/processProposerSlashing.d.ts.map +1 -1
- package/lib/block/processProposerSlashing.js +7 -5
- package/lib/block/processProposerSlashing.js.map +1 -1
- package/lib/block/processVoluntaryExit.d.ts +1 -1
- package/lib/block/processVoluntaryExit.d.ts.map +1 -1
- package/lib/block/processVoluntaryExit.js +44 -2
- package/lib/block/processVoluntaryExit.js.map +1 -1
- package/lib/block/processWithdrawals.d.ts +1 -0
- package/lib/block/processWithdrawals.d.ts.map +1 -1
- package/lib/block/processWithdrawals.js +121 -66
- package/lib/block/processWithdrawals.js.map +1 -1
- package/lib/cache/epochCache.d.ts +8 -28
- package/lib/cache/epochCache.d.ts.map +1 -1
- package/lib/cache/epochCache.js +40 -180
- package/lib/cache/epochCache.js.map +1 -1
- package/lib/cache/epochTransitionCache.d.ts +5 -12
- package/lib/cache/epochTransitionCache.d.ts.map +1 -1
- package/lib/cache/epochTransitionCache.js +4 -14
- package/lib/cache/epochTransitionCache.js.map +1 -1
- package/lib/cache/stateCache.d.ts.map +1 -1
- package/lib/cache/stateCache.js +1 -2
- package/lib/cache/stateCache.js.map +1 -1
- package/lib/epoch/processBuilderPendingPayments.d.ts.map +1 -1
- package/lib/epoch/processBuilderPendingPayments.js +1 -4
- package/lib/epoch/processBuilderPendingPayments.js.map +1 -1
- package/lib/epoch/processProposerLookahead.d.ts.map +1 -1
- package/lib/epoch/processProposerLookahead.js +3 -6
- package/lib/epoch/processProposerLookahead.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/rewards/blockRewards.d.ts +2 -1
- package/lib/rewards/blockRewards.d.ts.map +1 -1
- package/lib/rewards/blockRewards.js +3 -2
- package/lib/rewards/blockRewards.js.map +1 -1
- package/lib/rewards/syncCommitteeRewards.d.ts.map +1 -1
- package/lib/rewards/syncCommitteeRewards.js +10 -11
- package/lib/rewards/syncCommitteeRewards.js.map +1 -1
- package/lib/signatureSets/blsToExecutionChange.d.ts +1 -2
- package/lib/signatureSets/blsToExecutionChange.d.ts.map +1 -1
- package/lib/signatureSets/blsToExecutionChange.js +2 -2
- package/lib/signatureSets/blsToExecutionChange.js.map +1 -1
- package/lib/types.d.ts +1 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/util/electra.d.ts.map +1 -1
- package/lib/util/electra.js +1 -2
- package/lib/util/electra.js.map +1 -1
- package/lib/util/epochShuffling.d.ts +1 -34
- package/lib/util/epochShuffling.d.ts.map +1 -1
- package/lib/util/epochShuffling.js +1 -1
- package/lib/util/epochShuffling.js.map +1 -1
- package/lib/util/gloas.d.ts +43 -3
- package/lib/util/gloas.d.ts.map +1 -1
- package/lib/util/gloas.js +93 -5
- package/lib/util/gloas.js.map +1 -1
- package/lib/util/index.d.ts +1 -2
- package/lib/util/index.d.ts.map +1 -1
- package/lib/util/index.js +1 -2
- package/lib/util/index.js.map +1 -1
- package/lib/util/shuffling.d.ts +58 -0
- package/lib/util/shuffling.d.ts.map +1 -0
- package/lib/util/shuffling.js +175 -0
- package/lib/util/shuffling.js.map +1 -0
- package/lib/util/validator.d.ts +5 -0
- package/lib/util/validator.d.ts.map +1 -1
- package/lib/util/validator.js +25 -2
- package/lib/util/validator.js.map +1 -1
- package/package.json +7 -7
- package/src/block/index.ts +1 -0
- package/src/block/isValidIndexedAttestation.ts +17 -12
- package/src/block/processAttestationPhase0.ts +2 -1
- package/src/block/processAttesterSlashing.ts +16 -4
- package/src/block/processBlsToExecutionChange.ts +13 -14
- package/src/block/processDepositRequest.ts +101 -8
- package/src/block/processExecutionPayloadBid.ts +18 -40
- package/src/block/processExecutionPayloadEnvelope.ts +33 -29
- package/src/block/processOperations.ts +1 -1
- package/src/block/processProposerSlashing.ts +21 -11
- package/src/block/processVoluntaryExit.ts +59 -4
- package/src/block/processWithdrawals.ts +168 -70
- package/src/cache/epochCache.ts +52 -214
- package/src/cache/epochTransitionCache.ts +9 -34
- package/src/cache/stateCache.ts +1 -2
- package/src/epoch/processBuilderPendingPayments.ts +1 -5
- package/src/epoch/processProposerLookahead.ts +3 -7
- package/src/index.ts +0 -2
- package/src/rewards/blockRewards.ts +6 -3
- package/src/rewards/syncCommitteeRewards.ts +10 -13
- package/src/signatureSets/blsToExecutionChange.ts +2 -3
- package/src/types.ts +1 -0
- package/src/util/electra.ts +1 -4
- package/src/util/epochShuffling.ts +2 -43
- package/src/util/gloas.ts +109 -8
- package/src/util/index.ts +1 -2
- package/src/util/shuffling.ts +234 -0
- package/src/util/validator.ts +31 -1
- package/lib/util/calculateCommitteeAssignments.d.ts +0 -12
- package/lib/util/calculateCommitteeAssignments.d.ts.map +0 -1
- package/lib/util/calculateCommitteeAssignments.js +0 -26
- package/lib/util/calculateCommitteeAssignments.js.map +0 -1
- package/lib/util/shufflingDecisionRoot.d.ts +0 -20
- package/lib/util/shufflingDecisionRoot.d.ts.map +0 -1
- package/lib/util/shufflingDecisionRoot.js +0 -76
- package/lib/util/shufflingDecisionRoot.js.map +0 -1
- package/src/util/calculateCommitteeAssignments.ts +0 -43
- package/src/util/shufflingDecisionRoot.ts +0 -81
|
@@ -1,21 +1,114 @@
|
|
|
1
|
-
import {UNSET_DEPOSIT_REQUESTS_START_INDEX} from "@lodestar/params";
|
|
2
|
-
import {electra, ssz} from "@lodestar/types";
|
|
1
|
+
import {FAR_FUTURE_EPOCH, ForkSeq, UNSET_DEPOSIT_REQUESTS_START_INDEX} from "@lodestar/params";
|
|
2
|
+
import {BLSPubkey, Bytes32, UintNum64, electra, ssz} from "@lodestar/types";
|
|
3
3
|
import {CachedBeaconStateElectra, CachedBeaconStateGloas} from "../types.js";
|
|
4
|
+
import {findBuilderIndexByPubkey, isBuilderWithdrawalCredential} from "../util/gloas.js";
|
|
5
|
+
import {computeEpochAtSlot, isValidatorKnown} from "../util/index.js";
|
|
6
|
+
import {isValidDepositSignature} from "./processDeposit.js";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Apply a deposit for a builder. Either increases balance for existing builder or adds new builder to registry.
|
|
10
|
+
* Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-apply_deposit_for_builder
|
|
11
|
+
*/
|
|
12
|
+
export function applyDepositForBuilder(
|
|
13
|
+
state: CachedBeaconStateGloas,
|
|
14
|
+
pubkey: BLSPubkey,
|
|
15
|
+
withdrawalCredentials: Bytes32,
|
|
16
|
+
amount: UintNum64,
|
|
17
|
+
signature: Bytes32
|
|
18
|
+
): void {
|
|
19
|
+
const builderIndex = findBuilderIndexByPubkey(state, pubkey);
|
|
20
|
+
|
|
21
|
+
if (builderIndex !== null) {
|
|
22
|
+
// Existing builder - increase balance
|
|
23
|
+
const builder = state.builders.get(builderIndex);
|
|
24
|
+
builder.balance += amount;
|
|
25
|
+
} else {
|
|
26
|
+
// New builder - verify signature and add to registry
|
|
27
|
+
if (isValidDepositSignature(state.config, pubkey, withdrawalCredentials, amount, signature)) {
|
|
28
|
+
addBuilderToRegistry(state, pubkey, withdrawalCredentials, amount);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* Add a new builder to the builders registry.
|
|
35
|
+
* Reuses slots from exited and fully withdrawn builders if available.
|
|
36
|
+
*/
|
|
37
|
+
function addBuilderToRegistry(
|
|
38
|
+
state: CachedBeaconStateGloas,
|
|
39
|
+
pubkey: BLSPubkey,
|
|
40
|
+
withdrawalCredentials: Bytes32,
|
|
41
|
+
amount: UintNum64
|
|
42
|
+
): void {
|
|
43
|
+
const currentEpoch = computeEpochAtSlot(state.slot);
|
|
44
|
+
|
|
45
|
+
// Try to find a reusable slot from an exited builder with zero balance
|
|
46
|
+
let builderIndex = state.builders.length;
|
|
47
|
+
for (let i = 0; i < state.builders.length; i++) {
|
|
48
|
+
const builder = state.builders.getReadonly(i);
|
|
49
|
+
if (builder.withdrawableEpoch <= currentEpoch && builder.balance === 0) {
|
|
50
|
+
builderIndex = i;
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// Create new builder
|
|
56
|
+
const newBuilder = ssz.gloas.Builder.toViewDU({
|
|
57
|
+
pubkey,
|
|
58
|
+
version: withdrawalCredentials[0],
|
|
59
|
+
executionAddress: withdrawalCredentials.subarray(12),
|
|
60
|
+
balance: amount,
|
|
61
|
+
depositEpoch: currentEpoch,
|
|
62
|
+
withdrawableEpoch: FAR_FUTURE_EPOCH,
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
if (builderIndex < state.builders.length) {
|
|
66
|
+
// Reuse existing slot
|
|
67
|
+
state.builders.set(builderIndex, newBuilder);
|
|
68
|
+
} else {
|
|
69
|
+
// Append to end
|
|
70
|
+
state.builders.push(newBuilder);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
4
73
|
|
|
5
74
|
export function processDepositRequest(
|
|
75
|
+
fork: ForkSeq,
|
|
6
76
|
state: CachedBeaconStateElectra | CachedBeaconStateGloas,
|
|
7
77
|
depositRequest: electra.DepositRequest
|
|
8
78
|
): void {
|
|
9
|
-
|
|
79
|
+
const {pubkey, withdrawalCredentials, amount, signature} = depositRequest;
|
|
80
|
+
|
|
81
|
+
// Check if this is a builder or validator deposit
|
|
82
|
+
if (fork >= ForkSeq.gloas) {
|
|
83
|
+
const stateGloas = state as CachedBeaconStateGloas;
|
|
84
|
+
const builderIndex = findBuilderIndexByPubkey(stateGloas, pubkey);
|
|
85
|
+
const validatorIndex = state.epochCtx.getValidatorIndex(pubkey);
|
|
86
|
+
|
|
87
|
+
// Regardless of the withdrawal credentials prefix, if a builder/validator
|
|
88
|
+
// already exists with this pubkey, apply the deposit to their balance
|
|
89
|
+
const isBuilder = builderIndex !== null;
|
|
90
|
+
const isValidator = isValidatorKnown(state, validatorIndex);
|
|
91
|
+
const isBuilderPrefix = isBuilderWithdrawalCredential(withdrawalCredentials);
|
|
92
|
+
|
|
93
|
+
// Route to builder if it's an existing builder OR has builder prefix and is not a validator
|
|
94
|
+
if (isBuilder || (isBuilderPrefix && !isValidator)) {
|
|
95
|
+
// Apply builder deposits immediately
|
|
96
|
+
applyDepositForBuilder(stateGloas, pubkey, withdrawalCredentials, amount, signature);
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
// Only set deposit_requests_start_index in Electra fork, not Gloas
|
|
102
|
+
if (fork < ForkSeq.gloas && state.depositRequestsStartIndex === UNSET_DEPOSIT_REQUESTS_START_INDEX) {
|
|
10
103
|
state.depositRequestsStartIndex = depositRequest.index;
|
|
11
104
|
}
|
|
12
105
|
|
|
13
|
-
//
|
|
106
|
+
// Add validator deposits to the queue
|
|
14
107
|
const pendingDeposit = ssz.electra.PendingDeposit.toViewDU({
|
|
15
|
-
pubkey
|
|
16
|
-
withdrawalCredentials
|
|
17
|
-
amount
|
|
18
|
-
signature
|
|
108
|
+
pubkey,
|
|
109
|
+
withdrawalCredentials,
|
|
110
|
+
amount,
|
|
111
|
+
signature,
|
|
19
112
|
slot: state.slot,
|
|
20
113
|
});
|
|
21
114
|
state.pendingDeposits.push(pendingDeposit);
|
|
@@ -1,68 +1,47 @@
|
|
|
1
1
|
import {PublicKey, Signature, verify} from "@chainsafe/blst";
|
|
2
2
|
import {byteArrayEquals} from "@chainsafe/ssz";
|
|
3
|
-
import {
|
|
4
|
-
DOMAIN_BEACON_BUILDER,
|
|
5
|
-
FAR_FUTURE_EPOCH,
|
|
6
|
-
ForkPostGloas,
|
|
7
|
-
MIN_ACTIVATION_BALANCE,
|
|
8
|
-
SLOTS_PER_EPOCH,
|
|
9
|
-
} from "@lodestar/params";
|
|
3
|
+
import {BUILDER_INDEX_SELF_BUILD, DOMAIN_BEACON_BUILDER, ForkPostGloas, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
10
4
|
import {BeaconBlock, gloas, ssz} from "@lodestar/types";
|
|
11
5
|
import {toHex, toRootHex} from "@lodestar/utils";
|
|
12
6
|
import {G2_POINT_AT_INFINITY} from "../constants/constants.ts";
|
|
13
7
|
import {CachedBeaconStateGloas} from "../types.ts";
|
|
14
|
-
import {
|
|
15
|
-
import {computeSigningRoot, getCurrentEpoch, getRandaoMix
|
|
8
|
+
import {canBuilderCoverBid, isActiveBuilder} from "../util/gloas.ts";
|
|
9
|
+
import {computeSigningRoot, getCurrentEpoch, getRandaoMix} from "../util/index.ts";
|
|
16
10
|
|
|
17
11
|
export function processExecutionPayloadBid(state: CachedBeaconStateGloas, block: BeaconBlock<ForkPostGloas>): void {
|
|
18
12
|
const signedBid = block.body.signedExecutionPayloadBid;
|
|
19
13
|
const bid = signedBid.message;
|
|
20
14
|
const {builderIndex, value: amount} = bid;
|
|
21
|
-
const builder = state.validators.getReadonly(builderIndex);
|
|
22
15
|
|
|
23
16
|
// For self-builds, amount must be zero regardless of withdrawal credential prefix
|
|
24
|
-
if (builderIndex ===
|
|
17
|
+
if (builderIndex === BUILDER_INDEX_SELF_BUILD) {
|
|
25
18
|
if (amount !== 0) {
|
|
26
19
|
throw Error(`Invalid execution payload bid: self-build with non-zero amount ${amount}`);
|
|
27
20
|
}
|
|
28
21
|
if (!byteArrayEquals(signedBid.signature, G2_POINT_AT_INFINITY)) {
|
|
29
22
|
throw Error("Invalid execution payload bid: self-build with non-zero signature");
|
|
30
23
|
}
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
24
|
+
}
|
|
25
|
+
// Non-self builds require active builder with valid signature
|
|
26
|
+
else {
|
|
27
|
+
const builder = state.builders.getReadonly(builderIndex);
|
|
28
|
+
|
|
29
|
+
// Verify that the builder is active
|
|
30
|
+
if (!isActiveBuilder(state, builderIndex)) {
|
|
31
|
+
throw Error(`Invalid execution payload bid: builder ${builderIndex} is not active`);
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
// Verify that the builder has funds to cover the bid
|
|
35
|
+
if (!canBuilderCoverBid(state, builderIndex, amount)) {
|
|
36
|
+
throw Error(`Invalid execution payload bid: builder ${builderIndex} has insufficient balance`);
|
|
35
37
|
}
|
|
36
38
|
|
|
39
|
+
// Verify that the bid signature is valid
|
|
37
40
|
if (!verifyExecutionPayloadBidSignature(state, builder.pubkey, signedBid)) {
|
|
38
41
|
throw Error(`Invalid execution payload bid: invalid signature for builder ${builderIndex}`);
|
|
39
42
|
}
|
|
40
43
|
}
|
|
41
44
|
|
|
42
|
-
if (!isActiveValidator(builder, getCurrentEpoch(state))) {
|
|
43
|
-
throw Error(`Invalid execution payload bid: builder ${builderIndex} is not active`);
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
if (builder.slashed) {
|
|
47
|
-
throw Error(`Invalid execution payload bid: builder ${builderIndex} is slashed`);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
const pendingPayments = state.builderPendingPayments
|
|
51
|
-
.getAllReadonly()
|
|
52
|
-
.filter((payment) => payment.withdrawal.builderIndex === builderIndex)
|
|
53
|
-
.reduce((acc, payment) => acc + payment.withdrawal.amount, 0);
|
|
54
|
-
const pendingWithdrawals = state.builderPendingWithdrawals
|
|
55
|
-
.getAllReadonly()
|
|
56
|
-
.filter((withdrawal) => withdrawal.builderIndex === builderIndex)
|
|
57
|
-
.reduce((acc, withdrawal) => acc + withdrawal.amount, 0);
|
|
58
|
-
|
|
59
|
-
if (
|
|
60
|
-
amount !== 0 &&
|
|
61
|
-
state.balances.get(builderIndex) < amount + pendingPayments + pendingWithdrawals + MIN_ACTIVATION_BALANCE
|
|
62
|
-
) {
|
|
63
|
-
throw Error("Insufficient builder balance");
|
|
64
|
-
}
|
|
65
|
-
|
|
66
45
|
if (bid.slot !== block.slot) {
|
|
67
46
|
throw Error(`Bid slot ${bid.slot} does not match block slot ${block.slot}`);
|
|
68
47
|
}
|
|
@@ -91,7 +70,6 @@ export function processExecutionPayloadBid(state: CachedBeaconStateGloas, block:
|
|
|
91
70
|
feeRecipient: bid.feeRecipient,
|
|
92
71
|
amount,
|
|
93
72
|
builderIndex,
|
|
94
|
-
withdrawableEpoch: FAR_FUTURE_EPOCH,
|
|
95
73
|
}),
|
|
96
74
|
});
|
|
97
75
|
|
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import {PublicKey, Signature, verify} from "@chainsafe/blst";
|
|
2
2
|
import {byteArrayEquals} from "@chainsafe/ssz";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
BUILDER_INDEX_SELF_BUILD,
|
|
5
|
+
DOMAIN_BEACON_BUILDER,
|
|
6
|
+
SLOTS_PER_EPOCH,
|
|
7
|
+
SLOTS_PER_HISTORICAL_ROOT,
|
|
8
|
+
} from "@lodestar/params";
|
|
4
9
|
import {gloas, ssz} from "@lodestar/types";
|
|
5
10
|
import {toHex, toRootHex} from "@lodestar/utils";
|
|
6
11
|
import {CachedBeaconStateGloas} from "../types.ts";
|
|
7
|
-
import {
|
|
12
|
+
import {computeSigningRoot, computeTimeAtSlot} from "../util/index.ts";
|
|
8
13
|
import {processConsolidationRequest} from "./processConsolidationRequest.ts";
|
|
9
14
|
import {processDepositRequest} from "./processDepositRequest.ts";
|
|
10
15
|
import {processWithdrawalRequest} from "./processWithdrawalRequest.ts";
|
|
@@ -19,13 +24,8 @@ export function processExecutionPayloadEnvelope(
|
|
|
19
24
|
const payload = envelope.payload;
|
|
20
25
|
const fork = state.config.getForkSeq(envelope.slot);
|
|
21
26
|
|
|
22
|
-
if (verify) {
|
|
23
|
-
|
|
24
|
-
const pubkey = state.validators.getReadonly(builderIndex).pubkey;
|
|
25
|
-
|
|
26
|
-
if (!verifyExecutionPayloadEnvelopeSignature(state, pubkey, signedEnvelope)) {
|
|
27
|
-
throw new Error("Payload Envelope has invalid signature");
|
|
28
|
-
}
|
|
27
|
+
if (verify && !verifyExecutionPayloadEnvelopeSignature(state, signedEnvelope)) {
|
|
28
|
+
throw Error(`Execution payload envelope has invalid signature builderIndex=${envelope.builderIndex}`);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
validateExecutionPayloadEnvelope(state, envelope);
|
|
@@ -33,7 +33,7 @@ export function processExecutionPayloadEnvelope(
|
|
|
33
33
|
const requests = envelope.executionRequests;
|
|
34
34
|
|
|
35
35
|
for (const deposit of requests.deposits) {
|
|
36
|
-
processDepositRequest(state, deposit);
|
|
36
|
+
processDepositRequest(fork, state, deposit);
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
for (const withdrawal of requests.withdrawals) {
|
|
@@ -50,9 +50,6 @@ export function processExecutionPayloadEnvelope(
|
|
|
50
50
|
const amount = payment.withdrawal.amount;
|
|
51
51
|
|
|
52
52
|
if (amount > 0) {
|
|
53
|
-
const exitQueueEpoch = computeExitEpochAndUpdateChurn(state, BigInt(amount));
|
|
54
|
-
|
|
55
|
-
payment.withdrawal.withdrawableEpoch = exitQueueEpoch + state.config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY;
|
|
56
53
|
state.builderPendingWithdrawals.push(payment.withdrawal);
|
|
57
54
|
}
|
|
58
55
|
|
|
@@ -75,6 +72,7 @@ function validateExecutionPayloadEnvelope(
|
|
|
75
72
|
): void {
|
|
76
73
|
const payload = envelope.payload;
|
|
77
74
|
|
|
75
|
+
// Cache latest block header state root
|
|
78
76
|
if (byteArrayEquals(state.latestBlockHeader.stateRoot, ssz.Root.defaultValue())) {
|
|
79
77
|
const previousStateRoot = state.hashTreeRoot();
|
|
80
78
|
state.latestBlockHeader.stateRoot = previousStateRoot;
|
|
@@ -87,20 +85,18 @@ function validateExecutionPayloadEnvelope(
|
|
|
87
85
|
);
|
|
88
86
|
}
|
|
89
87
|
|
|
90
|
-
// Verify consistency with the beacon block
|
|
91
88
|
if (envelope.slot !== state.slot) {
|
|
92
89
|
throw new Error(`Slot mismatch between envelope and state envelope=${envelope.slot} state=${state.slot}`);
|
|
93
90
|
}
|
|
94
91
|
|
|
95
|
-
const committedBid = state.latestExecutionPayloadBid;
|
|
96
92
|
// Verify consistency with the committed bid
|
|
93
|
+
const committedBid = state.latestExecutionPayloadBid;
|
|
97
94
|
if (envelope.builderIndex !== committedBid.builderIndex) {
|
|
98
95
|
throw new Error(
|
|
99
96
|
`Builder index mismatch between envelope and committed bid envelope=${envelope.builderIndex} committedBid=${committedBid.builderIndex}`
|
|
100
97
|
);
|
|
101
98
|
}
|
|
102
99
|
|
|
103
|
-
// Verify consistency with the committed bid
|
|
104
100
|
const envelopeKzgRoot = ssz.deneb.BlobKzgCommitments.hashTreeRoot(envelope.blobKzgCommitments);
|
|
105
101
|
if (!byteArrayEquals(committedBid.blobKzgCommitmentsRoot, envelopeKzgRoot)) {
|
|
106
102
|
throw new Error(
|
|
@@ -108,11 +104,18 @@ function validateExecutionPayloadEnvelope(
|
|
|
108
104
|
);
|
|
109
105
|
}
|
|
110
106
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
107
|
+
if (!byteArrayEquals(committedBid.prevRandao, payload.prevRandao)) {
|
|
108
|
+
throw new Error(
|
|
109
|
+
`Prev randao mismatch between committed bid and payload committedBid=${toHex(committedBid.prevRandao)} payload=${toHex(payload.prevRandao)}`
|
|
110
|
+
);
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
// Verify consistency with expected withdrawals
|
|
114
|
+
const payloadWithdrawalsRoot = ssz.capella.Withdrawals.hashTreeRoot(payload.withdrawals);
|
|
115
|
+
const expectedWithdrawalsRoot = state.payloadExpectedWithdrawals.hashTreeRoot();
|
|
116
|
+
if (!byteArrayEquals(payloadWithdrawalsRoot, expectedWithdrawalsRoot)) {
|
|
114
117
|
throw new Error(
|
|
115
|
-
`Withdrawals
|
|
118
|
+
`Withdrawals mismatch between payload and expected withdrawals payload=${toRootHex(payloadWithdrawalsRoot)} expected=${toRootHex(expectedWithdrawalsRoot)}`
|
|
116
119
|
);
|
|
117
120
|
}
|
|
118
121
|
|
|
@@ -137,13 +140,6 @@ function validateExecutionPayloadEnvelope(
|
|
|
137
140
|
);
|
|
138
141
|
}
|
|
139
142
|
|
|
140
|
-
// Verify prev_randao matches committed bid
|
|
141
|
-
if (!byteArrayEquals(committedBid.prevRandao, payload.prevRandao)) {
|
|
142
|
-
throw new Error(
|
|
143
|
-
`Prev randao mismatch between committed bid and payload committedBid=${toHex(committedBid.prevRandao)} payload=${toHex(payload.prevRandao)}`
|
|
144
|
-
);
|
|
145
|
-
}
|
|
146
|
-
|
|
147
143
|
// Verify timestamp
|
|
148
144
|
if (payload.timestamp !== computeTimeAtSlot(state.config, state.slot, state.genesisTime)) {
|
|
149
145
|
throw new Error(
|
|
@@ -164,14 +160,22 @@ function validateExecutionPayloadEnvelope(
|
|
|
164
160
|
|
|
165
161
|
function verifyExecutionPayloadEnvelopeSignature(
|
|
166
162
|
state: CachedBeaconStateGloas,
|
|
167
|
-
pubkey: Uint8Array,
|
|
168
163
|
signedEnvelope: gloas.SignedExecutionPayloadEnvelope
|
|
169
164
|
): boolean {
|
|
165
|
+
const builderIndex = signedEnvelope.message.builderIndex;
|
|
166
|
+
|
|
170
167
|
const domain = state.config.getDomain(state.slot, DOMAIN_BEACON_BUILDER);
|
|
171
168
|
const signingRoot = computeSigningRoot(ssz.gloas.ExecutionPayloadEnvelope, signedEnvelope.message, domain);
|
|
172
169
|
|
|
173
170
|
try {
|
|
174
|
-
|
|
171
|
+
let publicKey: PublicKey;
|
|
172
|
+
|
|
173
|
+
if (builderIndex === BUILDER_INDEX_SELF_BUILD) {
|
|
174
|
+
const validatorIndex = state.latestBlockHeader.proposerIndex;
|
|
175
|
+
publicKey = state.epochCtx.index2pubkey[validatorIndex];
|
|
176
|
+
} else {
|
|
177
|
+
publicKey = PublicKey.fromBytes(state.builders.getReadonly(builderIndex).pubkey);
|
|
178
|
+
}
|
|
175
179
|
const signature = Signature.fromBytes(signedEnvelope.signature, true);
|
|
176
180
|
|
|
177
181
|
return verify(signingRoot, publicKey, signature);
|
|
@@ -75,7 +75,7 @@ export function processOperations(
|
|
|
75
75
|
const bodyElectra = body as electra.BeaconBlockBody;
|
|
76
76
|
|
|
77
77
|
for (const depositRequest of bodyElectra.executionRequests.deposits) {
|
|
78
|
-
processDepositRequest(stateElectra, depositRequest);
|
|
78
|
+
processDepositRequest(fork, stateElectra, depositRequest);
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
for (const elWithdrawalRequest of bodyElectra.executionRequests.withdrawals) {
|
|
@@ -1,5 +1,8 @@
|
|
|
1
|
+
import {BeaconConfig} from "@lodestar/config";
|
|
1
2
|
import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
|
|
2
|
-
import {phase0, ssz} from "@lodestar/types";
|
|
3
|
+
import {Slot, phase0, ssz} from "@lodestar/types";
|
|
4
|
+
import {Validator} from "@lodestar/types/phase0";
|
|
5
|
+
import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
|
|
3
6
|
import {getProposerSlashingSignatureSets} from "../signatureSets/index.js";
|
|
4
7
|
import {CachedBeaconStateAllForks, CachedBeaconStateGloas} from "../types.js";
|
|
5
8
|
import {computeEpochAtSlot, isSlashableValidator} from "../util/index.js";
|
|
@@ -18,7 +21,15 @@ export function processProposerSlashing(
|
|
|
18
21
|
proposerSlashing: phase0.ProposerSlashing,
|
|
19
22
|
verifySignatures = true
|
|
20
23
|
): void {
|
|
21
|
-
|
|
24
|
+
const proposer = state.validators.getReadonly(proposerSlashing.signedHeader1.message.proposerIndex);
|
|
25
|
+
assertValidProposerSlashing(
|
|
26
|
+
state.config,
|
|
27
|
+
state.epochCtx.index2pubkey,
|
|
28
|
+
state.slot,
|
|
29
|
+
proposerSlashing,
|
|
30
|
+
proposer,
|
|
31
|
+
verifySignatures
|
|
32
|
+
);
|
|
22
33
|
|
|
23
34
|
if (fork >= ForkSeq.gloas) {
|
|
24
35
|
const slot = Number(proposerSlashing.signedHeader1.message.slot);
|
|
@@ -45,8 +56,11 @@ export function processProposerSlashing(
|
|
|
45
56
|
}
|
|
46
57
|
|
|
47
58
|
export function assertValidProposerSlashing(
|
|
48
|
-
|
|
59
|
+
config: BeaconConfig,
|
|
60
|
+
index2pubkey: Index2PubkeyCache,
|
|
61
|
+
stateSlot: Slot,
|
|
49
62
|
proposerSlashing: phase0.ProposerSlashing,
|
|
63
|
+
proposer: Validator,
|
|
50
64
|
verifySignatures = true
|
|
51
65
|
): void {
|
|
52
66
|
const header1 = proposerSlashing.signedHeader1.message;
|
|
@@ -70,19 +84,15 @@ export function assertValidProposerSlashing(
|
|
|
70
84
|
}
|
|
71
85
|
|
|
72
86
|
// verify the proposer is slashable
|
|
73
|
-
|
|
74
|
-
|
|
87
|
+
// ideally we would get the proposer from state.validators using proposerIndex but that requires access to state
|
|
88
|
+
// instead of that we pass in the proposer directly from the consumer side
|
|
89
|
+
if (!isSlashableValidator(proposer, computeEpochAtSlot(stateSlot))) {
|
|
75
90
|
throw new Error("ProposerSlashing proposer is not slashable");
|
|
76
91
|
}
|
|
77
92
|
|
|
78
93
|
// verify signatures
|
|
79
94
|
if (verifySignatures) {
|
|
80
|
-
const signatureSets = getProposerSlashingSignatureSets(
|
|
81
|
-
state.config,
|
|
82
|
-
state.epochCtx.index2pubkey,
|
|
83
|
-
state.slot,
|
|
84
|
-
proposerSlashing
|
|
85
|
-
);
|
|
95
|
+
const signatureSets = getProposerSlashingSignatureSets(config, index2pubkey, stateSlot, proposerSlashing);
|
|
86
96
|
for (let i = 0; i < signatureSets.length; i++) {
|
|
87
97
|
if (!verifySignatureSet(signatureSets[i])) {
|
|
88
98
|
throw new Error(`ProposerSlashing header${i + 1} signature invalid`);
|
|
@@ -1,8 +1,16 @@
|
|
|
1
|
+
import {PublicKey, Signature, verify} from "@chainsafe/blst";
|
|
1
2
|
import {FAR_FUTURE_EPOCH, ForkSeq} from "@lodestar/params";
|
|
2
|
-
import {phase0} from "@lodestar/types";
|
|
3
|
+
import {phase0, ssz} from "@lodestar/types";
|
|
3
4
|
import {verifyVoluntaryExitSignature} from "../signatureSets/index.js";
|
|
4
|
-
import {CachedBeaconStateAllForks, CachedBeaconStateElectra} from "../types.js";
|
|
5
|
-
import {
|
|
5
|
+
import {CachedBeaconStateAllForks, CachedBeaconStateElectra, CachedBeaconStateGloas} from "../types.js";
|
|
6
|
+
import {
|
|
7
|
+
convertValidatorIndexToBuilderIndex,
|
|
8
|
+
getPendingBalanceToWithdrawForBuilder,
|
|
9
|
+
initiateBuilderExit,
|
|
10
|
+
isActiveBuilder,
|
|
11
|
+
isBuilderIndex,
|
|
12
|
+
} from "../util/gloas.js";
|
|
13
|
+
import {computeSigningRoot, getCurrentEpoch, getPendingBalanceToWithdraw, isActiveValidator} from "../util/index.js";
|
|
6
14
|
import {initiateValidatorExit} from "./index.js";
|
|
7
15
|
|
|
8
16
|
export enum VoluntaryExitValidity {
|
|
@@ -16,7 +24,7 @@ export enum VoluntaryExitValidity {
|
|
|
16
24
|
}
|
|
17
25
|
|
|
18
26
|
/**
|
|
19
|
-
* Process a VoluntaryExit operation. Initiates the exit of a validator.
|
|
27
|
+
* Process a VoluntaryExit operation. Initiates the exit of a validator or builder.
|
|
20
28
|
*
|
|
21
29
|
* PERF: Work depends on number of VoluntaryExit per block. On regular networks the average is 0 / block.
|
|
22
30
|
*/
|
|
@@ -26,6 +34,53 @@ export function processVoluntaryExit(
|
|
|
26
34
|
signedVoluntaryExit: phase0.SignedVoluntaryExit,
|
|
27
35
|
verifySignature = true
|
|
28
36
|
): void {
|
|
37
|
+
const voluntaryExit = signedVoluntaryExit.message;
|
|
38
|
+
const currentEpoch = getCurrentEpoch(state);
|
|
39
|
+
|
|
40
|
+
// Exits must specify an epoch when they become valid; they are not valid before then
|
|
41
|
+
if (currentEpoch < voluntaryExit.epoch) {
|
|
42
|
+
throw Error(`Voluntary exit epoch ${voluntaryExit.epoch} is after current epoch ${currentEpoch}`);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// Check if this is a builder exit
|
|
46
|
+
if (fork >= ForkSeq.gloas && isBuilderIndex(voluntaryExit.validatorIndex)) {
|
|
47
|
+
const stateGloas = state as CachedBeaconStateGloas;
|
|
48
|
+
const builderIndex = convertValidatorIndexToBuilderIndex(voluntaryExit.validatorIndex);
|
|
49
|
+
const builder = stateGloas.builders.getReadonly(builderIndex);
|
|
50
|
+
|
|
51
|
+
// Verify the builder is active
|
|
52
|
+
if (!isActiveBuilder(stateGloas, builderIndex)) {
|
|
53
|
+
throw Error(`Builder ${builderIndex} is not active`);
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
// Only exit builder if it has no pending withdrawals in the queue
|
|
57
|
+
if (getPendingBalanceToWithdrawForBuilder(stateGloas, builderIndex) !== 0) {
|
|
58
|
+
throw Error(`Builder ${builderIndex} has pending withdrawals`);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
// Verify signature
|
|
62
|
+
if (verifySignature) {
|
|
63
|
+
const domain = state.config.getDomainForVoluntaryExit(state.slot);
|
|
64
|
+
const signingRoot = computeSigningRoot(ssz.phase0.VoluntaryExit, voluntaryExit, domain);
|
|
65
|
+
|
|
66
|
+
try {
|
|
67
|
+
const publicKey = PublicKey.fromBytes(builder.pubkey);
|
|
68
|
+
const signature = Signature.fromBytes(signedVoluntaryExit.signature, true);
|
|
69
|
+
|
|
70
|
+
if (!verify(signingRoot, publicKey, signature)) {
|
|
71
|
+
throw Error("BLS verify failed");
|
|
72
|
+
}
|
|
73
|
+
} catch (e) {
|
|
74
|
+
throw Error(`Builder ${builderIndex} invalid exit signature reason=${(e as Error).message}`);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
// Initiate builder exit
|
|
79
|
+
initiateBuilderExit(stateGloas, builderIndex);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
// Handle validator exit
|
|
29
84
|
const validity = getVoluntaryExitValidity(fork, state, signedVoluntaryExit, verifySignature);
|
|
30
85
|
if (validity !== VoluntaryExitValidity.valid) {
|
|
31
86
|
throw Error(`Invalid voluntary exit at forkSeq=${fork} reason=${validity}`);
|