@aztec/ethereum 2.1.0-rc.27 → 2.1.0-rc.28

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.
@@ -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,wBAAwB,CAAC;AAEvF,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"}
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,wBAAwB,CAAC;AAEvF,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;AA2E9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAenE,CAAC;AAoBF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAYxD,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;CAUhC,CAAC;AA2CF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAe5D,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
@@ -63,7 +63,7 @@ const TestnetGovernanceConfiguration = {
63
63
  gracePeriod: 1n * 24n * 60n * 60n,
64
64
  quorum: 2n * 10n ** 17n,
65
65
  requiredYeaMargin: 1n * 10n ** 17n,
66
- minimumVotes: 1250n * 200_000n * 10n ** 18n
66
+ minimumVotes: 100n * 200_000n * 10n ** 18n
67
67
  };
68
68
  const StagingIgnitionGovernanceConfiguration = {
69
69
  proposeConfig: {
@@ -78,6 +78,19 @@ const StagingIgnitionGovernanceConfiguration = {
78
78
  requiredYeaMargin: 1n * 10n ** 17n,
79
79
  minimumVotes: 1250n * 200_000n * 10n ** 18n
80
80
  };
81
+ const MainnetGovernanceConfiguration = {
82
+ proposeConfig: {
83
+ lockDelay: 90n * 24n * 60n * 60n,
84
+ lockAmount: 258_750_000n * 10n ** 18n
85
+ },
86
+ votingDelay: 3n * 24n * 60n * 60n,
87
+ votingDuration: 7n * 24n * 60n * 60n,
88
+ executionDelay: 7n * 24n * 60n * 60n,
89
+ gracePeriod: 7n * 24n * 60n * 60n,
90
+ quorum: 2n * 10n ** 17n,
91
+ requiredYeaMargin: 33n * 10n ** 16n,
92
+ minimumVotes: 1000n * 200_000n * 10n ** 18n
93
+ };
81
94
  export const getGovernanceConfiguration = (networkName)=>{
82
95
  switch(networkName){
83
96
  case 'local':
@@ -88,6 +101,8 @@ export const getGovernanceConfiguration = (networkName)=>{
88
101
  return TestnetGovernanceConfiguration;
89
102
  case 'staging-ignition':
90
103
  return StagingIgnitionGovernanceConfiguration;
104
+ case 'mainnet':
105
+ return MainnetGovernanceConfiguration;
91
106
  default:
92
107
  throw new Error(`Unrecognized network name: ${networkName}`);
93
108
  }
@@ -101,6 +116,12 @@ const DefaultRewardConfig = {
101
116
  booster: EthAddress.ZERO.toString(),
102
117
  blockReward: 500n * 10n ** 18n
103
118
  };
119
+ const MainnetRewardConfig = {
120
+ sequencerBps: 7_000,
121
+ rewardDistributor: EthAddress.ZERO.toString(),
122
+ booster: EthAddress.ZERO.toString(),
123
+ blockReward: 400n * 10n ** 18n
124
+ };
104
125
  export const getRewardConfig = (networkName)=>{
105
126
  switch(networkName){
106
127
  case 'local':
@@ -108,6 +129,8 @@ export const getRewardConfig = (networkName)=>{
108
129
  case 'testnet':
109
130
  case 'staging-ignition':
110
131
  return DefaultRewardConfig;
132
+ case 'mainnet':
133
+ return MainnetRewardConfig;
111
134
  default:
112
135
  throw new Error(`Unrecognized network name: ${networkName}`);
113
136
  }
@@ -116,11 +139,11 @@ export const getRewardBoostConfig = ()=>{
116
139
  // The reward configuration is specified with a precision of 1e5, and we use the same across
117
140
  // all networks.
118
141
  return {
119
- increment: 125000,
120
- maxScore: 15000000,
121
- a: 1000,
122
- k: 1000000,
123
- minimum: 100000
142
+ increment: 125_000,
143
+ maxScore: 15_000_000,
144
+ a: 1_000,
145
+ k: 1_000_000,
146
+ minimum: 100_000
124
147
  };
125
148
  };
126
149
  // Similar to the above, no need for environment variables for this.
@@ -139,11 +162,11 @@ const StagingPublicEntryQueueConfig = {
139
162
  maxQueueFlushSize: 32n
140
163
  };
141
164
  const TestnetEntryQueueConfig = {
142
- bootstrapValidatorSetSize: 750n,
143
- bootstrapFlushSize: 32n,
144
- normalFlushSizeMin: 32n,
145
- normalFlushSizeQuotient: 2475n,
146
- maxQueueFlushSize: 32n
165
+ bootstrapValidatorSetSize: 256n,
166
+ bootstrapFlushSize: 256n,
167
+ normalFlushSizeMin: 4n,
168
+ normalFlushSizeQuotient: 2048n,
169
+ maxQueueFlushSize: 8n
147
170
  };
148
171
  const StagingIgnitionEntryQueueConfig = {
149
172
  bootstrapValidatorSetSize: 48n,
@@ -152,6 +175,13 @@ const StagingIgnitionEntryQueueConfig = {
152
175
  normalFlushSizeQuotient: 2048n,
153
176
  maxQueueFlushSize: 24n
154
177
  };
178
+ const MainnetEntryQueueConfig = {
179
+ bootstrapValidatorSetSize: 1_000n,
180
+ bootstrapFlushSize: 1_000n,
181
+ normalFlushSizeMin: 1n,
182
+ normalFlushSizeQuotient: 2_048n,
183
+ maxQueueFlushSize: 8n
184
+ };
155
185
  export const getEntryQueueConfig = (networkName)=>{
156
186
  switch(networkName){
157
187
  case 'local':
@@ -162,6 +192,8 @@ export const getEntryQueueConfig = (networkName)=>{
162
192
  return TestnetEntryQueueConfig;
163
193
  case 'staging-ignition':
164
194
  return StagingIgnitionEntryQueueConfig;
195
+ case 'mainnet':
196
+ return MainnetEntryQueueConfig;
165
197
  default:
166
198
  throw new Error(`Unrecognized network name: ${networkName}`);
167
199
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/ethereum",
3
- "version": "2.1.0-rc.27",
3
+ "version": "2.1.0-rc.28",
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": "2.1.0-rc.27",
35
- "@aztec/constants": "2.1.0-rc.27",
36
- "@aztec/foundation": "2.1.0-rc.27",
37
- "@aztec/l1-artifacts": "2.1.0-rc.27",
34
+ "@aztec/blob-lib": "2.1.0-rc.28",
35
+ "@aztec/constants": "2.1.0-rc.28",
36
+ "@aztec/foundation": "2.1.0-rc.28",
37
+ "@aztec/l1-artifacts": "2.1.0-rc.28",
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
@@ -138,7 +138,7 @@ const TestnetGovernanceConfiguration = {
138
138
  gracePeriod: 1n * 24n * 60n * 60n, // 1 day
139
139
  quorum: 2n * 10n ** 17n, // 20%
140
140
  requiredYeaMargin: 1n * 10n ** 17n, // 10%
141
- minimumVotes: 1250n * 200_000n * 10n ** 18n,
141
+ minimumVotes: 100n * 200_000n * 10n ** 18n,
142
142
  };
143
143
 
144
144
  const StagingIgnitionGovernanceConfiguration = {
@@ -156,6 +156,21 @@ const StagingIgnitionGovernanceConfiguration = {
156
156
  minimumVotes: 1250n * 200_000n * 10n ** 18n,
157
157
  };
158
158
 
159
+ const MainnetGovernanceConfiguration = {
160
+ proposeConfig: {
161
+ lockDelay: 90n * 24n * 60n * 60n,
162
+ lockAmount: 258_750_000n * 10n ** 18n,
163
+ },
164
+
165
+ votingDelay: 3n * 24n * 60n * 60n,
166
+ votingDuration: 7n * 24n * 60n * 60n,
167
+ executionDelay: 7n * 24n * 60n * 60n,
168
+ gracePeriod: 7n * 24n * 60n * 60n,
169
+ quorum: 2n * 10n ** 17n, // 20%
170
+ requiredYeaMargin: 33n * 10n ** 16n, // 33%
171
+ minimumVotes: 1000n * 200_000n * 10n ** 18n,
172
+ };
173
+
159
174
  export const getGovernanceConfiguration = (networkName: NetworkNames) => {
160
175
  switch (networkName) {
161
176
  case 'local':
@@ -166,6 +181,8 @@ export const getGovernanceConfiguration = (networkName: NetworkNames) => {
166
181
  return TestnetGovernanceConfiguration;
167
182
  case 'staging-ignition':
168
183
  return StagingIgnitionGovernanceConfiguration;
184
+ case 'mainnet':
185
+ return MainnetGovernanceConfiguration;
169
186
  default:
170
187
  throw new Error(`Unrecognized network name: ${networkName}`);
171
188
  }
@@ -182,6 +199,13 @@ const DefaultRewardConfig = {
182
199
  blockReward: 500n * 10n ** 18n,
183
200
  };
184
201
 
202
+ const MainnetRewardConfig = {
203
+ sequencerBps: 7_000,
204
+ rewardDistributor: EthAddress.ZERO.toString(),
205
+ booster: EthAddress.ZERO.toString(),
206
+ blockReward: 400n * 10n ** 18n,
207
+ };
208
+
185
209
  export const getRewardConfig = (networkName: NetworkNames) => {
186
210
  switch (networkName) {
187
211
  case 'local':
@@ -189,6 +213,8 @@ export const getRewardConfig = (networkName: NetworkNames) => {
189
213
  case 'testnet':
190
214
  case 'staging-ignition':
191
215
  return DefaultRewardConfig;
216
+ case 'mainnet':
217
+ return MainnetRewardConfig;
192
218
  default:
193
219
  throw new Error(`Unrecognized network name: ${networkName}`);
194
220
  }
@@ -198,11 +224,11 @@ export const getRewardBoostConfig = () => {
198
224
  // The reward configuration is specified with a precision of 1e5, and we use the same across
199
225
  // all networks.
200
226
  return {
201
- increment: 125000, // 1.25
202
- maxScore: 15000000, // 150
203
- a: 1000, // 0.01
204
- k: 1000000, // 10
205
- minimum: 100000, // 1
227
+ increment: 125_000, // 1.25
228
+ maxScore: 15_000_000, // 150
229
+ a: 1_000, // 0.01
230
+ k: 1_000_000, // 10
231
+ minimum: 100_000, // 1
206
232
  };
207
233
  };
208
234
 
@@ -224,11 +250,11 @@ const StagingPublicEntryQueueConfig = {
224
250
  };
225
251
 
226
252
  const TestnetEntryQueueConfig = {
227
- bootstrapValidatorSetSize: 750n,
228
- bootstrapFlushSize: 32n,
229
- normalFlushSizeMin: 32n,
230
- normalFlushSizeQuotient: 2475n,
231
- maxQueueFlushSize: 32n,
253
+ bootstrapValidatorSetSize: 256n,
254
+ bootstrapFlushSize: 256n,
255
+ normalFlushSizeMin: 4n,
256
+ normalFlushSizeQuotient: 2048n,
257
+ maxQueueFlushSize: 8n,
232
258
  };
233
259
 
234
260
  const StagingIgnitionEntryQueueConfig = {
@@ -239,6 +265,14 @@ const StagingIgnitionEntryQueueConfig = {
239
265
  maxQueueFlushSize: 24n,
240
266
  };
241
267
 
268
+ const MainnetEntryQueueConfig = {
269
+ bootstrapValidatorSetSize: 1_000n,
270
+ bootstrapFlushSize: 1_000n,
271
+ normalFlushSizeMin: 1n,
272
+ normalFlushSizeQuotient: 2_048n,
273
+ maxQueueFlushSize: 8n,
274
+ };
275
+
242
276
  export const getEntryQueueConfig = (networkName: NetworkNames) => {
243
277
  switch (networkName) {
244
278
  case 'local':
@@ -249,6 +283,8 @@ export const getEntryQueueConfig = (networkName: NetworkNames) => {
249
283
  return TestnetEntryQueueConfig;
250
284
  case 'staging-ignition':
251
285
  return StagingIgnitionEntryQueueConfig;
286
+ case 'mainnet':
287
+ return MainnetEntryQueueConfig;
252
288
  default:
253
289
  throw new Error(`Unrecognized network name: ${networkName}`);
254
290
  }