@aztec/aztec-node 3.0.0-canary.a9708bd → 3.0.0-devnet.2

package/dest/sentinel/sentinel.js

@@ -1,11 +1,11 @@
-import { countWhile, filterAsync } from '@aztec/foundation/collection';
+import { countWhile, filterAsync, fromEntries, getEntries, mapValues } from '@aztec/foundation/collection';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { L2TipsMemoryStore } from '@aztec/kv-store/stores';
 import { OffenseType, WANT_TO_SLASH_EVENT } from '@aztec/slasher';
-import { L2BlockStream, getAttestationsFromPublishedL2Block } from '@aztec/stdlib/block';
-import { getEpochAtSlot, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
+import { L2BlockStream, getAttestationInfoFromPublishedL2Block } from '@aztec/stdlib/block';
+import { getEpochAtSlot, getSlotRangeForEpoch, getTimestampForSlot } from '@aztec/stdlib/epoch-helpers';
 import EventEmitter from 'node:events';
 export class Sentinel extends EventEmitter {
     epochCache;
@@ -55,7 +55,7 @@ export class Sentinel extends EventEmitter {
                 this.slotNumberToBlock.set(block.block.header.getSlot(), {
                     blockNumber: block.block.number,
                     archive: block.block.archive.root.toString(),
-                    attestors: getAttestationsFromPublishedL2Block(block).map((att)=>att.getSender())
+                    attestors: getAttestationInfoFromPublishedL2Block(block).filter((a)=>a.status === 'recovered-from-signature').map((a)=>a.address)
                 });
             }
             // Prune the archive map to only keep at most N entries
@@ -82,18 +82,17 @@ export class Sentinel extends EventEmitter {
             });
             return;
         }
-        const epoch = getEpochAtSlot(block.header.getSlot(), await this.archiver.getL1Constants());
+        // TODO(palla/slash): We should only be computing proven performance if this is
+        // a full proof epoch and not a partial one, otherwise we'll end up with skewed stats.
+        const epoch = getEpochAtSlot(block.header.getSlot(), this.epochCache.getL1Constants());
         this.logger.debug(`Computing proven performance for epoch ${epoch}`);
         const performance = await this.computeProvenPerformance(epoch);
         this.logger.info(`Computed proven performance for epoch ${epoch}`, performance);
-        await this.updateProvenPerformance(epoch, performance);
+        await this.store.updateProvenPerformance(epoch, performance);
         await this.handleProvenPerformance(epoch, performance);
     }
     async computeProvenPerformance(epoch) {
-        const headers = await this.archiver.getBlockHeadersForEpoch(epoch);
-        const provenSlots = headers.map((h)=>h.getSlot());
-        const fromSlot = provenSlots[0];
-        const toSlot = provenSlots[provenSlots.length - 1];
+        const [fromSlot, toSlot] = getSlotRangeForEpoch(epoch, this.epochCache.getL1Constants());
         const { committee } = await this.epochCache.getCommittee(fromSlot);
         if (!committee) {
             this.logger.trace(`No committee found for slot ${fromSlot}`);
@@ -101,36 +100,25 @@ export class Sentinel extends EventEmitter {
         }
         const stats = await this.computeStats({
             fromSlot,
-            toSlot
+            toSlot,
+            validators: committee
         });
-        this.logger.debug(`Stats for epoch ${epoch}`, stats);
-        const performance = {};
-        for (const validator of Object.keys(stats.stats)){
-            let address;
-            try {
-                address = EthAddress.fromString(validator);
-            } catch (e) {
-                this.logger.error(`Invalid validator address ${validator}`, e);
-                continue;
-            }
-            if (!committee.find((v)=>v.equals(address))) {
-                continue;
-            }
-            let missed = 0;
-            for (const history of stats.stats[validator].history){
-                if (provenSlots.includes(history.slot) && history.status === 'attestation-missed') {
-                    missed++;
-                }
-            }
-            performance[address.toString()] = {
-                missed,
-                total: provenSlots.length
-            };
-        }
-        return performance;
-    }
-    updateProvenPerformance(epoch, performance) {
-        return this.store.updateProvenPerformance(epoch, performance);
+        this.logger.debug(`Stats for epoch ${epoch}`, {
+            ...stats,
+            fromSlot,
+            toSlot,
+            epoch
+        });
+        // Note that we are NOT using the total slots in the epoch as `total` here, since we only
+        // compute missed attestations over the blocks that had a proposal in them. So, let's say
+        // we have an epoch with 10 slots, but only 5 had a block proposal. A validator that was
+        // offline, assuming they were not picked as proposer, will then be reported as having missed
+        // 5/5 attestations. If we used the total, they'd be reported as 5/10, which would probably
+        // allow them to avoid being slashed.
+        return mapValues(stats.stats, (stat)=>({
+                missed: stat.missedAttestations.count + stat.missedProposals.count,
+                total: stat.missedAttestations.total + stat.missedProposals.total
+            }));
     }
     /**
    * Checks if a validator has been inactive for the specified number of consecutive epochs for which we have data on it.
@@ -152,9 +140,10 @@ export class Sentinel extends EventEmitter {
         return allPerformance.sort((a, b)=>Number(b.epoch - a.epoch)).filter((p)=>p.epoch < currentEpoch).slice(0, requiredConsecutiveEpochs).every((p)=>p.missed / p.total >= this.config.slashInactivityTargetPercentage);
     }
     async handleProvenPerformance(epoch, performance) {
-        const inactiveValidators = Object.entries(performance).filter(([_, { missed, total }])=>{
-            return missed / total >= this.config.slashInactivityTargetPercentage;
-        }).map(([address])=>address);
+        if (this.config.slashInactivityPenalty === 0n) {
+            return;
+        }
+        const inactiveValidators = getEntries(performance).filter(([_, { missed, total }])=>missed / total >= this.config.slashInactivityTargetPercentage).map(([address])=>address);
         this.logger.debug(`Found ${inactiveValidators.length} inactive validators in epoch ${epoch}`, {
             inactiveValidators,
             epoch,
@@ -169,7 +158,7 @@ export class Sentinel extends EventEmitter {
                 epochOrSlot: epoch
             }));
         if (criminals.length > 0) {
-            this.logger.info(`Identified ${criminals.length} validators to slash due to inactivity in at least ${epochThreshold} consecutive epochs`, {
+            this.logger.verbose(`Identified ${criminals.length} validators to slash due to inactivity in at least ${epochThreshold} consecutive epochs`, {
                 ...args,
                 epochThreshold
             });
@@ -267,14 +256,18 @@ export class Sentinel extends EventEmitter {
         // (contains the ones synced from mined blocks, which we may have missed from p2p).
         const block = this.slotNumberToBlock.get(slot);
         const p2pAttested = await this.p2p.getAttestationsForSlot(slot, block?.archive);
+        // Filter out attestations with invalid signatures
+        const p2pAttestors = p2pAttested.map((a)=>a.getSender()).filter((s)=>s !== undefined);
         const attestors = new Set([
-            ...p2pAttested.map((a)=>a.getSender().toString()),
+            ...p2pAttestors.map((a)=>a.toString()),
             ...block?.attestors.map((a)=>a.toString()) ?? []
-        ]);
-        // We assume that there was a block proposal if at least one of the validators attested to it.
+        ].filter((addr)=>proposer.toString() !== addr));
+        // We assume that there was a block proposal if at least one of the validators (other than the proposer) attested to it.
         // It could be the case that every single validator failed, and we could differentiate it by having
         // this node re-execute every block proposal it sees and storing it in the attestation pool.
         // But we'll leave that corner case out to reduce pressure on the node.
+        // TODO(palla/slash): This breaks if a given node has more than one validator in the current committee,
+        // since they will attest to their own proposal it even if it's not re-executable.
         const blockStatus = block ? 'mined' : attestors.size > 0 ? 'proposed' : 'missed';
         this.logger.debug(`Block for slot ${slot} was ${blockStatus}`, {
             ...block,
@@ -315,18 +308,17 @@ export class Sentinel extends EventEmitter {
     /** Push the status for each slot for each validator. */ updateValidators(slot, stats) {
         return this.store.updateValidators(slot, stats);
     }
-    /** Computes stats to be returned based on stored data. */ async computeStats({ fromSlot: _fromSlot, toSlot: _toSlot } = {}) {
-        const histories = await this.store.getHistories();
+    /** Computes stats to be returned based on stored data. */ async computeStats({ fromSlot, toSlot, validators } = {}) {
+        const histories = validators ? fromEntries(await Promise.all(validators.map(async (v)=>[
+                v.toString(),
+                await this.store.getHistory(v)
+            ]))) : await this.store.getHistories();
         const slotNow = this.epochCache.getEpochAndSlotNow().slot;
-        const fromSlot = _fromSlot ?? (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
-        const toSlot = _toSlot ?? this.lastProcessedSlot ?? slotNow;
-        const result = {};
-        for (const [address, history] of Object.entries(histories)){
-            const validatorAddress = address;
-            result[validatorAddress] = this.computeStatsForValidator(validatorAddress, history, fromSlot, toSlot);
-        }
+        fromSlot ??= (this.lastProcessedSlot ?? slotNow) - BigInt(this.store.getHistoryLength());
+        toSlot ??= this.lastProcessedSlot ?? slotNow;
+        const stats = mapValues(histories, (history, address)=>this.computeStatsForValidator(address, history ?? [], fromSlot, toSlot));
         return {
-            stats: result,
+            stats,
             lastProcessedSlot: this.lastProcessedSlot,
             initialSlot: this.initialSlot,
             slotWindow: this.store.getHistoryLength()
@@ -357,25 +349,32 @@ export class Sentinel extends EventEmitter {
     computeStatsForValidator(address, allHistory, fromSlot, toSlot) {
         let history = fromSlot ? allHistory.filter((h)=>h.slot >= fromSlot) : allHistory;
         history = toSlot ? history.filter((h)=>h.slot <= toSlot) : history;
+        const lastProposal = history.filter((h)=>h.status === 'block-proposed' || h.status === 'block-mined').at(-1);
+        const lastAttestation = history.filter((h)=>h.status === 'attestation-sent').at(-1);
         return {
             address: EthAddress.fromString(address),
-            lastProposal: this.computeFromSlot(history.filter((h)=>h.status === 'block-proposed' || h.status === 'block-mined').at(-1)?.slot),
-            lastAttestation: this.computeFromSlot(history.filter((h)=>h.status === 'attestation-sent').at(-1)?.slot),
+            lastProposal: this.computeFromSlot(lastProposal?.slot),
+            lastAttestation: this.computeFromSlot(lastAttestation?.slot),
             totalSlots: history.length,
-            missedProposals: this.computeMissed(history, 'block', 'block-missed'),
-            missedAttestations: this.computeMissed(history, 'attestation', 'attestation-missed'),
+            missedProposals: this.computeMissed(history, 'block', [
+                'block-missed'
+            ]),
+            missedAttestations: this.computeMissed(history, 'attestation', [
+                'attestation-missed'
+            ]),
             history
         };
     }
     computeMissed(history, computeOverPrefix, filter) {
-        const relevantHistory = history.filter((h)=>h.status.startsWith(computeOverPrefix));
-        const filteredHistory = relevantHistory.filter((h)=>h.status === filter);
+        const relevantHistory = history.filter((h)=>!computeOverPrefix || h.status.startsWith(computeOverPrefix));
+        const filteredHistory = relevantHistory.filter((h)=>filter.includes(h.status));
         return {
             currentStreak: countWhile([
                 ...relevantHistory
-            ].reverse(), (h)=>h.status === filter),
+            ].reverse(), (h)=>filter.includes(h.status)),
             rate: relevantHistory.length === 0 ? undefined : filteredHistory.length / relevantHistory.length,
-            count: filteredHistory.length
+            count: filteredHistory.length,
+            total: relevantHistory.length
         };
     }
     computeFromSlot(slot) {

package/dest/sentinel/store.d.ts

@@ -9,8 +9,10 @@ export declare class SentinelStore {
     private readonly provenMap;
     constructor(store: AztecAsyncKVStore, config: {
         historyLength: number;
+        historicProvenPerformanceLength: number;
     });
     getHistoryLength(): number;
+    getHistoricProvenPerformanceLength(): number;
     updateProvenPerformance(epoch: bigint, performance: ValidatorsEpochPerformance): Promise<void>;
     getProvenPerformance(who: EthAddress): Promise<{
         missed: number;

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

@@ -1 +1 @@
-{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/sentinel/store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAElC,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;IAQ9E,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;YAKjG,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC;YAUhG,0BAA0B;IAY3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAQtE,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAKzF,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,sBAAsB;IAa9B,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":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,iBAAiB,EAAiB,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACrB,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAElC,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,CAAC;QAAC,+BAA+B,EAAE,MAAM,CAAA;KAAE;IAM7E,gBAAgB;IAIhB,kCAAkC;IAI5B,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,0BAA0B;IAQ9E,oBAAoB,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;YAKjG,sCAAsC;IA6BvC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAC;YAUhG,0BAA0B;IAY3B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,MAAM,EAAE,EAAE,sBAAsB,CAAC,CAAC;IAQtE,UAAU,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAKzF,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

@@ -18,6 +18,9 @@ export class SentinelStore {
     getHistoryLength() {
         return this.config.historyLength;
     }
+    getHistoricProvenPerformanceLength() {
+        return this.config.historicProvenPerformanceLength;
+    }
     async updateProvenPerformance(epoch, performance) {
         await this.store.transactionAsync(async ()=>{
             for (const [who, { missed, total }] of Object.entries(performance)){
@@ -53,8 +56,8 @@ export class SentinelStore {
         // 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);
+        // keep the most recent `historicProvenPerformanceLength` entries.
+        const performanceToKeep = currentPerformance.slice(-this.config.historicProvenPerformanceLength);
         await this.provenMap.set(who.toString(), this.serializePerformance(performanceToKeep));
     }
     async updateValidators(slot, statuses) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.2",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -66,33 +66,33 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "3.0.0-canary.a9708bd",
-    "@aztec/bb-prover": "3.0.0-canary.a9708bd",
-    "@aztec/blob-sink": "3.0.0-canary.a9708bd",
-    "@aztec/constants": "3.0.0-canary.a9708bd",
-    "@aztec/epoch-cache": "3.0.0-canary.a9708bd",
-    "@aztec/ethereum": "3.0.0-canary.a9708bd",
-    "@aztec/foundation": "3.0.0-canary.a9708bd",
-    "@aztec/kv-store": "3.0.0-canary.a9708bd",
-    "@aztec/l1-artifacts": "3.0.0-canary.a9708bd",
-    "@aztec/merkle-tree": "3.0.0-canary.a9708bd",
-    "@aztec/node-keystore": "3.0.0-canary.a9708bd",
-    "@aztec/node-lib": "3.0.0-canary.a9708bd",
-    "@aztec/noir-protocol-circuits-types": "3.0.0-canary.a9708bd",
-    "@aztec/p2p": "3.0.0-canary.a9708bd",
-    "@aztec/protocol-contracts": "3.0.0-canary.a9708bd",
-    "@aztec/prover-client": "3.0.0-canary.a9708bd",
-    "@aztec/sequencer-client": "3.0.0-canary.a9708bd",
-    "@aztec/simulator": "3.0.0-canary.a9708bd",
-    "@aztec/slasher": "3.0.0-canary.a9708bd",
-    "@aztec/stdlib": "3.0.0-canary.a9708bd",
-    "@aztec/telemetry-client": "3.0.0-canary.a9708bd",
-    "@aztec/validator-client": "3.0.0-canary.a9708bd",
-    "@aztec/world-state": "3.0.0-canary.a9708bd",
+    "@aztec/archiver": "3.0.0-devnet.2",
+    "@aztec/bb-prover": "3.0.0-devnet.2",
+    "@aztec/blob-sink": "3.0.0-devnet.2",
+    "@aztec/constants": "3.0.0-devnet.2",
+    "@aztec/epoch-cache": "3.0.0-devnet.2",
+    "@aztec/ethereum": "3.0.0-devnet.2",
+    "@aztec/foundation": "3.0.0-devnet.2",
+    "@aztec/kv-store": "3.0.0-devnet.2",
+    "@aztec/l1-artifacts": "3.0.0-devnet.2",
+    "@aztec/merkle-tree": "3.0.0-devnet.2",
+    "@aztec/node-keystore": "3.0.0-devnet.2",
+    "@aztec/node-lib": "3.0.0-devnet.2",
+    "@aztec/noir-protocol-circuits-types": "3.0.0-devnet.2",
+    "@aztec/p2p": "3.0.0-devnet.2",
+    "@aztec/protocol-contracts": "3.0.0-devnet.2",
+    "@aztec/prover-client": "3.0.0-devnet.2",
+    "@aztec/sequencer-client": "3.0.0-devnet.2",
+    "@aztec/simulator": "3.0.0-devnet.2",
+    "@aztec/slasher": "3.0.0-devnet.2",
+    "@aztec/stdlib": "3.0.0-devnet.2",
+    "@aztec/telemetry-client": "3.0.0-devnet.2",
+    "@aztec/validator-client": "3.0.0-devnet.2",
+    "@aztec/world-state": "3.0.0-devnet.2",
     "koa": "^2.16.1",
-    "koa-router": "^12.0.0",
+    "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

package/src/aztec-node/config.ts

@@ -6,16 +6,12 @@ import {
   l1ContractAddressesMapping,
 } from '@aztec/ethereum';
 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 AztecAddressHex,
-  type EthAddressHex,
-  type EthPrivateKey,
-  type EthRemoteSignerAccount,
-  type Hex,
   type KeyStore,
-  type KeyStoreConfig,
   type ValidatorKeyStore,
+  ethPrivateKeySchema,
   keyStoreConfigMappings,
 } from '@aztec/node-keystore';
 import { type SharedNodeConfig, sharedNodeConfigMappings } from '@aztec/node-lib/config';
@@ -50,7 +46,6 @@ export type AztecNodeConfig = ArchiverConfig &
   Pick<ProverClientUserConfig, 'bbBinaryPath' | 'bbWorkingDirectory' | 'realProofs'> &
   P2PConfig &
   DataStoreConfig &
-  KeyStoreConfig &
   SentinelConfig &
   SharedNodeConfig &
   GenesisStateConfig &
@@ -97,7 +92,7 @@ export function getConfigEnvVars(): AztecNodeConfig {
 
 type ConfigRequiredToBuildKeyStore = TxSenderConfig & SequencerClientConfig & SharedNodeConfig & ValidatorClientConfig;
 
-function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
+function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
 
   if (
@@ -108,22 +103,13 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
   ) {
     return undefined;
   }
-  const coinbase = config.coinbase ? config.coinbase.toString() : config.validatorAddresses[0].toString();
-  const feeRecipient = config.feeRecipient ? config.feeRecipient.toString() : AztecAddress.ZERO.toString();
-
-  const publisherAddresses =
-    config.publisherAddresses && config.publisherAddresses.length > 0
-      ? config.publisherAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount)
-      : [];
-
-  const attestors = config.validatorAddresses.map(k => k.toChecksumString() as EthRemoteSignerAccount);
 
   validatorKeyStores.push({
-    attester: attestors,
-    feeRecipient: feeRecipient as AztecAddressHex,
-    coinbase: coinbase as EthAddressHex,
+    attester: config.validatorAddresses,
+    feeRecipient: config.feeRecipient ?? AztecAddress.ZERO,
+    coinbase: config.coinbase ?? config.validatorAddresses[0],
     remoteSigner: config.web3SignerUrl,
-    publisher: publisherAddresses,
+    publisher: config.publisherAddresses ?? [],
   });
 
   const keyStore: KeyStore = {
@@ -136,30 +122,26 @@ function createKeyStoreFromWeb3Signer(config: ConfigRequiredToBuildKeyStore) {
   return keyStore;
 }
 
-function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore) {
+function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore): KeyStore | undefined {
   const validatorKeyStores: ValidatorKeyStore[] = [];
-  const ethPrivateKeys: EthPrivateKey[] = [];
-  const validatorKeys = config.validatorPrivateKeys ? config.validatorPrivateKeys.getValue() : [];
-  for (let i = 0; i < validatorKeys.length; i++) {
-    const key = validatorKeys[i];
-    const ethPrivateKey: EthPrivateKey = key as Hex<32>;
-    ethPrivateKeys.push(ethPrivateKey);
-  }
+  const ethPrivateKeys = config.validatorPrivateKeys
+    ? config.validatorPrivateKeys.getValue().map(x => ethPrivateKeySchema.parse(x))
+    : [];
 
   if (!ethPrivateKeys.length) {
     return undefined;
   }
-  const coinbase = config.coinbase ? config.coinbase.toString() : privateKeyToAddress(ethPrivateKeys[0]);
-  const feeRecipient = config.feeRecipient ? config.feeRecipient.toString() : AztecAddress.ZERO.toString();
+  const coinbase = config.coinbase ?? EthAddress.fromString(privateKeyToAddress(ethPrivateKeys[0]));
+  const feeRecipient = config.feeRecipient ?? AztecAddress.ZERO;
 
   const publisherKeys = config.publisherPrivateKeys
-    ? config.publisherPrivateKeys.map(k => k.getValue() as EthPrivateKey)
+    ? config.publisherPrivateKeys.map(k => ethPrivateKeySchema.parse(k.getValue()))
     : [];
 
   validatorKeyStores.push({
     attester: ethPrivateKeys,
-    feeRecipient: feeRecipient as AztecAddressHex,
-    coinbase: coinbase as EthAddressHex,
+    feeRecipient: feeRecipient,
+    coinbase: coinbase,
     remoteSigner: undefined,
     publisher: publisherKeys,
   });
@@ -174,7 +156,9 @@ function createKeyStoreFromPrivateKeys(config: ConfigRequiredToBuildKeyStore) {
   return keyStore;
 }
 
-export function createKeyStoreForValidator(config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig) {
+export function createKeyStoreForValidator(
+  config: TxSenderConfig & SequencerClientConfig & SharedNodeConfig,
+): KeyStore | undefined {
   if (config.web3SignerUrl !== undefined && config.web3SignerUrl.length > 0) {
     return createKeyStoreFromWeb3Signer(config);
   }