@aztec/sequencer-client 0.72.1 → 0.74.0

package/src/slasher/slasher_client.ts

@@ -10,7 +10,7 @@ import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
 import { type L1ContractsConfig, type L1ReaderConfig, createEthereumChain } from '@aztec/ethereum';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
-import { type AztecKVStore, type AztecMap, type AztecSingleton } from '@aztec/kv-store';
+import type { AztecAsyncKVStore, AztecAsyncMap, AztecAsyncSingleton } from '@aztec/kv-store';
 import { SlashFactoryAbi } from '@aztec/l1-artifacts';
 import { type TelemetryClient, WithTracer, getTelemetryClient } from '@aztec/telemetry-client';
 
@@ -92,9 +92,9 @@ export class SlasherClient extends WithTracer {
   private latestBlockNumberAtStart = -1;
   private provenBlockNumberAtStart = -1;
 
-  private synchedBlockHashes: AztecMap<number, string>;
-  private synchedLatestBlockNumber: AztecSingleton<number>;
-  private synchedProvenBlockNumber: AztecSingleton<number>;
+  private synchedBlockHashes: AztecAsyncMap<number, string>;
+  private synchedLatestBlockNumber: AztecAsyncSingleton<number>;
+  private synchedProvenBlockNumber: AztecAsyncSingleton<number>;
 
   private blockStream;
 
@@ -110,7 +110,7 @@ export class SlasherClient extends WithTracer {
 
   constructor(
     private config: SlasherConfig & L1ContractsConfig & L1ReaderConfig,
-    private store: AztecKVStore,
+    private store: AztecAsyncKVStore,
     private l2BlockSource: L2BlockSource,
     telemetry: TelemetryClient = getTelemetryClient(),
     private log = createLogger('slasher'),
@@ -178,17 +178,17 @@ export class SlasherClient extends WithTracer {
   }
 
   public getL2BlockHash(number: number): Promise<string | undefined> {
-    return Promise.resolve(this.synchedBlockHashes.get(number));
+    return this.synchedBlockHashes.getAsync(number);
   }
 
-  public getL2Tips(): Promise<L2Tips> {
-    const latestBlockNumber = this.getSyncedLatestBlockNum();
+  public async getL2Tips(): Promise<L2Tips> {
+    const latestBlockNumber = await this.getSyncedLatestBlockNum();
     let latestBlockHash: string | undefined;
-    const provenBlockNumber = this.getSyncedProvenBlockNum();
+    const provenBlockNumber = await this.getSyncedProvenBlockNum();
     let provenBlockHash: string | undefined;
 
     if (latestBlockNumber > 0) {
-      latestBlockHash = this.synchedBlockHashes.get(latestBlockNumber);
+      latestBlockHash = await this.synchedBlockHashes.getAsync(latestBlockNumber);
       if (typeof latestBlockHash === 'undefined') {
         this.log.warn(`Block hash for latest block ${latestBlockNumber} not found`);
         throw new Error();
@@ -196,7 +196,7 @@ export class SlasherClient extends WithTracer {
     }
 
     if (provenBlockNumber > 0) {
-      provenBlockHash = this.synchedBlockHashes.get(provenBlockNumber);
+      provenBlockHash = await this.synchedBlockHashes.getAsync(provenBlockNumber);
       if (typeof provenBlockHash === 'undefined') {
         this.log.warn(`Block hash for proven block ${provenBlockNumber} not found`);
         throw new Error();
@@ -220,7 +220,7 @@ export class SlasherClient extends WithTracer {
         // TODO (alexg): I think we can prune the block hashes map here
         break;
       case 'chain-proven': {
-        const from = this.getSyncedProvenBlockNum() + 1;
+        const from = (await this.getSyncedProvenBlockNum()) + 1;
         const limit = event.blockNumber - from + 1;
         await this.handleProvenL2Blocks(await this.l2BlockSource.getBlocks(from, limit));
         break;
@@ -247,8 +247,8 @@ export class SlasherClient extends WithTracer {
     this.latestBlockNumberAtStart = await this.l2BlockSource.getBlockNumber();
     this.provenBlockNumberAtStart = await this.l2BlockSource.getProvenBlockNumber();
 
-    const syncedLatestBlock = this.getSyncedLatestBlockNum() + 1;
-    const syncedProvenBlock = this.getSyncedProvenBlockNum() + 1;
+    const syncedLatestBlock = (await this.getSyncedLatestBlockNum()) + 1;
+    const syncedProvenBlock = (await this.getSyncedProvenBlockNum()) + 1;
 
     // if there are blocks to be retrieved, go to a synching state
     if (syncedLatestBlock <= this.latestBlockNumberAtStart || syncedProvenBlock <= this.provenBlockNumberAtStart) {
@@ -278,6 +278,8 @@ export class SlasherClient extends WithTracer {
     this.log.debug('Stopping Slasher client...');
     await this.blockStream.stop();
     this.log.debug('Stopped block downloader');
+    await this.store.close();
+    this.log.debug('Stopped slasher store');
     this.setCurrentState(SlasherClientState.STOPPED);
     this.log.info('Slasher client stopped.');
   }
@@ -294,16 +296,16 @@ export class SlasherClient extends WithTracer {
    * Public function to check the latest block number that the slasher client is synced to.
    * @returns Block number of latest L2 Block we've synced with.
    */
-  public getSyncedLatestBlockNum() {
-    return this.synchedLatestBlockNumber.get() ?? INITIAL_L2_BLOCK_NUM - 1;
+  public async getSyncedLatestBlockNum(): Promise<number> {
+    return (await this.synchedLatestBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
   }
 
   /**
    * Public function to check the latest proven block number that the slasher client is synced to.
    * @returns Block number of latest proven L2 Block we've synced with.
    */
-  public getSyncedProvenBlockNum() {
-    return this.synchedProvenBlockNumber.get() ?? INITIAL_L2_BLOCK_NUM - 1;
+  public async getSyncedProvenBlockNum(): Promise<number> {
+    return (await this.synchedProvenBlockNumber.getAsync()) ?? INITIAL_L2_BLOCK_NUM - 1;
   }
 
   /**
@@ -311,11 +313,14 @@ export class SlasherClient extends WithTracer {
    * @returns Information about slasher client status: state & syncedToBlockNum.
    */
   public async getStatus(): Promise<SlasherSyncState> {
-    const blockNumber = this.getSyncedLatestBlockNum();
+    const blockNumber = await this.getSyncedLatestBlockNum();
     const blockHash =
       blockNumber == 0
         ? ''
-        : await this.l2BlockSource.getBlockHeader(blockNumber).then(header => header?.hash().toString());
+        : await this.l2BlockSource
+            .getBlockHeader(blockNumber)
+            .then(header => header?.hash())
+            .then(hash => hash?.toString());
     return Promise.resolve({
       state: this.currentState,
       syncedToL2Block: { number: blockNumber, hash: blockHash },
@@ -329,14 +334,19 @@ export class SlasherClient extends WithTracer {
    */
   private async handleLatestL2Blocks(blocks: L2Block[]): Promise<void> {
     if (!blocks.length) {
-      return Promise.resolve();
+      return;
     }
 
-    const lastBlockNum = blocks[blocks.length - 1].number;
-    await Promise.all(blocks.map(block => this.synchedBlockHashes.set(block.number, block.hash().toString())));
-    await this.synchedLatestBlockNumber.set(lastBlockNum);
-    this.log.debug(`Synched to latest block ${lastBlockNum}`);
-    this.startServiceIfSynched();
+    await this.store.transactionAsync(async () => {
+      for (const block of blocks) {
+        await this.synchedBlockHashes.set(block.number, (await block.hash()).toString());
+      }
+
+      const lastBlockNum = blocks[blocks.length - 1].number;
+      await this.synchedLatestBlockNumber.set(lastBlockNum);
+    });
+
+    await this.startServiceIfSynched();
   }
 
   /**
@@ -352,7 +362,7 @@ export class SlasherClient extends WithTracer {
     await this.synchedProvenBlockNumber.set(lastBlockNum);
     this.log.debug(`Synched to proven block ${lastBlockNum}`);
 
-    this.startServiceIfSynched();
+    await this.startServiceIfSynched();
   }
 
   private async handlePruneL2Blocks(latestBlock: number): Promise<void> {
@@ -376,11 +386,15 @@ export class SlasherClient extends WithTracer {
     await this.synchedLatestBlockNumber.set(latestBlock);
   }
 
-  private startServiceIfSynched() {
+  private async startServiceIfSynched() {
+    const [latestBlock, provenBlock] = await Promise.all([
+      this.getSyncedLatestBlockNum(),
+      this.getSyncedProvenBlockNum(),
+    ]);
     if (
       this.currentState === SlasherClientState.SYNCHING &&
-      this.getSyncedLatestBlockNum() >= this.latestBlockNumberAtStart &&
-      this.getSyncedProvenBlockNum() >= this.provenBlockNumberAtStart
+      latestBlock >= this.latestBlockNumberAtStart &&
+      provenBlock >= this.provenBlockNumberAtStart
     ) {
       this.log.debug(`Synched to blocks at start`);
       this.setCurrentState(SlasherClientState.RUNNING);

package/src/test/index.ts

@@ -1,14 +1,14 @@
 import { type PublicProcessorFactory } from '@aztec/simulator/server';
 
 import { SequencerClient } from '../client/sequencer-client.js';
-import { type L1Publisher } from '../publisher/l1-publisher.js';
+import { type SequencerPublisher } from '../publisher/sequencer-publisher.js';
 import { Sequencer } from '../sequencer/sequencer.js';
 import { type SequencerTimetable } from '../sequencer/timetable.js';
 
 class TestSequencer_ extends Sequencer {
   public override publicProcessorFactory!: PublicProcessorFactory;
   public override timetable!: SequencerTimetable;
-  public override publisher!: L1Publisher;
+  public override publisher!: SequencerPublisher;
 }
 
 export type TestSequencer = TestSequencer_;
@@ -18,5 +18,3 @@ class TestSequencerClient_ extends SequencerClient {
 }
 
 export type TestSequencerClient = TestSequencerClient_;
-
-export * from './test-l1-publisher.js';

package/src/tx_validator/gas_validator.ts

@@ -74,20 +74,21 @@ export class GasTxValidator implements TxValidator<Tx> {
     // Read current balance of the feePayer
     const initialBalance = await this.#publicDataSource.storageRead(
       this.#feeJuiceAddress,
-      computeFeePayerBalanceStorageSlot(feePayer),
+      await computeFeePayerBalanceStorageSlot(feePayer),
     );
 
     // If there is a claim in this tx that increases the fee payer balance in Fee Juice, add it to balance
     const setupFns = getExecutionRequestsByPhase(tx, TxExecutionPhase.SETUP);
+    const increasePublicBalanceSelector = await FunctionSelector.fromSignature(
+      '_increase_public_balance((Field),(Field,Field))',
+    );
     const claimFunctionCall = setupFns.find(
       fn =>
         fn.callContext.contractAddress.equals(this.#feeJuiceAddress) &&
         fn.callContext.msgSender.equals(this.#feeJuiceAddress) &&
         fn.args.length > 2 &&
         // Public functions get routed through the dispatch function, whose first argument is the target function selector.
-        fn.args[0].equals(
-          FunctionSelector.fromSignature('_increase_public_balance((Field),(Field,Field))').toField(),
-        ) &&
+        fn.args[0].equals(increasePublicBalanceSelector.toField()) &&
         fn.args[1].equals(feePayer.toField()) &&
         !fn.callContext.isStaticCall,
     );

package/src/tx_validator/test_utils.ts

@@ -6,7 +6,7 @@ export function patchNonRevertibleFn(
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): { address: AztecAddress; selector: FunctionSelector } {
+): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
   return patchFn('nonRevertibleAccumulatedData', tx, index, overrides);
 }
 
@@ -14,16 +14,16 @@ export function patchRevertibleFn(
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): { address: AztecAddress; selector: FunctionSelector } {
+): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
   return patchFn('revertibleAccumulatedData', tx, index, overrides);
 }
 
-function patchFn(
+async function patchFn(
   where: 'revertibleAccumulatedData' | 'nonRevertibleAccumulatedData',
   tx: Tx,
   index: number,
   overrides: { address?: AztecAddress; selector: FunctionSelector; args?: Fr[]; msgSender?: AztecAddress },
-): { address: AztecAddress; selector: FunctionSelector } {
+): Promise<{ address: AztecAddress; selector: FunctionSelector }> {
   const fn = tx.enqueuedPublicFunctionCalls.at(-1 * index - 1)!;
   fn.callContext.contractAddress = overrides.address ?? fn.callContext.contractAddress;
   fn.callContext.functionSelector = overrides.selector;
@@ -36,7 +36,7 @@ function patchFn(
   request.msgSender = fn.callContext.msgSender;
   request.functionSelector = fn.callContext.functionSelector;
   request.isStaticCall = fn.callContext.isStaticCall;
-  request.argsHash = computeVarArgsHash(fn.args);
+  request.argsHash = await computeVarArgsHash(fn.args);
   tx.data.forPublic![where].publicCallRequests[index] = request;
 
   return {

package/dest/publisher/l1-publisher-metrics.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"l1-publisher-metrics.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher-metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC3G,OAAO,EAIL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,SAAS,GAAG,sBAAsB,CAAC;AAE1E,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAY;IAE5B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,KAAK,CAAY;IACzB,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,aAAa,CAAY;IACjC,OAAO,CAAC,iBAAiB,CAAY;IACrC,OAAO,CAAC,iBAAiB,CAAY;gBAEzB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAgB;IAkDzD,cAAc,CAAC,MAAM,EAAE,QAAQ;IAO/B,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAIhE,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAInE,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc;IAItE,OAAO,CAAC,QAAQ;CA6BjB"}

package/dest/publisher/l1-publisher-metrics.js

@@ -1,85 +0,0 @@
-import { Attributes, Metrics, ValueType, } from '@aztec/telemetry-client';
-import { formatEther } from 'viem/utils';
-export class L1PublisherMetrics {
-    constructor(client, name = 'L1Publisher') {
-        const meter = client.getMeter(name);
-        this.gasPrice = meter.createHistogram(Metrics.L1_PUBLISHER_GAS_PRICE, {
-            description: 'The gas price used for transactions',
-            unit: 'gwei',
-            valueType: ValueType.DOUBLE,
-        });
-        this.txCount = meter.createUpDownCounter(Metrics.L1_PUBLISHER_TX_COUNT, {
-            description: 'The number of transactions processed',
-        });
-        this.txDuration = meter.createHistogram(Metrics.L1_PUBLISHER_TX_DURATION, {
-            description: 'The duration of transaction processing',
-            unit: 'ms',
-            valueType: ValueType.INT,
-        });
-        this.txGas = meter.createHistogram(Metrics.L1_PUBLISHER_TX_GAS, {
-            description: 'The gas consumed by transactions',
-            unit: 'gas',
-            valueType: ValueType.INT,
-        });
-        this.txCalldataSize = meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_SIZE, {
-            description: 'The size of the calldata in transactions',
-            unit: 'By',
-            valueType: ValueType.INT,
-        });
-        this.txCalldataGas = meter.createHistogram(Metrics.L1_PUBLISHER_TX_CALLDATA_GAS, {
-            description: 'The gas consumed by the calldata in transactions',
-            unit: 'gas',
-            valueType: ValueType.INT,
-        });
-        this.txBlobDataGasUsed = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_USED, {
-            description: 'The amount of blob gas used in transactions',
-            unit: 'gas',
-            valueType: ValueType.INT,
-        });
-        this.txBlobDataGasCost = meter.createHistogram(Metrics.L1_PUBLISHER_TX_BLOBDATA_GAS_COST, {
-            description: 'The gas cost of blobs in transactions',
-            unit: 'gwei',
-            valueType: ValueType.INT,
-        });
-    }
-    recordFailedTx(txType) {
-        this.txCount.add(1, {
-            [Attributes.L1_TX_TYPE]: txType,
-            [Attributes.OK]: false,
-        });
-    }
-    recordSubmitProof(durationMs, stats) {
-        this.recordTx('submitProof', durationMs, stats);
-    }
-    recordProcessBlockTx(durationMs, stats) {
-        this.recordTx('process', durationMs, stats);
-    }
-    recordClaimEpochProofRightTx(durationMs, stats) {
-        this.recordTx('claimEpochProofRight', durationMs, stats);
-    }
-    recordTx(txType, durationMs, stats) {
-        const attributes = {
-            [Attributes.L1_TX_TYPE]: txType,
-            [Attributes.L1_SENDER]: stats.sender,
-        };
-        this.txCount.add(1, {
-            ...attributes,
-            [Attributes.OK]: true,
-        });
-        this.txDuration.record(Math.ceil(durationMs), attributes);
-        this.txGas.record(
-        // safe to downcast - total block limit is 30M gas which fits in a JS number
-        Number(stats.gasUsed), attributes);
-        this.txCalldataGas.record(stats.calldataGas, attributes);
-        this.txCalldataSize.record(stats.calldataSize, attributes);
-        this.txBlobDataGasCost.record(Number(stats.blobDataGas), attributes);
-        this.txBlobDataGasUsed.record(Number(stats.blobGasUsed), attributes);
-        try {
-            this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
-        }
-        catch (e) {
-            // ignore
-        }
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDEtcHVibGlzaGVyLW1ldHJpY3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGlzaGVyL2wxLXB1Ymxpc2hlci1tZXRyaWNzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFDTCxVQUFVLEVBRVYsT0FBTyxFQUdQLFNBQVMsR0FDVixNQUFNLHlCQUF5QixDQUFDO0FBRWpDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxZQUFZLENBQUM7QUFJekMsTUFBTSxPQUFPLGtCQUFrQjtJQVc3QixZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGFBQWE7UUFDdkQsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLHNCQUFzQixFQUFFO1lBQ3BFLFdBQVcsRUFBRSxxQ0FBcUM7WUFDbEQsSUFBSSxFQUFFLE1BQU07WUFDWixTQUFTLEVBQUUsU0FBUyxDQUFDLE1BQU07U0FDNUIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLHFCQUFxQixFQUFFO1lBQ3RFLFdBQVcsRUFBRSxzQ0FBc0M7U0FDcEQsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyx3QkFBd0IsRUFBRTtZQUN4RSxXQUFXLEVBQUUsd0NBQXdDO1lBQ3JELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsbUJBQW1CLEVBQUU7WUFDOUQsV0FBVyxFQUFFLGtDQUFrQztZQUMvQyxJQUFJLEVBQUUsS0FBSztZQUNY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

package/dest/publisher/l1-publisher.d.ts

@@ -1,195 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
-import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { type EpochProofClaim, type EpochProofQuote, type L2Block, type TxHash } from '@aztec/circuit-types';
-import { AZTEC_MAX_EPOCH_DURATION, type BlockHeader, EthAddress, type Proof } from '@aztec/circuits.js';
-import { type FeeRecipient, type RootRollupPublicInputs } from '@aztec/circuits.js/rollup';
-import { type EthereumChain, type L1ContractsConfig } from '@aztec/ethereum';
-import { Blob } from '@aztec/foundation/blob';
-import { type Signature } from '@aztec/foundation/eth-signature';
-import { Fr } from '@aztec/foundation/fields';
-import { type Logger } from '@aztec/foundation/log';
-import { type Tuple } from '@aztec/foundation/serialize';
-import { RollupAbi } from '@aztec/l1-artifacts';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import { type Chain, type Client, type GetContractReturnType, type HttpTransport, type PrivateKeyAccount, type PublicActions, type PublicClient, type PublicRpcSchema, type WalletActions, type WalletClient, type WalletRpcSchema } from 'viem';
-import { type PublisherConfig, type TxSenderConfig } from './config.js';
-/**
- * Stats for a sent transaction.
- */
-export type TransactionStats = {
-    /** Address of the sender. */
-    sender: string;
-    /** Hash of the transaction. */
-    transactionHash: string;
-    /** Size in bytes of the tx calldata */
-    calldataSize: number;
-    /** Gas required to pay for the calldata inclusion (depends on size and number of zeros)  */
-    calldataGas: number;
-};
-/**
- * Minimal information from a tx receipt.
- */
-export type MinimalTransactionReceipt = {
-    /** True if the tx was successful, false if reverted. */
-    status: boolean;
-    /** Hash of the transaction. */
-    transactionHash: `0x${string}`;
-    /** Effective gas used by the tx. */
-    gasUsed: bigint;
-    /** Effective gas price paid by the tx. */
-    gasPrice: bigint;
-    /** Logs emitted in this tx. */
-    logs: any[];
-    /** Block number in which this tx was mined. */
-    blockNumber: bigint;
-    /** The block hash in which this tx was mined */
-    blockHash: `0x${string}`;
-};
-/** Arguments to the submitEpochProof method of the rollup contract */
-export type L1SubmitEpochProofArgs = {
-    epochSize: number;
-    previousArchive: Fr;
-    endArchive: Fr;
-    previousBlockHash: Fr;
-    endBlockHash: Fr;
-    endTimestamp: Fr;
-    outHash: Fr;
-    proverId: Fr;
-    fees: Tuple<FeeRecipient, typeof AZTEC_MAX_EPOCH_DURATION>;
-    proof: Proof;
-};
-export declare enum VoteType {
-    GOVERNANCE = 0,
-    SLASHING = 1
-}
-type GetSlashPayloadCallBack = (slotNumber: bigint) => Promise<EthAddress | undefined>;
-/**
- * Publishes L2 blocks to L1. This implementation does *not* retry a transaction in
- * the event of network congestion, but should work for local development.
- * - If sending (not mining) a tx fails, it retries indefinitely at 1-minute intervals.
- * - If the tx is not mined, keeps polling indefinitely at 1-second intervals.
- *
- * Adapted from https://github.com/AztecProtocol/aztec2-internal/blob/master/falafel/src/rollup_publisher.ts.
- */
-export declare class L1Publisher {
-    private interruptibleSleep;
-    private sleepTimeMs;
-    private interrupted;
-    private metrics;
-    protected governanceLog: Logger;
-    protected governanceProposerAddress?: EthAddress;
-    private governancePayload;
-    protected slashingLog: Logger;
-    protected slashingProposerAddress?: EthAddress;
-    private getSlashPayload?;
-    private myLastVotes;
-    protected log: Logger;
-    protected rollupContract: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, Chain, PrivateKeyAccount>>;
-    protected publicClient: PublicClient<HttpTransport, Chain>;
-    protected walletClient: WalletClient<HttpTransport, Chain, PrivateKeyAccount>;
-    protected account: PrivateKeyAccount;
-    protected ethereumSlotDuration: bigint;
-    private blobSinkClient;
-    static PROPOSE_GAS_GUESS: bigint;
-    static PROPOSE_AND_CLAIM_GAS_GUESS: bigint;
-    private readonly l1TxUtils;
-    constructor(config: TxSenderConfig & PublisherConfig & Pick<L1ContractsConfig, 'ethereumSlotDuration'>, deps?: {
-        telemetry?: TelemetryClient;
-        blobSinkClient?: BlobSinkClientInterface;
-    });
-    registerSlashPayloadGetter(callback: GetSlashPayloadCallBack): void;
-    private getSlashingProposerAddress;
-    get publisherAddress(): `0x${string}`;
-    protected createWalletClient(account: PrivateKeyAccount, chain: EthereumChain): WalletClient<HttpTransport, Chain, PrivateKeyAccount>;
-    getGovernancePayload(): EthAddress;
-    setGovernancePayload(payload: EthAddress): void;
-    getSenderAddress(): EthAddress;
-    getClient(): Client<HttpTransport, Chain, PrivateKeyAccount, [
-        ...WalletRpcSchema,
-        ...PublicRpcSchema
-    ], PublicActions<HttpTransport, Chain> & WalletActions<Chain, PrivateKeyAccount>>;
-    getRollupContract(): GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, Chain, PrivateKeyAccount>>;
-    /**
-     * @notice  Calls `canProposeAtTime` with the time of the next Ethereum block and the sender address
-     *
-     * @dev     Throws if unable to propose
-     *
-     * @param archive - The archive that we expect to be current state
-     * @return slot - The L2 slot number  of the next Ethereum block,
-     * @return blockNumber - The L2 block number of the next L2 block
-     */
-    canProposeAtNextEthBlock(archive: Buffer): Promise<[bigint, bigint]>;
-    getClaimableEpoch(): Promise<bigint | undefined>;
-    getEpochForSlotNumber(slotNumber: bigint): Promise<bigint>;
-    getEpochToProve(): Promise<bigint | undefined>;
-    getProofClaim(): Promise<EpochProofClaim | undefined>;
-    validateProofQuote(quote: EpochProofQuote): Promise<EpochProofQuote | undefined>;
-    /**
-     * @notice  Will call `validateHeader` to make sure that it is possible to propose
-     *
-     * @dev     Throws if unable to propose
-     *
-     * @param header - The header to propose
-     * @param digest - The digest that attestations are signing over
-     *
-     */
-    validateBlockForSubmission(header: BlockHeader, attestationData?: {
-        digest: Buffer;
-        signatures: Signature[];
-    }): Promise<bigint>;
-    getCurrentEpochCommittee(): Promise<EthAddress[]>;
-    getTransactionStats(txHash: string): Promise<TransactionStats | undefined>;
-    castVote(slotNumber: bigint, timestamp: bigint, voteType: VoteType): Promise<boolean>;
-    /**
-     * Proposes a L2 block on L1.
-     * @param block - L2 block to propose.
-     * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
-     */
-    proposeL2Block(block: L2Block, attestations?: Signature[], txHashes?: TxHash[], proofQuote?: EpochProofQuote, opts?: {
-        txTimeoutAt?: Date;
-    }): Promise<boolean>;
-    /** Calls claimEpochProofRight in the Rollup contract to submit a chosen prover quote for the previous epoch. */
-    claimEpochProofRight(proofQuote: EpochProofQuote): Promise<boolean>;
-    private tryGetErrorFromRevertedTx;
-    submitEpochProof(args: {
-        epochNumber: number;
-        fromBlock: number;
-        toBlock: number;
-        publicInputs: RootRollupPublicInputs;
-        proof: Proof;
-    }): Promise<boolean>;
-    private validateEpochProofSubmission;
-    /**
-     * Calling `interrupt` will cause any in progress call to `publishRollup` to return `false` asap.
-     * Be warned, the call may return false even if the tx subsequently gets successfully mined.
-     * In practice this shouldn't matter, as we'll only ever be calling `interrupt` when we know it's going to fail.
-     * A call to `restart` is required before you can continue publishing.
-     */
-    interrupt(): void;
-    /** Restarts the publisher after calling `interrupt`. */
-    restart(): void;
-    private sendSubmitEpochProofTx;
-    private prepareProposeTx;
-    private getSubmitEpochProofArgs;
-    private sendProposeTx;
-    private sendProposeAndClaimTx;
-    /**
-     * Returns a tx receipt if the tx has been mined.
-     * @param txHash - Hash of the tx to look for.
-     * @returns Undefined if the tx hasn't been mined yet, the receipt otherwise.
-     */
-    getTransactionReceipt(txHash: string): Promise<MinimalTransactionReceipt | undefined>;
-    protected sleepOrInterrupted(): Promise<void>;
-    /**
-     * Send blobs to the blob sink
-     *
-     * If a blob sink url is configured, then we send blobs to the blob sink
-     * - for now we use the blockHash as the identifier for the blobs;
-     *   In the future this will move to be the beacon block id - which takes a bit more work
-     *   to calculate and will need to be mocked in e2e tests
-     */
-    protected sendBlobsToBlobSink(blockHash: string, blobs: Blob[]): Promise<boolean>;
-}
-export {};
-//# sourceMappingURL=l1-publisher.d.ts.map

package/dest/publisher/l1-publisher.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"l1-publisher.d.ts","sourceRoot":"","sources":["../../src/publisher/l1-publisher.ts"],"names":[],"mappings":"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"}