@aztec/cli 2.0.0-rc.21 → 2.0.0-rc.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dest/config/chain_l2_config.d.ts.map +1 -1
  2. package/dest/config/chain_l2_config.js +30 -68
  3. package/package.json +23 -23
  4. package/src/config/chain_l2_config.ts +37 -80
package/dest/config/chain_l2_config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAOrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEJ,eAAO,MAAM,4BAA4B,EAAE,aAwD1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aA4ExC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA4ElC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkBpC;AAuBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAyF/E"}
1
+ {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnF,OAAO,KAAK,EAAU,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAOrE,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAC3C,IAAI,CAAC,aAAa,EAAE,sBAAsB,GAAG,uBAAuB,CAAC,GAAG;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IAGpC,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAoCJ,eAAO,MAAM,4BAA4B,EAAE,aAqC1C,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,aA+CxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,aA+ClC,CAAC;AAIF,wBAAsB,YAAY,CAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,CAAC,EAAE,MAAM,gBAgC9E;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,YAAY,EACzB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAkBpC;AAuBD,wBAAsB,gCAAgC,CAAC,WAAW,EAAE,YAAY,iBAyF/E"}
package/dest/config/chain_l2_config.js CHANGED
@@ -5,6 +5,32 @@ import path, { dirname, join } from 'path';
5
5
  import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with {
6
6
  type: 'json'
7
7
  };
8
+ const DefaultSlashConfig = {
9
+ /** Tally-style slashing */ slasherFlavor: 'tally',
10
+ /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
11
+ /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
12
+ /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
13
+ /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
14
+ /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
15
+ slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
16
+ slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
17
+ // Slashing stuff
18
+ slashMinPenaltyPercentage: 0.5,
19
+ slashMaxPenaltyPercentage: 2.0,
20
+ slashInactivityTargetPercentage: 0.7,
21
+ slashInactivityConsecutiveEpochThreshold: 1,
22
+ slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
23
+ slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
24
+ slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
25
+ slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
26
+ slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
27
+ slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
28
+ slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
29
+ slashMaxPayloadSize: 50,
30
+ slashGracePeriodL2Slots: 32 * 2,
31
+ slashOffenseExpirationRounds: 8,
32
+ sentinelEnabled: true
33
+ };
8
34
  export const stagingIgnitionL2ChainConfig = {
9
35
  l1ChainId: 11155111,
10
36
  testAccounts: true,
@@ -27,32 +53,14 @@ export const stagingIgnitionL2ChainConfig = {
27
53
  'sequencer'
28
54
  ],
29
55
  ...DefaultL1ContractsConfig,
56
+ ...DefaultSlashConfig,
30
57
  /** How many seconds an L1 slot lasts. */ ethereumSlotDuration: 12,
31
58
  /** How many seconds an L2 slots lasts (must be multiple of ethereum slot duration). */ aztecSlotDuration: 36,
32
59
  /** How many L2 slots an epoch lasts. */ aztecEpochDuration: 32,
33
60
  /** The target validator committee size. */ aztecTargetCommitteeSize: 48,
34
61
  /** The number of epochs after an epoch ends that proofs are still accepted. */ aztecProofSubmissionEpochs: 1,
35
62
  /** The mana target for the rollup */ manaTarget: 0n,
36
- /** The proving cost per mana */ provingCostPerMana: 0n,
37
- slasherFlavor: 'none',
38
- slashAmountSmall: 0n,
39
- slashAmountMedium: 0n,
40
- slashAmountLarge: 0n,
41
- slashMinPenaltyPercentage: 0.5,
42
- slashMaxPenaltyPercentage: 200,
43
- slashInactivityTargetPercentage: 0,
44
- slashInactivityConsecutiveEpochThreshold: 1,
45
- slashInactivityPenalty: 0n,
46
- slashPrunePenalty: 0n,
47
- slashDataWithholdingPenalty: 0n,
48
- slashProposeInvalidAttestationsPenalty: 0n,
49
- slashAttestDescendantOfInvalidPenalty: 0n,
50
- slashBroadcastedInvalidBlockPenalty: 0n,
51
- slashMaxPayloadSize: 50,
52
- slashGracePeriodL2Slots: 0,
53
- slashUnknownPenalty: 0n,
54
- slashOffenseExpirationRounds: 10,
55
- sentinelEnabled: false
63
+ /** The proving cost per mana */ provingCostPerMana: 0n
56
64
  };
57
65
  export const stagingPublicL2ChainConfig = {
58
66
  l1ChainId: 11155111,
@@ -88,30 +96,7 @@ export const stagingPublicL2ChainConfig = {
88
96
  /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
89
97
  /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
90
98
  /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
91
- /** Tally-style slashing */ slasherFlavor: 'tally',
92
- /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
93
- /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
94
- /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
95
- /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
96
- /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
97
- slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
98
- slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
99
- // Slashing stuff
100
- slashMinPenaltyPercentage: 0.5,
101
- slashMaxPenaltyPercentage: 2.0,
102
- slashInactivityTargetPercentage: 0.7,
103
- slashInactivityConsecutiveEpochThreshold: 1,
104
- slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
105
- slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
106
- slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
107
- slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
108
- slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
109
- slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
110
- slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
111
- slashMaxPayloadSize: 50,
112
- slashGracePeriodL2Slots: 32 * 2,
113
- slashOffenseExpirationRounds: 8,
114
- sentinelEnabled: true
99
+ ...DefaultSlashConfig
115
100
  };
116
101
  export const testnetL2ChainConfig = {
117
102
  l1ChainId: 11155111,
@@ -147,30 +132,7 @@ export const testnetL2ChainConfig = {
147
132
  /** The mana target for the rollup */ manaTarget: DefaultL1ContractsConfig.manaTarget,
148
133
  /** The proving cost per mana */ provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
149
134
  /** Exit delay for stakers */ exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
150
- /** Tally-style slashing */ slasherFlavor: 'tally',
151
- /** Allow one round for vetoing */ slashingExecutionDelayInRounds: 1,
152
- /** How long for a slash payload to be executed */ slashingLifetimeInRounds: 5,
153
- /** Allow 2 rounds to discover faults */ slashingOffsetInRounds: 2,
154
- /** No slash vetoer */ slashingVetoer: EthAddress.ZERO,
155
- /** Use default slash amounts */ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
156
- slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
157
- slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
158
- // Slashing stuff
159
- slashMinPenaltyPercentage: 0.5,
160
- slashMaxPenaltyPercentage: 2.0,
161
- slashInactivityTargetPercentage: 0.7,
162
- slashInactivityConsecutiveEpochThreshold: 1,
163
- slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
164
- slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
165
- slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
166
- slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
167
- slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
168
- slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
169
- slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
170
- slashMaxPayloadSize: 50,
171
- slashGracePeriodL2Slots: 32 * 2,
172
- slashOffenseExpirationRounds: 8,
173
- sentinelEnabled: true
135
+ ...DefaultSlashConfig
174
136
  };
175
137
  const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;
176
138
  export async function getBootnodes(networkName, cacheDir) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "2.0.0-rc.21",
3
+ "version": "2.0.0-rc.23",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,17 +70,17 @@
70
70
  ]
71
71
  },
72
72
  "dependencies": {
73
- "@aztec/archiver": "2.0.0-rc.21",
74
- "@aztec/aztec.js": "2.0.0-rc.21",
75
- "@aztec/constants": "2.0.0-rc.21",
76
- "@aztec/entrypoints": "2.0.0-rc.21",
77
- "@aztec/ethereum": "2.0.0-rc.21",
78
- "@aztec/foundation": "2.0.0-rc.21",
79
- "@aztec/l1-artifacts": "2.0.0-rc.21",
80
- "@aztec/node-lib": "2.0.0-rc.21",
81
- "@aztec/p2p": "2.0.0-rc.21",
82
- "@aztec/stdlib": "2.0.0-rc.21",
83
- "@aztec/world-state": "2.0.0-rc.21",
73
+ "@aztec/archiver": "2.0.0-rc.23",
74
+ "@aztec/aztec.js": "2.0.0-rc.23",
75
+ "@aztec/constants": "2.0.0-rc.23",
76
+ "@aztec/entrypoints": "2.0.0-rc.23",
77
+ "@aztec/ethereum": "2.0.0-rc.23",
78
+ "@aztec/foundation": "2.0.0-rc.23",
79
+ "@aztec/l1-artifacts": "2.0.0-rc.23",
80
+ "@aztec/node-lib": "2.0.0-rc.23",
81
+ "@aztec/p2p": "2.0.0-rc.23",
82
+ "@aztec/stdlib": "2.0.0-rc.23",
83
+ "@aztec/world-state": "2.0.0-rc.23",
84
84
  "@iarna/toml": "^2.2.5",
85
85
  "@libp2p/peer-id-factory": "^3.0.4",
86
86
  "commander": "^12.1.0",
@@ -92,8 +92,8 @@
92
92
  "viem": "2.23.7"
93
93
  },
94
94
  "devDependencies": {
95
- "@aztec/accounts": "2.0.0-rc.21",
96
- "@aztec/protocol-contracts": "2.0.0-rc.21",
95
+ "@aztec/accounts": "2.0.0-rc.23",
96
+ "@aztec/protocol-contracts": "2.0.0-rc.23",
97
97
  "@jest/globals": "^30.0.0",
98
98
  "@types/jest": "^30.0.0",
99
99
  "@types/lodash.chunk": "^4.2.9",
@@ -109,15 +109,15 @@
109
109
  "typescript": "^5.3.3"
110
110
  },
111
111
  "peerDependencies": {
112
- "@aztec/accounts": "2.0.0-rc.21",
113
- "@aztec/bb-prover": "2.0.0-rc.21",
114
- "@aztec/ethereum": "2.0.0-rc.21",
115
- "@aztec/l1-artifacts": "2.0.0-rc.21",
116
- "@aztec/noir-contracts.js": "2.0.0-rc.21",
117
- "@aztec/noir-protocol-circuits-types": "2.0.0-rc.21",
118
- "@aztec/noir-test-contracts.js": "2.0.0-rc.21",
119
- "@aztec/protocol-contracts": "2.0.0-rc.21",
120
- "@aztec/stdlib": "2.0.0-rc.21"
112
+ "@aztec/accounts": "2.0.0-rc.23",
113
+ "@aztec/bb-prover": "2.0.0-rc.23",
114
+ "@aztec/ethereum": "2.0.0-rc.23",
115
+ "@aztec/l1-artifacts": "2.0.0-rc.23",
116
+ "@aztec/noir-contracts.js": "2.0.0-rc.23",
117
+ "@aztec/noir-protocol-circuits-types": "2.0.0-rc.23",
118
+ "@aztec/noir-test-contracts.js": "2.0.0-rc.23",
119
+ "@aztec/protocol-contracts": "2.0.0-rc.23",
120
+ "@aztec/stdlib": "2.0.0-rc.23"
121
121
  },
122
122
  "files": [
123
123
  "dest",
package/src/config/chain_l2_config.ts CHANGED
@@ -34,6 +34,40 @@ export type L2ChainConfig = L1ContractsConfig &
34
34
  sentinelEnabled: boolean;
35
35
  };
36
36
 
37
+ const DefaultSlashConfig = {
38
+ /** Tally-style slashing */
39
+ slasherFlavor: 'tally',
40
+ /** Allow one round for vetoing */
41
+ slashingExecutionDelayInRounds: 1,
42
+ /** How long for a slash payload to be executed */
43
+ slashingLifetimeInRounds: 5,
44
+ /** Allow 2 rounds to discover faults */
45
+ slashingOffsetInRounds: 2,
46
+ /** No slash vetoer */
47
+ slashingVetoer: EthAddress.ZERO,
48
+ /** Use default slash amounts */
49
+ slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
50
+ slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
51
+ slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
52
+
53
+ // Slashing stuff
54
+ slashMinPenaltyPercentage: 0.5,
55
+ slashMaxPenaltyPercentage: 2.0,
56
+ slashInactivityTargetPercentage: 0.7,
57
+ slashInactivityConsecutiveEpochThreshold: 1,
58
+ slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
59
+ slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
60
+ slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
61
+ slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
62
+ slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
63
+ slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
64
+ slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
65
+ slashMaxPayloadSize: 50,
66
+ slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
67
+ slashOffenseExpirationRounds: 8,
68
+ sentinelEnabled: true,
69
+ } satisfies Partial<L2ChainConfig>;
70
+
37
71
  export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
38
72
  l1ChainId: 11155111,
39
73
  testAccounts: true,
@@ -55,6 +89,7 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
55
89
  publicMetricsCollectFrom: ['sequencer'],
56
90
 
57
91
  ...DefaultL1ContractsConfig,
92
+ ...DefaultSlashConfig,
58
93
 
59
94
  /** How many seconds an L1 slot lasts. */
60
95
  ethereumSlotDuration: 12,
@@ -70,26 +105,6 @@ export const stagingIgnitionL2ChainConfig: L2ChainConfig = {
70
105
  manaTarget: 0n,
71
106
  /** The proving cost per mana */
72
107
  provingCostPerMana: 0n,
73
-
74
- slasherFlavor: 'none',
75
- slashAmountSmall: 0n,
76
- slashAmountMedium: 0n,
77
- slashAmountLarge: 0n,
78
- slashMinPenaltyPercentage: 0.5,
79
- slashMaxPenaltyPercentage: 200,
80
- slashInactivityTargetPercentage: 0,
81
- slashInactivityConsecutiveEpochThreshold: 1,
82
- slashInactivityPenalty: 0n,
83
- slashPrunePenalty: 0n,
84
- slashDataWithholdingPenalty: 0n,
85
- slashProposeInvalidAttestationsPenalty: 0n,
86
- slashAttestDescendantOfInvalidPenalty: 0n,
87
- slashBroadcastedInvalidBlockPenalty: 0n,
88
- slashMaxPayloadSize: 50,
89
- slashGracePeriodL2Slots: 0,
90
- slashUnknownPenalty: 0n,
91
- slashOffenseExpirationRounds: 10,
92
- sentinelEnabled: false,
93
108
  };
94
109
 
95
110
  export const stagingPublicL2ChainConfig: L2ChainConfig = {
@@ -137,37 +152,8 @@ export const stagingPublicL2ChainConfig: L2ChainConfig = {
137
152
  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
138
153
  /** Exit delay for stakers */
139
154
  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
140
- /** Tally-style slashing */
141
- slasherFlavor: 'tally',
142
- /** Allow one round for vetoing */
143
- slashingExecutionDelayInRounds: 1,
144
- /** How long for a slash payload to be executed */
145
- slashingLifetimeInRounds: 5,
146
- /** Allow 2 rounds to discover faults */
147
- slashingOffsetInRounds: 2,
148
- /** No slash vetoer */
149
- slashingVetoer: EthAddress.ZERO,
150
- /** Use default slash amounts */
151
- slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
152
- slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
153
- slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
154
155
 
155
- // Slashing stuff
156
- slashMinPenaltyPercentage: 0.5,
157
- slashMaxPenaltyPercentage: 2.0,
158
- slashInactivityTargetPercentage: 0.7,
159
- slashInactivityConsecutiveEpochThreshold: 1,
160
- slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
161
- slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
162
- slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
163
- slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
164
- slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
165
- slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
166
- slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
167
- slashMaxPayloadSize: 50,
168
- slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
169
- slashOffenseExpirationRounds: 8,
170
- sentinelEnabled: true,
156
+ ...DefaultSlashConfig,
171
157
  };
172
158
 
173
159
  export const testnetL2ChainConfig: L2ChainConfig = {
@@ -215,37 +201,8 @@ export const testnetL2ChainConfig: L2ChainConfig = {
215
201
  provingCostPerMana: DefaultL1ContractsConfig.provingCostPerMana,
216
202
  /** Exit delay for stakers */
217
203
  exitDelaySeconds: DefaultL1ContractsConfig.exitDelaySeconds,
218
- /** Tally-style slashing */
219
- slasherFlavor: 'tally',
220
- /** Allow one round for vetoing */
221
- slashingExecutionDelayInRounds: 1,
222
- /** How long for a slash payload to be executed */
223
- slashingLifetimeInRounds: 5,
224
- /** Allow 2 rounds to discover faults */
225
- slashingOffsetInRounds: 2,
226
- /** No slash vetoer */
227
- slashingVetoer: EthAddress.ZERO,
228
- /** Use default slash amounts */
229
- slashAmountSmall: DefaultL1ContractsConfig.slashAmountSmall,
230
- slashAmountMedium: DefaultL1ContractsConfig.slashAmountMedium,
231
- slashAmountLarge: DefaultL1ContractsConfig.slashAmountLarge,
232
204
 
233
- // Slashing stuff
234
- slashMinPenaltyPercentage: 0.5,
235
- slashMaxPenaltyPercentage: 2.0,
236
- slashInactivityTargetPercentage: 0.7,
237
- slashInactivityConsecutiveEpochThreshold: 1,
238
- slashInactivityPenalty: DefaultL1ContractsConfig.slashAmountSmall,
239
- slashPrunePenalty: DefaultL1ContractsConfig.slashAmountSmall,
240
- slashDataWithholdingPenalty: DefaultL1ContractsConfig.slashAmountSmall,
241
- slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.slashAmountLarge,
242
- slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.slashAmountLarge,
243
- slashUnknownPenalty: DefaultL1ContractsConfig.slashAmountSmall,
244
- slashBroadcastedInvalidBlockPenalty: DefaultL1ContractsConfig.slashAmountMedium,
245
- slashMaxPayloadSize: 50,
246
- slashGracePeriodL2Slots: 32 * 2, // Two epochs from genesis
247
- slashOffenseExpirationRounds: 8,
248
- sentinelEnabled: true,
205
+ ...DefaultSlashConfig,
249
206
  };
250
207
 
251
208
  const BOOTNODE_CACHE_DURATION_MS = 60 * 60 * 1000; // 1 hour;