@aztec/ethereum 0.68.2 → 0.69.0-devnet

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/config.d.ts CHANGED
@@ -10,6 +10,16 @@ export type L1ContractsConfig = {
10
10
  aztecTargetCommitteeSize: number;
11
11
  /** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
12
12
  aztecEpochProofClaimWindowInL2Slots: number;
13
+ /** The minimum stake for a validator. */
14
+ minimumStake: bigint;
15
+ /** The slashing quorum */
16
+ slashingQuorum: number;
17
+ /** The slashing round size */
18
+ slashingRoundSize: number;
19
+ /** Governance proposing quorum */
20
+ governanceProposerQuorum: number;
21
+ /** Governance proposing round size */
22
+ governanceProposerRoundSize: number;
13
23
  };
14
24
  export declare const DefaultL1ContractsConfig: {
15
25
  ethereumSlotDuration: number;
@@ -17,6 +27,11 @@ export declare const DefaultL1ContractsConfig: {
17
27
  aztecEpochDuration: number;
18
28
  aztecTargetCommitteeSize: number;
19
29
  aztecEpochProofClaimWindowInL2Slots: number;
30
+ minimumStake: bigint;
31
+ slashingQuorum: number;
32
+ slashingRoundSize: number;
33
+ governanceProposerQuorum: number;
34
+ governanceProposerRoundSize: number;
20
35
  };
21
36
  export declare const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig>;
22
37
  export declare function getL1ContractsConfigEnvVars(): L1ContractsConfig;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA6C,MAAM,0BAA0B,CAAC;AAE9G,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;CAMR,CAAC;AAE9B,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CA0B3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,0BAA0B,CAAC;AAElC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,sFAAsF;IACtF,mCAAmC,EAAE,MAAM,CAAC;IAC5C,yCAAyC;IACzC,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kCAAkC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;CACrC,CAAC;AAEF,eAAO,MAAM,wBAAwB;;;;;;;;;;;CAWR,CAAC;AAE9B,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAmD3E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D"}
package/dest/config.js CHANGED
@@ -1,10 +1,15 @@
1
- import { getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
1
+ import { bigintConfigHelper, getConfigFromMappings, numberConfigHelper, } from '@aztec/foundation/config';
2
2
  export const DefaultL1ContractsConfig = {
3
3
  ethereumSlotDuration: 12,
4
4
  aztecSlotDuration: 24,
5
5
  aztecEpochDuration: 16,
6
6
  aztecTargetCommitteeSize: 48,
7
7
  aztecEpochProofClaimWindowInL2Slots: 13,
8
+ minimumStake: BigInt(100e18),
9
+ slashingQuorum: 6,
10
+ slashingRoundSize: 10,
11
+ governanceProposerQuorum: 6,
12
+ governanceProposerRoundSize: 10,
8
13
  };
9
14
  export const l1ContractsConfigMappings = {
10
15
  ethereumSlotDuration: {
@@ -32,8 +37,33 @@ export const l1ContractsConfigMappings = {
32
37
  description: 'The number of L2 slots that we can wait for a proof of an epoch to be produced.',
33
38
  ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochProofClaimWindowInL2Slots),
34
39
  },
40
+ minimumStake: {
41
+ env: 'AZTEC_MINIMUM_STAKE',
42
+ description: 'The minimum stake for a validator.',
43
+ ...bigintConfigHelper(DefaultL1ContractsConfig.minimumStake),
44
+ },
45
+ slashingQuorum: {
46
+ env: 'AZTEC_SLASHING_QUORUM',
47
+ description: 'The slashing quorum',
48
+ ...numberConfigHelper(DefaultL1ContractsConfig.slashingQuorum),
49
+ },
50
+ slashingRoundSize: {
51
+ env: 'AZTEC_SLASHING_ROUND_SIZE',
52
+ description: 'The slashing round size',
53
+ ...numberConfigHelper(DefaultL1ContractsConfig.slashingRoundSize),
54
+ },
55
+ governanceProposerQuorum: {
56
+ env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
57
+ description: 'The governance proposing quorum',
58
+ ...numberConfigHelper(DefaultL1ContractsConfig.governanceProposerQuorum),
59
+ },
60
+ governanceProposerRoundSize: {
61
+ env: 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
62
+ description: 'The governance proposing round size',
63
+ ...numberConfigHelper(DefaultL1ContractsConfig.governanceProposerRoundSize),
64
+ },
35
65
  };
36
66
  export function getL1ContractsConfigEnvVars() {
37
67
  return getConfigFromMappings(l1ContractsConfigMappings);
38
68
  }
39
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQTJCLHFCQUFxQixFQUFFLGtCQUFrQixFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFlOUcsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUc7SUFDdEMsb0JBQW9CLEVBQUUsRUFBRTtJQUN4QixpQkFBaUIsRUFBRSxFQUFFO0lBQ3JCLGtCQUFrQixFQUFFLEVBQUU7SUFDdEIsd0JBQXdCLEVBQUUsRUFBRTtJQUM1QixtQ0FBbUMsRUFBRSxFQUFFO0NBQ1osQ0FBQztBQUU5QixNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBMEM7SUFDOUUsb0JBQW9CLEVBQUU7UUFDcEIsR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUsb0NBQW9DO1FBQ2pELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsb0JBQW9CLENBQUM7S0FDckU7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSxrRkFBa0Y7UUFDL0YsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsRTtJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSxzQkFBc0I7UUFDM0IsV0FBVyxFQUFFLHNFQUFzRTtRQUNuRixHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLGtCQUFrQixDQUFDO0tBQ25FO0lBQ0Qsd0JBQXdCLEVBQUU7UUFDeEIsR0FBRyxFQUFFLDZCQUE2QjtRQUNsQyxXQUFXLEVBQUUsc0NBQXNDO1FBQ25ELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsd0JBQXdCLENBQUM7S0FDekU7SUFDRCxtQ0FBbUMsRUFBRTtRQUNuQyxHQUFHLEVBQUUsNENBQTRDO1FBQ2pELFdBQVcsRUFBRSxpRkFBaUY7UUFDOUYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxtQ0FBbUMsQ0FBQztLQUNwRjtDQUNGLENBQUM7QUFFRixNQUFNLFVBQVUsMkJBQTJCO0lBQ3pDLE9BQU8scUJBQXFCLENBQUMseUJBQXlCLENBQUMsQ0FBQztBQUMxRCxDQUFDIn0=
69
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBRUwsa0JBQWtCLEVBQ2xCLHFCQUFxQixFQUNyQixrQkFBa0IsR0FDbkIsTUFBTSwwQkFBMEIsQ0FBQztBQXlCbEMsTUFBTSxDQUFDLE1BQU0sd0JBQXdCLEdBQUc7SUFDdEMsb0JBQW9CLEVBQUUsRUFBRTtJQUN4QixpQkFBaUIsRUFBRSxFQUFFO0lBQ3JCLGtCQUFrQixFQUFFLEVBQUU7SUFDdEIsd0JBQXdCLEVBQUUsRUFBRTtJQUM1QixtQ0FBbUMsRUFBRSxFQUFFO0lBQ3ZDLFlBQVksRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDO0lBQzVCLGNBQWMsRUFBRSxDQUFDO0lBQ2pCLGlCQUFpQixFQUFFLEVBQUU7SUFDckIsd0JBQXdCLEVBQUUsQ0FBQztJQUMzQiwyQkFBMkIsRUFBRSxFQUFFO0NBQ0osQ0FBQztBQUU5QixNQUFNLENBQUMsTUFBTSx5QkFBeUIsR0FBMEM7SUFDOUUsb0JBQW9CLEVBQUU7UUFDcEIsR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUsb0NBQW9DO1FBQ2pELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsb0JBQW9CLENBQUM7S0FDckU7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUscUJBQXFCO1FBQzFCLFdBQVcsRUFBRSxrRkFBa0Y7UUFDL0YsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxpQkFBaUIsQ0FBQztLQUNsRTtJQUNELGtCQUFrQixFQUFFO1FBQ2xCLEdBQUcsRUFBRSxzQkFBc0I7UUFDM0IsV0FBVyxFQUFFLHNFQUFzRTtRQUNuRixHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLGtCQUFrQixDQUFDO0tBQ25FO0lBQ0Qsd0JBQXdCLEVBQUU7UUFDeEIsR0FBRyxFQUFFLDZCQUE2QjtRQUNsQyxXQUFXLEVBQUUsc0NBQXNDO1FBQ25ELEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsd0JBQXdCLENBQUM7S0FDekU7SUFDRCxtQ0FBbUMsRUFBRTtRQUNuQyxHQUFHLEVBQUUsNENBQTRDO1FBQ2pELFdBQVcsRUFBRSxpRkFBaUY7UUFDOUYsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQyxtQ0FBbUMsQ0FBQztLQUNwRjtJQUNELFlBQVksRUFBRTtRQUNaLEdBQUcsRUFBRSxxQkFBcUI7UUFDMUIsV0FBVyxFQUFFLG9DQUFvQztRQUNqRCxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLFlBQVksQ0FBQztLQUM3RDtJQUNELGNBQWMsRUFBRTtRQUNkLEdBQUcsRUFBRSx1QkFBdUI7UUFDNUIsV0FBVyxFQUFFLHFCQUFxQjtRQUNsQyxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLGNBQWMsQ0FBQztLQUMvRDtJQUNELGlCQUFpQixFQUFFO1FBQ2pCLEdBQUcsRUFBRSwyQkFBMkI7UUFDaEMsV0FBVyxFQUFFLHlCQUF5QjtRQUN0QyxHQUFHLGtCQUFrQixDQUFDLHdCQUF3QixDQUFDLGlCQUFpQixDQUFDO0tBQ2xFO0lBQ0Qsd0JBQXdCLEVBQUU7UUFDeEIsR0FBRyxFQUFFLGtDQUFrQztRQUN2QyxXQUFXLEVBQUUsaUNBQWlDO1FBQzlDLEdBQUcsa0JBQWtCLENBQUMsd0JBQXdCLENBQUMsd0JBQXdCLENBQUM7S0FDekU7SUFDRCwyQkFBMkIsRUFBRTtRQUMzQixHQUFHLEVBQUUsc0NBQXNDO1FBQzNDLFdBQVcsRUFBRSxxQ0FBcUM7UUFDbEQsR0FBRyxrQkFBa0IsQ0FBQyx3QkFBd0IsQ0FBQywyQkFBMkIsQ0FBQztLQUM1RTtDQUNGLENBQUM7QUFFRixNQUFNLFVBQVUsMkJBQTJCO0lBQ3pDLE9BQU8scUJBQXFCLENBQUMseUJBQXlCLENBQUMsQ0FBQztBQUMxRCxDQUFDIn0=
@@ -1,5 +1,4 @@
1
1
  import { type Hex } from 'viem';
2
2
  export declare const NULL_KEY: Hex;
3
3
  export declare const AZTEC_TEST_CHAIN_ID = 677692;
4
- export declare const MINIMUM_STAKE: bigint;
5
4
  //# sourceMappingURL=constants.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,GAA+E,CAAC;AACvG,eAAO,MAAM,mBAAmB,SAAS,CAAC;AAC1C,eAAO,MAAM,aAAa,QAAiB,CAAC"}
1
+ {"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,eAAO,MAAM,QAAQ,EAAE,GAA+E,CAAC;AACvG,eAAO,MAAM,mBAAmB,SAAS,CAAC"}
package/dest/constants.js CHANGED
@@ -1,4 +1,3 @@
1
1
  export const NULL_KEY = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`;
2
2
  export const AZTEC_TEST_CHAIN_ID = 677692;
3
- export const MINIMUM_STAKE = BigInt(100e18);
4
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQVEsS0FBSyxrRUFBa0UsRUFBRSxDQUFDO0FBQ3ZHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLE1BQU0sQ0FBQztBQUMxQyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDIn0=
3
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQVEsS0FBSyxrRUFBa0UsRUFBRSxDQUFDO0FBQ3ZHLE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLE1BQU0sQ0FBQyJ9
@@ -101,6 +101,10 @@ export interface L1ContractArtifactsForDeployment {
101
101
  * Governance contract artifacts.
102
102
  */
103
103
  governance: ContractArtifacts;
104
+ /**
105
+ * SlashFactory contract artifacts.
106
+ */
107
+ slashFactory: ContractArtifacts;
104
108
  }
105
109
  export declare const l1Artifacts: L1ContractArtifactsForDeployment;
106
110
  export interface DeployL1ContractsArgs extends L1ContractsConfig {
@@ -1 +1 @@
1
- {"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deploy_l1_contracts.d.ts","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,8 @@
1
1
  import { EthAddress } from '@aztec/foundation/eth-address';
2
- import { CoinIssuerAbi, CoinIssuerBytecode, ExtRollupLibAbi, ExtRollupLibBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, GovernanceAbi, GovernanceBytecode, GovernanceProposerAbi, GovernanceProposerBytecode, InboxAbi, InboxBytecode, LeonidasLibAbi, LeonidasLibBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RewardDistributorAbi, RewardDistributorBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, TestERC20Abi, TestERC20Bytecode, } from '@aztec/l1-artifacts';
2
+ import { CoinIssuerAbi, CoinIssuerBytecode, ExtRollupLibAbi, ExtRollupLibBytecode, FeeJuicePortalAbi, FeeJuicePortalBytecode, GovernanceAbi, GovernanceBytecode, GovernanceProposerAbi, GovernanceProposerBytecode, InboxAbi, InboxBytecode, LeonidasLibAbi, LeonidasLibBytecode, OutboxAbi, OutboxBytecode, RegistryAbi, RegistryBytecode, RewardDistributorAbi, RewardDistributorBytecode, RollupAbi, RollupBytecode, RollupLinkReferences, SlashFactoryAbi, SlashFactoryBytecode, TestERC20Abi, TestERC20Bytecode, } from '@aztec/l1-artifacts';
3
3
  import { concatHex, createPublicClient, createWalletClient, encodeDeployData, getAddress, getContract, getContractAddress, http, numberToHex, padHex, } from 'viem';
4
4
  import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
5
5
  import { foundry } from 'viem/chains';
6
- import { MINIMUM_STAKE } from './constants.js';
7
6
  import { isAnvilTestChain } from './ethereum_chain.js';
8
7
  import { L1TxUtils } from './l1_tx_utils.js';
9
8
  export const l1Artifacts = {
@@ -64,6 +63,10 @@ export const l1Artifacts = {
64
63
  contractAbi: GovernanceAbi,
65
64
  contractBytecode: GovernanceBytecode,
66
65
  },
66
+ slashFactory: {
67
+ contractAbi: SlashFactoryAbi,
68
+ contractBytecode: SlashFactoryBytecode,
69
+ },
67
70
  };
68
71
  /**
69
72
  * Creates a wallet and a public viem client for interacting with L1.
@@ -138,14 +141,10 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
138
141
  account.address.toString(),
139
142
  ]);
140
143
  logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
141
- // @todo #8084
142
- // @note These numbers are just chosen to make testing simple.
143
- const quorumSize = 6n;
144
- const roundSize = 10n;
145
144
  const governanceProposerAddress = await govDeployer.deploy(l1Artifacts.governanceProposer, [
146
145
  registryAddress.toString(),
147
- quorumSize,
148
- roundSize,
146
+ args.governanceProposerQuorum,
147
+ args.governanceProposerRoundSize,
149
148
  ]);
150
149
  logger.verbose(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
151
150
  // @note @LHerskind the assets are expected to be the same at some point, but for better
@@ -182,7 +181,9 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
182
181
  aztecEpochDuration: args.aztecEpochDuration,
183
182
  targetCommitteeSize: args.aztecTargetCommitteeSize,
184
183
  aztecEpochProofClaimWindowInL2Slots: args.aztecEpochProofClaimWindowInL2Slots,
185
- minimumStake: MINIMUM_STAKE,
184
+ minimumStake: args.minimumStake,
185
+ slashingQuorum: args.slashingQuorum,
186
+ slashingRoundSize: args.slashingRoundSize,
186
187
  };
187
188
  const rollupArgs = [
188
189
  feeJuicePortalAddress.toString(),
@@ -195,6 +196,8 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
195
196
  ];
196
197
  const rollupAddress = await deployer.deploy(l1Artifacts.rollup, rollupArgs);
197
198
  logger.verbose(`Deployed Rollup at ${rollupAddress}`, rollupConfigArgs);
199
+ const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [rollupAddress.toString()]);
200
+ logger.info(`Deployed SlashFactory at ${slashFactoryAddress}`);
198
201
  await deployer.waitForDeployments();
199
202
  logger.verbose(`All core contracts have been deployed`);
200
203
  const feeJuicePortal = getContract({
@@ -226,7 +229,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
226
229
  }
227
230
  if (args.initialValidators && args.initialValidators.length > 0) {
228
231
  // Mint tokens, approve them, use cheat code to initialise validator set without setting up the epoch.
229
- const stakeNeeded = MINIMUM_STAKE * BigInt(args.initialValidators.length);
232
+ const stakeNeeded = args.minimumStake * BigInt(args.initialValidators.length);
230
233
  await Promise.all([
231
234
  await stakingAsset.write.mint([walletClient.account.address, stakeNeeded], {}),
232
235
  await stakingAsset.write.approve([rollupAddress.toString(), stakeNeeded], {}),
@@ -236,7 +239,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
236
239
  attester: v.toString(),
237
240
  proposer: v.toString(),
238
241
  withdrawer: v.toString(),
239
- amount: MINIMUM_STAKE,
242
+ amount: args.minimumStake,
240
243
  })),
241
244
  ]);
242
245
  txHashes.push(initiateValidatorSetTxHash);
@@ -329,6 +332,7 @@ export const deployL1Contracts = async (rpcUrl, account, chain, logger, args) =>
329
332
  rewardDistributorAddress,
330
333
  governanceProposerAddress,
331
334
  governanceAddress,
335
+ slashFactoryAddress,
332
336
  };
333
337
  logger.info(`Aztec L1 contracts initialized`, l1Contracts);
334
338
  return {
@@ -476,4 +480,4 @@ export async function deployL1Contract(walletClient, publicClient, abi, bytecode
476
480
  return { address: EthAddress.fromString(resultingAddress), txHash };
477
481
  }
478
482
  // docs:end:deployL1Contract
479
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
483
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"deploy_l1_contracts.js","sourceRoot":"","sources":["../src/deploy_l1_contracts.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ import { z } from 'zod';
6
6
  * NOTE: When changing this list, make sure to update CLI & CI scripts accordingly.
7
7
  * For reference: https://github.com/AztecProtocol/aztec-packages/pull/5553
8
8
  */
9
- export declare const L1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress", "coinIssuerAddress", "rewardDistributorAddress", "governanceProposerAddress", "governanceAddress", "stakingAssetAddress"];
9
+ export declare const L1ContractsNames: readonly ["rollupAddress", "registryAddress", "inboxAddress", "outboxAddress", "feeJuiceAddress", "feeJuicePortalAddress", "coinIssuerAddress", "rewardDistributorAddress", "governanceProposerAddress", "governanceAddress", "stakingAssetAddress", "slashFactoryAddress"];
10
10
  /** Provides the directory of current L1 contract addresses */
11
11
  export type L1ContractAddresses = {
12
12
  [K in (typeof L1ContractsNames)[number]]: EthAddress;
@@ -23,6 +23,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
23
23
  rewardDistributorAddress: z.ZodType<EthAddress, any, string>;
24
24
  governanceProposerAddress: z.ZodType<EthAddress, any, string>;
25
25
  governanceAddress: z.ZodType<EthAddress, any, string>;
26
+ slashFactoryAddress: z.ZodType<EthAddress, any, string>;
26
27
  }, "strip", z.ZodTypeAny, {
27
28
  rollupAddress: EthAddress;
28
29
  registryAddress: EthAddress;
@@ -35,6 +36,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
35
36
  governanceProposerAddress: EthAddress;
36
37
  governanceAddress: EthAddress;
37
38
  stakingAssetAddress: EthAddress;
39
+ slashFactoryAddress: EthAddress;
38
40
  }, {
39
41
  rollupAddress: string;
40
42
  registryAddress: string;
@@ -47,6 +49,7 @@ export declare const L1ContractAddressesSchema: z.ZodObject<{
47
49
  governanceProposerAddress: string;
48
50
  governanceAddress: string;
49
51
  stakingAssetAddress: string;
52
+ slashFactoryAddress: string;
50
53
  }>;
51
54
  export declare const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>;
52
55
  //# sourceMappingURL=l1_contract_addresses.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,sPAYnB,CAAC;AAEX,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYE,CAAC;AAIzC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CAwD9E,CAAC"}
1
+ {"version":3,"file":"l1_contract_addresses.d.ts","sourceRoot":"","sources":["../src/l1_contract_addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAG3D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,6QAanB,CAAC;AAEX,8DAA8D;AAC9D,MAAM,MAAM,mBAAmB,GAAG;KAC/B,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,GAAG,UAAU;CACrD,CAAC;AAEF,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAaE,CAAC;AAIzC,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,mBAAmB,CA6D9E,CAAC"}
@@ -18,6 +18,7 @@ export const L1ContractsNames = [
18
18
  'governanceProposerAddress',
19
19
  'governanceAddress',
20
20
  'stakingAssetAddress',
21
+ 'slashFactoryAddress',
21
22
  ];
22
23
  export const L1ContractAddressesSchema = z.object({
23
24
  rollupAddress: schemas.EthAddress,
@@ -31,6 +32,7 @@ export const L1ContractAddressesSchema = z.object({
31
32
  rewardDistributorAddress: schemas.EthAddress,
32
33
  governanceProposerAddress: schemas.EthAddress,
33
34
  governanceAddress: schemas.EthAddress,
35
+ slashFactoryAddress: schemas.EthAddress,
34
36
  });
35
37
  const parseEnv = (val) => EthAddress.fromString(val);
36
38
  export const l1ContractAddressesMapping = {
@@ -89,5 +91,10 @@ export const l1ContractAddressesMapping = {
89
91
  description: 'The deployed L1 governance contract address',
90
92
  parseEnv,
91
93
  },
94
+ slashFactoryAddress: {
95
+ env: 'SLASH_FACTORY_CONTRACT_ADDRESS',
96
+ description: 'The deployed L1 slashFactory contract address',
97
+ parseEnv,
98
+ },
92
99
  };
93
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFlLE9BQU8sRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHO0lBQzlCLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsY0FBYztJQUNkLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsdUJBQXVCO0lBQ3ZCLG1CQUFtQjtJQUNuQiwwQkFBMEI7SUFDMUIsMkJBQTJCO0lBQzNCLG1CQUFtQjtJQUNuQixxQkFBcUI7Q0FDYixDQUFDO0FBT1gsTUFBTSxDQUFDLE1BQU0seUJBQXlCLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNoRCxhQUFhLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDakMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ25DLFlBQVksRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNoQyxhQUFhLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDakMsZUFBZSxFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ25DLG1CQUFtQixFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ3ZDLHFCQUFxQixFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ3pDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ3JDLHdCQUF3QixFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQzVDLHlCQUF5QixFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQzdDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxVQUFVO0NBQ3RDLENBQXVDLENBQUM7QUFFekMsTUFBTSxRQUFRLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUM7QUFFN0QsTUFBTSxDQUFDLE1BQU0sMEJBQTBCLEdBQTRDO0lBQ2pGLGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsMkJBQTJCO1FBQ2hDLFdBQVcsRUFBRSw0Q0FBNEM7UUFDekQsUUFBUTtLQUNUO0lBQ0QsWUFBWSxFQUFFO1FBQ1osR0FBRyxFQUFFLHdCQUF3QjtRQUM3QixXQUFXLEVBQUUseUNBQXlDO1FBQ3RELFFBQVE7S0FDVDtJQUNELGFBQWEsRUFBRTtRQUNiLEdBQUcsRUFBRSx5QkFBeUI7UUFDOUIsV0FBVyxFQUFFLDBDQUEwQztRQUN2RCxRQUFRO0tBQ1Q7SUFDRCxlQUFlLEVBQUU7UUFDZixHQUFHLEVBQUUsNEJBQTRCO1FBQ2pDLFdBQVcsRUFBRSw2Q0FBNkM7UUFDMUQsUUFBUTtLQUNUO0lBQ0QsbUJBQW1CLEVBQUU7UUFDbkIsR0FBRyxFQUFFLGdDQUFnQztRQUNyQyxXQUFXLEVBQUUsaURBQWlEO1FBQzlELFFBQVE7S0FDVDtJQUNELHFCQUFxQixFQUFFO1FBQ3JCLEdBQUcsRUFBRSxtQ0FBbUM7UUFDeEMsV0FBVyxFQUFFLG9EQUFvRDtRQUNqRSxRQUFRO0tBQ1Q7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsOEJBQThCO1FBQ25DLFdBQVcsRUFBRSw2Q0FBNkM7UUFDMUQsUUFBUTtLQUNUO0lBQ0Qsd0JBQXdCLEVBQUU7UUFDeEIsR0FBRyxFQUFFLHFDQUFxQztRQUMxQyxXQUFXLEVBQUUsb0RBQW9EO1FBQ2pFLFFBQVE7S0FDVDtJQUNELHlCQUF5QixFQUFFO1FBQ3pCLEdBQUcsRUFBRSxzQ0FBc0M7UUFDM0MsV0FBVyxFQUFFLHFEQUFxRDtRQUNsRSxRQUFRO0tBQ1Q7SUFDRCxpQkFBaUIsRUFBRTtRQUNqQixHQUFHLEVBQUUsNkJBQTZCO1FBQ2xDLFdBQVcsRUFBRSw2Q0FBNkM7UUFDMUQsUUFBUTtLQUNUO0NBQ0YsQ0FBQyJ9
100
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfY29udHJhY3RfYWRkcmVzc2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2wxX2NvbnRyYWN0X2FkZHJlc3Nlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFDM0QsT0FBTyxFQUFlLE9BQU8sRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRWpFLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxLQUFLLENBQUM7QUFFeEI7Ozs7R0FJRztBQUNILE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHO0lBQzlCLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsY0FBYztJQUNkLGVBQWU7SUFDZixpQkFBaUI7SUFDakIsdUJBQXVCO0lBQ3ZCLG1CQUFtQjtJQUNuQiwwQkFBMEI7SUFDMUIsMkJBQTJCO0lBQzNCLG1CQUFtQjtJQUNuQixxQkFBcUI7SUFDckIscUJBQXFCO0NBQ2IsQ0FBQztBQU9YLE1BQU0sQ0FBQyxNQUFNLHlCQUF5QixHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUM7SUFDaEQsYUFBYSxFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ2pDLGVBQWUsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNuQyxZQUFZLEVBQUUsT0FBTyxDQUFDLFVBQVU7SUFDaEMsYUFBYSxFQUFFLE9BQU8sQ0FBQyxVQUFVO0lBQ2pDLGVBQWUsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNuQyxtQkFBbUIsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUN2QyxxQkFBcUIsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUN6QyxpQkFBaUIsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNyQyx3QkFBd0IsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUM1Qyx5QkFBeUIsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUM3QyxpQkFBaUIsRUFBRSxPQUFPLENBQUMsVUFBVTtJQUNyQyxtQkFBbUIsRUFBRSxPQUFPLENBQUMsVUFBVTtDQUN4QyxDQUF1QyxDQUFDO0FBRXpDLE1BQU0sUUFBUSxHQUFHLENBQUMsR0FBVyxFQUFFLEVBQUUsQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0FBRTdELE1BQU0sQ0FBQyxNQUFNLDBCQUEwQixHQUE0QztJQUNqRixhQUFhLEVBQUU7UUFDYixHQUFHLEVBQUUseUJBQXlCO1FBQzlCLFdBQVcsRUFBRSwwQ0FBMEM7UUFDdkQsUUFBUTtLQUNUO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLDJCQUEyQjtRQUNoQyxXQUFXLEVBQUUsNENBQTRDO1FBQ3pELFFBQVE7S0FDVDtJQUNELFlBQVksRUFBRTtRQUNaLEdBQUcsRUFBRSx3QkFBd0I7UUFDN0IsV0FBVyxFQUFFLHlDQUF5QztRQUN0RCxRQUFRO0tBQ1Q7SUFDRCxhQUFhLEVBQUU7UUFDYixHQUFHLEVBQUUseUJBQXlCO1FBQzlCLFdBQVcsRUFBRSwwQ0FBMEM7UUFDdkQsUUFBUTtLQUNUO0lBQ0QsZUFBZSxFQUFFO1FBQ2YsR0FBRyxFQUFFLDRCQUE0QjtRQUNqQyxXQUFXLEVBQUUsNkNBQTZDO1FBQzFELFFBQVE7S0FDVDtJQUNELG1CQUFtQixFQUFFO1FBQ25CLEdBQUcsRUFBRSxnQ0FBZ0M7UUFDckMsV0FBVyxFQUFFLGlEQUFpRDtRQUM5RCxRQUFRO0tBQ1Q7SUFDRCxxQkFBcUIsRUFBRTtRQUNyQixHQUFHLEVBQUUsbUNBQW1DO1FBQ3hDLFdBQVcsRUFBRSxvREFBb0Q7UUFDakUsUUFBUTtLQUNUO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLDhCQUE4QjtRQUNuQyxXQUFXLEVBQUUsNkNBQTZDO1FBQzFELFFBQVE7S0FDVDtJQUNELHdCQUF3QixFQUFFO1FBQ3hCLEdBQUcsRUFBRSxxQ0FBcUM7UUFDMUMsV0FBVyxFQUFFLG9EQUFvRDtRQUNqRSxRQUFRO0tBQ1Q7SUFDRCx5QkFBeUIsRUFBRTtRQUN6QixHQUFHLEVBQUUsc0NBQXNDO1FBQzNDLFdBQVcsRUFBRSxxREFBcUQ7UUFDbEUsUUFBUTtLQUNUO0lBQ0QsaUJBQWlCLEVBQUU7UUFDakIsR0FBRyxFQUFFLDZCQUE2QjtRQUNsQyxXQUFXLEVBQUUsNkNBQTZDO1FBQzFELFFBQVE7S0FDVDtJQUNELG1CQUFtQixFQUFFO1FBQ25CLEdBQUcsRUFBRSxnQ0FBZ0M7UUFDckMsV0FBVyxFQUFFLCtDQUErQztRQUM1RCxRQUFRO0tBQ1Q7Q0FDRixDQUFDIn0=
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "0.68.2",
3
+ "version": "0.69.0-devnet",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -29,8 +29,8 @@
29
29
  "../package.common.json"
30
30
  ],
31
31
  "dependencies": {
32
- "@aztec/foundation": "0.68.2",
33
- "@aztec/l1-artifacts": "0.68.2",
32
+ "@aztec/foundation": "0.69.0-devnet",
33
+ "@aztec/l1-artifacts": "0.69.0-devnet",
34
34
  "@viem/anvil": "^0.0.10",
35
35
  "dotenv": "^16.0.3",
36
36
  "get-port": "^7.1.0",
@@ -80,12 +80,7 @@
80
80
  ".ts"
81
81
  ],
82
82
  "reporters": [
83
- [
84
- "jest-silent-reporter",
85
- {
86
- "useDots": true
87
- }
88
- ]
83
+ "default"
89
84
  ],
90
85
  "testTimeout": 30000,
91
86
  "setupFiles": [
package/src/config.ts CHANGED
@@ -1,4 +1,9 @@
1
- import { type ConfigMappingsType, getConfigFromMappings, numberConfigHelper } from '@aztec/foundation/config';
1
+ import {
2
+ type ConfigMappingsType,
3
+ bigintConfigHelper,
4
+ getConfigFromMappings,
5
+ numberConfigHelper,
6
+ } from '@aztec/foundation/config';
2
7
 
3
8
  export type L1ContractsConfig = {
4
9
  /** How many seconds an L1 slot lasts. */
@@ -11,6 +16,16 @@ export type L1ContractsConfig = {
11
16
  aztecTargetCommitteeSize: number;
12
17
  /** The number of L2 slots that we can wait for a proof of an epoch to be produced. */
13
18
  aztecEpochProofClaimWindowInL2Slots: number;
19
+ /** The minimum stake for a validator. */
20
+ minimumStake: bigint;
21
+ /** The slashing quorum */
22
+ slashingQuorum: number;
23
+ /** The slashing round size */
24
+ slashingRoundSize: number;
25
+ /** Governance proposing quorum */
26
+ governanceProposerQuorum: number;
27
+ /** Governance proposing round size */
28
+ governanceProposerRoundSize: number;
14
29
  };
15
30
 
16
31
  export const DefaultL1ContractsConfig = {
@@ -19,6 +34,11 @@ export const DefaultL1ContractsConfig = {
19
34
  aztecEpochDuration: 16,
20
35
  aztecTargetCommitteeSize: 48,
21
36
  aztecEpochProofClaimWindowInL2Slots: 13,
37
+ minimumStake: BigInt(100e18),
38
+ slashingQuorum: 6,
39
+ slashingRoundSize: 10,
40
+ governanceProposerQuorum: 6,
41
+ governanceProposerRoundSize: 10,
22
42
  } satisfies L1ContractsConfig;
23
43
 
24
44
  export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> = {
@@ -47,6 +67,31 @@ export const l1ContractsConfigMappings: ConfigMappingsType<L1ContractsConfig> =
47
67
  description: 'The number of L2 slots that we can wait for a proof of an epoch to be produced.',
48
68
  ...numberConfigHelper(DefaultL1ContractsConfig.aztecEpochProofClaimWindowInL2Slots),
49
69
  },
70
+ minimumStake: {
71
+ env: 'AZTEC_MINIMUM_STAKE',
72
+ description: 'The minimum stake for a validator.',
73
+ ...bigintConfigHelper(DefaultL1ContractsConfig.minimumStake),
74
+ },
75
+ slashingQuorum: {
76
+ env: 'AZTEC_SLASHING_QUORUM',
77
+ description: 'The slashing quorum',
78
+ ...numberConfigHelper(DefaultL1ContractsConfig.slashingQuorum),
79
+ },
80
+ slashingRoundSize: {
81
+ env: 'AZTEC_SLASHING_ROUND_SIZE',
82
+ description: 'The slashing round size',
83
+ ...numberConfigHelper(DefaultL1ContractsConfig.slashingRoundSize),
84
+ },
85
+ governanceProposerQuorum: {
86
+ env: 'AZTEC_GOVERNANCE_PROPOSER_QUORUM',
87
+ description: 'The governance proposing quorum',
88
+ ...numberConfigHelper(DefaultL1ContractsConfig.governanceProposerQuorum),
89
+ },
90
+ governanceProposerRoundSize: {
91
+ env: 'AZTEC_GOVERNANCE_PROPOSER_ROUND_SIZE',
92
+ description: 'The governance proposing round size',
93
+ ...numberConfigHelper(DefaultL1ContractsConfig.governanceProposerRoundSize),
94
+ },
50
95
  };
51
96
 
52
97
  export function getL1ContractsConfigEnvVars(): L1ContractsConfig {
package/src/constants.ts CHANGED
@@ -2,4 +2,3 @@ import { type Hex } from 'viem';
2
2
 
3
3
  export const NULL_KEY: Hex = `0x${'0000000000000000000000000000000000000000000000000000000000000000'}`;
4
4
  export const AZTEC_TEST_CHAIN_ID = 677692;
5
- export const MINIMUM_STAKE = BigInt(100e18);
@@ -26,6 +26,8 @@ import {
26
26
  RollupAbi,
27
27
  RollupBytecode,
28
28
  RollupLinkReferences,
29
+ SlashFactoryAbi,
30
+ SlashFactoryBytecode,
29
31
  TestERC20Abi,
30
32
  TestERC20Bytecode,
31
33
  } from '@aztec/l1-artifacts';
@@ -53,7 +55,6 @@ import { type HDAccount, type PrivateKeyAccount, mnemonicToAccount, privateKeyTo
53
55
  import { foundry } from 'viem/chains';
54
56
 
55
57
  import { type L1ContractsConfig } from './config.js';
56
- import { MINIMUM_STAKE } from './constants.js';
57
58
  import { isAnvilTestChain } from './ethereum_chain.js';
58
59
  import { type L1ContractAddresses } from './l1_contract_addresses.js';
59
60
  import { L1TxUtils } from './l1_tx_utils.js';
@@ -156,6 +157,10 @@ export interface L1ContractArtifactsForDeployment {
156
157
  * Governance contract artifacts.
157
158
  */
158
159
  governance: ContractArtifacts;
160
+ /**
161
+ * SlashFactory contract artifacts.
162
+ */
163
+ slashFactory: ContractArtifacts;
159
164
  }
160
165
 
161
166
  export const l1Artifacts: L1ContractArtifactsForDeployment = {
@@ -216,6 +221,10 @@ export const l1Artifacts: L1ContractArtifactsForDeployment = {
216
221
  contractAbi: GovernanceAbi,
217
222
  contractBytecode: GovernanceBytecode,
218
223
  },
224
+ slashFactory: {
225
+ contractAbi: SlashFactoryAbi,
226
+ contractBytecode: SlashFactoryBytecode,
227
+ },
219
228
  };
220
229
 
221
230
  export interface DeployL1ContractsArgs extends L1ContractsConfig {
@@ -331,14 +340,10 @@ export const deployL1Contracts = async (
331
340
  ]);
332
341
  logger.verbose(`Deployed Staking Asset at ${stakingAssetAddress}`);
333
342
 
334
- // @todo #8084
335
- // @note These numbers are just chosen to make testing simple.
336
- const quorumSize = 6n;
337
- const roundSize = 10n;
338
343
  const governanceProposerAddress = await govDeployer.deploy(l1Artifacts.governanceProposer, [
339
344
  registryAddress.toString(),
340
- quorumSize,
341
- roundSize,
345
+ args.governanceProposerQuorum,
346
+ args.governanceProposerRoundSize,
342
347
  ]);
343
348
  logger.verbose(`Deployed GovernanceProposer at ${governanceProposerAddress}`);
344
349
 
@@ -382,7 +387,9 @@ export const deployL1Contracts = async (
382
387
  aztecEpochDuration: args.aztecEpochDuration,
383
388
  targetCommitteeSize: args.aztecTargetCommitteeSize,
384
389
  aztecEpochProofClaimWindowInL2Slots: args.aztecEpochProofClaimWindowInL2Slots,
385
- minimumStake: MINIMUM_STAKE,
390
+ minimumStake: args.minimumStake,
391
+ slashingQuorum: args.slashingQuorum,
392
+ slashingRoundSize: args.slashingRoundSize,
386
393
  };
387
394
  const rollupArgs = [
388
395
  feeJuicePortalAddress.toString(),
@@ -396,6 +403,9 @@ export const deployL1Contracts = async (
396
403
  const rollupAddress = await deployer.deploy(l1Artifacts.rollup, rollupArgs);
397
404
  logger.verbose(`Deployed Rollup at ${rollupAddress}`, rollupConfigArgs);
398
405
 
406
+ const slashFactoryAddress = await deployer.deploy(l1Artifacts.slashFactory, [rollupAddress.toString()]);
407
+ logger.info(`Deployed SlashFactory at ${slashFactoryAddress}`);
408
+
399
409
  await deployer.waitForDeployments();
400
410
  logger.verbose(`All core contracts have been deployed`);
401
411
 
@@ -434,7 +444,7 @@ export const deployL1Contracts = async (
434
444
 
435
445
  if (args.initialValidators && args.initialValidators.length > 0) {
436
446
  // Mint tokens, approve them, use cheat code to initialise validator set without setting up the epoch.
437
- const stakeNeeded = MINIMUM_STAKE * BigInt(args.initialValidators.length);
447
+ const stakeNeeded = args.minimumStake * BigInt(args.initialValidators.length);
438
448
  await Promise.all(
439
449
  [
440
450
  await stakingAsset.write.mint([walletClient.account.address, stakeNeeded], {} as any),
@@ -447,7 +457,7 @@ export const deployL1Contracts = async (
447
457
  attester: v.toString(),
448
458
  proposer: v.toString(),
449
459
  withdrawer: v.toString(),
450
- amount: MINIMUM_STAKE,
460
+ amount: args.minimumStake,
451
461
  })),
452
462
  ]);
453
463
  txHashes.push(initiateValidatorSetTxHash);
@@ -560,6 +570,7 @@ export const deployL1Contracts = async (
560
570
  rewardDistributorAddress,
561
571
  governanceProposerAddress,
562
572
  governanceAddress,
573
+ slashFactoryAddress,
563
574
  };
564
575
 
565
576
  logger.info(`Aztec L1 contracts initialized`, l1Contracts);
@@ -21,6 +21,7 @@ export const L1ContractsNames = [
21
21
  'governanceProposerAddress',
22
22
  'governanceAddress',
23
23
  'stakingAssetAddress',
24
+ 'slashFactoryAddress',
24
25
  ] as const;
25
26
 
26
27
  /** Provides the directory of current L1 contract addresses */
@@ -40,6 +41,7 @@ export const L1ContractAddressesSchema = z.object({
40
41
  rewardDistributorAddress: schemas.EthAddress,
41
42
  governanceProposerAddress: schemas.EthAddress,
42
43
  governanceAddress: schemas.EthAddress,
44
+ slashFactoryAddress: schemas.EthAddress,
43
45
  }) satisfies ZodFor<L1ContractAddresses>;
44
46
 
45
47
  const parseEnv = (val: string) => EthAddress.fromString(val);
@@ -100,4 +102,9 @@ export const l1ContractAddressesMapping: ConfigMappingsType<L1ContractAddresses>
100
102
  description: 'The deployed L1 governance contract address',
101
103
  parseEnv,
102
104
  },
105
+ slashFactoryAddress: {
106
+ env: 'SLASH_FACTORY_CONTRACT_ADDRESS',
107
+ description: 'The deployed L1 slashFactory contract address',
108
+ parseEnv,
109
+ },
103
110
  };