@aztec/ethereum 3.0.0-nightly.20250917 → 3.0.0-nightly.20250918

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
@@ -103,7 +103,7 @@ export declare const getRewardConfig: (networkName: NetworkNames) => {
103
103
  booster: `0x${string}`;
104
104
  blockReward: bigint;
105
105
  };
106
- export declare const getRewardBoostConfig: (networkName: NetworkNames) => {
106
+ export declare const getRewardBoostConfig: () => {
107
107
  increment: number;
108
108
  maxScore: number;
109
109
  a: number;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,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,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAC;AA2D9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAanE,CAAC;AAaF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAUxD,CAAC;AAkCF,eAAO,MAAM,oBAAoB,GAAI,aAAa,YAAY;;;;;;CAa7D,CAAC;AAmCF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAa5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkI3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,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,oFAAoF;IACpF,WAAW,EAAE,MAAM,CAAC;IACpB,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mHAAmH;IACnH,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+EAA+E;IAC/E,uBAAuB,EAAE,MAAM,CAAC;IAChC,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;CAwBR,CAAC;AA4D9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAanE,CAAC;AAaF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAUxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AAmCF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAa5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkI3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
package/dest/config.js CHANGED
@@ -8,12 +8,12 @@ export const DefaultL1ContractsConfig = {
8
8
  aztecTargetCommitteeSize: 48,
9
9
  lagInEpochs: 2,
10
10
  aztecProofSubmissionEpochs: 1,
11
- activationThreshold: BigInt(100e18),
12
- ejectionThreshold: BigInt(50e18),
13
- localEjectionThreshold: BigInt(98e18),
14
- slashAmountSmall: BigInt(10e18),
15
- slashAmountMedium: BigInt(20e18),
16
- slashAmountLarge: BigInt(50e18),
11
+ activationThreshold: 100n * 10n ** 18n,
12
+ ejectionThreshold: 50n * 10n ** 18n,
13
+ localEjectionThreshold: 98n * 10n ** 18n,
14
+ slashAmountSmall: 10n * 10n ** 18n,
15
+ slashAmountMedium: 20n * 10n ** 18n,
16
+ slashAmountLarge: 50n * 10n ** 18n,
17
17
  slashingRoundSizeInEpochs: 4,
18
18
  slashingLifetimeInRounds: 5,
19
19
  slashingExecutionDelayInRounds: 0,
@@ -54,29 +54,29 @@ const StagingPublicGovernanceConfiguration = {
54
54
  };
55
55
  const TestnetGovernanceConfiguration = {
56
56
  proposeConfig: {
57
- lockDelay: 60n * 60n * 24n,
58
- lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n
57
+ lockDelay: 10n * 365n * 24n * 60n * 60n,
58
+ lockAmount: 1250n * 200_000n * 10n ** 18n
59
59
  },
60
- votingDelay: 60n,
61
- votingDuration: 60n * 60n,
62
- executionDelay: 60n * 60n * 24n,
63
- gracePeriod: 60n * 60n * 24n * 7n,
64
- quorum: 3n * 10n ** 17n,
65
- requiredYeaMargin: 4n * 10n ** 16n,
66
- minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
60
+ votingDelay: 12n * 60n * 60n,
61
+ votingDuration: 1n * 24n * 60n * 60n,
62
+ executionDelay: 12n * 60n * 60n,
63
+ gracePeriod: 1n * 24n * 60n * 60n,
64
+ quorum: 2n * 10n ** 17n,
65
+ requiredYeaMargin: 1n * 10n ** 17n,
66
+ minimumVotes: 1250n * 200_000n * 10n ** 18n
67
67
  };
68
68
  const StagingIgnitionGovernanceConfiguration = {
69
69
  proposeConfig: {
70
- lockDelay: 60n * 60n * 24n * 30n,
71
- lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n
70
+ lockDelay: 10n * 365n * 24n * 60n * 60n,
71
+ lockAmount: 1250n * 200_000n * 10n ** 18n
72
72
  },
73
- votingDelay: 60n,
74
- votingDuration: 60n * 60n,
75
- executionDelay: 60n,
76
- gracePeriod: 60n * 60n * 24n * 7n,
77
- quorum: 3n * 10n ** 17n,
78
- requiredYeaMargin: 4n * 10n ** 16n,
79
- minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
73
+ votingDelay: 7n * 24n * 60n * 60n,
74
+ votingDuration: 7n * 24n * 60n * 60n,
75
+ executionDelay: 30n * 24n * 60n * 60n,
76
+ gracePeriod: 7n * 24n * 60n * 60n,
77
+ quorum: 2n * 10n ** 17n,
78
+ requiredYeaMargin: 1n * 10n ** 17n,
79
+ minimumVotes: 1250n * 200_000n * 10n ** 18n
80
80
  };
81
81
  export const getGovernanceConfiguration = (networkName)=>{
82
82
  switch(networkName){
@@ -96,10 +96,10 @@ export const getGovernanceConfiguration = (networkName)=>{
96
96
  // and do not expect to be using different setups, so having environment variables
97
97
  // for it seems overkill
98
98
  const DefaultRewardConfig = {
99
- sequencerBps: 5000,
99
+ sequencerBps: 8000,
100
100
  rewardDistributor: EthAddress.ZERO.toString(),
101
101
  booster: EthAddress.ZERO.toString(),
102
- blockReward: BigInt(50e18)
102
+ blockReward: 500n * 10n ** 18n
103
103
  };
104
104
  export const getRewardConfig = (networkName)=>{
105
105
  switch(networkName){
@@ -112,47 +112,16 @@ export const getRewardConfig = (networkName)=>{
112
112
  throw new Error(`Unrecognized network name: ${networkName}`);
113
113
  }
114
114
  };
115
- const LocalRewardBoostConfig = {
116
- increment: 200000,
117
- maxScore: 5000000,
118
- a: 5000,
119
- k: 1000000,
120
- minimum: 100000
121
- };
122
- const StagingPublicRewardBoostConfig = {
123
- increment: 200000,
124
- maxScore: 5000000,
125
- a: 5000,
126
- k: 1000000,
127
- minimum: 100000
128
- };
129
- const TestnetRewardBoostConfig = {
130
- increment: 125000,
131
- maxScore: 15000000,
132
- a: 1000,
133
- k: 1000000,
134
- minimum: 100000
135
- };
136
- const StagingIgnitionRewardBoostConfig = {
137
- increment: 200000,
138
- maxScore: 5000000,
139
- a: 5000,
140
- k: 1000000,
141
- minimum: 100000
142
- };
143
- export const getRewardBoostConfig = (networkName)=>{
144
- switch(networkName){
145
- case 'local':
146
- return LocalRewardBoostConfig;
147
- case 'staging-public':
148
- return StagingPublicRewardBoostConfig;
149
- case 'testnet':
150
- return TestnetRewardBoostConfig;
151
- case 'staging-ignition':
152
- return StagingIgnitionRewardBoostConfig;
153
- default:
154
- throw new Error(`Unrecognized network name: ${networkName}`);
155
- }
115
+ export const getRewardBoostConfig = ()=>{
116
+ // The reward configuration is specified with a precision of 1e5, and we use the same across
117
+ // all networks.
118
+ return {
119
+ increment: 125000,
120
+ maxScore: 15000000,
121
+ a: 1000,
122
+ k: 1000000,
123
+ minimum: 100000
124
+ };
156
125
  };
157
126
  // Similar to the above, no need for environment variables for this.
158
127
  const LocalEntryQueueConfig = {
@@ -171,17 +140,17 @@ const StagingPublicEntryQueueConfig = {
171
140
  };
172
141
  const TestnetEntryQueueConfig = {
173
142
  bootstrapValidatorSetSize: 750n,
174
- bootstrapFlushSize: 48n,
175
- normalFlushSizeMin: 1n,
143
+ bootstrapFlushSize: 32n,
144
+ normalFlushSizeMin: 32n,
176
145
  normalFlushSizeQuotient: 2475n,
177
146
  maxQueueFlushSize: 32n
178
147
  };
179
148
  const StagingIgnitionEntryQueueConfig = {
180
- bootstrapValidatorSetSize: 750n,
181
- bootstrapFlushSize: 48n,
149
+ bootstrapValidatorSetSize: 1250n,
150
+ bootstrapFlushSize: 8n,
182
151
  normalFlushSizeMin: 1n,
183
- normalFlushSizeQuotient: 2475n,
184
- maxQueueFlushSize: 32n
152
+ normalFlushSizeQuotient: 2048n,
153
+ maxQueueFlushSize: 8n
185
154
  };
186
155
  export const getEntryQueueConfig = (networkName)=>{
187
156
  switch(networkName){
@@ -231,6 +231,12 @@ export declare class RollupContract {
231
231
  getBlobCommitmentsHash(blockNumber: bigint): Promise<`0x${string}`>;
232
232
  getCurrentBlobCommitmentsHash(): Promise<`0x${string}`>;
233
233
  getStakingAsset(): Promise<`0x${string}`>;
234
+ getRewardConfig(): Promise<{
235
+ rewardDistributor: `0x${string}`;
236
+ sequencerBps: number;
237
+ booster: `0x${string}`;
238
+ blockReward: bigint;
239
+ }>;
234
240
  setupEpoch(l1TxUtils: L1TxUtils): Promise<{
235
241
  receipt: import("viem").TransactionReceipt;
236
242
  gasPrice: import("../l1_tx_utils.js").GasPrice;
@@ -1 +1 @@
1
- {"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rollup.d.ts","sourceRoot":"","sources":["../../src/contracts/rollup.ts"],"names":[],"mappings":"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"}
@@ -545,6 +545,9 @@ export class RollupContract {
545
545
  getStakingAsset() {
546
546
  return this.rollup.read.getStakingAsset();
547
547
  }
548
+ getRewardConfig() {
549
+ return this.rollup.read.getRewardConfig();
550
+ }
548
551
  setupEpoch(l1TxUtils) {
549
552
  return l1TxUtils.sendAndMonitorTransaction({
550
553
  to: this.address,
@@ -314,7 +314,7 @@ function slasherFlavorToSolidityEnum(flavor) {
314
314
  provingCostPerMana: args.provingCostPerMana,
315
315
  rewardConfig: rewardConfig,
316
316
  version: 0,
317
- rewardBoostConfig: getRewardBoostConfig(networkName),
317
+ rewardBoostConfig: getRewardBoostConfig(),
318
318
  stakingQueueConfig: getEntryQueueConfig(networkName),
319
319
  exitDelaySeconds: BigInt(args.exitDelaySeconds),
320
320
  slasherFlavor: slasherFlavorToSolidityEnum(args.slasherFlavor),
@@ -38,7 +38,7 @@ export declare class RollupCheatCodes {
38
38
  * @param epoch - The epoch to advance to
39
39
  * @param opts - Options
40
40
  */
41
- advanceToEpoch(epoch: bigint, opts?: {
41
+ advanceToEpoch(epoch: bigint | number, opts?: {
42
42
  /** Optional test date provider to update with the epoch timestamp */
43
43
  updateDateProvider?: TestDateProvider;
44
44
  }): Promise<bigint>;
@@ -1 +1 @@
1
- {"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EAMT,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,8CAA8C;AAC9C,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IANvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAA4D;IAE1E,OAAO,CAAC,MAAM,CAAuC;gBAG3C,aAAa,EAAE,aAAa,EACpC,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAavD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,GAAG,gBAAgB;IAKzG,+BAA+B;IAClB,OAAO;IAKpB,gCAAgC;IACnB,QAAQ;IAKrB;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC;QAC9B,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7C,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5C,CAAC;IAQF;;OAEG;IACU,WAAW;IAmBxB,0EAA0E;IAC7D,SAAS,IAAI,OAAO,CAAC;QAChC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC;QAC5C,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;KAC3C,CAAC;IAQF;;;;OAIG;IACU,cAAc,CACzB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;QACJ,qEAAqE;QACrE,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;KAClC;IAaR,4CAA4C;IAC/B,kBAAkB,CAC7B,IAAI,GAAE;QACJ,qEAAqE;QACrE,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;KAClC;IAeR,6DAA6D;IAChD,iBAAiB;IAQ9B;;;OAGG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM;IASzC;;;OAGG;IACI,YAAY,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAiCtD;;;OAGG;IACI,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqCxE;;;OAGG;IACU,OAAO,CAClB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAQ1G;;OAEG;IACU,UAAU;IASvB,4CAA4C;IAC/B,oBAAoB;IAQjC;;;OAGG;IACU,sBAAsB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM;IAMtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM;CAWpD"}
1
+ {"version":3,"file":"rollup_cheat_codes.d.ts","sourceRoot":"","sources":["../../src/test/rollup_cheat_codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAGjF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EACL,KAAK,qBAAqB,EAC1B,KAAK,GAAG,EAMT,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,8CAA8C;AAC9C,qBAAa,gBAAgB;IAOzB,OAAO,CAAC,aAAa;IANvB,OAAO,CAAC,MAAM,CAAmB;IACjC,OAAO,CAAC,MAAM,CAA4D;IAE1E,OAAO,CAAC,MAAM,CAAuC;gBAG3C,aAAa,EAAE,aAAa,EACpC,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC;IAavD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,mBAAmB,EAAE,eAAe,CAAC,GAAG,gBAAgB;IAKzG,+BAA+B;IAClB,OAAO;IAKpB,gCAAgC;IACnB,QAAQ;IAKrB;;;OAGG;IACU,OAAO,IAAI,OAAO,CAAC;QAC9B,4BAA4B,CAAC,OAAO,EAAE,MAAM,CAAC;QAC7C,2BAA2B,CAAC,MAAM,EAAE,MAAM,CAAC;KAC5C,CAAC;IAQF;;OAEG;IACU,WAAW;IAmBxB,0EAA0E;IAC7D,SAAS,IAAI,OAAO,CAAC;QAChC,qBAAqB,CAAC,aAAa,EAAE,MAAM,CAAC;QAC5C,oBAAoB,CAAC,YAAY,EAAE,MAAM,CAAC;KAC3C,CAAC;IAQF;;;;OAIG;IACU,cAAc,CACzB,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,IAAI,GAAE;QACJ,qEAAqE;QACrE,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;KAClC;IAaR,4CAA4C;IAC/B,kBAAkB,CAC7B,IAAI,GAAE;QACJ,qEAAqE;QACrE,kBAAkB,CAAC,EAAE,gBAAgB,CAAC;KAClC;IAeR,6DAA6D;IAChD,iBAAiB;IAQ9B;;;OAGG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM;IASzC;;;OAGG;IACI,YAAY,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAiCtD;;;OAGG;IACI,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAqCxE;;;OAGG;IACU,OAAO,CAClB,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,qBAAqB,CAAC,OAAO,SAAS,EAAE,gBAAgB,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC;IAQ1G;;OAEG;IACU,UAAU;IASvB,4CAA4C;IAC/B,oBAAoB;IAQjC;;;OAGG;IACU,sBAAsB,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM;IAMtE;;;OAGG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM;CAWpD"}
@@ -85,7 +85,7 @@ import { EthCheatCodes } from './eth_cheat_codes.js';
85
85
  */ async advanceToEpoch(epoch, opts = {}) {
86
86
  const { epochDuration: slotsInEpoch } = await this.getConfig();
87
87
  const timestamp = await this.rollup.read.getTimestampForSlot([
88
- epoch * slotsInEpoch
88
+ BigInt(epoch) * slotsInEpoch
89
89
  ]);
90
90
  try {
91
91
  await this.ethCheatCodes.warp(Number(timestamp), {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "3.0.0-nightly.20250917",
3
+ "version": "3.0.0-nightly.20250918",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -31,10 +31,10 @@
31
31
  "../package.common.json"
32
32
  ],
33
33
  "dependencies": {
34
- "@aztec/blob-lib": "3.0.0-nightly.20250917",
35
- "@aztec/constants": "3.0.0-nightly.20250917",
36
- "@aztec/foundation": "3.0.0-nightly.20250917",
37
- "@aztec/l1-artifacts": "3.0.0-nightly.20250917",
34
+ "@aztec/blob-lib": "3.0.0-nightly.20250918",
35
+ "@aztec/constants": "3.0.0-nightly.20250918",
36
+ "@aztec/foundation": "3.0.0-nightly.20250918",
37
+ "@aztec/l1-artifacts": "3.0.0-nightly.20250918",
38
38
  "@viem/anvil": "^0.0.10",
39
39
  "dotenv": "^16.0.3",
40
40
  "lodash.chunk": "^4.2.0",
package/src/config.ts CHANGED
@@ -79,12 +79,12 @@ export const DefaultL1ContractsConfig = {
79
79
  aztecTargetCommitteeSize: 48,
80
80
  lagInEpochs: 2,
81
81
  aztecProofSubmissionEpochs: 1, // you have a full epoch to submit a proof after the epoch to prove ends
82
- activationThreshold: BigInt(100e18),
83
- ejectionThreshold: BigInt(50e18),
84
- localEjectionThreshold: BigInt(98e18),
85
- slashAmountSmall: BigInt(10e18),
86
- slashAmountMedium: BigInt(20e18),
87
- slashAmountLarge: BigInt(50e18),
82
+ activationThreshold: 100n * 10n ** 18n,
83
+ ejectionThreshold: 50n * 10n ** 18n,
84
+ localEjectionThreshold: 98n * 10n ** 18n,
85
+ slashAmountSmall: 10n * 10n ** 18n,
86
+ slashAmountMedium: 20n * 10n ** 18n,
87
+ slashAmountLarge: 50n * 10n ** 18n,
88
88
  slashingRoundSizeInEpochs: 4,
89
89
  slashingLifetimeInRounds: 5,
90
90
  slashingExecutionDelayInRounds: 0, // round N may be submitted in round N + 1
@@ -128,31 +128,32 @@ const StagingPublicGovernanceConfiguration = {
128
128
 
129
129
  const TestnetGovernanceConfiguration = {
130
130
  proposeConfig: {
131
- lockDelay: 60n * 60n * 24n,
132
- lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
131
+ lockDelay: 10n * 365n * 24n * 60n * 60n,
132
+ lockAmount: 1250n * 200_000n * 10n ** 18n,
133
133
  },
134
- votingDelay: 60n,
135
- votingDuration: 60n * 60n,
136
- executionDelay: 60n * 60n * 24n,
137
- gracePeriod: 60n * 60n * 24n * 7n,
138
- quorum: 3n * 10n ** 17n, // 30%
139
- requiredYeaMargin: 4n * 10n ** 16n, // 4%
140
- minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n,
134
+
135
+ votingDelay: 12n * 60n * 60n, // 12 hours
136
+ votingDuration: 1n * 24n * 60n * 60n, // 1 day
137
+ executionDelay: 12n * 60n * 60n, // 12 hours
138
+ gracePeriod: 1n * 24n * 60n * 60n, // 1 day
139
+ quorum: 2n * 10n ** 17n, // 20%
140
+ requiredYeaMargin: 1n * 10n ** 17n, // 10%
141
+ minimumVotes: 1250n * 200_000n * 10n ** 18n,
141
142
  };
142
143
 
143
144
  const StagingIgnitionGovernanceConfiguration = {
144
145
  proposeConfig: {
145
- lockDelay: 60n * 60n * 24n * 30n, // 30 days
146
- lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
146
+ lockDelay: 10n * 365n * 24n * 60n * 60n,
147
+ lockAmount: 1250n * 200_000n * 10n ** 18n,
147
148
  },
148
149
 
149
- votingDelay: 60n,
150
- votingDuration: 60n * 60n,
151
- executionDelay: 60n,
152
- gracePeriod: 60n * 60n * 24n * 7n,
153
- quorum: 3n * 10n ** 17n, // 30%
154
- requiredYeaMargin: 4n * 10n ** 16n, // 4%
155
- minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n, // >= 200 validators must vote
150
+ votingDelay: 7n * 24n * 60n * 60n,
151
+ votingDuration: 7n * 24n * 60n * 60n,
152
+ executionDelay: 30n * 24n * 60n * 60n,
153
+ gracePeriod: 7n * 24n * 60n * 60n,
154
+ quorum: 2n * 10n ** 17n, // 20%
155
+ requiredYeaMargin: 1n * 10n ** 17n, // 10%
156
+ minimumVotes: 1250n * 200_000n * 10n ** 18n,
156
157
  };
157
158
 
158
159
  export const getGovernanceConfiguration = (networkName: NetworkNames) => {
@@ -175,10 +176,10 @@ export const getGovernanceConfiguration = (networkName: NetworkNames) => {
175
176
  // for it seems overkill
176
177
 
177
178
  const DefaultRewardConfig = {
178
- sequencerBps: 5000,
179
+ sequencerBps: 8000,
179
180
  rewardDistributor: EthAddress.ZERO.toString(),
180
181
  booster: EthAddress.ZERO.toString(),
181
- blockReward: BigInt(50e18),
182
+ blockReward: 500n * 10n ** 18n,
182
183
  };
183
184
 
184
185
  export const getRewardConfig = (networkName: NetworkNames) => {
@@ -193,51 +194,16 @@ export const getRewardConfig = (networkName: NetworkNames) => {
193
194
  }
194
195
  };
195
196
 
196
- const LocalRewardBoostConfig = {
197
- increment: 200000,
198
- maxScore: 5000000,
199
- a: 5000,
200
- k: 1000000,
201
- minimum: 100000,
202
- };
203
-
204
- const StagingPublicRewardBoostConfig = {
205
- increment: 200000,
206
- maxScore: 5000000,
207
- a: 5000,
208
- k: 1000000,
209
- minimum: 100000,
210
- };
211
-
212
- const TestnetRewardBoostConfig = {
213
- increment: 125000,
214
- maxScore: 15000000,
215
- a: 1000,
216
- k: 1000000,
217
- minimum: 100000,
218
- };
219
-
220
- const StagingIgnitionRewardBoostConfig = {
221
- increment: 200000,
222
- maxScore: 5000000,
223
- a: 5000,
224
- k: 1000000,
225
- minimum: 100000,
226
- };
227
-
228
- export const getRewardBoostConfig = (networkName: NetworkNames) => {
229
- switch (networkName) {
230
- case 'local':
231
- return LocalRewardBoostConfig;
232
- case 'staging-public':
233
- return StagingPublicRewardBoostConfig;
234
- case 'testnet':
235
- return TestnetRewardBoostConfig;
236
- case 'staging-ignition':
237
- return StagingIgnitionRewardBoostConfig;
238
- default:
239
- throw new Error(`Unrecognized network name: ${networkName}`);
240
- }
197
+ export const getRewardBoostConfig = () => {
198
+ // The reward configuration is specified with a precision of 1e5, and we use the same across
199
+ // all networks.
200
+ return {
201
+ increment: 125000, // 1.25
202
+ maxScore: 15000000, // 150
203
+ a: 1000, // 0.01
204
+ k: 1000000, // 10
205
+ minimum: 100000, // 1
206
+ };
241
207
  };
242
208
 
243
209
  // Similar to the above, no need for environment variables for this.
@@ -259,18 +225,18 @@ const StagingPublicEntryQueueConfig = {
259
225
 
260
226
  const TestnetEntryQueueConfig = {
261
227
  bootstrapValidatorSetSize: 750n,
262
- bootstrapFlushSize: 48n, // will effectively be bounded by maxQueueFlushSize
263
- normalFlushSizeMin: 1n,
228
+ bootstrapFlushSize: 32n,
229
+ normalFlushSizeMin: 32n,
264
230
  normalFlushSizeQuotient: 2475n,
265
- maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
231
+ maxQueueFlushSize: 32n,
266
232
  };
267
233
 
268
234
  const StagingIgnitionEntryQueueConfig = {
269
- bootstrapValidatorSetSize: 750n,
270
- bootstrapFlushSize: 48n, // will effectively be bounded by maxQueueFlushSize
235
+ bootstrapValidatorSetSize: 1250n,
236
+ bootstrapFlushSize: 8n,
271
237
  normalFlushSizeMin: 1n,
272
- normalFlushSizeQuotient: 2475n,
273
- maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
238
+ normalFlushSizeQuotient: 2048n,
239
+ maxQueueFlushSize: 8n,
274
240
  };
275
241
 
276
242
  export const getEntryQueueConfig = (networkName: NetworkNames) => {
@@ -713,6 +713,10 @@ export class RollupContract {
713
713
  return this.rollup.read.getStakingAsset();
714
714
  }
715
715
 
716
+ getRewardConfig() {
717
+ return this.rollup.read.getRewardConfig();
718
+ }
719
+
716
720
  setupEpoch(l1TxUtils: L1TxUtils) {
717
721
  return l1TxUtils.sendAndMonitorTransaction({
718
722
  to: this.address,
@@ -551,7 +551,7 @@ export const deployRollup = async (
551
551
  provingCostPerMana: args.provingCostPerMana,
552
552
  rewardConfig: rewardConfig,
553
553
  version: 0,
554
- rewardBoostConfig: getRewardBoostConfig(networkName),
554
+ rewardBoostConfig: getRewardBoostConfig(),
555
555
  stakingQueueConfig: getEntryQueueConfig(networkName),
556
556
  exitDelaySeconds: BigInt(args.exitDelaySeconds),
557
557
  slasherFlavor: slasherFlavorToSolidityEnum(args.slasherFlavor),
@@ -112,14 +112,14 @@ export class RollupCheatCodes {
112
112
  * @param opts - Options
113
113
  */
114
114
  public async advanceToEpoch(
115
- epoch: bigint,
115
+ epoch: bigint | number,
116
116
  opts: {
117
117
  /** Optional test date provider to update with the epoch timestamp */
118
118
  updateDateProvider?: TestDateProvider;
119
119
  } = {},
120
120
  ) {
121
121
  const { epochDuration: slotsInEpoch } = await this.getConfig();
122
- const timestamp = await this.rollup.read.getTimestampForSlot([epoch * slotsInEpoch]);
122
+ const timestamp = await this.rollup.read.getTimestampForSlot([BigInt(epoch) * slotsInEpoch]);
123
123
  try {
124
124
  await this.ethCheatCodes.warp(Number(timestamp), { ...opts, silent: true, resetBlockInterval: true });
125
125
  this.logger.warn(`Warped to epoch ${epoch}`);