@aztec/cli 0.0.1-commit.d3ec352c → 0.0.1-commit.fcb71a6
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/contracts/inspect_contract.js +1 -1
- package/dest/cmds/infrastructure/sequencers.d.ts +1 -1
- package/dest/cmds/infrastructure/sequencers.d.ts.map +1 -1
- package/dest/cmds/infrastructure/sequencers.js +9 -3
- package/dest/cmds/l1/bridge_erc20.d.ts +1 -1
- package/dest/cmds/l1/bridge_erc20.d.ts.map +1 -1
- package/dest/cmds/l1/bridge_erc20.js +2 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +4 -0
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -0
- package/dest/cmds/l1/{deploy_l1_contracts.js → deploy_l1_contracts_cmd.js} +39 -4
- package/dest/cmds/l1/deploy_new_rollup.d.ts +4 -4
- package/dest/cmds/l1/deploy_new_rollup.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_new_rollup.js +3 -3
- package/dest/cmds/l1/get_l1_addresses.d.ts +1 -1
- package/dest/cmds/l1/get_l1_addresses.d.ts.map +1 -1
- package/dest/cmds/l1/get_l1_addresses.js +5 -2
- package/dest/cmds/l1/get_l1_balance.js +4 -2
- package/dest/cmds/l1/governance_utils.d.ts +1 -1
- package/dest/cmds/l1/governance_utils.d.ts.map +1 -1
- package/dest/cmds/l1/governance_utils.js +3 -1
- package/dest/cmds/l1/index.d.ts +1 -2
- package/dest/cmds/l1/index.d.ts.map +1 -1
- package/dest/cmds/l1/index.js +10 -8
- package/dest/cmds/l1/prover_stats.d.ts +1 -1
- package/dest/cmds/l1/prover_stats.d.ts.map +1 -1
- package/dest/cmds/l1/prover_stats.js +4 -2
- package/dest/cmds/l1/trigger_seed_snapshot.d.ts +1 -1
- package/dest/cmds/l1/trigger_seed_snapshot.d.ts.map +1 -1
- package/dest/cmds/l1/trigger_seed_snapshot.js +2 -1
- package/dest/cmds/l1/update_l1_validators.d.ts +1 -1
- package/dest/cmds/l1/update_l1_validators.d.ts.map +1 -1
- package/dest/cmds/l1/update_l1_validators.js +5 -1
- package/dest/cmds/misc/generate_secret_and_hash.js +1 -1
- package/dest/cmds/misc/index.d.ts +1 -1
- package/dest/cmds/misc/index.d.ts.map +1 -1
- package/dest/cmds/misc/index.js +1 -1
- package/dest/cmds/validator_keys/generate_bls_keypair.js +1 -1
- package/dest/cmds/validator_keys/new.d.ts +1 -1
- package/dest/cmds/validator_keys/new.d.ts.map +1 -1
- package/dest/cmds/validator_keys/new.js +5 -2
- package/dest/cmds/validator_keys/shared.d.ts +1 -1
- package/dest/cmds/validator_keys/shared.d.ts.map +1 -1
- package/dest/cmds/validator_keys/shared.js +2 -1
- package/dest/cmds/validator_keys/staker.d.ts +2 -2
- package/dest/cmds/validator_keys/staker.d.ts.map +1 -1
- package/dest/cmds/validator_keys/staker.js +7 -4
- package/dest/cmds/validator_keys/utils.d.ts +1 -1
- package/dest/cmds/validator_keys/utils.d.ts.map +1 -1
- package/dest/cmds/validator_keys/utils.js +1 -1
- package/dest/config/chain_l2_config.d.ts +6 -5
- package/dest/config/chain_l2_config.d.ts.map +1 -1
- package/dest/config/chain_l2_config.js +49 -30
- package/dest/config/get_l1_config.d.ts +3 -2
- package/dest/config/get_l1_config.d.ts.map +1 -1
- package/dest/config/get_l1_config.js +3 -1
- package/dest/config/network_config.d.ts +1 -1
- package/dest/config/network_config.d.ts.map +1 -1
- package/dest/config/network_config.js +6 -0
- package/dest/utils/aztec.d.ts +7 -13
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +19 -40
- package/dest/utils/commands.d.ts +7 -6
- package/dest/utils/commands.d.ts.map +1 -1
- package/dest/utils/commands.js +6 -5
- package/dest/utils/encoding.js +1 -1
- package/package.json +32 -29
- package/src/cmds/contracts/inspect_contract.ts +1 -1
- package/src/cmds/infrastructure/sequencers.ts +5 -3
- package/src/cmds/l1/bridge_erc20.ts +2 -1
- package/src/cmds/l1/{deploy_l1_contracts.ts → deploy_l1_contracts_cmd.ts} +39 -22
- package/src/cmds/l1/deploy_new_rollup.ts +4 -9
- package/src/cmds/l1/get_l1_addresses.ts +4 -2
- package/src/cmds/l1/get_l1_balance.ts +2 -2
- package/src/cmds/l1/governance_utils.ts +3 -8
- package/src/cmds/l1/index.ts +7 -17
- package/src/cmds/l1/prover_stats.ts +6 -2
- package/src/cmds/l1/trigger_seed_snapshot.ts +2 -1
- package/src/cmds/l1/update_l1_validators.ts +5 -10
- package/src/cmds/misc/generate_secret_and_hash.ts +1 -1
- package/src/cmds/misc/index.ts +1 -1
- package/src/cmds/validator_keys/generate_bls_keypair.ts +1 -1
- package/src/cmds/validator_keys/new.ts +3 -2
- package/src/cmds/validator_keys/shared.ts +2 -1
- package/src/cmds/validator_keys/staker.ts +5 -4
- package/src/cmds/validator_keys/utils.ts +2 -1
- package/src/config/chain_l2_config.ts +59 -33
- package/src/config/get_l1_config.ts +4 -1
- package/src/config/network_config.ts +7 -0
- package/src/utils/aztec.ts +24 -83
- package/src/utils/commands.ts +6 -5
- package/src/utils/encoding.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts.d.ts +0 -4
- package/dest/cmds/l1/deploy_l1_contracts.d.ts.map +0 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { prettyPrintJSON } from '@aztec/cli/utils';
|
|
2
|
-
import {
|
|
2
|
+
import { deriveBlsPrivateKey } from '@aztec/foundation/crypto/bls';
|
|
3
3
|
import { createBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
|
|
4
|
+
import { computeBn254G1PublicKeyCompressed } from '@aztec/foundation/crypto/bn254';
|
|
4
5
|
import { Wallet } from '@ethersproject/wallet';
|
|
5
6
|
import { constants as fsConstants, mkdirSync } from 'fs';
|
|
6
7
|
import { access, writeFile } from 'fs/promises';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GSEContract } from '@aztec/ethereum';
|
|
1
|
+
import { GSEContract } from '@aztec/ethereum/contracts';
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { LogFn } from '@aztec/foundation/log';
|
|
4
4
|
import type { AttesterAccounts } from '@aztec/node-keystore/types';
|
|
@@ -35,4 +35,4 @@ export declare function processAttesterAccounts(attesterAccounts: AttesterAccoun
|
|
|
35
35
|
* Main staker command function
|
|
36
36
|
*/
|
|
37
37
|
export declare function generateStakerJson(options: StakerOptions, log: LogFn): Promise<void>;
|
|
38
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3Rha2VyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy92YWxpZGF0b3Jfa2V5cy9zdGFrZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSXhELE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELE9BQU8sS0FBSyxFQUVWLGdCQUFnQixFQUtqQixNQUFNLDRCQUE0QixDQUFDO0FBUXBDLE1BQU0sTUFBTSxhQUFhLEdBQUc7SUFDMUIsSUFBSSxFQUFFLE1BQU0sQ0FBQztJQUNiLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQixNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDaEIsVUFBVSxFQUFFLFVBQVUsQ0FBQztJQUN2QixTQUFTLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDcEIsU0FBUyxFQUFFLE1BQU0sQ0FBQztDQUNuQixDQUFDO0FBRUYsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixRQUFRLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLFdBQVcsRUFBRTtRQUNYLENBQUMsRUFBRSxNQUFNLENBQUM7UUFDVixDQUFDLEVBQUUsTUFBTSxDQUFDO0tBQ1gsQ0FBQztJQUNGLFdBQVcsRUFBRTtRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7UUFDWCxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ1gsRUFBRSxFQUFFLE1BQU0sQ0FBQztRQUNYLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDWixDQUFDO0lBQ0YsaUJBQWlCLEVBQUU7UUFDakIsQ0FBQyxFQUFFLE1BQU0sQ0FBQztRQUNWLENBQUMsRUFBRSxNQUFNLENBQUM7S0FDWCxDQUFDO0NBQ0gsQ0FBQztBQTJLRjs7R0FFRztBQUNILHdCQUFzQix1QkFBdUIsQ0FDM0MsZ0JBQWdCLEVBQUUsZ0JBQWdCLEVBQ2xDLEdBQUcsRUFBRSxXQUFXLEVBQ2hCLFFBQVEsQ0FBQyxFQUFFLE1BQU0sR0FDaEIsT0FBTyxDQUFDLFlBQVksRUFBRSxDQUFDLENBcUJ6QjtBQUVEOztHQUVHO0FBQ0gsd0JBQXNCLGtCQUFrQixDQUFDLE9BQU8sRUFBRSxhQUFhLEVBQUUsR0FBRyxFQUFFLEtBQUssR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBK0MxRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staker.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/staker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"staker.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/staker.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAEV,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AAQpC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE;QACX,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;IACF,WAAW,EAAE;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;KACZ,CAAC;IACF,iBAAiB,EAAE;QACjB,CAAC,EAAE,MAAM,CAAC;QACV,CAAC,EAAE,MAAM,CAAC;KACX,CAAC;CACH,CAAC;AA2KF;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,gBAAgB,EAClC,GAAG,EAAE,WAAW,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,EAAE,CAAC,CAqBzB;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA+C1F"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { prettyPrintJSON } from '@aztec/cli/utils';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { createEthereumChain } from '@aztec/ethereum/chain';
|
|
3
|
+
import { GSEContract } from '@aztec/ethereum/contracts';
|
|
4
4
|
import { decryptBn254Keystore } from '@aztec/foundation/crypto/bls/bn254_keystore';
|
|
5
|
-
import {
|
|
5
|
+
import { computeBn254G1PublicKey, computeBn254G2PublicKey } from '@aztec/foundation/crypto/bn254';
|
|
6
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
6
7
|
import { loadKeystoreFile } from '@aztec/node-keystore/loader';
|
|
7
8
|
import { Wallet } from '@ethersproject/wallet';
|
|
8
9
|
import { readFileSync, writeFileSync } from 'fs';
|
|
@@ -184,7 +185,9 @@ import { privateKeyToAddress } from 'viem/accounts';
|
|
|
184
185
|
const chain = createEthereumChain(l1RpcUrls, l1ChainId);
|
|
185
186
|
const publicClient = createPublicClient({
|
|
186
187
|
chain: chain.chainInfo,
|
|
187
|
-
transport: fallback(l1RpcUrls.map((url)=>http(url
|
|
188
|
+
transport: fallback(l1RpcUrls.map((url)=>http(url, {
|
|
189
|
+
batch: false
|
|
190
|
+
})))
|
|
188
191
|
});
|
|
189
192
|
const gse = new GSEContract(publicClient, gseAddress);
|
|
190
193
|
const keystoreBaseName = basename(from, '.json');
|
|
@@ -22,4 +22,4 @@ export declare function validatePublisherOptions(options: {
|
|
|
22
22
|
publishers?: string[];
|
|
23
23
|
publisherCount?: number;
|
|
24
24
|
}): void;
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL3ZhbGlkYXRvcl9rZXlzL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBSWhFLGVBQU8sTUFBTSxjQUFjLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFnQixzQkFBc0IsQ0FBQyxPQUFPLEVBQUU7SUFDOUMsS0FBSyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2YsY0FBYyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3hCLFlBQVksQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN0QixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDdEIsT0FBTyxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQztDQUNkLFFBV0E7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQ25ELFlBQVksQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUN2QixVQUFVLENBQUMsRUFBRSxVQUFVLENBQUM7SUFDeEIsU0FBUyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDckIsU0FBUyxDQUFDLEVBQUUsTUFBTSxDQUFDO0NBQ3BCLFFBZUE7QUFFRCx3QkFBZ0IsMkJBQTJCLENBQUMsT0FBTyxFQUFFO0lBQUUsWUFBWSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxDQUFBO0NBQUUsUUFNaEc7QUFFRCx3QkFBZ0Isd0JBQXdCLENBQUMsT0FBTyxFQUFFO0lBQUUsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFBQyxjQUFjLENBQUMsRUFBRSxNQUFNLENBQUE7Q0FBRSxRQXdCbkcifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/cmds/validator_keys/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAIhE,eAAO,MAAM,cAAc,uBAAuB,CAAC;AAEnD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,QAWA;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACnD,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,QAeA;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,QAMhG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,QAwBnG"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ethPrivateKeySchema } from '@aztec/node-keystore';
|
|
1
|
+
import { ethPrivateKeySchema } from '@aztec/node-keystore/schemas';
|
|
2
2
|
export const defaultBlsPath = 'm/12381/3600/0/0/0';
|
|
3
3
|
export function validateBlsPathOptions(options) {
|
|
4
4
|
if (options.blsPath && options.blsPath !== defaultBlsPath) {
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { type L1ContractsConfig
|
|
1
|
+
import { type L1ContractsConfig } from '@aztec/ethereum/config';
|
|
2
|
+
import type { L1TxUtilsConfig } from '@aztec/ethereum/l1-tx-utils/config';
|
|
2
3
|
import type { NetworkNames } from '@aztec/foundation/config';
|
|
3
4
|
import type { SharedNodeConfig } from '@aztec/node-lib/config';
|
|
4
|
-
import type { P2PConfig } from '@aztec/p2p';
|
|
5
|
+
import type { P2PConfig } from '@aztec/p2p/config';
|
|
5
6
|
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
|
+
export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omit<SlasherConfig, 'slashValidatorsNever' | 'slashValidatorsAlways' | 'slashOverridePayload' | 'slashSelfAllowed'> & Pick<P2PConfig, 'bootstrapNodes' | 'p2pEnabled' | 'txPoolDeleteTxsAfterReorg'> & Pick<SequencerConfig, 'buildCheckpointIfEmpty' | 'minTxsPerBlock' | 'maxTxsPerBlock' | 'blockDurationMs'> & {
|
|
7
8
|
l1ChainId: number;
|
|
8
9
|
testAccounts: boolean;
|
|
9
10
|
sponsoredFPC: boolean;
|
|
@@ -13,7 +14,7 @@ export type L2ChainConfig = Omit<L1ContractsConfig, keyof L1TxUtilsConfig> & Omi
|
|
|
13
14
|
snapshotsUrls: string[];
|
|
14
15
|
autoUpdate: SharedNodeConfig['autoUpdate'];
|
|
15
16
|
autoUpdateUrl?: string;
|
|
16
|
-
|
|
17
|
+
maxPendingTxCount: number;
|
|
17
18
|
publicMetricsOptOut: boolean;
|
|
18
19
|
publicIncludeMetrics?: string[];
|
|
19
20
|
publicMetricsCollectorUrl?: string;
|
|
@@ -37,4 +38,4 @@ export declare const devnetL2ChainConfig: L2ChainConfig;
|
|
|
37
38
|
export declare function getL2ChainConfig(networkName: NetworkNames): L2ChainConfig | undefined;
|
|
38
39
|
export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
|
|
39
40
|
export declare function enrichEnvironmentWithChainConfig(config: L2ChainConfig): void;
|
|
40
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTRCLEtBQUssaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMxRixPQUFPLEtBQUssRUFBRSxlQUFlLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQztBQUMxRSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUU3RCxPQUFPLEtBQUssRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sS0FBSyxFQUFFLFNBQVMsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ25ELE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxhQUFhLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQVl0RixNQUFNLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxNQUFNLGVBQWUsQ0FBQyxHQUN4RSxJQUFJLENBQUMsYUFBYSxFQUFFLHNCQUFzQixHQUFHLHVCQUF1QixHQUFHLHNCQUFzQixHQUFHLGtCQUFrQixDQUFDLEdBQ25ILElBQUksQ0FBQyxTQUFTLEVBQUUsZ0JBQWdCLEdBQUcsWUFBWSxHQUFHLDJCQUEyQixDQUFDLEdBQzlFLElBQUksQ0FBQyxlQUFlLEVBQUUsd0JBQXdCLEdBQUcsZ0JBQWdCLEdBQUcsZ0JBQWdCLEdBQUcsaUJBQWlCLENBQUMsR0FBRztJQUMxRyxTQUFTLEVBQUUsTUFBTSxDQUFDO0lBQ2xCLFlBQVksRUFBRSxPQUFPLENBQUM7SUFDdEIsWUFBWSxFQUFFLE9BQU8sQ0FBQztJQUN0QixjQUFjLEVBQUUsTUFBTSxDQUFDO0lBQ3ZCLGNBQWMsRUFBRSxNQUFNLENBQUM7SUFDdkIsVUFBVSxFQUFFLE9BQU8sQ0FBQztJQUNwQixhQUFhLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDeEIsVUFBVSxFQUFFLGdCQUFnQixDQUFDLFlBQVksQ0FBQyxDQUFDO0lBQzNDLGFBQWEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUN2QixpQkFBaUIsRUFBRSxNQUFNLENBQUM7SUFDMUIsbUJBQW1CLEVBQUUsT0FBTyxDQUFDO0lBQzdCLG9CQUFvQixDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDaEMseUJBQXlCLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbkMsd0JBQXdCLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNwQyx1QkFBdUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUNsQyxxQkFBcUIsQ0FBQyxFQUFFLE9BQU8sQ0FBQztJQUloQyxrQkFBa0IsRUFBRSxNQUFNLENBQUM7SUFDM0Isc0JBQXNCLEVBQUUsTUFBTSxDQUFDO0lBQy9CLHFCQUFxQixFQUFFLE1BQU0sQ0FBQztJQUM5QixzQkFBc0IsRUFBRSxNQUFNLENBQUM7SUFDL0IsdUJBQXVCLEVBQUUsTUFBTSxDQUFDO0lBR2hDLGVBQWUsRUFBRSxPQUFPLENBQUM7SUFDekIsbUJBQW1CLEVBQUUsT0FBTyxDQUFDO0NBQzlCLENBQUM7QUErQ0osZUFBTyxNQUFNLDRCQUE0QixFQUFFLGFBc0YxQyxDQUFDO0FBRUYsZUFBTyxNQUFNLDBCQUEwQixFQUFFLGFBMER4QyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBMERsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBNEZsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG9CQUFvQixFQUFFLGFBMkZsQyxDQUFDO0FBRUYsZUFBTyxNQUFNLG1CQUFtQixFQUFFLGFBMERqQyxDQUFDO0FBRUYsd0JBQWdCLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxZQUFZLEdBQUcsYUFBYSxHQUFHLFNBQVMsQ0FnQnJGO0FBTUQsd0JBQWdCLDhCQUE4QixDQUFDLFdBQVcsRUFBRSxZQUFZLFFBYXZFO0FBRUQsd0JBQWdCLGdDQUFnQyxDQUFDLE1BQU0sRUFBRSxhQUFhLFFBd0dyRSJ9
|
|
@@ -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,KAAK,eAAe,EAAE,MAAM,
|
|
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,wBAAwB,CAAC;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,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,wBAAwB,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,iBAAiB,CAAC,GAAG;IAC1G,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,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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,aAsF1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aA0DxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA0DlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA4FlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA2FlC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,aA0DjC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,SAAS,CAgBrF;AAMD,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAavE;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,aAAa,QAwGrE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DefaultL1ContractsConfig } from '@aztec/ethereum';
|
|
1
|
+
import { DefaultL1ContractsConfig } from '@aztec/ethereum/config';
|
|
2
2
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
|
|
@@ -52,13 +52,14 @@ export const stagingIgnitionL2ChainConfig = {
|
|
|
52
52
|
bootstrapNodes: [],
|
|
53
53
|
minTxsPerBlock: 0,
|
|
54
54
|
maxTxsPerBlock: 0,
|
|
55
|
+
buildCheckpointIfEmpty: true,
|
|
55
56
|
realProofs: true,
|
|
56
57
|
snapshotsUrls: [
|
|
57
58
|
`${SNAPSHOTS_URL}/staging-ignition/`
|
|
58
59
|
],
|
|
59
60
|
autoUpdate: 'config-and-version',
|
|
60
61
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/staging-ignition.json',
|
|
61
|
-
|
|
62
|
+
maxPendingTxCount: 0,
|
|
62
63
|
publicMetricsOptOut: false,
|
|
63
64
|
publicIncludeMetrics,
|
|
64
65
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
@@ -73,6 +74,7 @@ export const stagingIgnitionL2ChainConfig = {
|
|
|
73
74
|
/** The target validator committee size. */ aztecTargetCommitteeSize: 24,
|
|
74
75
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
|
|
75
76
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
|
|
77
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
|
|
76
78
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
77
79
|
/** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 65,
|
|
78
80
|
slashingRoundSizeInEpochs: 4,
|
|
@@ -121,6 +123,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
121
123
|
bootstrapNodes: [],
|
|
122
124
|
minTxsPerBlock: 0,
|
|
123
125
|
maxTxsPerBlock: 20,
|
|
126
|
+
buildCheckpointIfEmpty: true,
|
|
124
127
|
realProofs: true,
|
|
125
128
|
snapshotsUrls: [
|
|
126
129
|
`${SNAPSHOTS_URL}/staging-public/`
|
|
@@ -133,7 +136,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
133
136
|
publicMetricsCollectFrom: [
|
|
134
137
|
'sequencer'
|
|
135
138
|
],
|
|
136
|
-
|
|
139
|
+
maxPendingTxCount: 1_000,
|
|
137
140
|
txPoolDeleteTxsAfterReorg: true,
|
|
138
141
|
// Deployment stuff
|
|
139
142
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
@@ -142,6 +145,7 @@ export const stagingPublicL2ChainConfig = {
|
|
|
142
145
|
/** The target validator committee size. */ aztecTargetCommitteeSize: 48,
|
|
143
146
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
|
|
144
147
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
|
|
148
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
|
|
145
149
|
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
146
150
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
147
151
|
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
@@ -163,6 +167,7 @@ export const nextNetL2ChainConfig = {
|
|
|
163
167
|
bootstrapNodes: [],
|
|
164
168
|
minTxsPerBlock: 0,
|
|
165
169
|
maxTxsPerBlock: 8,
|
|
170
|
+
buildCheckpointIfEmpty: true,
|
|
166
171
|
realProofs: true,
|
|
167
172
|
snapshotsUrls: [],
|
|
168
173
|
autoUpdate: 'config-and-version',
|
|
@@ -173,7 +178,7 @@ export const nextNetL2ChainConfig = {
|
|
|
173
178
|
publicMetricsCollectFrom: [
|
|
174
179
|
''
|
|
175
180
|
],
|
|
176
|
-
|
|
181
|
+
maxPendingTxCount: 1_000,
|
|
177
182
|
txPoolDeleteTxsAfterReorg: false,
|
|
178
183
|
// Deployment stuff
|
|
179
184
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
@@ -182,6 +187,7 @@ export const nextNetL2ChainConfig = {
|
|
|
182
187
|
/** The target validator committee size. */ aztecTargetCommitteeSize: 48,
|
|
183
188
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: DefaultL1ContractsConfig.lagInEpochsForValidatorSet,
|
|
184
189
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: DefaultL1ContractsConfig.lagInEpochsForRandao,
|
|
190
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
|
|
185
191
|
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
186
192
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
187
193
|
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
@@ -202,14 +208,15 @@ export const testnetL2ChainConfig = {
|
|
|
202
208
|
disableTransactions: true,
|
|
203
209
|
bootstrapNodes: [],
|
|
204
210
|
minTxsPerBlock: 0,
|
|
205
|
-
maxTxsPerBlock:
|
|
211
|
+
maxTxsPerBlock: 20,
|
|
212
|
+
buildCheckpointIfEmpty: true,
|
|
206
213
|
realProofs: true,
|
|
207
214
|
snapshotsUrls: [
|
|
208
215
|
`${SNAPSHOTS_URL}/testnet/`
|
|
209
216
|
],
|
|
210
217
|
autoUpdate: 'config-and-version',
|
|
211
218
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-testnet/auto-update/testnet.json',
|
|
212
|
-
|
|
219
|
+
maxPendingTxCount: 5_000,
|
|
213
220
|
publicMetricsOptOut: false,
|
|
214
221
|
publicIncludeMetrics,
|
|
215
222
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
@@ -222,40 +229,41 @@ export const testnetL2ChainConfig = {
|
|
|
222
229
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
223
230
|
/** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 72,
|
|
224
231
|
/** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
|
|
225
|
-
/** The target validator committee size. */ aztecTargetCommitteeSize:
|
|
232
|
+
/** The target validator committee size. */ aztecTargetCommitteeSize: 48,
|
|
226
233
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
|
|
227
234
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
|
|
235
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
|
|
228
236
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
229
|
-
// This is a diff from mainnet: we have
|
|
230
|
-
localEjectionThreshold:
|
|
231
|
-
/** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum:
|
|
232
|
-
slashingRoundSizeInEpochs:
|
|
233
|
-
slashingExecutionDelayInRounds:
|
|
234
|
-
slashingLifetimeInRounds:
|
|
235
|
-
slashingVetoer: EthAddress.fromString('
|
|
237
|
+
// This is a diff from mainnet: we have 1-strike you're out, rather than 3 on mainnet.
|
|
238
|
+
localEjectionThreshold: 199_000n * 10n ** 18n,
|
|
239
|
+
/** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 33,
|
|
240
|
+
slashingRoundSizeInEpochs: 2,
|
|
241
|
+
slashingExecutionDelayInRounds: 2,
|
|
242
|
+
slashingLifetimeInRounds: 5,
|
|
243
|
+
slashingVetoer: EthAddress.fromString('0xdfe19Da6a717b7088621d8bBB66be59F2d78e924'),
|
|
236
244
|
slashingOffsetInRounds: 2,
|
|
237
|
-
slashingDisableDuration:
|
|
245
|
+
slashingDisableDuration: 5 * 24 * 60 * 60,
|
|
238
246
|
slasherFlavor: 'tally',
|
|
239
|
-
slashAmountSmall:
|
|
240
|
-
slashAmountMedium:
|
|
241
|
-
slashAmountLarge:
|
|
242
|
-
/** The mana target for the rollup */ manaTarget:
|
|
243
|
-
/** The proving cost per mana */ provingCostPerMana:
|
|
247
|
+
slashAmountSmall: 10_000n * 10n ** 18n,
|
|
248
|
+
slashAmountMedium: 50_000n * 10n ** 18n,
|
|
249
|
+
slashAmountLarge: 200_000n * 10n ** 18n,
|
|
250
|
+
/** The mana target for the rollup */ manaTarget: 150_000_000n,
|
|
251
|
+
/** The proving cost per mana */ provingCostPerMana: 100n,
|
|
244
252
|
exitDelaySeconds: 4 * 24 * 60 * 60,
|
|
245
253
|
activationThreshold: 200_000n * 10n ** 18n,
|
|
246
254
|
ejectionThreshold: 100_000n * 10n ** 18n,
|
|
247
|
-
governanceProposerRoundSize:
|
|
248
|
-
governanceProposerQuorum:
|
|
255
|
+
governanceProposerRoundSize: 100,
|
|
256
|
+
governanceProposerQuorum: 60,
|
|
249
257
|
// Node slashing config
|
|
250
258
|
slashInactivityTargetPercentage: 0.8,
|
|
251
259
|
slashInactivityConsecutiveEpochThreshold: 2,
|
|
252
|
-
slashInactivityPenalty:
|
|
260
|
+
slashInactivityPenalty: 10_000n * 10n ** 18n,
|
|
253
261
|
slashPrunePenalty: 0n,
|
|
254
262
|
slashDataWithholdingPenalty: 0n,
|
|
255
|
-
slashProposeInvalidAttestationsPenalty:
|
|
256
|
-
slashAttestDescendantOfInvalidPenalty:
|
|
257
|
-
slashUnknownPenalty:
|
|
258
|
-
slashBroadcastedInvalidBlockPenalty:
|
|
263
|
+
slashProposeInvalidAttestationsPenalty: 10_000n * 10n ** 18n,
|
|
264
|
+
slashAttestDescendantOfInvalidPenalty: 10_000n * 10n ** 18n,
|
|
265
|
+
slashUnknownPenalty: 10_000n * 10n ** 18n,
|
|
266
|
+
slashBroadcastedInvalidBlockPenalty: 10_000n * 10n ** 18n,
|
|
259
267
|
slashGracePeriodL2Slots: 1_200,
|
|
260
268
|
slashOffenseExpirationRounds: 8,
|
|
261
269
|
slashMinPenaltyPercentage: 0.5,
|
|
@@ -275,13 +283,14 @@ export const mainnetL2ChainConfig = {
|
|
|
275
283
|
bootstrapNodes: [],
|
|
276
284
|
minTxsPerBlock: 0,
|
|
277
285
|
maxTxsPerBlock: 0,
|
|
286
|
+
buildCheckpointIfEmpty: true,
|
|
278
287
|
realProofs: true,
|
|
279
288
|
snapshotsUrls: [
|
|
280
289
|
`${SNAPSHOTS_URL}/mainnet/`
|
|
281
290
|
],
|
|
282
291
|
autoUpdate: 'notify',
|
|
283
292
|
autoUpdateUrl: 'https://storage.googleapis.com/aztec-mainnet/auto-update/mainnet.json',
|
|
284
|
-
|
|
293
|
+
maxPendingTxCount: 0,
|
|
285
294
|
publicMetricsOptOut: true,
|
|
286
295
|
publicIncludeMetrics,
|
|
287
296
|
publicMetricsCollectorUrl: 'https://telemetry.alpha-testnet.aztec-labs.com/v1/metrics',
|
|
@@ -295,6 +304,7 @@ export const mainnetL2ChainConfig = {
|
|
|
295
304
|
/** The target validator committee size. */ aztecTargetCommitteeSize: 24,
|
|
296
305
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 2,
|
|
297
306
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 2,
|
|
307
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: 1,
|
|
298
308
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
299
309
|
localEjectionThreshold: 196_000n * 10n ** 18n,
|
|
300
310
|
/** How many sequencers must agree with a slash for it to be executed. */ slashingQuorum: 65,
|
|
@@ -343,6 +353,7 @@ export const devnetL2ChainConfig = {
|
|
|
343
353
|
bootstrapNodes: [],
|
|
344
354
|
minTxsPerBlock: 0,
|
|
345
355
|
maxTxsPerBlock: 8,
|
|
356
|
+
buildCheckpointIfEmpty: true,
|
|
346
357
|
realProofs: false,
|
|
347
358
|
snapshotsUrls: [],
|
|
348
359
|
autoUpdate: 'config-and-version',
|
|
@@ -353,7 +364,7 @@ export const devnetL2ChainConfig = {
|
|
|
353
364
|
publicMetricsCollectFrom: [
|
|
354
365
|
''
|
|
355
366
|
],
|
|
356
|
-
|
|
367
|
+
maxPendingTxCount: 1_000,
|
|
357
368
|
txPoolDeleteTxsAfterReorg: true,
|
|
358
369
|
// Deployment stuff
|
|
359
370
|
/** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
|
|
@@ -362,6 +373,7 @@ export const devnetL2ChainConfig = {
|
|
|
362
373
|
/** The target validator committee size. */ aztecTargetCommitteeSize: 1,
|
|
363
374
|
/** The number of epochs to lag behind the current epoch for validator selection. */ lagInEpochsForValidatorSet: 1,
|
|
364
375
|
/** The number of epochs to lag behind the current epoch for randao selection. */ lagInEpochsForRandao: 1,
|
|
376
|
+
/** The number of checkpoints to lag in the inbox (prevents sequencer DOS attacks). */ inboxLag: DefaultL1ContractsConfig.inboxLag,
|
|
365
377
|
/** The local ejection threshold for a validator. Stricter than ejectionThreshold but local to a specific rollup */ localEjectionThreshold: DefaultL1ContractsConfig.localEjectionThreshold,
|
|
366
378
|
/** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
|
|
367
379
|
/** The deposit amount for a validator */ activationThreshold: DefaultL1ContractsConfig.activationThreshold,
|
|
@@ -425,10 +437,16 @@ export function enrichEnvironmentWithChainConfig(config) {
|
|
|
425
437
|
enrichVar('L1_CHAIN_ID', config.l1ChainId.toString());
|
|
426
438
|
enrichVar('SEQ_MIN_TX_PER_BLOCK', config.minTxsPerBlock.toString());
|
|
427
439
|
enrichVar('SEQ_MAX_TX_PER_BLOCK', config.maxTxsPerBlock.toString());
|
|
440
|
+
if (config.blockDurationMs !== undefined) {
|
|
441
|
+
enrichVar('SEQ_BLOCK_DURATION_MS', config.blockDurationMs.toString());
|
|
442
|
+
}
|
|
443
|
+
if (config.buildCheckpointIfEmpty !== undefined) {
|
|
444
|
+
enrichVar('SEQ_BUILD_CHECKPOINT_IF_EMPTY', config.buildCheckpointIfEmpty.toString());
|
|
445
|
+
}
|
|
428
446
|
enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString());
|
|
429
447
|
enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString());
|
|
430
448
|
enrichVar('SYNC_SNAPSHOTS_URLS', config.snapshotsUrls.join(','));
|
|
431
|
-
enrichVar('
|
|
449
|
+
enrichVar('P2P_MAX_PENDING_TX_COUNT', config.maxPendingTxCount.toString());
|
|
432
450
|
enrichVar('P2P_TX_POOL_DELETE_TXS_AFTER_REORG', config.txPoolDeleteTxsAfterReorg.toString());
|
|
433
451
|
enrichVar('DATA_STORE_MAP_SIZE_KB', config.dataStoreMapSizeKb.toString());
|
|
434
452
|
enrichVar('ARCHIVER_STORE_MAP_SIZE_KB', config.archiverStoreMapSizeKb.toString());
|
|
@@ -464,6 +482,7 @@ export function enrichEnvironmentWithChainConfig(config) {
|
|
|
464
482
|
enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
|
|
465
483
|
enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET', config.lagInEpochsForValidatorSet.toString());
|
|
466
484
|
enrichVar('AZTEC_LAG_IN_EPOCHS_FOR_RANDAO', config.lagInEpochsForRandao.toString());
|
|
485
|
+
enrichVar('AZTEC_INBOX_LAG', config.inboxLag.toString());
|
|
467
486
|
enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
|
|
468
487
|
enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
|
|
469
488
|
enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { L1ContractAddresses } from '@aztec/ethereum/l1-contract-addresses';
|
|
2
|
+
import { getL1ContractsConfig } from '@aztec/ethereum/queries';
|
|
2
3
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
4
|
export declare function getL1Config(registryAddress: EthAddress, l1RpcUrls: string[], l1ChainId: number, rollupVersion?: number | 'canonical'): Promise<{
|
|
4
5
|
addresses: L1ContractAddresses;
|
|
5
6
|
config: Awaited<ReturnType<typeof getL1ContractsConfig>>;
|
|
6
7
|
}>;
|
|
7
8
|
export declare function getL1RollupAddressFromEnv(l1RpcUrls: string[], l1ChainId: number): Promise<EthAddress>;
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2wxX2NvbmZpZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbmZpZy9nZXRfbDFfY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFDakYsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDL0QsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBRTNELHdCQUFzQixXQUFXLENBQy9CLGVBQWUsRUFBRSxVQUFVLEVBQzNCLFNBQVMsRUFBRSxNQUFNLEVBQUUsRUFDbkIsU0FBUyxFQUFFLE1BQU0sRUFDakIsYUFBYSxHQUFFLE1BQU0sR0FBRyxXQUF5QixHQUNoRCxPQUFPLENBQUM7SUFBRSxTQUFTLEVBQUUsbUJBQW1CLENBQUM7SUFBQyxNQUFNLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMsQ0FBQTtDQUFFLENBQUMsQ0FVdkc7QUFFRCx3QkFBc0IseUJBQXlCLENBQUMsU0FBUyxFQUFFLE1BQU0sRUFBRSxFQUFFLFNBQVMsRUFBRSxNQUFNLHVCQU9yRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/config/get_l1_config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get_l1_config.d.ts","sourceRoot":"","sources":["../../src/config/get_l1_config.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,WAAW,CAC/B,eAAe,EAAE,UAAU,EAC3B,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,GAAE,MAAM,GAAG,WAAyB,GAChD,OAAO,CAAC;IAAE,SAAS,EAAE,mBAAmB,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAA;CAAE,CAAC,CAUvG;AAED,wBAAsB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,uBAOrF"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getPublicClient } from '@aztec/ethereum/client';
|
|
2
|
+
import { RegistryContract } from '@aztec/ethereum/contracts';
|
|
3
|
+
import { getL1ContractsConfig } from '@aztec/ethereum/queries';
|
|
2
4
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
5
|
export async function getL1Config(registryAddress, l1RpcUrls, l1ChainId, rollupVersion = 'canonical') {
|
|
4
6
|
const publicClient = getPublicClient({
|
|
@@ -19,4 +19,4 @@ export declare function getNetworkConfig(networkName: NetworkNames, cacheDir?: s
|
|
|
19
19
|
* Does not throw if the network simply doesn't exist in the config - just returns without enriching
|
|
20
20
|
*/
|
|
21
21
|
export declare function enrichEnvironmentWithNetworkConfig(networkName: NetworkNames): Promise<void>;
|
|
22
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya19jb25maWcuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jb25maWcvbmV0d29ya19jb25maWcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUEwQixLQUFLLFlBQVksRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBYXpHOzs7Ozs7OztHQVFHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUNwQyxXQUFXLEVBQUUsWUFBWSxFQUN6QixRQUFRLENBQUMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQyxhQUFhLEdBQUcsU0FBUyxDQUFDLENBOEJwQztBQXVERDs7Ozs7Ozs7R0FRRztBQUNILHdCQUFzQixrQ0FBa0MsQ0FBQyxXQUFXLEVBQUUsWUFBWSxpQkEyQmpGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAazG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAuDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"network_config.d.ts","sourceRoot":"","sources":["../../src/config/network_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAA0B,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAazG;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA8BpC;AAuDD;;;;;;;;GAQG;AACH,wBAAsB,kCAAkC,CAAC,WAAW,EAAE,YAAY,iBA2BjF"}
|
|
@@ -106,4 +106,10 @@ const NETWORK_CONFIG_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour
|
|
|
106
106
|
if (networkConfig.feeAssetHandlerAddress) {
|
|
107
107
|
enrichEthAddressVar('FEE_ASSET_HANDLER_CONTRACT_ADDRESS', networkConfig.feeAssetHandlerAddress.toString());
|
|
108
108
|
}
|
|
109
|
+
if (networkConfig.blobFileStoreUrls?.length) {
|
|
110
|
+
enrichVar('BLOB_FILE_STORE_URLS', networkConfig.blobFileStoreUrls.join(','));
|
|
111
|
+
}
|
|
112
|
+
if (networkConfig.blockDurationMs !== undefined) {
|
|
113
|
+
enrichVar('SEQ_BLOCK_DURATION_MS', String(networkConfig.blockDurationMs));
|
|
114
|
+
}
|
|
109
115
|
}
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { type ContractArtifact, type FunctionAbi } from '@aztec/aztec.js/abi';
|
|
2
2
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
5
|
-
import type {
|
|
3
|
+
import type { L1ContractsConfig } from '@aztec/ethereum/config';
|
|
4
|
+
import { RollupContract } from '@aztec/ethereum/contracts';
|
|
5
|
+
import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
6
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
7
|
+
import { type LogFn } from '@aztec/foundation/log';
|
|
6
8
|
import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
7
9
|
/**
|
|
8
10
|
* Helper to get an ABI function or throw error if it doesn't exist.
|
|
@@ -11,15 +13,7 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
|
11
13
|
* @returns The function's ABI.
|
|
12
14
|
*/
|
|
13
15
|
export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
|
|
14
|
-
|
|
15
|
-
* Function to execute the 'deployRollupContracts' command.
|
|
16
|
-
* @param rpcUrls - The RPC URL of the ethereum node.
|
|
17
|
-
* @param chainId - The chain ID of the L1 host.
|
|
18
|
-
* @param privateKey - The private key to be used in contract deployment.
|
|
19
|
-
* @param mnemonic - The mnemonic to be used in contract deployment.
|
|
20
|
-
*/
|
|
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, createVerificationJson: string | false, logger: Logger): Promise<{
|
|
16
|
+
export declare function deployNewRollupContracts(registryAddress: EthAddress, rpcUrls: string[], privateKey: string | undefined, chainId: number, mnemonic: string, mnemonicIndex: number, initialValidators: Operator[], genesisArchiveRoot: Fr, feeJuicePortalInitialBalance: bigint, config: L1ContractsConfig, realVerifier: boolean): Promise<{
|
|
23
17
|
rollup: RollupContract;
|
|
24
18
|
slashFactoryAddress: EthAddress;
|
|
25
19
|
}>;
|
|
@@ -60,4 +54,4 @@ export declare const stripLeadingHex: (hex: string) => string;
|
|
|
60
54
|
*/
|
|
61
55
|
export declare const addLeadingHex: (hex: string) => `0x${string}`;
|
|
62
56
|
export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
|
|
63
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQztJQUFDLG1CQUFtQixFQUFFLFVBQVUsQ0FBQTtDQUFFLENBQUMsQ0FnRHRFO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
|
|
@@ -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,
|
|
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,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAE1E,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAWhE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,GACpB,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAgDtE;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,yBAK3B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,gCAKzB,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE"}
|
package/dest/utils/aztec.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { FunctionType, getAllFunctionAbis, loadContractArtifact } from '@aztec/aztec.js/abi';
|
|
2
2
|
import { EthAddress } from '@aztec/aztec.js/addresses';
|
|
3
3
|
import { SecretValue } from '@aztec/foundation/config';
|
|
4
|
-
import { Fr } from '@aztec/foundation/
|
|
4
|
+
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
5
|
+
import { createLogger } from '@aztec/foundation/log';
|
|
5
6
|
import { protocolContractsHash } from '@aztec/protocol-contracts';
|
|
6
7
|
import TOML from '@iarna/toml';
|
|
7
8
|
import { readFile } from 'fs/promises';
|
|
8
9
|
import { encodeArgs } from './encoding.js';
|
|
10
|
+
const logger = createLogger('cli:utils:aztec');
|
|
9
11
|
/**
|
|
10
12
|
* Helper to get an ABI function or throw error if it doesn't exist.
|
|
11
13
|
* @param artifact - Contract's build artifact in JSON format.
|
|
@@ -18,43 +20,21 @@ import { encodeArgs } from './encoding.js';
|
|
|
18
20
|
}
|
|
19
21
|
return fn;
|
|
20
22
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
* @param rpcUrls - The RPC URL of the ethereum node.
|
|
24
|
-
* @param chainId - The chain ID of the L1 host.
|
|
25
|
-
* @param privateKey - The private key to be used in contract deployment.
|
|
26
|
-
* @param mnemonic - The mnemonic to be used in contract deployment.
|
|
27
|
-
*/ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, existingToken, realVerifier, createVerificationJson, debugLogger) {
|
|
28
|
-
const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
|
|
29
|
-
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
30
|
-
const account = !privateKey ? mnemonicToAccount(mnemonic, {
|
|
31
|
-
addressIndex: mnemonicIndex
|
|
32
|
-
}) : privateKeyToAccount(addLeadingHex(privateKey));
|
|
33
|
-
const chain = createEthereumChain(rpcUrls, chainId);
|
|
34
|
-
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
35
|
-
const result = await deployL1Contracts(chain.rpcUrls, account, chain.chainInfo, debugLogger, {
|
|
36
|
-
vkTreeRoot: getVKTreeRoot(),
|
|
37
|
-
protocolContractsHash,
|
|
38
|
-
genesisArchiveRoot,
|
|
39
|
-
salt,
|
|
40
|
-
initialValidators,
|
|
41
|
-
acceleratedTestDeployments,
|
|
42
|
-
feeJuicePortalInitialBalance,
|
|
43
|
-
realVerifier,
|
|
44
|
-
existingTokenAddress: existingToken,
|
|
45
|
-
...config
|
|
46
|
-
}, config, createVerificationJson);
|
|
47
|
-
return result;
|
|
48
|
-
}
|
|
49
|
-
export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, createVerificationJson, logger) {
|
|
50
|
-
const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
|
|
23
|
+
export async function deployNewRollupContracts(registryAddress, rpcUrls, privateKey, chainId, mnemonic, mnemonicIndex, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier) {
|
|
24
|
+
const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
|
|
51
25
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
52
26
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
27
|
+
let account;
|
|
28
|
+
if (privateKey) {
|
|
29
|
+
account = privateKeyToAccount(addLeadingHex(privateKey));
|
|
30
|
+
} else {
|
|
31
|
+
account = mnemonicToAccount(mnemonic, {
|
|
32
|
+
addressIndex: mnemonicIndex
|
|
33
|
+
});
|
|
34
|
+
const privateKeyBuf = account.getHdKey().privateKey;
|
|
35
|
+
const privateKeyHex = Buffer.from(privateKeyBuf).toString('hex');
|
|
36
|
+
privateKey = `0x${privateKeyHex}`;
|
|
37
|
+
}
|
|
58
38
|
if (!initialValidators || initialValidators.length === 0) {
|
|
59
39
|
// initialize the new rollup with Amin's validator address.
|
|
60
40
|
const aminAddressString = '0x3b218d0F26d15B36C715cB06c949210a0d630637';
|
|
@@ -71,8 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
71
51
|
initialValidators
|
|
72
52
|
});
|
|
73
53
|
}
|
|
74
|
-
const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(
|
|
75
|
-
salt,
|
|
54
|
+
const { rollup, slashFactoryAddress } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
|
|
76
55
|
vkTreeRoot: getVKTreeRoot(),
|
|
77
56
|
protocolContractsHash,
|
|
78
57
|
genesisArchiveRoot,
|
|
@@ -80,10 +59,10 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
|
|
|
80
59
|
feeJuicePortalInitialBalance,
|
|
81
60
|
realVerifier,
|
|
82
61
|
...config
|
|
83
|
-
}
|
|
62
|
+
});
|
|
84
63
|
return {
|
|
85
64
|
rollup,
|
|
86
|
-
slashFactoryAddress
|
|
65
|
+
slashFactoryAddress: EthAddress.fromString(slashFactoryAddress)
|
|
87
66
|
};
|
|
88
67
|
}
|
|
89
68
|
/**
|