@aztec/cli 3.0.0-nightly.20251024 → 3.0.0-nightly.20251026
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/cmds/l1/deploy_new_rollup.d.ts +1 -1
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +2 -2
- package/dest/cmds/l1/index.d.ts.map +1 -1
- package/dest/cmds/l1/index.js +2 -2
- package/dest/config/chain_l2_config.d.ts +3 -1
- package/dest/config/chain_l2_config.d.ts.map +1 -1
- package/dest/config/chain_l2_config.js +54 -7
- package/dest/utils/aztec.d.ts +1 -1
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +2 -2
- package/package.json +24 -24
- package/src/cmds/l1/deploy_new_rollup.ts +2 -0
- package/src/cmds/l1/index.ts +2 -0
- package/src/config/chain_l2_config.ts +69 -7
- package/src/utils/aztec.ts +2 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Operator } from '@aztec/ethereum';
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
4
|
-
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: Operator[], realVerifier: boolean, log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
|
+
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: Operator[], realVerifier: boolean, createVerificationJson: string | false, log: LogFn, debugLogger: Logger): Promise<void>;
|
|
5
5
|
//# sourceMappingURL=deploy_new_rollup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAA+B,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAA+B,MAAM,iBAAiB,CAAC;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,wBAAsB,eAAe,CACnC,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA+CpB"}
|
|
@@ -3,13 +3,13 @@ import { getL1ContractsConfigEnvVars } from '@aztec/ethereum';
|
|
|
3
3
|
import { getGenesisValues } from '@aztec/world-state/testing';
|
|
4
4
|
import { deployNewRollupContracts } from '../../utils/aztec.js';
|
|
5
5
|
import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
|
|
6
|
-
export async function deployNewRollup(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, json, initialValidators, realVerifier, log, debugLogger) {
|
|
6
|
+
export async function deployNewRollup(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, testAccounts, sponsoredFPC, json, initialValidators, realVerifier, createVerificationJson, log, debugLogger) {
|
|
7
7
|
const config = getL1ContractsConfigEnvVars();
|
|
8
8
|
const initialAccounts = testAccounts ? await getInitialTestAccountsData() : [];
|
|
9
9
|
const sponsoredFPCAddress = sponsoredFPC ? await getSponsoredFPCAddress() : [];
|
|
10
10
|
const initialFundedAccounts = initialAccounts.map((a)=>a.address).concat(sponsoredFPCAddress);
|
|
11
11
|
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
12
|
-
const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, config, realVerifier, debugLogger);
|
|
12
|
+
const { rollup, slashFactoryAddress } = await deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, fundingNeeded, config, realVerifier, createVerificationJson, debugLogger);
|
|
13
13
|
if (json) {
|
|
14
14
|
log(JSON.stringify({
|
|
15
15
|
rollupAddress: rollup.address,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAcjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAa3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAof/E"}
|
package/dest/cmds/l1/index.js
CHANGED
|
@@ -13,10 +13,10 @@ export function injectCommands(program, log, debugLogger) {
|
|
|
13
13
|
const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
|
|
14
14
|
await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, options.createVerificationJson, initialValidators, options.realVerifier, options.existingToken, log, debugLogger);
|
|
15
15
|
});
|
|
16
|
-
program.command('deploy-new-rollup').description('Deploys a new rollup contract and adds it to the registry (if you are the owner).').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', MNEMONIC ?? 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--real-verifier', 'Deploy the real verifier', false).action(async (options)=>{
|
|
16
|
+
program.command('deploy-new-rollup').description('Deploys a new rollup contract and adds it to the registry (if you are the owner).').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', MNEMONIC ?? 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--real-verifier', 'Deploy the real verifier', false).option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false).action(async (options)=>{
|
|
17
17
|
const { deployNewRollup } = await import('./deploy_new_rollup.js');
|
|
18
18
|
const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
|
|
19
|
-
await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.json, initialValidators, options.realVerifier, log, debugLogger);
|
|
19
|
+
await deployNewRollup(options.registryAddress, options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.json, initialValidators, options.realVerifier, options.createVerificationJson, log, debugLogger);
|
|
20
20
|
});
|
|
21
21
|
program.command('deposit-governance-tokens').description('Deposits governance tokens to the governance contract.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).requiredOption('--recipient <string>', 'The recipient of the tokens', parseEthereumAddress).requiredOption('-a, --amount <string>', 'The amount of tokens to deposit', parseBigint).option('--mint', 'Mint the tokens on L1', false).addOption(l1RpcUrlsOption).addOption(l1ChainIdOption).option('-p, --private-key <string>', 'The private key to use to deposit', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use to deposit', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use to deposit', (arg)=>parseInt(arg), 0).action(async (options)=>{
|
|
22
22
|
const { depositGovernanceTokens } = await import('./governance_utils.js');
|
|
@@ -24,12 +24,14 @@ export type L2ChainConfig = L1ContractsConfig & Omit<SlasherConfig, 'slashValida
|
|
|
24
24
|
nullifierTreeMapSizeKb: number;
|
|
25
25
|
publicDataTreeMapSizeKb: number;
|
|
26
26
|
sentinelEnabled: boolean;
|
|
27
|
+
disableTransactions: boolean;
|
|
27
28
|
};
|
|
28
29
|
export declare const stagingIgnitionL2ChainConfig: L2ChainConfig;
|
|
29
30
|
export declare const stagingPublicL2ChainConfig: L2ChainConfig;
|
|
30
31
|
export declare const nextNetL2ChainConfig: L2ChainConfig;
|
|
31
32
|
export declare const testnetL2ChainConfig: L2ChainConfig;
|
|
32
|
-
export declare const
|
|
33
|
+
export declare const mainnetL2ChainConfig: L2ChainConfig;
|
|
34
|
+
export declare const devnetL2ChainConfig: L2ChainConfig;
|
|
33
35
|
export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
|
|
34
36
|
export declare function enrichEnvironmentWithChainConfig(networkName: NetworkNames): void;
|
|
35
37
|
//# 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,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,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;IAIpC,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;
|
|
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,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAYrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,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;IAIpC,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,aA+E1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aAmDxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAmDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAqDlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aAiFlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aAmDjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,gCAAgC,CAAC,WAAW,EAAE,YAAY,QA4FzE"}
|
|
@@ -47,6 +47,7 @@ export const stagingIgnitionL2ChainConfig = {
|
|
|
47
47
|
l1ChainId: 11155111,
|
|
48
48
|
testAccounts: false,
|
|
49
49
|
sponsoredFPC: false,
|
|
50
|
+
disableTransactions: true,
|
|
50
51
|
p2pEnabled: true,
|
|
51
52
|
p2pBootstrapNodes: [],
|
|
52
53
|
seqMinTxsPerBlock: 0,
|
|
@@ -112,6 +113,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
112
113
|
l1ChainId: 11155111,
|
|
113
114
|
testAccounts: false,
|
|
114
115
|
sponsoredFPC: true,
|
|
116
|
+
disableTransactions: false,
|
|
115
117
|
p2pEnabled: true,
|
|
116
118
|
p2pBootstrapNodes: [],
|
|
117
119
|
seqMinTxsPerBlock: 0,
|
|
@@ -151,6 +153,7 @@ export const nextNetL2ChainConfig = {
|
|
|
151
153
|
testAccounts: true,
|
|
152
154
|
sponsoredFPC: true,
|
|
153
155
|
p2pEnabled: true,
|
|
156
|
+
disableTransactions: false,
|
|
154
157
|
p2pBootstrapNodes: [],
|
|
155
158
|
seqMinTxsPerBlock: 0,
|
|
156
159
|
seqMaxTxsPerBlock: 8,
|
|
@@ -187,9 +190,10 @@ export const testnetL2ChainConfig = {
|
|
|
187
190
|
testAccounts: false,
|
|
188
191
|
sponsoredFPC: true,
|
|
189
192
|
p2pEnabled: true,
|
|
193
|
+
disableTransactions: true,
|
|
190
194
|
p2pBootstrapNodes: [],
|
|
191
195
|
seqMinTxsPerBlock: 0,
|
|
192
|
-
seqMaxTxsPerBlock:
|
|
196
|
+
seqMaxTxsPerBlock: 0,
|
|
193
197
|
realProofs: true,
|
|
194
198
|
snapshotsUrls: [
|
|
195
199
|
`${SNAPSHOTS_URL}/testnet/`
|
|
@@ -214,7 +218,7 @@ export const testnetL2ChainConfig = {
|
|
|
214
218
|
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
215
219
|
/** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
216
220
|
/** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
217
|
-
/** The mana target for the rollup */ manaTarget:
|
|
221
|
+
/** The mana target for the rollup */ manaTarget: 0n,
|
|
218
222
|
/** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
219
223
|
/** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
220
224
|
...DefaultSlashConfig,
|
|
@@ -222,20 +226,21 @@ export const testnetL2ChainConfig = {
|
|
|
222
226
|
slashDataWithholdingPenalty: 0n,
|
|
223
227
|
...DefaultNetworkDBMapSizeConfig
|
|
224
228
|
};
|
|
225
|
-
export const
|
|
229
|
+
export const mainnetL2ChainConfig = {
|
|
226
230
|
l1ChainId: 1,
|
|
227
231
|
testAccounts: false,
|
|
228
232
|
sponsoredFPC: false,
|
|
229
233
|
p2pEnabled: true,
|
|
234
|
+
disableTransactions: true,
|
|
230
235
|
p2pBootstrapNodes: [],
|
|
231
236
|
seqMinTxsPerBlock: 0,
|
|
232
237
|
seqMaxTxsPerBlock: 0,
|
|
233
238
|
realProofs: true,
|
|
234
239
|
snapshotsUrls: [
|
|
235
|
-
`${SNAPSHOTS_URL}/
|
|
240
|
+
`${SNAPSHOTS_URL}/mainnet/`
|
|
236
241
|
],
|
|
237
242
|
autoUpdate: 'notify',
|
|
238
|
-
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/
|
|
243
|
+
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
|
|
239
244
|
maxTxPoolSize: 100_000_000,
|
|
240
245
|
publicIncludeMetrics,
|
|
241
246
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
@@ -287,6 +292,43 @@ export const ignitionL2ChainConfig = {
|
|
|
287
292
|
slashExecuteRoundsLookBack: 4,
|
|
288
293
|
...DefaultNetworkDBMapSizeConfig
|
|
289
294
|
};
|
|
295
|
+
export const devnetL2ChainConfig = {
|
|
296
|
+
l1ChainId: 11155111,
|
|
297
|
+
testAccounts: true,
|
|
298
|
+
sponsoredFPC: true,
|
|
299
|
+
p2pEnabled: true,
|
|
300
|
+
disableTransactions: false,
|
|
301
|
+
p2pBootstrapNodes: [],
|
|
302
|
+
seqMinTxsPerBlock: 0,
|
|
303
|
+
seqMaxTxsPerBlock: 8,
|
|
304
|
+
realProofs: false,
|
|
305
|
+
snapshotsUrls: [],
|
|
306
|
+
autoUpdate: 'config-and-version',
|
|
307
|
+
autoUpdateUrl: '',
|
|
308
|
+
publicIncludeMetrics,
|
|
309
|
+
publicMetricsCollectorUrl: '',
|
|
310
|
+
publicMetricsCollectFrom: [
|
|
311
|
+
''
|
|
312
|
+
],
|
|
313
|
+
maxTxPoolSize: 100_000_000,
|
|
314
|
+
// Deployment stuff
|
|
315
|
+
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
316
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
|
|
317
|
+
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 8,
|
|
318
|
+
/** The target validator committee size. */ aztecTargetCommitteeSize: 1,
|
|
319
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochs: 0,
|
|
320
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
321
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
322
|
+
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
323
|
+
/** The minimum stake for a validator. */ ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
324
|
+
/** The slashing round size */ slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
325
|
+
/** Governance proposing round size */ governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
326
|
+
/** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
327
|
+
/** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
328
|
+
/** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
329
|
+
...DefaultSlashConfig,
|
|
330
|
+
...DefaultNetworkDBMapSizeConfig
|
|
331
|
+
};
|
|
290
332
|
export function getL2ChainConfig(networkName) {
|
|
291
333
|
let config;
|
|
292
334
|
if (networkName === 'staging-public') {
|
|
@@ -301,14 +343,18 @@ export function getL2ChainConfig(networkName) {
|
|
|
301
343
|
config = {
|
|
302
344
|
...stagingIgnitionL2ChainConfig
|
|
303
345
|
};
|
|
304
|
-
} else if (networkName === '
|
|
346
|
+
} else if (networkName === 'mainnet') {
|
|
305
347
|
config = {
|
|
306
|
-
...
|
|
348
|
+
...mainnetL2ChainConfig
|
|
307
349
|
};
|
|
308
350
|
} else if (networkName === 'next-net') {
|
|
309
351
|
config = {
|
|
310
352
|
...nextNetL2ChainConfig
|
|
311
353
|
};
|
|
354
|
+
} else if (networkName === 'devnet') {
|
|
355
|
+
config = {
|
|
356
|
+
...devnetL2ChainConfig
|
|
357
|
+
};
|
|
312
358
|
}
|
|
313
359
|
return config;
|
|
314
360
|
}
|
|
@@ -394,4 +440,5 @@ export function enrichEnvironmentWithChainConfig(networkName) {
|
|
|
394
440
|
enrichVar('SLASH_OFFENSE_EXPIRATION_ROUNDS', config.slashOffenseExpirationRounds.toString());
|
|
395
441
|
enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
|
|
396
442
|
enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
|
|
443
|
+
enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
|
|
397
444
|
}
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export declare function getFunctionAbi(artifact: ContractArtifact, fnName: strin
|
|
|
19
19
|
* @param mnemonic - The mnemonic to be used in contract deployment.
|
|
20
20
|
*/
|
|
21
21
|
export declare function deployAztecContracts(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, acceleratedTestDeployments: boolean, config: L1ContractsConfig, existingToken: EthAddress | undefined, realVerifier: boolean, createVerificationJson: string | false, debugLogger: Logger): Promise<DeployL1ContractsReturnType>;
|
|
22
|
-
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean, logger: Logger): Promise<{
|
|
22
|
+
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, salt: number | undefined, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean, createVerificationJson: string | false, logger: Logger): Promise<{
|
|
23
23
|
rollup: RollupContract;
|
|
24
24
|
slashFactoryAddress: EthAddress;
|
|
25
25
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAiCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAQhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CAiCtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,sBAAsB,EAAE,MAAM,GAAG,KAAK,EACtC,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CA8CtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
|
package/dest/utils/aztec.js
CHANGED
|
@@ -46,7 +46,7 @@ import { encodeArgs } from './encoding.js';
|
|
|
46
46
|
}, config, createVerificationJson);
|
|
47
47
|
return result;
|
|
48
48
|
}
|
|
49
|
-
export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, logger) {
|
|
49
|
+
export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, createVerificationJson, logger) {
|
|
50
50
|
const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
|
|
51
51
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
52
52
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -80,7 +80,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
80
80
|
feeJuicePortalInitialBalance,
|
|
81
81
|
realVerifier,
|
|
82
82
|
...config
|
|
83
|
-
}, registryAddress, logger, config);
|
|
83
|
+
}, registryAddress, logger, config, createVerificationJson);
|
|
84
84
|
return {
|
|
85
85
|
rollup,
|
|
86
86
|
slashFactoryAddress
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "3.0.0-nightly.
|
|
3
|
+
"version": "3.0.0-nightly.20251026",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -70,20 +70,20 @@
|
|
|
70
70
|
]
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@aztec/accounts": "3.0.0-nightly.
|
|
74
|
-
"@aztec/archiver": "3.0.0-nightly.
|
|
75
|
-
"@aztec/aztec.js": "3.0.0-nightly.
|
|
76
|
-
"@aztec/constants": "3.0.0-nightly.
|
|
77
|
-
"@aztec/entrypoints": "3.0.0-nightly.
|
|
78
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
79
|
-
"@aztec/foundation": "3.0.0-nightly.
|
|
80
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
81
|
-
"@aztec/node-lib": "3.0.0-nightly.
|
|
82
|
-
"@aztec/p2p": "3.0.0-nightly.
|
|
83
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
84
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
85
|
-
"@aztec/test-wallet": "3.0.0-nightly.
|
|
86
|
-
"@aztec/world-state": "3.0.0-nightly.
|
|
73
|
+
"@aztec/accounts": "3.0.0-nightly.20251026",
|
|
74
|
+
"@aztec/archiver": "3.0.0-nightly.20251026",
|
|
75
|
+
"@aztec/aztec.js": "3.0.0-nightly.20251026",
|
|
76
|
+
"@aztec/constants": "3.0.0-nightly.20251026",
|
|
77
|
+
"@aztec/entrypoints": "3.0.0-nightly.20251026",
|
|
78
|
+
"@aztec/ethereum": "3.0.0-nightly.20251026",
|
|
79
|
+
"@aztec/foundation": "3.0.0-nightly.20251026",
|
|
80
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251026",
|
|
81
|
+
"@aztec/node-lib": "3.0.0-nightly.20251026",
|
|
82
|
+
"@aztec/p2p": "3.0.0-nightly.20251026",
|
|
83
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251026",
|
|
84
|
+
"@aztec/stdlib": "3.0.0-nightly.20251026",
|
|
85
|
+
"@aztec/test-wallet": "3.0.0-nightly.20251026",
|
|
86
|
+
"@aztec/world-state": "3.0.0-nightly.20251026",
|
|
87
87
|
"@iarna/toml": "^2.2.5",
|
|
88
88
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
89
89
|
"commander": "^12.1.0",
|
|
@@ -110,15 +110,15 @@
|
|
|
110
110
|
"typescript": "^5.3.3"
|
|
111
111
|
},
|
|
112
112
|
"peerDependencies": {
|
|
113
|
-
"@aztec/accounts": "3.0.0-nightly.
|
|
114
|
-
"@aztec/bb-prover": "3.0.0-nightly.
|
|
115
|
-
"@aztec/ethereum": "3.0.0-nightly.
|
|
116
|
-
"@aztec/l1-artifacts": "3.0.0-nightly.
|
|
117
|
-
"@aztec/noir-contracts.js": "3.0.0-nightly.
|
|
118
|
-
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.
|
|
119
|
-
"@aztec/noir-test-contracts.js": "3.0.0-nightly.
|
|
120
|
-
"@aztec/protocol-contracts": "3.0.0-nightly.
|
|
121
|
-
"@aztec/stdlib": "3.0.0-nightly.
|
|
113
|
+
"@aztec/accounts": "3.0.0-nightly.20251026",
|
|
114
|
+
"@aztec/bb-prover": "3.0.0-nightly.20251026",
|
|
115
|
+
"@aztec/ethereum": "3.0.0-nightly.20251026",
|
|
116
|
+
"@aztec/l1-artifacts": "3.0.0-nightly.20251026",
|
|
117
|
+
"@aztec/noir-contracts.js": "3.0.0-nightly.20251026",
|
|
118
|
+
"@aztec/noir-protocol-circuits-types": "3.0.0-nightly.20251026",
|
|
119
|
+
"@aztec/noir-test-contracts.js": "3.0.0-nightly.20251026",
|
|
120
|
+
"@aztec/protocol-contracts": "3.0.0-nightly.20251026",
|
|
121
|
+
"@aztec/stdlib": "3.0.0-nightly.20251026"
|
|
122
122
|
},
|
|
123
123
|
"files": [
|
|
124
124
|
"dest",
|
|
@@ -20,6 +20,7 @@ export async function deployNewRollup(
|
|
|
20
20
|
json: boolean,
|
|
21
21
|
initialValidators: Operator[],
|
|
22
22
|
realVerifier: boolean,
|
|
23
|
+
createVerificationJson: string | false,
|
|
23
24
|
log: LogFn,
|
|
24
25
|
debugLogger: Logger,
|
|
25
26
|
) {
|
|
@@ -43,6 +44,7 @@ export async function deployNewRollup(
|
|
|
43
44
|
fundingNeeded,
|
|
44
45
|
config,
|
|
45
46
|
realVerifier,
|
|
47
|
+
createVerificationJson,
|
|
46
48
|
debugLogger,
|
|
47
49
|
);
|
|
48
50
|
|
package/src/cmds/l1/index.ts
CHANGED
|
@@ -94,6 +94,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
94
94
|
.option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts')
|
|
95
95
|
.option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract')
|
|
96
96
|
.option('--real-verifier', 'Deploy the real verifier', false)
|
|
97
|
+
.option('--create-verification-json [path]', 'Create JSON file for etherscan contract verification', false)
|
|
97
98
|
.action(async options => {
|
|
98
99
|
const { deployNewRollup } = await import('./deploy_new_rollup.js');
|
|
99
100
|
|
|
@@ -112,6 +113,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
|
|
|
112
113
|
options.json,
|
|
113
114
|
initialValidators,
|
|
114
115
|
options.realVerifier,
|
|
116
|
+
options.createVerificationJson,
|
|
115
117
|
log,
|
|
116
118
|
debugLogger,
|
|
117
119
|
);
|
|
@@ -42,6 +42,7 @@ export type L2ChainConfig = L1ContractsConfig &
|
|
|
42
42
|
|
|
43
43
|
// Control whether sentinel is enabled or not. Needed for slashing
|
|
44
44
|
sentinelEnabled: boolean;
|
|
45
|
+
disableTransactions: boolean;
|
|
45
46
|
};
|
|
46
47
|
|
|
47
48
|
const DefaultSlashConfig = {
|
|
@@ -93,6 +94,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
|
|
|
93
94
|
l1ChainId: 11155111,
|
|
94
95
|
testAccounts: false,
|
|
95
96
|
sponsoredFPC: false,
|
|
97
|
+
disableTransactions: true,
|
|
96
98
|
p2pEnabled: true,
|
|
97
99
|
p2pBootstrapNodes: [],
|
|
98
100
|
seqMinTxsPerBlock: 0,
|
|
@@ -173,6 +175,7 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
|
|
|
173
175
|
l1ChainId: 11155111,
|
|
174
176
|
testAccounts: false,
|
|
175
177
|
sponsoredFPC: true,
|
|
178
|
+
disableTransactions: false,
|
|
176
179
|
p2pEnabled: true,
|
|
177
180
|
p2pBootstrapNodes: [],
|
|
178
181
|
seqMinTxsPerBlock: 0,
|
|
@@ -226,6 +229,7 @@ export const nextNetL2ChainConfig: L2ChainConfig = {
|
|
|
226
229
|
testAccounts: true,
|
|
227
230
|
sponsoredFPC: true,
|
|
228
231
|
p2pEnabled: true,
|
|
232
|
+
disableTransactions: false,
|
|
229
233
|
p2pBootstrapNodes: [],
|
|
230
234
|
seqMinTxsPerBlock: 0,
|
|
231
235
|
seqMaxTxsPerBlock: 8,
|
|
@@ -278,9 +282,10 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
278
282
|
testAccounts: false,
|
|
279
283
|
sponsoredFPC: true,
|
|
280
284
|
p2pEnabled: true,
|
|
285
|
+
disableTransactions: true,
|
|
281
286
|
p2pBootstrapNodes: [],
|
|
282
287
|
seqMinTxsPerBlock: 0,
|
|
283
|
-
seqMaxTxsPerBlock:
|
|
288
|
+
seqMaxTxsPerBlock: 0,
|
|
284
289
|
realProofs: true,
|
|
285
290
|
snapshotsUrls: [`${SNAPSHOTS_URL}/testnet/`],
|
|
286
291
|
autoUpdate: 'config-and-version',
|
|
@@ -314,7 +319,7 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
314
319
|
/** Governance proposing round size */
|
|
315
320
|
governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
316
321
|
/** The mana target for the rollup */
|
|
317
|
-
manaTarget:
|
|
322
|
+
manaTarget: 0n,
|
|
318
323
|
/** The proving cost per mana */
|
|
319
324
|
provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
320
325
|
/** Exit delay for stakers */
|
|
@@ -327,18 +332,19 @@ export const testnetL2ChainConfig: L2ChainConfig = {
|
|
|
327
332
|
...DefaultNetworkDBMapSizeConfig,
|
|
328
333
|
};
|
|
329
334
|
|
|
330
|
-
export const
|
|
335
|
+
export const mainnetL2ChainConfig: L2ChainConfig = {
|
|
331
336
|
l1ChainId: 1,
|
|
332
337
|
testAccounts: false,
|
|
333
338
|
sponsoredFPC: false,
|
|
334
339
|
p2pEnabled: true,
|
|
340
|
+
disableTransactions: true,
|
|
335
341
|
p2pBootstrapNodes: [],
|
|
336
342
|
seqMinTxsPerBlock: 0,
|
|
337
343
|
seqMaxTxsPerBlock: 0,
|
|
338
344
|
realProofs: true,
|
|
339
|
-
snapshotsUrls: [`${SNAPSHOTS_URL}/
|
|
345
|
+
snapshotsUrls: [`${SNAPSHOTS_URL}/mainnet/`],
|
|
340
346
|
autoUpdate: 'notify',
|
|
341
|
-
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/
|
|
347
|
+
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
|
|
342
348
|
maxTxPoolSize: 100_000_000, // 100MB
|
|
343
349
|
publicIncludeMetrics,
|
|
344
350
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
@@ -409,6 +415,59 @@ export const ignitionL2ChainConfig: L2ChainConfig = {
|
|
|
409
415
|
...DefaultNetworkDBMapSizeConfig,
|
|
410
416
|
};
|
|
411
417
|
|
|
418
|
+
export const devnetL2ChainConfig: L2ChainConfig = {
|
|
419
|
+
l1ChainId: 11155111,
|
|
420
|
+
testAccounts: true,
|
|
421
|
+
sponsoredFPC: true,
|
|
422
|
+
p2pEnabled: true,
|
|
423
|
+
disableTransactions: false,
|
|
424
|
+
p2pBootstrapNodes: [],
|
|
425
|
+
seqMinTxsPerBlock: 0,
|
|
426
|
+
seqMaxTxsPerBlock: 8,
|
|
427
|
+
realProofs: false,
|
|
428
|
+
snapshotsUrls: [],
|
|
429
|
+
autoUpdate: 'config-and-version',
|
|
430
|
+
autoUpdateUrl: '',
|
|
431
|
+
publicIncludeMetrics,
|
|
432
|
+
publicMetricsCollectorUrl: '',
|
|
433
|
+
publicMetricsCollectFrom: [''],
|
|
434
|
+
maxTxPoolSize: 100_000_000, // 100MB
|
|
435
|
+
|
|
436
|
+
// Deployment stuff
|
|
437
|
+
/** How many seconds an L1 slot lasts. */
|
|
438
|
+
ethereumSlotDuration: 12,
|
|
439
|
+
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */
|
|
440
|
+
aztecSlotDuration: 36,
|
|
441
|
+
/** How many L2 slots an epoch lasts. */
|
|
442
|
+
aztecEpochDuration: 8,
|
|
443
|
+
/** The target validator committee size. */
|
|
444
|
+
aztecTargetCommitteeSize: 1,
|
|
445
|
+
/** The number of epochs to lag behind the current epoch for validator selection. */
|
|
446
|
+
lagInEpochs: 0,
|
|
447
|
+
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */
|
|
448
|
+
localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
449
|
+
/** The number of epochs after an epoch ends that proofs are still accepted. */
|
|
450
|
+
aztecProofSubmissionEpochs: 1,
|
|
451
|
+
/** The deposit amount for a validator */
|
|
452
|
+
activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
453
|
+
/** The minimum stake for a validator. */
|
|
454
|
+
ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
|
|
455
|
+
/** The slashing round size */
|
|
456
|
+
slashingRoundSizeInEpochs: DefaultL1ContractsConfig.slashingRoundSizeInEpochs,
|
|
457
|
+
/** Governance proposing round size */
|
|
458
|
+
governanceProposerRoundSize: DefaultL1ContractsConfig.governanceProposerRoundSize,
|
|
459
|
+
/** The mana target for the rollup */
|
|
460
|
+
manaTarget: DefaultL1ContractsConfig.manaTarget,
|
|
461
|
+
/** The proving cost per mana */
|
|
462
|
+
provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
|
|
463
|
+
/** Exit delay for stakers */
|
|
464
|
+
exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
|
|
465
|
+
|
|
466
|
+
...DefaultSlashConfig,
|
|
467
|
+
|
|
468
|
+
...DefaultNetworkDBMapSizeConfig,
|
|
469
|
+
};
|
|
470
|
+
|
|
412
471
|
export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined {
|
|
413
472
|
let config: L2ChainConfig | undefined;
|
|
414
473
|
if (networkName === 'staging-public') {
|
|
@@ -417,10 +476,12 @@ export function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | und
|
|
|
417
476
|
config = { ...testnetL2ChainConfig };
|
|
418
477
|
} else if (networkName === 'staging-ignition') {
|
|
419
478
|
config = { ...stagingIgnitionL2ChainConfig };
|
|
420
|
-
} else if (networkName === '
|
|
421
|
-
config = { ...
|
|
479
|
+
} else if (networkName === 'mainnet') {
|
|
480
|
+
config = { ...mainnetL2ChainConfig };
|
|
422
481
|
} else if (networkName === 'next-net') {
|
|
423
482
|
config = { ...nextNetL2ChainConfig };
|
|
483
|
+
} else if (networkName === 'devnet') {
|
|
484
|
+
config = { ...devnetL2ChainConfig };
|
|
424
485
|
}
|
|
425
486
|
return config;
|
|
426
487
|
}
|
|
@@ -520,4 +581,5 @@ export function enrichEnvironmentWithChainConfig(networkName: NetworkNames) {
|
|
|
520
581
|
enrichVar('SLASH_MAX_PAYLOAD_SIZE', config.slashMaxPayloadSize.toString());
|
|
521
582
|
|
|
522
583
|
enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
|
|
584
|
+
enrichVar('TRANSACTIONS_DISABLED', config.disableTransactions.toString());
|
|
523
585
|
}
|
package/src/utils/aztec.ts
CHANGED
|
@@ -108,6 +108,7 @@ export async function deployNewRollupContracts(
|
|
|
108
108
|
feeJuicePortalInitialBalance: bigint,
|
|
109
109
|
config: L1ContractsConfig,
|
|
110
110
|
realVerifier: boolean,
|
|
111
|
+
createVerificationJson: string | false,
|
|
111
112
|
logger: Logger,
|
|
112
113
|
): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
|
|
113
114
|
const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
|
|
@@ -151,6 +152,7 @@ export async function deployNewRollupContracts(
|
|
|
151
152
|
registryAddress,
|
|
152
153
|
logger,
|
|
153
154
|
config,
|
|
155
|
+
createVerificationJson,
|
|
154
156
|
);
|
|
155
157
|
|
|
156
158
|
return { rollup, slashFactoryAddress };
|