@aztec/aztec-node 0.0.1-commit.96dac018d → 0.0.1-commit.9badcec54

package/dest/sentinel/factory.d.ts

@@ -1,9 +1,9 @@
 import type { EpochCache } from '@aztec/epoch-cache';
-import type { DataStoreConfig } from '@aztec/kv-store/config';
 import type { P2PClient } from '@aztec/p2p';
 import type { L2BlockSource } from '@aztec/stdlib/block';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import type { DataStoreConfig } from '@aztec/stdlib/kv-store';
 import type { SentinelConfig } from './config.js';
 import { Sentinel } from './sentinel.js';
 export declare function createSentinel(epochCache: EpochCache, archiver: L2BlockSource, p2p: P2PClient, config: SentinelConfig & DataStoreConfig & SlasherConfig, logger?: import("@aztec/foundation/log").Logger): Promise<Sentinel | undefined>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFckQsT0FBTyxLQUFLLEVBQUUsZUFBZSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFOUQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRXJFLE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmFjdG9yeS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3NlbnRpbmVsL2ZhY3RvcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFHckQsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQzVDLE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3pELE9BQU8sS0FBSyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBQ3JFLE9BQU8sS0FBSyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRTlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUNsRCxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBR3pDLHdCQUFzQixjQUFjLENBQ2xDLFVBQVUsRUFBRSxVQUFVLEVBQ3RCLFFBQVEsRUFBRSxhQUFhLEVBQ3ZCLEdBQUcsRUFBRSxTQUFTLEVBQ2QsTUFBTSxFQUFFLGNBQWMsR0FBRyxlQUFlLEdBQUcsYUFBYSxFQUN4RCxNQUFNLHlDQUFnQyxHQUNyQyxPQUFPLENBQUMsUUFBUSxHQUFHLFNBQVMsQ0FBQyxDQVkvQiJ9

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

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/sentinel/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAErE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,aAAa,EACxD,MAAM,yCAAgC,GACrC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../src/sentinel/factory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,wBAAsB,cAAc,CAClC,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,aAAa,EACvB,GAAG,EAAE,SAAS,EACd,MAAM,EAAE,cAAc,GAAG,eAAe,GAAG,aAAa,EACxD,MAAM,yCAAgC,GACrC,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC,CAY/B"}

package/dest/sentinel/sentinel.js

@@ -48,7 +48,7 @@ export class Sentinel extends EventEmitter {
         this.runningPromise.start();
     }
     /** Loads initial slot and initializes blockstream. We will not process anything at or before the initial slot. */ async init() {
-        this.initialSlot = this.epochCache.getEpochAndSlotNow().slot;
+        this.initialSlot = this.epochCache.getSlotNow();
         const startingBlock = BlockNumber(await this.archiver.getBlockNumber());
         this.logger.info(`Starting validator sentinel with initial slot ${this.initialSlot} and block ${startingBlock}`);
         this.blockStream = new L2BlockStream(this.archiver, this.l2TipsStore, this, this.logger, {
@@ -157,13 +157,13 @@ export class Sentinel extends EventEmitter {
             return false;
         }
         // Check that we have at least requiredConsecutiveEpochs and that all of them are above the inactivity threshold
-        return pastEpochs.slice(0, requiredConsecutiveEpochs).every((p)=>p.missed / p.total >= this.config.slashInactivityTargetPercentage);
+        return pastEpochs.slice(0, requiredConsecutiveEpochs).every((p)=>p.total === 0 ? false : p.missed / p.total >= this.config.slashInactivityTargetPercentage);
     }
     async handleProvenPerformance(epoch, performance) {
         if (this.config.slashInactivityPenalty === 0n) {
             return;
         }
-        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
+        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>total > 0 && missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
         this.logger.debug(`Found ${inactiveValidators.length} inactive validators in epoch ${epoch}`, {
             inactiveValidators,
             epoch,
@@ -190,7 +190,7 @@ export class Sentinel extends EventEmitter {
    * Note that we do not process historical data, since we rely on p2p data for processing,
    * and we don't have that data if we were offline during the period.
    */ async work() {
-        const { slot: currentSlot } = this.epochCache.getEpochAndSlotNow();
+        const currentSlot = this.epochCache.getSlotNow();
         try {
             // Manually sync the block stream to ensure we have the latest data.
             // Note we never `start` the blockstream, so it loops at the same pace as we do.
@@ -229,10 +229,10 @@ export class Sentinel extends EventEmitter {
             this.logger.trace(`Refusing to process slot ${targetSlot} given initial slot ${this.initialSlot}`);
             return false;
         }
-        const archiverSlot = await this.archiver.getL2SlotNumber();
-        if (archiverSlot === undefined || archiverSlot < targetSlot) {
+        const syncedSlot = await this.archiver.getSyncedL2SlotNumber();
+        if (syncedSlot === undefined || syncedSlot < targetSlot) {
             this.logger.debug(`Waiting for archiver to sync with L2 slot ${targetSlot}`, {
-                archiverSlot,
+                syncedSlot,
                 targetSlot
             });
             return false;
@@ -351,7 +351,7 @@ export class Sentinel extends EventEmitter {
                 v.toString(),
                 await this.store.getHistory(v)
             ]))) : await this.store.getHistories();
-        const slotNow = this.epochCache.getEpochAndSlotNow().slot;
+        const slotNow = this.epochCache.getSlotNow();
         fromSlot ??= SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
         toSlot ??= this.lastProcessedSlot ?? slotNow;
         const stats = mapValues(histories, (history, address)=>this.computeStatsForValidator(address, history ?? [], fromSlot, toSlot));
@@ -367,7 +367,7 @@ export class Sentinel extends EventEmitter {
         if (!history || history.length === 0) {
             return undefined;
         }
-        const slotNow = this.epochCache.getEpochAndSlotNow().slot;
+        const slotNow = this.epochCache.getSlotNow();
         const effectiveFromSlot = fromSlot ?? SlotNumber(Math.max((this.lastProcessedSlot ?? slotNow) - this.store.getHistoryLength(), 0));
         const effectiveToSlot = toSlot ?? this.lastProcessedSlot ?? slotNow;
         const historyLength = BigInt(this.store.getHistoryLength());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.0.1-commit.96dac018d",
+  "version": "0.0.1-commit.9badcec54",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -65,32 +65,31 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.0.1-commit.96dac018d",
-    "@aztec/bb-prover": "0.0.1-commit.96dac018d",
-    "@aztec/blob-client": "0.0.1-commit.96dac018d",
-    "@aztec/blob-lib": "0.0.1-commit.96dac018d",
-    "@aztec/constants": "0.0.1-commit.96dac018d",
-    "@aztec/epoch-cache": "0.0.1-commit.96dac018d",
-    "@aztec/ethereum": "0.0.1-commit.96dac018d",
-    "@aztec/foundation": "0.0.1-commit.96dac018d",
-    "@aztec/kv-store": "0.0.1-commit.96dac018d",
-    "@aztec/l1-artifacts": "0.0.1-commit.96dac018d",
-    "@aztec/merkle-tree": "0.0.1-commit.96dac018d",
-    "@aztec/node-keystore": "0.0.1-commit.96dac018d",
-    "@aztec/node-lib": "0.0.1-commit.96dac018d",
-    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.96dac018d",
-    "@aztec/p2p": "0.0.1-commit.96dac018d",
-    "@aztec/protocol-contracts": "0.0.1-commit.96dac018d",
-    "@aztec/prover-client": "0.0.1-commit.96dac018d",
-    "@aztec/prover-node": "0.0.1-commit.96dac018d",
-    "@aztec/sequencer-client": "0.0.1-commit.96dac018d",
-    "@aztec/simulator": "0.0.1-commit.96dac018d",
-    "@aztec/slasher": "0.0.1-commit.96dac018d",
-    "@aztec/stdlib": "0.0.1-commit.96dac018d",
-    "@aztec/telemetry-client": "0.0.1-commit.96dac018d",
-    "@aztec/validator-client": "0.0.1-commit.96dac018d",
-    "@aztec/validator-ha-signer": "0.0.1-commit.96dac018d",
-    "@aztec/world-state": "0.0.1-commit.96dac018d",
+    "@aztec/archiver": "0.0.1-commit.9badcec54",
+    "@aztec/bb-prover": "0.0.1-commit.9badcec54",
+    "@aztec/blob-client": "0.0.1-commit.9badcec54",
+    "@aztec/blob-lib": "0.0.1-commit.9badcec54",
+    "@aztec/constants": "0.0.1-commit.9badcec54",
+    "@aztec/epoch-cache": "0.0.1-commit.9badcec54",
+    "@aztec/ethereum": "0.0.1-commit.9badcec54",
+    "@aztec/foundation": "0.0.1-commit.9badcec54",
+    "@aztec/kv-store": "0.0.1-commit.9badcec54",
+    "@aztec/l1-artifacts": "0.0.1-commit.9badcec54",
+    "@aztec/node-keystore": "0.0.1-commit.9badcec54",
+    "@aztec/node-lib": "0.0.1-commit.9badcec54",
+    "@aztec/noir-protocol-circuits-types": "0.0.1-commit.9badcec54",
+    "@aztec/p2p": "0.0.1-commit.9badcec54",
+    "@aztec/protocol-contracts": "0.0.1-commit.9badcec54",
+    "@aztec/prover-client": "0.0.1-commit.9badcec54",
+    "@aztec/prover-node": "0.0.1-commit.9badcec54",
+    "@aztec/sequencer-client": "0.0.1-commit.9badcec54",
+    "@aztec/simulator": "0.0.1-commit.9badcec54",
+    "@aztec/slasher": "0.0.1-commit.9badcec54",
+    "@aztec/stdlib": "0.0.1-commit.9badcec54",
+    "@aztec/telemetry-client": "0.0.1-commit.9badcec54",
+    "@aztec/validator-client": "0.0.1-commit.9badcec54",
+    "@aztec/validator-ha-signer": "0.0.1-commit.9badcec54",
+    "@aztec/world-state": "0.0.1-commit.9badcec54",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",

package/src/aztec-node/config.ts

@@ -3,7 +3,6 @@ import { type GenesisStateConfig, genesisStateConfigMappings } from '@aztec/ethe
 import { type L1ContractAddresses, l1ContractAddressesMapping } from '@aztec/ethereum/l1-contract-addresses';
 import { type ConfigMappingsType, booleanConfigHelper, getConfigFromMappings } from '@aztec/foundation/config';
 import { EthAddress } from '@aztec/foundation/eth-address';
-import { type DataStoreConfig, dataConfigMappings } from '@aztec/kv-store/config';
 import {
   type KeyStore,
   type ValidatorKeyStore,
@@ -27,6 +26,7 @@ import { slasherConfigMappings } from '@aztec/slasher';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { type NodeRPCConfig, nodeRpcConfigMappings } from '@aztec/stdlib/config';
 import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
+import { type DataStoreConfig, dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';