@lodestar/state-transition 1.50.0-dev.c3aaeedc3b → 1.50.0-dev.c785f2463a

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.
Files changed (86) hide show
  1. package/lib/block/index.d.ts.map +1 -1
  2. package/lib/block/index.js +1 -1
  3. package/lib/block/index.js.map +1 -1
  4. package/lib/block/processDeposit.d.ts +2 -2
  5. package/lib/block/processDeposit.d.ts.map +1 -1
  6. package/lib/block/processDeposit.js.map +1 -1
  7. package/lib/block/processEth1Data.d.ts +3 -3
  8. package/lib/block/processEth1Data.d.ts.map +1 -1
  9. package/lib/block/processEth1Data.js.map +1 -1
  10. package/lib/block/processOperations.d.ts.map +1 -1
  11. package/lib/block/processOperations.js +8 -6
  12. package/lib/block/processOperations.js.map +1 -1
  13. package/lib/block/processProposerSlashing.d.ts.map +1 -1
  14. package/lib/block/processProposerSlashing.js +0 -23
  15. package/lib/block/processProposerSlashing.js.map +1 -1
  16. package/lib/block/slashValidator.d.ts.map +1 -1
  17. package/lib/block/slashValidator.js +11 -0
  18. package/lib/block/slashValidator.js.map +1 -1
  19. package/lib/cache/stateCache.d.ts +2 -1
  20. package/lib/cache/stateCache.d.ts.map +1 -1
  21. package/lib/cache/stateCache.js.map +1 -1
  22. package/lib/cache/types.d.ts +2 -1
  23. package/lib/cache/types.d.ts.map +1 -1
  24. package/lib/epoch/index.d.ts.map +1 -1
  25. package/lib/epoch/index.js +3 -1
  26. package/lib/epoch/index.js.map +1 -1
  27. package/lib/epoch/processEth1DataReset.d.ts +2 -2
  28. package/lib/epoch/processEth1DataReset.d.ts.map +1 -1
  29. package/lib/epoch/processEth1DataReset.js.map +1 -1
  30. package/lib/epoch/processPendingDeposits.d.ts.map +1 -1
  31. package/lib/epoch/processPendingDeposits.js +8 -4
  32. package/lib/epoch/processPendingDeposits.js.map +1 -1
  33. package/lib/index.d.ts +1 -1
  34. package/lib/index.d.ts.map +1 -1
  35. package/lib/index.js.map +1 -1
  36. package/lib/slot/upgradeStateToHeze.d.ts.map +1 -1
  37. package/lib/slot/upgradeStateToHeze.js +4 -4
  38. package/lib/slot/upgradeStateToHeze.js.map +1 -1
  39. package/lib/stateView/beaconStateView.d.ts.map +1 -1
  40. package/lib/stateView/beaconStateView.js +3 -0
  41. package/lib/stateView/beaconStateView.js.map +1 -1
  42. package/lib/stateView/nativeBeaconStateView.d.ts.map +1 -1
  43. package/lib/stateView/nativeBeaconStateView.js +4 -0
  44. package/lib/stateView/nativeBeaconStateView.js.map +1 -1
  45. package/lib/types.d.ts +2 -2
  46. package/lib/types.d.ts.map +1 -1
  47. package/lib/util/blindedBlock.d.ts +1 -1
  48. package/lib/util/blindedBlock.d.ts.map +1 -1
  49. package/lib/util/blindedBlock.js +5 -2
  50. package/lib/util/blindedBlock.js.map +1 -1
  51. package/lib/util/clock.d.ts +5 -0
  52. package/lib/util/clock.d.ts.map +1 -1
  53. package/lib/util/clock.js +19 -16
  54. package/lib/util/clock.js.map +1 -1
  55. package/lib/util/deposit.d.ts +2 -2
  56. package/lib/util/deposit.d.ts.map +1 -1
  57. package/lib/util/deposit.js.map +1 -1
  58. package/lib/util/genesis.d.ts.map +1 -1
  59. package/lib/util/genesis.js +46 -23
  60. package/lib/util/genesis.js.map +1 -1
  61. package/lib/util/slot.d.ts +3 -1
  62. package/lib/util/slot.d.ts.map +1 -1
  63. package/lib/util/slot.js +4 -0
  64. package/lib/util/slot.js.map +1 -1
  65. package/package.json +7 -7
  66. package/src/block/index.ts +4 -3
  67. package/src/block/processDeposit.ts +7 -2
  68. package/src/block/processEth1Data.ts +3 -3
  69. package/src/block/processOperations.ts +14 -11
  70. package/src/block/processProposerSlashing.ts +2 -28
  71. package/src/block/slashValidator.ts +13 -2
  72. package/src/cache/stateCache.ts +2 -0
  73. package/src/cache/types.ts +2 -1
  74. package/src/epoch/index.ts +4 -1
  75. package/src/epoch/processEth1DataReset.ts +2 -2
  76. package/src/epoch/processPendingDeposits.ts +14 -3
  77. package/src/index.ts +2 -0
  78. package/src/slot/upgradeStateToHeze.ts +6 -4
  79. package/src/stateView/beaconStateView.ts +5 -1
  80. package/src/stateView/nativeBeaconStateView.ts +3 -0
  81. package/src/types.ts +2 -0
  82. package/src/util/blindedBlock.ts +8 -3
  83. package/src/util/clock.ts +25 -16
  84. package/src/util/deposit.ts +2 -2
  85. package/src/util/genesis.ts +56 -30
  86. package/src/util/slot.ts +6 -1
@@ -1 +1 @@
1
- {"version":3,"file":"genesis.d.ts","sourceRoot":"","sources":["../../src/util/genesis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAWjD,OAAO,EAAC,OAAO,EAAQ,WAAW,EAAE,MAAM,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAExE,OAAO,EAAC,uBAAuB,EAAC,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAC,mBAAmB,EAAE,yBAAyB,EAA2B,MAAM,aAAa,CAAC;AAOrG,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AAClE,KAAK,qBAAqB,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;AAItE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEhG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAKrG;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,MAAM,CAAC,QAAQ,EAChC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,GAC1C,mBAAmB,CAkCrB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,yBAAyB,EAAE,aAAa,EAAE,OAAO,GAAG,IAAI,CAGjG;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAErH;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,yBAAyB,EAChC,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,EAC7B,uBAAuB,CAAC,EAAE,qBAAqB,GAC9C;IAAC,uBAAuB,EAAE,MAAM,CAAA;CAAC,CAqFnC;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,uBAAuB,EACtC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,WAAW,EAC1B,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,EAC1B,uBAAuB,CAAC,EAAE,qBAAqB,EAC/C,sBAAsB,CAAC,EAAE,eAAe,CACpC,OAAO,GAAG,CAAC,SAAS,CAAC,sBAAsB,GAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,sBAAsB,GACzC,OAAO,GAAG,CAAC,KAAK,CAAC,sBAAsB,GACvC,OAAO,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAC5C,GACA,yBAAyB,CA0G3B"}
1
+ {"version":3,"file":"genesis.d.ts","sourceRoot":"","sources":["../../src/util/genesis.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAWjD,OAAO,EAAC,OAAO,EAAQ,WAAW,EAAE,MAAM,EAAE,GAAG,EAAC,MAAM,iBAAiB,CAAC;AAExE,OAAO,EAAC,uBAAuB,EAAC,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EACL,mBAAmB,EAEnB,yBAAyB,EAI1B,MAAM,aAAa,CAAC;AAOrB,KAAK,uBAAuB,GAAG,iBAAiB,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AAClE,KAAK,qBAAqB,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;AAItE;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAEhG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAKrG;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,MAAM,CAAC,QAAQ,EAChC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,GAC1C,mBAAmB,CAoCrB;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,yBAAyB,EAAE,aAAa,EAAE,OAAO,GAAG,IAAI,CAKjG;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,yBAAyB,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI,CAErH;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,yBAAyB,EAChC,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,EAC7B,uBAAuB,CAAC,EAAE,qBAAqB,GAC9C;IAAC,uBAAuB,EAAE,MAAM,CAAA;CAAC,CA8FnC;AAED;;;;GAIG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,eAAe,EACvB,aAAa,EAAE,uBAAuB,EACtC,aAAa,EAAE,OAAO,EACtB,aAAa,EAAE,WAAW,EAC1B,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,EAC1B,uBAAuB,CAAC,EAAE,qBAAqB,EAC/C,sBAAsB,CAAC,EAAE,eAAe,CACpC,OAAO,GAAG,CAAC,SAAS,CAAC,sBAAsB,GAC3C,OAAO,GAAG,CAAC,OAAO,CAAC,sBAAsB,GACzC,OAAO,GAAG,CAAC,KAAK,CAAC,sBAAsB,GACvC,OAAO,GAAG,CAAC,OAAO,CAAC,sBAAsB,CAC5C,GACA,yBAAyB,CAgH3B"}
@@ -1,6 +1,6 @@
1
1
  import { EFFECTIVE_BALANCE_INCREMENT, EPOCHS_PER_HISTORICAL_VECTOR, ForkSeq, GENESIS_EPOCH, GENESIS_SLOT, MAX_EFFECTIVE_BALANCE, UNSET_DEPOSIT_REQUESTS_START_INDEX, } from "@lodestar/params";
2
2
  import { ssz } from "@lodestar/types";
3
- import { processDeposit } from "../block/processDeposit.js";
3
+ import { applyDeposit, processDeposit } from "../block/processDeposit.js";
4
4
  import { createCachedBeaconState } from "../cache/stateCache.js";
5
5
  import { increaseBalance } from "../index.js";
6
6
  import { newFilledArray } from "./array.js";
@@ -55,7 +55,9 @@ export function getGenesisBeaconState(config, genesisEth1Data, latestBlockHeader
55
55
  // Randomness and committees
56
56
  state.latestBlockHeader = ssz.phase0.BeaconBlockHeader.toViewDU(latestBlockHeader);
57
57
  // Ethereum 1.0 chain data
58
- state.eth1Data = ssz.phase0.Eth1Data.toViewDU(genesisEth1Data);
58
+ if (config.getForkSeq(GENESIS_SLOT) < ForkSeq.heze) {
59
+ state.eth1Data = ssz.phase0.Eth1Data.toViewDU(genesisEth1Data);
60
+ }
59
61
  state.randaoMixes = ssz.phase0.RandaoMixes.toViewDU(randaoMixes);
60
62
  return state;
61
63
  }
@@ -66,7 +68,9 @@ export function getGenesisBeaconState(config, genesisEth1Data, latestBlockHeader
66
68
  * @param eth1BlockHash eth1 block hash
67
69
  */
68
70
  export function applyEth1BlockHash(state, eth1BlockHash) {
69
- state.eth1Data.blockHash = eth1BlockHash;
71
+ if (state.config.getForkSeq(state.slot) < ForkSeq.heze) {
72
+ state.eth1Data.blockHash = eth1BlockHash;
73
+ }
70
74
  state.randaoMixes = ssz.phase0.RandaoMixes.toViewDU(newFilledArray(EPOCHS_PER_HISTORICAL_VECTOR, eth1BlockHash));
71
75
  }
72
76
  /**
@@ -93,29 +97,37 @@ export function applyTimestamp(config, state, eth1Timestamp) {
93
97
  */
94
98
  export function applyDeposits(config, state, newDeposits, fullDepositDataRootList) {
95
99
  const fork = config.getForkSeq(state.slot);
96
- const depositDataRootList = [];
97
- const fullDepositDataRootArr = fullDepositDataRootList ? fullDepositDataRootList.getAllReadonlyValues() : null;
98
- if (fullDepositDataRootArr) {
99
- const depositCount = Number(state.eth1Data.depositCount);
100
- for (let index = 0; index < depositCount; index++) {
101
- depositDataRootList.push(fullDepositDataRootArr[index]);
100
+ if (fork >= ForkSeq.heze) {
101
+ // Genesis deposits do not use the removed legacy deposit tree.
102
+ for (const deposit of newDeposits) {
103
+ applyDeposit(fork, state, deposit.data);
102
104
  }
103
105
  }
104
- const initDepositCount = depositDataRootList.length;
105
- const depositDatas = fullDepositDataRootList ? null : newDeposits.map((deposit) => deposit.data);
106
- const { DepositData, DepositDataRootList } = ssz.phase0;
107
- for (const [index, deposit] of newDeposits.entries()) {
106
+ else {
107
+ const statePreHeze = state;
108
+ const depositDataRootList = [];
109
+ const fullDepositDataRootArr = fullDepositDataRootList ? fullDepositDataRootList.getAllReadonlyValues() : null;
108
110
  if (fullDepositDataRootArr) {
109
- depositDataRootList.push(fullDepositDataRootArr[index + initDepositCount]);
110
- state.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataRootList);
111
+ const depositCount = Number(statePreHeze.eth1Data.depositCount);
112
+ for (let index = 0; index < depositCount; index++) {
113
+ depositDataRootList.push(fullDepositDataRootArr[index]);
114
+ }
111
115
  }
112
- else if (depositDatas) {
113
- const depositDataList = depositDatas.slice(0, index + 1);
114
- state.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataList.map((d) => DepositData.hashTreeRoot(d)));
116
+ const initDepositCount = depositDataRootList.length;
117
+ const depositDatas = fullDepositDataRootList ? null : newDeposits.map((deposit) => deposit.data);
118
+ const { DepositData, DepositDataRootList } = ssz.phase0;
119
+ for (const [index, deposit] of newDeposits.entries()) {
120
+ if (fullDepositDataRootArr) {
121
+ depositDataRootList.push(fullDepositDataRootArr[index + initDepositCount]);
122
+ statePreHeze.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataRootList);
123
+ }
124
+ else if (depositDatas) {
125
+ const depositDataList = depositDatas.slice(0, index + 1);
126
+ statePreHeze.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataList.map((d) => DepositData.hashTreeRoot(d)));
127
+ }
128
+ statePreHeze.eth1Data.depositCount += 1n;
129
+ processDeposit(fork, statePreHeze, deposit);
115
130
  }
116
- state.eth1Data.depositCount += 1n;
117
- const fork = config.getForkSeq(GENESIS_SLOT);
118
- processDeposit(fork, state, deposit);
119
131
  }
120
132
  // Process deposit balance updates
121
133
  if (fork >= ForkSeq.electra) {
@@ -129,7 +141,12 @@ export function applyDeposits(config, state, newDeposits, fullDepositDataRootLis
129
141
  }
130
142
  increaseBalance(state, validatorIndex, amount);
131
143
  }
132
- stateElectra.pendingDeposits = ssz.electra.PendingDeposits.defaultViewDU();
144
+ if (fork >= ForkSeq.gloas) {
145
+ state.pendingDeposits = ssz.gloas.PendingDeposits.defaultViewDU();
146
+ }
147
+ else {
148
+ stateElectra.pendingDeposits = ssz.electra.PendingDeposits.defaultViewDU();
149
+ }
133
150
  }
134
151
  // Process activations
135
152
  const { epochCtx } = state;
@@ -224,7 +241,9 @@ export function initializeBeaconStateFromEth1(config, immutableData, eth1BlockHa
224
241
  stateElectra.latestExecutionPayloadHeader =
225
242
  executionPayloadHeader ??
226
243
  ssz.electra.ExecutionPayloadHeader.defaultViewDU();
227
- stateElectra.depositRequestsStartIndex = UNSET_DEPOSIT_REQUESTS_START_INDEX;
244
+ if (fork < ForkSeq.heze) {
245
+ stateElectra.depositRequestsStartIndex = UNSET_DEPOSIT_REQUESTS_START_INDEX;
246
+ }
228
247
  }
229
248
  if (fork >= ForkSeq.fulu) {
230
249
  const stateFulu = state;
@@ -233,6 +252,10 @@ export function initializeBeaconStateFromEth1(config, immutableData, eth1BlockHa
233
252
  stateFulu.latestExecutionPayloadHeader =
234
253
  executionPayloadHeader ??
235
254
  ssz.fulu.ExecutionPayloadHeader.defaultViewDU();
255
+ if (fork < ForkSeq.heze) {
256
+ // Fulu retires the legacy bridge after the genesis deposits.
257
+ stateFulu.depositRequestsStartIndex = BigInt(stateFulu.eth1DepositIndex);
258
+ }
236
259
  }
237
260
  if (fork >= ForkSeq.gloas) {
238
261
  const stateGloas = state;
@@ -1 +1 @@
1
- {"version":3,"file":"genesis.js","sourceRoot":"","sources":["../../src/util/genesis.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"genesis.js","sourceRoot":"","sources":["../../src/util/genesis.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,7 @@
1
- import { ChainConfig } from "@lodestar/config";
1
+ import { ChainConfig, ChainForkConfig } from "@lodestar/config";
2
2
  import { Epoch, Slot, TimeSeconds } from "@lodestar/types";
3
+ /** Slot duration in ms for a given slot */
4
+ export declare function getSlotDurationMs(config: ChainForkConfig, slot: Slot): number;
3
5
  export declare function getSlotsSinceGenesis(config: ChainConfig, genesisTime: TimeSeconds): Slot;
4
6
  export declare function getCurrentSlot(config: ChainConfig, genesisTime: TimeSeconds): Slot;
5
7
  export declare function computeSlotsSinceEpochStart(slot: Slot, epoch?: Epoch): Slot;
@@ -1 +1 @@
1
- {"version":3,"file":"slot.d.ts","sourceRoot":"","sources":["../../src/util/slot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAGzD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAGxF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAElF;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAG3E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,WAAW,CAExG"}
1
+ {"version":3,"file":"slot.d.ts","sourceRoot":"","sources":["../../src/util/slot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAE9D,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,WAAW,EAAC,MAAM,iBAAiB,CAAC;AAGzD,2CAA2C;AAC3C,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,GAAG,MAAM,CAE7E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAGxF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAElF;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAG3E;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,GAAG,WAAW,CAExG"}
package/lib/util/slot.js CHANGED
@@ -1,5 +1,9 @@
1
1
  import { GENESIS_SLOT } from "@lodestar/params";
2
2
  import { computeEpochAtSlot, computeStartSlotAtEpoch } from "./epoch.js";
3
+ /** Slot duration in ms for a given slot */
4
+ export function getSlotDurationMs(config, slot) {
5
+ return config.getSlotDurationMs(config.getForkName(slot));
6
+ }
3
7
  export function getSlotsSinceGenesis(config, genesisTime) {
4
8
  const diffInSeconds = Date.now() / 1000 - genesisTime;
5
9
  return Math.floor(diffInSeconds / (config.SLOT_DURATION_MS / 1000));
@@ -1 +1 @@
1
- {"version":3,"file":"slot.js","sourceRoot":"","sources":["../../src/util/slot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,YAAY,CAAC;AAEvE,MAAM,UAAU,oBAAoB,CAAC,MAAmB,EAAE,WAAwB;IAChF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,WAAW,CAAC;IACtD,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,WAAwB;IAC1E,OAAO,YAAY,GAAG,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAAU,EAAE,KAAa;IACnE,MAAM,YAAY,GAAG,KAAK,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,IAAI,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAmB,EAAE,IAAU,EAAE,WAAwB;IACzF,OAAO,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;AAC/D,CAAC"}
1
+ {"version":3,"file":"slot.js","sourceRoot":"","sources":["../../src/util/slot.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAC,kBAAkB,EAAE,uBAAuB,EAAC,MAAM,YAAY,CAAC;AAEvE,2CAA2C;AAC3C,MAAM,UAAU,iBAAiB,CAAC,MAAuB,EAAE,IAAU;IACnE,OAAO,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAmB,EAAE,WAAwB;IAChF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,WAAW,CAAC;IACtD,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,WAAwB;IAC1E,OAAO,YAAY,GAAG,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAAU,EAAE,KAAa;IACnE,MAAM,YAAY,GAAG,KAAK,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC;IACvD,OAAO,IAAI,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAmB,EAAE,IAAU,EAAE,WAAwB;IACzF,OAAO,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;AAC/D,CAAC"}
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.50.0-dev.c3aaeedc3b",
14
+ "version": "1.50.0-dev.c785f2463a",
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.1",
72
- "@lodestar/config": "^1.50.0-dev.c3aaeedc3b",
73
- "@lodestar/params": "^1.50.0-dev.c3aaeedc3b",
74
- "@lodestar/types": "^1.50.0-dev.c3aaeedc3b",
75
- "@lodestar/utils": "^1.50.0-dev.c3aaeedc3b",
72
+ "@lodestar/config": "^1.50.0-dev.c785f2463a",
73
+ "@lodestar/params": "^1.50.0-dev.c785f2463a",
74
+ "@lodestar/types": "^1.50.0-dev.c785f2463a",
75
+ "@lodestar/utils": "^1.50.0-dev.c785f2463a",
76
76
  "@vekexasia/bigint-buffer2": "^1.1.1"
77
77
  },
78
78
  "devDependencies": {
79
- "@lodestar/test-utils": "^1.50.0-dev.c3aaeedc3b"
79
+ "@lodestar/test-utils": "^1.50.0-dev.c785f2463a"
80
80
  },
81
81
  "keywords": [
82
82
  "ethereum",
@@ -84,5 +84,5 @@
84
84
  "beacon",
85
85
  "blockchain"
86
86
  ],
87
- "gitHead": "166b75e36415d0978d463f1009b518c0f94fdbd7"
87
+ "gitHead": "478b2a501b90e13d159ae83ed71ee20400b805be"
88
88
  }
@@ -1,4 +1,4 @@
1
- import {ForkPostGloas, ForkSeq} from "@lodestar/params";
1
+ import {ForkPostGloas, ForkPreHeze, ForkSeq} from "@lodestar/params";
2
2
  import {BeaconBlock, BlindedBeaconBlock, Slot, altair, capella} from "@lodestar/types";
3
3
  import {BeaconStateTransitionMetrics} from "../metrics.js";
4
4
  import {
@@ -6,6 +6,7 @@ import {
6
6
  CachedBeaconStateBellatrix,
7
7
  CachedBeaconStateCapella,
8
8
  CachedBeaconStateGloas,
9
+ CachedBeaconStatePreHeze,
9
10
  } from "../types.js";
10
11
  import {getFullOrBlindedPayload, isExecutionEnabled} from "../util/execution.js";
11
12
  import {BlockExternalData, DataAvailabilityStatus} from "./externalData.js";
@@ -117,9 +118,9 @@ export function processBlock(
117
118
  timer?.();
118
119
  }
119
120
 
120
- {
121
+ if (fork < ForkSeq.heze) {
121
122
  const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processEth1Data});
122
- processEth1Data(state, block.body.eth1Data);
123
+ processEth1Data(state as CachedBeaconStatePreHeze, (block as BeaconBlock<ForkPreHeze>).body.eth1Data);
123
124
  timer?.();
124
125
  }
125
126
 
@@ -17,7 +17,12 @@ import {
17
17
  import {BLSPubkey, Bytes32, UintNum64, electra, phase0, ssz} from "@lodestar/types";
18
18
  import {verifyMerkleBranch} from "@lodestar/utils";
19
19
  import {ZERO_HASH} from "../constants/index.js";
20
- import {CachedBeaconStateAllForks, CachedBeaconStateAltair, CachedBeaconStateElectra} from "../types.js";
20
+ import {
21
+ CachedBeaconStateAllForks,
22
+ CachedBeaconStateAltair,
23
+ CachedBeaconStateElectra,
24
+ CachedBeaconStatePreHeze,
25
+ } from "../types.js";
21
26
  import {
22
27
  computeDomain,
23
28
  computeSigningRoot,
@@ -33,7 +38,7 @@ import {
33
38
  *
34
39
  * PERF: Work depends on number of Deposit per block. On regular networks the average is 0 / block.
35
40
  */
36
- export function processDeposit(fork: ForkSeq, state: CachedBeaconStateAllForks, deposit: phase0.Deposit): void {
41
+ export function processDeposit(fork: ForkSeq, state: CachedBeaconStatePreHeze, deposit: phase0.Deposit): void {
37
42
  // verify the merkle branch
38
43
  if (
39
44
  !verifyMerkleBranch(
@@ -2,7 +2,7 @@ import {Node} from "@chainsafe/persistent-merkle-tree";
2
2
  import {CompositeViewDU} from "@chainsafe/ssz";
3
3
  import {EPOCHS_PER_ETH1_VOTING_PERIOD, SLOTS_PER_EPOCH} from "@lodestar/params";
4
4
  import {phase0, ssz} from "@lodestar/types";
5
- import {BeaconStateAllForks, CachedBeaconStateAllForks} from "../types.js";
5
+ import {BeaconStatePreHeze, CachedBeaconStatePreHeze} from "../types.js";
6
6
 
7
7
  /**
8
8
  * Store vote counts for every eth-execution block that has votes; if any eth-execution block wins majority support within a 1024-slot
@@ -12,7 +12,7 @@ import {BeaconStateAllForks, CachedBeaconStateAllForks} from "../types.js";
12
12
  * - Best case: Vote is already decided, zero work. See becomesNewEth1Data conditions
13
13
  * - Worst case: 1023 votes and no majority vote yet.
14
14
  */
15
- export function processEth1Data(state: CachedBeaconStateAllForks, eth1Data: phase0.Eth1Data): void {
15
+ export function processEth1Data(state: CachedBeaconStatePreHeze, eth1Data: phase0.Eth1Data): void {
16
16
  // Convert to view first to hash once and compare hashes
17
17
  const eth1DataView = ssz.phase0.Eth1Data.toViewDU(eth1Data);
18
18
 
@@ -28,7 +28,7 @@ export function processEth1Data(state: CachedBeaconStateAllForks, eth1Data: phas
28
28
  * result in a change to `state.eth1Data`.
29
29
  */
30
30
  export function becomesNewEth1Data(
31
- state: BeaconStateAllForks,
31
+ state: BeaconStatePreHeze,
32
32
  newEth1Data: CompositeViewDU<typeof ssz.phase0.Eth1Data>
33
33
  ): boolean {
34
34
  const SLOTS_PER_ETH1_VOTING_PERIOD = EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH;
@@ -1,4 +1,4 @@
1
- import {ForkSeq} from "@lodestar/params";
1
+ import {ForkPreHeze, ForkSeq} from "@lodestar/params";
2
2
  import {BeaconBlockBody, Slot, capella, electra, gloas} from "@lodestar/types";
3
3
  import {BeaconStateTransitionMetrics} from "../metrics.js";
4
4
  import {
@@ -6,6 +6,7 @@ import {
6
6
  CachedBeaconStateCapella,
7
7
  CachedBeaconStateElectra,
8
8
  CachedBeaconStateGloas,
9
+ CachedBeaconStatePreHeze,
9
10
  } from "../types.js";
10
11
  import {getEth1DepositCount} from "../util/deposit.js";
11
12
  import {processAttestations} from "./processAttestations.js";
@@ -40,13 +41,15 @@ export function processOperations(
40
41
  opts: ProcessBlockOpts = {verifySignatures: true},
41
42
  metrics?: BeaconStateTransitionMetrics | null
42
43
  ): void {
43
- // verify that outstanding deposits are processed up to the maximum number of deposits.
44
- // From Fulu the eth1 bridge deposit mechanism was removed, so blocks must not contain any deposits.
45
- const maxDeposits = fork >= ForkSeq.fulu ? 0 : getEth1DepositCount(state);
46
- if (body.deposits.length !== maxDeposits) {
47
- throw new Error(
48
- `Block contains incorrect number of deposits: depositCount=${body.deposits.length} expected=${maxDeposits}`
49
- );
44
+ if (fork < ForkSeq.heze) {
45
+ // From Fulu the eth1 bridge deposit mechanism was removed, so blocks must not contain any deposits.
46
+ const deposits = (body as BeaconBlockBody<ForkPreHeze>).deposits;
47
+ const maxDeposits = fork >= ForkSeq.fulu ? 0 : getEth1DepositCount(state as CachedBeaconStatePreHeze);
48
+ if (deposits.length !== maxDeposits) {
49
+ throw new Error(
50
+ `Block contains incorrect number of deposits: depositCount=${deposits.length} expected=${maxDeposits}`
51
+ );
52
+ }
50
53
  }
51
54
 
52
55
  {
@@ -71,10 +74,10 @@ export function processOperations(
71
74
  timer?.();
72
75
  }
73
76
 
74
- {
77
+ if (fork < ForkSeq.heze) {
75
78
  const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processDeposit});
76
- for (const deposit of body.deposits) {
77
- processDeposit(fork, state, deposit);
79
+ for (const deposit of (body as BeaconBlockBody<ForkPreHeze>).deposits) {
80
+ processDeposit(fork, state as CachedBeaconStatePreHeze, deposit);
78
81
  }
79
82
  timer?.();
80
83
  }
@@ -1,9 +1,9 @@
1
1
  import {BeaconConfig} from "@lodestar/config";
2
- import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
2
+ import {ForkSeq} from "@lodestar/params";
3
3
  import {Slot, phase0, ssz} from "@lodestar/types";
4
4
  import {Validator} from "@lodestar/types/phase0";
5
5
  import {getProposerSlashingSignatureSets} from "../signatureSets/index.js";
6
- import {CachedBeaconStateAllForks, CachedBeaconStateGloas} from "../types.js";
6
+ import {CachedBeaconStateAllForks} from "../types.js";
7
7
  import {computeEpochAtSlot, isSlashableValidator} from "../util/index.js";
8
8
  import {verifySignatureSet} from "../util/signatureSets.js";
9
9
  import {slashValidator} from "./slashValidator.js";
@@ -23,32 +23,6 @@ export function processProposerSlashing(
23
23
  const proposer = state.validators.getReadonly(proposerSlashing.signedHeader1.message.proposerIndex);
24
24
  assertValidProposerSlashing(state.config, state.slot, proposerSlashing, proposer, verifySignatures);
25
25
 
26
- if (fork >= ForkSeq.gloas) {
27
- // Remove the BuilderPendingPayment corresponding to this proposal if it is still in the
28
- // 2-epoch window. Only clear it when the slashed validator is the proposer associated with
29
- // the payment; otherwise an unrelated same-slot equivocation could grief an honest proposer's
30
- // payment.
31
- const slot = Number(proposerSlashing.signedHeader1.message.slot);
32
- const proposalEpoch = computeEpochAtSlot(slot);
33
- const currentEpoch = state.epochCtx.epoch;
34
- const previousEpoch = currentEpoch - 1;
35
-
36
- const paymentIndex =
37
- proposalEpoch === currentEpoch
38
- ? SLOTS_PER_EPOCH + (slot % SLOTS_PER_EPOCH)
39
- : proposalEpoch === previousEpoch
40
- ? slot % SLOTS_PER_EPOCH
41
- : undefined;
42
-
43
- if (paymentIndex !== undefined) {
44
- const builderPendingPayments = (state as CachedBeaconStateGloas).builderPendingPayments;
45
- const payment = builderPendingPayments.get(paymentIndex);
46
- if (payment.proposerIndex === proposerSlashing.signedHeader1.message.proposerIndex) {
47
- builderPendingPayments.set(paymentIndex, ssz.gloas.BuilderPendingPayment.defaultViewDU());
48
- }
49
- }
50
- }
51
-
52
26
  slashValidator(fork, state, proposerSlashing.signedHeader1.message.proposerIndex);
53
27
  }
54
28
 
@@ -13,8 +13,8 @@ import {
13
13
  WHISTLEBLOWER_REWARD_QUOTIENT,
14
14
  WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA,
15
15
  } from "@lodestar/params";
16
- import {ValidatorIndex} from "@lodestar/types";
17
- import {CachedBeaconStateAllForks, CachedBeaconStateAltair} from "../types.js";
16
+ import {ValidatorIndex, ssz} from "@lodestar/types";
17
+ import {CachedBeaconStateAllForks, CachedBeaconStateAltair, CachedBeaconStateGloas} from "../types.js";
18
18
  import {decreaseBalance, increaseBalance} from "../util/index.js";
19
19
  import {initiateValidatorExit} from "./initiateValidatorExit.js";
20
20
 
@@ -95,4 +95,15 @@ export function slashValidator(
95
95
  );
96
96
  }
97
97
  }
98
+
99
+ if (fork >= ForkSeq.gloas) {
100
+ // Cleared on every slashing, not only proposer slashings: a proposer slashed via an attester slashing
101
+ // first would otherwise keep the builder paying for a block it equivocated on
102
+ const {builderPendingPayments} = state as CachedBeaconStateGloas;
103
+ for (let i = 0; i < builderPendingPayments.length; i++) {
104
+ if (builderPendingPayments.getReadonly(i).proposerIndex === slashedIndex) {
105
+ builderPendingPayments.set(i, ssz.gloas.BuilderPendingPayment.defaultViewDU());
106
+ }
107
+ }
108
+ }
98
109
  }
@@ -15,6 +15,7 @@ import {
15
15
  BeaconStateGloas,
16
16
  BeaconStateHeze,
17
17
  BeaconStatePhase0,
18
+ BeaconStatePreHeze,
18
19
  } from "./types.js";
19
20
 
20
21
  export type BeaconStateCache = {
@@ -142,6 +143,7 @@ export type CachedBeaconStateHeze = CachedBeaconState<BeaconStateHeze>;
142
143
 
143
144
  export type CachedBeaconStateAllForks = CachedBeaconState<BeaconStateAllForks>;
144
145
  export type CachedBeaconStateExecutions = CachedBeaconState<BeaconStateExecutions>;
146
+ export type CachedBeaconStatePreHeze = CachedBeaconState<BeaconStatePreHeze>;
145
147
  /**
146
148
  * Create CachedBeaconState computing a new EpochCache instance
147
149
  * TODO ELECTRA: rename this to createFinalizedCachedBeaconState() as it's intended for finalized state only
@@ -1,5 +1,5 @@
1
1
  import {CompositeViewDU} from "@chainsafe/ssz";
2
- import {ForkAll, ForkName, ForkPostBellatrix, ForkPreGloas} from "@lodestar/params";
2
+ import {ForkAll, ForkName, ForkPostBellatrix, ForkPreGloas, ForkPreHeze} from "@lodestar/params";
3
3
  import {Epoch, RootHex, SSZTypesFor} from "@lodestar/types";
4
4
  import {EpochShuffling} from "../util/epochShuffling.js";
5
5
 
@@ -15,5 +15,6 @@ export type BeaconStateHeze = CompositeViewDU<SSZTypesFor<ForkName.heze, "Beacon
15
15
 
16
16
  export type BeaconStateAllForks = CompositeViewDU<SSZTypesFor<ForkAll, "BeaconState">>;
17
17
  export type BeaconStateExecutions = CompositeViewDU<SSZTypesFor<ForkPostBellatrix & ForkPreGloas, "BeaconState">>;
18
+ export type BeaconStatePreHeze = CompositeViewDU<SSZTypesFor<ForkPreHeze, "BeaconState">>;
18
19
 
19
20
  export type ShufflingGetter = (shufflingEpoch: Epoch, dependentRoot: RootHex) => EpochShuffling | null;
@@ -14,6 +14,7 @@ import {
14
14
  CachedBeaconStateFulu,
15
15
  CachedBeaconStateGloas,
16
16
  CachedBeaconStatePhase0,
17
+ CachedBeaconStatePreHeze,
17
18
  EpochTransitionCache,
18
19
  } from "../types.js";
19
20
  import {processBuilderPendingPayments} from "./processBuilderPendingPayments.js";
@@ -140,7 +141,9 @@ export function processEpoch(
140
141
  timer?.();
141
142
  }
142
143
 
143
- processEth1DataReset(state, cache);
144
+ if (fork < ForkSeq.heze) {
145
+ processEth1DataReset(state as CachedBeaconStatePreHeze, cache);
146
+ }
144
147
 
145
148
  if (fork >= ForkSeq.electra) {
146
149
  const stateElectra = state as CachedBeaconStateElectra;
@@ -1,13 +1,13 @@
1
1
  import {EPOCHS_PER_ETH1_VOTING_PERIOD} from "@lodestar/params";
2
2
  import {ssz} from "@lodestar/types";
3
- import {CachedBeaconStateAllForks, EpochTransitionCache} from "../types.js";
3
+ import {CachedBeaconStatePreHeze, EpochTransitionCache} from "../types.js";
4
4
 
5
5
  /**
6
6
  * Reset eth1DataVotes tree every `EPOCHS_PER_ETH1_VOTING_PERIOD`.
7
7
  *
8
8
  * PERF: Almost no (constant) cost
9
9
  */
10
- export function processEth1DataReset(state: CachedBeaconStateAllForks, cache: EpochTransitionCache): void {
10
+ export function processEth1DataReset(state: CachedBeaconStatePreHeze, cache: EpochTransitionCache): void {
11
11
  const nextEpoch = cache.currentEpoch + 1;
12
12
 
13
13
  // reset eth1 data votes
@@ -1,4 +1,10 @@
1
- import {FAR_FUTURE_EPOCH, ForkSeq, GENESIS_SLOT, MAX_PENDING_DEPOSITS_PER_EPOCH} from "@lodestar/params";
1
+ import {
2
+ BLS_WITHDRAWAL_PREFIX,
3
+ FAR_FUTURE_EPOCH,
4
+ ForkSeq,
5
+ GENESIS_SLOT,
6
+ MAX_PENDING_DEPOSITS_PER_EPOCH,
7
+ } from "@lodestar/params";
2
8
  import {electra} from "@lodestar/types";
3
9
  import {addValidatorToRegistry, isValidDepositSignature} from "../block/processDeposit.js";
4
10
  import {CachedBeaconStateElectra, EpochTransitionCache} from "../types.js";
@@ -71,7 +77,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
71
77
 
72
78
  if (isValidatorWithdrawn) {
73
79
  // Deposited balance will never become active. Increase balance but do not consume churn
74
- applyPendingDeposit(state, deposit, cache);
80
+ applyPendingDeposit(fork, state, deposit, cache);
75
81
  } else if (isValidatorExited) {
76
82
  // Validator is exiting, postpone the deposit until after withdrawable epoch
77
83
  depositsToPostpone.push(deposit);
@@ -83,7 +89,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
83
89
  }
84
90
  // Consume churn and apply deposit.
85
91
  processedAmount += deposit.amount;
86
- applyPendingDeposit(state, deposit, cache);
92
+ applyPendingDeposit(fork, state, deposit, cache);
87
93
  }
88
94
 
89
95
  // Regardless of how the deposit was handled, we move on in the queue.
@@ -110,6 +116,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
110
116
  }
111
117
 
112
118
  function applyPendingDeposit(
119
+ fork: ForkSeq,
113
120
  state: CachedBeaconStateElectra,
114
121
  deposit: electra.PendingDeposit,
115
122
  cache: EpochTransitionCache
@@ -119,6 +126,10 @@ function applyPendingDeposit(
119
126
  const cachedBalances = cache.balances;
120
127
 
121
128
  if (!isValidatorKnown(state, validatorIndex)) {
129
+ // Do not create validators with BLS withdrawal credentials, the deposit is skipped without a refund
130
+ if (fork >= ForkSeq.heze && withdrawalCredentials[0] === BLS_WITHDRAWAL_PREFIX) {
131
+ return;
132
+ }
122
133
  // Verify the deposit signature (proof of possession) which is not checked by the deposit contract
123
134
  if (isValidDepositSignature(state.config, pubkey, withdrawalCredentials, amount, signature)) {
124
135
  addValidatorToRegistry(ForkSeq.electra, state, pubkey, withdrawalCredentials, amount);
package/src/index.ts CHANGED
@@ -80,6 +80,7 @@ export type {
80
80
  BeaconStateHeze,
81
81
  // Non-cached states
82
82
  BeaconStatePhase0,
83
+ BeaconStatePreHeze,
83
84
  CachedBeaconStateAllForks,
84
85
  CachedBeaconStateAltair,
85
86
  CachedBeaconStateBellatrix,
@@ -91,5 +92,6 @@ export type {
91
92
  CachedBeaconStateGloas,
92
93
  CachedBeaconStateHeze,
93
94
  CachedBeaconStatePhase0,
95
+ CachedBeaconStatePreHeze,
94
96
  } from "./types.js";
95
97
  export * from "./util/index.js";
@@ -7,6 +7,12 @@ import {CachedBeaconStateGloas, CachedBeaconStateHeze} from "../types.js";
7
7
  * Spec: heze/fork.md `upgrade_to_heze`.
8
8
  */
9
9
  export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBeaconStateHeze {
10
+ // In Heze, the old deposit mechanism must be fully drained before the fork
11
+ if (BigInt(stateGloas.eth1DepositIndex) !== stateGloas.depositRequestsStartIndex) {
12
+ throw new Error(
13
+ `Cannot upgrade to Heze: legacy deposit mechanism still active eth1DepositIndex=${stateGloas.eth1DepositIndex} depositRequestsStartIndex=${stateGloas.depositRequestsStartIndex}`
14
+ );
15
+ }
10
16
  const {config} = stateGloas;
11
17
 
12
18
  ssz.gloas.BeaconState.commitViewDU(stateGloas);
@@ -26,9 +32,6 @@ export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBe
26
32
  stateHezeView.blockRoots = stateHezeCloned.blockRoots;
27
33
  stateHezeView.stateRoots = stateHezeCloned.stateRoots;
28
34
  stateHezeView.historicalRoots = stateHezeCloned.historicalRoots;
29
- stateHezeView.eth1Data = stateHezeCloned.eth1Data;
30
- stateHezeView.eth1DataVotes = stateHezeCloned.eth1DataVotes;
31
- stateHezeView.eth1DepositIndex = stateHezeCloned.eth1DepositIndex;
32
35
  stateHezeView.validators = stateHezeCloned.validators;
33
36
  stateHezeView.balances = stateHezeCloned.balances;
34
37
  stateHezeView.randaoMixes = stateHezeCloned.randaoMixes;
@@ -46,7 +49,6 @@ export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBe
46
49
  stateHezeView.nextWithdrawalIndex = stateHezeCloned.nextWithdrawalIndex;
47
50
  stateHezeView.nextWithdrawalValidatorIndex = stateHezeCloned.nextWithdrawalValidatorIndex;
48
51
  stateHezeView.historicalSummaries = stateHezeCloned.historicalSummaries;
49
- stateHezeView.depositRequestsStartIndex = stateHezeCloned.depositRequestsStartIndex;
50
52
  stateHezeView.depositBalanceToConsume = stateHezeCloned.depositBalanceToConsume;
51
53
  stateHezeView.exitBalanceToConsume = stateHezeCloned.exitBalanceToConsume;
52
54
  stateHezeView.earliestExitEpoch = stateHezeCloned.earliestExitEpoch;
@@ -40,6 +40,7 @@ import {
40
40
  CachedBeaconStateExecutions,
41
41
  CachedBeaconStateFulu,
42
42
  CachedBeaconStateGloas,
43
+ CachedBeaconStatePreHeze,
43
44
  createCachedBeaconState,
44
45
  isStateValidatorsNodesPopulated,
45
46
  } from "../cache/stateCache.js";
@@ -145,7 +146,10 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
145
146
  }
146
147
 
147
148
  get eth1Data(): phase0.Eth1Data {
148
- return this.cachedState.eth1Data;
149
+ if (this.forkSeq >= ForkSeq.heze) {
150
+ throw new Error("eth1Data was removed from the beacon state in Heze");
151
+ }
152
+ return (this.cachedState as CachedBeaconStatePreHeze).eth1Data;
149
153
  }
150
154
 
151
155
  get latestBlockHeader(): phase0.BeaconBlockHeader {