@aztec/ethereum 2.0.3-rc.9 → 2.1.0-rc.1
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 +9 -4
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +26 -38
- package/dest/contracts/multicall.d.ts.map +1 -1
- package/dest/contracts/multicall.js +4 -0
- package/dest/contracts/rollup.d.ts +8 -9
- package/dest/contracts/rollup.d.ts.map +1 -1
- package/dest/contracts/rollup.js +23 -64
- package/dest/contracts/slasher_contract.d.ts +10 -0
- package/dest/contracts/slasher_contract.d.ts.map +1 -1
- package/dest/contracts/slasher_contract.js +18 -0
- package/dest/deploy_l1_contracts.d.ts +16 -2
- package/dest/deploy_l1_contracts.d.ts.map +1 -1
- package/dest/deploy_l1_contracts.js +297 -155
- package/dest/l1_artifacts.d.ts +8019 -5948
- package/dest/l1_artifacts.d.ts.map +1 -1
- package/dest/l1_artifacts.js +6 -1
- package/dest/l1_contract_addresses.d.ts +5 -1
- package/dest/l1_contract_addresses.d.ts.map +1 -1
- package/dest/l1_contract_addresses.js +2 -1
- package/dest/l1_tx_utils.d.ts.map +1 -1
- package/dest/l1_tx_utils.js +3 -2
- package/dest/publisher_manager.d.ts +4 -1
- package/dest/publisher_manager.d.ts.map +1 -1
- package/dest/publisher_manager.js +10 -2
- package/dest/queries.d.ts.map +1 -1
- package/dest/queries.js +8 -2
- package/dest/test/rollup_cheat_codes.d.ts +3 -1
- package/dest/test/rollup_cheat_codes.d.ts.map +1 -1
- package/dest/test/rollup_cheat_codes.js +2 -2
- package/package.json +5 -5
- package/src/config.ts +33 -43
- package/src/contracts/multicall.ts +5 -0
- package/src/contracts/rollup.ts +26 -81
- package/src/contracts/slasher_contract.ts +22 -0
- package/src/deploy_l1_contracts.ts +336 -169
- package/src/l1_artifacts.ts +8 -0
- package/src/l1_contract_addresses.ts +3 -1
- package/src/l1_tx_utils.ts +3 -2
- package/src/publisher_manager.ts +14 -4
- package/src/queries.ts +10 -1
- package/src/test/rollup_cheat_codes.ts +5 -2
package/dest/config.d.ts
CHANGED
|
@@ -16,12 +16,16 @@ export type L1ContractsConfig = {
|
|
|
16
16
|
aztecEpochDuration: number;
|
|
17
17
|
/** The target validator committee size. */
|
|
18
18
|
aztecTargetCommitteeSize: number;
|
|
19
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */
|
|
20
|
+
lagInEpochs: number;
|
|
19
21
|
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
20
22
|
aztecProofSubmissionEpochs: number;
|
|
21
23
|
/** The deposit amount for a validator */
|
|
22
24
|
activationThreshold: bigint;
|
|
23
25
|
/** The minimum stake for a validator. */
|
|
24
26
|
ejectionThreshold: bigint;
|
|
27
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
|
|
28
|
+
localEjectionThreshold: bigint;
|
|
25
29
|
/** The slashing quorum, i.e. how many slots must signal for the same payload in a round for it to be submittable to the Slasher (defaults to slashRoundSize / 2 + 1) */
|
|
26
30
|
slashingQuorum?: number;
|
|
27
31
|
/** The slashing round size, i.e. how many epochs are in a slashing round */
|
|
@@ -34,6 +38,8 @@ export type L1ContractsConfig = {
|
|
|
34
38
|
slashingVetoer: EthAddress;
|
|
35
39
|
/** How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset) */
|
|
36
40
|
slashingOffsetInRounds: number;
|
|
41
|
+
/** How long slashing can be disabled for in seconds when vetoer disables it */
|
|
42
|
+
slashingDisableDuration: number;
|
|
37
43
|
/** Type of slasher proposer */
|
|
38
44
|
slasherFlavor: 'empire' | 'tally' | 'none';
|
|
39
45
|
/** Minimum amount that can be slashed in tally slashing */
|
|
@@ -58,9 +64,11 @@ export declare const DefaultL1ContractsConfig: {
|
|
|
58
64
|
aztecSlotDuration: number;
|
|
59
65
|
aztecEpochDuration: number;
|
|
60
66
|
aztecTargetCommitteeSize: number;
|
|
67
|
+
lagInEpochs: number;
|
|
61
68
|
aztecProofSubmissionEpochs: number;
|
|
62
69
|
activationThreshold: bigint;
|
|
63
70
|
ejectionThreshold: bigint;
|
|
71
|
+
localEjectionThreshold: bigint;
|
|
64
72
|
slashAmountSmall: bigint;
|
|
65
73
|
slashAmountMedium: bigint;
|
|
66
74
|
slashAmountLarge: bigint;
|
|
@@ -74,6 +82,7 @@ export declare const DefaultL1ContractsConfig: {
|
|
|
74
82
|
exitDelaySeconds: number;
|
|
75
83
|
slasherFlavor: "tally";
|
|
76
84
|
slashingOffsetInRounds: number;
|
|
85
|
+
slashingDisableDuration: number;
|
|
77
86
|
};
|
|
78
87
|
export declare const getGovernanceConfiguration: (networkName: NetworkNames) => {
|
|
79
88
|
proposeConfig: {
|
|
@@ -88,10 +97,6 @@ export declare const getGovernanceConfiguration: (networkName: NetworkNames) =>
|
|
|
88
97
|
requiredYeaMargin: bigint;
|
|
89
98
|
minimumVotes: bigint;
|
|
90
99
|
};
|
|
91
|
-
export declare const getGSEConfiguration: (networkName: NetworkNames) => {
|
|
92
|
-
activationThreshold: bigint;
|
|
93
|
-
ejectionThreshold: bigint;
|
|
94
|
-
};
|
|
95
100
|
export declare const getRewardConfig: (networkName: NetworkNames) => {
|
|
96
101
|
sequencerBps: number;
|
|
97
102
|
rewardDistributor: `0x${string}`;
|
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,kBAAkB,CAAC;AAEjF,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,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,+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
|
|
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,kBAAkB,CAAC;AAEjF,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,WAAW,EAAE,MAAM,CAAC;IACpB,+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;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAC;AA4D9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAanE,CAAC;AAaF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAUxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AAmCF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAa5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkI3E,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,9 +6,11 @@ export const DefaultL1ContractsConfig = {
|
|
|
6
6
|
aztecSlotDuration: 36,
|
|
7
7
|
aztecEpochDuration: 32,
|
|
8
8
|
aztecTargetCommitteeSize: 48,
|
|
9
|
+
lagInEpochs: 2,
|
|
9
10
|
aztecProofSubmissionEpochs: 1,
|
|
10
11
|
activationThreshold: 100n * 10n ** 18n,
|
|
11
12
|
ejectionThreshold: 50n * 10n ** 18n,
|
|
13
|
+
localEjectionThreshold: 98n * 10n ** 18n,
|
|
12
14
|
slashAmountSmall: 10n * 10n ** 18n,
|
|
13
15
|
slashAmountMedium: 20n * 10n ** 18n,
|
|
14
16
|
slashAmountLarge: 50n * 10n ** 18n,
|
|
@@ -21,7 +23,8 @@ export const DefaultL1ContractsConfig = {
|
|
|
21
23
|
provingCostPerMana: BigInt(100),
|
|
22
24
|
exitDelaySeconds: 2 * 24 * 60 * 60,
|
|
23
25
|
slasherFlavor: 'tally',
|
|
24
|
-
slashingOffsetInRounds: 2
|
|
26
|
+
slashingOffsetInRounds: 2,
|
|
27
|
+
slashingDisableDuration: 5 * 24 * 60 * 60
|
|
25
28
|
};
|
|
26
29
|
const LocalGovernanceConfiguration = {
|
|
27
30
|
proposeConfig: {
|
|
@@ -89,36 +92,6 @@ export const getGovernanceConfiguration = (networkName)=>{
|
|
|
89
92
|
throw new Error(`Unrecognized network name: ${networkName}`);
|
|
90
93
|
}
|
|
91
94
|
};
|
|
92
|
-
const LocalGSEConfiguration = {
|
|
93
|
-
activationThreshold: BigInt(100e18),
|
|
94
|
-
ejectionThreshold: BigInt(50e18)
|
|
95
|
-
};
|
|
96
|
-
const StagingPublicGSEConfiguration = {
|
|
97
|
-
activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
98
|
-
ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold
|
|
99
|
-
};
|
|
100
|
-
const TestnetGSEConfiguration = {
|
|
101
|
-
activationThreshold: BigInt(100e18),
|
|
102
|
-
ejectionThreshold: BigInt(50e18)
|
|
103
|
-
};
|
|
104
|
-
const StagingIgnitionGSEConfiguration = {
|
|
105
|
-
activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
106
|
-
ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold
|
|
107
|
-
};
|
|
108
|
-
export const getGSEConfiguration = (networkName)=>{
|
|
109
|
-
switch(networkName){
|
|
110
|
-
case 'local':
|
|
111
|
-
return LocalGSEConfiguration;
|
|
112
|
-
case 'staging-public':
|
|
113
|
-
return StagingPublicGSEConfiguration;
|
|
114
|
-
case 'testnet':
|
|
115
|
-
return TestnetGSEConfiguration;
|
|
116
|
-
case 'staging-ignition':
|
|
117
|
-
return StagingIgnitionGSEConfiguration;
|
|
118
|
-
default:
|
|
119
|
-
throw new Error(`Unrecognized network name: ${networkName}`);
|
|
120
|
-
}
|
|
121
|
-
};
|
|
122
95
|
// Making a default config here as we are only using it thought the deployment
|
|
123
96
|
// and do not expect to be using different setups, so having environment variables
|
|
124
97
|
// for it seems overkill
|
|
@@ -160,8 +133,8 @@ const LocalEntryQueueConfig = {
|
|
|
160
133
|
};
|
|
161
134
|
const StagingPublicEntryQueueConfig = {
|
|
162
135
|
bootstrapValidatorSetSize: 48n,
|
|
163
|
-
bootstrapFlushSize:
|
|
164
|
-
normalFlushSizeMin:
|
|
136
|
+
bootstrapFlushSize: 48n,
|
|
137
|
+
normalFlushSizeMin: 1n,
|
|
165
138
|
normalFlushSizeQuotient: 2475n,
|
|
166
139
|
maxQueueFlushSize: 32n
|
|
167
140
|
};
|
|
@@ -173,11 +146,11 @@ const TestnetEntryQueueConfig = {
|
|
|
173
146
|
maxQueueFlushSize: 32n
|
|
174
147
|
};
|
|
175
148
|
const StagingIgnitionEntryQueueConfig = {
|
|
176
|
-
bootstrapValidatorSetSize:
|
|
177
|
-
bootstrapFlushSize:
|
|
149
|
+
bootstrapValidatorSetSize: 48n,
|
|
150
|
+
bootstrapFlushSize: 48n,
|
|
178
151
|
normalFlushSizeMin: 1n,
|
|
179
152
|
normalFlushSizeQuotient: 2048n,
|
|
180
|
-
maxQueueFlushSize:
|
|
153
|
+
maxQueueFlushSize: 24n
|
|
181
154
|
};
|
|
182
155
|
export const getEntryQueueConfig = (networkName)=>{
|
|
183
156
|
switch(networkName){
|
|
@@ -214,6 +187,11 @@ export const l1ContractsConfigMappings = {
|
|
|
214
187
|
description: 'The target validator committee size.',
|
|
215
188
|
...numberConfigHelper(DefaultL1ContractsConfig.aztecTargetCommitteeSize)
|
|
216
189
|
},
|
|
190
|
+
lagInEpochs: {
|
|
191
|
+
env: 'AZTEC_LAG_IN_EPOCHS',
|
|
192
|
+
description: 'The number of epochs to lag behind the current epoch for validator selection.',
|
|
193
|
+
...numberConfigHelper(DefaultL1ContractsConfig.lagInEpochs)
|
|
194
|
+
},
|
|
217
195
|
aztecProofSubmissionEpochs: {
|
|
218
196
|
env: 'AZTEC_PROOF_SUBMISSION_EPOCHS',
|
|
219
197
|
description: 'The number of epochs after an epoch ends that proofs are still accepted.',
|
|
@@ -229,6 +207,11 @@ export const l1ContractsConfigMappings = {
|
|
|
229
207
|
description: 'The minimum stake for a validator.',
|
|
230
208
|
...bigintConfigHelper(DefaultL1ContractsConfig.ejectionThreshold)
|
|
231
209
|
},
|
|
210
|
+
localEjectionThreshold: {
|
|
211
|
+
env: 'AZTEC_LOCAL_EJECTION_THRESHOLD',
|
|
212
|
+
description: 'The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup',
|
|
213
|
+
...bigintConfigHelper(DefaultL1ContractsConfig.localEjectionThreshold)
|
|
214
|
+
},
|
|
232
215
|
slashingOffsetInRounds: {
|
|
233
216
|
env: 'AZTEC_SLASHING_OFFSET_IN_ROUNDS',
|
|
234
217
|
description: 'How many slashing rounds back we slash (ie when slashing in round N, we slash for offenses committed during epochs of round N-offset)',
|
|
@@ -284,6 +267,11 @@ export const l1ContractsConfigMappings = {
|
|
|
284
267
|
parseEnv: (val)=>EthAddress.fromString(val),
|
|
285
268
|
defaultValue: DefaultL1ContractsConfig.slashingVetoer
|
|
286
269
|
},
|
|
270
|
+
slashingDisableDuration: {
|
|
271
|
+
env: 'AZTEC_SLASHING_DISABLE_DURATION',
|
|
272
|
+
description: 'How long slashing can be disabled for in seconds when vetoer disables it',
|
|
273
|
+
...numberConfigHelper(DefaultL1ContractsConfig.slashingDisableDuration)
|
|
274
|
+
},
|
|
287
275
|
governanceProposerQuorum: {
|
|
288
276
|
env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
|
|
289
277
|
description: 'The governance proposing quorum',
|
|
@@ -347,12 +335,12 @@ export function getGenesisStateConfigEnvVars() {
|
|
|
347
335
|
errors.push(`aztecSlotDuration (${config.aztecSlotDuration}) must be a multiple of ethereumSlotDuration (${config.ethereumSlotDuration})`);
|
|
348
336
|
}
|
|
349
337
|
// EmpireBase constructor validations for governance/slashing proposers
|
|
350
|
-
// From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.
|
|
338
|
+
// From: require(QUORUM_SIZE > ROUND_SIZE / 2, Errors.EmpireBase__InvalidQuorumAndRoundSize(QUORUM_SIZE, ROUND_SIZE));
|
|
351
339
|
const { governanceProposerQuorum, governanceProposerRoundSize } = config;
|
|
352
340
|
if (governanceProposerQuorum !== undefined && governanceProposerQuorum <= Math.floor(governanceProposerRoundSize / 2)) {
|
|
353
341
|
errors.push(`governanceProposerQuorum (${governanceProposerQuorum}) must be greater than half of governanceProposerRoundSize (${Math.floor(governanceProposerRoundSize / 2)})`);
|
|
354
342
|
}
|
|
355
|
-
// From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.
|
|
343
|
+
// From: require(QUORUM_SIZE <= ROUND_SIZE, Errors.EmpireBase__QuorumCannotBeLargerThanRoundSize(QUORUM_SIZE, ROUND_SIZE));
|
|
356
344
|
if (governanceProposerQuorum !== undefined && governanceProposerQuorum > governanceProposerRoundSize) {
|
|
357
345
|
errors.push(`governanceProposerQuorum (${governanceProposerQuorum}) cannot be larger than governanceProposerRoundSize (${governanceProposerRoundSize})`);
|
|
358
346
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multicall.d.ts","sourceRoot":"","sources":["../../src/contracts/multicall.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAqC,KAAK,GAAG,EAAqC,MAAM,MAAM,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAmB,MAAM,aAAa,CAAC;AAGlE,eAAO,MAAM,oBAAoB,EAAG,4CAAqD,CAAC;AAE1F,qBAAa,UAAU;WACR,OAAO,CAClB,QAAQ,EAAE,WAAW,EAAE,EACvB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,UAAU,EAAE,YAAY,GAAG,SAAS,EACpC,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAO;;;;;;;;;;;CAuG3C;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,iBA+BxF"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { toHex as toPaddedHex } from '@aztec/foundation/bigint-buffer';
|
|
2
|
+
import { TimeoutError } from '@aztec/foundation/error';
|
|
2
3
|
import { encodeFunctionData, multicall3Abi } from 'viem';
|
|
3
4
|
import { FormattedViemError, formatViemError } from '../utils.js';
|
|
4
5
|
import { RollupContract } from './rollup.js';
|
|
@@ -73,6 +74,9 @@ export class Multicall3 {
|
|
|
73
74
|
};
|
|
74
75
|
}
|
|
75
76
|
} catch (err) {
|
|
77
|
+
if (err instanceof TimeoutError) {
|
|
78
|
+
throw err;
|
|
79
|
+
}
|
|
76
80
|
for (const request of requests){
|
|
77
81
|
logger.debug('Simulating request', {
|
|
78
82
|
request
|
|
@@ -81,6 +81,8 @@ export declare class RollupContract {
|
|
|
81
81
|
getSlotDuration(): Promise<bigint>;
|
|
82
82
|
getTargetCommitteeSize(): Promise<bigint>;
|
|
83
83
|
getEjectionThreshold(): Promise<bigint>;
|
|
84
|
+
getLocalEjectionThreshold(): Promise<bigint>;
|
|
85
|
+
getLagInEpochs(): Promise<bigint>;
|
|
84
86
|
getActivationThreshold(): Promise<bigint>;
|
|
85
87
|
getExitDelay(): Promise<bigint>;
|
|
86
88
|
getManaTarget(): Promise<bigint>;
|
|
@@ -147,6 +149,9 @@ export declare class RollupContract {
|
|
|
147
149
|
getTimestampForSlot(slot: bigint): Promise<bigint>;
|
|
148
150
|
getEntryQueueLength(): Promise<bigint>;
|
|
149
151
|
getEpochNumber(blockNumber?: bigint): Promise<bigint>;
|
|
152
|
+
getAvailableValidatorFlushes(): Promise<bigint>;
|
|
153
|
+
getNextFlushableEpoch(): Promise<bigint>;
|
|
154
|
+
getCurrentEpochNumber(): Promise<bigint>;
|
|
150
155
|
getRollupAddresses(): Promise<L1RollupContractAddresses>;
|
|
151
156
|
getFeeJuicePortal(): Promise<EthAddress>;
|
|
152
157
|
getEpochNumberForSlotNumber(slotNumber: bigint): Promise<bigint>;
|
|
@@ -155,6 +160,7 @@ export declare class RollupContract {
|
|
|
155
160
|
ViemHeader,
|
|
156
161
|
ViemCommitteeAttestations,
|
|
157
162
|
`0x${string}`[],
|
|
163
|
+
ViemSignature,
|
|
158
164
|
`0x${string}`,
|
|
159
165
|
`0x${string}`,
|
|
160
166
|
{
|
|
@@ -162,13 +168,6 @@ export declare class RollupContract {
|
|
|
162
168
|
ignoreSignatures: boolean;
|
|
163
169
|
}
|
|
164
170
|
], account: `0x${string}` | Account): Promise<void>;
|
|
165
|
-
/**
|
|
166
|
-
* Packs an array of committee attestations into the format expected by the Solidity contract
|
|
167
|
-
*
|
|
168
|
-
* @param attestations - Array of committee attestations with addresses and signatures
|
|
169
|
-
* @returns Packed attestations with bitmap and tightly packed signature/address data
|
|
170
|
-
*/
|
|
171
|
-
static packAttestations(attestations: ViemCommitteeAttestation[]): ViemCommitteeAttestations;
|
|
172
171
|
/**
|
|
173
172
|
* @notice Calls `canProposeAtTime` with the time of the next Ethereum block and the sender address
|
|
174
173
|
*
|
|
@@ -192,9 +191,9 @@ export declare class RollupContract {
|
|
|
192
191
|
*/
|
|
193
192
|
makePendingBlockNumberOverride(forcePendingBlockNumber: number | undefined): Promise<StateOverride>;
|
|
194
193
|
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */
|
|
195
|
-
buildInvalidateBadAttestationRequest(blockNumber: number,
|
|
194
|
+
buildInvalidateBadAttestationRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[], invalidIndex: number): L1TxRequest;
|
|
196
195
|
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */
|
|
197
|
-
buildInvalidateInsufficientAttestationsRequest(blockNumber: number,
|
|
196
|
+
buildInvalidateInsufficientAttestationsRequest(blockNumber: number, attestationsAndSigners: ViemCommitteeAttestations, committee: EthAddress[]): L1TxRequest;
|
|
198
197
|
/** Calls getHasSubmitted directly. Returns whether the given prover has submitted a proof with the given length for the given epoch. */
|
|
199
198
|
getHasSubmittedProof(epochNumber: number, numberOfBlocksInEpoch: number, prover: Hex | EthAddress): Promise<boolean>;
|
|
200
199
|
getManaBaseFeeAt(timestamp: bigint, inFeeAsset: boolean): Promise<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
|
@@ -122,6 +122,12 @@ export class RollupContract {
|
|
|
122
122
|
getEjectionThreshold() {
|
|
123
123
|
return this.rollup.read.getEjectionThreshold();
|
|
124
124
|
}
|
|
125
|
+
getLocalEjectionThreshold() {
|
|
126
|
+
return this.rollup.read.getLocalEjectionThreshold();
|
|
127
|
+
}
|
|
128
|
+
getLagInEpochs() {
|
|
129
|
+
return this.rollup.read.getLagInEpochs();
|
|
130
|
+
}
|
|
125
131
|
getActivationThreshold() {
|
|
126
132
|
return this.rollup.read.getActivationThreshold();
|
|
127
133
|
}
|
|
@@ -144,10 +150,9 @@ export class RollupContract {
|
|
|
144
150
|
return this.rollup.read.getVersion();
|
|
145
151
|
}
|
|
146
152
|
async getGenesisArchiveTreeRoot() {
|
|
147
|
-
|
|
153
|
+
return await this.rollup.read.archiveAt([
|
|
148
154
|
0n
|
|
149
155
|
]);
|
|
150
|
-
return block.archive;
|
|
151
156
|
}
|
|
152
157
|
/**
|
|
153
158
|
* Returns rollup constants used for epoch queries.
|
|
@@ -301,6 +306,15 @@ export class RollupContract {
|
|
|
301
306
|
BigInt(blockNumber)
|
|
302
307
|
]);
|
|
303
308
|
}
|
|
309
|
+
getAvailableValidatorFlushes() {
|
|
310
|
+
return this.rollup.read.getAvailableValidatorFlushes();
|
|
311
|
+
}
|
|
312
|
+
getNextFlushableEpoch() {
|
|
313
|
+
return this.rollup.read.getNextFlushableEpoch();
|
|
314
|
+
}
|
|
315
|
+
getCurrentEpochNumber() {
|
|
316
|
+
return this.rollup.read.getCurrentEpoch();
|
|
317
|
+
}
|
|
304
318
|
async getRollupAddresses() {
|
|
305
319
|
const [inboxAddress, outboxAddress, feeJuicePortalAddress, rewardDistributorAddress, feeJuiceAddress, stakingAssetAddress, gseAddress] = (await Promise.all([
|
|
306
320
|
this.rollup.read.getInbox(),
|
|
@@ -347,64 +361,6 @@ export class RollupContract {
|
|
|
347
361
|
}
|
|
348
362
|
}
|
|
349
363
|
/**
|
|
350
|
-
* Packs an array of committee attestations into the format expected by the Solidity contract
|
|
351
|
-
*
|
|
352
|
-
* @param attestations - Array of committee attestations with addresses and signatures
|
|
353
|
-
* @returns Packed attestations with bitmap and tightly packed signature/address data
|
|
354
|
-
*/ static packAttestations(attestations) {
|
|
355
|
-
const length = attestations.length;
|
|
356
|
-
// Calculate bitmap size (1 bit per attestation, rounded up to nearest byte)
|
|
357
|
-
const bitmapSize = Math.ceil(length / 8);
|
|
358
|
-
const signatureIndices = new Uint8Array(bitmapSize);
|
|
359
|
-
// Calculate total data size needed
|
|
360
|
-
let totalDataSize = 0;
|
|
361
|
-
for(let i = 0; i < length; i++){
|
|
362
|
-
const signature = attestations[i].signature;
|
|
363
|
-
// Check if signature is empty (v = 0)
|
|
364
|
-
const isEmpty = signature.v === 0;
|
|
365
|
-
if (!isEmpty) {
|
|
366
|
-
totalDataSize += 65; // v (1) + r (32) + s (32)
|
|
367
|
-
} else {
|
|
368
|
-
totalDataSize += 20; // address only
|
|
369
|
-
}
|
|
370
|
-
}
|
|
371
|
-
const signaturesOrAddresses = new Uint8Array(totalDataSize);
|
|
372
|
-
let dataIndex = 0;
|
|
373
|
-
// Pack the data
|
|
374
|
-
for(let i = 0; i < length; i++){
|
|
375
|
-
const attestation = attestations[i];
|
|
376
|
-
const signature = attestation.signature;
|
|
377
|
-
// Check if signature is empty
|
|
378
|
-
const isEmpty = signature.v === 0;
|
|
379
|
-
if (!isEmpty) {
|
|
380
|
-
// Set bit in bitmap (bit 7-0 in each byte, left to right)
|
|
381
|
-
const byteIndex = Math.floor(i / 8);
|
|
382
|
-
const bitIndex = 7 - i % 8;
|
|
383
|
-
signatureIndices[byteIndex] |= 1 << bitIndex;
|
|
384
|
-
// Pack signature: v + r + s
|
|
385
|
-
signaturesOrAddresses[dataIndex] = signature.v;
|
|
386
|
-
dataIndex++;
|
|
387
|
-
// Pack r (32 bytes)
|
|
388
|
-
const rBytes = Buffer.from(signature.r.slice(2), 'hex');
|
|
389
|
-
signaturesOrAddresses.set(rBytes, dataIndex);
|
|
390
|
-
dataIndex += 32;
|
|
391
|
-
// Pack s (32 bytes)
|
|
392
|
-
const sBytes = Buffer.from(signature.s.slice(2), 'hex');
|
|
393
|
-
signaturesOrAddresses.set(sBytes, dataIndex);
|
|
394
|
-
dataIndex += 32;
|
|
395
|
-
} else {
|
|
396
|
-
// Pack address only (20 bytes)
|
|
397
|
-
const addrBytes = Buffer.from(attestation.addr.slice(2), 'hex');
|
|
398
|
-
signaturesOrAddresses.set(addrBytes, dataIndex);
|
|
399
|
-
dataIndex += 20;
|
|
400
|
-
}
|
|
401
|
-
}
|
|
402
|
-
return {
|
|
403
|
-
signatureIndices: `0x${Buffer.from(signatureIndices).toString('hex')}`,
|
|
404
|
-
signaturesOrAddresses: `0x${Buffer.from(signaturesOrAddresses).toString('hex')}`
|
|
405
|
-
};
|
|
406
|
-
}
|
|
407
|
-
/**
|
|
408
364
|
* @notice Calls `canProposeAtTime` with the time of the next Ethereum block and the sender address
|
|
409
365
|
*
|
|
410
366
|
* @dev Throws if unable to propose
|
|
@@ -468,7 +424,7 @@ export class RollupContract {
|
|
|
468
424
|
}
|
|
469
425
|
];
|
|
470
426
|
}
|
|
471
|
-
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(blockNumber,
|
|
427
|
+
/** Creates a request to Rollup#invalidateBadAttestation to be simulated or sent */ buildInvalidateBadAttestationRequest(blockNumber, attestationsAndSigners, committee, invalidIndex) {
|
|
472
428
|
return {
|
|
473
429
|
to: this.address,
|
|
474
430
|
data: encodeFunctionData({
|
|
@@ -476,14 +432,14 @@ export class RollupContract {
|
|
|
476
432
|
functionName: 'invalidateBadAttestation',
|
|
477
433
|
args: [
|
|
478
434
|
BigInt(blockNumber),
|
|
479
|
-
|
|
435
|
+
attestationsAndSigners,
|
|
480
436
|
committee.map((addr)=>addr.toString()),
|
|
481
437
|
BigInt(invalidIndex)
|
|
482
438
|
]
|
|
483
439
|
})
|
|
484
440
|
};
|
|
485
441
|
}
|
|
486
|
-
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(blockNumber,
|
|
442
|
+
/** Creates a request to Rollup#invalidateInsufficientAttestations to be simulated or sent */ buildInvalidateInsufficientAttestationsRequest(blockNumber, attestationsAndSigners, committee) {
|
|
487
443
|
return {
|
|
488
444
|
to: this.address,
|
|
489
445
|
data: encodeFunctionData({
|
|
@@ -491,7 +447,7 @@ export class RollupContract {
|
|
|
491
447
|
functionName: 'invalidateInsufficientAttestations',
|
|
492
448
|
args: [
|
|
493
449
|
BigInt(blockNumber),
|
|
494
|
-
|
|
450
|
+
attestationsAndSigners,
|
|
495
451
|
committee.map((addr)=>addr.toString())
|
|
496
452
|
]
|
|
497
453
|
})
|
|
@@ -689,6 +645,9 @@ _ts_decorate([
|
|
|
689
645
|
_ts_decorate([
|
|
690
646
|
memoize
|
|
691
647
|
], RollupContract.prototype, "getEjectionThreshold", null);
|
|
648
|
+
_ts_decorate([
|
|
649
|
+
memoize
|
|
650
|
+
], RollupContract.prototype, "getLagInEpochs", null);
|
|
692
651
|
_ts_decorate([
|
|
693
652
|
memoize
|
|
694
653
|
], RollupContract.prototype, "getActivationThreshold", null);
|
|
@@ -15,11 +15,21 @@ export declare class SlasherContract {
|
|
|
15
15
|
* @returns True if the payload is vetoed, false otherwise
|
|
16
16
|
*/
|
|
17
17
|
isPayloadVetoed(payloadAddress: EthAddress): Promise<boolean>;
|
|
18
|
+
/**
|
|
19
|
+
* Checks if slashing is currently enabled. Slashing can be disabled by the vetoer.
|
|
20
|
+
* @returns True if slashing is enabled, false otherwise
|
|
21
|
+
*/
|
|
22
|
+
isSlashingEnabled(): Promise<boolean>;
|
|
18
23
|
/**
|
|
19
24
|
* Gets the current vetoer address.
|
|
20
25
|
* @returns The vetoer address
|
|
21
26
|
*/
|
|
22
27
|
getVetoer(): Promise<EthAddress>;
|
|
28
|
+
/**
|
|
29
|
+
* Gets the disable duration by the vetoer.
|
|
30
|
+
* @returns The disable duration in seconds
|
|
31
|
+
*/
|
|
32
|
+
getSlashingDisableDuration(): Promise<number>;
|
|
23
33
|
/**
|
|
24
34
|
* Gets the current governance address.
|
|
25
35
|
* @returns The governance address
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slasher_contract.d.ts","sourceRoot":"","sources":["../../src/contracts/slasher_contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAM3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,qBAAa,eAAe;IAIxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAuD;gBAGpD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,UAAU,EACnB,GAAG,yCAAmC;IASzD;;;;OAIG;IACU,eAAe,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAS1E;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAK7C;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC;IAKjD;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC;CAIhD"}
|
|
1
|
+
{"version":3,"file":"slasher_contract.d.ts","sourceRoot":"","sources":["../../src/contracts/slasher_contract.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAM3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C;;GAEG;AACH,qBAAa,eAAe;IAIxB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,GAAG;IALtB,OAAO,CAAC,QAAQ,CAAuD;gBAGpD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,UAAU,EACnB,GAAG,yCAAmC;IASzD;;;;OAIG;IACU,eAAe,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAS1E;;;OAGG;IACU,iBAAiB,IAAI,OAAO,CAAC,OAAO,CAAC;IASlD;;;OAGG;IACU,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAK7C;;;OAGG;IACU,0BAA0B,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1D;;;OAGG;IACU,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC;IAKjD;;;OAGG;IACU,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC;CAIhD"}
|
|
@@ -34,6 +34,17 @@ import { getContract } from 'viem';
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
|
+
* Checks if slashing is currently enabled. Slashing can be disabled by the vetoer.
|
|
38
|
+
* @returns True if slashing is enabled, false otherwise
|
|
39
|
+
*/ async isSlashingEnabled() {
|
|
40
|
+
try {
|
|
41
|
+
return await this.contract.read.isSlashingEnabled();
|
|
42
|
+
} catch (error) {
|
|
43
|
+
this.log.error(`Error checking if slashing is enabled`, error);
|
|
44
|
+
throw error;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
37
48
|
* Gets the current vetoer address.
|
|
38
49
|
* @returns The vetoer address
|
|
39
50
|
*/ async getVetoer() {
|
|
@@ -41,6 +52,13 @@ import { getContract } from 'viem';
|
|
|
41
52
|
return EthAddress.fromString(vetoer);
|
|
42
53
|
}
|
|
43
54
|
/**
|
|
55
|
+
* Gets the disable duration by the vetoer.
|
|
56
|
+
* @returns The disable duration in seconds
|
|
57
|
+
*/ async getSlashingDisableDuration() {
|
|
58
|
+
const duration = await this.contract.read.SLASHING_DISABLE_DURATION();
|
|
59
|
+
return Number(duration);
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
44
62
|
* Gets the current governance address.
|
|
45
63
|
* @returns The governance address
|
|
46
64
|
*/ async getGovernance() {
|
|
@@ -92,6 +92,8 @@ export interface DeployL1ContractsArgs extends Omit<L1ContractsConfig, keyof L1T
|
|
|
92
92
|
realVerifier: boolean;
|
|
93
93
|
/** The zk passport args */
|
|
94
94
|
zkPassportArgs?: ZKPassportArgs;
|
|
95
|
+
/** If provided, use this token for BOTH fee and staking assets (skip deployments) */
|
|
96
|
+
existingTokenAddress?: EthAddress;
|
|
95
97
|
}
|
|
96
98
|
export interface ZKPassportArgs {
|
|
97
99
|
/** Whether to use the mock zk passport verifier */
|
|
@@ -101,6 +103,12 @@ export interface ZKPassportArgs {
|
|
|
101
103
|
/** The scope of the zk passport (personhood, etc) */
|
|
102
104
|
zkPassportScope?: string;
|
|
103
105
|
}
|
|
106
|
+
/**
|
|
107
|
+
* Validates that the provided address points to a contract that resembles an ERC20 token.
|
|
108
|
+
* Checks for contract code and attempts common ERC20 view calls.
|
|
109
|
+
* Throws an error if validation fails.
|
|
110
|
+
*/
|
|
111
|
+
export declare function validateExistingErc20TokenAddress(l1Client: ExtendedViemWalletClient, tokenAddress: EthAddress, logger: Logger): Promise<void>;
|
|
104
112
|
export declare const deploySharedContracts: (l1Client: ExtendedViemWalletClient, deployer: L1Deployer, args: DeployL1ContractsArgs, logger: Logger) => Promise<{
|
|
105
113
|
feeAssetAddress: EthAddress;
|
|
106
114
|
feeAssetHandlerAddress: EthAddress | undefined;
|
|
@@ -135,7 +143,9 @@ export declare const deployRollup: (extendedClient: ExtendedViemWalletClient, de
|
|
|
135
143
|
rollup: RollupContract;
|
|
136
144
|
slashFactoryAddress: EthAddress;
|
|
137
145
|
}>;
|
|
138
|
-
export declare const handoverToGovernance: (extendedClient: ExtendedViemWalletClient, deployer: L1Deployer, registryAddress: EthAddress, gseAddress: EthAddress, coinIssuerAddress: EthAddress, feeAssetAddress: EthAddress, governanceAddress: EthAddress, logger: Logger, acceleratedTestDeployments: boolean | undefined) => Promise<
|
|
146
|
+
export declare const handoverToGovernance: (extendedClient: ExtendedViemWalletClient, deployer: L1Deployer, registryAddress: EthAddress, gseAddress: EthAddress, coinIssuerAddress: EthAddress, feeAssetAddress: EthAddress, governanceAddress: EthAddress, logger: Logger, acceleratedTestDeployments: boolean | undefined, useExternalToken?: boolean) => Promise<{
|
|
147
|
+
dateGatedRelayerAddress: EthAddress;
|
|
148
|
+
}>;
|
|
139
149
|
export declare const addMultipleValidators: (extendedClient: ExtendedViemWalletClient, deployer: L1Deployer, gseAddress: Hex, rollupAddress: Hex, stakingAssetAddress: Hex, validators: Operator[], acceleratedTestDeployments: boolean | undefined, logger: Logger) => Promise<void>;
|
|
140
150
|
/**
|
|
141
151
|
* Initialize the fee asset handler and make it a minter on the fee asset.
|
|
@@ -173,7 +183,10 @@ export declare class L1Deployer {
|
|
|
173
183
|
constructor(client: ExtendedViemWalletClient, maybeSalt: number | undefined, dateProvider?: DateProvider, acceleratedTestDeployments?: boolean, logger?: Logger, txUtilsConfig?: L1TxUtilsConfig | undefined, createVerificationJson?: boolean);
|
|
174
184
|
deploy<const TAbi extends Abi>(params: ContractArtifacts<TAbi>, args?: ContractConstructorArgs<TAbi>, opts?: {
|
|
175
185
|
gasLimit?: bigint;
|
|
176
|
-
}): Promise<
|
|
186
|
+
}): Promise<{
|
|
187
|
+
address: EthAddress;
|
|
188
|
+
existed: boolean;
|
|
189
|
+
}>;
|
|
177
190
|
waitForDeployments(): Promise<void>;
|
|
178
191
|
sendTransaction(tx: L1TxRequest, options?: L1GasConfig): Promise<{
|
|
179
192
|
txHash: Hex;
|
|
@@ -202,6 +215,7 @@ export declare function deployL1Contract(extendedClient: ExtendedViemWalletClien
|
|
|
202
215
|
address: EthAddress;
|
|
203
216
|
txHash: Hex | undefined;
|
|
204
217
|
deployedLibraries?: VerificationLibraryEntry[];
|
|
218
|
+
existed: boolean;
|
|
205
219
|
}>;
|
|
206
220
|
export declare function getExpectedAddress(abi: Narrow<Abi | readonly unknown[]>, bytecode: Hex, args: readonly unknown[], salt: Hex): {
|
|
207
221
|
address: `0x${string}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAwB,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
|