@aztec/node-keystore 2.1.9 → 2.1.11-rc.2

package/dest/keystore_manager.d.ts

@@ -54,7 +54,7 @@ export declare class KeystoreManager {
      */
     createAttesterSigners(validatorIndex: number): EthSigner[];
     /**
-     * Create signers for validator publisher accounts (falls back to attester if not specified)
+     * Create signers for validator publisher accounts (falls back to keystore-level publisher, then to attester if not specified)
      */
     createPublisherSigners(validatorIndex: number): EthSigner[];
     createAllValidatorPublisherSigners(): EthSigner[];
@@ -78,11 +78,11 @@ export declare class KeystoreManager {
      */
     getValidatorCount(): number;
     /**
-     * Get coinbase address for validator (falls back to the specific attester address)
+     * Get coinbase address for validator (falls back to keystore-level coinbase, then to the specific attester address)
      */
     getCoinbaseAddress(validatorIndex: number, attesterAddress: EthAddress): EthAddress;
     /**
-     * Get fee recipient for validator
+     * Get fee recipient for validator (falls back to keystore-level feeRecipient)
      */
     getFeeRecipient(validatorIndex: number): AztecAddress;
     /**

package/dest/keystore_manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keystore_manager.d.ts","sourceRoot":"","sources":["../src/keystore_manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAKhD,OAAO,KAAK,EAIV,WAAW,EAEX,qBAAqB,EACrB,QAAQ,EAER,cAAc,EACd,iBAAiB,IAAI,uBAAuB,EAC7C,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;IAGpB,KAAK,CAAC,EAAE,KAAK;gBAD7B,OAAO,EAAE,MAAM,EACC,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC;;;;OAIG;gBACS,QAAQ,EAAE,QAAQ;IAK9B;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEtC;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAkBvC;;;OAGG;IACH,OAAO,CAAC,0CAA0C;IAKlD;;OAEG;IACH,OAAO,CAAC,2CAA2C;IA+CnD;;OAEG;IACH,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAM1D;;OAEG;IACH,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAc3D,kCAAkC,IAAI,SAAS,EAAE;IAWjD;;OAEG;IACH,oBAAoB,IAAI,SAAS,EAAE;IAQnC;;OAEG;IACH,mBAAmB,IAAI;QAAE,EAAE,EAAE,UAAU,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,SAAS,EAAE,CAAA;KAAE,GAAG,SAAS;IAiCvF;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAOpD;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,GAAG,UAAU;IAWnF;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IAKrD;;;OAGG;IACH,kBAAkB,IAAI,WAAW,GAAG,SAAS;IAI7C;;;OAGG;IACH,eAAe,IAAI,cAAc,GAAG,SAAS;IAI7C;;;OAGG;IACH,uCAAuC,IAAI,IAAI;IAqB/C;;OAEG;IACH,OAAO,CAAC,4BAA4B;IA+BpC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA2ClC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,gCAAgC;IAwBxC;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA8BjC;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E;;OAEG;IACG,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI1F;;;OAGG;IACH,8BAA8B,CAC5B,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,UAAU,GAC1B,qBAAqB,GAAG,SAAS;IA0GpC,iDAAiD;IACjD,OAAO,CAAC,8BAA8B;CAyBvC"}
+{"version":3,"file":"keystore_manager.d.ts","sourceRoot":"","sources":["../src/keystore_manager.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAKhD,OAAO,KAAK,EAIV,WAAW,EAEX,qBAAqB,EACrB,QAAQ,EAER,cAAc,EACd,iBAAiB,IAAI,uBAAuB,EAC7C,MAAM,YAAY,CAAC;AAEpB;;GAEG;AACH,qBAAa,aAAc,SAAQ,KAAK;IAGpB,KAAK,CAAC,EAAE,KAAK;gBAD7B,OAAO,EAAE,MAAM,EACC,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC;;;;OAIG;gBACS,QAAQ,EAAE,QAAQ;IAK9B;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwEtC;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAkBvC;;;OAGG;IACH,OAAO,CAAC,0CAA0C;IAKlD;;OAEG;IACH,OAAO,CAAC,2CAA2C;IA+CnD;;OAEG;IACH,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAM1D;;OAEG;IACH,sBAAsB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAsB3D,kCAAkC,IAAI,SAAS,EAAE;IAWjD;;OAEG;IACH,oBAAoB,IAAI,SAAS,EAAE;IAQnC;;OAEG;IACH,mBAAmB,IAAI;QAAE,EAAE,EAAE,UAAU,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,SAAS,EAAE,CAAA;KAAE,GAAG,SAAS;IAiCvF;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAOpD;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,UAAU,GAAG,UAAU;IAgBnF;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IAiBrD;;;OAGG;IACH,kBAAkB,IAAI,WAAW,GAAG,SAAS;IAI7C;;;OAGG;IACH,eAAe,IAAI,cAAc,GAAG,SAAS;IAI7C;;;OAGG;IACH,uCAAuC,IAAI,IAAI;IAqB/C;;OAEG;IACH,OAAO,CAAC,4BAA4B;IA+BpC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA2ClC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAkD9B;;OAEG;IACH,OAAO,CAAC,gCAAgC;IAwBxC;;OAEG;IACH,OAAO,CAAC,yBAAyB;IA8BjC;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAI3E;;OAEG;IACG,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,SAAS,CAAC;IAI1F;;;OAGG;IACH,8BAA8B,CAC5B,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,UAAU,GAC1B,qBAAqB,GAAG,SAAS;IA0GpC,iDAAiD;IACjD,OAAO,CAAC,8BAA8B;CAyBvC"}

package/dest/keystore_manager.js

@@ -170,12 +170,16 @@ import { LocalSigner, RemoteSigner } from './signer.js';
         return this.createSignersFromEthAccounts(ethAccounts, validator.remoteSigner || this.keystore.remoteSigner);
     }
     /**
-   * Create signers for validator publisher accounts (falls back to attester if not specified)
+   * Create signers for validator publisher accounts (falls back to keystore-level publisher, then to attester if not specified)
    */ createPublisherSigners(validatorIndex) {
         const validator = this.getValidator(validatorIndex);
         if (validator.publisher) {
             return this.createSignersFromEthAccounts(validator.publisher, validator.remoteSigner || this.keystore.remoteSigner);
         }
+        // Fall back to keystore-level publisher
+        if (this.keystore.publisher) {
+            return this.createSignersFromEthAccounts(this.keystore.publisher, validator.remoteSigner || this.keystore.remoteSigner);
+        }
         // Fall back to attester signers
         return this.createAttesterSigners(validatorIndex);
     }
@@ -239,20 +243,31 @@ import { LocalSigner, RemoteSigner } from './signer.js';
         return this.keystore.validators?.length || 0;
     }
     /**
-   * Get coinbase address for validator (falls back to the specific attester address)
+   * Get coinbase address for validator (falls back to keystore-level coinbase, then to the specific attester address)
    */ getCoinbaseAddress(validatorIndex, attesterAddress) {
         const validator = this.getValidator(validatorIndex);
         if (validator.coinbase) {
             return validator.coinbase;
         }
+        // Fall back to keystore-level coinbase
+        if (this.keystore.coinbase) {
+            return this.keystore.coinbase;
+        }
         // Fall back to the specific attester address
         return attesterAddress;
     }
     /**
-   * Get fee recipient for validator
+   * Get fee recipient for validator (falls back to keystore-level feeRecipient)
    */ getFeeRecipient(validatorIndex) {
         const validator = this.getValidator(validatorIndex);
-        return validator.feeRecipient;
+        if (validator.feeRecipient) {
+            return validator.feeRecipient;
+        }
+        // Fall back to keystore-level feeRecipient
+        if (this.keystore.feeRecipient) {
+            return this.keystore.feeRecipient;
+        }
+        throw new KeystoreError(`No feeRecipient configured for validator ${validatorIndex}. You can set it at validator or keystore level.`);
     }
     /**
    * Get the raw slasher configuration as provided in the keystore file.

package/dest/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIxD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAGjC,QAAQ,EAAE,MAAM;IACP,KAAK,CAAC,EAAE,KAAK;gBAF7B,OAAO,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM,EACP,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAuB3D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAmCjE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,EAAE,CAuBtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,QAAQ,EAAE,CA8B1E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,QAAQ,CA+E9D"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAe,QAAQ,EAAE,MAAM,YAAY,CAAC;AAIxD;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAGjC,QAAQ,EAAE,MAAM;IACP,KAAK,CAAC,EAAE,KAAK;gBAF7B,OAAO,EAAE,MAAM,EACR,QAAQ,EAAE,MAAM,EACP,KAAK,CAAC,EAAE,KAAK,YAAA;CAKhC;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAuB3D;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,EAAE,CAmCjE;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,EAAE,CAuBtD;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,QAAQ,EAAE,CA8B1E;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAuI9D"}

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,26 +286,37 @@ 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)) {
         const keys = [];
         for (const item of attester){
-            keys.push(...extractAttesterKeys(item));
+            keys.push(...extractAttesterAddresses(item));
         }
         return keys;
     }
     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 extractAttesterKeys(obj.eth);
+            return extractAttesterAddresses(obj.eth);
         }
         // Remote signer account object shape: { address, remoteSignerUrl?, ... }
         if ('address' in obj) {
@@ -262,13 +324,7 @@ const logger = createLogger('node-keystore:loader');
                 String(obj.address)
             ];
         }
-        // Mnemonic or other object shapes: stringify
-        return [
-            JSON.stringify(attester)
-        ];
     }
-    // Fallback stringify for anything else (null/undefined)
-    return [
-        JSON.stringify(attester)
-    ];
+    // mnemonic, encrypted file just disable early duplicates checking
+    return [];
 }