@aztec/ethereum 3.0.0-nightly.20251124 → 3.0.0-nightly.20251126
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 +6 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +13 -7
- package/dest/contracts/rollup.d.ts +25 -23
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +48 -41
- package/dest/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_l1_contracts.js +4 -3
- package/dest/l1_artifacts.d.ts +1582 -763
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils/readonly_l1_tx_utils.js +1 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +5 -3
- package/dest/test/chain_monitor.d.ts +13 -13
- package/dest/test/chain_monitor.d.ts.map +1 -1
- package/dest/test/chain_monitor.js +28 -28
- package/dest/test/rollup_cheat_codes.d.ts +4 -4
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +18 -22
- package/package.json +5 -5
- package/src/config.ts +16 -8
- package/src/contracts/rollup.ts +50 -40
- package/src/deploy_l1_contracts.ts +4 -3
- package/src/l1_tx_utils/readonly_l1_tx_utils.ts +1 -2
- package/src/queries.ts +6 -3
- package/src/test/chain_monitor.ts +35 -35
- package/src/test/rollup_cheat_codes.ts +18 -22
package/dest/config.d.ts
CHANGED
|
@@ -17,7 +17,9 @@ export type L1ContractsConfig = {
|
|
|
17
17
|
/** The target validator committee size. */
|
|
18
18
|
aztecTargetCommitteeSize: number;
|
|
19
19
|
/** The number of epochs to lag behind the current epoch for validator selection. */
|
|
20
|
-
|
|
20
|
+
lagInEpochsForValidatorSet: number;
|
|
21
|
+
/** The number of epochs to lag behind the current epoch for randao selection. */
|
|
22
|
+
lagInEpochsForRandao: number;
|
|
21
23
|
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
22
24
|
aztecProofSubmissionEpochs: number;
|
|
23
25
|
/** The deposit amount for a validator */
|
|
@@ -64,7 +66,8 @@ export declare const DefaultL1ContractsConfig: {
|
|
|
64
66
|
aztecSlotDuration: number;
|
|
65
67
|
aztecEpochDuration: number;
|
|
66
68
|
aztecTargetCommitteeSize: number;
|
|
67
|
-
|
|
69
|
+
lagInEpochsForValidatorSet: number;
|
|
70
|
+
lagInEpochsForRandao: number;
|
|
68
71
|
aztecProofSubmissionEpochs: number;
|
|
69
72
|
activationThreshold: bigint;
|
|
70
73
|
ejectionThreshold: bigint;
|
|
@@ -101,7 +104,7 @@ export declare const getRewardConfig: (networkName: NetworkNames) => {
|
|
|
101
104
|
sequencerBps: number;
|
|
102
105
|
rewardDistributor: `0x${string}`;
|
|
103
106
|
booster: `0x${string}`;
|
|
104
|
-
|
|
107
|
+
checkpointReward: bigint;
|
|
105
108
|
};
|
|
106
109
|
export declare const getRewardBoostConfig: () => {
|
|
107
110
|
increment: number;
|
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,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAEvF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,oFAAoF;IACpF,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,wBAAwB,CAAC;AAEvF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,oFAAoF;IACpF,0BAA0B,EAAE,MAAM,CAAC;IACnC,iFAAiF;IACjF,oBAAoB,EAAE,MAAM,CAAC;IAC7B,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;CAyBR,CAAC;AA2E9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAmBnE,CAAC;AAoBF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAcxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AA2CF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAmB5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAuI3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
|
package/dest/config.js
CHANGED
|
@@ -6,7 +6,8 @@ export const DefaultL1ContractsConfig = {
|
|
|
6
6
|
aztecSlotDuration: 36,
|
|
7
7
|
aztecEpochDuration: 32,
|
|
8
8
|
aztecTargetCommitteeSize: 48,
|
|
9
|
-
|
|
9
|
+
lagInEpochsForValidatorSet: 2,
|
|
10
|
+
lagInEpochsForRandao: 2,
|
|
10
11
|
aztecProofSubmissionEpochs: 1,
|
|
11
12
|
activationThreshold: 100n * 10n ** 18n,
|
|
12
13
|
ejectionThreshold: 50n * 10n ** 18n,
|
|
@@ -19,7 +20,7 @@ export const DefaultL1ContractsConfig = {
|
|
|
19
20
|
slashingExecutionDelayInRounds: 0,
|
|
20
21
|
slashingVetoer: EthAddress.ZERO,
|
|
21
22
|
governanceProposerRoundSize: 300,
|
|
22
|
-
manaTarget: BigInt(
|
|
23
|
+
manaTarget: BigInt(100e6),
|
|
23
24
|
provingCostPerMana: BigInt(100),
|
|
24
25
|
exitDelaySeconds: 2 * 24 * 60 * 60,
|
|
25
26
|
slasherFlavor: 'tally',
|
|
@@ -118,13 +119,13 @@ const DefaultRewardConfig = {
|
|
|
118
119
|
sequencerBps: 8000,
|
|
119
120
|
rewardDistributor: EthAddress.ZERO.toString(),
|
|
120
121
|
booster: EthAddress.ZERO.toString(),
|
|
121
|
-
|
|
122
|
+
checkpointReward: 500n * 10n ** 18n
|
|
122
123
|
};
|
|
123
124
|
const MainnetRewardConfig = {
|
|
124
125
|
sequencerBps: 7_000,
|
|
125
126
|
rewardDistributor: EthAddress.ZERO.toString(),
|
|
126
127
|
booster: EthAddress.ZERO.toString(),
|
|
127
|
-
|
|
128
|
+
checkpointReward: 400n * 10n ** 18n
|
|
128
129
|
};
|
|
129
130
|
export const getRewardConfig = (networkName)=>{
|
|
130
131
|
switch(networkName){
|
|
@@ -229,10 +230,15 @@ export const l1ContractsConfigMappings = {
|
|
|
229
230
|
description: 'The target validator committee size.',
|
|
230
231
|
...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize)
|
|
231
232
|
},
|
|
232
|
-
|
|
233
|
-
env: '
|
|
233
|
+
lagInEpochsForValidatorSet: {
|
|
234
|
+
env: 'AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET',
|
|
234
235
|
description: 'The number of epochs to lag behind the current epoch for validator selection.',
|
|
235
|
-
...numberConfigHelper(DefaultL1ContractsConfig.
|
|
236
|
+
...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForValidatorSet)
|
|
237
|
+
},
|
|
238
|
+
lagInEpochsForRandao: {
|
|
239
|
+
env: 'AZTEC_LAG_IN_EPOCHS_FOR_RANDAO',
|
|
240
|
+
description: 'The number of epochs to lag behind the current epoch for randao selection.',
|
|
241
|
+
...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochsForRandao)
|
|
236
242
|
},
|
|
237
243
|
aztecProofSubmissionEpochs: {
|
|
238
244
|
env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
|
|
@@ -83,7 +83,8 @@ export declare class RollupContract {
|
|
|
83
83
|
getTargetCommitteeSize(): Promise<bigint>;
|
|
84
84
|
getEjectionThreshold(): Promise<bigint>;
|
|
85
85
|
getLocalEjectionThreshold(): Promise<bigint>;
|
|
86
|
-
|
|
86
|
+
getLagInEpochsForValidatorSet(): Promise<bigint>;
|
|
87
|
+
getLagInEpochsForRandao(): Promise<bigint>;
|
|
87
88
|
getActivationThreshold(): Promise<bigint>;
|
|
88
89
|
getExitDelay(): Promise<bigint>;
|
|
89
90
|
getManaTarget(): Promise<bigint>;
|
|
@@ -112,9 +113,9 @@ export declare class RollupContract {
|
|
|
112
113
|
getOwner(): Promise<`0x${string}`>;
|
|
113
114
|
getActiveAttesterCount(): Promise<bigint>;
|
|
114
115
|
getSlashingProposerAddress(): Promise<EthAddress>;
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
116
|
+
getCheckpointReward(): Promise<bigint>;
|
|
117
|
+
getCheckpointNumber(): Promise<bigint>;
|
|
118
|
+
getProvenCheckpointNumber(): Promise<bigint>;
|
|
118
119
|
getSlotNumber(): Promise<bigint>;
|
|
119
120
|
getL1FeesAt(timestamp: bigint): Promise<{
|
|
120
121
|
baseFee: bigint;
|
|
@@ -128,7 +129,7 @@ export declare class RollupContract {
|
|
|
128
129
|
getCurrentEpochCommittee(): Promise<readonly `0x${string}`[] | undefined>;
|
|
129
130
|
getCurrentProposer(): Promise<`0x${string}`>;
|
|
130
131
|
getProposerAt(timestamp: bigint): Promise<`0x${string}`>;
|
|
131
|
-
|
|
132
|
+
getCheckpoint(checkpointNumber: bigint | number): Promise<{
|
|
132
133
|
archive: `0x${string}`;
|
|
133
134
|
headerHash: `0x${string}`;
|
|
134
135
|
blobCommitmentsHash: `0x${string}`;
|
|
@@ -144,15 +145,15 @@ export declare class RollupContract {
|
|
|
144
145
|
};
|
|
145
146
|
}>;
|
|
146
147
|
getTips(): Promise<{
|
|
147
|
-
|
|
148
|
-
|
|
148
|
+
pending: bigint;
|
|
149
|
+
proven: bigint;
|
|
149
150
|
}>;
|
|
150
151
|
getTimestampForSlot(slot: bigint): Promise<bigint>;
|
|
151
152
|
getEntryQueueLength(): Promise<bigint>;
|
|
152
153
|
getAvailableValidatorFlushes(): Promise<bigint>;
|
|
153
154
|
getNextFlushableEpoch(): Promise<bigint>;
|
|
154
155
|
getCurrentEpochNumber(): Promise<bigint>;
|
|
155
|
-
|
|
156
|
+
getEpochNumberForCheckpoint(checkpointNumber: bigint): Promise<bigint>;
|
|
156
157
|
getRollupAddresses(): Promise<L1RollupContractAddresses>;
|
|
157
158
|
getFeeJuicePortal(): Promise<EthAddress>;
|
|
158
159
|
getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
|
|
@@ -175,38 +176,39 @@ export declare class RollupContract {
|
|
|
175
176
|
* @dev Throws if unable to propose
|
|
176
177
|
*
|
|
177
178
|
* @param archive - The archive that we expect to be current state
|
|
178
|
-
* @return [slot,
|
|
179
|
+
* @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
|
|
180
|
+
* timestamp of the next L1 block
|
|
179
181
|
* @throws otherwise
|
|
180
182
|
*/
|
|
181
183
|
canProposeAtNextEthBlock(archive: Buffer, account: `0x${string}` | Account, slotDuration: bigint | number, opts?: {
|
|
182
|
-
|
|
184
|
+
forcePendingCheckpointNumber?: number;
|
|
183
185
|
}): Promise<{
|
|
184
186
|
slot: bigint;
|
|
185
|
-
|
|
187
|
+
checkpointNumber: bigint;
|
|
186
188
|
timeOfNextL1Slot: bigint;
|
|
187
189
|
}>;
|
|
188
190
|
/**
|
|
189
|
-
* Returns a state override that sets the pending
|
|
190
|
-
* Requires querying the current state of the contract to get the current proven
|
|
191
|
+
* Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
|
|
192
|
+
* Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
|
|
191
193
|
* stored in the same slot. If the argument is undefined, it returns an empty override.
|
|
192
194
|
*/
|
|
193
|
-
|
|
195
|
+
makePendingCheckpointNumberOverride(forcePendingCheckpointNumber: number | undefined): Promise<StateOverride>;
|
|
194
196
|
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
|
|
195
|
-
buildInvalidateBadAttestationRequest(
|
|
197
|
+
buildInvalidateBadAttestationRequest(checkpointNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
|
|
196
198
|
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
|
|
197
|
-
buildInvalidateInsufficientAttestationsRequest(
|
|
199
|
+
buildInvalidateInsufficientAttestationsRequest(checkpointNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
|
|
198
200
|
/** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
|
|
199
|
-
getHasSubmittedProof(epochNumber: number,
|
|
201
|
+
getHasSubmittedProof(epochNumber: number, numberOfCheckpointsInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
|
|
200
202
|
getManaBaseFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<bigint>;
|
|
201
203
|
getSlotAt(timestamp: bigint): Promise<bigint>;
|
|
202
|
-
status(
|
|
204
|
+
status(checkpointNumber: bigint, options?: {
|
|
203
205
|
blockNumber?: bigint;
|
|
204
206
|
}): Promise<readonly [bigint, `0x${string}`, bigint, `0x${string}`, `0x${string}`, bigint]>;
|
|
205
207
|
canPruneAtTime(timestamp: bigint, options?: {
|
|
206
208
|
blockNumber?: bigint;
|
|
207
209
|
}): Promise<boolean>;
|
|
208
210
|
archive(): Promise<`0x${string}`>;
|
|
209
|
-
archiveAt(
|
|
211
|
+
archiveAt(checkpointNumber: bigint): Promise<`0x${string}`>;
|
|
210
212
|
getSequencerRewards(address: Hex | EthAddress): Promise<bigint>;
|
|
211
213
|
getSpecificProverRewardsForEpoch(epoch: bigint, prover: Hex | EthAddress): Promise<bigint>;
|
|
212
214
|
getAttesters(): Promise<`0x${string}`[]>;
|
|
@@ -230,14 +232,14 @@ export declare class RollupContract {
|
|
|
230
232
|
};
|
|
231
233
|
}>;
|
|
232
234
|
getStatus(address: Hex | EthAddress): Promise<number>;
|
|
233
|
-
getBlobCommitmentsHash(
|
|
235
|
+
getBlobCommitmentsHash(checkpointNumber: bigint): Promise<`0x${string}`>;
|
|
234
236
|
getCurrentBlobCommitmentsHash(): Promise<`0x${string}`>;
|
|
235
237
|
getStakingAsset(): Promise<`0x${string}`>;
|
|
236
238
|
getRewardConfig(): Promise<{
|
|
237
239
|
rewardDistributor: `0x${string}`;
|
|
238
240
|
sequencerBps: number;
|
|
239
241
|
booster: `0x${string}`;
|
|
240
|
-
|
|
242
|
+
checkpointReward: bigint;
|
|
241
243
|
}>;
|
|
242
244
|
setupEpoch(l1TxUtils: L1TxUtils): Promise<{
|
|
243
245
|
receipt: import("viem").TransactionReceipt;
|
|
@@ -251,8 +253,8 @@ export declare class RollupContract {
|
|
|
251
253
|
oldSlasher: `0x${string}`;
|
|
252
254
|
newSlasher: `0x${string}`;
|
|
253
255
|
}) => unknown): WatchContractEventReturnType;
|
|
254
|
-
|
|
255
|
-
|
|
256
|
+
listenToCheckpointInvalidated(callback: (args: {
|
|
257
|
+
checkpointNumber: bigint;
|
|
256
258
|
}) => unknown): WatchContractEventReturnType;
|
|
257
259
|
getSlashEvents(l1BlockHash: Hex): Promise<{
|
|
258
260
|
amount: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
|
package/dest/contracts/rollup.js
CHANGED
|
@@ -125,8 +125,11 @@ export class RollupContract {
|
|
|
125
125
|
getLocalEjectionThreshold() {
|
|
126
126
|
return this.rollup.read.getLocalEjectionThreshold();
|
|
127
127
|
}
|
|
128
|
-
|
|
129
|
-
return this.rollup.read.
|
|
128
|
+
getLagInEpochsForValidatorSet() {
|
|
129
|
+
return this.rollup.read.getLagInEpochsForValidatorSet();
|
|
130
|
+
}
|
|
131
|
+
getLagInEpochsForRandao() {
|
|
132
|
+
return this.rollup.read.getLagInEpochsForRandao();
|
|
130
133
|
}
|
|
131
134
|
getActivationThreshold() {
|
|
132
135
|
return this.rollup.read.getActivationThreshold();
|
|
@@ -199,14 +202,14 @@ export class RollupContract {
|
|
|
199
202
|
}
|
|
200
203
|
return await slasher.getProposer();
|
|
201
204
|
}
|
|
202
|
-
|
|
203
|
-
return this.rollup.read.
|
|
205
|
+
getCheckpointReward() {
|
|
206
|
+
return this.rollup.read.getCheckpointReward();
|
|
204
207
|
}
|
|
205
|
-
|
|
206
|
-
return this.rollup.read.
|
|
208
|
+
getCheckpointNumber() {
|
|
209
|
+
return this.rollup.read.getPendingCheckpointNumber();
|
|
207
210
|
}
|
|
208
|
-
|
|
209
|
-
return this.rollup.read.
|
|
211
|
+
getProvenCheckpointNumber() {
|
|
212
|
+
return this.rollup.read.getProvenCheckpointNumber();
|
|
210
213
|
}
|
|
211
214
|
getSlotNumber() {
|
|
212
215
|
return this.rollup.read.getCurrentSlot();
|
|
@@ -284,9 +287,9 @@ export class RollupContract {
|
|
|
284
287
|
});
|
|
285
288
|
return result;
|
|
286
289
|
}
|
|
287
|
-
|
|
288
|
-
return this.rollup.read.
|
|
289
|
-
BigInt(
|
|
290
|
+
getCheckpoint(checkpointNumber) {
|
|
291
|
+
return this.rollup.read.getCheckpoint([
|
|
292
|
+
BigInt(checkpointNumber)
|
|
290
293
|
]);
|
|
291
294
|
}
|
|
292
295
|
getTips() {
|
|
@@ -309,9 +312,9 @@ export class RollupContract {
|
|
|
309
312
|
getCurrentEpochNumber() {
|
|
310
313
|
return this.rollup.read.getCurrentEpoch();
|
|
311
314
|
}
|
|
312
|
-
|
|
313
|
-
return this.rollup.read.
|
|
314
|
-
BigInt(
|
|
315
|
+
getEpochNumberForCheckpoint(checkpointNumber) {
|
|
316
|
+
return this.rollup.read.getEpochForCheckpoint([
|
|
317
|
+
BigInt(checkpointNumber)
|
|
315
318
|
]);
|
|
316
319
|
}
|
|
317
320
|
async getRollupAddresses() {
|
|
@@ -365,7 +368,8 @@ export class RollupContract {
|
|
|
365
368
|
* @dev Throws if unable to propose
|
|
366
369
|
*
|
|
367
370
|
* @param archive - The archive that we expect to be current state
|
|
368
|
-
* @return [slot,
|
|
371
|
+
* @return [slot, checkpointNumber, timeOfNextL1Slot] - If you can propose, the L2 slot number, checkpoint number and
|
|
372
|
+
* timestamp of the next L1 block
|
|
369
373
|
* @throws otherwise
|
|
370
374
|
*/ async canProposeAtNextEthBlock(archive, account, slotDuration, opts = {}) {
|
|
371
375
|
if (typeof slotDuration === 'number') {
|
|
@@ -375,7 +379,7 @@ export class RollupContract {
|
|
|
375
379
|
const timeOfNextL1Slot = latestBlock.timestamp + slotDuration;
|
|
376
380
|
const who = typeof account === 'string' ? account : account.address;
|
|
377
381
|
try {
|
|
378
|
-
const { result: [slot,
|
|
382
|
+
const { result: [slot, checkpointNumber] } = await this.client.simulateContract({
|
|
379
383
|
address: this.address,
|
|
380
384
|
abi: RollupAbi,
|
|
381
385
|
functionName: 'canProposeAtTime',
|
|
@@ -385,11 +389,11 @@ export class RollupContract {
|
|
|
385
389
|
who
|
|
386
390
|
],
|
|
387
391
|
account,
|
|
388
|
-
stateOverride: await this.
|
|
392
|
+
stateOverride: await this.makePendingCheckpointNumberOverride(opts.forcePendingCheckpointNumber)
|
|
389
393
|
});
|
|
390
394
|
return {
|
|
391
395
|
slot,
|
|
392
|
-
|
|
396
|
+
checkpointNumber,
|
|
393
397
|
timeOfNextL1Slot
|
|
394
398
|
};
|
|
395
399
|
} catch (err) {
|
|
@@ -397,11 +401,11 @@ export class RollupContract {
|
|
|
397
401
|
}
|
|
398
402
|
}
|
|
399
403
|
/**
|
|
400
|
-
* Returns a state override that sets the pending
|
|
401
|
-
* Requires querying the current state of the contract to get the current proven
|
|
404
|
+
* Returns a state override that sets the pending checkpoint number to the specified value. Useful for simulations.
|
|
405
|
+
* Requires querying the current state of the contract to get the current proven checkpoint number, as they are both
|
|
402
406
|
* stored in the same slot. If the argument is undefined, it returns an empty override.
|
|
403
|
-
*/ async
|
|
404
|
-
if (
|
|
407
|
+
*/ async makePendingCheckpointNumberOverride(forcePendingCheckpointNumber) {
|
|
408
|
+
if (forcePendingCheckpointNumber === undefined) {
|
|
405
409
|
return [];
|
|
406
410
|
}
|
|
407
411
|
const slot = RollupContract.stfStorageSlot;
|
|
@@ -409,8 +413,8 @@ export class RollupContract {
|
|
|
409
413
|
address: this.address,
|
|
410
414
|
slot
|
|
411
415
|
});
|
|
412
|
-
const
|
|
413
|
-
const newValue = BigInt(
|
|
416
|
+
const currentProvenCheckpointNumber = currentValue ? hexToBigInt(currentValue) & (1n << 128n) - 1n : 0n;
|
|
417
|
+
const newValue = BigInt(forcePendingCheckpointNumber) << 128n | currentProvenCheckpointNumber;
|
|
414
418
|
return [
|
|
415
419
|
{
|
|
416
420
|
address: this.address,
|
|
@@ -423,14 +427,14 @@ export class RollupContract {
|
|
|
423
427
|
}
|
|
424
428
|
];
|
|
425
429
|
}
|
|
426
|
-
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(
|
|
430
|
+
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(checkpointNumber, attestationsAndSigners, committee, invalidIndex) {
|
|
427
431
|
return {
|
|
428
432
|
to: this.address,
|
|
429
433
|
data: encodeFunctionData({
|
|
430
434
|
abi: RollupAbi,
|
|
431
435
|
functionName: 'invalidateBadAttestation',
|
|
432
436
|
args: [
|
|
433
|
-
BigInt(
|
|
437
|
+
BigInt(checkpointNumber),
|
|
434
438
|
attestationsAndSigners,
|
|
435
439
|
committee.map((addr)=>addr.toString()),
|
|
436
440
|
BigInt(invalidIndex)
|
|
@@ -438,27 +442,27 @@ export class RollupContract {
|
|
|
438
442
|
})
|
|
439
443
|
};
|
|
440
444
|
}
|
|
441
|
-
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(
|
|
445
|
+
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(checkpointNumber, attestationsAndSigners, committee) {
|
|
442
446
|
return {
|
|
443
447
|
to: this.address,
|
|
444
448
|
data: encodeFunctionData({
|
|
445
449
|
abi: RollupAbi,
|
|
446
450
|
functionName: 'invalidateInsufficientAttestations',
|
|
447
451
|
args: [
|
|
448
|
-
BigInt(
|
|
452
|
+
BigInt(checkpointNumber),
|
|
449
453
|
attestationsAndSigners,
|
|
450
454
|
committee.map((addr)=>addr.toString())
|
|
451
455
|
]
|
|
452
456
|
})
|
|
453
457
|
};
|
|
454
458
|
}
|
|
455
|
-
/** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */ getHasSubmittedProof(epochNumber,
|
|
459
|
+
/** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */ getHasSubmittedProof(epochNumber, numberOfCheckpointsInEpoch, prover) {
|
|
456
460
|
if (prover instanceof EthAddress) {
|
|
457
461
|
prover = prover.toString();
|
|
458
462
|
}
|
|
459
463
|
return this.rollup.read.getHasSubmitted([
|
|
460
464
|
BigInt(epochNumber),
|
|
461
|
-
BigInt(
|
|
465
|
+
BigInt(numberOfCheckpointsInEpoch),
|
|
462
466
|
prover
|
|
463
467
|
]);
|
|
464
468
|
}
|
|
@@ -473,10 +477,10 @@ export class RollupContract {
|
|
|
473
477
|
timestamp
|
|
474
478
|
]);
|
|
475
479
|
}
|
|
476
|
-
async status(
|
|
480
|
+
async status(checkpointNumber, options) {
|
|
477
481
|
await checkBlockTag(options?.blockNumber, this.client);
|
|
478
482
|
return this.rollup.read.status([
|
|
479
|
-
|
|
483
|
+
checkpointNumber
|
|
480
484
|
], options);
|
|
481
485
|
}
|
|
482
486
|
async canPruneAtTime(timestamp, options) {
|
|
@@ -488,9 +492,9 @@ export class RollupContract {
|
|
|
488
492
|
archive() {
|
|
489
493
|
return this.rollup.read.archive();
|
|
490
494
|
}
|
|
491
|
-
archiveAt(
|
|
495
|
+
archiveAt(checkpointNumber) {
|
|
492
496
|
return this.rollup.read.archiveAt([
|
|
493
|
-
|
|
497
|
+
checkpointNumber
|
|
494
498
|
]);
|
|
495
499
|
}
|
|
496
500
|
getSequencerRewards(address) {
|
|
@@ -536,9 +540,9 @@ export class RollupContract {
|
|
|
536
540
|
address
|
|
537
541
|
]);
|
|
538
542
|
}
|
|
539
|
-
getBlobCommitmentsHash(
|
|
543
|
+
getBlobCommitmentsHash(checkpointNumber) {
|
|
540
544
|
return this.rollup.read.getBlobCommitmentsHash([
|
|
541
|
-
|
|
545
|
+
checkpointNumber
|
|
542
546
|
]);
|
|
543
547
|
}
|
|
544
548
|
getCurrentBlobCommitmentsHash() {
|
|
@@ -584,14 +588,14 @@ export class RollupContract {
|
|
|
584
588
|
}
|
|
585
589
|
});
|
|
586
590
|
}
|
|
587
|
-
|
|
588
|
-
return this.rollup.watchEvent.
|
|
591
|
+
listenToCheckpointInvalidated(callback) {
|
|
592
|
+
return this.rollup.watchEvent.CheckpointInvalidated({}, {
|
|
589
593
|
onLogs: (logs)=>{
|
|
590
594
|
for (const log of logs){
|
|
591
595
|
const args = log.args;
|
|
592
|
-
if (args.
|
|
596
|
+
if (args.checkpointNumber !== undefined) {
|
|
593
597
|
callback({
|
|
594
|
-
|
|
598
|
+
checkpointNumber: args.checkpointNumber
|
|
595
599
|
});
|
|
596
600
|
}
|
|
597
601
|
}
|
|
@@ -649,7 +653,10 @@ _ts_decorate([
|
|
|
649
653
|
], RollupContract.prototype, "getLocalEjectionThreshold", null);
|
|
650
654
|
_ts_decorate([
|
|
651
655
|
memoize
|
|
652
|
-
], RollupContract.prototype, "
|
|
656
|
+
], RollupContract.prototype, "getLagInEpochsForValidatorSet", null);
|
|
657
|
+
_ts_decorate([
|
|
658
|
+
memoize
|
|
659
|
+
], RollupContract.prototype, "getLagInEpochsForRandao", null);
|
|
653
660
|
_ts_decorate([
|
|
654
661
|
memoize
|
|
655
662
|
], RollupContract.prototype, "getActivationThreshold", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
|
|
@@ -310,8 +310,8 @@ export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
|
|
|
310
310
|
const registry = new RegistryContract(l1Client, registryAddress);
|
|
311
311
|
/* -------------------------------------------------------------------------- */ /* FUND REWARD DISTRIBUTOR START */ /* -------------------------------------------------------------------------- */ const rewardDistributorAddress = await registry.getRewardDistributor();
|
|
312
312
|
if (!args.existingTokenAddress) {
|
|
313
|
-
const
|
|
314
|
-
const funding =
|
|
313
|
+
const checkpointReward = getRewardConfig(networkName).checkpointReward;
|
|
314
|
+
const funding = checkpointReward * 200000n;
|
|
315
315
|
const { txHash: fundRewardDistributorTxHash } = await deployer.sendTransaction({
|
|
316
316
|
to: feeAssetAddress.toString(),
|
|
317
317
|
data: encodeFunctionData({
|
|
@@ -654,7 +654,8 @@ function slasherFlavorToSolidityEnum(flavor) {
|
|
|
654
654
|
aztecSlotDuration: BigInt(args.aztecSlotDuration),
|
|
655
655
|
aztecEpochDuration: BigInt(args.aztecEpochDuration),
|
|
656
656
|
targetCommitteeSize: BigInt(args.aztecTargetCommitteeSize),
|
|
657
|
-
|
|
657
|
+
lagInEpochsForValidatorSet: BigInt(args.lagInEpochsForValidatorSet),
|
|
658
|
+
lagInEpochsForRandao: BigInt(args.lagInEpochsForRandao),
|
|
658
659
|
aztecProofSubmissionEpochs: BigInt(args.aztecProofSubmissionEpochs),
|
|
659
660
|
slashingQuorum: BigInt(args.slashingQuorum ?? args.slashingRoundSizeInEpochs * args.aztecEpochDuration / 2 + 1),
|
|
660
661
|
slashingRoundSize: BigInt(args.slashingRoundSizeInEpochs * args.aztecEpochDuration),
|