@aztec/node-keystore 4.0.0-nightly.20250907 → 4.0.0-nightly.20260107

package/dest/loader.js

@@ -2,9 +2,11 @@
  * Keystore File Loader
  *
  * Handles loading and parsing keystore configuration files.
- */ import { createLogger } from '@aztec/foundation/log';
+ */ import { EthAddress } from '@aztec/foundation/eth-address';
+import { createLogger } from '@aztec/foundation/log';
 import { readFileSync, readdirSync, statSync } from 'fs';
 import { extname, join } from 'path';
+import { privateKeyToAddress } from 'viem/accounts';
 import { keystoreSchema } from './schemas.js';
 const logger = createLogger('node-keystore:loader');
 /**
@@ -166,12 +168,17 @@ const logger = createLogger('node-keystore:loader');
     }
     // Track attester addresses to prevent duplicates
     const attesterAddresses = new Set();
+    // Determine schema version: use v2 if any input is v2
+    const schemaVersion = keystores.some((ks)=>ks.schemaVersion === 2) ? 2 : 1;
     const merged = {
-        schemaVersion: 1,
+        schemaVersion,
         validators: [],
         slasher: undefined,
         remoteSigner: undefined,
-        prover: undefined
+        prover: undefined,
+        publisher: undefined,
+        coinbase: undefined,
+        feeRecipient: undefined
     };
     for(let i = 0; i < keystores.length; i++){
         const keystore = keystores[i];
@@ -179,15 +186,22 @@ const logger = createLogger('node-keystore:loader');
         if (keystore.validators) {
             for (const validator of keystore.validators){
                 // Check for duplicate attester addresses
-                const attesterKeys = extractAttesterKeys(validator.attester);
-                for (const key of attesterKeys){
+                const attesterKeys = extractAttesterAddresses(validator.attester);
+                for (let key of attesterKeys){
+                    key = key.toLowerCase();
                     if (attesterAddresses.has(key)) {
                         throw new KeyStoreLoadError(`Duplicate attester address ${key} found across keystore files`, `keystores[${i}].validators`);
                     }
                     attesterAddresses.add(key);
                 }
+                // When merging v1 validators into a v2+ result, preserve original fallback behavior
+                // by explicitly setting publisher/coinbase/feeRecipient if they're missing
+                if (keystore.schemaVersion !== schemaVersion) {
+                    throw new KeyStoreLoadError(`Cannot merge keystores with different schema versions: ${keystore.schemaVersion} and ${schemaVersion}`, `keystores[${i}].schemaVersion`);
+                } else {
+                    merged.validators.push(validator);
+                }
             }
-            merged.validators.push(...keystore.validators);
         }
         // Merge slasher (accumulate all)
         if (keystore.slasher) {
@@ -219,6 +233,43 @@ const logger = createLogger('node-keystore:loader');
             }
             merged.prover = keystore.prover;
         }
+        // Merge top-level publisher (accumulate all, unless conflicting MnemonicConfigs)
+        if (keystore.publisher) {
+            if (!merged.publisher) {
+                merged.publisher = keystore.publisher;
+            } else {
+                const isMnemonic = (accounts)=>typeof accounts === 'object' && accounts !== null && 'mnemonic' in accounts;
+                // If either is a mnemonic, warn and use last one (can't merge mnemonics)
+                if (isMnemonic(merged.publisher) || isMnemonic(keystore.publisher)) {
+                    logger.warn('Multiple default publisher configurations found with mnemonic, using the last one (cannot merge mnemonics)');
+                    merged.publisher = keystore.publisher;
+                } else {
+                    // Both are non-mnemonic, accumulate them
+                    const toArray = (accounts)=>Array.isArray(accounts) ? accounts : [
+                            accounts
+                        ];
+                    const combined = [
+                        ...toArray(merged.publisher),
+                        ...toArray(keystore.publisher)
+                    ];
+                    merged.publisher = combined;
+                }
+            }
+        }
+        // Merge top-level coinbase (last one wins, but warn about conflicts)
+        if (keystore.coinbase) {
+            if (merged.coinbase) {
+                logger.warn('Multiple default coinbase addresses found, using the last one');
+            }
+            merged.coinbase = keystore.coinbase;
+        }
+        // Merge top-level feeRecipient (last one wins, but warn about conflicts)
+        if (keystore.feeRecipient) {
+            if (merged.feeRecipient) {
+                logger.warn('Multiple default feeRecipient addresses found, using the last one');
+            }
+            merged.feeRecipient = keystore.feeRecipient;
+        }
     }
     // Clean up empty arrays
     if (merged.validators.length === 0) {
@@ -235,21 +286,45 @@ const logger = createLogger('node-keystore:loader');
  *
  * @param attester The attester configuration in any supported shape.
  * @returns Array of string keys used to detect duplicates.
- */ function extractAttesterKeys(attester) {
+ */ function extractAttesterAddresses(attester) {
+    // String forms (private key or other) - return as-is for coarse uniqueness
     if (typeof attester === 'string') {
-        return [
-            attester
-        ];
+        if (attester.length === 66) {
+            return [
+                privateKeyToAddress(attester)
+            ];
+        } else {
+            return [
+                attester
+            ];
+        }
     }
+    // Arrays of attester items
     if (Array.isArray(attester)) {
-        return attester.map((a)=>typeof a === 'string' ? a : JSON.stringify(a));
+        const keys = [];
+        for (const item of attester){
+            keys.push(...extractAttesterAddresses(item));
+        }
+        return keys;
     }
-    if (attester && typeof attester === 'object' && 'address' in attester) {
-        return [
-            attester.address
-        ];
+    if (attester && typeof attester === 'object') {
+        if (attester instanceof EthAddress) {
+            return [
+                attester.toString()
+            ];
+        }
+        const obj = attester;
+        // New shape: { eth: EthAccount, bls?: BLSAccount }
+        if ('eth' in obj) {
+            return extractAttesterAddresses(obj.eth);
+        }
+        // Remote signer account object shape: { address, remoteSignerUrl?, ... }
+        if ('address' in obj) {
+            return [
+                String(obj.address)
+            ];
+        }
     }
-    return [
-        JSON.stringify(attester)
-    ];
+    // mnemonic, encrypted file just disable early duplicates checking
+    return [];
 }