@aztec/sequencer-client 0.0.0-test.1 → 0.0.1-commit.b655e406

package/dest/global_variable_builder/global_builder.js

@@ -1,17 +1,20 @@
-import { createEthereumChain } from '@aztec/ethereum';
+import { RollupContract, createEthereumChain } from '@aztec/ethereum';
 import { Fr } from '@aztec/foundation/fields';
 import { createLogger } from '@aztec/foundation/log';
-import { RollupAbi } from '@aztec/l1-artifacts';
 import { GasFees } from '@aztec/stdlib/gas';
 import { GlobalVariables } from '@aztec/stdlib/tx';
-import { createPublicClient, fallback, getAddress, getContract, http } from 'viem';
+import { createPublicClient, fallback, http } from 'viem';
 /**
  * Simple global variables builder.
  */ export class GlobalVariableBuilder {
     log = createLogger('sequencer:global_variable_builder');
+    currentBaseFees = Promise.resolve(new GasFees(0, 0));
+    currentL1BlockNumber = undefined;
     rollupContract;
     publicClient;
     ethereumSlotDuration;
+    chainId;
+    version;
     constructor(config){
         const { l1RpcUrls, l1ChainId: chainId, l1Contracts } = config;
         const chain = createEthereumChain(l1RpcUrls, chainId);
@@ -21,31 +24,42 @@ import { createPublicClient, fallback, getAddress, getContract, http } from 'vie
             transport: fallback(chain.rpcUrls.map((url)=>http(url))),
             pollingInterval: config.viemPollingIntervalMS
         });
-        this.rollupContract = getContract({
-            address: getAddress(l1Contracts.rollupAddress.toString()),
-            abi: RollupAbi,
-            client: this.publicClient
-        });
+        this.rollupContract = new RollupContract(this.publicClient, l1Contracts.rollupAddress);
     }
     /**
    * Computes the "current" base fees, e.g., the price that you currently should pay to get include in the next block
-   * @returns Base fees for the expected next block
-   */ async getCurrentBaseFees() {
+   * @returns Base fees for the next block
+   */ async computeCurrentBaseFees() {
         // Since this might be called in the middle of a slot where a block might have been published,
         // we need to fetch the last block written, and estimate the earliest timestamp for the next block.
         // The timestamp of that last block will act as a lower bound for the next block.
-        const lastBlock = await this.rollupContract.read.getBlock([
-            await this.rollupContract.read.getPendingBlockNumber()
-        ]);
-        const earliestTimestamp = await this.rollupContract.read.getTimestampForSlot([
-            lastBlock.slotNumber + 1n
-        ]);
+        const lastBlock = await this.rollupContract.getBlock(await this.rollupContract.getBlockNumber());
+        const earliestTimestamp = await this.rollupContract.getTimestampForSlot(lastBlock.slotNumber + 1n);
         const nextEthTimestamp = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
         const timestamp = earliestTimestamp > nextEthTimestamp ? earliestTimestamp : nextEthTimestamp;
-        return new GasFees(Fr.ZERO, new Fr(await this.rollupContract.read.getManaBaseFeeAt([
-            timestamp,
-            true
-        ])));
+        return new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
+    }
+    async getCurrentBaseFees() {
+        // Get the current block number
+        const blockNumber = await this.publicClient.getBlockNumber();
+        // If the L1 block number has changed then chain a new promise to get the current base fees
+        if (this.currentL1BlockNumber === undefined || blockNumber > this.currentL1BlockNumber) {
+            this.currentL1BlockNumber = blockNumber;
+            this.currentBaseFees = this.currentBaseFees.then(()=>this.computeCurrentBaseFees());
+        }
+        return this.currentBaseFees;
+    }
+    async getGlobalConstantVariables() {
+        if (!this.chainId) {
+            this.chainId = new Fr(this.publicClient.chain.id);
+        }
+        if (!this.version) {
+            this.version = new Fr(await this.rollupContract.getVersion());
+        }
+        return {
+            chainId: this.chainId,
+            version: this.version
+        };
     }
     /**
    * Simple builder of global variables that use the minimum time possible.
@@ -55,25 +69,16 @@ import { createPublicClient, fallback, getAddress, getContract, http } from 'vie
    * @param slotNumber - The slot number to use for the global variables, if undefined it will be calculated.
    * @returns The global variables for the given block number.
    */ async buildGlobalVariables(blockNumber, coinbase, feeRecipient, slotNumber) {
-        const version = new Fr(await this.rollupContract.read.getVersion());
-        const chainId = new Fr(this.publicClient.chain.id);
+        const { chainId, version } = await this.getGlobalConstantVariables();
         if (slotNumber === undefined) {
             const ts = BigInt((await this.publicClient.getBlock()).timestamp + BigInt(this.ethereumSlotDuration));
-            slotNumber = await this.rollupContract.read.getSlotAt([
-                ts
-            ]);
+            slotNumber = await this.rollupContract.getSlotAt(ts);
         }
-        const timestamp = await this.rollupContract.read.getTimestampForSlot([
-            slotNumber
-        ]);
+        const timestamp = await this.rollupContract.getTimestampForSlot(slotNumber);
         const slotFr = new Fr(slotNumber);
-        const timestampFr = new Fr(timestamp);
         // We can skip much of the logic in getCurrentBaseFees since it we already check that we are not within a slot elsewhere.
-        const gasFees = new GasFees(Fr.ZERO, new Fr(await this.rollupContract.read.getManaBaseFeeAt([
-            timestamp,
-            true
-        ])));
-        const globalVariables = new GlobalVariables(chainId, version, blockNumber, slotFr, timestampFr, coinbase, feeRecipient, gasFees);
+        const gasFees = new GasFees(0, await this.rollupContract.getManaBaseFeeAt(timestamp, true));
+        const globalVariables = new GlobalVariables(chainId, version, blockNumber, slotFr, timestamp, coinbase, feeRecipient, gasFees);
         return globalVariables;
     }
 }

package/dest/index.d.ts

@@ -1,8 +1,7 @@
 export * from './client/index.js';
 export * from './config.js';
 export * from './publisher/index.js';
+export { FullNodeBlockBuilder as BlockBuilder, Sequencer, SequencerState, type SequencerEvents, } from './sequencer/index.js';
 export * from './tx_validator/tx_validator_factory.js';
-export * from './slasher/index.js';
-export { Sequencer, SequencerState, getDefaultAllowedSetupFunctions } from './sequencer/index.js';
 export * from './global_variable_builder/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAIlG,cAAc,oCAAoC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,OAAO,EACL,oBAAoB,IAAI,YAAY,EACpC,SAAS,EACT,cAAc,EACd,KAAK,eAAe,GACrB,MAAM,sBAAsB,CAAC;AAC9B,cAAc,wCAAwC,CAAC;AAIvD,cAAc,oCAAoC,CAAC"}

package/dest/index.js

@@ -1,9 +1,8 @@
 export * from './client/index.js';
 export * from './config.js';
 export * from './publisher/index.js';
+export { FullNodeBlockBuilder as BlockBuilder, Sequencer, SequencerState } from './sequencer/index.js';
 export * from './tx_validator/tx_validator_factory.js';
-export * from './slasher/index.js';
-export { Sequencer, SequencerState, getDefaultAllowedSetupFunctions } from './sequencer/index.js';
 // Used by the node to simulate public parts of transactions. Should these be moved to a shared library?
 // ISSUE(#9832)
 export * from './global_variable_builder/index.js';

package/dest/publisher/config.d.ts

@@ -1,6 +1,6 @@
 import { type BlobSinkConfig } from '@aztec/blob-sink/client';
 import { type L1ReaderConfig, type L1TxUtilsConfig } from '@aztec/ethereum';
-import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 /**
  * The configuration of the rollup transaction publisher.
@@ -9,20 +9,18 @@ export type TxSenderConfig = L1ReaderConfig & {
     /**
      * The private key to be used by the publisher.
      */
-    publisherPrivateKey: `0x${string}`;
+    publisherPrivateKeys?: SecretValue<`0x${string}`>[];
     /**
-     * The address of the custom forwarder contract.
+     * Publisher addresses to be used with a remote signer
      */
-    customForwarderContractAddress: EthAddress;
+    publisherAddresses?: EthAddress[];
 };
 /**
  * Configuration of the L1Publisher.
  */
 export type PublisherConfig = L1TxUtilsConfig & BlobSinkConfig & {
-    /**
-     * The interval to wait between publish retries.
-     */
-    l1PublishRetryIntervalMS: number;
+    /** True to use publishers in invalid states (timed out, cancelled, etc) if no other is available */
+    publisherAllowInvalidStates?: boolean;
 };
 export declare const getTxSenderConfigMappings: (scope: 'PROVER' | 'SEQ') => ConfigMappingsType<Omit<TxSenderConfig, 'l1Contracts'>>;
 export declare function getTxSenderConfigFromEnv(scope: 'PROVER' | 'SEQ'): Omit<TxSenderConfig, 'l1Contracts'>;

package/dest/publisher/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,eAAe,EAIrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,KAAK,kBAAkB,EAAyB,MAAM,0BAA0B,CAAC;AAC1F,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C;;OAEG;IACH,mBAAmB,EAAE,KAAK,MAAM,EAAE,CAAC;IAEnC;;OAEG;IACH,8BAA8B,EAAE,UAAU,CAAC;CAC5C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAC3C,cAAc,GAAG;IACf;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAC;CAClC,CAAC;AAEJ,eAAO,MAAM,yBAAyB,EAAE,CACtC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAczD,CAAC;AAEH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAErG;AAED,eAAO,MAAM,0BAA0B,EAAE,CACvC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,eAAe,GAAG,eAAe,CASvD,CAAC;AAEH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,eAAe,CAElF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/publisher/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAyB,MAAM,yBAAyB,CAAC;AACrF,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,eAAe,EAGrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,KAAK,kBAAkB,EACvB,WAAW,EAGZ,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG;IAC5C;;OAEG;IACH,oBAAoB,CAAC,EAAE,WAAW,CAAC,KAAK,MAAM,EAAE,CAAC,EAAE,CAAC;IAEpD;;OAEG;IACH,kBAAkB,CAAC,EAAE,UAAU,EAAE,CAAC;CACnC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,eAAe,GAC3C,cAAc,GAAG;IACf,oGAAoG;IACpG,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEJ,eAAO,MAAM,yBAAyB,EAAE,CACtC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAezD,CAAC;AAEH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAErG;AAED,eAAO,MAAM,0BAA0B,EAAE,CACvC,KAAK,EAAE,QAAQ,GAAG,KAAK,KACpB,kBAAkB,CAAC,eAAe,GAAG,eAAe,CAQvD,CAAC;AAEH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,QAAQ,GAAG,KAAK,GAAG,eAAe,CAElF"}

package/dest/publisher/config.js

@@ -1,31 +1,33 @@
 import { blobSinkConfigMapping } from '@aztec/blob-sink/client';
-import { NULL_KEY, l1ReaderConfigMappings, l1TxUtilsConfigMappings } from '@aztec/ethereum';
-import { getConfigFromMappings } from '@aztec/foundation/config';
+import { l1ReaderConfigMappings, l1TxUtilsConfigMappings } from '@aztec/ethereum';
+import { SecretValue, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
 export const getTxSenderConfigMappings = (scope)=>({
         ...l1ReaderConfigMappings,
-        customForwarderContractAddress: {
-            env: `CUSTOM_FORWARDER_CONTRACT_ADDRESS`,
-            parseEnv: (val)=>EthAddress.fromString(val),
-            description: 'The address of the custom forwarder contract.',
-            defaultValue: EthAddress.ZERO
+        publisherPrivateKeys: {
+            env: scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEYS` : `SEQ_PUBLISHER_PRIVATE_KEYS`,
+            description: 'The private keys to be used by the publisher.',
+            parseEnv: (val)=>val.split(',').map((key)=>new SecretValue(`0x${key.replace('0x', '')}`)),
+            defaultValue: [],
+            fallback: [
+                scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEY` : `SEQ_PUBLISHER_PRIVATE_KEY`
+            ]
         },
-        publisherPrivateKey: {
-            env: scope === 'PROVER' ? `PROVER_PUBLISHER_PRIVATE_KEY` : `SEQ_PUBLISHER_PRIVATE_KEY`,
-            description: 'The private key to be used by the publisher.',
-            parseEnv: (val)=>val ? `0x${val.replace('0x', '')}` : NULL_KEY,
-            defaultValue: NULL_KEY
+        publisherAddresses: {
+            env: scope === 'PROVER' ? `PROVER_PUBLISHER_ADDRESSES` : `SEQ_PUBLISHER_ADDRESSES`,
+            description: 'The addresses of the publishers to use with remote signers',
+            parseEnv: (val)=>val.split(',').map((address)=>EthAddress.fromString(address)),
+            defaultValue: []
         }
     });
 export function getTxSenderConfigFromEnv(scope) {
     return getConfigFromMappings(getTxSenderConfigMappings(scope));
 }
 export const getPublisherConfigMappings = (scope)=>({
-        l1PublishRetryIntervalMS: {
-            env: scope === `PROVER` ? `PROVER_PUBLISH_RETRY_INTERVAL_MS` : `SEQ_PUBLISH_RETRY_INTERVAL_MS`,
-            parseEnv: (val)=>+val,
-            defaultValue: 1000,
-            description: 'The interval to wait between publish retries.'
+        publisherAllowInvalidStates: {
+            description: 'True to use publishers in invalid states (timed out, cancelled, etc) if no other is available',
+            env: scope === `PROVER` ? `PROVER_PUBLISHER_ALLOW_INVALID_STATES` : `SEQ_PUBLISHER_ALLOW_INVALID_STATES`,
+            ...booleanConfigHelper(true)
         },
         ...l1TxUtilsConfigMappings,
         ...blobSinkConfigMapping

package/dest/publisher/index.d.ts

@@ -1,2 +1,4 @@
 export { SequencerPublisher } from './sequencer-publisher.js';
+export { SequencerPublisherFactory } from './sequencer-publisher-factory.js';
+export { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
 //# sourceMappingURL=index.d.ts.map

package/dest/publisher/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/publisher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/publisher/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAG7E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC"}

package/dest/publisher/index.js

@@ -1 +1,4 @@
 export { SequencerPublisher } from './sequencer-publisher.js';
+export { SequencerPublisherFactory } from './sequencer-publisher-factory.js';
+// Used for tests
+export { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';

package/dest/publisher/sequencer-publisher-factory.d.ts

@@ -0,0 +1,43 @@
+import { EthAddress } from '@aztec/aztec.js/addresses';
+import { type Logger } from '@aztec/aztec.js/log';
+import type { BlobSinkClientInterface } from '@aztec/blob-sink/client';
+import type { EpochCache } from '@aztec/epoch-cache';
+import type { GovernanceProposerContract, PublisherManager, RollupContract } from '@aztec/ethereum';
+import type { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
+import type { DateProvider } from '@aztec/foundation/timer';
+import type { SlashFactoryContract } from '@aztec/stdlib/l1-contracts';
+import type { TelemetryClient } from '@aztec/telemetry-client';
+import { NodeKeystoreAdapter } from '@aztec/validator-client';
+import type { SequencerClientConfig } from '../config.js';
+import { SequencerPublisher } from './sequencer-publisher.js';
+export type AttestorPublisherPair = {
+    attestorAddress: EthAddress;
+    publisher: SequencerPublisher;
+};
+export declare class SequencerPublisherFactory {
+    private sequencerConfig;
+    private deps;
+    private publisherMetrics;
+    /** Stores the last slot in which every action was carried out by a publisher */
+    private lastActions;
+    private logger;
+    constructor(sequencerConfig: SequencerClientConfig, deps: {
+        telemetry: TelemetryClient;
+        publisherManager: PublisherManager<L1TxUtilsWithBlobs>;
+        blobSinkClient?: BlobSinkClientInterface;
+        dateProvider: DateProvider;
+        epochCache: EpochCache;
+        rollupContract: RollupContract;
+        governanceProposerContract: GovernanceProposerContract;
+        slashFactoryContract: SlashFactoryContract;
+        nodeKeyStore: NodeKeystoreAdapter;
+        logger?: Logger;
+    });
+    /**
+     * Creates a new SequencerPublisher instance.
+     * @param _validatorAddress - The address of the validator that will be using the publisher.
+     * @returns A new SequencerPublisher instance.
+     */
+    create(validatorAddress?: EthAddress): Promise<AttestorPublisherPair>;
+}
+//# sourceMappingURL=sequencer-publisher-factory.d.ts.map

package/dest/publisher/sequencer-publisher-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sequencer-publisher-factory.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,qBAAqB,CAAC;AAChE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,KAAK,EAAE,0BAA0B,EAAmB,gBAAgB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACrH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAE1D,OAAO,EAAe,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,UAAU,CAAC;IAC5B,SAAS,EAAE,kBAAkB,CAAC;CAC/B,CAAC;AAEF,qBAAa,yBAAyB;IASlC,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,IAAI;IATd,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,gFAAgF;IAChF,OAAO,CAAC,WAAW,CAAuC;IAE1D,OAAO,CAAC,MAAM,CAAS;gBAGb,eAAe,EAAE,qBAAqB,EACtC,IAAI,EAAE;QACZ,SAAS,EAAE,eAAe,CAAC;QAC3B,gBAAgB,EAAE,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;QACvD,cAAc,CAAC,EAAE,uBAAuB,CAAC;QACzC,YAAY,EAAE,YAAY,CAAC;QAC3B,UAAU,EAAE,UAAU,CAAC;QACvB,cAAc,EAAE,cAAc,CAAC;QAC/B,0BAA0B,EAAE,0BAA0B,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC;QAC3C,YAAY,EAAE,mBAAmB,CAAC;QAClC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;IAKH;;;;OAIG;IACU,MAAM,CAAC,gBAAgB,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;CAsCnF"}

package/dest/publisher/sequencer-publisher-factory.js

@@ -0,0 +1,51 @@
+import { createLogger } from '@aztec/aztec.js/log';
+import { SequencerPublisherMetrics } from './sequencer-publisher-metrics.js';
+import { SequencerPublisher } from './sequencer-publisher.js';
+export class SequencerPublisherFactory {
+    sequencerConfig;
+    deps;
+    publisherMetrics;
+    /** Stores the last slot in which every action was carried out by a publisher */ lastActions;
+    logger;
+    constructor(sequencerConfig, deps){
+        this.sequencerConfig = sequencerConfig;
+        this.deps = deps;
+        this.lastActions = {};
+        this.publisherMetrics = new SequencerPublisherMetrics(deps.telemetry, 'SequencerPublisher');
+        this.logger = deps.logger ?? createLogger('sequencer');
+    }
+    /**
+   * Creates a new SequencerPublisher instance.
+   * @param _validatorAddress - The address of the validator that will be using the publisher.
+   * @returns A new SequencerPublisher instance.
+   */ async create(validatorAddress) {
+        // If we have been given an attestor address we must only allow publishers permitted for that attestor
+        const allowedPublishers = !validatorAddress ? [] : this.deps.nodeKeyStore.getPublisherAddresses(validatorAddress);
+        const filter = !validatorAddress ? ()=>true : (utils)=>{
+            const publisherAddress = utils.getSenderAddress();
+            return allowedPublishers.some((allowedPublisher)=>allowedPublisher.equals(publisherAddress));
+        };
+        const l1Publisher = await this.deps.publisherManager.getAvailablePublisher(filter);
+        const attestorAddress = validatorAddress ?? this.deps.nodeKeyStore.getAttestorForPublisher(l1Publisher.getSenderAddress());
+        const rollup = this.deps.rollupContract;
+        const slashingProposerContract = await rollup.getSlashingProposer();
+        const publisher = new SequencerPublisher(this.sequencerConfig, {
+            l1TxUtils: l1Publisher,
+            telemetry: this.deps.telemetry,
+            blobSinkClient: this.deps.blobSinkClient,
+            rollupContract: this.deps.rollupContract,
+            epochCache: this.deps.epochCache,
+            governanceProposerContract: this.deps.governanceProposerContract,
+            slashingProposerContract,
+            slashFactoryContract: this.deps.slashFactoryContract,
+            dateProvider: this.deps.dateProvider,
+            metrics: this.publisherMetrics,
+            lastActions: this.lastActions,
+            log: this.logger.createChild('publisher')
+        });
+        return {
+            attestorAddress,
+            publisher
+        };
+    }
+}

package/dest/publisher/sequencer-publisher-metrics.d.ts

@@ -11,12 +11,13 @@ export declare class SequencerPublisherMetrics {
     private txCalldataGas;
     private txBlobDataGasUsed;
     private txBlobDataGasCost;
+    private txTotalFee;
     private readonly blobCountHistogram;
     private readonly blobInclusionBlocksHistogram;
     private readonly blobTxSuccessCounter;
     private readonly blobTxFailureCounter;
     private senderBalance;
-    constructor(client: TelemetryClient, name?: string, logger?: import("@aztec/aztec.js").Logger);
+    constructor(client: TelemetryClient, name?: string, logger?: import("@aztec/aztec.js/log").Logger);
     recordFailedTx(txType: L1TxType): void;
     recordProcessBlockTx(durationMs: number, stats: L1PublishBlockStats): void;
     recordSenderBalance(wei: bigint, senderAddress: string): void;

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

@@ -1 +1 @@
-{"version":3,"file":"sequencer-publisher-metrics.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-metrics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAKL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEjC,qBAAa,yBAAyB;IAqBlC,OAAO,CAAC,MAAM;IApBhB,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;IAErC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IAErD,OAAO,CAAC,aAAa,CAAQ;gBAG3B,MAAM,EAAE,eAAe,EACvB,IAAI,SAAuB,EACnB,MAAM,mCAA8C;IA6E9D,cAAc,CAAC,MAAM,EAAE,QAAQ;IAW/B,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAcnE,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAOtD,OAAO,CAAC,QAAQ;CA6BjB"}
+{"version":3,"file":"sequencer-publisher-metrics.d.ts","sourceRoot":"","sources":["../../src/publisher/sequencer-publisher-metrics.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAkB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAKL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEjC,qBAAa,yBAAyB;IAsBlC,OAAO,CAAC,MAAM;IArBhB,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;IACrC,OAAO,CAAC,UAAU,CAAY;IAE9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAY;IACzD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IACrD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgB;IAErD,OAAO,CAAC,aAAa,CAAQ;gBAG3B,MAAM,EAAE,eAAe,EACvB,IAAI,SAAuB,EACnB,MAAM,uCAA8C;IAwF9D,cAAc,CAAC,MAAM,EAAE,QAAQ;IAW/B,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB;IAcnE,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAOtD,OAAO,CAAC,QAAQ;CAuCjB"}

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

@@ -1,4 +1,4 @@
-import { createLogger } from '@aztec/aztec.js';
+import { createLogger } from '@aztec/aztec.js/log';
 import { Attributes, Metrics, ValueType } from '@aztec/telemetry-client';
 import { formatEther } from 'viem/utils';
 export class SequencerPublisherMetrics {
@@ -11,6 +11,7 @@ export class SequencerPublisherMetrics {
     txCalldataGas;
     txBlobDataGasUsed;
     txBlobDataGasCost;
+    txTotalFee;
     blobCountHistogram;
     blobInclusionBlocksHistogram;
     blobTxSuccessCounter;
@@ -73,6 +74,32 @@ export class SequencerPublisherMetrics {
         this.blobTxFailureCounter = meter.createUpDownCounter(Metrics.L1_PUBLISHER_BLOB_TX_FAILURE, {
             description: 'Number of failed L1 transactions with blobs'
         });
+        this.txTotalFee = meter.createHistogram(Metrics.L1_PUBLISHER_TX_TOTAL_FEE, {
+            description: 'How much L1 tx costs',
+            unit: 'eth',
+            valueType: ValueType.DOUBLE,
+            advice: {
+                explicitBucketBoundaries: [
+                    0.001,
+                    0.002,
+                    0.004,
+                    0.008,
+                    0.01,
+                    0.02,
+                    0.04,
+                    0.08,
+                    0.1,
+                    0.2,
+                    0.4,
+                    0.8,
+                    1,
+                    1.2,
+                    1.4,
+                    1.8,
+                    2
+                ]
+            }
+        });
         this.senderBalance = meter.createGauge(Metrics.L1_PUBLISHER_BALANCE, {
             unit: 'eth',
             description: 'The balance of the sender address',
@@ -122,7 +149,15 @@ export class SequencerPublisherMetrics {
         this.txBlobDataGasUsed.record(Number(stats.blobGasUsed), attributes);
         try {
             this.gasPrice.record(parseInt(formatEther(stats.gasPrice, 'gwei'), 10));
-        } catch (e) {
+        } catch  {
+        // ignore
+        }
+        const executionFee = stats.gasUsed * stats.gasPrice;
+        const blobFee = stats.blobGasUsed * stats.blobDataGas;
+        const totalFee = executionFee + blobFee;
+        try {
+            this.txTotalFee.record(parseFloat(formatEther(totalFee)));
+        } catch  {
         // ignore
         }
     }