@aztec/cli 0.0.1-commit.d6f2b3f94 → 0.0.1-commit.dbf9cec

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 (15) hide show
  1. package/dest/cmds/infrastructure/setup_l2_contract.d.ts +1 -1
  2. package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map +1 -1
  3. package/dest/cmds/infrastructure/setup_l2_contract.js +3 -2
  4. package/dest/cmds/l1/update_l1_validators.js +5 -5
  5. package/dest/config/chain_l2_config.d.ts +1 -1
  6. package/dest/config/chain_l2_config.d.ts.map +1 -1
  7. package/dest/config/chain_l2_config.js +3 -1
  8. package/dest/config/generated/networks.d.ts +24 -13
  9. package/dest/config/generated/networks.d.ts.map +1 -1
  10. package/dest/config/generated/networks.js +23 -12
  11. package/package.json +30 -30
  12. package/src/cmds/infrastructure/setup_l2_contract.ts +4 -3
  13. package/src/cmds/l1/update_l1_validators.ts +5 -5
  14. package/src/config/chain_l2_config.ts +3 -1
  15. package/src/config/generated/networks.ts +23 -12
package/dest/cmds/infrastructure/setup_l2_contract.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import type { LogFn } from '@aztec/foundation/log';
2
2
  export declare function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn): Promise<void>;
3
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfbDJfY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2luZnJhc3RydWN0dXJlL3NldHVwX2wyX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBSW5ELHdCQUFzQixnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkF3QnZHIn0=
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2V0dXBfbDJfY29udHJhY3QuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2luZnJhc3RydWN0dXJlL3NldHVwX2wyX2NvbnRyYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBS25ELHdCQUFzQixnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxpQkF3QnZHIn0=
package/dest/cmds/infrastructure/setup_l2_contract.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAwBvG"}
1
+ {"version":3,"file":"setup_l2_contract.d.ts","sourceRoot":"","sources":["../../../src/cmds/infrastructure/setup_l2_contract.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,iBAwBvG"}
package/dest/cmds/infrastructure/setup_l2_contract.js CHANGED
@@ -2,7 +2,8 @@ import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
2
  import { createAztecNodeClient } from '@aztec/aztec.js/node';
3
3
  import { jsonStringify } from '@aztec/foundation/json-rpc';
4
4
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
5
- import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
5
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
6
+ import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
6
7
  export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
7
8
  const waitOpts = {
8
9
  timeout: 180,
@@ -11,7 +12,7 @@ export async function setupL2Contracts(nodeUrl, testAccounts, json, log) {
11
12
  log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
12
13
  log('setupL2Contracts: Creating PXE client...');
13
14
  const node = createAztecNodeClient(nodeUrl);
14
- const wallet = await TestWallet.create(node);
15
+ const wallet = await EmbeddedWallet.create(node);
15
16
  let deployedAccountManagers = [];
16
17
  if (testAccounts) {
17
18
  log('setupL2Contracts: Deploying test accounts...');
package/dest/cmds/l1/update_l1_validators.js CHANGED
@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
2
2
  import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
3
3
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
5
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
6
6
  import { EthCheatCodes } from '@aztec/ethereum/test';
7
7
  import { DateProvider } from '@aztec/foundation/timer';
8
8
  import { RollupAbi, StakingAssetHandlerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -38,7 +38,7 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
38
38
  const gseAddress = await rollup.read.getGSE();
39
39
  const gse = new GSEContract(l1Client, gseAddress);
40
40
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
41
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
41
+ const l1TxUtils = createL1TxUtils(l1Client, {
42
42
  logger: debugLogger
43
43
  });
44
44
  const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
@@ -130,7 +130,7 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
130
130
  const gseAddress = await rollup.read.getGSE();
131
131
  const gse = new GSEContract(l1Client, gseAddress);
132
132
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
133
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
133
+ const l1TxUtils = createL1TxUtils(l1Client, {
134
134
  logger: debugLogger
135
135
  });
136
136
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -172,7 +172,7 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
172
172
  const account = getAccount(privateKey, mnemonic);
173
173
  const chain = createEthereumChain(rpcUrls, chainId);
174
174
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
175
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
175
+ const l1TxUtils = createL1TxUtils(l1Client, {
176
176
  logger: debugLogger
177
177
  });
178
178
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
@@ -194,7 +194,7 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
194
194
  const account = getAccount(privateKey, mnemonic);
195
195
  const chain = createEthereumChain(rpcUrls, chainId);
196
196
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
197
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
197
+ const l1TxUtils = createL1TxUtils(l1Client, {
198
198
  logger: debugLogger
199
199
  });
200
200
  dualLog(`Trying prune`);
package/dest/config/chain_l2_config.d.ts CHANGED
@@ -11,4 +11,4 @@ import type { NetworkNames } from '@aztec/foundation/config';
11
11
  * @param networkName - The network name
12
12
  */
13
13
  export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQW1CdkUifQ==
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQXFCdkUifQ==
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,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAmBvE"}
1
+ {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAqBvE"}
package/dest/config/chain_l2_config.js CHANGED
@@ -34,7 +34,9 @@ function getDefaultDataDir(networkName) {
34
34
  return;
35
35
  }
36
36
  // Apply generated network config from defaults.yml
37
- const generatedConfig = NetworkConfigs[networkName];
37
+ // For devnet iterations (v4-devnet-1, etc.), use the base devnet config
38
+ const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
39
+ const generatedConfig = NetworkConfigs[configKey];
38
40
  if (generatedConfig) {
39
41
  enrichEnvironmentWithNetworkConfig(generatedConfig);
40
42
  }
package/dest/config/generated/networks.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  export declare const devnetConfig: {
2
2
  readonly ETHEREUM_SLOT_DURATION: 12;
3
- readonly AZTEC_SLOT_DURATION: 36;
3
+ readonly AZTEC_SLOT_DURATION: 72;
4
4
  readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
5
5
  readonly AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000;
6
6
  readonly AZTEC_EJECTION_THRESHOLD: 50000000000000000000;
@@ -30,6 +30,8 @@ export declare const devnetConfig: {
30
30
  readonly BOOTSTRAP_NODES: "";
31
31
  readonly SEQ_MIN_TX_PER_BLOCK: 0;
32
32
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
33
+ readonly SEQ_BLOCK_DURATION_MS: 6000;
34
+ readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
33
35
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
34
36
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
35
37
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -45,7 +47,7 @@ export declare const devnetConfig: {
45
47
  readonly TEST_ACCOUNTS: true;
46
48
  readonly SPONSORED_FPC: true;
47
49
  readonly TRANSACTIONS_DISABLED: false;
48
- readonly SEQ_MAX_TX_PER_BLOCK: 32;
50
+ readonly SEQ_MAX_TX_PER_BLOCK: 18;
49
51
  readonly PROVER_REAL_PROOFS: false;
50
52
  readonly PXE_PROVER_ENABLED: false;
51
53
  readonly SYNC_SNAPSHOTS_URLS: "";
@@ -80,16 +82,12 @@ export declare const testnetConfig: {
80
82
  readonly AZTEC_EXIT_DELAY_SECONDS: 172800;
81
83
  readonly AZTEC_INBOX_LAG: 1;
82
84
  readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
83
- readonly AZTEC_PROVING_COST_PER_MANA: 100;
84
85
  readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
85
86
  readonly AZTEC_SLASHER_FLAVOR: "tally";
86
87
  readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
87
88
  readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
88
89
  readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
89
90
  readonly AZTEC_SLASHING_DISABLE_DURATION: 432000;
90
- readonly AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000;
91
- readonly AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000;
92
- readonly AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000;
93
91
  readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
94
92
  readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
95
93
  readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
@@ -99,6 +97,8 @@ export declare const testnetConfig: {
99
97
  readonly BOOTSTRAP_NODES: "";
100
98
  readonly SEQ_MIN_TX_PER_BLOCK: 0;
101
99
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
100
+ readonly SEQ_BLOCK_DURATION_MS: 6000;
101
+ readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
102
102
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
103
103
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
104
104
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -115,12 +115,16 @@ export declare const testnetConfig: {
115
115
  readonly AZTEC_SLASHING_QUORUM: 33;
116
116
  readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100;
117
117
  readonly AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60;
118
- readonly AZTEC_MANA_TARGET: 150000000;
118
+ readonly AZTEC_MANA_TARGET: 75000000;
119
+ readonly AZTEC_PROVING_COST_PER_MANA: 25000000;
120
+ readonly AZTEC_SLASH_AMOUNT_SMALL: 1e+23;
121
+ readonly AZTEC_SLASH_AMOUNT_MEDIUM: 1e+23;
122
+ readonly AZTEC_SLASH_AMOUNT_LARGE: 1e+23;
119
123
  readonly L1_CHAIN_ID: 11155111;
120
124
  readonly TEST_ACCOUNTS: false;
121
125
  readonly SPONSORED_FPC: true;
122
126
  readonly TRANSACTIONS_DISABLED: false;
123
- readonly SEQ_MAX_TX_PER_BLOCK: 8;
127
+ readonly SEQ_MAX_TX_PER_BLOCK: 2;
124
128
  readonly PROVER_REAL_PROOFS: true;
125
129
  readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
126
130
  readonly SLASH_PRUNE_PENALTY: 10000000000000000000;
@@ -139,6 +143,7 @@ export declare const testnetConfig: {
139
143
  export declare const mainnetConfig: {
140
144
  readonly ETHEREUM_SLOT_DURATION: 12;
141
145
  readonly AZTEC_EPOCH_DURATION: 32;
146
+ readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
142
147
  readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
143
148
  readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
144
149
  readonly AZTEC_INBOX_LAG: 1;
@@ -156,6 +161,8 @@ export declare const mainnetConfig: {
156
161
  readonly BOOTSTRAP_NODES: "";
157
162
  readonly SEQ_MIN_TX_PER_BLOCK: 0;
158
163
  readonly SEQ_BUILD_CHECKPOINT_IF_EMPTY: true;
164
+ readonly SEQ_BLOCK_DURATION_MS: 6000;
165
+ readonly SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36;
159
166
  readonly DATA_STORE_MAP_SIZE_KB: 134217728;
160
167
  readonly ARCHIVER_STORE_MAP_SIZE_KB: 1073741824;
161
168
  readonly NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824;
@@ -164,10 +171,9 @@ export declare const mainnetConfig: {
164
171
  readonly PUBLIC_OTEL_INCLUDE_METRICS: "aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_";
165
172
  readonly SENTINEL_ENABLED: true;
166
173
  readonly AZTEC_SLOT_DURATION: 72;
167
- readonly AZTEC_TARGET_COMMITTEE_SIZE: 24;
168
174
  readonly AZTEC_ACTIVATION_THRESHOLD: 2e+23;
169
175
  readonly AZTEC_EJECTION_THRESHOLD: 1e+23;
170
- readonly AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96e+23;
176
+ readonly AZTEC_LOCAL_EJECTION_THRESHOLD: 1.62e+23;
171
177
  readonly AZTEC_SLASH_AMOUNT_SMALL: 2e+21;
172
178
  readonly AZTEC_SLASH_AMOUNT_MEDIUM: 2e+21;
173
179
  readonly AZTEC_SLASH_AMOUNT_LARGE: 2e+21;
@@ -177,10 +183,15 @@ export declare const mainnetConfig: {
177
183
  readonly AZTEC_SLASHING_QUORUM: 65;
178
184
  readonly AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600;
179
185
  readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000;
180
- readonly AZTEC_MANA_TARGET: 0;
181
- readonly AZTEC_PROVING_COST_PER_MANA: 0;
186
+ readonly AZTEC_MANA_TARGET: 75000000;
187
+ readonly AZTEC_PROVING_COST_PER_MANA: 25000000;
182
188
  readonly AZTEC_EXIT_DELAY_SECONDS: 345600;
183
189
  readonly AZTEC_SLASHING_DISABLE_DURATION: 259200;
190
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500;
191
+ readonly AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500;
192
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1;
193
+ readonly AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400;
194
+ readonly AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4;
184
195
  readonly L1_CHAIN_ID: 1;
185
196
  readonly TEST_ACCOUNTS: false;
186
197
  readonly SPONSORED_FPC: false;
@@ -208,4 +219,4 @@ export declare const mainnetConfig: {
208
219
  readonly SLASH_INVALID_BLOCK_PENALTY: 2e+21;
209
220
  readonly SLASH_GRACE_PERIOD_L2_SLOTS: 1200;
210
221
  };
211
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0F3RWYsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBZ0VoQixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0NBdUVoQixDQUFDIn0=
222
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTBFZixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQWtFaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Q0E4RWhCLENBQUMifQ==
package/dest/config/generated/networks.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwEf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgEhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuEhB,CAAC"}
1
+ {"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0Ef,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EhB,CAAC"}
package/dest/config/generated/networks.js CHANGED
@@ -2,7 +2,7 @@
2
2
  // Do not edit manually - run yarn generate to regenerate
3
3
  export const devnetConfig = {
4
4
  ETHEREUM_SLOT_DURATION: 12,
5
- AZTEC_SLOT_DURATION: 36,
5
+ AZTEC_SLOT_DURATION: 72,
6
6
  AZTEC_TARGET_COMMITTEE_SIZE: 48,
7
7
  AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
8
8
  AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
@@ -32,6 +32,8 @@ export const devnetConfig = {
32
32
  BOOTSTRAP_NODES: '',
33
33
  SEQ_MIN_TX_PER_BLOCK: 0,
34
34
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
35
+ SEQ_BLOCK_DURATION_MS: 6000,
36
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
35
37
  DATA_STORE_MAP_SIZE_KB: 134217728,
36
38
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
37
39
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -47,7 +49,7 @@ export const devnetConfig = {
47
49
  TEST_ACCOUNTS: true,
48
50
  SPONSORED_FPC: true,
49
51
  TRANSACTIONS_DISABLED: false,
50
- SEQ_MAX_TX_PER_BLOCK: 32,
52
+ SEQ_MAX_TX_PER_BLOCK: 18,
51
53
  PROVER_REAL_PROOFS: false,
52
54
  PXE_PROVER_ENABLED: false,
53
55
  SYNC_SNAPSHOTS_URLS: '',
@@ -82,16 +84,12 @@ export const testnetConfig = {
82
84
  AZTEC_EXIT_DELAY_SECONDS: 172800,
83
85
  AZTEC_INBOX_LAG: 1,
84
86
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
85
- AZTEC_PROVING_COST_PER_MANA: 100,
86
87
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
87
88
  AZTEC_SLASHER_FLAVOR: 'tally',
88
89
  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
89
90
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
90
91
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
91
92
  AZTEC_SLASHING_DISABLE_DURATION: 432000,
92
- AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
93
- AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
94
- AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
95
93
  SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
96
94
  SLASH_MAX_PENALTY_PERCENTAGE: 2,
97
95
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
@@ -101,6 +99,8 @@ export const testnetConfig = {
101
99
  BOOTSTRAP_NODES: '',
102
100
  SEQ_MIN_TX_PER_BLOCK: 0,
103
101
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
102
+ SEQ_BLOCK_DURATION_MS: 6000,
103
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
104
104
  DATA_STORE_MAP_SIZE_KB: 134217728,
105
105
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
106
106
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -117,12 +117,16 @@ export const testnetConfig = {
117
117
  AZTEC_SLASHING_QUORUM: 33,
118
118
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
119
119
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
120
- AZTEC_MANA_TARGET: 150000000,
120
+ AZTEC_MANA_TARGET: 75000000,
121
+ AZTEC_PROVING_COST_PER_MANA: 25000000,
122
+ AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
123
+ AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
124
+ AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
121
125
  L1_CHAIN_ID: 11155111,
122
126
  TEST_ACCOUNTS: false,
123
127
  SPONSORED_FPC: true,
124
128
  TRANSACTIONS_DISABLED: false,
125
- SEQ_MAX_TX_PER_BLOCK: 8,
129
+ SEQ_MAX_TX_PER_BLOCK: 2,
126
130
  PROVER_REAL_PROOFS: true,
127
131
  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
128
132
  SLASH_PRUNE_PENALTY: 10000000000000000000,
@@ -141,6 +145,7 @@ export const testnetConfig = {
141
145
  export const mainnetConfig = {
142
146
  ETHEREUM_SLOT_DURATION: 12,
143
147
  AZTEC_EPOCH_DURATION: 32,
148
+ AZTEC_TARGET_COMMITTEE_SIZE: 48,
144
149
  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
145
150
  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
146
151
  AZTEC_INBOX_LAG: 1,
@@ -158,6 +163,8 @@ export const mainnetConfig = {
158
163
  BOOTSTRAP_NODES: '',
159
164
  SEQ_MIN_TX_PER_BLOCK: 0,
160
165
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
166
+ SEQ_BLOCK_DURATION_MS: 6000,
167
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
161
168
  DATA_STORE_MAP_SIZE_KB: 134217728,
162
169
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
163
170
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -166,10 +173,9 @@ export const mainnetConfig = {
166
173
  PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
167
174
  SENTINEL_ENABLED: true,
168
175
  AZTEC_SLOT_DURATION: 72,
169
- AZTEC_TARGET_COMMITTEE_SIZE: 24,
170
176
  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
171
177
  AZTEC_EJECTION_THRESHOLD: 1E+23,
172
- AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96E+23,
178
+ AZTEC_LOCAL_EJECTION_THRESHOLD: 1.62E+23,
173
179
  AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
174
180
  AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
175
181
  AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
@@ -179,10 +185,15 @@ export const mainnetConfig = {
179
185
  AZTEC_SLASHING_QUORUM: 65,
180
186
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
181
187
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
182
- AZTEC_MANA_TARGET: 0,
183
- AZTEC_PROVING_COST_PER_MANA: 0,
188
+ AZTEC_MANA_TARGET: 75000000,
189
+ AZTEC_PROVING_COST_PER_MANA: 25000000,
184
190
  AZTEC_EXIT_DELAY_SECONDS: 345600,
185
191
  AZTEC_SLASHING_DISABLE_DURATION: 259200,
192
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
193
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500,
194
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1,
195
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400,
196
+ AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4,
186
197
  L1_CHAIN_ID: 1,
187
198
  TEST_ACCOUNTS: false,
188
199
  SPONSORED_FPC: false,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.0.1-commit.d6f2b3f94",
3
+ "version": "0.0.1-commit.dbf9cec",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "@aztec/accounts": "0.0.1-commit.d6f2b3f94",
81
- "@aztec/archiver": "0.0.1-commit.d6f2b3f94",
82
- "@aztec/aztec.js": "0.0.1-commit.d6f2b3f94",
83
- "@aztec/constants": "0.0.1-commit.d6f2b3f94",
84
- "@aztec/entrypoints": "0.0.1-commit.d6f2b3f94",
85
- "@aztec/ethereum": "0.0.1-commit.d6f2b3f94",
86
- "@aztec/foundation": "0.0.1-commit.d6f2b3f94",
87
- "@aztec/l1-artifacts": "0.0.1-commit.d6f2b3f94",
88
- "@aztec/node-keystore": "0.0.1-commit.d6f2b3f94",
89
- "@aztec/node-lib": "0.0.1-commit.d6f2b3f94",
90
- "@aztec/p2p": "0.0.1-commit.d6f2b3f94",
91
- "@aztec/protocol-contracts": "0.0.1-commit.d6f2b3f94",
92
- "@aztec/sequencer-client": "0.0.1-commit.d6f2b3f94",
93
- "@aztec/slasher": "0.0.1-commit.d6f2b3f94",
94
- "@aztec/stdlib": "0.0.1-commit.d6f2b3f94",
95
- "@aztec/test-wallet": "0.0.1-commit.d6f2b3f94",
96
- "@aztec/world-state": "0.0.1-commit.d6f2b3f94",
80
+ "@aztec/accounts": "0.0.1-commit.dbf9cec",
81
+ "@aztec/archiver": "0.0.1-commit.dbf9cec",
82
+ "@aztec/aztec.js": "0.0.1-commit.dbf9cec",
83
+ "@aztec/constants": "0.0.1-commit.dbf9cec",
84
+ "@aztec/entrypoints": "0.0.1-commit.dbf9cec",
85
+ "@aztec/ethereum": "0.0.1-commit.dbf9cec",
86
+ "@aztec/foundation": "0.0.1-commit.dbf9cec",
87
+ "@aztec/l1-artifacts": "0.0.1-commit.dbf9cec",
88
+ "@aztec/node-keystore": "0.0.1-commit.dbf9cec",
89
+ "@aztec/node-lib": "0.0.1-commit.dbf9cec",
90
+ "@aztec/p2p": "0.0.1-commit.dbf9cec",
91
+ "@aztec/protocol-contracts": "0.0.1-commit.dbf9cec",
92
+ "@aztec/sequencer-client": "0.0.1-commit.dbf9cec",
93
+ "@aztec/slasher": "0.0.1-commit.dbf9cec",
94
+ "@aztec/stdlib": "0.0.1-commit.dbf9cec",
95
+ "@aztec/wallets": "0.0.1-commit.dbf9cec",
96
+ "@aztec/world-state": "0.0.1-commit.dbf9cec",
97
97
  "@ethersproject/wallet": "^5.8.0",
98
98
  "@iarna/toml": "^2.2.5",
99
99
  "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
107
107
  "viem": "npm:@aztec/viem@2.38.2"
108
108
  },
109
109
  "devDependencies": {
110
- "@aztec/aztec-node": "0.0.1-commit.d6f2b3f94",
111
- "@aztec/kv-store": "0.0.1-commit.d6f2b3f94",
112
- "@aztec/telemetry-client": "0.0.1-commit.d6f2b3f94",
110
+ "@aztec/aztec-node": "0.0.1-commit.dbf9cec",
111
+ "@aztec/kv-store": "0.0.1-commit.dbf9cec",
112
+ "@aztec/telemetry-client": "0.0.1-commit.dbf9cec",
113
113
  "@jest/globals": "^30.0.0",
114
114
  "@types/jest": "^30.0.0",
115
115
  "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
126
126
  "typescript": "^5.3.3"
127
127
  },
128
128
  "peerDependencies": {
129
- "@aztec/accounts": "0.0.1-commit.d6f2b3f94",
130
- "@aztec/bb-prover": "0.0.1-commit.d6f2b3f94",
131
- "@aztec/ethereum": "0.0.1-commit.d6f2b3f94",
132
- "@aztec/l1-artifacts": "0.0.1-commit.d6f2b3f94",
133
- "@aztec/noir-contracts.js": "0.0.1-commit.d6f2b3f94",
134
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.d6f2b3f94",
135
- "@aztec/noir-test-contracts.js": "0.0.1-commit.d6f2b3f94",
136
- "@aztec/protocol-contracts": "0.0.1-commit.d6f2b3f94",
137
- "@aztec/stdlib": "0.0.1-commit.d6f2b3f94"
129
+ "@aztec/accounts": "0.0.1-commit.dbf9cec",
130
+ "@aztec/bb-prover": "0.0.1-commit.dbf9cec",
131
+ "@aztec/ethereum": "0.0.1-commit.dbf9cec",
132
+ "@aztec/l1-artifacts": "0.0.1-commit.dbf9cec",
133
+ "@aztec/noir-contracts.js": "0.0.1-commit.dbf9cec",
134
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.dbf9cec",
135
+ "@aztec/noir-test-contracts.js": "0.0.1-commit.dbf9cec",
136
+ "@aztec/protocol-contracts": "0.0.1-commit.dbf9cec",
137
+ "@aztec/stdlib": "0.0.1-commit.dbf9cec"
138
138
  },
139
139
  "files": [
140
140
  "dest",
package/src/cmds/infrastructure/setup_l2_contract.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { getInitialTestAccountsData } from '@aztec/accounts/testing';
2
- import type { AztecAddress } from '@aztec/aztec.js/addresses';
2
+ import { AztecAddress } from '@aztec/aztec.js/addresses';
3
3
  import type { WaitOpts } from '@aztec/aztec.js/contracts';
4
4
  import { createAztecNodeClient } from '@aztec/aztec.js/node';
5
5
  import { AccountManager } from '@aztec/aztec.js/wallet';
6
6
  import { jsonStringify } from '@aztec/foundation/json-rpc';
7
7
  import type { LogFn } from '@aztec/foundation/log';
8
8
  import { ProtocolContractAddress } from '@aztec/protocol-contracts';
9
- import { TestWallet, deployFundedSchnorrAccounts } from '@aztec/test-wallet/server';
9
+ import { EmbeddedWallet } from '@aztec/wallets/embedded';
10
+ import { deployFundedSchnorrAccounts } from '@aztec/wallets/testing';
10
11
 
11
12
  export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, json: boolean, log: LogFn) {
12
13
  const waitOpts: WaitOpts = {
@@ -16,7 +17,7 @@ export async function setupL2Contracts(nodeUrl: string, testAccounts: boolean, j
16
17
  log('setupL2Contracts: Wait options' + jsonStringify(waitOpts));
17
18
  log('setupL2Contracts: Creating PXE client...');
18
19
  const node = createAztecNodeClient(nodeUrl);
19
- const wallet = await TestWallet.create(node);
20
+ const wallet = await EmbeddedWallet.create(node);
20
21
 
21
22
  let deployedAccountManagers: AccountManager[] = [];
22
23
  if (testAccounts) {
package/src/cmds/l1/update_l1_validators.ts CHANGED
@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
2
2
  import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
3
3
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
5
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
6
6
  import { EthCheatCodes } from '@aztec/ethereum/test';
7
7
  import type { EthAddress } from '@aztec/foundation/eth-address';
8
8
  import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -88,7 +88,7 @@ export async function addL1Validator({
88
88
  const gse = new GSEContract(l1Client, gseAddress);
89
89
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
90
90
 
91
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
91
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
92
92
  const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
93
93
 
94
94
  // Step 1: Claim STK tokens from the faucet
@@ -194,7 +194,7 @@ export async function addL1ValidatorViaRollup({
194
194
 
195
195
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
196
196
 
197
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
197
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
198
198
 
199
199
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
200
200
  to: rollupAddress.toString(),
@@ -241,7 +241,7 @@ export async function removeL1Validator({
241
241
  const account = getAccount(privateKey, mnemonic);
242
242
  const chain = createEthereumChain(rpcUrls, chainId);
243
243
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
244
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
244
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
245
245
 
246
246
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
247
247
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -268,7 +268,7 @@ export async function pruneRollup({
268
268
  const account = getAccount(privateKey, mnemonic);
269
269
  const chain = createEthereumChain(rpcUrls, chainId);
270
270
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
271
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
271
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
272
272
 
273
273
  dualLog(`Trying prune`);
274
274
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
package/src/config/chain_l2_config.ts CHANGED
@@ -45,7 +45,9 @@ export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
45
45
  }
46
46
 
47
47
  // Apply generated network config from defaults.yml
48
- const generatedConfig = NetworkConfigs[networkName];
48
+ // For devnet iterations (v4-devnet-1, etc.), use the base devnet config
49
+ const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
50
+ const generatedConfig = NetworkConfigs[configKey];
49
51
  if (generatedConfig) {
50
52
  enrichEnvironmentWithNetworkConfig(generatedConfig);
51
53
  }
package/src/config/generated/networks.ts CHANGED
@@ -3,7 +3,7 @@
3
3
 
4
4
  export const devnetConfig = {
5
5
  ETHEREUM_SLOT_DURATION: 12,
6
- AZTEC_SLOT_DURATION: 36,
6
+ AZTEC_SLOT_DURATION: 72,
7
7
  AZTEC_TARGET_COMMITTEE_SIZE: 48,
8
8
  AZTEC_ACTIVATION_THRESHOLD: 100000000000000000000,
9
9
  AZTEC_EJECTION_THRESHOLD: 50000000000000000000,
@@ -33,6 +33,8 @@ export const devnetConfig = {
33
33
  BOOTSTRAP_NODES: '',
34
34
  SEQ_MIN_TX_PER_BLOCK: 0,
35
35
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
36
+ SEQ_BLOCK_DURATION_MS: 6000,
37
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
36
38
  DATA_STORE_MAP_SIZE_KB: 134217728,
37
39
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
38
40
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -48,7 +50,7 @@ export const devnetConfig = {
48
50
  TEST_ACCOUNTS: true,
49
51
  SPONSORED_FPC: true,
50
52
  TRANSACTIONS_DISABLED: false,
51
- SEQ_MAX_TX_PER_BLOCK: 32,
53
+ SEQ_MAX_TX_PER_BLOCK: 18,
52
54
  PROVER_REAL_PROOFS: false,
53
55
  PXE_PROVER_ENABLED: false,
54
56
  SYNC_SNAPSHOTS_URLS: '',
@@ -84,16 +86,12 @@ export const testnetConfig = {
84
86
  AZTEC_EXIT_DELAY_SECONDS: 172800,
85
87
  AZTEC_INBOX_LAG: 1,
86
88
  AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
87
- AZTEC_PROVING_COST_PER_MANA: 100,
88
89
  AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
89
90
  AZTEC_SLASHER_FLAVOR: 'tally',
90
91
  AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
91
92
  AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
92
93
  AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
93
94
  AZTEC_SLASHING_DISABLE_DURATION: 432000,
94
- AZTEC_SLASH_AMOUNT_SMALL: 10000000000000000000,
95
- AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
96
- AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
97
95
  SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
98
96
  SLASH_MAX_PENALTY_PERCENTAGE: 2,
99
97
  SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
@@ -103,6 +101,8 @@ export const testnetConfig = {
103
101
  BOOTSTRAP_NODES: '',
104
102
  SEQ_MIN_TX_PER_BLOCK: 0,
105
103
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
104
+ SEQ_BLOCK_DURATION_MS: 6000,
105
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
106
106
  DATA_STORE_MAP_SIZE_KB: 134217728,
107
107
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
108
108
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -119,12 +119,16 @@ export const testnetConfig = {
119
119
  AZTEC_SLASHING_QUORUM: 33,
120
120
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 100,
121
121
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 60,
122
- AZTEC_MANA_TARGET: 150000000,
122
+ AZTEC_MANA_TARGET: 75000000,
123
+ AZTEC_PROVING_COST_PER_MANA: 25000000,
124
+ AZTEC_SLASH_AMOUNT_SMALL: 1E+23,
125
+ AZTEC_SLASH_AMOUNT_MEDIUM: 1E+23,
126
+ AZTEC_SLASH_AMOUNT_LARGE: 1E+23,
123
127
  L1_CHAIN_ID: 11155111,
124
128
  TEST_ACCOUNTS: false,
125
129
  SPONSORED_FPC: true,
126
130
  TRANSACTIONS_DISABLED: false,
127
- SEQ_MAX_TX_PER_BLOCK: 8,
131
+ SEQ_MAX_TX_PER_BLOCK: 2,
128
132
  PROVER_REAL_PROOFS: true,
129
133
  P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
130
134
  SLASH_PRUNE_PENALTY: 10000000000000000000,
@@ -144,6 +148,7 @@ export const testnetConfig = {
144
148
  export const mainnetConfig = {
145
149
  ETHEREUM_SLOT_DURATION: 12,
146
150
  AZTEC_EPOCH_DURATION: 32,
151
+ AZTEC_TARGET_COMMITTEE_SIZE: 48,
147
152
  AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
148
153
  AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
149
154
  AZTEC_INBOX_LAG: 1,
@@ -161,6 +166,8 @@ export const mainnetConfig = {
161
166
  BOOTSTRAP_NODES: '',
162
167
  SEQ_MIN_TX_PER_BLOCK: 0,
163
168
  SEQ_BUILD_CHECKPOINT_IF_EMPTY: true,
169
+ SEQ_BLOCK_DURATION_MS: 6000,
170
+ SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT: 36,
164
171
  DATA_STORE_MAP_SIZE_KB: 134217728,
165
172
  ARCHIVER_STORE_MAP_SIZE_KB: 1073741824,
166
173
  NOTE_HASH_TREE_MAP_SIZE_KB: 1073741824,
@@ -169,10 +176,9 @@ export const mainnetConfig = {
169
176
  PUBLIC_OTEL_INCLUDE_METRICS: 'aztec.validator,aztec.tx_collector,aztec.mempool,aztec.p2p.gossip.agg_,aztec.ivc_verifier.agg_',
170
177
  SENTINEL_ENABLED: true,
171
178
  AZTEC_SLOT_DURATION: 72,
172
- AZTEC_TARGET_COMMITTEE_SIZE: 24,
173
179
  AZTEC_ACTIVATION_THRESHOLD: 2E+23,
174
180
  AZTEC_EJECTION_THRESHOLD: 1E+23,
175
- AZTEC_LOCAL_EJECTION_THRESHOLD: 1.96E+23,
181
+ AZTEC_LOCAL_EJECTION_THRESHOLD: 1.62E+23,
176
182
  AZTEC_SLASH_AMOUNT_SMALL: 2E+21,
177
183
  AZTEC_SLASH_AMOUNT_MEDIUM: 2E+21,
178
184
  AZTEC_SLASH_AMOUNT_LARGE: 2E+21,
@@ -182,10 +188,15 @@ export const mainnetConfig = {
182
188
  AZTEC_SLASHING_QUORUM: 65,
183
189
  AZTEC_GOVERNANCE_PROPOSER_QUORUM: 600,
184
190
  AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 1000,
185
- AZTEC_MANA_TARGET: 0,
186
- AZTEC_PROVING_COST_PER_MANA: 0,
191
+ AZTEC_MANA_TARGET: 75000000,
192
+ AZTEC_PROVING_COST_PER_MANA: 25000000,
187
193
  AZTEC_EXIT_DELAY_SECONDS: 345600,
188
194
  AZTEC_SLASHING_DISABLE_DURATION: 259200,
195
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_VALIDATOR_SET_SIZE: 500,
196
+ AZTEC_ENTRY_QUEUE_BOOTSTRAP_FLUSH_SIZE: 500,
197
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_MIN: 1,
198
+ AZTEC_ENTRY_QUEUE_FLUSH_SIZE_QUOTIENT: 400,
199
+ AZTEC_ENTRY_QUEUE_MAX_FLUSH_SIZE: 4,
189
200
  L1_CHAIN_ID: 1,
190
201
  TEST_ACCOUNTS: false,
191
202
  SPONSORED_FPC: false,