@aztec/aztec-node 0.87.1 → 0.87.2-nightly.20250524

package/dest/sentinel/store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAE9F,qBAAa,aAAa;IAMtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IANhB,gBAAuB,cAAc,KAAK;IAE1C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAuC;gBAGjD,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE;IAKpC,gBAAgB;IAIV,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC;YAUhG,0BAA0B;IAU3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;YAQrE,UAAU;IAKxB,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,gBAAgB;CAgBzB"}
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAIlC,qBAAa,aAAa;IAWtB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,MAAM;IAXhB,gBAAuB,cAAc,KAAK;IAG1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAuC;IAIlE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAuC;gBAGvD,KAAK,EAAE,iBAAiB,EACxB,MAAM,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE;IAMpC,gBAAgB;IAIV,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,0BAA0B;IAW9E,oBAAoB,CAAC,GAAG,EAAE,KAAK,MAAM,EAAE,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;YAKpG,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC;YAUhG,0BAA0B;IAU3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;YAQrE,UAAU;IAKxB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,gBAAgB;IAMxB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,cAAc;IAmBtB,OAAO,CAAC,gBAAgB;CAgBzB"}

package/dest/sentinel/store.js

@@ -1,17 +1,65 @@
 import { BufferReader, numToUInt8, numToUInt32BE, serializeToBuffer } from '@aztec/foundation/serialize';
+import { isAddress } from 'viem';
 export class SentinelStore {
     store;
     config;
-    static SCHEMA_VERSION = 1;
-    map;
+    static SCHEMA_VERSION = 2;
+    // a map from validator address to their ValidatorStatusHistory
+    historyMap;
+    // a map from validator address to their historical proven epoch performance
+    // e.g. { validator: [{ epoch: 1, missed: 1, total: 10 }, { epoch: 2, missed: 3, total: 7 }, ...] }
+    provenMap;
     constructor(store, config){
         this.store = store;
         this.config = config;
-        this.map = store.openMap('sentinel-validator-status');
+        this.historyMap = store.openMap('sentinel-validator-status');
+        this.provenMap = store.openMap('sentinel-validator-proven');
     }
     getHistoryLength() {
         return this.config.historyLength;
     }
+    async updateProvenPerformance(epoch, performance) {
+        await this.store.transactionAsync(async ()=>{
+            for (const [who, { missed, total }] of Object.entries(performance)){
+                if (!isAddress(who)) {
+                    continue;
+                }
+                await this.pushValidatorProvenPerformanceForEpoch({
+                    who,
+                    missed,
+                    total,
+                    epoch
+                });
+            }
+        });
+    }
+    async getProvenPerformance(who) {
+        const currentPerformanceBuffer = await this.provenMap.getAsync(who);
+        return currentPerformanceBuffer ? this.deserializePerformance(currentPerformanceBuffer) : [];
+    }
+    async pushValidatorProvenPerformanceForEpoch({ who, missed, total, epoch }) {
+        const currentPerformance = await this.getProvenPerformance(who);
+        const existingIndex = currentPerformance.findIndex((p)=>p.epoch === epoch);
+        if (existingIndex !== -1) {
+            currentPerformance[existingIndex] = {
+                missed,
+                total,
+                epoch
+            };
+        } else {
+            currentPerformance.push({
+                missed,
+                total,
+                epoch
+            });
+        }
+        // This should be sorted by epoch, but just in case.
+        // Since we keep the size small, this is not a big deal.
+        currentPerformance.sort((a, b)=>Number(a.epoch - b.epoch));
+        // keep the most recent `historyLength` entries.
+        const performanceToKeep = currentPerformance.slice(-this.config.historyLength);
+        await this.provenMap.set(who, this.serializePerformance(performanceToKeep));
+    }
     async updateValidators(slot, statuses) {
         await this.store.transactionAsync(async ()=>{
             for (const [who, status] of Object.entries(statuses)){
@@ -30,19 +78,38 @@ export class SentinelStore {
                 status
             }
         ].slice(-this.config.historyLength);
-        await this.map.set(who, this.serializeHistory(newHistory));
+        await this.historyMap.set(who, this.serializeHistory(newHistory));
     }
     async getHistories() {
         const histories = {};
-        for await (const [address, history] of this.map.entriesAsync()){
+        for await (const [address, history] of this.historyMap.entriesAsync()){
             histories[address] = this.deserializeHistory(history);
         }
         return histories;
     }
     async getHistory(address) {
-        const data = await this.map.getAsync(address);
+        const data = await this.historyMap.getAsync(address);
         return data && this.deserializeHistory(data);
     }
+    serializePerformance(performance) {
+        return serializeToBuffer(performance.map((p)=>[
+                numToUInt32BE(Number(p.epoch)),
+                numToUInt32BE(p.missed),
+                numToUInt32BE(p.total)
+            ]));
+    }
+    deserializePerformance(buffer) {
+        const reader = new BufferReader(buffer);
+        const performance = [];
+        while(!reader.isEmpty()){
+            performance.push({
+                epoch: BigInt(reader.readNumber()),
+                missed: reader.readNumber(),
+                total: reader.readNumber()
+            });
+        }
+        return performance;
+    }
     serializeHistory(history) {
         return serializeToBuffer(history.map((h)=>[
                 numToUInt32BE(Number(h.slot)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.87.1",
+  "version": "0.87.2-nightly.20250524",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -61,27 +61,28 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.87.1",
-    "@aztec/bb-prover": "0.87.1",
-    "@aztec/blob-sink": "0.87.1",
-    "@aztec/constants": "0.87.1",
-    "@aztec/epoch-cache": "0.87.1",
-    "@aztec/ethereum": "0.87.1",
-    "@aztec/foundation": "0.87.1",
-    "@aztec/kv-store": "0.87.1",
-    "@aztec/l1-artifacts": "0.87.1",
-    "@aztec/merkle-tree": "0.87.1",
-    "@aztec/node-lib": "0.87.1",
-    "@aztec/noir-protocol-circuits-types": "0.87.1",
-    "@aztec/p2p": "0.87.1",
-    "@aztec/protocol-contracts": "0.87.1",
-    "@aztec/prover-client": "0.87.1",
-    "@aztec/sequencer-client": "0.87.1",
-    "@aztec/simulator": "0.87.1",
-    "@aztec/stdlib": "0.87.1",
-    "@aztec/telemetry-client": "0.87.1",
-    "@aztec/validator-client": "0.87.1",
-    "@aztec/world-state": "0.87.1",
+    "@aztec/archiver": "0.87.2-nightly.20250524",
+    "@aztec/bb-prover": "0.87.2-nightly.20250524",
+    "@aztec/blob-sink": "0.87.2-nightly.20250524",
+    "@aztec/constants": "0.87.2-nightly.20250524",
+    "@aztec/epoch-cache": "0.87.2-nightly.20250524",
+    "@aztec/ethereum": "0.87.2-nightly.20250524",
+    "@aztec/foundation": "0.87.2-nightly.20250524",
+    "@aztec/kv-store": "0.87.2-nightly.20250524",
+    "@aztec/l1-artifacts": "0.87.2-nightly.20250524",
+    "@aztec/merkle-tree": "0.87.2-nightly.20250524",
+    "@aztec/node-lib": "0.87.2-nightly.20250524",
+    "@aztec/noir-protocol-circuits-types": "0.87.2-nightly.20250524",
+    "@aztec/p2p": "0.87.2-nightly.20250524",
+    "@aztec/protocol-contracts": "0.87.2-nightly.20250524",
+    "@aztec/prover-client": "0.87.2-nightly.20250524",
+    "@aztec/sequencer-client": "0.87.2-nightly.20250524",
+    "@aztec/simulator": "0.87.2-nightly.20250524",
+    "@aztec/slasher": "0.87.2-nightly.20250524",
+    "@aztec/stdlib": "0.87.2-nightly.20250524",
+    "@aztec/telemetry-client": "0.87.2-nightly.20250524",
+    "@aztec/validator-client": "0.87.2-nightly.20250524",
+    "@aztec/world-state": "0.87.2-nightly.20250524",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",

package/src/aztec-node/config.ts

@@ -11,6 +11,7 @@ import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib
 import { type P2PConfig, p2pConfigMappings } from '@aztec/p2p/config';
 import { type ProverClientUserConfig, proverClientConfigMappings } from '@aztec/prover-client/config';
 import { type SequencerClientConfig, sequencerClientConfigMappings } from '@aztec/sequencer-client/config';
+import { type SlasherConfig, slasherConfigMappings } from '@aztec/slasher';
 import { type NodeRPCConfig, nodeRpcConfigMappings } from '@aztec/stdlib/config';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
@@ -33,7 +34,8 @@ export type AztecNodeConfig = ArchiverConfig &
   SentinelConfig &
   SharedNodeConfig &
   GenesisStateConfig &
-  NodeRPCConfig & {
+  NodeRPCConfig &
+  SlasherConfig & {
     /** L1 contracts addresses */
     l1Contracts: L1ContractAddresses;
     /** Whether the validator is disabled for this node */
@@ -52,6 +54,7 @@ export const aztecNodeConfigMappings: ConfigMappingsType<AztecNodeConfig> = {
   ...sharedNodeConfigMappings,
   ...genesisStateConfigMappings,
   ...nodeRpcConfigMappings,
+  ...slasherConfigMappings,
   l1Contracts: {
     description: 'The deployed L1 contract addresses',
     nested: l1ContractAddressesMapping,

package/src/aztec-node/server.ts

@@ -10,7 +10,13 @@ import {
   type PUBLIC_DATA_TREE_HEIGHT,
 } from '@aztec/constants';
 import { EpochCache } from '@aztec/epoch-cache';
-import { type L1ContractAddresses, RegistryContract, createEthereumChain } from '@aztec/ethereum';
+import {
+  type L1ContractAddresses,
+  RegistryContract,
+  createEthereumChain,
+  createExtendedL1Client,
+} from '@aztec/ethereum';
+import { L1TxUtilsWithBlobs } from '@aztec/ethereum/l1-tx-utils-with-blobs';
 import { compactArray } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -20,7 +26,6 @@ import { SerialQueue } from '@aztec/foundation/queue';
 import { count } from '@aztec/foundation/string';
 import { DateProvider, Timer } from '@aztec/foundation/timer';
 import { SiblingPath } from '@aztec/foundation/trees';
-import type { AztecKVStore } from '@aztec/kv-store';
 import { openTmpStore } from '@aztec/kv-store/lmdb';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { SHA256Trunc, StandardTree, UnbalancedTree } from '@aztec/merkle-tree';
@@ -31,10 +36,10 @@ import {
   GlobalVariableBuilder,
   SequencerClient,
   type SequencerPublisher,
-  createSlasherClient,
   createValidatorForAcceptingTxs,
 } from '@aztec/sequencer-client';
 import { PublicProcessorFactory } from '@aztec/simulator/server';
+import { EpochPruneWatcher, SlasherClient, type Watcher } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { InBlock, L2Block, L2BlockNumber, L2BlockSource, PublishedL2Block } from '@aztec/stdlib/block';
 import type {
@@ -182,7 +187,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
 
     const publicClient = createPublicClient({
       chain: ethereumChain.chainInfo,
-      transport: fallback(config.l1RpcUrls.map(url => http(url))),
+      transport: fallback(config.l1RpcUrls.map((url: string) => http(url))),
       pollingInterval: config.viemPollingIntervalMS,
     });
 
@@ -195,6 +200,9 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     // Overwrite the passed in vars.
     config.l1Contracts = { ...config.l1Contracts, ...l1ContractsAddresses };
 
+    const l1Client = createExtendedL1Client(config.l1RpcUrls, config.publisherPrivateKey, ethereumChain.chainInfo);
+    const l1TxUtils = new L1TxUtilsWithBlobs(l1Client, log, config);
+
     const rollup = getContract({
       address: l1ContractsAddresses.rollupAddress.toString(),
       abi: RollupAbi,
@@ -248,8 +256,17 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     // Start p2p. Note that it depends on world state to be running.
     await p2pClient.start();
 
-    const slasherClient = createSlasherClient(config, archiver, telemetry);
-    slasherClient.start();
+    const watchers: Watcher[] = [];
+
+    const validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
+    if (validatorsSentinel) {
+      watchers.push(validatorsSentinel);
+    }
+    const epochPruneWatcher = new EpochPruneWatcher(archiver, epochCache, config.slashPrunePenalty);
+    watchers.push(epochPruneWatcher);
+
+    const slasherClient = await SlasherClient.new(config, config.l1Contracts, l1TxUtils, watchers, dateProvider);
+    await slasherClient.start();
 
     const validatorClient = createValidatorClient(config, {
       p2pClient,
@@ -259,16 +276,17 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
       blockSource: archiver,
     });
 
-    const validatorsSentinel = await createSentinel(epochCache, archiver, p2pClient, config);
-    await validatorsSentinel?.start();
-
     log.verbose(`All Aztec Node subsystems synced`);
 
     // now create the sequencer
     const sequencer = config.disableValidator
       ? undefined
       : await SequencerClient.new(config, {
+          // if deps were provided, they should override the defaults,
+          // or things that we created in this function
           ...deps,
+          epochCache,
+          l1TxUtils,
           validatorClient,
           p2pClient,
           worldStateSynchronizer,
@@ -529,7 +547,7 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
   public async stop() {
     this.log.info(`Stopping`);
     await this.txQueue.end();
-    await this.validatorsSentinel?.stop();
+    // await this.validatorsSentinel?.stop(); <- The slasher client will stop this
     await this.sequencer?.stop();
     await this.p2pClient.stop();
     await this.worldStateSynchronizer.stop();
@@ -699,14 +717,20 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
   }
 
   /**
-   * Returns the index of a l2ToL1Message in a ephemeral l2 to l1 data tree as well as its sibling path.
-   * @remarks This tree is considered ephemeral because it is created on-demand by: taking all the l2ToL1 messages
-   * in a single block, and then using them to make a variable depth append-only tree with these messages as leaves.
-   * The tree is discarded immediately after calculating what we need from it.
+   * Returns the index and sibling path for a L2->L1 message in a block's message tree.
+   * @remarks The message tree is constructed on-demand by taking all L2->L1 messages in a block
+   * and creating a variable depth append-only tree with the messages as leaves.
+   * The tree is constructed in two layers:
+   * 1. Subtree - For each transaction in the block, a subtree is created containing all L2->L1 messages from that
+   * transaction.
+   * 2. Top tree - A tree containing the roots of all the subtrees as leaves
+   * The final path is constructed by concatenating the path in the subtree with the path in the top tree.
+   * When there is only one transaction in the block, the subtree itself becomes the block's L2->L1 message tree,
+   * and no top tree is needed. The out hash is the root of the the block's L2->L1 message tree.
    * TODO: Handle the case where two messages in the same tx have the same hash.
-   * @param blockNumber - The block number at which to get the data.
-   * @param l2ToL1Message - The l2ToL1Message get the index / sibling path for.
-   * @returns A tuple of the index and the sibling path of the L2ToL1Message.
+   * @param blockNumber - Block number to get data from
+   * @param l2ToL1Message - Message to get index/path for
+   * @returns [index, siblingPath] for the message
    */
   public async getL2ToL1MessageMembershipWitness(
     blockNumber: L2BlockNumber,
@@ -715,70 +739,98 @@ export class AztecNodeService implements AztecNode, AztecNodeAdmin, Traceable {
     const block = await this.blockSource.getBlock(blockNumber === 'latest' ? await this.getBlockNumber() : blockNumber);
 
     if (block === undefined) {
-      throw new Error('Block is not defined');
+      throw new Error('Block not found in getL2ToL1MessageMembershipWitness');
     }
 
-    const l2ToL1Messages = block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs);
+    const messagesPerTx = block.body.txEffects.map(txEffect => txEffect.l2ToL1Msgs);
 
-    // Find index of message
-    let indexOfMsgInSubtree = -1;
-    const indexOfMsgTx = l2ToL1Messages.findIndex(msgs => {
-      const idx = msgs.findIndex(msg => msg.equals(l2ToL1Message));
-      indexOfMsgInSubtree = Math.max(indexOfMsgInSubtree, idx);
-      return idx !== -1;
-    });
+    // Find index of message in subtree and index of tx in a block
+    let messageIndexInTx = -1,
+      txIndex = -1;
+    {
+      txIndex = messagesPerTx.findIndex(messages => {
+        const idx = messages.findIndex(msg => msg.equals(l2ToL1Message));
+        messageIndexInTx = Math.max(messageIndexInTx, idx);
+        return idx !== -1;
+      });
+    }
 
-    if (indexOfMsgTx === -1) {
+    if (txIndex === -1) {
       throw new Error('The L2ToL1Message you are trying to prove inclusion of does not exist');
     }
 
-    const tempStores: AztecKVStore[] = [];
+    // Get the message path in subtree and message subtree height
+    let messagePathInSubtree: SiblingPath<number>;
+    let messageSubtreeHeight: number;
+    {
+      const subtreeStore = openTmpStore(true);
+      const txMessages = messagesPerTx[txIndex];
+      messageSubtreeHeight = txMessages.length <= 1 ? 1 : Math.ceil(Math.log2(txMessages.length));
+      const subtree = new StandardTree(
+        subtreeStore,
+        new SHA256Trunc(),
+        `subtree_${txIndex}`,
+        messageSubtreeHeight,
+        0n,
+        Fr,
+      );
+      subtree.appendLeaves(txMessages);
+      messagePathInSubtree = await subtree.getSiblingPath(BigInt(messageIndexInTx), true);
+      await subtreeStore.delete();
+    }
 
-    // Construct message subtrees
-    const l2toL1Subtrees = l2ToL1Messages.map((msgs, i) => {
-      const store = openTmpStore(true);
-      tempStores.push(store);
-      const treeHeight = msgs.length <= 1 ? 1 : Math.ceil(Math.log2(msgs.length));
-      const tree = new StandardTree(store, new SHA256Trunc(), `temp_msgs_subtrees_${i}`, treeHeight, 0n, Fr);
-      tree.appendLeaves(msgs);
-      return tree;
-    });
+    // If the number of txs is 1 we are dealing with a special case where the tx subtree itself is the whole block's
+    // l2 to l1 message tree.
+    const numTransactions = block.body.txEffects.length;
+    if (numTransactions === 1) {
+      return [BigInt(messageIndexInTx), messagePathInSubtree];
+    }
 
-    // path of the input msg from leaf -> first out hash calculated in base rolllup
-    const subtreePathOfL2ToL1Message = await l2toL1Subtrees[indexOfMsgTx].getSiblingPath(
-      BigInt(indexOfMsgInSubtree),
-      true,
+    // Calculate roots for all tx subtrees
+    const txSubtreeRoots = await Promise.all(
+      messagesPerTx.map(async (messages, txIdx) => {
+        // For a tx with no messages, we have to set an out hash of 0 to match what the circuit does.
+        if (messages.length === 0) {
+          return Fr.ZERO;
+        }
+
+        const txStore = openTmpStore(true);
+        const txTreeHeight = messages.length <= 1 ? 1 : Math.ceil(Math.log2(messages.length));
+        const txTree = new StandardTree(
+          txStore,
+          new SHA256Trunc(),
+          `tx_messages_subtree_${txIdx}`,
+          txTreeHeight,
+          0n,
+          Fr,
+        );
+        txTree.appendLeaves(messages);
+        const root = Fr.fromBuffer(txTree.getRoot(true));
+        await txStore.delete();
+        return root;
+      }),
     );
 
-    const numTxs = block.body.txEffects.length;
-    if (numTxs === 1) {
-      return [BigInt(indexOfMsgInSubtree), subtreePathOfL2ToL1Message];
+    // Construct the top tree and compute the combined path
+    let combinedPath: Buffer[];
+    {
+      const topTreeHeight = Math.ceil(Math.log2(txSubtreeRoots.length));
+      // The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
+      const topTree = new UnbalancedTree(new SHA256Trunc(), 'top_tree', topTreeHeight, Fr);
+      await topTree.appendLeaves(txSubtreeRoots);
+
+      const txPathInTopTree = await topTree.getSiblingPath(txSubtreeRoots[txIndex].toBigInt());
+      // Append subtree path to top tree path
+      combinedPath = messagePathInSubtree.toBufferArray().concat(txPathInTopTree.toBufferArray());
     }
 
-    // For a tx with no messages, we have to set an out hash of 0 to match the circuit/contract behavior
-    const l2toL1SubtreeRoots = l2toL1Subtrees.map(t =>
-      t.getNumLeaves(true) == 0n ? Fr.ZERO : Fr.fromBuffer(t.getRoot(true)),
-    );
-    const maxTreeHeight = Math.ceil(Math.log2(l2toL1SubtreeRoots.length));
-    // The root of this tree is the out_hash calculated in Noir => we truncate to match Noir's SHA
-    const outHashTree = new UnbalancedTree(new SHA256Trunc(), 'temp_outhash_sibling_path', maxTreeHeight, Fr);
-    await outHashTree.appendLeaves(l2toL1SubtreeRoots);
-
-    const pathOfTxInOutHashTree = await outHashTree.getSiblingPath(l2toL1SubtreeRoots[indexOfMsgTx].toBigInt());
-    // Append subtree path to out hash tree path
-    const mergedPath = subtreePathOfL2ToL1Message.toBufferArray().concat(pathOfTxInOutHashTree.toBufferArray());
-    // Append binary index of subtree path to binary index of out hash tree path
-    const mergedIndex = parseInt(
-      indexOfMsgTx
-        .toString(2)
-        .concat(indexOfMsgInSubtree.toString(2).padStart(l2toL1Subtrees[indexOfMsgTx].getDepth(), '0')),
+    // Append binary index of subtree path to binary index of top tree path
+    const combinedIndex = parseInt(
+      txIndex.toString(2).concat(messageIndexInTx.toString(2).padStart(messageSubtreeHeight, '0')),
       2,
     );
 
-    // clear the tmp stores
-    await Promise.all(tempStores.map(store => store.delete()));
-
-    return [BigInt(mergedIndex), new SiblingPath(mergedPath.length, mergedPath)];
+    return [BigInt(combinedIndex), new SiblingPath(combinedPath.length, combinedPath)];
   }
 
   /**

package/src/sentinel/factory.ts

@@ -3,6 +3,7 @@ import { createLogger } from '@aztec/foundation/log';
 import type { DataStoreConfig } from '@aztec/kv-store/config';
 import { createStore } from '@aztec/kv-store/lmdb-v2';
 import type { P2PClient } from '@aztec/p2p';
+import type { SlasherConfig } from '@aztec/slasher/config';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 
 import type { SentinelConfig } from './config.js';
@@ -13,7 +14,7 @@ export async function createSentinel(
   epochCache: EpochCache,
   archiver: L2BlockSource,
   p2p: P2PClient,
-  config: SentinelConfig & DataStoreConfig,
+  config: SentinelConfig & DataStoreConfig & SlasherConfig,
   logger = createLogger('node:sentinel'),
 ): Promise<Sentinel | undefined> {
   if (!config.sentinelEnabled) {
@@ -27,5 +28,5 @@ export async function createSentinel(
   );
   const storeHistoryLength = config.sentinelHistoryLengthInEpochs * epochCache.getL1Constants().epochDuration;
   const sentinelStore = new SentinelStore(kvStore, { historyLength: storeHistoryLength });
-  return new Sentinel(epochCache, archiver, p2p, sentinelStore, logger);
+  return new Sentinel(epochCache, archiver, p2p, sentinelStore, config, logger);
 }