@lodestar/state-transition 1.46.0-dev.ba5ee9aff0 → 1.46.0-dev.ba701016f3

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 (54) hide show
  1. package/lib/block/index.d.ts.map +1 -1
  2. package/lib/block/index.js +3 -2
  3. package/lib/block/index.js.map +1 -1
  4. package/lib/block/processAttestations.d.ts +2 -2
  5. package/lib/block/processAttestations.d.ts.map +1 -1
  6. package/lib/block/processAttestations.js +2 -2
  7. package/lib/block/processAttestations.js.map +1 -1
  8. package/lib/block/processAttestationsAltair.d.ts +3 -3
  9. package/lib/block/processAttestationsAltair.d.ts.map +1 -1
  10. package/lib/block/processAttestationsAltair.js +7 -4
  11. package/lib/block/processAttestationsAltair.js.map +1 -1
  12. package/lib/block/processExecutionPayloadBid.d.ts +2 -2
  13. package/lib/block/processExecutionPayloadBid.d.ts.map +1 -1
  14. package/lib/block/processExecutionPayloadBid.js +2 -0
  15. package/lib/block/processExecutionPayloadBid.js.map +1 -1
  16. package/lib/block/processOperations.d.ts +2 -2
  17. package/lib/block/processOperations.d.ts.map +1 -1
  18. package/lib/block/processOperations.js +2 -2
  19. package/lib/block/processOperations.js.map +1 -1
  20. package/lib/block/processWithdrawalRequest.d.ts.map +1 -1
  21. package/lib/block/processWithdrawalRequest.js +2 -2
  22. package/lib/block/processWithdrawalRequest.js.map +1 -1
  23. package/lib/rewards/blockRewards.d.ts.map +1 -1
  24. package/lib/rewards/blockRewards.js +7 -4
  25. package/lib/rewards/blockRewards.js.map +1 -1
  26. package/lib/slot/upgradeStateToAltair.js +1 -1
  27. package/lib/slot/upgradeStateToAltair.js.map +1 -1
  28. package/lib/slot/upgradeStateToGloas.js +1 -1
  29. package/lib/slot/upgradeStateToGloas.js.map +1 -1
  30. package/lib/util/clock.d.ts +55 -0
  31. package/lib/util/clock.d.ts.map +1 -0
  32. package/lib/util/clock.js +142 -0
  33. package/lib/util/clock.js.map +1 -0
  34. package/lib/util/gloas.d.ts +2 -1
  35. package/lib/util/gloas.d.ts.map +1 -1
  36. package/lib/util/gloas.js +7 -4
  37. package/lib/util/gloas.js.map +1 -1
  38. package/lib/util/index.d.ts +1 -0
  39. package/lib/util/index.d.ts.map +1 -1
  40. package/lib/util/index.js +1 -0
  41. package/lib/util/index.js.map +1 -1
  42. package/package.json +13 -13
  43. package/src/block/index.ts +4 -3
  44. package/src/block/processAttestations.ts +10 -2
  45. package/src/block/processAttestationsAltair.ts +10 -4
  46. package/src/block/processExecutionPayloadBid.ts +5 -2
  47. package/src/block/processOperations.ts +3 -2
  48. package/src/block/processWithdrawalRequest.ts +6 -2
  49. package/src/rewards/blockRewards.ts +20 -5
  50. package/src/slot/upgradeStateToAltair.ts +1 -0
  51. package/src/slot/upgradeStateToGloas.ts +1 -1
  52. package/src/util/clock.ts +183 -0
  53. package/src/util/gloas.ts +9 -5
  54. package/src/util/index.ts +1 -0
@@ -0,0 +1,183 @@
1
+ import {ChainForkConfig} from "@lodestar/config";
2
+ import {GENESIS_SLOT, SLOTS_PER_EPOCH} from "@lodestar/params";
3
+ import {Epoch, Slot, TimeSeconds} from "@lodestar/types";
4
+ import {ErrorAborted, Logger, isErrorAborted, sleep} from "@lodestar/utils";
5
+ import {computeEpochAtSlot} from "./epoch.js";
6
+ import {computeTimeAtSlot, getCurrentSlot} from "./slot.js";
7
+
8
+ type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
9
+
10
+ export type ClockOptions = {
11
+ skipSlots?: boolean;
12
+ };
13
+
14
+ export interface IClock {
15
+ readonly genesisTime: number;
16
+ readonly secondsPerSlot: number;
17
+
18
+ readonly currentEpoch: number;
19
+
20
+ start(signal: AbortSignal): void;
21
+ runEverySlot(fn: (slot: Slot, signal: AbortSignal) => Promise<void>): void;
22
+ runEveryEpoch(fn: (epoch: Epoch, signal: AbortSignal) => Promise<void>): void;
23
+ msToSlot(slot: Slot): number;
24
+ msFromSlot(slot: Slot): number;
25
+ secFromSlot(slot: Slot): number;
26
+ getCurrentSlot(): Slot;
27
+ getCurrentEpoch(): Epoch;
28
+ }
29
+
30
+ export enum TimeItem {
31
+ Slot,
32
+ Epoch,
33
+ }
34
+
35
+ export class Clock implements IClock {
36
+ readonly genesisTime: number;
37
+ readonly secondsPerSlot: number;
38
+ private readonly config: ChainForkConfig;
39
+ private readonly logger: Logger;
40
+ private readonly fns: {timeItem: TimeItem; fn: RunEveryFn}[] = [];
41
+
42
+ constructor(
43
+ config: ChainForkConfig,
44
+ logger: Logger,
45
+ private readonly opts: {genesisTime: number} & ClockOptions
46
+ ) {
47
+ this.genesisTime = opts.genesisTime;
48
+ this.secondsPerSlot = config.SLOT_DURATION_MS / 1000;
49
+ this.config = config;
50
+ this.logger = logger;
51
+ }
52
+
53
+ get currentEpoch(): Epoch {
54
+ return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
55
+ }
56
+
57
+ start(signal: AbortSignal): void {
58
+ for (const {timeItem, fn} of this.fns) {
59
+ this.runAtMostEvery(timeItem, signal, fn).catch((e: Error) => {
60
+ if (!isErrorAborted(e)) {
61
+ this.logger.error("runAtMostEvery", {}, e);
62
+ }
63
+ });
64
+ }
65
+ }
66
+
67
+ getCurrentSlot(): Slot {
68
+ return getCurrentSlot(this.config, this.genesisTime);
69
+ }
70
+
71
+ getCurrentEpoch(): Epoch {
72
+ return computeEpochAtSlot(getCurrentSlot(this.config, this.genesisTime));
73
+ }
74
+
75
+ runEverySlot(fn: RunEveryFn): void {
76
+ this.fns.push({timeItem: TimeItem.Slot, fn});
77
+ }
78
+
79
+ runEveryEpoch(fn: RunEveryFn): void {
80
+ this.fns.push({timeItem: TimeItem.Epoch, fn});
81
+ }
82
+
83
+ /** Milliseconds from now to a specific slot */
84
+ msToSlot(slot: Slot): number {
85
+ return computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000 - Date.now();
86
+ }
87
+
88
+ /** Milliseconds elapsed from a specific slot to now */
89
+ msFromSlot(slot: Slot): number {
90
+ return Date.now() - computeTimeAtSlot(this.config, slot, this.genesisTime) * 1000;
91
+ }
92
+
93
+ /** Seconds elapsed from a specific slot to now */
94
+ secFromSlot(slot: Slot): number {
95
+ return Date.now() / 1000 - computeTimeAtSlot(this.config, slot, this.genesisTime);
96
+ }
97
+
98
+ /**
99
+ * If a task happens to take more than one slot to run, we might skip a slot. This is unfortunate,
100
+ * however the alternative is to *always* process every slot, which has the chance of creating a
101
+ * theoretically unlimited backlog of tasks. It was a conscious decision to choose to drop tasks
102
+ * on an overloaded/latent system rather than overload it even more.
103
+ */
104
+ private async runAtMostEvery(timeItem: TimeItem, signal: AbortSignal, fn: RunEveryFn): Promise<void> {
105
+ // Run immediately first
106
+ let slot = getCurrentSlot(this.config, this.genesisTime);
107
+ let slotOrEpoch = timeItem === TimeItem.Slot ? slot : computeEpochAtSlot(slot);
108
+ while (!signal.aborted) {
109
+ // Must catch fn() to ensure `sleep()` is awaited both for resolve and reject
110
+ const task = fn(slotOrEpoch, signal).catch((e: Error) => {
111
+ if (!isErrorAborted(e)) this.logger.error("Error on runEvery fn", {}, e);
112
+ });
113
+
114
+ if (timeItem !== TimeItem.Slot || this.opts.skipSlots !== false) {
115
+ // await response to only continue with next task if current task finished within slot
116
+ await task;
117
+ }
118
+
119
+ try {
120
+ await sleep(this.timeUntilNext(timeItem), signal);
121
+ // calling getCurrentSlot here may not be correct when we're close to the next slot
122
+ // it's safe to call getCurrentSlotAround after we sleep
123
+ const nextSlot = getCurrentSlotAround(this.config, this.genesisTime);
124
+
125
+ if (timeItem === TimeItem.Slot) {
126
+ if (nextSlot > slot + 1) {
127
+ // It's not very likely that we skip more than one slot as HTTP timeout is set
128
+ // to SLOT_DURATION_MS so we will fail task before skipping another slot.
129
+ this.logger.warn("Skipped slot due to task taking more than one slot to run", {
130
+ skippedSlot: slot + 1,
131
+ });
132
+ }
133
+ slotOrEpoch = nextSlot;
134
+ } else {
135
+ slotOrEpoch = computeEpochAtSlot(nextSlot);
136
+ }
137
+ slot = nextSlot;
138
+ } catch (e) {
139
+ if (e instanceof ErrorAborted) {
140
+ return;
141
+ }
142
+ throw e;
143
+ }
144
+ }
145
+ }
146
+
147
+ private timeUntilNext(timeItem: TimeItem): number {
148
+ const milliSecondsPerSlot = this.config.SLOT_DURATION_MS;
149
+ const msFromGenesis = Date.now() - this.genesisTime * 1000;
150
+
151
+ if (timeItem === TimeItem.Slot) {
152
+ if (msFromGenesis >= 0) {
153
+ return milliSecondsPerSlot - (msFromGenesis % milliSecondsPerSlot);
154
+ }
155
+ return Math.abs(msFromGenesis) % milliSecondsPerSlot;
156
+ }
157
+ const milliSecondsPerEpoch = SLOTS_PER_EPOCH * milliSecondsPerSlot;
158
+ if (msFromGenesis >= 0) {
159
+ return milliSecondsPerEpoch - (msFromGenesis % milliSecondsPerEpoch);
160
+ }
161
+ return Math.abs(msFromGenesis) % milliSecondsPerEpoch;
162
+ }
163
+ }
164
+
165
+ /**
166
+ * Same to the spec but we use Math.round instead of Math.floor.
167
+ */
168
+ export function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot {
169
+ const diffInSeconds = Date.now() / 1000 - genesisTime;
170
+ const slotsSinceGenesis = Math.round((diffInSeconds * 1000) / config.SLOT_DURATION_MS);
171
+ return GENESIS_SLOT + slotsSinceGenesis;
172
+ }
173
+
174
+ // function useEventStream() {
175
+ // this.stream = this.events.getEventStream([BeaconEventType.BLOCK, BeaconEventType.HEAD, BeaconEventType.CHAIN_REORG]);
176
+ // pipeToEmitter(this.stream, this).catch((e: Error) => {
177
+ // this.logger.error("Error on stream pipe", {}, e);
178
+ // });
179
+
180
+ // // On stop
181
+ // this.stream.stop();
182
+ // this.stream = null;
183
+ // }
package/src/util/gloas.ts CHANGED
@@ -87,15 +87,19 @@ export function isActiveBuilder(builder: gloas.Builder, finalizedEpoch: Epoch):
87
87
  * From https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1559.md
88
88
  */
89
89
  export function getExpectedGasLimit(parentGasLimit: number, targetGasLimit: number): number {
90
- const maxGasLimitDifference = Math.max(Math.floor(parentGasLimit / 1024), 1) - 1;
90
+ return Number(getExpectedGasLimitBigint(BigInt(parentGasLimit), BigInt(targetGasLimit)));
91
+ }
92
+
93
+ export function getExpectedGasLimitBigint(parentGasLimit: bigint, targetGasLimit: bigint): bigint {
94
+ const maxGasLimitDifference = (parentGasLimit / 1024n > 1n ? parentGasLimit / 1024n : 1n) - 1n;
91
95
 
92
96
  if (targetGasLimit > parentGasLimit) {
93
97
  const gasDiff = targetGasLimit - parentGasLimit;
94
- return parentGasLimit + Math.min(gasDiff, maxGasLimitDifference);
98
+ return parentGasLimit + (gasDiff < maxGasLimitDifference ? gasDiff : maxGasLimitDifference);
95
99
  }
96
100
 
97
101
  const gasDiff = parentGasLimit - targetGasLimit;
98
- return parentGasLimit - Math.min(gasDiff, maxGasLimitDifference);
102
+ return parentGasLimit - (gasDiff < maxGasLimitDifference ? gasDiff : maxGasLimitDifference);
99
103
  }
100
104
 
101
105
  /**
@@ -104,8 +108,8 @@ export function getExpectedGasLimit(parentGasLimit: number, targetGasLimit: numb
104
108
  * adjustment step of the parent, otherwise it must hit the clamped boundary.
105
109
  * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.8/specs/gloas/builder.md#new-is_gas_limit_target_compatible
106
110
  */
107
- export function isGasLimitTargetCompatible(parentGasLimit: number, gasLimit: number, targetGasLimit: number): boolean {
108
- return gasLimit === getExpectedGasLimit(parentGasLimit, targetGasLimit);
111
+ export function isGasLimitTargetCompatible(parentGasLimit: bigint, gasLimit: bigint, targetGasLimit: bigint): boolean {
112
+ return gasLimit === getExpectedGasLimitBigint(parentGasLimit, targetGasLimit);
109
113
  }
110
114
 
111
115
  /**
package/src/util/index.ts CHANGED
@@ -6,6 +6,7 @@ export * from "./balance.js";
6
6
  export * from "./blindedBlock.js";
7
7
  export * from "./blockRoot.js";
8
8
  export * from "./capella.js";
9
+ export * from "./clock.js";
9
10
  export * from "./computeAnchorCheckpoint.js";
10
11
  export * from "./deposit.js";
11
12
  export * from "./domain.js";