@aztec/cli 2.1.1-rc.1 → 2.1.2-rc.2
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.
|
@@ -16,6 +16,7 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
|
|
|
16
16
|
autoUpdate: SharedNodeConfig['autoUpdate'];
|
|
17
17
|
autoUpdateUrl?: string;
|
|
18
18
|
maxTxPoolSize: number;
|
|
19
|
+
publicMetricsOptOut: boolean;
|
|
19
20
|
publicIncludeMetrics?: string[];
|
|
20
21
|
publicMetricsCollectorUrl?: string;
|
|
21
22
|
publicMetricsCollectFrom?: string[];
|
|
@@ -31,8 +32,10 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
|
|
|
31
32
|
};
|
|
32
33
|
export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
|
|
33
34
|
export declare const stagingPublicL2ChainConfig: L2ChainConfig;
|
|
35
|
+
export declare const nextNetL2ChainConfig: L2ChainConfig;
|
|
34
36
|
export declare const testnetL2ChainConfig: L2ChainConfig;
|
|
35
37
|
export declare const mainnetL2ChainConfig: L2ChainConfig;
|
|
38
|
+
export declare const devnetL2ChainConfig: L2ChainConfig;
|
|
36
39
|
export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
|
|
37
40
|
export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
|
|
38
41
|
//# sourceMappingURL=chain_l2_config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,
|
|
1
|
+
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE7D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,SAAS,EAAE,2BAA2B,CAAC,GAC5C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAIhC,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,uBAAuB,EAAE,MAAM,CAAC;IAGhC,eAAe,EAAE,OAAO,CAAC;IACzB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AA+CJ,eAAO,MAAM,4BAA4B,EAAE,aAiF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAqDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAqDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAuFlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAsFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAqDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAYrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QAsGzE"}
|
|
@@ -58,7 +58,8 @@ export const stagingIgnitionL2ChainConfig = {
|
|
|
58
58
|
],
|
|
59
59
|
autoUpdate: 'config-and-version',
|
|
60
60
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
|
|
61
|
-
maxTxPoolSize:
|
|
61
|
+
maxTxPoolSize: 0,
|
|
62
|
+
publicMetricsOptOut: false,
|
|
62
63
|
publicIncludeMetrics,
|
|
63
64
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
64
65
|
publicMetricsCollectFrom: [
|
|
@@ -125,6 +126,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
125
126
|
],
|
|
126
127
|
autoUpdate: 'config-and-version',
|
|
127
128
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
|
|
129
|
+
publicMetricsOptOut: false,
|
|
128
130
|
publicIncludeMetrics,
|
|
129
131
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
130
132
|
publicMetricsCollectFrom: [
|
|
@@ -150,6 +152,45 @@ export const stagingPublicL2ChainConfig = {
|
|
|
150
152
|
...DefaultSlashConfig,
|
|
151
153
|
...DefaultNetworkDBMapSizeConfig
|
|
152
154
|
};
|
|
155
|
+
export const nextNetL2ChainConfig = {
|
|
156
|
+
l1ChainId: 11155111,
|
|
157
|
+
testAccounts: true,
|
|
158
|
+
sponsoredFPC: true,
|
|
159
|
+
p2pEnabled: true,
|
|
160
|
+
disableTransactions: false,
|
|
161
|
+
p2pBootstrapNodes: [],
|
|
162
|
+
seqMinTxsPerBlock: 0,
|
|
163
|
+
seqMaxTxsPerBlock: 8,
|
|
164
|
+
realProofs: true,
|
|
165
|
+
snapshotsUrls: [],
|
|
166
|
+
autoUpdate: 'config-and-version',
|
|
167
|
+
autoUpdateUrl: '',
|
|
168
|
+
publicMetricsOptOut: true,
|
|
169
|
+
publicIncludeMetrics,
|
|
170
|
+
publicMetricsCollectorUrl: '',
|
|
171
|
+
publicMetricsCollectFrom: [
|
|
172
|
+
''
|
|
173
|
+
],
|
|
174
|
+
maxTxPoolSize: 100_000_000,
|
|
175
|
+
txPoolDeleteTxsAfterReorg: false,
|
|
176
|
+
// Deployment stuff
|
|
177
|
+
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
178
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
|
|
179
|
+
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
|
|
180
|
+
/** The target validator committee size. */ aztecTargetCommitteeSize: 48,
|
|
181
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
|
|
182
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
183
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
184
|
+
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
185
|
+
/** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
186
|
+
/** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
187
|
+
/** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
188
|
+
/** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
189
|
+
/** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
190
|
+
/** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
191
|
+
...DefaultSlashConfig,
|
|
192
|
+
...DefaultNetworkDBMapSizeConfig
|
|
193
|
+
};
|
|
153
194
|
export const testnetL2ChainConfig = {
|
|
154
195
|
l1ChainId: 11155111,
|
|
155
196
|
testAccounts: false,
|
|
@@ -166,6 +207,7 @@ export const testnetL2ChainConfig = {
|
|
|
166
207
|
autoUpdate: 'config-and-version',
|
|
167
208
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
|
|
168
209
|
maxTxPoolSize: 100_000_000,
|
|
210
|
+
publicMetricsOptOut: false,
|
|
169
211
|
publicIncludeMetrics,
|
|
170
212
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
171
213
|
publicMetricsCollectFrom: [
|
|
@@ -235,12 +277,14 @@ export const mainnetL2ChainConfig = {
|
|
|
235
277
|
],
|
|
236
278
|
autoUpdate: 'notify',
|
|
237
279
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
|
|
238
|
-
maxTxPoolSize:
|
|
280
|
+
maxTxPoolSize: 0,
|
|
281
|
+
publicMetricsOptOut: true,
|
|
239
282
|
publicIncludeMetrics,
|
|
240
283
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
241
284
|
publicMetricsCollectFrom: [
|
|
242
285
|
'sequencer'
|
|
243
286
|
],
|
|
287
|
+
blobAllowEmptySources: true,
|
|
244
288
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
245
289
|
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
|
|
246
290
|
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
|
|
@@ -252,7 +296,7 @@ export const mainnetL2ChainConfig = {
|
|
|
252
296
|
slashingRoundSizeInEpochs: 4,
|
|
253
297
|
slashingExecutionDelayInRounds: 28,
|
|
254
298
|
slashingLifetimeInRounds: 34,
|
|
255
|
-
slashingVetoer: EthAddress.
|
|
299
|
+
slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
|
|
256
300
|
slashingOffsetInRounds: 2,
|
|
257
301
|
slashingDisableDuration: 259_200,
|
|
258
302
|
slasherFlavor: 'tally',
|
|
@@ -285,6 +329,45 @@ export const mainnetL2ChainConfig = {
|
|
|
285
329
|
sentinelEnabled: true,
|
|
286
330
|
...DefaultNetworkDBMapSizeConfig
|
|
287
331
|
};
|
|
332
|
+
export const devnetL2ChainConfig = {
|
|
333
|
+
l1ChainId: 11155111,
|
|
334
|
+
testAccounts: true,
|
|
335
|
+
sponsoredFPC: true,
|
|
336
|
+
p2pEnabled: true,
|
|
337
|
+
disableTransactions: false,
|
|
338
|
+
p2pBootstrapNodes: [],
|
|
339
|
+
seqMinTxsPerBlock: 0,
|
|
340
|
+
seqMaxTxsPerBlock: 8,
|
|
341
|
+
realProofs: false,
|
|
342
|
+
snapshotsUrls: [],
|
|
343
|
+
autoUpdate: 'config-and-version',
|
|
344
|
+
autoUpdateUrl: '',
|
|
345
|
+
publicMetricsOptOut: true,
|
|
346
|
+
publicIncludeMetrics,
|
|
347
|
+
publicMetricsCollectorUrl: '',
|
|
348
|
+
publicMetricsCollectFrom: [
|
|
349
|
+
''
|
|
350
|
+
],
|
|
351
|
+
maxTxPoolSize: 100_000_000,
|
|
352
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
353
|
+
// Deployment stuff
|
|
354
|
+
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
355
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
|
|
356
|
+
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 8,
|
|
357
|
+
/** The target validator committee size. */ aztecTargetCommitteeSize: 1,
|
|
358
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 1,
|
|
359
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
360
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
361
|
+
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
362
|
+
/** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
363
|
+
/** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
364
|
+
/** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
365
|
+
/** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
366
|
+
/** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
367
|
+
/** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
368
|
+
...DefaultSlashConfig,
|
|
369
|
+
...DefaultNetworkDBMapSizeConfig
|
|
370
|
+
};
|
|
288
371
|
export function getL2ChainConfig(networkName) {
|
|
289
372
|
let config;
|
|
290
373
|
if (networkName === 'staging-public') {
|
|
@@ -355,6 +438,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
|
|
|
355
438
|
if (config.publicMetricsCollectFrom) {
|
|
356
439
|
enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
|
|
357
440
|
}
|
|
441
|
+
enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
|
|
358
442
|
// Deployment stuff
|
|
359
443
|
enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
|
|
360
444
|
enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.2-rc.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -71,18 +71,18 @@
|
|
|
71
71
|
]
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@aztec/archiver": "2.1.
|
|
75
|
-
"@aztec/aztec.js": "2.1.
|
|
76
|
-
"@aztec/constants": "2.1.
|
|
77
|
-
"@aztec/entrypoints": "2.1.
|
|
78
|
-
"@aztec/ethereum": "2.1.
|
|
79
|
-
"@aztec/foundation": "2.1.
|
|
80
|
-
"@aztec/l1-artifacts": "2.1.
|
|
81
|
-
"@aztec/node-keystore": "2.1.
|
|
82
|
-
"@aztec/node-lib": "2.1.
|
|
83
|
-
"@aztec/p2p": "2.1.
|
|
84
|
-
"@aztec/stdlib": "2.1.
|
|
85
|
-
"@aztec/world-state": "2.1.
|
|
74
|
+
"@aztec/archiver": "2.1.2-rc.2",
|
|
75
|
+
"@aztec/aztec.js": "2.1.2-rc.2",
|
|
76
|
+
"@aztec/constants": "2.1.2-rc.2",
|
|
77
|
+
"@aztec/entrypoints": "2.1.2-rc.2",
|
|
78
|
+
"@aztec/ethereum": "2.1.2-rc.2",
|
|
79
|
+
"@aztec/foundation": "2.1.2-rc.2",
|
|
80
|
+
"@aztec/l1-artifacts": "2.1.2-rc.2",
|
|
81
|
+
"@aztec/node-keystore": "2.1.2-rc.2",
|
|
82
|
+
"@aztec/node-lib": "2.1.2-rc.2",
|
|
83
|
+
"@aztec/p2p": "2.1.2-rc.2",
|
|
84
|
+
"@aztec/stdlib": "2.1.2-rc.2",
|
|
85
|
+
"@aztec/world-state": "2.1.2-rc.2",
|
|
86
86
|
"@ethersproject/wallet": "^5.8.0",
|
|
87
87
|
"@iarna/toml": "^2.2.5",
|
|
88
88
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
@@ -96,8 +96,8 @@
|
|
|
96
96
|
"viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
|
|
97
97
|
},
|
|
98
98
|
"devDependencies": {
|
|
99
|
-
"@aztec/accounts": "2.1.
|
|
100
|
-
"@aztec/protocol-contracts": "2.1.
|
|
99
|
+
"@aztec/accounts": "2.1.2-rc.2",
|
|
100
|
+
"@aztec/protocol-contracts": "2.1.2-rc.2",
|
|
101
101
|
"@jest/globals": "^30.0.0",
|
|
102
102
|
"@types/jest": "^30.0.0",
|
|
103
103
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -113,15 +113,15 @@
|
|
|
113
113
|
"typescript": "^5.3.3"
|
|
114
114
|
},
|
|
115
115
|
"peerDependencies": {
|
|
116
|
-
"@aztec/accounts": "2.1.
|
|
117
|
-
"@aztec/bb-prover": "2.1.
|
|
118
|
-
"@aztec/ethereum": "2.1.
|
|
119
|
-
"@aztec/l1-artifacts": "2.1.
|
|
120
|
-
"@aztec/noir-contracts.js": "2.1.
|
|
121
|
-
"@aztec/noir-protocol-circuits-types": "2.1.
|
|
122
|
-
"@aztec/noir-test-contracts.js": "2.1.
|
|
123
|
-
"@aztec/protocol-contracts": "2.1.
|
|
124
|
-
"@aztec/stdlib": "2.1.
|
|
116
|
+
"@aztec/accounts": "2.1.2-rc.2",
|
|
117
|
+
"@aztec/bb-prover": "2.1.2-rc.2",
|
|
118
|
+
"@aztec/ethereum": "2.1.2-rc.2",
|
|
119
|
+
"@aztec/l1-artifacts": "2.1.2-rc.2",
|
|
120
|
+
"@aztec/noir-contracts.js": "2.1.2-rc.2",
|
|
121
|
+
"@aztec/noir-protocol-circuits-types": "2.1.2-rc.2",
|
|
122
|
+
"@aztec/noir-test-contracts.js": "2.1.2-rc.2",
|
|
123
|
+
"@aztec/protocol-contracts": "2.1.2-rc.2",
|
|
124
|
+
"@aztec/stdlib": "2.1.2-rc.2"
|
|
125
125
|
},
|
|
126
126
|
"files": [
|
|
127
127
|
"dest",
|
|
@@ -30,6 +30,7 @@ export type L2ChainConfig = L1ContractsConfig &
|
|
|
30
30
|
autoUpdate: SharedNodeConfig['autoUpdate'];
|
|
31
31
|
autoUpdateUrl?: string;
|
|
32
32
|
maxTxPoolSize: number;
|
|
33
|
+
publicMetricsOptOut: boolean;
|
|
33
34
|
publicIncludeMetrics?: string[];
|
|
34
35
|
publicMetricsCollectorUrl?: string;
|
|
35
36
|
publicMetricsCollectFrom?: string[];
|
|
@@ -107,7 +108,8 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
|
|
|
107
108
|
snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
|
|
108
109
|
autoUpdate: 'config-and-version',
|
|
109
110
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
|
|
110
|
-
maxTxPoolSize:
|
|
111
|
+
maxTxPoolSize: 0,
|
|
112
|
+
publicMetricsOptOut: false,
|
|
111
113
|
publicIncludeMetrics,
|
|
112
114
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
113
115
|
publicMetricsCollectFrom: ['sequencer'],
|
|
@@ -138,7 +140,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
|
|
|
138
140
|
slashAmountLarge: 50_000n * 10n ** 18n,
|
|
139
141
|
slashingOffsetInRounds: 2,
|
|
140
142
|
slasherFlavor: 'tally',
|
|
141
|
-
slashingVetoer: EthAddress.ZERO,
|
|
143
|
+
slashingVetoer: EthAddress.ZERO,
|
|
142
144
|
|
|
143
145
|
/** The mana target for the rollup */
|
|
144
146
|
manaTarget: 0n,
|
|
@@ -189,6 +191,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
|
|
|
189
191
|
snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
|
|
190
192
|
autoUpdate: 'config-and-version',
|
|
191
193
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-public.json',
|
|
194
|
+
publicMetricsOptOut: false,
|
|
192
195
|
publicIncludeMetrics,
|
|
193
196
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
194
197
|
publicMetricsCollectFrom: ['sequencer'],
|
|
@@ -230,6 +233,61 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
|
|
|
230
233
|
...DefaultNetworkDBMapSizeConfig,
|
|
231
234
|
};
|
|
232
235
|
|
|
236
|
+
export const nextNetL2ChainConfig: L2ChainConfig = {
|
|
237
|
+
l1ChainId: 11155111,
|
|
238
|
+
testAccounts: true,
|
|
239
|
+
sponsoredFPC: true,
|
|
240
|
+
p2pEnabled: true,
|
|
241
|
+
disableTransactions: false,
|
|
242
|
+
p2pBootstrapNodes: [],
|
|
243
|
+
seqMinTxsPerBlock: 0,
|
|
244
|
+
seqMaxTxsPerBlock: 8,
|
|
245
|
+
realProofs: true,
|
|
246
|
+
snapshotsUrls: [],
|
|
247
|
+
autoUpdate: 'config-and-version',
|
|
248
|
+
autoUpdateUrl: '',
|
|
249
|
+
publicMetricsOptOut: true,
|
|
250
|
+
publicIncludeMetrics,
|
|
251
|
+
publicMetricsCollectorUrl: '',
|
|
252
|
+
publicMetricsCollectFrom: [''],
|
|
253
|
+
maxTxPoolSize: 100_000_000, // 100MB
|
|
254
|
+
txPoolDeleteTxsAfterReorg: false,
|
|
255
|
+
|
|
256
|
+
// Deployment stuff
|
|
257
|
+
/** How many seconds an L1 slot lasts. */
|
|
258
|
+
ethereumSlotDuration: 12,
|
|
259
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
|
|
260
|
+
aztecSlotDuration: 36,
|
|
261
|
+
/** How many L2 slots an epoch lasts. */
|
|
262
|
+
aztecEpochDuration: 32,
|
|
263
|
+
/** The target validator committee size. */
|
|
264
|
+
aztecTargetCommitteeSize: 48,
|
|
265
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */
|
|
266
|
+
lagInEpochs: DefaultL1ContractsConfig.lagInEpochs,
|
|
267
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
|
|
268
|
+
localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
269
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
270
|
+
aztecProofSubmissionEpochs: 1,
|
|
271
|
+
/** The deposit amount for a validator */
|
|
272
|
+
activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
273
|
+
/** The minimum stake for a validator. */
|
|
274
|
+
ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
275
|
+
/** The slashing round size */
|
|
276
|
+
slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
277
|
+
/** Governance proposing round size */
|
|
278
|
+
governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
279
|
+
/** The mana target for the rollup */
|
|
280
|
+
manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
281
|
+
/** The proving cost per mana */
|
|
282
|
+
provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
283
|
+
/** Exit delay for stakers */
|
|
284
|
+
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
285
|
+
|
|
286
|
+
...DefaultSlashConfig,
|
|
287
|
+
|
|
288
|
+
...DefaultNetworkDBMapSizeConfig,
|
|
289
|
+
};
|
|
290
|
+
|
|
233
291
|
export const testnetL2ChainConfig: L2ChainConfig = {
|
|
234
292
|
l1ChainId: 11155111,
|
|
235
293
|
testAccounts: false,
|
|
@@ -244,6 +302,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
244
302
|
autoUpdate: 'config-and-version',
|
|
245
303
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
|
|
246
304
|
maxTxPoolSize: 100_000_000, // 100MB
|
|
305
|
+
publicMetricsOptOut: false,
|
|
247
306
|
publicIncludeMetrics,
|
|
248
307
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
249
308
|
publicMetricsCollectFrom: ['sequencer'],
|
|
@@ -333,10 +392,12 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
|
|
|
333
392
|
snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
|
|
334
393
|
autoUpdate: 'notify',
|
|
335
394
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
|
|
336
|
-
maxTxPoolSize:
|
|
395
|
+
maxTxPoolSize: 0,
|
|
396
|
+
publicMetricsOptOut: true,
|
|
337
397
|
publicIncludeMetrics,
|
|
338
398
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
339
399
|
publicMetricsCollectFrom: ['sequencer'],
|
|
400
|
+
blobAllowEmptySources: true,
|
|
340
401
|
|
|
341
402
|
/** How many seconds an L1 slot lasts. */
|
|
342
403
|
ethereumSlotDuration: 12,
|
|
@@ -357,7 +418,7 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
|
|
|
357
418
|
slashingRoundSizeInEpochs: 4,
|
|
358
419
|
slashingExecutionDelayInRounds: 28,
|
|
359
420
|
slashingLifetimeInRounds: 34,
|
|
360
|
-
slashingVetoer: EthAddress.
|
|
421
|
+
slashingVetoer: EthAddress.fromString('0xBbB4aF368d02827945748b28CD4b2D42e4A37480'),
|
|
361
422
|
slashingOffsetInRounds: 2,
|
|
362
423
|
|
|
363
424
|
slashingDisableDuration: 259_200, // 3 days
|
|
@@ -404,6 +465,61 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
|
|
|
404
465
|
...DefaultNetworkDBMapSizeConfig,
|
|
405
466
|
};
|
|
406
467
|
|
|
468
|
+
export const devnetL2ChainConfig: L2ChainConfig = {
|
|
469
|
+
l1ChainId: 11155111,
|
|
470
|
+
testAccounts: true,
|
|
471
|
+
sponsoredFPC: true,
|
|
472
|
+
p2pEnabled: true,
|
|
473
|
+
disableTransactions: false,
|
|
474
|
+
p2pBootstrapNodes: [],
|
|
475
|
+
seqMinTxsPerBlock: 0,
|
|
476
|
+
seqMaxTxsPerBlock: 8,
|
|
477
|
+
realProofs: false,
|
|
478
|
+
snapshotsUrls: [],
|
|
479
|
+
autoUpdate: 'config-and-version',
|
|
480
|
+
autoUpdateUrl: '',
|
|
481
|
+
publicMetricsOptOut: true,
|
|
482
|
+
publicIncludeMetrics,
|
|
483
|
+
publicMetricsCollectorUrl: '',
|
|
484
|
+
publicMetricsCollectFrom: [''],
|
|
485
|
+
maxTxPoolSize: 100_000_000, // 100MB
|
|
486
|
+
txPoolDeleteTxsAfterReorg: true,
|
|
487
|
+
|
|
488
|
+
// Deployment stuff
|
|
489
|
+
/** How many seconds an L1 slot lasts. */
|
|
490
|
+
ethereumSlotDuration: 12,
|
|
491
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
|
|
492
|
+
aztecSlotDuration: 36,
|
|
493
|
+
/** How many L2 slots an epoch lasts. */
|
|
494
|
+
aztecEpochDuration: 8,
|
|
495
|
+
/** The target validator committee size. */
|
|
496
|
+
aztecTargetCommitteeSize: 1,
|
|
497
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */
|
|
498
|
+
lagInEpochs: 1,
|
|
499
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
|
|
500
|
+
localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
501
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
502
|
+
aztecProofSubmissionEpochs: 1,
|
|
503
|
+
/** The deposit amount for a validator */
|
|
504
|
+
activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
505
|
+
/** The minimum stake for a validator. */
|
|
506
|
+
ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
507
|
+
/** The slashing round size */
|
|
508
|
+
slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
509
|
+
/** Governance proposing round size */
|
|
510
|
+
governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
511
|
+
/** The mana target for the rollup */
|
|
512
|
+
manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
513
|
+
/** The proving cost per mana */
|
|
514
|
+
provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
515
|
+
/** Exit delay for stakers */
|
|
516
|
+
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
517
|
+
|
|
518
|
+
...DefaultSlashConfig,
|
|
519
|
+
|
|
520
|
+
...DefaultNetworkDBMapSizeConfig,
|
|
521
|
+
};
|
|
522
|
+
|
|
407
523
|
export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
|
|
408
524
|
let config: L2ChainConfig | undefined;
|
|
409
525
|
if (networkName === 'staging-public') {
|
|
@@ -480,6 +596,8 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
|
|
|
480
596
|
enrichVar('PUBLIC_OTEL_COLLECT_FROM', config.publicMetricsCollectFrom.join(','));
|
|
481
597
|
}
|
|
482
598
|
|
|
599
|
+
enrichVar('PUBLIC_OTEL_OPT_OUT', config.publicMetricsOptOut.toString());
|
|
600
|
+
|
|
483
601
|
// Deployment stuff
|
|
484
602
|
enrichVar('ETHEREUM_SLOT_DURATION', config.ethereumSlotDuration.toString());
|
|
485
603
|
enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
|