@aztec/sequencer-client 0.73.0 → 0.74.0

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.
@@ -109,22 +109,22 @@ export class SlasherClient extends WithTracer {
109
109
  return EthAddress.fromString(payloadAddress);
110
110
  }
111
111
  getL2BlockHash(number) {
112
- return Promise.resolve(this.synchedBlockHashes.get(number));
112
+ return this.synchedBlockHashes.getAsync(number);
113
113
  }
114
- getL2Tips() {
115
- const latestBlockNumber = this.getSyncedLatestBlockNum();
114
+ async getL2Tips() {
115
+ const latestBlockNumber = await this.getSyncedLatestBlockNum();
116
116
  let latestBlockHash;
117
- const provenBlockNumber = this.getSyncedProvenBlockNum();
117
+ const provenBlockNumber = await this.getSyncedProvenBlockNum();
118
118
  let provenBlockHash;
119
119
  if (latestBlockNumber > 0) {
120
- latestBlockHash = this.synchedBlockHashes.get(latestBlockNumber);
120
+ latestBlockHash = await this.synchedBlockHashes.getAsync(latestBlockNumber);
121
121
  if (typeof latestBlockHash === 'undefined') {
122
122
  this.log.warn(`Block hash for latest block ${latestBlockNumber} not found`);
123
123
  throw new Error();
124
124
  }
125
125
  }
126
126
  if (provenBlockNumber > 0) {
127
- provenBlockHash = this.synchedBlockHashes.get(provenBlockNumber);
127
+ provenBlockHash = await this.synchedBlockHashes.getAsync(provenBlockNumber);
128
128
  if (typeof provenBlockHash === 'undefined') {
129
129
  this.log.warn(`Block hash for proven block ${provenBlockNumber} not found`);
130
130
  throw new Error();
@@ -146,7 +146,7 @@ export class SlasherClient extends WithTracer {
146
146
  // TODO (alexg): I think we can prune the block hashes map here
147
147
  break;
148
148
  case 'chain-proven': {
149
- const from = this.getSyncedProvenBlockNum() + 1;
149
+ const from = (await this.getSyncedProvenBlockNum()) + 1;
150
150
  const limit = event.blockNumber - from + 1;
151
151
  await this.handleProvenL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
152
152
  break;
@@ -170,8 +170,8 @@ export class SlasherClient extends WithTracer {
170
170
  // get the current latest block numbers
171
171
  this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
172
172
  this.provenBlockNumberAtStart = await this.l2BlockSource.getProvenBlockNumber();
173
- const syncedLatestBlock = this.getSyncedLatestBlockNum() + 1;
174
- const syncedProvenBlock = this.getSyncedProvenBlockNum() + 1;
173
+ const syncedLatestBlock = (await this.getSyncedLatestBlockNum()) + 1;
174
+ const syncedProvenBlock = (await this.getSyncedProvenBlockNum()) + 1;
175
175
  // if there are blocks to be retrieved, go to a synching state
176
176
  if (syncedLatestBlock <= this.latestBlockNumberAtStart || syncedProvenBlock <= this.provenBlockNumberAtStart) {
177
177
  this.setCurrentState(SlasherClientState.SYNCHING);
@@ -198,6 +198,8 @@ export class SlasherClient extends WithTracer {
198
198
  this.log.debug('Stopping Slasher client...');
199
199
  await this.blockStream.stop();
200
200
  this.log.debug('Stopped block downloader');
201
+ await this.store.close();
202
+ this.log.debug('Stopped slasher store');
201
203
  this.setCurrentState(SlasherClientState.STOPPED);
202
204
  this.log.info('Slasher client stopped.');
203
205
  }
@@ -212,22 +214,22 @@ export class SlasherClient extends WithTracer {
212
214
  * Public function to check the latest block number that the slasher client is synced to.
213
215
  * @returns Block number of latest L2 Block we've synced with.
214
216
  */
215
- getSyncedLatestBlockNum() {
216
- return this.synchedLatestBlockNumber.get() ?? INITIAL_L2_BLOCK_NUM - 1;
217
+ async getSyncedLatestBlockNum() {
218
+ return (await this.synchedLatestBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
217
219
  }
218
220
  /**
219
221
  * Public function to check the latest proven block number that the slasher client is synced to.
220
222
  * @returns Block number of latest proven L2 Block we've synced with.
221
223
  */
222
- getSyncedProvenBlockNum() {
223
- return this.synchedProvenBlockNumber.get() ?? INITIAL_L2_BLOCK_NUM - 1;
224
+ async getSyncedProvenBlockNum() {
225
+ return (await this.synchedProvenBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
224
226
  }
225
227
  /**
226
228
  * Method to check the status of the slasher client.
227
229
  * @returns Information about slasher client status: state & syncedToBlockNum.
228
230
  */
229
231
  async getStatus() {
230
- const blockNumber = this.getSyncedLatestBlockNum();
232
+ const blockNumber = await this.getSyncedLatestBlockNum();
231
233
  const blockHash = blockNumber == 0
232
234
  ? ''
233
235
  : await this.l2BlockSource
@@ -246,13 +248,16 @@ export class SlasherClient extends WithTracer {
246
248
  */
247
249
  async handleLatestL2Blocks(blocks) {
248
250
  if (!blocks.length) {
249
- return Promise.resolve();
251
+ return;
250
252
  }
251
- const lastBlockNum = blocks[blocks.length - 1].number;
252
- await Promise.all(blocks.map(async (block) => this.synchedBlockHashes.set(block.number, (await block.hash()).toString())));
253
- await this.synchedLatestBlockNumber.set(lastBlockNum);
254
- this.log.debug(`Synched to latest block ${lastBlockNum}`);
255
- this.startServiceIfSynched();
253
+ await this.store.transactionAsync(async () => {
254
+ for (const block of blocks) {
255
+ await this.synchedBlockHashes.set(block.number, (await block.hash()).toString());
256
+ }
257
+ const lastBlockNum = blocks[blocks.length - 1].number;
258
+ await this.synchedLatestBlockNumber.set(lastBlockNum);
259
+ });
260
+ await this.startServiceIfSynched();
256
261
  }
257
262
  /**
258
263
  * Handles new proven blocks by updating the proven block number
@@ -266,7 +271,7 @@ export class SlasherClient extends WithTracer {
266
271
  const lastBlockNum = blocks[blocks.length - 1].number;
267
272
  await this.synchedProvenBlockNumber.set(lastBlockNum);
268
273
  this.log.debug(`Synched to proven block ${lastBlockNum}`);
269
- this.startServiceIfSynched();
274
+ await this.startServiceIfSynched();
270
275
  }
271
276
  async handlePruneL2Blocks(latestBlock) {
272
277
  const blockHeader = await this.l2BlockSource.getBlockHeader(latestBlock);
@@ -284,10 +289,14 @@ export class SlasherClient extends WithTracer {
284
289
  });
285
290
  await this.synchedLatestBlockNumber.set(latestBlock);
286
291
  }
287
- startServiceIfSynched() {
292
+ async startServiceIfSynched() {
293
+ const [latestBlock, provenBlock] = await Promise.all([
294
+ this.getSyncedLatestBlockNum(),
295
+ this.getSyncedProvenBlockNum(),
296
+ ]);
288
297
  if (this.currentState === SlasherClientState.SYNCHING &&
289
- this.getSyncedLatestBlockNum() >= this.latestBlockNumberAtStart &&
290
- this.getSyncedProvenBlockNum() >= this.provenBlockNumberAtStart) {
298
+ latestBlock >= this.latestBlockNumberAtStart &&
299
+ provenBlock >= this.provenBlockNumberAtStart) {
291
300
  this.log.debug(`Synched to blocks at start`);
292
301
  this.setCurrentState(SlasherClientState.RUNNING);
293
302
  if (this.syncResolve !== undefined) {
@@ -304,4 +313,4 @@ export class SlasherClient extends WithTracer {
304
313
  this.log.debug(`Moved to state ${SlasherClientState[this.currentState]}`);
305
314
  }
306
315
  }
307
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"slasher_client.js","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,GAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAA+C,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAwB,UAAU,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAKL,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,IAAI,GACL,MAAM,MAAM,CAAC;AAEd;;GAEG;AACH,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,2DAAI,CAAA;IACJ,mEAAQ,CAAA;IACR,iEAAO,CAAA;IACP,iEAAO,CAAA;AACT,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AA2BD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,OAAO,aAAc,SAAQ,UAAU;IAuB3C,YACU,MAA0D,EAC1D,KAAmB,EACnB,aAA4B,EACpC,YAA6B,kBAAkB,EAAE,EACzC,MAAM,YAAY,CAAC,SAAS,CAAC;QAErC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QANpB,WAAM,GAAN,MAAM,CAAoD;QAC1D,UAAK,GAAL,KAAK,CAAc;QACnB,kBAAa,GAAb,aAAa,CAAe;QAE5B,QAAG,GAAH,GAAG,CAA0B;QA3B/B,iBAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QACvC,gBAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAChC,gBAAW,GAAgB,SAAS,CAAC;QACrC,6BAAwB,GAAG,CAAC,CAAC,CAAC;QAC9B,6BAAwB,GAAG,CAAC,CAAC,CAAC;QAQ9B,gBAAW,GAAiB,EAAE,CAAC;QAE7B,yBAAoB,GAC5B,SAAS,CAAC;QAEZ,mCAAmC;QACnC,mGAAmG;QACnG,kDAAkD;QAC1C,mBAAc,GAAW,EAAE,CAAC;QAWlC,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,CAAC,EAAE;YACpG,SAAS,EAAE,MAAM,CAAC,qBAAqB;YACvC,cAAc,EAAE,MAAM,CAAC,oBAAoB;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAChE,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;QAC7E,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC,aAAa,CAAC,8BAA8B,CAAC,CAAC;QAEpF,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YACzG,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,kBAAkB,CAAC;gBACtC,KAAK,EAAE,KAAK,CAAC,SAAS;gBACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC7B,eAAe,EAAE,MAAM,CAAC,qBAAqB;aAC9C,CAAC,CAAC;YAEH,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;gBACtC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;gBACtE,GAAG,EAAE,eAAe;gBACpB,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;IAED,6EAA6E;IACtE,KAAK,CAAC,eAAe,CAAC,UAAkB;QAC7C,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,+FAA+F;QAC/F,mDAAmD;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC;YAChF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAEvC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,uBAAuB,CAAC;YAChG,UAAU,CAAC,KAAK;YAChB,UAAU,CAAC,MAAM;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,uDAAuD;YACvD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uCAAuC,cAAc,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAEM,cAAc,CAAC,MAAc;QAClC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,SAAS;QACd,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACzD,IAAI,eAAmC,CAAC;QACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACzD,IAAI,eAAmC,CAAC;QAExC,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACjE,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,iBAAiB,YAAY,CAAC,CAAC;gBAC5E,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;YACjE,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,iBAAiB,YAAY,CAAC,CAAC;gBAC5E,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,MAAM,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;YAC7D,MAAM,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;YAC7D,SAAS,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,KAAyB;QAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,cAAc;gBACjB,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACR,KAAK,iBAAiB;gBACpB,+DAA+D;gBAC/D,MAAM;YACR,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,MAAM,IAAI,GAAG,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;gBAChD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC;gBAC3C,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;gBACjF,MAAM;YACR,CAAC;YACD,KAAK,cAAc;gBACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM;YACR,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,CAAC,GAAU,KAAK,CAAC;gBACvB,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QAED,uCAAuC;QACvC,IAAI,CAAC,wBAAwB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QAC1E,IAAI,CAAC,wBAAwB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE,CAAC;QAEhF,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;QAC7D,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;QAE7D,8DAA8D;QAC9D,IAAI,iBAAiB,IAAI,IAAI,CAAC,wBAAwB,IAAI,iBAAiB,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC7G,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,CAAC,WAAW,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBACvC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,iBAAiB,iBAAiB,iBAAiB,GAAG,CAAC,CAAC;QACjG,CAAC;aAAM,CAAC;YACN,uDAAuD;YACvD,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,iBAAiB,YAAY,iBAAiB,gCAAgC,CAAC,CAAC;QAC5G,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uCAAuC,iBAAiB,EAAE,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,OAAO,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAAI,oBAAoB,GAAG,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACI,uBAAuB;QAC5B,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,IAAI,oBAAoB,GAAG,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,SAAS;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACnD,MAAM,SAAS,GACb,WAAW,IAAI,CAAC;YACd,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa;iBACrB,cAAc,CAAC,WAAW,CAAC;iBAC3B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;iBAC9B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,eAAe,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;SACtC,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,oBAAoB,CAAC,MAAiB;QAClD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;QACtD,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CACtG,CAAC;QACF,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,oBAAoB,CAAC,MAAiB;QAClD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;QACtD,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAE1D,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,WAAmB;QACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/F,MAAM,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2DAA2D,WAAW,EAAE,CAAC,CAAC;QAExF,iFAAiF;QACjF,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC;QAElG,MAAM,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE7E,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAEO,qBAAqB;QAC3B,IACE,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,QAAQ;YACjD,IAAI,CAAC,uBAAuB,EAAE,IAAI,IAAI,CAAC,wBAAwB;YAC/D,IAAI,CAAC,uBAAuB,EAAE,IAAI,IAAI,CAAC,wBAAwB,EAC/D,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC7C,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,QAA4B;QAClD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;CACF"}
316
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"slasher_client.js","sourceRoot":"","sources":["../../src/slasher/slasher_client.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,GAGd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAA+C,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACnG,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAwB,UAAU,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE/F,OAAO,EAKL,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,IAAI,GACL,MAAM,MAAM,CAAC;AAEd;;GAEG;AACH,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,2DAAI,CAAA;IACJ,mEAAQ,CAAA;IACR,iEAAO,CAAA;IACP,iEAAO,CAAA;AACT,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AA2BD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,OAAO,aAAc,SAAQ,UAAU;IAuB3C,YACU,MAA0D,EAC1D,KAAwB,EACxB,aAA4B,EACpC,YAA6B,kBAAkB,EAAE,EACzC,MAAM,YAAY,CAAC,SAAS,CAAC;QAErC,KAAK,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QANpB,WAAM,GAAN,MAAM,CAAoD;QAC1D,UAAK,GAAL,KAAK,CAAmB;QACxB,kBAAa,GAAb,aAAa,CAAe;QAE5B,QAAG,GAAH,GAAG,CAA0B;QA3B/B,iBAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC;QACvC,gBAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAChC,gBAAW,GAAgB,SAAS,CAAC;QACrC,6BAAwB,GAAG,CAAC,CAAC,CAAC;QAC9B,6BAAwB,GAAG,CAAC,CAAC,CAAC;QAQ9B,gBAAW,GAAiB,EAAE,CAAC;QAE7B,yBAAoB,GAC5B,SAAS,CAAC;QAEZ,mCAAmC;QACnC,mGAAmG;QACnG,kDAAkD;QAC1C,mBAAc,GAAW,EAAE,CAAC;QAWlC,IAAI,CAAC,WAAW,GAAG,IAAI,aAAa,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,CAAC,sBAAsB,CAAC,EAAE;YACpG,SAAS,EAAE,MAAM,CAAC,qBAAqB;YACvC,cAAc,EAAE,MAAM,CAAC,oBAAoB;SAC5C,CAAC,CAAC;QAEH,IAAI,CAAC,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;QAChE,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC;QAC7E,IAAI,CAAC,wBAAwB,GAAG,KAAK,CAAC,aAAa,CAAC,8BAA8B,CAAC,CAAC;QAEpF,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,IAAI,MAAM,CAAC,WAAW,CAAC,mBAAmB,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC;YACzG,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG,kBAAkB,CAAC;gBACtC,KAAK,EAAE,KAAK,CAAC,SAAS;gBACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC7B,eAAe,EAAE,MAAM,CAAC,qBAAqB;aAC9C,CAAC,CAAC;YAEH,IAAI,CAAC,oBAAoB,GAAG,WAAW,CAAC;gBACtC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;gBACtE,GAAG,EAAE,eAAe;gBACpB,MAAM,EAAE,YAAY;aACrB,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;IAC9C,CAAC;IAED,6EAA6E;IACtE,KAAK,CAAC,eAAe,CAAC,UAAkB;QAC7C,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,+FAA+F;QAC/F,mDAAmD;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,UAAU,EAAE,CAAC;YAChF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAC3B,CAAC;QAED,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAEvC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,uBAAuB,CAAC;YAChG,UAAU,CAAC,KAAK;YAChB,UAAU,CAAC,MAAM;SAClB,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,uDAAuD;YACvD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uCAAuC,cAAc,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,OAAO,UAAU,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAC/C,CAAC;IAEM,cAAc,CAAC,MAAc;QAClC,OAAO,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,SAAS;QACpB,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,IAAI,eAAmC,CAAC;QACxC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC/D,IAAI,eAAmC,CAAC;QAExC,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAC5E,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,iBAAiB,YAAY,CAAC,CAAC;gBAC5E,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,IAAI,iBAAiB,GAAG,CAAC,EAAE,CAAC;YAC1B,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAC5E,IAAI,OAAO,eAAe,KAAK,WAAW,EAAE,CAAC;gBAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+BAA+B,iBAAiB,YAAY,CAAC,CAAC;gBAC5E,MAAM,IAAI,KAAK,EAAE,CAAC;YACpB,CAAC;QACH,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,MAAM,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;YAC7D,MAAM,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;YAC7D,SAAS,EAAE,EAAE,IAAI,EAAE,eAAgB,EAAE,MAAM,EAAE,iBAAiB,EAAE;SACjE,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,sBAAsB,CAAC,KAAyB;QAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5D,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,cAAc;gBACjB,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM;YACR,KAAK,iBAAiB;gBACpB,+DAA+D;gBAC/D,MAAM;YACR,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,MAAM,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,CAAC;gBACxD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,CAAC;gBAC3C,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;gBACjF,MAAM;YACR,CAAC;YACD,KAAK,cAAc;gBACjB,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAClD,MAAM;YACR,OAAO,CAAC,CAAC,CAAC;gBACR,MAAM,CAAC,GAAU,KAAK,CAAC;gBACvB,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,IAAI,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,OAAO,EAAE,CAAC;YACrD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,IAAI,EAAE,CAAC;YAClD,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;QAED,uCAAuC;QACvC,IAAI,CAAC,wBAAwB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;QAC1E,IAAI,CAAC,wBAAwB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,EAAE,CAAC;QAEhF,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,CAAC;QACrE,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,CAAC;QAErE,8DAA8D;QAC9D,IAAI,iBAAiB,IAAI,IAAI,CAAC,wBAAwB,IAAI,iBAAiB,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAC7G,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAClD,IAAI,CAAC,WAAW,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;gBACvC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,sBAAsB,iBAAiB,iBAAiB,iBAAiB,GAAG,CAAC,CAAC;QACjG,CAAC;aAAM,CAAC;YACN,uDAAuD;YACvD,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,iBAAiB,YAAY,iBAAiB,gCAAgC,CAAC,CAAC;QAC5G,CAAC;QAED,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,uCAAuC,iBAAiB,EAAE,CAAC,CAAC;QAE7E,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC3C,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IACI,OAAO;QACZ,OAAO,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,OAAO,CAAC;IAC1D,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,uBAAuB;QAClC,OAAO,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,oBAAoB,GAAG,CAAC,CAAC;IACtF,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,uBAAuB;QAClC,OAAO,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,IAAI,oBAAoB,GAAG,CAAC,CAAC;IACtF,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,SAAS;QACpB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACzD,MAAM,SAAS,GACb,WAAW,IAAI,CAAC;YACd,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa;iBACrB,cAAc,CAAC,WAAW,CAAC;iBAC3B,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;iBAC9B,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QACxC,OAAO,OAAO,CAAC,OAAO,CAAC;YACrB,KAAK,EAAE,IAAI,CAAC,YAAY;YACxB,eAAe,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE;SACtC,CAAC,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,oBAAoB,CAAC,MAAiB;QAClD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,IAAI,EAAE;YAC3C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;YACnF,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;YACtD,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACrC,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,oBAAoB,CAAC,MAAiB;QAClD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;QACtD,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,YAAY,EAAE,CAAC,CAAC;QAE1D,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;IACrC,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,WAAmB;QACnD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACzE,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC/F,MAAM,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2DAA2D,WAAW,EAAE,CAAC,CAAC;QAExF,iFAAiF;QACjF,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,cAAc,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,cAAc,CAAC;QAElG,MAAM,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;QAE7E,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;YACpB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,IAAI,CAAC,cAAc;YAC3B,QAAQ;SACT,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAEO,KAAK,CAAC,qBAAqB;QACjC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACnD,IAAI,CAAC,uBAAuB,EAAE;YAC9B,IAAI,CAAC,uBAAuB,EAAE;SAC/B,CAAC,CAAC;QACH,IACE,IAAI,CAAC,YAAY,KAAK,kBAAkB,CAAC,QAAQ;YACjD,WAAW,IAAI,IAAI,CAAC,wBAAwB;YAC5C,WAAW,IAAI,IAAI,CAAC,wBAAwB,EAC5C,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC7C,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,eAAe,CAAC,QAA4B;QAClD,IAAI,CAAC,YAAY,GAAG,QAAQ,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;CACF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/sequencer-client",
3
- "version": "0.73.0",
3
+ "version": "0.74.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -28,26 +28,26 @@
28
28
  "test:integration:run": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --config jest.integration.config.json"
29
29
  },
30
30
  "dependencies": {
31
- "@aztec/aztec.js": "0.73.0",
32
- "@aztec/bb-prover": "0.73.0",
33
- "@aztec/blob-sink": "0.73.0",
34
- "@aztec/circuit-types": "0.73.0",
35
- "@aztec/circuits.js": "0.73.0",
36
- "@aztec/epoch-cache": "0.73.0",
37
- "@aztec/ethereum": "0.73.0",
38
- "@aztec/foundation": "0.73.0",
39
- "@aztec/l1-artifacts": "0.73.0",
40
- "@aztec/merkle-tree": "0.73.0",
41
- "@aztec/noir-contracts.js": "0.73.0",
42
- "@aztec/noir-protocol-circuits-types": "0.73.0",
43
- "@aztec/p2p": "0.73.0",
44
- "@aztec/protocol-contracts": "0.73.0",
45
- "@aztec/prover-client": "0.73.0",
46
- "@aztec/simulator": "0.73.0",
47
- "@aztec/telemetry-client": "0.73.0",
48
- "@aztec/types": "0.73.0",
49
- "@aztec/validator-client": "0.73.0",
50
- "@aztec/world-state": "0.73.0",
31
+ "@aztec/aztec.js": "0.74.0",
32
+ "@aztec/bb-prover": "0.74.0",
33
+ "@aztec/blob-sink": "0.74.0",
34
+ "@aztec/circuit-types": "0.74.0",
35
+ "@aztec/circuits.js": "0.74.0",
36
+ "@aztec/epoch-cache": "0.74.0",
37
+ "@aztec/ethereum": "0.74.0",
38
+ "@aztec/foundation": "0.74.0",
39
+ "@aztec/l1-artifacts": "0.74.0",
40
+ "@aztec/merkle-tree": "0.74.0",
41
+ "@aztec/noir-contracts.js": "0.74.0",
42
+ "@aztec/noir-protocol-circuits-types": "0.74.0",
43
+ "@aztec/p2p": "0.74.0",
44
+ "@aztec/protocol-contracts": "0.74.0",
45
+ "@aztec/prover-client": "0.74.0",
46
+ "@aztec/simulator": "0.74.0",
47
+ "@aztec/telemetry-client": "0.74.0",
48
+ "@aztec/types": "0.74.0",
49
+ "@aztec/validator-client": "0.74.0",
50
+ "@aztec/world-state": "0.74.0",
51
51
  "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
52
52
  "@noir-lang/types": "portal:../../noir/packages/types",
53
53
  "lodash.chunk": "^4.2.0",
@@ -4,8 +4,10 @@ import { type AztecAddress, type ContractDataSource } from '@aztec/circuits.js';
4
4
  import { EpochCache } from '@aztec/epoch-cache';
5
5
  import {
6
6
  ForwarderContract,
7
+ GovernanceProposerContract,
7
8
  L1TxUtilsWithBlobs,
8
9
  RollupContract,
10
+ SlashingProposerContract,
9
11
  createEthereumChain,
10
12
  createL1Clients,
11
13
  isAnvilTestChain,
@@ -84,8 +86,25 @@ export class SequencerClient {
84
86
  ] as const);
85
87
  const forwarderContract =
86
88
  config.customForwarderContractAddress && config.customForwarderContractAddress !== EthAddress.ZERO
87
- ? new ForwarderContract(publicClient, config.customForwarderContractAddress.toString())
88
- : await ForwarderContract.create(walletClient.account.address, walletClient, publicClient, log);
89
+ ? new ForwarderContract(
90
+ publicClient,
91
+ config.customForwarderContractAddress.toString(),
92
+ config.l1Contracts.rollupAddress.toString(),
93
+ )
94
+ : await ForwarderContract.create(
95
+ walletClient.account.address,
96
+ walletClient,
97
+ publicClient,
98
+ log,
99
+ config.l1Contracts.rollupAddress.toString(),
100
+ );
101
+
102
+ const governanceProposerContract = new GovernanceProposerContract(
103
+ publicClient,
104
+ config.l1Contracts.governanceProposerAddress.toString(),
105
+ );
106
+ const slashingProposerAddress = await rollupContract.getSlashingProposerAddress();
107
+ const slashingProposerContract = new SlashingProposerContract(publicClient, slashingProposerAddress.toString());
89
108
  const epochCache =
90
109
  deps.epochCache ??
91
110
  (await EpochCache.create(
@@ -110,6 +129,8 @@ export class SequencerClient {
110
129
  rollupContract,
111
130
  epochCache,
112
131
  forwarderContract,
132
+ governanceProposerContract,
133
+ slashingProposerContract,
113
134
  });
114
135
  const globalsBuilder = new GlobalVariableBuilder(config);
115
136
 
@@ -14,25 +14,28 @@ import {
14
14
  FormattedViemError,
15
15
  type ForwarderContract,
16
16
  type GasPrice,
17
+ type GovernanceProposerContract,
18
+ type IEmpireBase,
17
19
  type L1BlobInputs,
18
20
  type L1ContractsConfig,
19
21
  type L1GasConfig,
20
22
  type L1TxRequest,
21
23
  type L1TxUtilsWithBlobs,
22
- type RollupContract,
24
+ RollupContract,
25
+ type SlashingProposerContract,
23
26
  type TransactionStats,
24
27
  formatViemError,
25
28
  } from '@aztec/ethereum';
26
29
  import { toHex } from '@aztec/foundation/bigint-buffer';
27
30
  import { Blob } from '@aztec/foundation/blob';
28
31
  import { type Signature } from '@aztec/foundation/eth-signature';
29
- import { type Logger, createLogger } from '@aztec/foundation/log';
32
+ import { createLogger } from '@aztec/foundation/log';
30
33
  import { Timer } from '@aztec/foundation/timer';
31
- import { EmpireBaseAbi, ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
34
+ import { ForwarderAbi, RollupAbi } from '@aztec/l1-artifacts';
32
35
  import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
33
36
 
34
37
  import pick from 'lodash.pick';
35
- import { type TransactionReceipt, encodeFunctionData, getAddress, getContract } from 'viem';
38
+ import { type TransactionReceipt, encodeFunctionData } from 'viem';
36
39
 
37
40
  import { type PublisherConfig, type TxSenderConfig } from './config.js';
38
41
  import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
@@ -106,6 +109,8 @@ export class SequencerPublisher {
106
109
 
107
110
  public l1TxUtils: L1TxUtilsWithBlobs;
108
111
  public rollupContract: RollupContract;
112
+ public govProposerContract: GovernanceProposerContract;
113
+ public slashingProposerContract: SlashingProposerContract;
109
114
 
110
115
  protected requests: RequestWithExpiry[] = [];
111
116
 
@@ -117,15 +122,14 @@ export class SequencerPublisher {
117
122
  forwarderContract: ForwarderContract;
118
123
  l1TxUtils: L1TxUtilsWithBlobs;
119
124
  rollupContract: RollupContract;
125
+ slashingProposerContract: SlashingProposerContract;
126
+ governanceProposerContract: GovernanceProposerContract;
120
127
  epochCache: EpochCache;
121
128
  },
122
129
  ) {
123
130
  this.ethereumSlotDuration = BigInt(config.ethereumSlotDuration);
124
131
  this.epochCache = deps.epochCache;
125
132
 
126
- if (config.l1Contracts.governanceProposerAddress) {
127
- this.governanceProposerAddress = EthAddress.fromString(config.l1Contracts.governanceProposerAddress.toString());
128
- }
129
133
  this.blobSinkClient = deps.blobSinkClient ?? createBlobSinkClient(config);
130
134
 
131
135
  const telemetry = deps.telemetry ?? getTelemetryClient();
@@ -134,6 +138,9 @@ export class SequencerPublisher {
134
138
 
135
139
  this.rollupContract = deps.rollupContract;
136
140
  this.forwarderContract = deps.forwarderContract;
141
+
142
+ this.govProposerContract = deps.governanceProposerContract;
143
+ this.slashingProposerContract = deps.slashingProposerContract;
137
144
  }
138
145
 
139
146
  public registerSlashPayloadGetter(callback: GetSlashPayloadCallBack) {
@@ -221,12 +228,13 @@ export class SequencerPublisher {
221
228
  this.l1TxUtils,
222
229
  gasConfig,
223
230
  blobConfig,
231
+ this.log,
224
232
  );
225
233
  this.callbackBundledTransactions(validRequests, result);
226
234
  return result;
227
235
  } catch (err) {
228
- const { message, metaMessages } = formatViemError(err);
229
- this.log.error(`Failed to publish bundled transactions`, message, { metaMessages });
236
+ const viemError = formatViemError(err);
237
+ this.log.error(`Failed to publish bundled transactions`, viemError);
230
238
  return undefined;
231
239
  }
232
240
  }
@@ -249,7 +257,7 @@ export class SequencerPublisher {
249
257
  * @returns The slot and block number if it is possible to propose, undefined otherwise
250
258
  */
251
259
  public canProposeAtNextEthBlock(tipArchive: Buffer) {
252
- const ignoredErrors = ['SlotAlreadyInChain', 'InvalidProposer'];
260
+ const ignoredErrors = ['SlotAlreadyInChain', 'InvalidProposer', 'InvalidArchive'];
253
261
  return this.rollupContract
254
262
  .canProposeAtNextEthBlock(tipArchive, this.getForwarderAddress().toString(), this.ethereumSlotDuration)
255
263
  .catch(err => {
@@ -335,114 +343,85 @@ export class SequencerPublisher {
335
343
  return committee.map(EthAddress.fromString);
336
344
  }
337
345
 
338
- /**
339
- * Enqueues a castVote transaction to cast a vote for a given slot number.
340
- * @param slotNumber - The slot number to cast a vote for.
341
- * @param timestamp - The timestamp of the slot to cast a vote for.
342
- * @param voteType - The type of vote to cast.
343
- * @returns True if the vote was successfully enqueued, false otherwise.
344
- */
345
- public async enqueueCastVote(slotNumber: bigint, timestamp: bigint, voteType: VoteType): Promise<boolean> {
346
- // @todo This function can be optimized by doing some of the computations locally instead of calling the L1 contracts
346
+ private async enqueueCastVoteHelper(
347
+ slotNumber: bigint,
348
+ timestamp: bigint,
349
+ voteType: VoteType,
350
+ payload: EthAddress,
351
+ base: IEmpireBase,
352
+ ): Promise<boolean> {
347
353
  if (this.myLastVotes[voteType] >= slotNumber) {
348
354
  return false;
349
355
  }
350
-
351
- const voteConfig = async (): Promise<
352
- { payload: EthAddress; voteContractAddress: EthAddress; logger: Logger } | undefined
353
- > => {
354
- if (voteType === VoteType.GOVERNANCE) {
355
- if (this.governancePayload.equals(EthAddress.ZERO)) {
356
- return undefined;
357
- }
358
- if (!this.governanceProposerAddress) {
359
- return undefined;
360
- }
361
- return {
362
- payload: this.governancePayload,
363
- voteContractAddress: this.governanceProposerAddress,
364
- logger: this.governanceLog,
365
- };
366
- } else if (voteType === VoteType.SLASHING) {
367
- if (!this.getSlashPayload) {
368
- return undefined;
369
- }
370
- const slashingProposerAddress = await this.rollupContract.getSlashingProposerAddress();
371
- if (!slashingProposerAddress) {
372
- return undefined;
373
- }
374
-
375
- const slashPayload = await this.getSlashPayload(slotNumber);
376
-
377
- if (!slashPayload) {
378
- return undefined;
379
- }
380
-
381
- return {
382
- payload: slashPayload,
383
- voteContractAddress: slashingProposerAddress,
384
- logger: this.slashingLog,
385
- };
386
- } else {
387
- throw new Error('Invalid vote type');
388
- }
389
- };
390
-
391
- const vConfig = await voteConfig();
392
-
393
- if (!vConfig) {
356
+ if (payload.equals(EthAddress.ZERO)) {
394
357
  return false;
395
358
  }
396
-
397
- const { payload, voteContractAddress } = vConfig;
398
-
399
- const voteContract = getContract({
400
- address: getAddress(voteContractAddress.toString()),
401
- abi: EmpireBaseAbi,
402
- client: this.l1TxUtils.walletClient,
403
- });
404
-
405
- const [proposer, roundNumber] = await Promise.all([
359
+ const round = await base.computeRound(slotNumber);
360
+ const [proposer, roundInfo] = await Promise.all([
406
361
  this.rollupContract.getProposerAt(timestamp),
407
- voteContract.read.computeRound([slotNumber]),
362
+ base.getRoundInfo(this.rollupContract.address, round),
408
363
  ]);
409
364
 
410
365
  if (proposer.toLowerCase() !== this.getForwarderAddress().toString().toLowerCase()) {
411
366
  return false;
412
367
  }
413
-
414
- const [slotForLastVote] = await voteContract.read.rounds([this.rollupContract.address, roundNumber]);
415
-
416
- if (slotForLastVote >= slotNumber) {
368
+ if (roundInfo.lastVote >= slotNumber) {
417
369
  return false;
418
370
  }
419
371
 
420
372
  const cachedLastVote = this.myLastVotes[voteType];
421
-
422
373
  this.myLastVotes[voteType] = slotNumber;
423
374
 
424
375
  this.addRequest({
425
376
  action: voteType === VoteType.GOVERNANCE ? 'governance-vote' : 'slashing-vote',
426
- request: {
427
- to: voteContractAddress.toString(),
428
- data: encodeFunctionData({
429
- abi: EmpireBaseAbi,
430
- functionName: 'vote',
431
- args: [payload.toString()],
432
- }),
433
- },
377
+ request: base.createVoteRequest(payload.toString()),
434
378
  lastValidL2Slot: slotNumber,
435
379
  onResult: (_request, result) => {
436
380
  if (!result || result.receipt.status !== 'success') {
437
381
  this.myLastVotes[voteType] = cachedLastVote;
438
382
  } else {
439
- this.log.info(`Cast ${voteType} vote for slot ${slotNumber}`);
383
+ this.log.info(`Cast [${voteType}] vote for slot ${slotNumber}`);
440
384
  }
441
385
  },
442
386
  });
443
387
  return true;
444
388
  }
445
389
 
390
+ private async getVoteConfig(
391
+ slotNumber: bigint,
392
+ voteType: VoteType,
393
+ ): Promise<{ payload: EthAddress; base: IEmpireBase } | undefined> {
394
+ if (voteType === VoteType.GOVERNANCE) {
395
+ return { payload: this.governancePayload, base: this.govProposerContract };
396
+ } else if (voteType === VoteType.SLASHING) {
397
+ if (!this.getSlashPayload) {
398
+ return undefined;
399
+ }
400
+ const slashPayload = await this.getSlashPayload(slotNumber);
401
+ if (!slashPayload) {
402
+ return undefined;
403
+ }
404
+ return { payload: slashPayload, base: this.slashingProposerContract };
405
+ }
406
+ throw new Error('Unreachable: Invalid vote type');
407
+ }
408
+
409
+ /**
410
+ * Enqueues a castVote transaction to cast a vote for a given slot number.
411
+ * @param slotNumber - The slot number to cast a vote for.
412
+ * @param timestamp - The timestamp of the slot to cast a vote for.
413
+ * @param voteType - The type of vote to cast.
414
+ * @returns True if the vote was successfully enqueued, false otherwise.
415
+ */
416
+ public async enqueueCastVote(slotNumber: bigint, timestamp: bigint, voteType: VoteType): Promise<boolean> {
417
+ const voteConfig = await this.getVoteConfig(slotNumber, voteType);
418
+ if (!voteConfig) {
419
+ return false;
420
+ }
421
+ const { payload, base } = voteConfig;
422
+ return this.enqueueCastVoteHelper(slotNumber, timestamp, voteType, payload, base);
423
+ }
424
+
446
425
  /**
447
426
  * Proposes a L2 block on L1.
448
427
  *
@@ -627,7 +606,7 @@ export class SequencerPublisher {
627
606
  // @note we override checkBlob to false since blobs are not part simulate()
628
607
  stateDiff: [
629
608
  {
630
- slot: toHex(9n, true),
609
+ slot: toHex(RollupContract.checkBlobStorageSlot, true),
631
610
  value: toHex(0n, true),
632
611
  },
633
612
  ],
@@ -657,6 +636,7 @@ export class SequencerPublisher {
657
636
  const kzg = Blob.getViemKzgInstance();
658
637
  const { rollupData, simulationResult, blobEvaluationGas } = await this.prepareProposeTx(encodedData, timestamp);
659
638
  const startBlock = await this.l1TxUtils.getBlockNumber();
639
+ const blockHash = await block.hash();
660
640
 
661
641
  return this.addRequest({
662
642
  action: 'propose',
@@ -708,7 +688,7 @@ export class SequencerPublisher {
708
688
  this.log.error(`Rollup process tx reverted. ${errorMsg ?? 'No error message'}`, undefined, {
709
689
  ...block.getStats(),
710
690
  txHash: receipt.transactionHash,
711
- blockHash: block.hash().toString(),
691
+ blockHash,
712
692
  slotNumber: block.header.globalVariables.slotNumber.toBigInt(),
713
693
  });
714
694
  }
@@ -1,9 +1,9 @@
1
1
  import type { L2BlockSource } from '@aztec/circuit-types';
2
2
  import { type L1ContractsConfig, type L1ReaderConfig } from '@aztec/ethereum';
3
3
  import { createLogger } from '@aztec/foundation/log';
4
- import { type AztecKVStore } from '@aztec/kv-store';
4
+ import { type AztecAsyncKVStore } from '@aztec/kv-store';
5
5
  import { type DataStoreConfig } from '@aztec/kv-store/config';
6
- import { createStore } from '@aztec/kv-store/lmdb';
6
+ import { createStore } from '@aztec/kv-store/lmdb-v2';
7
7
  import { type TelemetryClient, getTelemetryClient } from '@aztec/telemetry-client';
8
8
 
9
9
  import { SlasherClient } from './slasher_client.js';
@@ -13,7 +13,7 @@ export const createSlasherClient = async (
13
13
  _config: SlasherConfig & DataStoreConfig & L1ContractsConfig & L1ReaderConfig,
14
14
  l2BlockSource: L2BlockSource,
15
15
  telemetry: TelemetryClient = getTelemetryClient(),
16
- deps: { store?: AztecKVStore } = {},
16
+ deps: { store?: AztecAsyncKVStore } = {},
17
17
  ) => {
18
18
  const config = { ..._config };
19
19
  const store = deps.store ?? (await createStore('slasher', config, createLogger('slasher:lmdb')));