@aztec/sequencer-client 0.67.1 → 0.68.1
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/client/sequencer-client.d.ts +3 -1
- package/dest/client/sequencer-client.d.ts.map +1 -1
- package/dest/client/sequencer-client.js +17 -3
- package/dest/config.d.ts +3 -3
- package/dest/config.d.ts.map +1 -1
- package/dest/config.js +8 -56
- package/dest/index.d.ts +1 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +2 -2
- package/dest/publisher/index.d.ts +0 -1
- package/dest/publisher/index.d.ts.map +1 -1
- package/dest/publisher/index.js +1 -2
- package/dest/publisher/l1-publisher-metrics.d.ts +5 -2
- package/dest/publisher/l1-publisher-metrics.d.ts.map +1 -1
- package/dest/publisher/l1-publisher-metrics.js +16 -1
- package/dest/publisher/l1-publisher.d.ts +4 -1
- package/dest/publisher/l1-publisher.d.ts.map +1 -1
- package/dest/publisher/l1-publisher.js +200 -44
- package/dest/publisher/utils.d.ts +1 -3
- package/dest/publisher/utils.d.ts.map +1 -1
- package/dest/publisher/utils.js +2 -8
- package/dest/sequencer/allowed.d.ts +3 -0
- package/dest/sequencer/allowed.d.ts.map +1 -0
- package/dest/sequencer/allowed.js +34 -0
- package/dest/sequencer/config.d.ts +1 -1
- package/dest/sequencer/config.d.ts.map +1 -1
- package/dest/sequencer/metrics.d.ts +2 -0
- package/dest/sequencer/metrics.d.ts.map +1 -1
- package/dest/sequencer/metrics.js +13 -2
- package/dest/sequencer/sequencer.d.ts +14 -11
- package/dest/sequencer/sequencer.d.ts.map +1 -1
- package/dest/sequencer/sequencer.js +160 -87
- package/dest/sequencer/utils.d.ts +2 -7
- package/dest/sequencer/utils.d.ts.map +1 -1
- package/dest/sequencer/utils.js +3 -11
- package/dest/tx_validator/gas_validator.d.ts +3 -4
- package/dest/tx_validator/gas_validator.d.ts.map +1 -1
- package/dest/tx_validator/gas_validator.js +25 -8
- package/dest/tx_validator/tx_validator_factory.d.ts.map +1 -1
- package/dest/tx_validator/tx_validator_factory.js +6 -4
- package/package.json +26 -23
- package/src/client/sequencer-client.ts +25 -5
- package/src/config.ts +10 -60
- package/src/index.ts +1 -1
- package/src/publisher/index.ts +0 -1
- package/src/publisher/l1-publisher-metrics.ts +24 -3
- package/src/publisher/l1-publisher.ts +241 -68
- package/src/publisher/utils.ts +1 -10
- package/src/sequencer/allowed.ts +36 -0
- package/src/sequencer/config.ts +1 -1
- package/src/sequencer/metrics.ts +15 -1
- package/src/sequencer/sequencer.ts +195 -109
- package/src/sequencer/utils.ts +2 -11
- package/src/tx_validator/gas_validator.ts +32 -6
- package/src/tx_validator/tx_validator_factory.ts +11 -3
|
@@ -3,19 +3,20 @@ import { ConsensusPayload, SignatureDomainSeperator, getHashedSignaturePayload,
|
|
|
3
3
|
import { AGGREGATION_OBJECT_LENGTH, AZTEC_MAX_EPOCH_DURATION, EthAddress, } from '@aztec/circuits.js';
|
|
4
4
|
import { L1TxUtils, createEthereumChain, } from '@aztec/ethereum';
|
|
5
5
|
import { makeTuple } from '@aztec/foundation/array';
|
|
6
|
+
import { toHex } from '@aztec/foundation/bigint-buffer';
|
|
7
|
+
import { Blob } from '@aztec/foundation/blob';
|
|
6
8
|
import { areArraysEqual, compactArray, times } from '@aztec/foundation/collection';
|
|
7
9
|
import { Fr } from '@aztec/foundation/fields';
|
|
8
10
|
import { createLogger } from '@aztec/foundation/log';
|
|
9
11
|
import { serializeToBuffer } from '@aztec/foundation/serialize';
|
|
10
12
|
import { InterruptibleSleep } from '@aztec/foundation/sleep';
|
|
11
13
|
import { Timer } from '@aztec/foundation/timer';
|
|
12
|
-
import { GovernanceProposerAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
14
|
+
import { ExtRollupLibAbi, GovernanceProposerAbi, LeonidasLibAbi, RollupAbi } from '@aztec/l1-artifacts';
|
|
13
15
|
import pick from 'lodash.pick';
|
|
14
|
-
import {
|
|
15
|
-
import { ContractFunctionRevertedError, createPublicClient, createWalletClient, encodeFunctionData, getAbiItem, getAddress, getContract, hexToBytes, http, publicActions, } from 'viem';
|
|
16
|
+
import { ContractFunctionExecutionError, ContractFunctionRevertedError, createPublicClient, createWalletClient, encodeFunctionData, getAbiItem, getAddress, getContract, getContractError, hexToBytes, http, publicActions, } from 'viem';
|
|
16
17
|
import { privateKeyToAccount } from 'viem/accounts';
|
|
17
18
|
import { L1PublisherMetrics } from './l1-publisher-metrics.js';
|
|
18
|
-
import {
|
|
19
|
+
import { prettyLogViemErrorMsg } from './utils.js';
|
|
19
20
|
/**
|
|
20
21
|
* Publishes L2 blocks to L1. This implementation does *not* retry a transaction in
|
|
21
22
|
* the event of network congestion, but should work for local development.
|
|
@@ -160,7 +161,10 @@ export class L1Publisher {
|
|
|
160
161
|
await this.rollupContract.read.validateEpochProofRightClaimAtTime(args, { account: this.account });
|
|
161
162
|
}
|
|
162
163
|
catch (err) {
|
|
163
|
-
|
|
164
|
+
let errorName = tryGetCustomErrorName(err);
|
|
165
|
+
if (!errorName) {
|
|
166
|
+
errorName = tryGetCustomErrorNameContractFunction(err);
|
|
167
|
+
}
|
|
164
168
|
this.log.warn(`Proof quote validation failed: ${errorName}`, quote);
|
|
165
169
|
return undefined;
|
|
166
170
|
}
|
|
@@ -187,7 +191,7 @@ export class L1Publisher {
|
|
|
187
191
|
formattedSignatures,
|
|
188
192
|
`0x${attestationData.digest.toString('hex')}`,
|
|
189
193
|
ts,
|
|
190
|
-
`0x${header.contentCommitment.
|
|
194
|
+
`0x${header.contentCommitment.blobsHash.toString('hex')}`,
|
|
191
195
|
flags,
|
|
192
196
|
];
|
|
193
197
|
try {
|
|
@@ -199,6 +203,38 @@ export class L1Publisher {
|
|
|
199
203
|
const err = error;
|
|
200
204
|
this.log.debug(`Validation failed: ${err.message}`, err.data);
|
|
201
205
|
}
|
|
206
|
+
else if (error instanceof ContractFunctionExecutionError) {
|
|
207
|
+
let err = error;
|
|
208
|
+
if (!tryGetCustomErrorName(err)) {
|
|
209
|
+
// If we get here, it's because the custom error no longer exists in Rollup.sol,
|
|
210
|
+
// but in another lib. The below reconstructs the error message.
|
|
211
|
+
try {
|
|
212
|
+
await this.publicClient.estimateGas({
|
|
213
|
+
data: encodeFunctionData({
|
|
214
|
+
abi: this.rollupContract.abi,
|
|
215
|
+
functionName: 'validateHeader',
|
|
216
|
+
args,
|
|
217
|
+
}),
|
|
218
|
+
account: this.account,
|
|
219
|
+
to: this.rollupContract.address,
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
catch (estGasErr) {
|
|
223
|
+
const possibleAbis = [ExtRollupLibAbi, LeonidasLibAbi];
|
|
224
|
+
possibleAbis.forEach(abi => {
|
|
225
|
+
const possibleErr = getContractError(estGasErr, {
|
|
226
|
+
args: [],
|
|
227
|
+
abi: abi,
|
|
228
|
+
functionName: 'validateHeader',
|
|
229
|
+
address: this.rollupContract.address,
|
|
230
|
+
sender: this.account.address,
|
|
231
|
+
});
|
|
232
|
+
err = tryGetCustomErrorName(possibleErr) ? possibleErr : err;
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
throw err;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
202
238
|
else {
|
|
203
239
|
this.log.debug(`Unexpected error during validation: ${error}`);
|
|
204
240
|
}
|
|
@@ -292,6 +328,7 @@ export class L1Publisher {
|
|
|
292
328
|
archive: block.archive.root.toBuffer(),
|
|
293
329
|
blockHash: block.header.hash().toBuffer(),
|
|
294
330
|
body: block.body.toBuffer(),
|
|
331
|
+
blobs: Blob.getBlobs(block.body.toBlobFields()),
|
|
295
332
|
attestations,
|
|
296
333
|
txHashes: txHashes ?? [],
|
|
297
334
|
};
|
|
@@ -317,13 +354,15 @@ export class L1Publisher {
|
|
|
317
354
|
this.log.info(`Failed to publish block ${block.number} to L1`, ctx);
|
|
318
355
|
return false;
|
|
319
356
|
}
|
|
320
|
-
const { receipt, args, functionName } = result;
|
|
357
|
+
const { receipt, args, functionName, data } = result;
|
|
321
358
|
// Tx was mined successfully
|
|
322
359
|
if (receipt.status === 'success') {
|
|
323
360
|
const tx = await this.getTransactionStats(receipt.transactionHash);
|
|
324
361
|
const stats = {
|
|
325
362
|
gasPrice: receipt.effectiveGasPrice,
|
|
326
363
|
gasUsed: receipt.gasUsed,
|
|
364
|
+
blobGasUsed: receipt.blobGasUsed ?? 0n,
|
|
365
|
+
blobDataGas: receipt.blobGasPrice ?? 0n,
|
|
327
366
|
transactionHash: receipt.transactionHash,
|
|
328
367
|
...pick(tx, 'calldataGas', 'calldataSize', 'sender'),
|
|
329
368
|
...block.getStats(),
|
|
@@ -334,12 +373,16 @@ export class L1Publisher {
|
|
|
334
373
|
return true;
|
|
335
374
|
}
|
|
336
375
|
this.metrics.recordFailedTx('process');
|
|
337
|
-
const
|
|
376
|
+
const kzg = Blob.getViemKzgInstance();
|
|
377
|
+
const errorMsg = await this.tryGetErrorFromRevertedTx(data, {
|
|
338
378
|
args,
|
|
339
379
|
functionName,
|
|
340
380
|
abi: RollupAbi,
|
|
341
381
|
address: this.rollupContract.address,
|
|
342
|
-
|
|
382
|
+
}, {
|
|
383
|
+
blobs: proposeTxArgs.blobs.map(b => b.data),
|
|
384
|
+
kzg,
|
|
385
|
+
maxFeePerBlobGas: 10000000000n,
|
|
343
386
|
});
|
|
344
387
|
this.log.error(`Rollup process tx reverted. ${errorMsg}`, undefined, {
|
|
345
388
|
...ctx,
|
|
@@ -348,20 +391,104 @@ export class L1Publisher {
|
|
|
348
391
|
await this.sleepOrInterrupted();
|
|
349
392
|
return false;
|
|
350
393
|
}
|
|
351
|
-
|
|
394
|
+
/** Calls claimEpochProofRight in the Rollup contract to submit a chosen prover quote for the previous epoch. */
|
|
395
|
+
async claimEpochProofRight(proofQuote) {
|
|
396
|
+
const timer = new Timer();
|
|
397
|
+
let receipt;
|
|
352
398
|
try {
|
|
353
|
-
|
|
354
|
-
|
|
399
|
+
this.log.debug(`Submitting claimEpochProofRight transaction`);
|
|
400
|
+
receipt = await this.l1TxUtils.sendAndMonitorTransaction({
|
|
401
|
+
to: this.rollupContract.address,
|
|
402
|
+
data: encodeFunctionData({
|
|
403
|
+
abi: RollupAbi,
|
|
404
|
+
functionName: 'claimEpochProofRight',
|
|
405
|
+
args: [proofQuote.toViemArgs()],
|
|
406
|
+
}),
|
|
407
|
+
});
|
|
355
408
|
}
|
|
356
409
|
catch (err) {
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
410
|
+
this.log.error(`Failed to claim epoch proof right: ${prettyLogViemErrorMsg(err)}`, err, {
|
|
411
|
+
proofQuote: proofQuote.toInspect(),
|
|
412
|
+
});
|
|
413
|
+
return false;
|
|
414
|
+
}
|
|
415
|
+
if (receipt.status === 'success') {
|
|
416
|
+
const tx = await this.getTransactionStats(receipt.transactionHash);
|
|
417
|
+
const stats = {
|
|
418
|
+
gasPrice: receipt.effectiveGasPrice,
|
|
419
|
+
gasUsed: receipt.gasUsed,
|
|
420
|
+
transactionHash: receipt.transactionHash,
|
|
421
|
+
blobDataGas: 0n,
|
|
422
|
+
blobGasUsed: 0n,
|
|
423
|
+
...pick(tx, 'calldataGas', 'calldataSize', 'sender'),
|
|
424
|
+
};
|
|
425
|
+
this.log.verbose(`Submitted claim epoch proof right to L1 rollup contract`, {
|
|
426
|
+
...stats,
|
|
427
|
+
...proofQuote.toInspect(),
|
|
428
|
+
});
|
|
429
|
+
this.metrics.recordClaimEpochProofRightTx(timer.ms(), stats);
|
|
430
|
+
return true;
|
|
431
|
+
}
|
|
432
|
+
else {
|
|
433
|
+
this.metrics.recordFailedTx('claimEpochProofRight');
|
|
434
|
+
// TODO: Get the error message from the reverted tx
|
|
435
|
+
this.log.error(`Claim epoch proof right tx reverted`, {
|
|
436
|
+
txHash: receipt.transactionHash,
|
|
437
|
+
...proofQuote.toInspect(),
|
|
438
|
+
});
|
|
439
|
+
return false;
|
|
440
|
+
}
|
|
441
|
+
}
|
|
442
|
+
async tryGetErrorFromRevertedTx(data, args, _blobInputs) {
|
|
443
|
+
const blobInputs = _blobInputs || {};
|
|
444
|
+
try {
|
|
445
|
+
// NB: If this fn starts unexpectedly giving incorrect blob hash errors, it may be because the checkBlob
|
|
446
|
+
// bool is no longer at the slot below. To find the slot, run: forge inspect src/core/Rollup.sol:Rollup storage
|
|
447
|
+
const checkBlobSlot = 9n;
|
|
448
|
+
await this.publicClient.simulateContract({
|
|
449
|
+
...args,
|
|
450
|
+
account: this.walletClient.account,
|
|
451
|
+
stateOverride: [
|
|
452
|
+
{
|
|
453
|
+
address: args.address,
|
|
454
|
+
stateDiff: [
|
|
455
|
+
{
|
|
456
|
+
slot: toHex(checkBlobSlot, true),
|
|
457
|
+
value: toHex(0n, true),
|
|
458
|
+
},
|
|
459
|
+
],
|
|
460
|
+
},
|
|
461
|
+
],
|
|
462
|
+
});
|
|
463
|
+
// If the above passes, we have a blob error. We cannot simulate blob txs, and failed txs no longer throw errors,
|
|
464
|
+
// and viem provides no way to get the revert reason from a given tx.
|
|
465
|
+
// Strangely, the only way to throw the revert reason as an error and provide blobs is prepareTransactionRequest.
|
|
466
|
+
// See: https://github.com/wevm/viem/issues/2075
|
|
467
|
+
// This throws a EstimateGasExecutionError with the custom error information:
|
|
468
|
+
await this.walletClient.prepareTransactionRequest({
|
|
469
|
+
account: this.walletClient.account,
|
|
470
|
+
to: this.rollupContract.address,
|
|
471
|
+
data,
|
|
472
|
+
...blobInputs,
|
|
473
|
+
});
|
|
474
|
+
return undefined;
|
|
475
|
+
}
|
|
476
|
+
catch (simulationErr) {
|
|
477
|
+
// If we don't have a ContractFunctionExecutionError, we have a blob related error => use ExtRollupLibAbi to get the error msg.
|
|
478
|
+
const contractErr = simulationErr.name === 'ContractFunctionExecutionError'
|
|
479
|
+
? simulationErr
|
|
480
|
+
: getContractError(simulationErr, {
|
|
481
|
+
args: [],
|
|
482
|
+
abi: ExtRollupLibAbi,
|
|
483
|
+
functionName: args.functionName,
|
|
484
|
+
address: args.address,
|
|
485
|
+
sender: this.account.address,
|
|
486
|
+
});
|
|
487
|
+
if (contractErr.name === 'ContractFunctionExecutionError') {
|
|
488
|
+
const execErr = contractErr;
|
|
489
|
+
return tryGetCustomErrorNameContractFunction(execErr);
|
|
363
490
|
}
|
|
364
|
-
this.log.error(`Error getting error from simulation`,
|
|
491
|
+
this.log.error(`Error getting error from simulation`, simulationErr);
|
|
365
492
|
}
|
|
366
493
|
}
|
|
367
494
|
async submitEpochProof(args) {
|
|
@@ -385,6 +512,8 @@ export class L1Publisher {
|
|
|
385
512
|
const stats = {
|
|
386
513
|
...pick(receipt, 'gasPrice', 'gasUsed', 'transactionHash'),
|
|
387
514
|
...pick(tx, 'calldataGas', 'calldataSize', 'sender'),
|
|
515
|
+
blobDataGas: 0n,
|
|
516
|
+
blobGasUsed: 0n,
|
|
388
517
|
eventName: 'proof-published-to-l1',
|
|
389
518
|
};
|
|
390
519
|
this.log.info(`Published epoch proof to L1 rollup contract`, { ...stats, ...ctx });
|
|
@@ -459,7 +588,8 @@ export class L1Publisher {
|
|
|
459
588
|
epochSize: argsArray[0],
|
|
460
589
|
args: argsArray[1],
|
|
461
590
|
fees: argsArray[2],
|
|
462
|
-
|
|
591
|
+
blobPublicInputs: argsArray[3],
|
|
592
|
+
aggregationObject: argsArray[4],
|
|
463
593
|
proof: proofHex,
|
|
464
594
|
},
|
|
465
595
|
];
|
|
@@ -480,20 +610,25 @@ export class L1Publisher {
|
|
|
480
610
|
}
|
|
481
611
|
}
|
|
482
612
|
async prepareProposeTx(encodedData) {
|
|
483
|
-
const
|
|
613
|
+
const kzg = Blob.getViemKzgInstance();
|
|
614
|
+
const blobEvaluationGas = await this.l1TxUtils.estimateGas(this.account, {
|
|
484
615
|
to: this.rollupContract.address,
|
|
485
616
|
data: encodeFunctionData({
|
|
486
617
|
abi: this.rollupContract.abi,
|
|
487
|
-
functionName: '
|
|
488
|
-
args: [
|
|
618
|
+
functionName: 'validateBlobs',
|
|
619
|
+
args: [Blob.getEthBlobEvaluationInputs(encodedData.blobs)],
|
|
489
620
|
}),
|
|
621
|
+
}, {}, {
|
|
622
|
+
blobs: encodedData.blobs.map(b => b.data),
|
|
623
|
+
kzg,
|
|
624
|
+
maxFeePerBlobGas: 10000000000n, //This is 10 gwei, taken from DEFAULT_MAX_FEE_PER_GAS
|
|
490
625
|
});
|
|
491
626
|
// @note We perform this guesstimate instead of the usual `gasEstimate` since
|
|
492
627
|
// viem will use the current state to simulate against, which means that
|
|
493
628
|
// we will fail estimation in the case where we are simulating for the
|
|
494
629
|
// first ethereum block within our slot (as current time is not in the
|
|
495
630
|
// slot yet).
|
|
496
|
-
const gasGuesstimate =
|
|
631
|
+
const gasGuesstimate = blobEvaluationGas + _a.PROPOSE_GAS_GUESS;
|
|
497
632
|
const attestations = encodedData.attestations
|
|
498
633
|
? encodedData.attestations.map(attest => attest.toViemSignature())
|
|
499
634
|
: [];
|
|
@@ -511,7 +646,9 @@ export class L1Publisher {
|
|
|
511
646
|
txHashes,
|
|
512
647
|
},
|
|
513
648
|
attestations,
|
|
649
|
+
// TODO(#9101): Extract blobs from beacon chain => calldata will only contain what's needed to verify blob and body input can be removed
|
|
514
650
|
`0x${encodedData.body.toString('hex')}`,
|
|
651
|
+
Blob.getEthBlobEvaluationInputs(encodedData.blobs),
|
|
515
652
|
];
|
|
516
653
|
return { args, gas: gasGuesstimate };
|
|
517
654
|
}
|
|
@@ -530,6 +667,10 @@ export class L1Publisher {
|
|
|
530
667
|
makeTuple(AZTEC_MAX_EPOCH_DURATION * 2, i => i % 2 === 0
|
|
531
668
|
? args.publicInputs.fees[i / 2].recipient.toField().toString()
|
|
532
669
|
: args.publicInputs.fees[(i - 1) / 2].value.toString()),
|
|
670
|
+
`0x${args.publicInputs.blobPublicInputs
|
|
671
|
+
.filter((_, i) => i < args.toBlock - args.fromBlock + 1)
|
|
672
|
+
.map(b => b.toString())
|
|
673
|
+
.join(``)}`,
|
|
533
674
|
`0x${serializeToBuffer(args.proof.extractAggregationObject()).toString('hex')}`,
|
|
534
675
|
];
|
|
535
676
|
}
|
|
@@ -538,26 +679,32 @@ export class L1Publisher {
|
|
|
538
679
|
return undefined;
|
|
539
680
|
}
|
|
540
681
|
try {
|
|
682
|
+
const kzg = Blob.getViemKzgInstance();
|
|
541
683
|
const { args, gas } = await this.prepareProposeTx(encodedData);
|
|
684
|
+
const data = encodeFunctionData({
|
|
685
|
+
abi: this.rollupContract.abi,
|
|
686
|
+
functionName: 'propose',
|
|
687
|
+
args,
|
|
688
|
+
});
|
|
542
689
|
const receipt = await this.l1TxUtils.sendAndMonitorTransaction({
|
|
543
690
|
to: this.rollupContract.address,
|
|
544
|
-
data
|
|
545
|
-
abi: this.rollupContract.abi,
|
|
546
|
-
functionName: 'propose',
|
|
547
|
-
args,
|
|
548
|
-
}),
|
|
691
|
+
data,
|
|
549
692
|
}, {
|
|
550
693
|
fixedGas: gas,
|
|
694
|
+
}, {
|
|
695
|
+
blobs: encodedData.blobs.map(b => b.data),
|
|
696
|
+
kzg,
|
|
697
|
+
maxFeePerBlobGas: 10000000000n, //This is 10 gwei, taken from DEFAULT_MAX_FEE_PER_GAS
|
|
551
698
|
});
|
|
552
699
|
return {
|
|
553
700
|
receipt,
|
|
554
701
|
args,
|
|
555
702
|
functionName: 'propose',
|
|
703
|
+
data,
|
|
556
704
|
};
|
|
557
705
|
}
|
|
558
706
|
catch (err) {
|
|
559
|
-
|
|
560
|
-
this.log.error(`Rollup publish failed`, err);
|
|
707
|
+
this.log.error(`Rollup publish failed: ${prettyLogViemErrorMsg(err)}`, err);
|
|
561
708
|
return undefined;
|
|
562
709
|
}
|
|
563
710
|
}
|
|
@@ -566,27 +713,30 @@ export class L1Publisher {
|
|
|
566
713
|
return undefined;
|
|
567
714
|
}
|
|
568
715
|
try {
|
|
569
|
-
|
|
570
|
-
this.log.info(inspect(quote.payload));
|
|
716
|
+
const kzg = Blob.getViemKzgInstance();
|
|
571
717
|
const { args, gas } = await this.prepareProposeTx(encodedData);
|
|
718
|
+
const data = encodeFunctionData({
|
|
719
|
+
abi: this.rollupContract.abi,
|
|
720
|
+
functionName: 'proposeAndClaim',
|
|
721
|
+
args: [...args, quote.toViemArgs()],
|
|
722
|
+
});
|
|
572
723
|
const receipt = await this.l1TxUtils.sendAndMonitorTransaction({
|
|
573
724
|
to: this.rollupContract.address,
|
|
574
|
-
data
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
}
|
|
725
|
+
data,
|
|
726
|
+
}, { fixedGas: gas }, {
|
|
727
|
+
blobs: encodedData.blobs.map(b => b.data),
|
|
728
|
+
kzg,
|
|
729
|
+
maxFeePerBlobGas: 10000000000n, //This is 10 gwei, taken from DEFAULT_MAX_FEE_PER_GAS
|
|
730
|
+
});
|
|
580
731
|
return {
|
|
581
732
|
receipt,
|
|
582
|
-
args,
|
|
733
|
+
args: [...args, quote.toViemArgs()],
|
|
583
734
|
functionName: 'proposeAndClaim',
|
|
735
|
+
data,
|
|
584
736
|
};
|
|
585
737
|
}
|
|
586
738
|
catch (err) {
|
|
587
|
-
|
|
588
|
-
const errorMessage = err instanceof Error ? err.message : String(err);
|
|
589
|
-
this.log.error(`Rollup publish failed`, errorMessage);
|
|
739
|
+
this.log.error(`Rollup publish failed: ${prettyLogViemErrorMsg(err)}`, err);
|
|
590
740
|
return undefined;
|
|
591
741
|
}
|
|
592
742
|
}
|
|
@@ -628,6 +778,9 @@ export class L1Publisher {
|
|
|
628
778
|
}
|
|
629
779
|
}
|
|
630
780
|
_a = L1Publisher;
|
|
781
|
+
// @note - with blobs, the below estimate seems too large.
|
|
782
|
+
// Total used for full block from int_l1_pub e2e test: 1m (of which 86k is 1x blob)
|
|
783
|
+
// Total used for emptier block from above test: 429k (of which 84k is 1x blob)
|
|
631
784
|
L1Publisher.PROPOSE_GAS_GUESS = 12000000n;
|
|
632
785
|
L1Publisher.PROPOSE_AND_CLAIM_GAS_GUESS = _a.PROPOSE_GAS_GUESS + 100000n;
|
|
633
786
|
/**
|
|
@@ -638,6 +791,9 @@ L1Publisher.PROPOSE_AND_CLAIM_GAS_GUESS = _a.PROPOSE_GAS_GUESS + 100000n;
|
|
|
638
791
|
function getCalldataGasUsage(data) {
|
|
639
792
|
return data.filter(byte => byte === 0).length * 4 + data.filter(byte => byte !== 0).length * 16;
|
|
640
793
|
}
|
|
794
|
+
function tryGetCustomErrorNameContractFunction(err) {
|
|
795
|
+
return compactArray([err.shortMessage, ...(err.metaMessages ?? []).slice(0, 2).map(s => s.trim())]).join(' ');
|
|
796
|
+
}
|
|
641
797
|
function tryGetCustomErrorName(err) {
|
|
642
798
|
try {
|
|
643
799
|
// See https://viem.sh/docs/contract/simulateContract#handling-custom-errors
|
|
@@ -653,4 +809,4 @@ function tryGetCustomErrorName(err) {
|
|
|
653
809
|
return undefined;
|
|
654
810
|
}
|
|
655
811
|
}
|
|
656
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1-publisher.js","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,gBAAgB,EAIhB,wBAAwB,EAExB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EAExB,UAAU,GAIX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,SAAS,EAET,mBAAmB,GACpB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAEnF,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAc,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAGvE,OAAO,IAAI,MAAM,aAAa,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAKL,6BAA6B,EAY7B,kBAAkB,EAClB,kBAAkB,EAClB,kBAAkB,EAClB,UAAU,EACV,UAAU,EACV,WAAW,EACX,UAAU,EACV,IAAI,EACJ,aAAa,GACd,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAgEvE;;;;;;;GAOG;AACH,MAAM,OAAO,WAAW;IA+BtB,YACE,MAA4G,EAC5G,MAAuB;QAhCjB,uBAAkB,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE9C,gBAAW,GAAG,KAAK,CAAC;QAGpB,YAAO,GAAe,UAAU,CAAC,IAAI,CAAC;QACtC,eAAU,GAAW,EAAE,CAAC;QAEtB,QAAG,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAAC;QAC1C,kBAAa,GAAG,YAAY,CAAC,gCAAgC,CAAC,CAAC;QAM/D,+BAA0B,GAGhC,SAAS,CAAC;QAgBZ,IAAI,CAAC,WAAW,GAAG,MAAM,EAAE,wBAAwB,IAAI,KAAM,CAAC;QAC9D,IAAI,CAAC,oBAAoB,GAAG,MAAM,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,GAAG,IAAI,kBAAkB,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAE7D,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAC1F,MAAM,KAAK,GAAG,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;QAElE,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEjE,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC;YACrC,KAAK,EAAE,KAAK,CAAC,SAAS;YACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YAC7B,eAAe,EAAE,MAAM,CAAC,qBAAqB;SAC9C,CAAC,CAAC;QAEH,IAAI,CAAC,cAAc,GAAG,WAAW,CAAC;YAChC,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YACzD,GAAG,EAAE,SAAS;YACd,MAAM,EAAE,IAAI,CAAC,YAAY;SAC1B,CAAC,CAAC;QAEH,IAAI,WAAW,CAAC,yBAAyB,EAAE,CAAC;YAC1C,IAAI,CAAC,0BAA0B,GAAG,WAAW,CAAC;gBAC5C,OAAO,EAAE,UAAU,CAAC,WAAW,CAAC,yBAAyB,CAAC,QAAQ,EAAE,CAAC;gBACrE,GAAG,EAAE,qBAAqB;gBAC1B,MAAM,EAAE,IAAI,CAAC,YAAY;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACzF,CAAC;IAED,IAAI,gBAAgB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IAC9B,CAAC;IAES,kBAAkB,CAC1B,OAA0B,EAC1B,KAAoB;QAEpB,OAAO,kBAAkB,CAAC;YACxB,OAAO;YACP,KAAK,EAAE,KAAK,CAAC,SAAS;YACtB,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;SAC9B,CAAC,CAAC;IACL,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,UAAU,CAAC,OAAmB;QACnC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,gBAAgB;QACrB,OAAO,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,SAAS;QAOd,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACjD,CAAC;IAEM,iBAAiB;QAItB,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,wBAAwB,CAAC,OAAe;QACnD,kFAAkF;QAClF,yFAAyF;QACzF,2EAA2E;QAC3E,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5G,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC;YAC1E,gBAAgB;YAChB,KAAK,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;SAC/B,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IAC7B,CAAC;IAEM,KAAK,CAAC,iBAAiB;QAC5B,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC5D,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YAC7C,oDAAoD;YACpD,kDAAkD;YAClD,kEAAkE;YAClE,MAAM,cAAc,GAAI,CAAC,wBAAwB,EAAE,kCAAkC,CAAW,CAAC,GAAG,CAClG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAClD,CAAC;YAEF,IAAI,SAAS,IAAI,cAAc,CAAC,QAAQ,CAAC,SAAgB,CAAC,EAAE,CAAC;gBAC3D,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,UAAkB;QACnD,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,eAAe;QAC1B,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;QAC1D,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,+GAA+G;YAC/G,4EAA4E;YAC5E,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,SAAS,KAAK,UAAU,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtF,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,MAAM,EACJ,YAAY,EACZ,aAAa,EACb,UAAU,EACV,YAAY,EAAE,eAAe,EAC7B,gBAAgB,EAAE,mBAAmB,GACtC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QAEnD,MAAM,YAAY,GAAG,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QAC5D,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QAEpE,IAAI,YAAY,CAAC,MAAM,EAAE,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,YAAY,KAAK,EAAE,EAAE,CAAC;YAC9E,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,OAAO;YACL,YAAY;YACZ,aAAa;YACb,UAAU;YACV,YAAY;YACZ,gBAAgB;SACjB,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,KAAsB;QACpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5G,MAAM,IAAI,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,UAAU,EAAE,CAAU,CAAC;QAC7D,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,kCAAkC,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACrG,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;YACpE,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,0BAA0B,CACrC,MAAmB,EACnB,kBAA+D;QAC7D,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,UAAU,EAAE,EAAE;KACf;QAED,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAE9F,MAAM,mBAAmB,GAAG,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QAC/F,MAAM,KAAK,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QAEpF,MAAM,IAAI,GAAG;YACX,KAAK,MAAM,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACxC,mBAAmB;YACnB,KAAK,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC7C,EAAE;YACF,KAAK,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAC9D,KAAK;SACG,CAAC;QAEX,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACjF,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,4BAA4B;YAC5B,IAAI,KAAK,YAAY,6BAA6B,EAAE,CAAC;gBACnD,MAAM,GAAG,GAAG,KAAsC,CAAC;gBACnD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,GAAG,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAChE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,KAAK,EAAE,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,wBAAwB;QACnC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC5E,OAAO,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,MAAc;QACtC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,MAAa,EAAE,CAAC,CAAC;QAC3E,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO;YACL,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC1B,eAAe,EAAE,EAAE,CAAC,IAAI;YACxB,YAAY,EAAE,QAAQ,CAAC,MAAM;YAC7B,WAAW,EAAE,mBAAmB,CAAC,QAAQ,CAAC;SAC3C,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,UAAkB,EAAE,SAAiB;QACzD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,uHAAuH;QACvH,+GAA+G;QAE/G,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAChD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,CAAC;YACnD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,UAAU,CAAC,CAAC;SAChE,CAAC,CAAC;QAEH,IAAI,QAAQ,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;YAClE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,CAAC,eAAe,CAAC,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC;YAC1E,IAAI,CAAC,cAAc,CAAC,OAAO;YAC3B,WAAW;SACZ,CAAC,CAAC;QAEH,IAAI,eAAe,IAAI,UAAU,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,+EAA+E;QAC/E,0CAA0C;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,UAAU,CAAC;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,oBAAoB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAE/D,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAClH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YACvC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;YAChD,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;YACnC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC;gBAClE,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;gBACnC,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,cAAc,CACzB,KAAc,EACd,YAA0B,EAC1B,QAAmB,EACnB,UAA4B;QAE5B,MAAM,GAAG,GAAG;YACV,WAAW,EAAE,KAAK,CAAC,MAAM;YACzB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,eAAe,CAAC,UAAU,CAAC,QAAQ,EAAE;YAC9D,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;SACnC,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;QAEhG,MAAM,MAAM,GAAG,yBAAyB,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,gBAAgB,CAAC,CAAC;QACtG,MAAM,aAAa,GAAG;YACpB,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE;YAC/B,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE;YACtC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;YACzC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC3B,YAAY;YACZ,QAAQ,EAAE,QAAQ,IAAI,EAAE;SACzB,CAAC;QAEF,4DAA4D;QAC5D,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,4DAA4D,EAAE,GAAG,CAAC,CAAC;YACpF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QAE1B,yHAAyH;QACzH,6EAA6E;QAC7E,uHAAuH;QACvH,6CAA6C;QAC7C,MAAM,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,MAAM,EAAE;YAClD,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;YACzB,UAAU,EAAE,YAAY,IAAI,EAAE;SAC/B,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,UAAU;YACvB,CAAC,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,UAAU,CAAC;YAC7D,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAE5C,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,KAAK,CAAC,MAAM,QAAQ,EAAE,GAAG,CAAC,CAAC;YACpE,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;QAE/C,4BAA4B;QAC5B,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACnE,MAAM,KAAK,GAAwB;gBACjC,QAAQ,EAAE,OAAO,CAAC,iBAAiB;gBACnC,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,GAAG,IAAI,CAAC,EAAG,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,CAAC;gBACrD,GAAG,KAAK,CAAC,QAAQ,EAAE;gBACnB,SAAS,EAAE,wBAAwB;aACpC,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,0CAA0C,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;YACnF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAEvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC;YACpD,IAAI;YACJ,YAAY;YACZ,GAAG,EAAE,SAAS;YACd,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO;YACpC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+BAA+B,QAAQ,EAAE,EAAE,SAAS,EAAE;YACnE,GAAG,GAAG;YACN,MAAM,EAAE,OAAO,CAAC,eAAe;SAChC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,yBAAyB,CAAC,IAMvC;QACC,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1F,OAAO,SAAS,CAAC;QACnB,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAgC,EAAE,CAAC;gBAClD,MAAM,OAAO,GAAG,GAAqC,CAAC;gBACtD,OAAO,YAAY,CAAC;oBAClB,OAAO,CAAC,YAAY;oBACpB,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;iBAC/D,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,IAM7B;QACC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACjD,MAAM,GAAG,GAAG,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;YAE1B,sEAAsE;YACtE,MAAM,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;YAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACvD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC;YACf,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;YACzD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YAED,4BAA4B;YAC5B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;gBAClD,MAAM,KAAK,GAAwB;oBACjC,GAAG,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,CAAC;oBAC1D,GAAG,IAAI,CAAC,EAAG,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,CAAC;oBACrD,SAAS,EAAE,uBAAuB;iBACnC,CAAC;gBACF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;gBACnF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6CAA6C,OAAO,CAAC,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;YAC5F,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,4DAA4D,EAAE,GAAG,CAAC,CAAC;QACpF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,IAK1C;QACC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QAEzD,qEAAqE;QACrE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5G,IAAI,MAAM,KAAK,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,IAAI,OAAO,uBAAuB,MAAM,EAAE,CAAC,CAAC;QACxG,CAAC;QACD,IAAI,OAAO,GAAG,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,SAAS,IAAI,OAAO,wBAAwB,OAAO,EAAE,CAAC,CAAC;QAC1G,CAAC;QAED,4EAA4E;QAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;QACnE,IAAI,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;YACtE,MAAM,IAAI,KAAK,CACb,mCAAmC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,QAAQ,CAAC,OAAO,EAAE,CAC1G,CAAC;QACJ,CAAC;QACD,mEAAmE;QACnE,IAAI,QAAQ,CAAC,SAAS,KAAK,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,YAAY,CAAC,iBAAiB,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;YAClH,MAAM,IAAI,KAAK,CACb,iCAAiC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,QAAQ,CAAC,SAAS,EAAE,CACvG,CAAC;QACJ,CAAC;QAED,mEAAmE;QACnE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/E,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CACb,8BAA8B,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,WAAW,CAAC,OAAO,EAAE,CACnG,CAAC;QACJ,CAAC;QACD,IAAI,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,WAAW,CAAC,SAAS,EAAE,CAAC;YACnE,MAAM,IAAI,KAAK,CAAC,4BAA4B,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE,QAAQ,WAAW,CAAC,SAAS,EAAE,CAAC,CAAC;QACnH,CAAC;QAED,4EAA4E;QAC5E,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,yBAAyB,CACjF,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CACnC,CAAC;QACF,MAAM,iBAAiB,GAAG,KAAK,CAAC,OAAO,EAAE;YACvC,CAAC,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,CAAC,IAAI,CAAC;YAC3C,CAAC,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC;QACrC,MAAM,gBAAgB,GAAG,CAAC,GAAG,YAAY,CAAC,QAAQ,EAAE,EAAE,GAAG,iBAAiB,CAAC,CAAC;QAE5E,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACvG,MAAM,GAAG,GAAG,CAAC,MAAgC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC3F,MAAM,IAAI,KAAK,CACb,iDAAiD,GAAG,CAAC,kBAAkB,CAAC,cAAc,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAC9G,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,SAAS;QACd,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;IACtC,CAAC;IAED,wDAAwD;IACjD,OAAO;QACZ,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,IAKpC;QACC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;YAErD,MAAM,MAAM,GAAG;gBACb;oBACE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;oBACvB,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;oBAClB,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;oBAClB,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC;oBAC/B,KAAK,EAAE,QAAQ;iBAChB;aACO,CAAC;YAEX,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,MAAM,QAAQ,CAAC,CAAC;YAE7F,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC;gBAC/D,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO;gBAC/B,IAAI,EAAE,kBAAkB,CAAC;oBACvB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG;oBAC5B,YAAY,EAAE,sBAAsB;oBACpC,IAAI,EAAE,MAAM;iBACb,CAAC;aACH,CAAC,CAAC;YAEH,OAAO,SAAS,CAAC,eAAe,CAAC;QACnC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;YACxD,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,WAA0B;QACvD,MAAM,wBAAwB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE;YAC9E,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO;YAC/B,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG;gBAC5B,YAAY,EAAE,uBAAuB;gBACrC,IAAI,EAAE,CAAC,KAAK,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;aAChD,CAAC;SACH,CAAC,CAAC;QAEH,8EAA8E;QAC9E,+EAA+E;QAC/E,6EAA6E;QAC7E,6EAA6E;QAC7E,oBAAoB;QACpB,MAAM,cAAc,GAAG,wBAAwB,GAAG,EAAW,CAAC,iBAAiB,CAAC;QAEhF,MAAM,YAAY,GAAG,WAAW,CAAC,YAAY;YAC3C,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;YAClE,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACnG,MAAM,IAAI,GAAG;YACX;gBACE,MAAM,EAAE,KAAK,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACjD,OAAO,EAAE,KAAK,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACnD,WAAW,EAAE;oBACX,kDAAkD;oBAClD,qBAAqB,EAAE,EAAE;oBACzB,mBAAmB,EAAE,EAAE;iBACxB;gBACD,SAAS,EAAE,KAAK,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACvD,QAAQ;aACT;YACD,YAAY;YACZ,KAAK,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;SAC/B,CAAC;QAEX,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAEO,uBAAuB,CAAC,IAK/B;QACC,OAAO;YACL,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;YACzC;gBACE,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACjD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAC5C,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,QAAQ,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE;gBACzC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE;gBACzC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE;gBACpC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE;aACtC;YACD,SAAS,CAAC,wBAAwB,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,CAC1C,CAAC,GAAG,CAAC,KAAK,CAAC;gBACT,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;gBAC9D,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,EAAE,CACzD;YACD,KAAK,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;SACvE,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,aAAa,CACzB,WAA0B;QAE1B,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAC5D;gBACE,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO;gBAC/B,IAAI,EAAE,kBAAkB,CAAC;oBACvB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG;oBAC5B,YAAY,EAAE,SAAS;oBACvB,IAAI;iBACL,CAAC;aACH,EACD;gBACE,QAAQ,EAAE,GAAG;aACd,CACF,CAAC;YACF,OAAO;gBACL,OAAO;gBACP,IAAI;gBACJ,YAAY,EAAE,SAAS;aACxB,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;YAC7C,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,WAA0B,EAC1B,KAAsB;QAEtB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAEtC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;YAC/D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAC5D;gBACE,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO;gBAC/B,IAAI,EAAE,kBAAkB,CAAC;oBACvB,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,GAAG;oBAC5B,YAAY,EAAE,iBAAiB;oBAC/B,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,UAAU,EAAE,CAAC;iBACpC,CAAC;aACH,EACD,EAAE,QAAQ,EAAE,GAAG,EAAE,CAClB,CAAC;YAEF,OAAO;gBACL,OAAO;gBACP,IAAI;gBACJ,YAAY,EAAE,iBAAiB;aAChC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,YAAY,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACtE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC;YACtD,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACxC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC;oBAC5D,IAAI,EAAE,MAAa;iBACpB,CAAC,CAAC;gBAEH,IAAI,OAAO,EAAE,CAAC;oBACZ,IAAI,OAAO,CAAC,eAAe,KAAK,MAAM,EAAE,CAAC;wBACvC,MAAM,IAAI,KAAK,CAAC,qBAAqB,OAAO,CAAC,eAAe,QAAQ,MAAM,EAAE,CAAC,CAAC;oBAChF,CAAC;oBAED,OAAO;wBACL,MAAM,EAAE,OAAO,CAAC,MAAM,KAAK,SAAS;wBACpC,eAAe,EAAE,MAAM;wBACvB,OAAO,EAAE,OAAO,CAAC,OAAO;wBACxB,QAAQ,EAAE,OAAO,CAAC,iBAAiB;wBACnC,IAAI,EAAE,OAAO,CAAC,IAAI;wBAClB,WAAW,EAAE,OAAO,CAAC,WAAW;qBACjC,CAAC;gBACJ,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,MAAM,EAAE,CAAC,CAAC;gBAC1D,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,kDAAkD;gBAClD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAClC,CAAC;QACH,CAAC;IACH,CAAC;IAES,KAAK,CAAC,kBAAkB;QAChC,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxD,CAAC;;;AArvBa,6BAAiB,GAAW,SAAW,AAAtB,CAAuB;AACxC,uCAA2B,GAAW,EAAI,CAAC,iBAAiB,GAAG,OAAQ,AAA5C,CAA6C;AAuvBxF;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,IAAgB;IAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;AAClG,CAAC;AAED,SAAS,qBAAqB,CAAC,GAAQ;IACrC,IAAI,CAAC;QACH,4EAA4E;QAC5E,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAgC,EAAE,CAAC;YAC9E,MAAM,SAAS,GAAG,GAAgB,CAAC;YACnC,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAE,GAAa,CAAC,IAAI,KAAK,+BAA+B,CAAC,CAAC;YACnG,IAAI,WAAW,EAAE,CAAC;gBAChB,OAAQ,WAA6C,CAAC,IAAI,EAAE,SAAS,CAAC;YACxE,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
812
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"l1-publisher.js","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare function prettyLogViemErrorMsg(err: any): string | undefined;
|
|
3
|
-
export declare function prettyLogViemError(err: any, logger: Logger): void;
|
|
1
|
+
export declare function prettyLogViemErrorMsg(err: any): any;
|
|
4
2
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publisher/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/publisher/utils.ts"],"names":[],"mappings":"AAEA,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,OAW7C"}
|
package/dest/publisher/utils.js
CHANGED
|
@@ -8,12 +8,6 @@ export function prettyLogViemErrorMsg(err) {
|
|
|
8
8
|
return `${errorName}${args}`;
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
|
+
return err?.message ?? err;
|
|
11
12
|
}
|
|
12
|
-
|
|
13
|
-
export function prettyLogViemError(err, logger) {
|
|
14
|
-
const msg = prettyLogViemErrorMsg(err);
|
|
15
|
-
if (msg) {
|
|
16
|
-
logger.debug(`canProposeAtTime failed with "${msg}"`);
|
|
17
|
-
}
|
|
18
|
-
}
|
|
19
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxTQUFTLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEUsTUFBTSxVQUFVLHFCQUFxQixDQUFDLEdBQVE7SUFDNUMsSUFBSSxHQUFHLFlBQVksU0FBUyxFQUFFLENBQUM7UUFDN0IsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsWUFBWSw2QkFBNkIsQ0FBQyxDQUFDO1FBQ2xGLElBQUksV0FBVyxZQUFZLDZCQUE2QixFQUFFLENBQUM7WUFDekQsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxTQUFTLElBQUksRUFBRSxDQUFDO1lBQ3BELE1BQU0sSUFBSSxHQUNSLFdBQVcsQ0FBQyxZQUFZLElBQUksV0FBVyxDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDbEgsT0FBTyxHQUFHLFNBQVMsR0FBRyxJQUFJLEVBQUUsQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztBQUNILENBQUM7QUFFRCxzQ0FBc0M7QUFDdEMsTUFBTSxVQUFVLGtCQUFrQixDQUFDLEdBQVEsRUFBRSxNQUFjO0lBQ3pELE1BQU0sR0FBRyxHQUFHLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZDLElBQUksR0FBRyxFQUFFLENBQUM7UUFDUixNQUFNLENBQUMsS0FBSyxDQUFDLGlDQUFpQyxHQUFHLEdBQUcsQ0FBQyxDQUFDO0lBQ3hELENBQUM7QUFDSCxDQUFDIn0=
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFFaEUsTUFBTSxVQUFVLHFCQUFxQixDQUFDLEdBQVE7SUFDNUMsSUFBSSxHQUFHLFlBQVksU0FBUyxFQUFFLENBQUM7UUFDN0IsTUFBTSxXQUFXLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsWUFBWSw2QkFBNkIsQ0FBQyxDQUFDO1FBQ2xGLElBQUksV0FBVyxZQUFZLDZCQUE2QixFQUFFLENBQUM7WUFDekQsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLElBQUksRUFBRSxTQUFTLElBQUksRUFBRSxDQUFDO1lBQ3BELE1BQU0sSUFBSSxHQUNSLFdBQVcsQ0FBQyxZQUFZLElBQUksV0FBVyxDQUFDLFlBQVksRUFBRSxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7WUFDbEgsT0FBTyxHQUFHLFNBQVMsR0FBRyxJQUFJLEVBQUUsQ0FBQztRQUMvQixDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU8sR0FBRyxFQUFFLE9BQU8sSUFBSSxHQUFHLENBQUM7QUFDN0IsQ0FBQyJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"allowed.d.ts","sourceRoot":"","sources":["../../src/sequencer/allowed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAQ3D,wBAAgB,+BAA+B,IAAI,cAAc,EAAE,CA2BlE"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { getContractClassFromArtifact } from '@aztec/circuits.js';
|
|
2
|
+
import { FPCContract } from '@aztec/noir-contracts.js/FPC';
|
|
3
|
+
import { TokenContractArtifact } from '@aztec/noir-contracts.js/Token';
|
|
4
|
+
import { ProtocolContractAddress } from '@aztec/protocol-contracts';
|
|
5
|
+
let defaultAllowedSetupFunctions = undefined;
|
|
6
|
+
export function getDefaultAllowedSetupFunctions() {
|
|
7
|
+
if (defaultAllowedSetupFunctions === undefined) {
|
|
8
|
+
defaultAllowedSetupFunctions = [
|
|
9
|
+
// needed for authwit support
|
|
10
|
+
{
|
|
11
|
+
address: ProtocolContractAddress.AuthRegistry,
|
|
12
|
+
},
|
|
13
|
+
// needed for claiming on the same tx as a spend
|
|
14
|
+
{
|
|
15
|
+
address: ProtocolContractAddress.FeeJuice,
|
|
16
|
+
// We can't restrict the selector because public functions get routed via dispatch.
|
|
17
|
+
// selector: FunctionSelector.fromSignature('_increase_public_balance((Field),Field)'),
|
|
18
|
+
},
|
|
19
|
+
// needed for private transfers via FPC
|
|
20
|
+
{
|
|
21
|
+
classId: getContractClassFromArtifact(TokenContractArtifact).id,
|
|
22
|
+
// We can't restrict the selector because public functions get routed via dispatch.
|
|
23
|
+
// selector: FunctionSelector.fromSignature('_increase_public_balance((Field),Field)'),
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
classId: getContractClassFromArtifact(FPCContract.artifact).id,
|
|
27
|
+
// We can't restrict the selector because public functions get routed via dispatch.
|
|
28
|
+
// selector: FunctionSelector.fromSignature('prepare_fee((Field),Field,(Field),Field)'),
|
|
29
|
+
},
|
|
30
|
+
];
|
|
31
|
+
}
|
|
32
|
+
return defaultAllowedSetupFunctions;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWxsb3dlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZXF1ZW5jZXIvYWxsb3dlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDM0QsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFDdkUsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFFcEUsSUFBSSw0QkFBNEIsR0FBaUMsU0FBUyxDQUFDO0FBRTNFLE1BQU0sVUFBVSwrQkFBK0I7SUFDN0MsSUFBSSw0QkFBNEIsS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMvQyw0QkFBNEIsR0FBRztZQUM3Qiw2QkFBNkI7WUFDN0I7Z0JBQ0UsT0FBTyxFQUFFLHVCQUF1QixDQUFDLFlBQVk7YUFDOUM7WUFDRCxnREFBZ0Q7WUFDaEQ7Z0JBQ0UsT0FBTyxFQUFFLHVCQUF1QixDQUFDLFFBQVE7Z0JBQ3pDLG1GQUFtRjtnQkFDbkYsdUZBQXVGO2FBQ3hGO1lBQ0QsdUNBQXVDO1lBQ3ZDO2dCQUNFLE9BQU8sRUFBRSw0QkFBNEIsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFDLEVBQUU7Z0JBQy9ELG1GQUFtRjtnQkFDbkYsdUZBQXVGO2FBQ3hGO1lBQ0Q7Z0JBQ0UsT0FBTyxFQUFFLDRCQUE0QixDQUFDLFdBQVcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFO2dCQUM5RCxtRkFBbUY7Z0JBQ25GLHdGQUF3RjthQUN6RjtTQUNGLENBQUM7SUFDSixDQUFDO0lBQ0QsT0FBTyw0QkFBNEIsQ0FBQztBQUN0QyxDQUFDIn0=
|