@aztec/epoch-cache 0.0.1-commit.fce3e4f → 0.0.1-commit.ff7989d6c
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/dest/config.d.ts +3 -2
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +2 -1
- package/dest/epoch_cache.d.ts +29 -18
- package/dest/epoch_cache.d.ts.map +1 -1
- package/dest/epoch_cache.js +45 -23
- package/dest/test/index.d.ts +2 -0
- package/dest/test/index.d.ts.map +1 -0
- package/dest/test/index.js +1 -0
- package/dest/test/test_epoch_cache.d.ts +76 -0
- package/dest/test/test_epoch_cache.d.ts.map +1 -0
- package/dest/test/test_epoch_cache.js +151 -0
- package/package.json +9 -9
- package/src/config.ts +2 -6
- package/src/epoch_cache.ts +55 -31
- package/src/test/index.ts +1 -0
- package/src/test/test_epoch_cache.ts +170 -0
package/dest/config.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { type L1ContractsConfig
|
|
1
|
+
import { type L1ContractsConfig } from '@aztec/ethereum/config';
|
|
2
|
+
import { type L1ReaderConfig } from '@aztec/ethereum/l1-reader';
|
|
2
3
|
export type EpochCacheConfig = Pick<L1ReaderConfig & L1ContractsConfig, 'l1RpcUrls' | 'l1ChainId' | 'viemPollingIntervalMS' | 'ethereumSlotDuration'>;
|
|
3
4
|
export declare function getEpochCacheConfigEnvVars(): EpochCacheConfig;
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLGlCQUFpQixFQUErQixNQUFNLHdCQUF3QixDQUFDO0FBQzdGLE9BQU8sRUFBRSxLQUFLLGNBQWMsRUFBNEIsTUFBTSwyQkFBMkIsQ0FBQztBQUUxRixNQUFNLE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSxDQUNqQyxjQUFjLEdBQUcsaUJBQWlCLEVBQ2xDLFdBQVcsR0FBRyxXQUFXLEdBQUcsdUJBQXVCLEdBQUcsc0JBQXNCLENBQzdFLENBQUM7QUFFRix3QkFBZ0IsMEJBQTBCLElBQUksZ0JBQWdCLENBRTdEIn0=
|
package/dest/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAA+B,MAAM,wBAAwB,CAAC;AAC7F,OAAO,EAAE,KAAK,cAAc,EAA4B,MAAM,2BAA2B,CAAC;AAE1F,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,cAAc,GAAG,iBAAiB,EAClC,WAAW,GAAG,WAAW,GAAG,uBAAuB,GAAG,sBAAsB,CAC7E,CAAC;AAEF,wBAAgB,0BAA0B,IAAI,gBAAgB,CAE7D"}
|
package/dest/config.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { getL1ContractsConfigEnvVars
|
|
1
|
+
import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
2
|
+
import { getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
|
|
2
3
|
export function getEpochCacheConfigEnvVars() {
|
|
3
4
|
return {
|
|
4
5
|
...getL1ReaderConfigFromEnv(),
|
package/dest/epoch_cache.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RollupContract } from '@aztec/ethereum';
|
|
1
|
+
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
2
2
|
import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
3
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
4
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -13,25 +13,29 @@ export type EpochCommitteeInfo = {
|
|
|
13
13
|
committee: EthAddress[] | undefined;
|
|
14
14
|
seed: bigint;
|
|
15
15
|
epoch: EpochNumber;
|
|
16
|
+
/** True if the epoch is within an open escape hatch window. */
|
|
17
|
+
isEscapeHatchOpen: boolean;
|
|
16
18
|
};
|
|
17
19
|
export type SlotTag = 'now' | 'next' | SlotNumber;
|
|
18
20
|
export interface EpochCacheInterface {
|
|
19
21
|
getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
|
|
20
|
-
getEpochAndSlotNow(): EpochAndSlot
|
|
22
|
+
getEpochAndSlotNow(): EpochAndSlot & {
|
|
23
|
+
nowMs: bigint;
|
|
24
|
+
};
|
|
21
25
|
getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
|
|
22
26
|
now: bigint;
|
|
23
27
|
};
|
|
24
28
|
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
|
|
25
29
|
computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
|
|
26
|
-
|
|
27
|
-
currentProposer: EthAddress | undefined;
|
|
28
|
-
nextProposer: EthAddress | undefined;
|
|
30
|
+
getCurrentAndNextSlot(): {
|
|
29
31
|
currentSlot: SlotNumber;
|
|
30
32
|
nextSlot: SlotNumber;
|
|
31
|
-
}
|
|
33
|
+
};
|
|
34
|
+
getProposerAttesterAddressInSlot(slot: SlotNumber): Promise<EthAddress | undefined>;
|
|
32
35
|
getRegisteredValidators(): Promise<EthAddress[]>;
|
|
33
36
|
isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean>;
|
|
34
37
|
filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
|
|
38
|
+
getL1Constants(): L1RollupConstants;
|
|
35
39
|
}
|
|
36
40
|
/**
|
|
37
41
|
* Epoch cache
|
|
@@ -66,7 +70,7 @@ export declare class EpochCache implements EpochCacheInterface {
|
|
|
66
70
|
}): Promise<EpochCache>;
|
|
67
71
|
getL1Constants(): L1RollupConstants;
|
|
68
72
|
getEpochAndSlotNow(): EpochAndSlot & {
|
|
69
|
-
|
|
73
|
+
nowMs: bigint;
|
|
70
74
|
};
|
|
71
75
|
nowInSeconds(): bigint;
|
|
72
76
|
private getEpochAndSlotAtSlot;
|
|
@@ -75,6 +79,20 @@ export declare class EpochCache implements EpochCacheInterface {
|
|
|
75
79
|
};
|
|
76
80
|
private getEpochAndSlotAtTimestamp;
|
|
77
81
|
getCommitteeForEpoch(epoch: EpochNumber): Promise<EpochCommitteeInfo>;
|
|
82
|
+
/**
|
|
83
|
+
* Returns whether the escape hatch is open for the given epoch.
|
|
84
|
+
*
|
|
85
|
+
* Uses the already-cached EpochCommitteeInfo when available. If not cached, it will fetch
|
|
86
|
+
* the epoch committee info (which includes the escape hatch flag) and return it.
|
|
87
|
+
*/
|
|
88
|
+
isEscapeHatchOpen(epoch: EpochNumber): Promise<boolean>;
|
|
89
|
+
/**
|
|
90
|
+
* Returns whether the escape hatch is open for the epoch containing the given slot.
|
|
91
|
+
*
|
|
92
|
+
* This is a lightweight helper intended for callers that already have a slot number and only
|
|
93
|
+
* need the escape hatch flag (without pulling full committee info).
|
|
94
|
+
*/
|
|
95
|
+
isEscapeHatchOpenAtSlot(slot?: SlotTag): Promise<boolean>;
|
|
78
96
|
/**
|
|
79
97
|
* Get the current validator set
|
|
80
98
|
* @param nextSlot - If true, get the validator set for the next slot.
|
|
@@ -88,18 +106,11 @@ export declare class EpochCache implements EpochCacheInterface {
|
|
|
88
106
|
*/
|
|
89
107
|
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
|
|
90
108
|
computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
|
|
91
|
-
/**
|
|
92
|
-
|
|
93
|
-
*
|
|
94
|
-
* We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
|
|
95
|
-
* which can be the next slot. If this is the case, then it will send proposals early.
|
|
96
|
-
*/
|
|
97
|
-
getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
|
|
109
|
+
/** Returns the current and next L2 slot numbers. */
|
|
110
|
+
getCurrentAndNextSlot(): {
|
|
98
111
|
currentSlot: SlotNumber;
|
|
99
112
|
nextSlot: SlotNumber;
|
|
100
|
-
|
|
101
|
-
nextProposer: EthAddress | undefined;
|
|
102
|
-
}>;
|
|
113
|
+
};
|
|
103
114
|
/**
|
|
104
115
|
* Get the proposer attester address in the given L2 slot
|
|
105
116
|
* @returns The proposer attester address. If the committee does not exist, we throw a NoCommitteeError.
|
|
@@ -120,4 +131,4 @@ export declare class EpochCache implements EpochCacheInterface {
|
|
|
120
131
|
filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
|
|
121
132
|
getRegisteredValidators(): Promise<EthAddress[]>;
|
|
122
133
|
}
|
|
123
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
134
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXBvY2hfY2FjaGUuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQW9CLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzdFLE9BQU8sRUFBRSxXQUFXLEVBQUUsVUFBVSxFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDMUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN2RCxPQUFPLEVBQ0wsS0FBSyxpQkFBaUIsRUFPdkIsTUFBTSw2QkFBNkIsQ0FBQztBQUlyQyxPQUFPLEVBQUUsS0FBSyxnQkFBZ0IsRUFBOEIsTUFBTSxhQUFhLENBQUM7QUFFaEYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixLQUFLLEVBQUUsV0FBVyxDQUFDO0lBQ25CLElBQUksRUFBRSxVQUFVLENBQUM7SUFDakIsRUFBRSxFQUFFLE1BQU0sQ0FBQztDQUNaLENBQUM7QUFFRixNQUFNLE1BQU0sa0JBQWtCLEdBQUc7SUFDL0IsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUFHLFNBQVMsQ0FBQztJQUNwQyxJQUFJLEVBQUUsTUFBTSxDQUFDO0lBQ2IsS0FBSyxFQUFFLFdBQVcsQ0FBQztJQUNuQiwrREFBK0Q7SUFDL0QsaUJBQWlCLEVBQUUsT0FBTyxDQUFDO0NBQzVCLENBQUM7QUFFRixNQUFNLE1BQU0sT0FBTyxHQUFHLEtBQUssR0FBRyxNQUFNLEdBQUcsVUFBVSxDQUFDO0FBRWxELE1BQU0sV0FBVyxtQkFBbUI7SUFDbEMsWUFBWSxDQUFDLElBQUksRUFBRSxPQUFPLEdBQUcsU0FBUyxHQUFHLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0lBQ3JFLGtCQUFrQixJQUFJLFlBQVksR0FBRztRQUFFLEtBQUssRUFBRSxNQUFNLENBQUE7S0FBRSxDQUFDO0lBQ3ZE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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"epoch_cache.d.ts","sourceRoot":"","sources":["../src/epoch_cache.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"epoch_cache.d.ts","sourceRoot":"","sources":["../src/epoch_cache.ts"],"names":[],"mappings":"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"}
|
package/dest/epoch_cache.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
2
|
+
import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
|
|
2
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
4
|
import { createLogger } from '@aztec/foundation/log';
|
|
4
5
|
import { DateProvider } from '@aztec/foundation/timer';
|
|
@@ -49,19 +50,22 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
49
50
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
50
51
|
const publicClient = createPublicClient({
|
|
51
52
|
chain: chain.chainInfo,
|
|
52
|
-
transport: fallback(config.l1RpcUrls.map((url)=>http(url
|
|
53
|
+
transport: fallback(config.l1RpcUrls.map((url)=>http(url, {
|
|
54
|
+
batch: false
|
|
55
|
+
}))),
|
|
53
56
|
pollingInterval: config.viemPollingIntervalMS
|
|
54
57
|
});
|
|
55
58
|
rollup = new RollupContract(publicClient, rollupOrAddress.toString());
|
|
56
59
|
}
|
|
57
|
-
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration, lagInEpochsForValidatorSet, lagInEpochsForRandao] = await Promise.all([
|
|
60
|
+
const [l1StartBlock, l1GenesisTime, proofSubmissionEpochs, slotDuration, epochDuration, lagInEpochsForValidatorSet, lagInEpochsForRandao, targetCommitteeSize] = await Promise.all([
|
|
58
61
|
rollup.getL1StartBlock(),
|
|
59
62
|
rollup.getL1GenesisTime(),
|
|
60
63
|
rollup.getProofSubmissionEpochs(),
|
|
61
64
|
rollup.getSlotDuration(),
|
|
62
65
|
rollup.getEpochDuration(),
|
|
63
66
|
rollup.getLagInEpochsForValidatorSet(),
|
|
64
|
-
rollup.getLagInEpochsForRandao()
|
|
67
|
+
rollup.getLagInEpochsForRandao(),
|
|
68
|
+
rollup.getTargetCommitteeSize()
|
|
65
69
|
]);
|
|
66
70
|
const l1RollupConstants = {
|
|
67
71
|
l1StartBlock,
|
|
@@ -71,7 +75,8 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
71
75
|
epochDuration: Number(epochDuration),
|
|
72
76
|
ethereumSlotDuration: config.ethereumSlotDuration,
|
|
73
77
|
lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
|
|
74
|
-
lagInEpochsForRandao: Number(lagInEpochsForRandao)
|
|
78
|
+
lagInEpochsForRandao: Number(lagInEpochsForRandao),
|
|
79
|
+
targetCommitteeSize: Number(targetCommitteeSize)
|
|
75
80
|
};
|
|
76
81
|
return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
|
|
77
82
|
}
|
|
@@ -79,10 +84,11 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
79
84
|
return this.l1constants;
|
|
80
85
|
}
|
|
81
86
|
getEpochAndSlotNow() {
|
|
82
|
-
const
|
|
87
|
+
const nowMs = BigInt(this.dateProvider.now());
|
|
88
|
+
const nowSeconds = nowMs / 1000n;
|
|
83
89
|
return {
|
|
84
|
-
...this.getEpochAndSlotAtTimestamp(
|
|
85
|
-
|
|
90
|
+
...this.getEpochAndSlotAtTimestamp(nowSeconds),
|
|
91
|
+
nowMs
|
|
86
92
|
};
|
|
87
93
|
}
|
|
88
94
|
nowInSeconds() {
|
|
@@ -118,6 +124,28 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
118
124
|
return this.getCommittee(startSlot);
|
|
119
125
|
}
|
|
120
126
|
/**
|
|
127
|
+
* Returns whether the escape hatch is open for the given epoch.
|
|
128
|
+
*
|
|
129
|
+
* Uses the already-cached EpochCommitteeInfo when available. If not cached, it will fetch
|
|
130
|
+
* the epoch committee info (which includes the escape hatch flag) and return it.
|
|
131
|
+
*/ async isEscapeHatchOpen(epoch) {
|
|
132
|
+
const cached = this.cache.get(epoch);
|
|
133
|
+
if (cached) {
|
|
134
|
+
return cached.isEscapeHatchOpen;
|
|
135
|
+
}
|
|
136
|
+
const info = await this.getCommitteeForEpoch(epoch);
|
|
137
|
+
return info.isEscapeHatchOpen;
|
|
138
|
+
}
|
|
139
|
+
/**
|
|
140
|
+
* Returns whether the escape hatch is open for the epoch containing the given slot.
|
|
141
|
+
*
|
|
142
|
+
* This is a lightweight helper intended for callers that already have a slot number and only
|
|
143
|
+
* need the escape hatch flag (without pulling full committee info).
|
|
144
|
+
*/ async isEscapeHatchOpenAtSlot(slot = 'now') {
|
|
145
|
+
const epoch = slot === 'now' ? this.getEpochAndSlotNow().epoch : slot === 'next' ? this.getEpochAndSlotInNextL1Slot().epoch : getEpochAtSlot(slot, this.l1constants);
|
|
146
|
+
return await this.isEscapeHatchOpen(epoch);
|
|
147
|
+
}
|
|
148
|
+
/**
|
|
121
149
|
* Get the current validator set
|
|
122
150
|
* @param nextSlot - If true, get the validator set for the next slot.
|
|
123
151
|
* @returns The current validator set.
|
|
@@ -150,23 +178,24 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
150
178
|
}
|
|
151
179
|
async computeCommittee(when) {
|
|
152
180
|
const { ts, epoch } = when;
|
|
153
|
-
const [
|
|
181
|
+
const [committee, seedBuffer, l1Timestamp, isEscapeHatchOpen] = await Promise.all([
|
|
154
182
|
this.rollup.getCommitteeAt(ts),
|
|
155
183
|
this.rollup.getSampleSeedAt(ts),
|
|
156
184
|
this.rollup.client.getBlock({
|
|
157
185
|
includeTransactions: false
|
|
158
|
-
}).then((b)=>b.timestamp)
|
|
186
|
+
}).then((b)=>b.timestamp),
|
|
187
|
+
this.rollup.isEscapeHatchOpen(epoch)
|
|
159
188
|
]);
|
|
160
189
|
const { lagInEpochsForValidatorSet, epochDuration, slotDuration } = this.l1constants;
|
|
161
190
|
const sub = BigInt(lagInEpochsForValidatorSet) * BigInt(epochDuration) * BigInt(slotDuration);
|
|
162
191
|
if (ts - sub > l1Timestamp) {
|
|
163
192
|
throw new Error(`Cannot query committee for future epoch ${epoch} with timestamp ${ts} (current L1 time is ${l1Timestamp}). Check your Ethereum node is synced.`);
|
|
164
193
|
}
|
|
165
|
-
const committee = committeeHex?.map((v)=>EthAddress.fromString(v));
|
|
166
194
|
return {
|
|
167
195
|
committee,
|
|
168
|
-
seed,
|
|
169
|
-
epoch
|
|
196
|
+
seed: seedBuffer.toBigInt(),
|
|
197
|
+
epoch,
|
|
198
|
+
isEscapeHatchOpen
|
|
170
199
|
};
|
|
171
200
|
}
|
|
172
201
|
/**
|
|
@@ -198,17 +227,10 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
198
227
|
}
|
|
199
228
|
return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
|
|
200
229
|
}
|
|
201
|
-
/**
|
|
202
|
-
* Returns the current and next proposer's attester address
|
|
203
|
-
*
|
|
204
|
-
* We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
|
|
205
|
-
* which can be the next slot. If this is the case, then it will send proposals early.
|
|
206
|
-
*/ async getProposerAttesterAddressInCurrentOrNextSlot() {
|
|
230
|
+
/** Returns the current and next L2 slot numbers. */ getCurrentAndNextSlot() {
|
|
207
231
|
const current = this.getEpochAndSlotNow();
|
|
208
232
|
const next = this.getEpochAndSlotInNextL1Slot();
|
|
209
233
|
return {
|
|
210
|
-
currentProposer: await this.getProposerAttesterAddressAt(current),
|
|
211
|
-
nextProposer: await this.getProposerAttesterAddressAt(next),
|
|
212
234
|
currentSlot: current.slot,
|
|
213
235
|
nextSlot: next.slot
|
|
214
236
|
};
|
|
@@ -272,9 +294,9 @@ import { getEpochCacheConfigEnvVars } from './config.js';
|
|
|
272
294
|
const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
|
|
273
295
|
if (validatorRefreshTime < this.dateProvider.now()) {
|
|
274
296
|
const currentSet = await this.rollup.getAttesters();
|
|
275
|
-
this.allValidators = new Set(currentSet);
|
|
297
|
+
this.allValidators = new Set(currentSet.map((v)=>v.toString()));
|
|
276
298
|
this.lastValidatorRefresh = this.dateProvider.now();
|
|
277
299
|
}
|
|
278
|
-
return Array.from(this.allValidators.keys().map((v)=>EthAddress.fromString(v))
|
|
300
|
+
return Array.from(this.allValidators.keys()).map((v)=>EthAddress.fromString(v));
|
|
279
301
|
}
|
|
280
302
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/test/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './test_epoch_cache.js';
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
4
|
+
import type { EpochAndSlot, EpochCacheInterface, EpochCommitteeInfo, SlotTag } from '../epoch_cache.js';
|
|
5
|
+
/**
|
|
6
|
+
* A test implementation of EpochCacheInterface that allows manual configuration
|
|
7
|
+
* of committee, proposer, slot, and escape hatch state for use in tests.
|
|
8
|
+
*
|
|
9
|
+
* Unlike the real EpochCache, this class doesn't require any RPC connections
|
|
10
|
+
* or mock setup. Simply use the setter methods to configure the test state.
|
|
11
|
+
*/
|
|
12
|
+
export declare class TestEpochCache implements EpochCacheInterface {
|
|
13
|
+
private committee;
|
|
14
|
+
private proposerAddress;
|
|
15
|
+
private currentSlot;
|
|
16
|
+
private escapeHatchOpen;
|
|
17
|
+
private seed;
|
|
18
|
+
private registeredValidators;
|
|
19
|
+
private l1Constants;
|
|
20
|
+
constructor(l1Constants?: Partial<L1RollupConstants>);
|
|
21
|
+
/**
|
|
22
|
+
* Sets the committee members. Used in validation and attestation flows.
|
|
23
|
+
* @param committee - Array of committee member addresses.
|
|
24
|
+
*/
|
|
25
|
+
setCommittee(committee: EthAddress[]): this;
|
|
26
|
+
/**
|
|
27
|
+
* Sets the proposer address returned by getProposerAttesterAddressInSlot.
|
|
28
|
+
* @param proposer - The address of the current proposer.
|
|
29
|
+
*/
|
|
30
|
+
setProposer(proposer: EthAddress | undefined): this;
|
|
31
|
+
/**
|
|
32
|
+
* Sets the current slot number.
|
|
33
|
+
* @param slot - The slot number to set.
|
|
34
|
+
*/
|
|
35
|
+
setCurrentSlot(slot: SlotNumber): this;
|
|
36
|
+
/**
|
|
37
|
+
* Sets whether the escape hatch is open.
|
|
38
|
+
* @param open - True if escape hatch should be open.
|
|
39
|
+
*/
|
|
40
|
+
setEscapeHatchOpen(open: boolean): this;
|
|
41
|
+
/**
|
|
42
|
+
* Sets the randomness seed used for proposer selection.
|
|
43
|
+
* @param seed - The seed value.
|
|
44
|
+
*/
|
|
45
|
+
setSeed(seed: bigint): this;
|
|
46
|
+
/**
|
|
47
|
+
* Sets the list of registered validators (all validators, not just committee).
|
|
48
|
+
* @param validators - Array of validator addresses.
|
|
49
|
+
*/
|
|
50
|
+
setRegisteredValidators(validators: EthAddress[]): this;
|
|
51
|
+
/**
|
|
52
|
+
* Sets the L1 constants used for epoch/slot calculations.
|
|
53
|
+
* @param constants - Partial constants to override defaults.
|
|
54
|
+
*/
|
|
55
|
+
setL1Constants(constants: Partial<L1RollupConstants>): this;
|
|
56
|
+
getL1Constants(): L1RollupConstants;
|
|
57
|
+
getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo>;
|
|
58
|
+
getEpochAndSlotNow(): EpochAndSlot & {
|
|
59
|
+
nowMs: bigint;
|
|
60
|
+
};
|
|
61
|
+
getEpochAndSlotInNextL1Slot(): EpochAndSlot & {
|
|
62
|
+
now: bigint;
|
|
63
|
+
};
|
|
64
|
+
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
|
|
65
|
+
computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint;
|
|
66
|
+
getCurrentAndNextSlot(): {
|
|
67
|
+
currentSlot: SlotNumber;
|
|
68
|
+
nextSlot: SlotNumber;
|
|
69
|
+
};
|
|
70
|
+
getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined>;
|
|
71
|
+
getRegisteredValidators(): Promise<EthAddress[]>;
|
|
72
|
+
isInCommittee(_slot: SlotTag, validator: EthAddress): Promise<boolean>;
|
|
73
|
+
filterInCommittee(_slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
|
|
74
|
+
isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean>;
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdF9lcG9jaF9jYWNoZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3Rlc3QvdGVzdF9lcG9jaF9jYWNoZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsV0FBVyxFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQzFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQztBQUMzRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBR3JFLE9BQU8sS0FBSyxFQUFFLFlBQVksRUFBRSxtQkFBbUIsRUFBRSxrQkFBa0IsRUFBRSxPQUFPLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQWF4Rzs7Ozs7O0dBTUc7QUFDSCxxQkFBYSxjQUFlLFlBQVcsbUJBQW1CO0lBQ3hELE9BQU8sQ0FBQyxTQUFTLENBQW9CO0lBQ3JDLE9BQU8sQ0FBQyxlQUFlLENBQXlCO0lBQ2hELE9BQU8sQ0FBQyxXQUFXLENBQTZCO0lBQ2hELE9BQU8sQ0FBQyxlQUFlLENBQWtCO0lBQ3pDLE9BQU8sQ0FBQyxJQUFJLENBQWM7SUFDMUIsT0FBTyxDQUFDLG9CQUFvQixDQUFvQjtJQUNoRCxPQUFPLENBQUMsV0FBVyxDQUFvQjtJQUV2QyxZQUFZLFdBQVcsR0FBRSxPQUFPLENBQUMsaUJBQWlCLENBQU0sRUFFdkQ7SUFFRDs7O09BR0c7SUFDSCxZQUFZLENBQUMsU0FBUyxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHMUM7SUFFRDs7O09BR0c7SUFDSCxXQUFXLENBQUMsUUFBUSxFQUFFLFVBQVUsR0FBRyxTQUFTLEdBQUcsSUFBSSxDQUdsRDtJQUVEOzs7T0FHRztJQUNILGNBQWMsQ0FBQyxJQUFJLEVBQUUsVUFBVSxHQUFHLElBQUksQ0FHckM7SUFFRDs7O09BR0c7SUFDSCxrQkFBa0IsQ0FBQyxJQUFJLEVBQUUsT0FBTyxHQUFHLElBQUksQ0FHdEM7SUFFRDs7O09BR0c7SUFDSCxPQUFPLENBQUMsSUFBSSxFQUFFLE1BQU0sR0FBRyxJQUFJLENBRzFCO0lBRUQ7OztPQUdHO0lBQ0gsdUJBQXVCLENBQUMsVUFBVSxFQUFFLFVBQVUsRUFBRSxHQUFHLElBQUksQ0FHdEQ7SUFFRDs7O09BR0c7SUFDSCxjQUFjLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxHQUFHLElBQUksQ0FHMUQ7SUFFRCxjQUFjLElBQUksaUJBQWlCLENBRWxDO0lBRUQsWUFBWSxDQUFDLEtBQUssQ0FBQyxFQUFFLE9BQU8sR0FBRyxPQUFPLENBQUMsa0JBQWtCLENBQUMsQ0FRekQ7SUFFRCxrQkFBa0IsSUFBSSxZQUFZLEdBQUc7UUFBRSxLQUFLLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FJckQ7SUFFRCwyQkFBMkIsSUFBSSxZQUFZLEdBQUc7UUFBRSxHQUFHLEVBQUUsTUFBTSxDQUFBO0tBQUUsQ0FPNUQ7SUFFRCx3QkFBd0IsQ0FBQyxLQUFLLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsSUFBSSxFQUFFLE1BQU0sR0FBRyxLQUFLLE1BQU0sRUFBRSxDQUcxRjtJQUVELG9CQUFvQixDQUFDLElBQUksRUFBRSxVQUFVLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEdBQUcsTUFBTSxDQUsvRjtJQUVELHFCQUFxQixJQUFJO1FBQUUsV0FBVyxFQUFFLFVBQVUsQ0FBQztRQUFDLFFBQVEsRUFBRSxVQUFVLENBQUE7S0FBRSxDQUt6RTtJQUVELGdDQUFnQyxDQUFDLEtBQUssRUFBRSxVQUFVLEdBQUcsT0FBTyxDQUFDLFVBQVUsR0FBRyxTQUFTLENBQUMsQ0FFbkY7SUFFRCx1QkFBdUIsSUFBSSxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FFL0M7SUFFRCxhQUFhLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsVUFBVSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FFckU7SUFFRCxpQkFBaUIsQ0FBQyxLQUFLLEVBQUUsT0FBTyxFQUFFLFVBQVUsRUFBRSxVQUFVLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FHakY7SUFFRCx1QkFBdUIsQ0FBQyxLQUFLLENBQUMsRUFBRSxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUV6RDtDQUNGIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test_epoch_cache.d.ts","sourceRoot":"","sources":["../../src/test/test_epoch_cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGrE,OAAO,KAAK,EAAE,YAAY,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAaxG;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,mBAAmB;IACxD,OAAO,CAAC,SAAS,CAAoB;IACrC,OAAO,CAAC,eAAe,CAAyB;IAChD,OAAO,CAAC,WAAW,CAA6B;IAChD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,IAAI,CAAc;IAC1B,OAAO,CAAC,oBAAoB,CAAoB;IAChD,OAAO,CAAC,WAAW,CAAoB;IAEvC,YAAY,WAAW,GAAE,OAAO,CAAC,iBAAiB,CAAM,EAEvD;IAED;;;OAGG;IACH,YAAY,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAG1C;IAED;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,UAAU,GAAG,SAAS,GAAG,IAAI,CAGlD;IAED;;;OAGG;IACH,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAGrC;IAED;;;OAGG;IACH,kBAAkB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAGtC;IAED;;;OAGG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAG1B;IAED;;;OAGG;IACH,uBAAuB,CAAC,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAGtD;IAED;;;OAGG;IACH,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAG1D;IAED,cAAc,IAAI,iBAAiB,CAElC;IAED,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQzD;IAED,kBAAkB,IAAI,YAAY,GAAG;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAIrD;IAED,2BAA2B,IAAI,YAAY,GAAG;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,CAO5D;IAED,wBAAwB,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAG1F;IAED,oBAAoB,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAK/F;IAED,qBAAqB,IAAI;QAAE,WAAW,EAAE,UAAU,CAAC;QAAC,QAAQ,EAAE,UAAU,CAAA;KAAE,CAKzE;IAED,gCAAgC,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAEnF;IAED,uBAAuB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAE/C;IAED,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAErE;IAED,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAGjF;IAED,uBAAuB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAEzD;CACF"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
3
|
+
/** Default L1 constants for testing. */ const DEFAULT_L1_CONSTANTS = {
|
|
4
|
+
l1StartBlock: 0n,
|
|
5
|
+
l1GenesisTime: 0n,
|
|
6
|
+
slotDuration: 24,
|
|
7
|
+
epochDuration: 16,
|
|
8
|
+
ethereumSlotDuration: 12,
|
|
9
|
+
proofSubmissionEpochs: 2,
|
|
10
|
+
targetCommitteeSize: 48
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* A test implementation of EpochCacheInterface that allows manual configuration
|
|
14
|
+
* of committee, proposer, slot, and escape hatch state for use in tests.
|
|
15
|
+
*
|
|
16
|
+
* Unlike the real EpochCache, this class doesn't require any RPC connections
|
|
17
|
+
* or mock setup. Simply use the setter methods to configure the test state.
|
|
18
|
+
*/ export class TestEpochCache {
|
|
19
|
+
committee = [];
|
|
20
|
+
proposerAddress;
|
|
21
|
+
currentSlot = SlotNumber(0);
|
|
22
|
+
escapeHatchOpen = false;
|
|
23
|
+
seed = 0n;
|
|
24
|
+
registeredValidators = [];
|
|
25
|
+
l1Constants;
|
|
26
|
+
constructor(l1Constants = {}){
|
|
27
|
+
this.l1Constants = {
|
|
28
|
+
...DEFAULT_L1_CONSTANTS,
|
|
29
|
+
...l1Constants
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Sets the committee members. Used in validation and attestation flows.
|
|
34
|
+
* @param committee - Array of committee member addresses.
|
|
35
|
+
*/ setCommittee(committee) {
|
|
36
|
+
this.committee = committee;
|
|
37
|
+
return this;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Sets the proposer address returned by getProposerAttesterAddressInSlot.
|
|
41
|
+
* @param proposer - The address of the current proposer.
|
|
42
|
+
*/ setProposer(proposer) {
|
|
43
|
+
this.proposerAddress = proposer;
|
|
44
|
+
return this;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Sets the current slot number.
|
|
48
|
+
* @param slot - The slot number to set.
|
|
49
|
+
*/ setCurrentSlot(slot) {
|
|
50
|
+
this.currentSlot = slot;
|
|
51
|
+
return this;
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* Sets whether the escape hatch is open.
|
|
55
|
+
* @param open - True if escape hatch should be open.
|
|
56
|
+
*/ setEscapeHatchOpen(open) {
|
|
57
|
+
this.escapeHatchOpen = open;
|
|
58
|
+
return this;
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* Sets the randomness seed used for proposer selection.
|
|
62
|
+
* @param seed - The seed value.
|
|
63
|
+
*/ setSeed(seed) {
|
|
64
|
+
this.seed = seed;
|
|
65
|
+
return this;
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Sets the list of registered validators (all validators, not just committee).
|
|
69
|
+
* @param validators - Array of validator addresses.
|
|
70
|
+
*/ setRegisteredValidators(validators) {
|
|
71
|
+
this.registeredValidators = validators;
|
|
72
|
+
return this;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Sets the L1 constants used for epoch/slot calculations.
|
|
76
|
+
* @param constants - Partial constants to override defaults.
|
|
77
|
+
*/ setL1Constants(constants) {
|
|
78
|
+
this.l1Constants = {
|
|
79
|
+
...this.l1Constants,
|
|
80
|
+
...constants
|
|
81
|
+
};
|
|
82
|
+
return this;
|
|
83
|
+
}
|
|
84
|
+
getL1Constants() {
|
|
85
|
+
return this.l1Constants;
|
|
86
|
+
}
|
|
87
|
+
getCommittee(_slot) {
|
|
88
|
+
const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
89
|
+
return Promise.resolve({
|
|
90
|
+
committee: this.committee,
|
|
91
|
+
epoch,
|
|
92
|
+
seed: this.seed,
|
|
93
|
+
isEscapeHatchOpen: this.escapeHatchOpen
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
getEpochAndSlotNow() {
|
|
97
|
+
const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
98
|
+
const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
|
|
99
|
+
return {
|
|
100
|
+
epoch,
|
|
101
|
+
slot: this.currentSlot,
|
|
102
|
+
ts,
|
|
103
|
+
nowMs: ts * 1000n
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
getEpochAndSlotInNextL1Slot() {
|
|
107
|
+
const now = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
|
|
108
|
+
const nextSlotTs = now + BigInt(this.l1Constants.ethereumSlotDuration);
|
|
109
|
+
const nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
|
|
110
|
+
const epoch = getEpochAtSlot(nextSlot, this.l1Constants);
|
|
111
|
+
const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
|
|
112
|
+
return {
|
|
113
|
+
epoch,
|
|
114
|
+
slot: nextSlot,
|
|
115
|
+
ts,
|
|
116
|
+
now
|
|
117
|
+
};
|
|
118
|
+
}
|
|
119
|
+
getProposerIndexEncoding(epoch, slot, seed) {
|
|
120
|
+
// Simple encoding for testing purposes
|
|
121
|
+
return `0x${epoch.toString(16).padStart(64, '0')}${slot.toString(16).padStart(64, '0')}${seed.toString(16).padStart(64, '0')}`;
|
|
122
|
+
}
|
|
123
|
+
computeProposerIndex(slot, _epoch, _seed, size) {
|
|
124
|
+
if (size === 0n) {
|
|
125
|
+
return 0n;
|
|
126
|
+
}
|
|
127
|
+
return BigInt(slot) % size;
|
|
128
|
+
}
|
|
129
|
+
getCurrentAndNextSlot() {
|
|
130
|
+
return {
|
|
131
|
+
currentSlot: this.currentSlot,
|
|
132
|
+
nextSlot: SlotNumber(this.currentSlot + 1)
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
getProposerAttesterAddressInSlot(_slot) {
|
|
136
|
+
return Promise.resolve(this.proposerAddress);
|
|
137
|
+
}
|
|
138
|
+
getRegisteredValidators() {
|
|
139
|
+
return Promise.resolve(this.registeredValidators);
|
|
140
|
+
}
|
|
141
|
+
isInCommittee(_slot, validator) {
|
|
142
|
+
return Promise.resolve(this.committee.some((v)=>v.equals(validator)));
|
|
143
|
+
}
|
|
144
|
+
filterInCommittee(_slot, validators) {
|
|
145
|
+
const committeeSet = new Set(this.committee.map((v)=>v.toString()));
|
|
146
|
+
return Promise.resolve(validators.filter((v)=>committeeSet.has(v.toString())));
|
|
147
|
+
}
|
|
148
|
+
isEscapeHatchOpenAtSlot(_slot) {
|
|
149
|
+
return Promise.resolve(this.escapeHatchOpen);
|
|
150
|
+
}
|
|
151
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/epoch-cache",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.ff7989d6c",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"tsconfig": "./tsconfig.json"
|
|
16
16
|
},
|
|
17
17
|
"scripts": {
|
|
18
|
-
"build": "yarn clean &&
|
|
19
|
-
"build:dev": "
|
|
18
|
+
"build": "yarn clean && ../scripts/tsc.sh",
|
|
19
|
+
"build:dev": "../scripts/tsc.sh --watch",
|
|
20
20
|
"clean": "rm -rf ./dest .tsbuildinfo",
|
|
21
|
-
"start:dev": "concurrently -k \"
|
|
21
|
+
"start:dev": "concurrently -k \"../scripts/tsc.sh --watch\" \"nodemon --watch dest --exec yarn start\"",
|
|
22
22
|
"start": "node ./dest/index.js",
|
|
23
23
|
"test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
|
|
24
24
|
},
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"../package.common.json"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
30
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
31
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
32
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
29
|
+
"@aztec/ethereum": "0.0.1-commit.ff7989d6c",
|
|
30
|
+
"@aztec/foundation": "0.0.1-commit.ff7989d6c",
|
|
31
|
+
"@aztec/l1-artifacts": "0.0.1-commit.ff7989d6c",
|
|
32
|
+
"@aztec/stdlib": "0.0.1-commit.ff7989d6c",
|
|
33
33
|
"@viem/anvil": "^0.0.10",
|
|
34
34
|
"dotenv": "^16.0.3",
|
|
35
35
|
"get-port": "^7.1.0",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@jest/globals": "^30.0.0",
|
|
43
43
|
"@types/jest": "^30.0.0",
|
|
44
44
|
"@types/node": "^22.15.17",
|
|
45
|
-
"@typescript/native-preview": "7.0.0-dev.
|
|
45
|
+
"@typescript/native-preview": "7.0.0-dev.20260113.1",
|
|
46
46
|
"jest": "^30.0.0",
|
|
47
47
|
"ts-node": "^10.9.1",
|
|
48
48
|
"typescript": "^5.3.3"
|
package/src/config.ts
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
type L1ReaderConfig,
|
|
4
|
-
getL1ContractsConfigEnvVars,
|
|
5
|
-
getL1ReaderConfigFromEnv,
|
|
6
|
-
} from '@aztec/ethereum';
|
|
1
|
+
import { type L1ContractsConfig, getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
|
|
2
|
+
import { type L1ReaderConfig, getL1ReaderConfigFromEnv } from '@aztec/ethereum/l1-reader';
|
|
7
3
|
|
|
8
4
|
export type EpochCacheConfig = Pick<
|
|
9
5
|
L1ReaderConfig & L1ContractsConfig,
|
package/src/epoch_cache.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
2
|
+
import { NoCommitteeError, RollupContract } from '@aztec/ethereum/contracts';
|
|
2
3
|
import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
3
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
4
5
|
import { type Logger, createLogger } from '@aztec/foundation/log';
|
|
@@ -27,25 +28,24 @@ export type EpochCommitteeInfo = {
|
|
|
27
28
|
committee: EthAddress[] | undefined;
|
|
28
29
|
seed: bigint;
|
|
29
30
|
epoch: EpochNumber;
|
|
31
|
+
/** True if the epoch is within an open escape hatch window. */
|
|
32
|
+
isEscapeHatchOpen: boolean;
|
|
30
33
|
};
|
|
31
34
|
|
|
32
35
|
export type SlotTag = 'now' | 'next' | SlotNumber;
|
|
33
36
|
|
|
34
37
|
export interface EpochCacheInterface {
|
|
35
38
|
getCommittee(slot: SlotTag | undefined): Promise<EpochCommitteeInfo>;
|
|
36
|
-
getEpochAndSlotNow(): EpochAndSlot;
|
|
39
|
+
getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint };
|
|
37
40
|
getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint };
|
|
38
41
|
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}`;
|
|
39
42
|
computeProposerIndex(slot: SlotNumber, epoch: EpochNumber, seed: bigint, size: bigint): bigint;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
nextProposer: EthAddress | undefined;
|
|
43
|
-
currentSlot: SlotNumber;
|
|
44
|
-
nextSlot: SlotNumber;
|
|
45
|
-
}>;
|
|
43
|
+
getCurrentAndNextSlot(): { currentSlot: SlotNumber; nextSlot: SlotNumber };
|
|
44
|
+
getProposerAttesterAddressInSlot(slot: SlotNumber): Promise<EthAddress | undefined>;
|
|
46
45
|
getRegisteredValidators(): Promise<EthAddress[]>;
|
|
47
46
|
isInCommittee(slot: SlotTag, validator: EthAddress): Promise<boolean>;
|
|
48
47
|
filterInCommittee(slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]>;
|
|
48
|
+
getL1Constants(): L1RollupConstants;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
51
|
/**
|
|
@@ -93,7 +93,7 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
93
93
|
const chain = createEthereumChain(config.l1RpcUrls, config.l1ChainId);
|
|
94
94
|
const publicClient = createPublicClient({
|
|
95
95
|
chain: chain.chainInfo,
|
|
96
|
-
transport: fallback(config.l1RpcUrls.map(url => http(url))),
|
|
96
|
+
transport: fallback(config.l1RpcUrls.map(url => http(url, { batch: false }))),
|
|
97
97
|
pollingInterval: config.viemPollingIntervalMS,
|
|
98
98
|
});
|
|
99
99
|
rollup = new RollupContract(publicClient, rollupOrAddress.toString());
|
|
@@ -107,6 +107,7 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
107
107
|
epochDuration,
|
|
108
108
|
lagInEpochsForValidatorSet,
|
|
109
109
|
lagInEpochsForRandao,
|
|
110
|
+
targetCommitteeSize,
|
|
110
111
|
] = await Promise.all([
|
|
111
112
|
rollup.getL1StartBlock(),
|
|
112
113
|
rollup.getL1GenesisTime(),
|
|
@@ -115,6 +116,7 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
115
116
|
rollup.getEpochDuration(),
|
|
116
117
|
rollup.getLagInEpochsForValidatorSet(),
|
|
117
118
|
rollup.getLagInEpochsForRandao(),
|
|
119
|
+
rollup.getTargetCommitteeSize(),
|
|
118
120
|
] as const);
|
|
119
121
|
|
|
120
122
|
const l1RollupConstants = {
|
|
@@ -126,6 +128,7 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
126
128
|
ethereumSlotDuration: config.ethereumSlotDuration,
|
|
127
129
|
lagInEpochsForValidatorSet: Number(lagInEpochsForValidatorSet),
|
|
128
130
|
lagInEpochsForRandao: Number(lagInEpochsForRandao),
|
|
131
|
+
targetCommitteeSize: Number(targetCommitteeSize),
|
|
129
132
|
};
|
|
130
133
|
|
|
131
134
|
return new EpochCache(rollup, l1RollupConstants, deps.dateProvider);
|
|
@@ -135,9 +138,10 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
135
138
|
return this.l1constants;
|
|
136
139
|
}
|
|
137
140
|
|
|
138
|
-
public getEpochAndSlotNow(): EpochAndSlot & {
|
|
139
|
-
const
|
|
140
|
-
|
|
141
|
+
public getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint } {
|
|
142
|
+
const nowMs = BigInt(this.dateProvider.now());
|
|
143
|
+
const nowSeconds = nowMs / 1000n;
|
|
144
|
+
return { ...this.getEpochAndSlotAtTimestamp(nowSeconds), nowMs };
|
|
141
145
|
}
|
|
142
146
|
|
|
143
147
|
public nowInSeconds(): bigint {
|
|
@@ -170,6 +174,38 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
170
174
|
return this.getCommittee(startSlot);
|
|
171
175
|
}
|
|
172
176
|
|
|
177
|
+
/**
|
|
178
|
+
* Returns whether the escape hatch is open for the given epoch.
|
|
179
|
+
*
|
|
180
|
+
* Uses the already-cached EpochCommitteeInfo when available. If not cached, it will fetch
|
|
181
|
+
* the epoch committee info (which includes the escape hatch flag) and return it.
|
|
182
|
+
*/
|
|
183
|
+
public async isEscapeHatchOpen(epoch: EpochNumber): Promise<boolean> {
|
|
184
|
+
const cached = this.cache.get(epoch);
|
|
185
|
+
if (cached) {
|
|
186
|
+
return cached.isEscapeHatchOpen;
|
|
187
|
+
}
|
|
188
|
+
const info = await this.getCommitteeForEpoch(epoch);
|
|
189
|
+
return info.isEscapeHatchOpen;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* Returns whether the escape hatch is open for the epoch containing the given slot.
|
|
194
|
+
*
|
|
195
|
+
* This is a lightweight helper intended for callers that already have a slot number and only
|
|
196
|
+
* need the escape hatch flag (without pulling full committee info).
|
|
197
|
+
*/
|
|
198
|
+
public async isEscapeHatchOpenAtSlot(slot: SlotTag = 'now'): Promise<boolean> {
|
|
199
|
+
const epoch =
|
|
200
|
+
slot === 'now'
|
|
201
|
+
? this.getEpochAndSlotNow().epoch
|
|
202
|
+
: slot === 'next'
|
|
203
|
+
? this.getEpochAndSlotInNextL1Slot().epoch
|
|
204
|
+
: getEpochAtSlot(slot, this.l1constants);
|
|
205
|
+
|
|
206
|
+
return await this.isEscapeHatchOpen(epoch);
|
|
207
|
+
}
|
|
208
|
+
|
|
173
209
|
/**
|
|
174
210
|
* Get the current validator set
|
|
175
211
|
* @param nextSlot - If true, get the validator set for the next slot.
|
|
@@ -209,10 +245,11 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
209
245
|
|
|
210
246
|
private async computeCommittee(when: { epoch: EpochNumber; ts: bigint }): Promise<EpochCommitteeInfo> {
|
|
211
247
|
const { ts, epoch } = when;
|
|
212
|
-
const [
|
|
248
|
+
const [committee, seedBuffer, l1Timestamp, isEscapeHatchOpen] = await Promise.all([
|
|
213
249
|
this.rollup.getCommitteeAt(ts),
|
|
214
250
|
this.rollup.getSampleSeedAt(ts),
|
|
215
251
|
this.rollup.client.getBlock({ includeTransactions: false }).then(b => b.timestamp),
|
|
252
|
+
this.rollup.isEscapeHatchOpen(epoch),
|
|
216
253
|
]);
|
|
217
254
|
const { lagInEpochsForValidatorSet, epochDuration, slotDuration } = this.l1constants;
|
|
218
255
|
const sub = BigInt(lagInEpochsForValidatorSet) * BigInt(epochDuration) * BigInt(slotDuration);
|
|
@@ -221,8 +258,7 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
221
258
|
`Cannot query committee for future epoch ${epoch} with timestamp ${ts} (current L1 time is ${l1Timestamp}). Check your Ethereum node is synced.`,
|
|
222
259
|
);
|
|
223
260
|
}
|
|
224
|
-
|
|
225
|
-
return { committee, seed, epoch };
|
|
261
|
+
return { committee, seed: seedBuffer.toBigInt(), epoch, isEscapeHatchOpen };
|
|
226
262
|
}
|
|
227
263
|
|
|
228
264
|
/**
|
|
@@ -247,24 +283,12 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
247
283
|
return BigInt(keccak256(this.getProposerIndexEncoding(epoch, slot, seed))) % size;
|
|
248
284
|
}
|
|
249
285
|
|
|
250
|
-
/**
|
|
251
|
-
|
|
252
|
-
*
|
|
253
|
-
* We return the next proposer's attester address as the node will check if it is the proposer at the next ethereum block,
|
|
254
|
-
* which can be the next slot. If this is the case, then it will send proposals early.
|
|
255
|
-
*/
|
|
256
|
-
public async getProposerAttesterAddressInCurrentOrNextSlot(): Promise<{
|
|
257
|
-
currentSlot: SlotNumber;
|
|
258
|
-
nextSlot: SlotNumber;
|
|
259
|
-
currentProposer: EthAddress | undefined;
|
|
260
|
-
nextProposer: EthAddress | undefined;
|
|
261
|
-
}> {
|
|
286
|
+
/** Returns the current and next L2 slot numbers. */
|
|
287
|
+
public getCurrentAndNextSlot(): { currentSlot: SlotNumber; nextSlot: SlotNumber } {
|
|
262
288
|
const current = this.getEpochAndSlotNow();
|
|
263
289
|
const next = this.getEpochAndSlotInNextL1Slot();
|
|
264
290
|
|
|
265
291
|
return {
|
|
266
|
-
currentProposer: await this.getProposerAttesterAddressAt(current),
|
|
267
|
-
nextProposer: await this.getProposerAttesterAddressAt(next),
|
|
268
292
|
currentSlot: current.slot,
|
|
269
293
|
nextSlot: next.slot,
|
|
270
294
|
};
|
|
@@ -350,9 +374,9 @@ export class EpochCache implements EpochCacheInterface {
|
|
|
350
374
|
const validatorRefreshTime = this.lastValidatorRefresh + validatorRefreshIntervalMs;
|
|
351
375
|
if (validatorRefreshTime < this.dateProvider.now()) {
|
|
352
376
|
const currentSet = await this.rollup.getAttesters();
|
|
353
|
-
this.allValidators = new Set(currentSet);
|
|
377
|
+
this.allValidators = new Set(currentSet.map(v => v.toString()));
|
|
354
378
|
this.lastValidatorRefresh = this.dateProvider.now();
|
|
355
379
|
}
|
|
356
|
-
return Array.from(this.allValidators.keys().map(v => EthAddress.fromString(v))
|
|
380
|
+
return Array.from(this.allValidators.keys()).map(v => EthAddress.fromString(v));
|
|
357
381
|
}
|
|
358
382
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './test_epoch_cache.js';
|
|
@@ -0,0 +1,170 @@
|
|
|
1
|
+
import { EpochNumber, SlotNumber } from '@aztec/foundation/branded-types';
|
|
2
|
+
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
|
+
import type { L1RollupConstants } from '@aztec/stdlib/epoch-helpers';
|
|
4
|
+
import { getEpochAtSlot, getSlotAtTimestamp, getTimestampRangeForEpoch } from '@aztec/stdlib/epoch-helpers';
|
|
5
|
+
|
|
6
|
+
import type { EpochAndSlot, EpochCacheInterface, EpochCommitteeInfo, SlotTag } from '../epoch_cache.js';
|
|
7
|
+
|
|
8
|
+
/** Default L1 constants for testing. */
|
|
9
|
+
const DEFAULT_L1_CONSTANTS: L1RollupConstants = {
|
|
10
|
+
l1StartBlock: 0n,
|
|
11
|
+
l1GenesisTime: 0n,
|
|
12
|
+
slotDuration: 24,
|
|
13
|
+
epochDuration: 16,
|
|
14
|
+
ethereumSlotDuration: 12,
|
|
15
|
+
proofSubmissionEpochs: 2,
|
|
16
|
+
targetCommitteeSize: 48,
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* A test implementation of EpochCacheInterface that allows manual configuration
|
|
21
|
+
* of committee, proposer, slot, and escape hatch state for use in tests.
|
|
22
|
+
*
|
|
23
|
+
* Unlike the real EpochCache, this class doesn't require any RPC connections
|
|
24
|
+
* or mock setup. Simply use the setter methods to configure the test state.
|
|
25
|
+
*/
|
|
26
|
+
export class TestEpochCache implements EpochCacheInterface {
|
|
27
|
+
private committee: EthAddress[] = [];
|
|
28
|
+
private proposerAddress: EthAddress | undefined;
|
|
29
|
+
private currentSlot: SlotNumber = SlotNumber(0);
|
|
30
|
+
private escapeHatchOpen: boolean = false;
|
|
31
|
+
private seed: bigint = 0n;
|
|
32
|
+
private registeredValidators: EthAddress[] = [];
|
|
33
|
+
private l1Constants: L1RollupConstants;
|
|
34
|
+
|
|
35
|
+
constructor(l1Constants: Partial<L1RollupConstants> = {}) {
|
|
36
|
+
this.l1Constants = { ...DEFAULT_L1_CONSTANTS, ...l1Constants };
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/**
|
|
40
|
+
* Sets the committee members. Used in validation and attestation flows.
|
|
41
|
+
* @param committee - Array of committee member addresses.
|
|
42
|
+
*/
|
|
43
|
+
setCommittee(committee: EthAddress[]): this {
|
|
44
|
+
this.committee = committee;
|
|
45
|
+
return this;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* Sets the proposer address returned by getProposerAttesterAddressInSlot.
|
|
50
|
+
* @param proposer - The address of the current proposer.
|
|
51
|
+
*/
|
|
52
|
+
setProposer(proposer: EthAddress | undefined): this {
|
|
53
|
+
this.proposerAddress = proposer;
|
|
54
|
+
return this;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Sets the current slot number.
|
|
59
|
+
* @param slot - The slot number to set.
|
|
60
|
+
*/
|
|
61
|
+
setCurrentSlot(slot: SlotNumber): this {
|
|
62
|
+
this.currentSlot = slot;
|
|
63
|
+
return this;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
/**
|
|
67
|
+
* Sets whether the escape hatch is open.
|
|
68
|
+
* @param open - True if escape hatch should be open.
|
|
69
|
+
*/
|
|
70
|
+
setEscapeHatchOpen(open: boolean): this {
|
|
71
|
+
this.escapeHatchOpen = open;
|
|
72
|
+
return this;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/**
|
|
76
|
+
* Sets the randomness seed used for proposer selection.
|
|
77
|
+
* @param seed - The seed value.
|
|
78
|
+
*/
|
|
79
|
+
setSeed(seed: bigint): this {
|
|
80
|
+
this.seed = seed;
|
|
81
|
+
return this;
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Sets the list of registered validators (all validators, not just committee).
|
|
86
|
+
* @param validators - Array of validator addresses.
|
|
87
|
+
*/
|
|
88
|
+
setRegisteredValidators(validators: EthAddress[]): this {
|
|
89
|
+
this.registeredValidators = validators;
|
|
90
|
+
return this;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
/**
|
|
94
|
+
* Sets the L1 constants used for epoch/slot calculations.
|
|
95
|
+
* @param constants - Partial constants to override defaults.
|
|
96
|
+
*/
|
|
97
|
+
setL1Constants(constants: Partial<L1RollupConstants>): this {
|
|
98
|
+
this.l1Constants = { ...this.l1Constants, ...constants };
|
|
99
|
+
return this;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
getL1Constants(): L1RollupConstants {
|
|
103
|
+
return this.l1Constants;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
getCommittee(_slot?: SlotTag): Promise<EpochCommitteeInfo> {
|
|
107
|
+
const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
108
|
+
return Promise.resolve({
|
|
109
|
+
committee: this.committee,
|
|
110
|
+
epoch,
|
|
111
|
+
seed: this.seed,
|
|
112
|
+
isEscapeHatchOpen: this.escapeHatchOpen,
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
getEpochAndSlotNow(): EpochAndSlot & { nowMs: bigint } {
|
|
117
|
+
const epoch = getEpochAtSlot(this.currentSlot, this.l1Constants);
|
|
118
|
+
const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
|
|
119
|
+
return { epoch, slot: this.currentSlot, ts, nowMs: ts * 1000n };
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
getEpochAndSlotInNextL1Slot(): EpochAndSlot & { now: bigint } {
|
|
123
|
+
const now = getTimestampRangeForEpoch(getEpochAtSlot(this.currentSlot, this.l1Constants), this.l1Constants)[0];
|
|
124
|
+
const nextSlotTs = now + BigInt(this.l1Constants.ethereumSlotDuration);
|
|
125
|
+
const nextSlot = getSlotAtTimestamp(nextSlotTs, this.l1Constants);
|
|
126
|
+
const epoch = getEpochAtSlot(nextSlot, this.l1Constants);
|
|
127
|
+
const ts = getTimestampRangeForEpoch(epoch, this.l1Constants)[0];
|
|
128
|
+
return { epoch, slot: nextSlot, ts, now };
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
getProposerIndexEncoding(epoch: EpochNumber, slot: SlotNumber, seed: bigint): `0x${string}` {
|
|
132
|
+
// Simple encoding for testing purposes
|
|
133
|
+
return `0x${epoch.toString(16).padStart(64, '0')}${slot.toString(16).padStart(64, '0')}${seed.toString(16).padStart(64, '0')}`;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
computeProposerIndex(slot: SlotNumber, _epoch: EpochNumber, _seed: bigint, size: bigint): bigint {
|
|
137
|
+
if (size === 0n) {
|
|
138
|
+
return 0n;
|
|
139
|
+
}
|
|
140
|
+
return BigInt(slot) % size;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
getCurrentAndNextSlot(): { currentSlot: SlotNumber; nextSlot: SlotNumber } {
|
|
144
|
+
return {
|
|
145
|
+
currentSlot: this.currentSlot,
|
|
146
|
+
nextSlot: SlotNumber(this.currentSlot + 1),
|
|
147
|
+
};
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
getProposerAttesterAddressInSlot(_slot: SlotNumber): Promise<EthAddress | undefined> {
|
|
151
|
+
return Promise.resolve(this.proposerAddress);
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
getRegisteredValidators(): Promise<EthAddress[]> {
|
|
155
|
+
return Promise.resolve(this.registeredValidators);
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
isInCommittee(_slot: SlotTag, validator: EthAddress): Promise<boolean> {
|
|
159
|
+
return Promise.resolve(this.committee.some(v => v.equals(validator)));
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
filterInCommittee(_slot: SlotTag, validators: EthAddress[]): Promise<EthAddress[]> {
|
|
163
|
+
const committeeSet = new Set(this.committee.map(v => v.toString()));
|
|
164
|
+
return Promise.resolve(validators.filter(v => committeeSet.has(v.toString())));
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
isEscapeHatchOpenAtSlot(_slot?: SlotTag): Promise<boolean> {
|
|
168
|
+
return Promise.resolve(this.escapeHatchOpen);
|
|
169
|
+
}
|
|
170
|
+
}
|