@aztec/cli 0.0.1-commit.8c0b8ff → 0.0.1-commit.8cb2d04d8
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/aztec_node/get_node_info.d.ts +1 -1
- package/dest/cmds/aztec_node/get_node_info.d.ts.map +1 -1
- package/dest/cmds/aztec_node/get_node_info.js +0 -2
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.d.ts.map +1 -1
- package/dest/cmds/l1/deploy_l1_contracts_cmd.js +0 -1
- 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 -4
- package/dest/config/chain_l2_config.d.ts +1 -1
- package/dest/config/chain_l2_config.d.ts.map +1 -1
- package/dest/config/chain_l2_config.js +3 -1
- package/dest/config/generated/networks.d.ts +25 -31
- package/dest/config/generated/networks.d.ts.map +1 -1
- package/dest/config/generated/networks.js +24 -30
- package/dest/utils/aztec.d.ts +1 -2
- package/dest/utils/aztec.d.ts.map +1 -1
- package/dest/utils/aztec.js +2 -3
- package/package.json +30 -30
- package/src/cmds/aztec_node/get_node_info.ts +0 -2
- package/src/cmds/l1/deploy_l1_contracts_cmd.ts +0 -1
- package/src/cmds/l1/deploy_new_rollup.ts +1 -3
- package/src/config/chain_l2_config.ts +3 -1
- package/src/config/generated/networks.ts +24 -30
- package/src/utils/aztec.ts +12 -18
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { LogFn } from '@aztec/foundation/log';
|
|
2
2
|
export declare function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, logJson: (output: any) => void): Promise<void>;
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X25vZGVfaW5mby5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvYXp0ZWNfbm9kZS9nZXRfbm9kZV9pbmZvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRW5ELHdCQUFzQixXQUFXLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLENBQUMsTUFBTSxFQUFFLEdBQUcsS0FBSyxJQUFJLGlCQXlEM0cifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"get_node_info.d.ts","sourceRoot":"","sources":["../../../src/cmds/aztec_node/get_node_info.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,iBAyD3G"}
|
|
@@ -20,7 +20,6 @@ export async function getNodeInfo(nodeUrl, json, log, logJson) {
|
|
|
20
20
|
rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
21
21
|
governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
|
|
22
22
|
governance: info.l1ContractAddresses.governanceAddress.toString(),
|
|
23
|
-
slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
|
|
24
23
|
feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
|
|
25
24
|
stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()
|
|
26
25
|
},
|
|
@@ -48,7 +47,6 @@ export async function getNodeInfo(nodeUrl, json, log, logJson) {
|
|
|
48
47
|
log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
49
48
|
log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
50
49
|
log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
|
|
51
|
-
log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
52
50
|
log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
53
51
|
log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
54
52
|
log(`L2 Contract Addresses:`);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { EthAddress } from '@aztec/aztec.js/addresses';
|
|
2
2
|
import type { LogFn, Logger } from '@aztec/foundation/log';
|
|
3
3
|
export declare function deployL1ContractsCmd(rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: EthAddress[], realVerifier: boolean, existingToken: EthAddress | undefined, log: LogFn, debugLogger: Logger): Promise<void>;
|
|
4
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
4
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X2wxX2NvbnRyYWN0c19jbWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2RlcGxveV9sMV9jb250cmFjdHNfY21kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBSzVELE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVMzRCx3QkFBc0Isb0JBQW9CLENBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsT0FBTyxFQUFFLE1BQU0sRUFDZixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixpQkFBaUIsRUFBRSxVQUFVLEVBQUUsRUFDL0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsYUFBYSxFQUFFLFVBQVUsR0FBRyxTQUFTLEVBQ3JDLEdBQUcsRUFBRSxLQUFLLEVBQ1YsV0FBVyxFQUFFLE1BQU0saUJBNkVwQiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,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,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"deploy_l1_contracts_cmd.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_l1_contracts_cmd.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAK5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,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,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,UAAU,EAAE,EAC/B,YAAY,EAAE,OAAO,EACrB,aAAa,EAAE,UAAU,GAAG,SAAS,EACrC,GAAG,EAAE,KAAK,EACV,WAAW,EAAE,MAAM,iBA6EpB"}
|
|
@@ -70,7 +70,6 @@ export async function deployL1ContractsCmd(rpcUrls, chainId, privateKey, mnemoni
|
|
|
70
70
|
log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
71
71
|
log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
72
72
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
73
|
-
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
74
73
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
75
74
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
76
75
|
log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);
|
|
@@ -2,4 +2,4 @@ import type { Operator } from '@aztec/ethereum/deploy-aztec-l1-contracts';
|
|
|
2
2
|
import type { EthAddress } from '@aztec/foundation/eth-address';
|
|
3
3
|
import type { LogFn } from '@aztec/foundation/log';
|
|
4
4
|
export declare function deployNewRollup(registryAddress: EthAddress, rpcUrls: string[], chainId: number, privateKey: string | undefined, mnemonic: string, mnemonicIndex: number, testAccounts: boolean, sponsoredFPC: boolean, json: boolean, initialValidators: Operator[], realVerifier: boolean, log: LogFn): Promise<void>;
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVwbG95X25ld19yb2xsdXAuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL2RlcGxveV9uZXdfcm9sbHVwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBQzFFLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBTW5ELHdCQUFzQixlQUFlLENBQ25DLGVBQWUsRUFBRSxVQUFVLEVBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQUUsRUFDakIsT0FBTyxFQUFFLE1BQU0sRUFDZixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsUUFBUSxFQUFFLE1BQU0sRUFDaEIsYUFBYSxFQUFFLE1BQU0sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsWUFBWSxFQUFFLE9BQU8sRUFDckIsSUFBSSxFQUFFLE9BQU8sRUFDYixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0IsWUFBWSxFQUFFLE9BQU8sRUFDckIsR0FBRyxFQUFFLEtBQUssaUJBMENYIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,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,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"deploy_new_rollup.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/deploy_new_rollup.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAMnD,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,YAAY,EAAE,OAAO,EACrB,YAAY,EAAE,OAAO,EACrB,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,YAAY,EAAE,OAAO,EACrB,GAAG,EAAE,KAAK,iBA0CX"}
|
|
@@ -9,20 +9,18 @@ export async function deployNewRollup(registryAddress, rpcUrls, chainId, private
|
|
|
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
|
|
12
|
+
const { rollup } = await deployNewRollupContracts(registryAddress, rpcUrls, privateKey, chainId, mnemonic, mnemonicIndex, initialValidators, genesisArchiveRoot, fundingNeeded, config, realVerifier);
|
|
13
13
|
if (json) {
|
|
14
14
|
log(JSON.stringify({
|
|
15
15
|
rollupAddress: rollup.address,
|
|
16
16
|
initialFundedAccounts: initialFundedAccounts.map((a)=>a.toString()),
|
|
17
17
|
initialValidators: initialValidators.map((a)=>a.attester.toString()),
|
|
18
|
-
genesisArchiveRoot: genesisArchiveRoot.toString()
|
|
19
|
-
slashFactoryAddress: slashFactoryAddress.toString()
|
|
18
|
+
genesisArchiveRoot: genesisArchiveRoot.toString()
|
|
20
19
|
}, null, 2));
|
|
21
20
|
} else {
|
|
22
21
|
log(`Rollup Address: ${rollup.address}`);
|
|
23
22
|
log(`Initial funded accounts: ${initialFundedAccounts.map((a)=>a.toString()).join(', ')}`);
|
|
24
23
|
log(`Initial validators: ${initialValidators.map((a)=>a.attester.toString()).join(', ')}`);
|
|
25
24
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
26
|
-
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
27
25
|
}
|
|
28
26
|
}
|
|
@@ -11,4 +11,4 @@ import type { NetworkNames } from '@aztec/foundation/config';
|
|
|
11
11
|
* @param networkName - The network name
|
|
12
12
|
*/
|
|
13
13
|
export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQXFCdkUifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAqBvE"}
|
|
@@ -34,7 +34,9 @@ function getDefaultDataDir(networkName) {
|
|
|
34
34
|
return;
|
|
35
35
|
}
|
|
36
36
|
// Apply generated network config from defaults.yml
|
|
37
|
-
|
|
37
|
+
// For devnet iterations (v4-devnet-1, etc.), use the base devnet config
|
|
38
|
+
const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
|
|
39
|
+
const generatedConfig = NetworkConfigs[configKey];
|
|
38
40
|
if (generatedConfig) {
|
|
39
41
|
enrichEnvironmentWithNetworkConfig(generatedConfig);
|
|
40
42
|
}
|
|
@@ -11,7 +11,7 @@ export declare const devnetConfig: {
|
|
|
11
11
|
readonly AZTEC_MANA_TARGET: 100000000;
|
|
12
12
|
readonly AZTEC_PROVING_COST_PER_MANA: 100;
|
|
13
13
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
14
|
-
readonly
|
|
14
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
15
15
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
16
16
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
17
17
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
@@ -21,10 +21,8 @@ export declare const devnetConfig: {
|
|
|
21
21
|
readonly AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000;
|
|
22
22
|
readonly AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000;
|
|
23
23
|
readonly AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300;
|
|
24
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
25
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
26
24
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
27
|
-
readonly SLASH_MAX_PAYLOAD_SIZE:
|
|
25
|
+
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
28
26
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
29
27
|
readonly P2P_ENABLED: true;
|
|
30
28
|
readonly BOOTSTRAP_NODES: "";
|
|
@@ -77,20 +75,18 @@ export declare const testnetConfig: {
|
|
|
77
75
|
readonly AZTEC_EPOCH_DURATION: 32;
|
|
78
76
|
readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
|
|
79
77
|
readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
|
|
80
|
-
readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
78
|
+
readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
|
|
81
79
|
readonly AZTEC_EXIT_DELAY_SECONDS: 172800;
|
|
82
80
|
readonly AZTEC_INBOX_LAG: 1;
|
|
83
81
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
84
82
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
85
|
-
readonly
|
|
83
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
86
84
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
87
85
|
readonly AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5;
|
|
88
86
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
89
87
|
readonly AZTEC_SLASHING_DISABLE_DURATION: 432000;
|
|
90
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
91
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
92
88
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
93
|
-
readonly SLASH_MAX_PAYLOAD_SIZE:
|
|
89
|
+
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
94
90
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
95
91
|
readonly P2P_ENABLED: true;
|
|
96
92
|
readonly BOOTSTRAP_NODES: "";
|
|
@@ -127,18 +123,18 @@ export declare const testnetConfig: {
|
|
|
127
123
|
readonly PROVER_REAL_PROOFS: true;
|
|
128
124
|
readonly P2P_MAX_PENDING_TX_COUNT: 1000;
|
|
129
125
|
readonly P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true;
|
|
130
|
-
readonly SLASH_PRUNE_PENALTY:
|
|
131
|
-
readonly SLASH_DATA_WITHHOLDING_PENALTY:
|
|
132
|
-
readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
133
|
-
readonly SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD:
|
|
134
|
-
readonly SLASH_INACTIVITY_PENALTY:
|
|
135
|
-
readonly SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
136
|
-
readonly SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
137
|
-
readonly SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
138
|
-
readonly SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY:
|
|
139
|
-
readonly SLASH_UNKNOWN_PENALTY:
|
|
140
|
-
readonly SLASH_INVALID_BLOCK_PENALTY:
|
|
141
|
-
readonly SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
126
|
+
readonly SLASH_PRUNE_PENALTY: 10000000000000000000;
|
|
127
|
+
readonly SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000;
|
|
128
|
+
readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9;
|
|
129
|
+
readonly SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1;
|
|
130
|
+
readonly SLASH_INACTIVITY_PENALTY: 10000000000000000000;
|
|
131
|
+
readonly SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000;
|
|
132
|
+
readonly SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000;
|
|
133
|
+
readonly SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000;
|
|
134
|
+
readonly SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000;
|
|
135
|
+
readonly SLASH_UNKNOWN_PENALTY: 10000000000000000000;
|
|
136
|
+
readonly SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000;
|
|
137
|
+
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 64;
|
|
142
138
|
readonly ENABLE_VERSION_CHECK: true;
|
|
143
139
|
};
|
|
144
140
|
export declare const mainnetConfig: {
|
|
@@ -146,17 +142,15 @@ export declare const mainnetConfig: {
|
|
|
146
142
|
readonly AZTEC_EPOCH_DURATION: 32;
|
|
147
143
|
readonly AZTEC_TARGET_COMMITTEE_SIZE: 48;
|
|
148
144
|
readonly AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2;
|
|
149
|
-
readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
145
|
+
readonly AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2;
|
|
150
146
|
readonly AZTEC_INBOX_LAG: 1;
|
|
151
147
|
readonly AZTEC_PROOF_SUBMISSION_EPOCHS: 1;
|
|
152
148
|
readonly AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000;
|
|
153
|
-
readonly
|
|
149
|
+
readonly AZTEC_SLASHER_ENABLED: true;
|
|
154
150
|
readonly AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4;
|
|
155
151
|
readonly AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2;
|
|
156
|
-
readonly SLASH_MIN_PENALTY_PERCENTAGE: 0.5;
|
|
157
|
-
readonly SLASH_MAX_PENALTY_PERCENTAGE: 2;
|
|
158
152
|
readonly SLASH_OFFENSE_EXPIRATION_ROUNDS: 4;
|
|
159
|
-
readonly SLASH_MAX_PAYLOAD_SIZE:
|
|
153
|
+
readonly SLASH_MAX_PAYLOAD_SIZE: 80;
|
|
160
154
|
readonly SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4;
|
|
161
155
|
readonly P2P_ENABLED: true;
|
|
162
156
|
readonly BOOTSTRAP_NODES: "";
|
|
@@ -207,15 +201,15 @@ export declare const mainnetConfig: {
|
|
|
207
201
|
readonly ENABLE_VERSION_CHECK: false;
|
|
208
202
|
readonly SLASH_PRUNE_PENALTY: 0;
|
|
209
203
|
readonly SLASH_DATA_WITHHOLDING_PENALTY: 0;
|
|
210
|
-
readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
204
|
+
readonly SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8;
|
|
211
205
|
readonly SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2;
|
|
212
206
|
readonly SLASH_INACTIVITY_PENALTY: 2e+21;
|
|
213
207
|
readonly SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2e+21;
|
|
214
|
-
readonly SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
215
|
-
readonly SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
208
|
+
readonly SLASH_DUPLICATE_PROPOSAL_PENALTY: 2e+21;
|
|
209
|
+
readonly SLASH_DUPLICATE_ATTESTATION_PENALTY: 2e+21;
|
|
216
210
|
readonly SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2e+21;
|
|
217
211
|
readonly SLASH_UNKNOWN_PENALTY: 2e+21;
|
|
218
212
|
readonly SLASH_INVALID_BLOCK_PENALTY: 2e+21;
|
|
219
|
-
readonly SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
213
|
+
readonly SLASH_GRACE_PERIOD_L2_SLOTS: 1200;
|
|
220
214
|
};
|
|
221
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV0d29ya3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb25maWcvZ2VuZXJhdGVkL25ldHdvcmtzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUdBLGVBQU8sTUFBTSxZQUFZOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQXVFZixDQUFDO0FBRVgsZUFBTyxNQUFNLGFBQWE7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQWtFaEIsQ0FBQztBQUVYLGVBQU8sTUFBTSxhQUFhOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztDQTBFaEIsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"networks.d.ts","sourceRoot":"","sources":["../../../src/config/generated/networks.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuEf,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC;AAEX,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0EhB,CAAC"}
|
|
@@ -13,7 +13,7 @@ export const devnetConfig = {
|
|
|
13
13
|
AZTEC_MANA_TARGET: 100000000,
|
|
14
14
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
15
15
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
16
|
-
|
|
16
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
17
17
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
18
18
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
19
19
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -23,10 +23,8 @@ export const devnetConfig = {
|
|
|
23
23
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
24
24
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
25
25
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
26
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
27
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
28
26
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
29
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
27
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
30
28
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
31
29
|
P2P_ENABLED: true,
|
|
32
30
|
BOOTSTRAP_NODES: '',
|
|
@@ -79,20 +77,18 @@ export const testnetConfig = {
|
|
|
79
77
|
AZTEC_EPOCH_DURATION: 32,
|
|
80
78
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
81
79
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
82
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
80
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
83
81
|
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
84
82
|
AZTEC_INBOX_LAG: 1,
|
|
85
83
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
86
84
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
87
|
-
|
|
85
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
88
86
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
89
87
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
90
88
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
91
89
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
92
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
93
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
94
90
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
95
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
91
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
96
92
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
97
93
|
P2P_ENABLED: true,
|
|
98
94
|
BOOTSTRAP_NODES: '',
|
|
@@ -129,18 +125,18 @@ export const testnetConfig = {
|
|
|
129
125
|
PROVER_REAL_PROOFS: true,
|
|
130
126
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
131
127
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
132
|
-
SLASH_PRUNE_PENALTY:
|
|
133
|
-
SLASH_DATA_WITHHOLDING_PENALTY:
|
|
134
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
135
|
-
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD:
|
|
136
|
-
SLASH_INACTIVITY_PENALTY:
|
|
137
|
-
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
138
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
139
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
140
|
-
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY:
|
|
141
|
-
SLASH_UNKNOWN_PENALTY:
|
|
142
|
-
SLASH_INVALID_BLOCK_PENALTY:
|
|
143
|
-
SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
128
|
+
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
129
|
+
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
130
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
131
|
+
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
132
|
+
SLASH_INACTIVITY_PENALTY: 10000000000000000000,
|
|
133
|
+
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
134
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
|
|
135
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
|
|
136
|
+
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
|
|
137
|
+
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
138
|
+
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
139
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
144
140
|
ENABLE_VERSION_CHECK: true
|
|
145
141
|
};
|
|
146
142
|
export const mainnetConfig = {
|
|
@@ -148,17 +144,15 @@ export const mainnetConfig = {
|
|
|
148
144
|
AZTEC_EPOCH_DURATION: 32,
|
|
149
145
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
150
146
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
151
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
147
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
152
148
|
AZTEC_INBOX_LAG: 1,
|
|
153
149
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
154
150
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
155
|
-
|
|
151
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
156
152
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
157
153
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
158
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
159
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
160
154
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
161
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
155
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
162
156
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
163
157
|
P2P_ENABLED: true,
|
|
164
158
|
BOOTSTRAP_NODES: '',
|
|
@@ -209,14 +203,14 @@ export const mainnetConfig = {
|
|
|
209
203
|
ENABLE_VERSION_CHECK: false,
|
|
210
204
|
SLASH_PRUNE_PENALTY: 0,
|
|
211
205
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
212
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
206
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
213
207
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
214
208
|
SLASH_INACTIVITY_PENALTY: 2E+21,
|
|
215
209
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
|
|
216
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
217
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
210
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 2E+21,
|
|
211
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 2E+21,
|
|
218
212
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
|
|
219
213
|
SLASH_UNKNOWN_PENALTY: 2E+21,
|
|
220
214
|
SLASH_INVALID_BLOCK_PENALTY: 2E+21,
|
|
221
|
-
SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
215
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 1200
|
|
222
216
|
};
|
package/dest/utils/aztec.d.ts
CHANGED
|
@@ -15,7 +15,6 @@ import type { NoirPackageConfig } from '@aztec/foundation/noir';
|
|
|
15
15
|
export declare function getFunctionAbi(artifact: ContractArtifact, fnName: string): FunctionAbi;
|
|
16
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<{
|
|
17
17
|
rollup: RollupContract;
|
|
18
|
-
slashFactoryAddress: EthAddress;
|
|
19
18
|
}>;
|
|
20
19
|
/**
|
|
21
20
|
* Gets all contracts available in \@aztec/noir-contracts.js.
|
|
@@ -54,4 +53,4 @@ export declare const stripLeadingHex: (hex: string) => string;
|
|
|
54
53
|
*/
|
|
55
54
|
export declare const addLeadingHex: (hex: string) => `0x${string}`;
|
|
56
55
|
export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlscy9henRlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsS0FBSyxnQkFBZ0IsRUFDckIsS0FBSyxXQUFXLEVBSWpCLE1BQU0scUJBQXFCLENBQUM7QUFDN0IsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDaEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBQzNELE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRTFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsS0FBSyxLQUFLLEVBQWdCLE1BQU0sdUJBQXVCLENBQUM7QUFDakUsT0FBTyxLQUFLLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQVdoRTs7Ozs7R0FLRztBQUNILHdCQUFnQixjQUFjLENBQUMsUUFBUSxFQUFFLGdCQUFnQixFQUFFLE1BQU0sRUFBRSxNQUFNLEdBQUcsV0FBVyxDQU10RjtBQUVELHdCQUFzQix3QkFBd0IsQ0FDNUMsZUFBZSxFQUFFLFVBQVUsRUFDM0IsT0FBTyxFQUFFLE1BQU0sRUFBRSxFQUNqQixVQUFVLEVBQUUsTUFBTSxHQUFHLFNBQVMsRUFDOUIsT0FBTyxFQUFFLE1BQU0sRUFDZixRQUFRLEVBQUUsTUFBTSxFQUNoQixhQUFhLEVBQUUsTUFBTSxFQUNyQixpQkFBaUIsRUFBRSxRQUFRLEVBQUUsRUFDN0Isa0JBQWtCLEVBQUUsRUFBRSxFQUN0Qiw0QkFBNEIsRUFBRSxNQUFNLEVBQ3BDLE1BQU0sRUFBRSxpQkFBaUIsRUFDekIsWUFBWSxFQUFFLE9BQU8sR0FDcEIsT0FBTyxDQUFDO0lBQUUsTUFBTSxFQUFFLGNBQWMsQ0FBQTtDQUFFLENBQUMsQ0EwQ3JDO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUtqRTtBQUVEOzs7O0dBSUc7QUFDSCx3QkFBc0IsbUJBQW1CLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsS0FBSyw2QkE0QnBFO0FBRUQ7Ozs7Ozs7R0FPRztBQUNILHdCQUFzQixNQUFNLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLGFBQWEsRUFBRSxNQUFNLEVBQUUsRUFBRSxHQUFHLEVBQUUsS0FBSzs7OztHQU8zRztBQUVEOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sZUFBZSx5QkFLM0IsQ0FBQztBQUVGOzs7O0dBSUc7QUFDSCxlQUFPLE1BQU0sYUFBYSxnQ0FLekIsQ0FBQztBQU9GLHdCQUFnQixvQkFBb0IsQ0FBQyxNQUFNLEVBQUUsaUJBQWlCLEdBQUcsTUFBTSxDQVV0RSJ9
|
|
@@ -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,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,
|
|
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,CAAA;CAAE,CAAC,CA0CrC;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
|
@@ -51,7 +51,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
|
|
|
51
51
|
initialValidators
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
|
-
const { rollup
|
|
54
|
+
const { rollup } = await deployRollupForUpgrade(privateKey, rpcUrls[0], chainId, registryAddress, {
|
|
55
55
|
vkTreeRoot: getVKTreeRoot(),
|
|
56
56
|
protocolContractsHash,
|
|
57
57
|
genesisArchiveRoot,
|
|
@@ -61,8 +61,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, private
|
|
|
61
61
|
...config
|
|
62
62
|
});
|
|
63
63
|
return {
|
|
64
|
-
rollup
|
|
65
|
-
slashFactoryAddress: EthAddress.fromString(slashFactoryAddress)
|
|
64
|
+
rollup
|
|
66
65
|
};
|
|
67
66
|
}
|
|
68
67
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec/cli",
|
|
3
|
-
"version": "0.0.1-commit.
|
|
3
|
+
"version": "0.0.1-commit.8cb2d04d8",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
"./contracts": "./dest/cmds/contracts/index.js",
|
|
@@ -77,23 +77,23 @@
|
|
|
77
77
|
]
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
81
|
-
"@aztec/archiver": "0.0.1-commit.
|
|
82
|
-
"@aztec/aztec.js": "0.0.1-commit.
|
|
83
|
-
"@aztec/constants": "0.0.1-commit.
|
|
84
|
-
"@aztec/entrypoints": "0.0.1-commit.
|
|
85
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
86
|
-
"@aztec/foundation": "0.0.1-commit.
|
|
87
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
88
|
-
"@aztec/node-keystore": "0.0.1-commit.
|
|
89
|
-
"@aztec/node-lib": "0.0.1-commit.
|
|
90
|
-
"@aztec/p2p": "0.0.1-commit.
|
|
91
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
92
|
-
"@aztec/sequencer-client": "0.0.1-commit.
|
|
93
|
-
"@aztec/slasher": "0.0.1-commit.
|
|
94
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
95
|
-
"@aztec/wallets": "0.0.1-commit.
|
|
96
|
-
"@aztec/world-state": "0.0.1-commit.
|
|
80
|
+
"@aztec/accounts": "0.0.1-commit.8cb2d04d8",
|
|
81
|
+
"@aztec/archiver": "0.0.1-commit.8cb2d04d8",
|
|
82
|
+
"@aztec/aztec.js": "0.0.1-commit.8cb2d04d8",
|
|
83
|
+
"@aztec/constants": "0.0.1-commit.8cb2d04d8",
|
|
84
|
+
"@aztec/entrypoints": "0.0.1-commit.8cb2d04d8",
|
|
85
|
+
"@aztec/ethereum": "0.0.1-commit.8cb2d04d8",
|
|
86
|
+
"@aztec/foundation": "0.0.1-commit.8cb2d04d8",
|
|
87
|
+
"@aztec/l1-artifacts": "0.0.1-commit.8cb2d04d8",
|
|
88
|
+
"@aztec/node-keystore": "0.0.1-commit.8cb2d04d8",
|
|
89
|
+
"@aztec/node-lib": "0.0.1-commit.8cb2d04d8",
|
|
90
|
+
"@aztec/p2p": "0.0.1-commit.8cb2d04d8",
|
|
91
|
+
"@aztec/protocol-contracts": "0.0.1-commit.8cb2d04d8",
|
|
92
|
+
"@aztec/sequencer-client": "0.0.1-commit.8cb2d04d8",
|
|
93
|
+
"@aztec/slasher": "0.0.1-commit.8cb2d04d8",
|
|
94
|
+
"@aztec/stdlib": "0.0.1-commit.8cb2d04d8",
|
|
95
|
+
"@aztec/wallets": "0.0.1-commit.8cb2d04d8",
|
|
96
|
+
"@aztec/world-state": "0.0.1-commit.8cb2d04d8",
|
|
97
97
|
"@ethersproject/wallet": "^5.8.0",
|
|
98
98
|
"@iarna/toml": "^2.2.5",
|
|
99
99
|
"@libp2p/peer-id-factory": "^3.0.4",
|
|
@@ -107,9 +107,9 @@
|
|
|
107
107
|
"viem": "npm:@aztec/viem@2.38.2"
|
|
108
108
|
},
|
|
109
109
|
"devDependencies": {
|
|
110
|
-
"@aztec/aztec-node": "0.0.1-commit.
|
|
111
|
-
"@aztec/kv-store": "0.0.1-commit.
|
|
112
|
-
"@aztec/telemetry-client": "0.0.1-commit.
|
|
110
|
+
"@aztec/aztec-node": "0.0.1-commit.8cb2d04d8",
|
|
111
|
+
"@aztec/kv-store": "0.0.1-commit.8cb2d04d8",
|
|
112
|
+
"@aztec/telemetry-client": "0.0.1-commit.8cb2d04d8",
|
|
113
113
|
"@jest/globals": "^30.0.0",
|
|
114
114
|
"@types/jest": "^30.0.0",
|
|
115
115
|
"@types/lodash.chunk": "^4.2.9",
|
|
@@ -126,15 +126,15 @@
|
|
|
126
126
|
"typescript": "^5.3.3"
|
|
127
127
|
},
|
|
128
128
|
"peerDependencies": {
|
|
129
|
-
"@aztec/accounts": "0.0.1-commit.
|
|
130
|
-
"@aztec/bb-prover": "0.0.1-commit.
|
|
131
|
-
"@aztec/ethereum": "0.0.1-commit.
|
|
132
|
-
"@aztec/l1-artifacts": "0.0.1-commit.
|
|
133
|
-
"@aztec/noir-contracts.js": "0.0.1-commit.
|
|
134
|
-
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.
|
|
135
|
-
"@aztec/noir-test-contracts.js": "0.0.1-commit.
|
|
136
|
-
"@aztec/protocol-contracts": "0.0.1-commit.
|
|
137
|
-
"@aztec/stdlib": "0.0.1-commit.
|
|
129
|
+
"@aztec/accounts": "0.0.1-commit.8cb2d04d8",
|
|
130
|
+
"@aztec/bb-prover": "0.0.1-commit.8cb2d04d8",
|
|
131
|
+
"@aztec/ethereum": "0.0.1-commit.8cb2d04d8",
|
|
132
|
+
"@aztec/l1-artifacts": "0.0.1-commit.8cb2d04d8",
|
|
133
|
+
"@aztec/noir-contracts.js": "0.0.1-commit.8cb2d04d8",
|
|
134
|
+
"@aztec/noir-protocol-circuits-types": "0.0.1-commit.8cb2d04d8",
|
|
135
|
+
"@aztec/noir-test-contracts.js": "0.0.1-commit.8cb2d04d8",
|
|
136
|
+
"@aztec/protocol-contracts": "0.0.1-commit.8cb2d04d8",
|
|
137
|
+
"@aztec/stdlib": "0.0.1-commit.8cb2d04d8"
|
|
138
138
|
},
|
|
139
139
|
"files": [
|
|
140
140
|
"dest",
|
|
@@ -23,7 +23,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
|
|
|
23
23
|
rewardDistributor: info.l1ContractAddresses.rewardDistributorAddress.toString(),
|
|
24
24
|
governanceProposer: info.l1ContractAddresses.governanceProposerAddress.toString(),
|
|
25
25
|
governance: info.l1ContractAddresses.governanceAddress.toString(),
|
|
26
|
-
slashFactory: info.l1ContractAddresses.slashFactoryAddress?.toString(),
|
|
27
26
|
feeAssetHandler: info.l1ContractAddresses.feeAssetHandlerAddress?.toString(),
|
|
28
27
|
stakingAssetHandler: info.l1ContractAddresses.stakingAssetHandlerAddress?.toString(),
|
|
29
28
|
},
|
|
@@ -51,7 +50,6 @@ export async function getNodeInfo(nodeUrl: string, json: boolean, log: LogFn, lo
|
|
|
51
50
|
log(` RewardDistributor Address: ${info.l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
52
51
|
log(` GovernanceProposer Address: ${info.l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
53
52
|
log(` Governance Address: ${info.l1ContractAddresses.governanceAddress.toString()}`);
|
|
54
|
-
log(` SlashFactory Address: ${info.l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
55
53
|
log(` FeeAssetHandler Address: ${info.l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
56
54
|
log(` StakingAssetHandler Address: ${info.l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
57
55
|
log(`L2 Contract Addresses:`);
|
|
@@ -96,7 +96,6 @@ export async function deployL1ContractsCmd(
|
|
|
96
96
|
log(`RewardDistributor Address: ${l1ContractAddresses.rewardDistributorAddress.toString()}`);
|
|
97
97
|
log(`GovernanceProposer Address: ${l1ContractAddresses.governanceProposerAddress.toString()}`);
|
|
98
98
|
log(`Governance Address: ${l1ContractAddresses.governanceAddress.toString()}`);
|
|
99
|
-
log(`SlashFactory Address: ${l1ContractAddresses.slashFactoryAddress?.toString()}`);
|
|
100
99
|
log(`FeeAssetHandler Address: ${l1ContractAddresses.feeAssetHandlerAddress?.toString()}`);
|
|
101
100
|
log(`StakingAssetHandler Address: ${l1ContractAddresses.stakingAssetHandlerAddress?.toString()}`);
|
|
102
101
|
log(`ZK Passport Verifier Address: ${l1ContractAddresses.zkPassportVerifierAddress?.toString()}`);
|
|
@@ -29,7 +29,7 @@ export async function deployNewRollup(
|
|
|
29
29
|
const initialFundedAccounts = initialAccounts.map(a => a.address).concat(sponsoredFPCAddress);
|
|
30
30
|
const { genesisArchiveRoot, fundingNeeded } = await getGenesisValues(initialFundedAccounts);
|
|
31
31
|
|
|
32
|
-
const { rollup
|
|
32
|
+
const { rollup } = await deployNewRollupContracts(
|
|
33
33
|
registryAddress,
|
|
34
34
|
rpcUrls,
|
|
35
35
|
privateKey,
|
|
@@ -51,7 +51,6 @@ export async function deployNewRollup(
|
|
|
51
51
|
initialFundedAccounts: initialFundedAccounts.map(a => a.toString()),
|
|
52
52
|
initialValidators: initialValidators.map(a => a.attester.toString()),
|
|
53
53
|
genesisArchiveRoot: genesisArchiveRoot.toString(),
|
|
54
|
-
slashFactoryAddress: slashFactoryAddress.toString(),
|
|
55
54
|
},
|
|
56
55
|
null,
|
|
57
56
|
2,
|
|
@@ -62,6 +61,5 @@ export async function deployNewRollup(
|
|
|
62
61
|
log(`Initial funded accounts: ${initialFundedAccounts.map(a => a.toString()).join(', ')}`);
|
|
63
62
|
log(`Initial validators: ${initialValidators.map(a => a.attester.toString()).join(', ')}`);
|
|
64
63
|
log(`Genesis archive root: ${genesisArchiveRoot.toString()}`);
|
|
65
|
-
log(`Slash Factory Address: ${slashFactoryAddress.toString()}`);
|
|
66
64
|
}
|
|
67
65
|
}
|
|
@@ -45,7 +45,9 @@ export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
// Apply generated network config from defaults.yml
|
|
48
|
-
|
|
48
|
+
// For devnet iterations (v4-devnet-1, etc.), use the base devnet config
|
|
49
|
+
const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
|
|
50
|
+
const generatedConfig = NetworkConfigs[configKey];
|
|
49
51
|
if (generatedConfig) {
|
|
50
52
|
enrichEnvironmentWithNetworkConfig(generatedConfig);
|
|
51
53
|
}
|
|
@@ -14,7 +14,7 @@ export const devnetConfig = {
|
|
|
14
14
|
AZTEC_MANA_TARGET: 100000000,
|
|
15
15
|
AZTEC_PROVING_COST_PER_MANA: 100,
|
|
16
16
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
17
|
-
|
|
17
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
18
18
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
19
19
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
20
20
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
@@ -24,10 +24,8 @@ export const devnetConfig = {
|
|
|
24
24
|
AZTEC_SLASH_AMOUNT_MEDIUM: 20000000000000000000,
|
|
25
25
|
AZTEC_SLASH_AMOUNT_LARGE: 50000000000000000000,
|
|
26
26
|
AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE: 300,
|
|
27
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
28
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
29
27
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
30
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
28
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
31
29
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
32
30
|
P2P_ENABLED: true,
|
|
33
31
|
BOOTSTRAP_NODES: '',
|
|
@@ -81,20 +79,18 @@ export const testnetConfig = {
|
|
|
81
79
|
AZTEC_EPOCH_DURATION: 32,
|
|
82
80
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
83
81
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
84
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
82
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
85
83
|
AZTEC_EXIT_DELAY_SECONDS: 172800,
|
|
86
84
|
AZTEC_INBOX_LAG: 1,
|
|
87
85
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
88
86
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
89
|
-
|
|
87
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
90
88
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
91
89
|
AZTEC_SLASHING_LIFETIME_IN_ROUNDS: 5,
|
|
92
90
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
93
91
|
AZTEC_SLASHING_DISABLE_DURATION: 432000,
|
|
94
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
95
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
96
92
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
97
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
93
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
98
94
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
99
95
|
P2P_ENABLED: true,
|
|
100
96
|
BOOTSTRAP_NODES: '',
|
|
@@ -131,18 +127,18 @@ export const testnetConfig = {
|
|
|
131
127
|
PROVER_REAL_PROOFS: true,
|
|
132
128
|
P2P_MAX_PENDING_TX_COUNT: 1000,
|
|
133
129
|
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true,
|
|
134
|
-
SLASH_PRUNE_PENALTY:
|
|
135
|
-
SLASH_DATA_WITHHOLDING_PENALTY:
|
|
136
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
137
|
-
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD:
|
|
138
|
-
SLASH_INACTIVITY_PENALTY:
|
|
139
|
-
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY:
|
|
140
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
141
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
142
|
-
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY:
|
|
143
|
-
SLASH_UNKNOWN_PENALTY:
|
|
144
|
-
SLASH_INVALID_BLOCK_PENALTY:
|
|
145
|
-
SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
130
|
+
SLASH_PRUNE_PENALTY: 10000000000000000000,
|
|
131
|
+
SLASH_DATA_WITHHOLDING_PENALTY: 10000000000000000000,
|
|
132
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.9,
|
|
133
|
+
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 1,
|
|
134
|
+
SLASH_INACTIVITY_PENALTY: 10000000000000000000,
|
|
135
|
+
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 10000000000000000000,
|
|
136
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 10000000000000000000,
|
|
137
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 10000000000000000000,
|
|
138
|
+
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 10000000000000000000,
|
|
139
|
+
SLASH_UNKNOWN_PENALTY: 10000000000000000000,
|
|
140
|
+
SLASH_INVALID_BLOCK_PENALTY: 10000000000000000000,
|
|
141
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 64,
|
|
146
142
|
ENABLE_VERSION_CHECK: true,
|
|
147
143
|
} as const;
|
|
148
144
|
|
|
@@ -151,17 +147,15 @@ export const mainnetConfig = {
|
|
|
151
147
|
AZTEC_EPOCH_DURATION: 32,
|
|
152
148
|
AZTEC_TARGET_COMMITTEE_SIZE: 48,
|
|
153
149
|
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: 2,
|
|
154
|
-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO:
|
|
150
|
+
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: 2,
|
|
155
151
|
AZTEC_INBOX_LAG: 1,
|
|
156
152
|
AZTEC_PROOF_SUBMISSION_EPOCHS: 1,
|
|
157
153
|
AZTEC_INITIAL_ETH_PER_FEE_ASSET: 10000000,
|
|
158
|
-
|
|
154
|
+
AZTEC_SLASHER_ENABLED: true,
|
|
159
155
|
AZTEC_SLASHING_ROUND_SIZE_IN_EPOCHS: 4,
|
|
160
156
|
AZTEC_SLASHING_OFFSET_IN_ROUNDS: 2,
|
|
161
|
-
SLASH_MIN_PENALTY_PERCENTAGE: 0.5,
|
|
162
|
-
SLASH_MAX_PENALTY_PERCENTAGE: 2,
|
|
163
157
|
SLASH_OFFENSE_EXPIRATION_ROUNDS: 4,
|
|
164
|
-
SLASH_MAX_PAYLOAD_SIZE:
|
|
158
|
+
SLASH_MAX_PAYLOAD_SIZE: 80,
|
|
165
159
|
SLASH_EXECUTE_ROUNDS_LOOK_BACK: 4,
|
|
166
160
|
P2P_ENABLED: true,
|
|
167
161
|
BOOTSTRAP_NODES: '',
|
|
@@ -212,15 +206,15 @@ export const mainnetConfig = {
|
|
|
212
206
|
ENABLE_VERSION_CHECK: false,
|
|
213
207
|
SLASH_PRUNE_PENALTY: 0,
|
|
214
208
|
SLASH_DATA_WITHHOLDING_PENALTY: 0,
|
|
215
|
-
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.
|
|
209
|
+
SLASH_INACTIVITY_TARGET_PERCENTAGE: 0.8,
|
|
216
210
|
SLASH_INACTIVITY_CONSECUTIVE_EPOCH_THRESHOLD: 2,
|
|
217
211
|
SLASH_INACTIVITY_PENALTY: 2E+21,
|
|
218
212
|
SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY: 2E+21,
|
|
219
|
-
SLASH_DUPLICATE_PROPOSAL_PENALTY:
|
|
220
|
-
SLASH_DUPLICATE_ATTESTATION_PENALTY:
|
|
213
|
+
SLASH_DUPLICATE_PROPOSAL_PENALTY: 2E+21,
|
|
214
|
+
SLASH_DUPLICATE_ATTESTATION_PENALTY: 2E+21,
|
|
221
215
|
SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY: 2E+21,
|
|
222
216
|
SLASH_UNKNOWN_PENALTY: 2E+21,
|
|
223
217
|
SLASH_INVALID_BLOCK_PENALTY: 2E+21,
|
|
224
|
-
SLASH_GRACE_PERIOD_L2_SLOTS:
|
|
218
|
+
SLASH_GRACE_PERIOD_L2_SLOTS: 1200,
|
|
225
219
|
} as const;
|
|
226
220
|
|
package/src/utils/aztec.ts
CHANGED
|
@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(
|
|
|
49
49
|
feeJuicePortalInitialBalance: bigint,
|
|
50
50
|
config: L1ContractsConfig,
|
|
51
51
|
realVerifier: boolean,
|
|
52
|
-
): Promise<{ rollup: RollupContract
|
|
52
|
+
): Promise<{ rollup: RollupContract }> {
|
|
53
53
|
const { deployRollupForUpgrade } = await import('@aztec/ethereum/deploy-aztec-l1-contracts');
|
|
54
54
|
const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
|
|
55
55
|
const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
|
|
@@ -80,23 +80,17 @@ export async function deployNewRollupContracts(
|
|
|
80
80
|
logger.info('Initializing new rollup with old attesters', { initialValidators });
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
-
const { rollup
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
realVerifier,
|
|
95
|
-
...config,
|
|
96
|
-
},
|
|
97
|
-
);
|
|
98
|
-
|
|
99
|
-
return { rollup, slashFactoryAddress: EthAddress.fromString(slashFactoryAddress!) };
|
|
83
|
+
const { rollup } = await deployRollupForUpgrade(privateKey as Hex, rpcUrls[0], chainId, registryAddress, {
|
|
84
|
+
vkTreeRoot: getVKTreeRoot(),
|
|
85
|
+
protocolContractsHash,
|
|
86
|
+
genesisArchiveRoot,
|
|
87
|
+
initialValidators,
|
|
88
|
+
feeJuicePortalInitialBalance,
|
|
89
|
+
realVerifier,
|
|
90
|
+
...config,
|
|
91
|
+
});
|
|
92
|
+
|
|
93
|
+
return { rollup };
|
|
100
94
|
}
|
|
101
95
|
|
|
102
96
|
/**
|