@aztec/cli 2.1.3-rc.1 → 2.1.3-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.
Files changed (5) hide show
  1. package/dest/config/chain_l2_config.d.ts +8 -9
  2. package/dest/config/chain_l2_config.d.ts.map +1 -1
  3. package/dest/config/chain_l2_config.js +32 -24
  4. package/package.json +27 -24
  5. package/src/config/chain_l2_config.ts +43 -35
package/dest/config/chain_l2_config.d.ts CHANGED
@@ -1,16 +1,14 @@
1
- import { type L1ContractsConfig } from '@aztec/ethereum';
1
+ import { type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
2
2
  import type { NetworkNames } from '@aztec/foundation/config';
3
3
  import type { SharedNodeConfig } from '@aztec/node-lib/config';
4
4
  import type { P2PConfig } from '@aztec/p2p/config';
5
- import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
6
- export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxsAfterReorg'> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
5
+ import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
6
+ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> & Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> & Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
7
7
  l1ChainId: number;
8
8
  testAccounts: boolean;
9
9
  sponsoredFPC: boolean;
10
- p2pEnabled: boolean;
11
- p2pBootstrapNodes: string[];
12
- seqMinTxsPerBlock: number;
13
- seqMaxTxsPerBlock: number;
10
+ minTxsPerBlock: number;
11
+ maxTxsPerBlock: number;
14
12
  realProofs: boolean;
15
13
  snapshotsUrls: string[];
16
14
  autoUpdate: SharedNodeConfig['autoUpdate'];
@@ -22,7 +20,7 @@ export type L2ChainConfig = L1ContractsConfig & Pick<P2PConfig, 'txPoolDeleteTxs
22
20
  publicMetricsCollectFrom?: string[];
23
21
  skipArchiverInitialSync?: boolean;
24
22
  blobAllowEmptySources?: boolean;
25
- dbMapSizeKb: number;
23
+ dataStoreMapSizeKb: number;
26
24
  archiverStoreMapSizeKb: number;
27
25
  noteHashTreeMapSizeKb: number;
28
26
  nullifierTreeMapSizeKb: number;
@@ -37,5 +35,6 @@ export declare const testnetL2ChainConfig: L2ChainConfig;
37
35
  export declare const mainnetL2ChainConfig: L2ChainConfig;
38
36
  export declare const devnetL2ChainConfig: L2ChainConfig;
39
37
  export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
40
- export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
38
+ export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
39
+ export declare function enrichEnvironmentWithChainConfig(config: L2ChainConfig): void;
41
40
  //# sourceMappingURL=chain_l2_config.d.ts.map
package/dest/config/chain_l2_config.d.ts.map CHANGED
@@ -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,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"}
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,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACzG,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,eAAe,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYtF,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GACxE,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,GAAG,sBAAsB,GAAG,kBAAkB,CAAC,GACnH,IAAI,CAAC,SAAS,EAAE,gBAAgB,GAAG,YAAY,GAAG,2BAA2B,CAAC,GAC9E,IAAI,CAAC,eAAe,EAAE,gBAAgB,GAAG,gBAAgB,CAAC,GAAG;IAC3D,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,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,kBAAkB,EAAE,MAAM,CAAC;IAC3B,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,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAavE;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,aAAa,QAgGrE"}
package/dest/config/chain_l2_config.js CHANGED
@@ -37,7 +37,7 @@ const DefaultSlashConfig = {
37
37
  slashExecuteRoundsLookBack: 4
38
38
  };
39
39
  const DefaultNetworkDBMapSizeConfig = {
40
- dbMapSizeKb: defaultDBMapSizeKb,
40
+ dataStoreMapSizeKb: defaultDBMapSizeKb,
41
41
  archiverStoreMapSizeKb: tbMapSizeKb,
42
42
  noteHashTreeMapSizeKb: tbMapSizeKb,
43
43
  nullifierTreeMapSizeKb: tbMapSizeKb,
@@ -49,9 +49,9 @@ export const stagingIgnitionL2ChainConfig = {
49
49
  sponsoredFPC: false,
50
50
  disableTransactions: true,
51
51
  p2pEnabled: true,
52
- p2pBootstrapNodes: [],
53
- seqMinTxsPerBlock: 0,
54
- seqMaxTxsPerBlock: 0,
52
+ bootstrapNodes: [],
53
+ minTxsPerBlock: 0,
54
+ maxTxsPerBlock: 0,
55
55
  realProofs: true,
56
56
  snapshotsUrls: [
57
57
  `${SNAPSHOTS_URL}/staging-ignition/`
@@ -117,9 +117,9 @@ export const stagingPublicL2ChainConfig = {
117
117
  sponsoredFPC: true,
118
118
  disableTransactions: false,
119
119
  p2pEnabled: true,
120
- p2pBootstrapNodes: [],
121
- seqMinTxsPerBlock: 0,
122
- seqMaxTxsPerBlock: 20,
120
+ bootstrapNodes: [],
121
+ minTxsPerBlock: 0,
122
+ maxTxsPerBlock: 20,
123
123
  realProofs: true,
124
124
  snapshotsUrls: [
125
125
  `${SNAPSHOTS_URL}/staging-public/`
@@ -158,9 +158,9 @@ export const nextNetL2ChainConfig = {
158
158
  sponsoredFPC: true,
159
159
  p2pEnabled: true,
160
160
  disableTransactions: false,
161
- p2pBootstrapNodes: [],
162
- seqMinTxsPerBlock: 0,
163
- seqMaxTxsPerBlock: 8,
161
+ bootstrapNodes: [],
162
+ minTxsPerBlock: 0,
163
+ maxTxsPerBlock: 8,
164
164
  realProofs: true,
165
165
  snapshotsUrls: [],
166
166
  autoUpdate: 'config-and-version',
@@ -197,9 +197,9 @@ export const testnetL2ChainConfig = {
197
197
  sponsoredFPC: true,
198
198
  p2pEnabled: true,
199
199
  disableTransactions: true,
200
- p2pBootstrapNodes: [],
201
- seqMinTxsPerBlock: 0,
202
- seqMaxTxsPerBlock: 0,
200
+ bootstrapNodes: [],
201
+ minTxsPerBlock: 0,
202
+ maxTxsPerBlock: 0,
203
203
  realProofs: true,
204
204
  snapshotsUrls: [
205
205
  `${SNAPSHOTS_URL}/testnet/`
@@ -268,9 +268,9 @@ export const mainnetL2ChainConfig = {
268
268
  testAccounts: false,
269
269
  sponsoredFPC: false,
270
270
  p2pEnabled: true,
271
- p2pBootstrapNodes: [],
272
- seqMinTxsPerBlock: 0,
273
- seqMaxTxsPerBlock: 0,
271
+ bootstrapNodes: [],
272
+ minTxsPerBlock: 0,
273
+ maxTxsPerBlock: 0,
274
274
  realProofs: true,
275
275
  snapshotsUrls: [
276
276
  `${SNAPSHOTS_URL}/mainnet/`
@@ -335,9 +335,9 @@ export const devnetL2ChainConfig = {
335
335
  sponsoredFPC: true,
336
336
  p2pEnabled: true,
337
337
  disableTransactions: false,
338
- p2pBootstrapNodes: [],
339
- seqMinTxsPerBlock: 0,
340
- seqMaxTxsPerBlock: 8,
338
+ bootstrapNodes: [],
339
+ minTxsPerBlock: 0,
340
+ maxTxsPerBlock: 8,
341
341
  realProofs: false,
342
342
  snapshotsUrls: [],
343
343
  autoUpdate: 'config-and-version',
@@ -392,7 +392,7 @@ export function getL2ChainConfig(networkName) {
392
392
  function getDefaultDataDir(networkName) {
393
393
  return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
394
394
  }
395
- export function enrichEnvironmentWithChainConfig(networkName) {
395
+ export function enrichEnvironmentWithChainName(networkName) {
396
396
  if (networkName === 'local') {
397
397
  return;
398
398
  }
@@ -401,18 +401,22 @@ export function enrichEnvironmentWithChainConfig(networkName) {
401
401
  if (!config) {
402
402
  throw new Error(`Unknown network name: ${networkName}`);
403
403
  }
404
- enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
404
+ enrichEnvironmentWithChainConfig(config);
405
+ }
406
+ export function enrichEnvironmentWithChainConfig(config) {
407
+ enrichVar('BOOTSTRAP_NODES', config.bootstrapNodes.join(','));
405
408
  enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
406
409
  enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
407
410
  enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
408
411
  enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
409
- enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
410
- enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
412
+ enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
413
+ enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
411
414
  enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
412
415
  enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
413
416
  enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
414
417
  enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
415
- enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
418
+ enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
419
+ enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
416
420
  enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
417
421
  enrichVar('NOTE_HASH_TREE_MAP_SIZE_KB', config.noteHashTreeMapSizeKb.toString());
418
422
  enrichVar('NULLIFIER_TREE_MAP_SIZE_KB', config.nullifierTreeMapSizeKb.toString());
@@ -444,6 +448,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
444
448
  enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
445
449
  enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
446
450
  enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
451
+ enrichVar('AZTEC_LAG_IN_EPOCHS', config.lagInEpochs.toString());
447
452
  enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
448
453
  enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
449
454
  enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
@@ -461,6 +466,7 @@ export function enrichEnvironmentWithChainConfig(networkName) {
461
466
  enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
462
467
  enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
463
468
  enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
469
+ enrichVar('AZTEC_SLASHING_DISABLE_DURATION', config.slashingDisableDuration.toString());
464
470
  enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
465
471
  enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
466
472
  // Slashing
@@ -477,6 +483,8 @@ export function enrichEnvironmentWithChainConfig(networkName) {
477
483
  enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
478
484
  enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
479
485
  enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
486
+ enrichVar('SLASH_GRACE_PERIOD_L2_SLOTS', config.slashGracePeriodL2Slots.toString());
487
+ enrichVar('SLASH_EXECUTE_ROUNDS_LOOK_BACK', config.slashExecuteRoundsLookBack.toString());
480
488
  enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
481
489
  enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
482
490
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "2.1.3-rc.1",
3
+ "version": "2.1.3-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.3-rc.1",
75
- "@aztec/aztec.js": "2.1.3-rc.1",
76
- "@aztec/constants": "2.1.3-rc.1",
77
- "@aztec/entrypoints": "2.1.3-rc.1",
78
- "@aztec/ethereum": "2.1.3-rc.1",
79
- "@aztec/foundation": "2.1.3-rc.1",
80
- "@aztec/l1-artifacts": "2.1.3-rc.1",
81
- "@aztec/node-keystore": "2.1.3-rc.1",
82
- "@aztec/node-lib": "2.1.3-rc.1",
83
- "@aztec/p2p": "2.1.3-rc.1",
84
- "@aztec/stdlib": "2.1.3-rc.1",
85
- "@aztec/world-state": "2.1.3-rc.1",
74
+ "@aztec/archiver": "2.1.3-rc.2",
75
+ "@aztec/aztec.js": "2.1.3-rc.2",
76
+ "@aztec/constants": "2.1.3-rc.2",
77
+ "@aztec/entrypoints": "2.1.3-rc.2",
78
+ "@aztec/ethereum": "2.1.3-rc.2",
79
+ "@aztec/foundation": "2.1.3-rc.2",
80
+ "@aztec/l1-artifacts": "2.1.3-rc.2",
81
+ "@aztec/node-keystore": "2.1.3-rc.2",
82
+ "@aztec/node-lib": "2.1.3-rc.2",
83
+ "@aztec/p2p": "2.1.3-rc.2",
84
+ "@aztec/stdlib": "2.1.3-rc.2",
85
+ "@aztec/world-state": "2.1.3-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,11 @@
96
96
  "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
97
97
  },
98
98
  "devDependencies": {
99
- "@aztec/accounts": "2.1.3-rc.1",
100
- "@aztec/protocol-contracts": "2.1.3-rc.1",
99
+ "@aztec/accounts": "2.1.3-rc.2",
100
+ "@aztec/aztec-node": "2.1.3-rc.2",
101
+ "@aztec/kv-store": "2.1.3-rc.2",
102
+ "@aztec/protocol-contracts": "2.1.3-rc.2",
103
+ "@aztec/telemetry-client": "2.1.3-rc.2",
101
104
  "@jest/globals": "^30.0.0",
102
105
  "@types/jest": "^30.0.0",
103
106
  "@types/lodash.chunk": "^4.2.9",
@@ -113,15 +116,15 @@
113
116
  "typescript": "^5.3.3"
114
117
  },
115
118
  "peerDependencies": {
116
- "@aztec/accounts": "2.1.3-rc.1",
117
- "@aztec/bb-prover": "2.1.3-rc.1",
118
- "@aztec/ethereum": "2.1.3-rc.1",
119
- "@aztec/l1-artifacts": "2.1.3-rc.1",
120
- "@aztec/noir-contracts.js": "2.1.3-rc.1",
121
- "@aztec/noir-protocol-circuits-types": "2.1.3-rc.1",
122
- "@aztec/noir-test-contracts.js": "2.1.3-rc.1",
123
- "@aztec/protocol-contracts": "2.1.3-rc.1",
124
- "@aztec/stdlib": "2.1.3-rc.1"
119
+ "@aztec/accounts": "2.1.3-rc.2",
120
+ "@aztec/bb-prover": "2.1.3-rc.2",
121
+ "@aztec/ethereum": "2.1.3-rc.2",
122
+ "@aztec/l1-artifacts": "2.1.3-rc.2",
123
+ "@aztec/noir-contracts.js": "2.1.3-rc.2",
124
+ "@aztec/noir-protocol-circuits-types": "2.1.3-rc.2",
125
+ "@aztec/noir-test-contracts.js": "2.1.3-rc.2",
126
+ "@aztec/protocol-contracts": "2.1.3-rc.2",
127
+ "@aztec/stdlib": "2.1.3-rc.2"
125
128
  },
126
129
  "files": [
127
130
  "dest",
package/src/config/chain_l2_config.ts CHANGED
@@ -1,9 +1,9 @@
1
- import { DefaultL1ContractsConfig, type L1ContractsConfig } from '@aztec/ethereum';
1
+ import { DefaultL1ContractsConfig, type L1ContractsConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
2
2
  import type { NetworkNames } from '@aztec/foundation/config';
3
3
  import { EthAddress } from '@aztec/foundation/eth-address';
4
4
  import type { SharedNodeConfig } from '@aztec/node-lib/config';
5
5
  import type { P2PConfig } from '@aztec/p2p/config';
6
- import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
6
+ import type { SequencerConfig, SlasherConfig } from '@aztec/stdlib/interfaces/server';
7
7
 
8
8
  import path from 'path';
9
9
 
@@ -15,16 +15,15 @@ const SNAPSHOTS_URL = 'https://aztec-labs-snapshots.com';
15
15
  const defaultDBMapSizeKb = 128 * 1_024 * 1_024; // 128 GB
16
16
  const tbMapSizeKb = 1_024 * 1_024 * 1_024; // 1 TB
17
17
 
18
- export type L2ChainConfig = L1ContractsConfig &
19
- Pick<P2PConfig, 'txPoolDeleteTxsAfterReorg'> &
20
- Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways'> & {
18
+ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> &
19
+ Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> &
20
+ Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> &
21
+ Pick<SequencerConfig, 'minTxsPerBlock' | 'maxTxsPerBlock'> & {
21
22
  l1ChainId: number;
22
23
  testAccounts: boolean;
23
24
  sponsoredFPC: boolean;
24
- p2pEnabled: boolean;
25
- p2pBootstrapNodes: string[];
26
- seqMinTxsPerBlock: number;
27
- seqMaxTxsPerBlock: number;
25
+ minTxsPerBlock: number;
26
+ maxTxsPerBlock: number;
28
27
  realProofs: boolean;
29
28
  snapshotsUrls: string[];
30
29
  autoUpdate: SharedNodeConfig['autoUpdate'];
@@ -37,9 +36,9 @@ export type L2ChainConfig = L1ContractsConfig &
37
36
  skipArchiverInitialSync?: boolean;
38
37
  blobAllowEmptySources?: boolean;
39
38
 
40
- // Setting the dbMapSize provides the default for every DB in the node.
39
+ // Setting the dataStoreMapSize provides the default for every DB in the node.
41
40
  // Then we explicitly override the sizes for the archiver and the larger trees.
42
- dbMapSizeKb: number;
41
+ dataStoreMapSizeKb: number;
43
42
  archiverStoreMapSizeKb: number;
44
43
  noteHashTreeMapSizeKb: number;
45
44
  nullifierTreeMapSizeKb: number;
@@ -88,7 +87,7 @@ const DefaultSlashConfig = {
88
87
  } satisfies Partial<L2ChainConfig>;
89
88
 
90
89
  const DefaultNetworkDBMapSizeConfig = {
91
- dbMapSizeKb: defaultDBMapSizeKb,
90
+ dataStoreMapSizeKb: defaultDBMapSizeKb,
92
91
  archiverStoreMapSizeKb: tbMapSizeKb,
93
92
  noteHashTreeMapSizeKb: tbMapSizeKb,
94
93
  nullifierTreeMapSizeKb: tbMapSizeKb,
@@ -101,9 +100,9 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
101
100
  sponsoredFPC: false,
102
101
  disableTransactions: true,
103
102
  p2pEnabled: true,
104
- p2pBootstrapNodes: [],
105
- seqMinTxsPerBlock: 0,
106
- seqMaxTxsPerBlock: 0,
103
+ bootstrapNodes: [],
104
+ minTxsPerBlock: 0,
105
+ maxTxsPerBlock: 0,
107
106
  realProofs: true,
108
107
  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-ignition/`],
109
108
  autoUpdate: 'config-and-version',
@@ -184,9 +183,9 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
184
183
  sponsoredFPC: true,
185
184
  disableTransactions: false,
186
185
  p2pEnabled: true,
187
- p2pBootstrapNodes: [],
188
- seqMinTxsPerBlock: 0,
189
- seqMaxTxsPerBlock: 20,
186
+ bootstrapNodes: [],
187
+ minTxsPerBlock: 0,
188
+ maxTxsPerBlock: 20,
190
189
  realProofs: true,
191
190
  snapshotsUrls: [`${SNAPSHOTS_URL}/staging-public/`],
192
191
  autoUpdate: 'config-and-version',
@@ -239,9 +238,9 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
239
238
  sponsoredFPC: true,
240
239
  p2pEnabled: true,
241
240
  disableTransactions: false,
242
- p2pBootstrapNodes: [],
243
- seqMinTxsPerBlock: 0,
244
- seqMaxTxsPerBlock: 8,
241
+ bootstrapNodes: [],
242
+ minTxsPerBlock: 0,
243
+ maxTxsPerBlock: 8,
245
244
  realProofs: true,
246
245
  snapshotsUrls: [],
247
246
  autoUpdate: 'config-and-version',
@@ -294,9 +293,9 @@ export const testnetL2ChainConfig: L2ChainConfig = {
294
293
  sponsoredFPC: true,
295
294
  p2pEnabled: true,
296
295
  disableTransactions: true,
297
- p2pBootstrapNodes: [],
298
- seqMinTxsPerBlock: 0,
299
- seqMaxTxsPerBlock: 0,
296
+ bootstrapNodes: [],
297
+ minTxsPerBlock: 0,
298
+ maxTxsPerBlock: 0,
300
299
  realProofs: true,
301
300
  snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
302
301
  autoUpdate: 'config-and-version',
@@ -385,9 +384,9 @@ export const mainnetL2ChainConfig: L2ChainConfig = {
385
384
  testAccounts: false,
386
385
  sponsoredFPC: false,
387
386
  p2pEnabled: true,
388
- p2pBootstrapNodes: [],
389
- seqMinTxsPerBlock: 0,
390
- seqMaxTxsPerBlock: 0,
387
+ bootstrapNodes: [],
388
+ minTxsPerBlock: 0,
389
+ maxTxsPerBlock: 0,
391
390
  realProofs: true,
392
391
  snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
393
392
  autoUpdate: 'notify',
@@ -471,9 +470,9 @@ export const devnetL2ChainConfig: L2ChainConfig = {
471
470
  sponsoredFPC: true,
472
471
  p2pEnabled: true,
473
472
  disableTransactions: false,
474
- p2pBootstrapNodes: [],
475
- seqMinTxsPerBlock: 0,
476
- seqMaxTxsPerBlock: 8,
473
+ bootstrapNodes: [],
474
+ minTxsPerBlock: 0,
475
+ maxTxsPerBlock: 8,
477
476
  realProofs: false,
478
477
  snapshotsUrls: [],
479
478
  autoUpdate: 'config-and-version',
@@ -538,7 +537,7 @@ function getDefaultDataDir(networkName: NetworkNames): string {
538
537
  return path.join(process.env.HOME || '~', '.aztec', networkName, 'data');
539
538
  }
540
539
 
541
- export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
540
+ export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
542
541
  if (networkName === 'local') {
543
542
  return;
544
543
  }
@@ -550,19 +549,24 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
550
549
  throw new Error(`Unknown network name: ${networkName}`);
551
550
  }
552
551
 
553
- enrichVar('BOOTSTRAP_NODES', config.p2pBootstrapNodes.join(','));
552
+ enrichEnvironmentWithChainConfig(config);
553
+ }
554
+
555
+ export function enrichEnvironmentWithChainConfig(config: L2ChainConfig) {
556
+ enrichVar('BOOTSTRAP_NODES', config.bootstrapNodes.join(','));
554
557
  enrichVar('TEST_ACCOUNTS', config.testAccounts.toString());
555
558
  enrichVar('SPONSORED_FPC', config.sponsoredFPC.toString());
556
559
  enrichVar('P2P_ENABLED', config.p2pEnabled.toString());
557
560
  enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
558
- enrichVar('SEQ_MIN_TX_PER_BLOCK', config.seqMinTxsPerBlock.toString());
559
- enrichVar('SEQ_MAX_TX_PER_BLOCK', config.seqMaxTxsPerBlock.toString());
561
+ enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
562
+ enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
560
563
  enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
561
564
  enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
562
565
  enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
563
566
  enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString());
567
+ enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
564
568
 
565
- enrichVar('DATA_STORE_MAP_SIZE_KB', config.dbMapSizeKb.toString());
569
+ enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
566
570
  enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
567
571
  enrichVar('NOTE_HASH_TREE_MAP_SIZE_KB', config.noteHashTreeMapSizeKb.toString());
568
572
  enrichVar('NULLIFIER_TREE_MAP_SIZE_KB', config.nullifierTreeMapSizeKb.toString());
@@ -603,6 +607,7 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
603
607
  enrichVar('AZTEC_SLOT_DURATION', config.aztecSlotDuration.toString());
604
608
  enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
605
609
  enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
610
+ enrichVar('AZTEC_LAG_IN_EPOCHS', config.lagInEpochs.toString());
606
611
  enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
607
612
  enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
608
613
  enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
@@ -620,6 +625,7 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
620
625
  enrichVar('AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS', config.slashingExecutionDelayInRounds.toString());
621
626
  enrichVar('AZTEC_SLASHING_OFFSET_IN_ROUNDS', config.slashingOffsetInRounds.toString());
622
627
  enrichVar('AZTEC_SLASHER_FLAVOR', config.slasherFlavor);
628
+ enrichVar('AZTEC_SLASHING_DISABLE_DURATION', config.slashingDisableDuration.toString());
623
629
  enrichVar('AZTEC_EXIT_DELAY_SECONDS', config.exitDelaySeconds.toString());
624
630
  enrichEthAddressVar('AZTEC_SLASHING_VETOER', config.slashingVetoer.toString());
625
631
 
@@ -637,6 +643,8 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
637
643
  enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashBroadcastedInvalidBlockPenalty.toString());
638
644
  enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
639
645
  enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
646
+ enrichVar('SLASH_GRACE_PERIOD_L2_SLOTS', config.slashGracePeriodL2Slots.toString());
647
+ enrichVar('SLASH_EXECUTE_ROUNDS_LOOK_BACK', config.slashExecuteRoundsLookBack.toString());
640
648
 
641
649
  enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
642
650
  enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());