@aztec/node-keystore 2.0.0-rc.8 → 2.0.2-rc.1

package/dest/keystore_manager.d.ts

@@ -7,6 +7,7 @@ import type { EthSigner } from '@aztec/ethereum';
 import { Buffer32 } from '@aztec/foundation/buffer';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import type { Signature } from '@aztec/foundation/eth-signature';
+import type { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { TypedDataDefinition } from 'viem';
 import type { EthAccounts, EthRemoteSignerConfig, KeyStore, ProverKeyStore, ValidatorKeyStore as ValidatorKeystoreConfig } from './types.js';
 /**
@@ -74,7 +75,7 @@ export declare class KeystoreManager {
     /**
      * Get fee recipient for validator
      */
-    getFeeRecipient(validatorIndex: number): string;
+    getFeeRecipient(validatorIndex: number): AztecAddress;
     /**
      * Get the raw slasher configuration as provided in the keystore file.
      * @returns The slasher accounts configuration or undefined if not set

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;AAKjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAIhD,OAAO,KAAK,EAEV,WAAW,EAKX,qBAAqB,EACrB,QAAQ,EACR,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;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAkBvC;;;OAGG;IACH,OAAO,CAAC,0CAA0C;IAiElD;;OAEG;IACH,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAK1D;;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;IAwBvF;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAOpD;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,UAAU;IAgBtD;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM;IAK/C;;;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;IA+ClC;;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;CAiIrC"}
+{"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,EAEV,WAAW,EAIX,qBAAqB,EACrB,QAAQ,EACR,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;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAkBvC;;;OAGG;IACH,OAAO,CAAC,0CAA0C;IAoDlD;;OAEG;IACH,qBAAqB,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,EAAE;IAK1D;;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;IAkCvF;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,uBAAuB;IAOpD;;OAEG;IACH,iBAAiB,IAAI,MAAM;IAI3B;;OAEG;IACH,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,UAAU;IAgBtD;;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;CAkHrC"}

package/dest/keystore_manager.js

@@ -3,11 +3,11 @@
  *
  * Manages keystore configuration and delegates signing operations to appropriate signers.
  */ import { Buffer32 } from '@aztec/foundation/buffer';
-import { EthAddress } from '@aztec/foundation/eth-address';
 import { Wallet } from '@ethersproject/wallet';
 import { readFileSync, readdirSync, statSync } from 'fs';
 import { extname, join } from 'path';
 import { mnemonicToAccount } from 'viem/accounts';
+import { ethPrivateKeySchema } from './schemas.js';
 import { LocalSigner, RemoteSigner } from './signer.js';
 /**
  * Error thrown when keystore operations fail
@@ -61,22 +61,13 @@ import { LocalSigner, RemoteSigner } from './signer.js';
                 if (account.startsWith('0x') && account.length === 66) {
                     // Private key -> derive address locally without external deps
                     try {
-                        const signer = new LocalSigner(Buffer32.fromString(account));
+                        const signer = new LocalSigner(Buffer32.fromString(ethPrivateKeySchema.parse(account)));
                         results.push(signer.address);
                     } catch  {
                     // Ignore invalid private key at construction time
                     }
                     return;
                 }
-                if (account.startsWith('0x') && account.length === 42) {
-                    // Address string
-                    try {
-                        results.push(EthAddress.fromString(account));
-                    } catch  {
-                    // Ignore invalid address format at construction time
-                    }
-                    return;
-                }
                 // Any other string cannot be confidently resolved here
                 return;
             }
@@ -88,16 +79,13 @@ import { LocalSigner, RemoteSigner } from './signer.js';
             if ('mnemonic' in account) {
                 return;
             }
-            // Remote signer account (object form)
+            // Remote signer account. If it contains 'address' then extract, otherwise it IS the address
             const remoteSigner = account;
-            const address = typeof remoteSigner === 'string' ? remoteSigner : remoteSigner.address;
-            if (address) {
-                try {
-                    results.push(EthAddress.fromString(address));
-                } catch  {
-                // Ignore invalid address format at construction time
-                }
+            if ('address' in remoteSigner) {
+                results.push(remoteSigner.address);
+                return;
             }
+            results.push(remoteSigner);
         };
         if (Array.isArray(accounts)) {
             for (const account of accounts){
@@ -147,7 +135,7 @@ import { LocalSigner, RemoteSigner } from './signer.js';
         if (!this.keystore.prover) {
             return undefined;
         }
-        // Handle simple prover case (just a private key)
+        // Handle prover being a private key, JSON key store or remote signer with nested address
         if (typeof this.keystore.prover === 'string' || 'path' in this.keystore.prover || 'address' in this.keystore.prover) {
             const signers = this.createSignersFromEthAccounts(this.keystore.prover, this.keystore.remoteSigner);
             return {
@@ -155,10 +143,19 @@ import { LocalSigner, RemoteSigner } from './signer.js';
                 signers
             };
         }
-        const id = EthAddress.fromString(this.keystore.prover.id);
-        const signers = this.createSignersFromEthAccounts(this.keystore.prover.publisher, this.keystore.remoteSigner);
+        // Handle prover as Id and specified publishers
+        if ('id' in this.keystore.prover) {
+            const id = this.keystore.prover.id;
+            const signers = this.createSignersFromEthAccounts(this.keystore.prover.publisher, this.keystore.remoteSigner);
+            return {
+                id,
+                signers
+            };
+        }
+        // Here, prover is just an EthAddress for a remote signer
+        const signers = this.createSignersFromEthAccounts(this.keystore.prover, this.keystore.remoteSigner);
         return {
-            id,
+            id: undefined,
             signers
         };
     }
@@ -180,7 +177,7 @@ import { LocalSigner, RemoteSigner } from './signer.js';
    */ getCoinbaseAddress(validatorIndex) {
         const validator = this.getValidator(validatorIndex);
         if (validator.coinbase) {
-            return EthAddress.fromString(validator.coinbase);
+            return validator.coinbase;
         }
         // Fall back to first attester address
         const attesterSigners = this.createAttesterSigners(validatorIndex);
@@ -261,13 +258,9 @@ import { LocalSigner, RemoteSigner } from './signer.js';
         if (typeof account === 'string') {
             if (account.startsWith('0x') && account.length === 66) {
                 // Private key
-                return new LocalSigner(Buffer32.fromString(account));
+                return new LocalSigner(Buffer32.fromString(ethPrivateKeySchema.parse(account)));
             } else {
-                // Remote signer address only - use default remote signer config
-                if (!defaultRemoteSigner) {
-                    throw new KeystoreError(`No remote signer configuration found for address ${account}`);
-                }
-                return new RemoteSigner(EthAddress.fromString(account), defaultRemoteSigner);
+                throw new Error(`Invalid private key`);
             }
         }
         // JSON V3 keystore
@@ -277,23 +270,23 @@ import { LocalSigner, RemoteSigner } from './signer.js';
         }
         // Remote signer account
         const remoteSigner = account;
-        if (typeof remoteSigner === 'string') {
-            // Just an address - use default config
-            if (!defaultRemoteSigner) {
-                throw new KeystoreError(`No remote signer configuration found for address ${remoteSigner}`);
+        if ('address' in remoteSigner) {
+            // Remote signer with config
+            const config = remoteSigner.remoteSignerUrl ? {
+                remoteSignerUrl: remoteSigner.remoteSignerUrl,
+                certPath: remoteSigner.certPath,
+                certPass: remoteSigner.certPass
+            } : defaultRemoteSigner;
+            if (!config) {
+                throw new KeystoreError(`No remote signer configuration found for address ${remoteSigner.address}`);
             }
-            return new RemoteSigner(EthAddress.fromString(remoteSigner), defaultRemoteSigner);
+            return new RemoteSigner(remoteSigner.address, config);
         }
-        // Remote signer with config
-        const config = remoteSigner.remoteSignerUrl ? {
-            remoteSignerUrl: remoteSigner.remoteSignerUrl,
-            certPath: remoteSigner.certPath,
-            certPass: remoteSigner.certPass
-        } : defaultRemoteSigner;
-        if (!config) {
-            throw new KeystoreError(`No remote signer configuration found for address ${remoteSigner.address}`);
+        // Just an address - use default config
+        if (!defaultRemoteSigner) {
+            throw new KeystoreError(`No remote signer configuration found for address ${remoteSigner}`);
         }
-        return new RemoteSigner(EthAddress.fromString(remoteSigner.address), config);
+        return new RemoteSigner(remoteSigner, defaultRemoteSigner);
     }
     /**
    * Create signer from JSON V3 keystore file or directory
@@ -410,20 +403,13 @@ import { LocalSigner, RemoteSigner } from './signer.js';
                 if (account.startsWith('0x') && account.length === 66) {
                     // This is a private key - derive the address
                     try {
-                        const signer = new LocalSigner(Buffer32.fromString(account));
+                        const signer = new LocalSigner(Buffer32.fromString(ethPrivateKeySchema.parse(account)));
                         return signer.address;
                     } catch  {
-                        return null;
-                    }
-                } else if (account.startsWith('0x') && account.length === 42) {
-                    // This is an address
-                    try {
-                        return EthAddress.fromString(account);
-                    } catch  {
-                        return null;
+                        return undefined;
                     }
                 }
-                return null;
+                return undefined;
             }
             // JSON V3 keystore
             if ('path' in account) {
@@ -431,17 +417,15 @@ import { LocalSigner, RemoteSigner } from './signer.js';
                     const signers = this.createSignerFromJsonV3(account);
                     return signers.map((s)=>s.address);
                 } catch  {
-                    return null;
+                    return undefined;
                 }
             }
-            // Remote signer account
+            // Remote signer account, either it is an address or the address is nested
             const remoteSigner = account;
-            const address = typeof remoteSigner === 'string' ? remoteSigner : remoteSigner.address;
-            try {
-                return EthAddress.fromString(address);
-            } catch  {
-                return null;
+            if ('address' in remoteSigner) {
+                return remoteSigner.address;
             }
+            return remoteSigner;
         };
         // Helper to check if account matches and get its remote signer config
         const checkAccount = (account)=>{
@@ -458,13 +442,7 @@ import { LocalSigner, RemoteSigner } from './signer.js';
             }
             // Found a match - determine the config to return
             if (typeof account === 'string') {
-                if (account.startsWith('0x') && account.length === 66) {
-                    // Private key - local signer, no remote config
-                    return undefined;
-                } else {
-                    // Address only - use defaults
-                    return validator.remoteSigner || this.keystore.remoteSigner;
-                }
+                return undefined;
             }
             // JSON V3 - local signer, no remote config
             if ('path' in account) {
@@ -472,21 +450,21 @@ import { LocalSigner, RemoteSigner } from './signer.js';
             }
             // Remote signer account with potential override
             const remoteSigner = account;
-            if (typeof remoteSigner === 'string') {
-                // Just an address - use defaults
-                return validator.remoteSigner || this.keystore.remoteSigner;
-            }
-            // Has inline config
-            if (remoteSigner.remoteSignerUrl) {
-                return {
-                    remoteSignerUrl: remoteSigner.remoteSignerUrl,
-                    certPath: remoteSigner.certPath,
-                    certPass: remoteSigner.certPass
-                };
-            } else {
-                // No URL specified, use defaults
-                return validator.remoteSigner || this.keystore.remoteSigner;
+            if ('address' in remoteSigner) {
+                // Has inline config
+                if (remoteSigner.remoteSignerUrl) {
+                    return {
+                        remoteSignerUrl: remoteSigner.remoteSignerUrl,
+                        certPath: remoteSigner.certPath,
+                        certPass: remoteSigner.certPass
+                    };
+                } else {
+                    // No URL specified, use defaults
+                    return validator.remoteSigner || this.keystore.remoteSigner;
+                }
             }
+            // Just an address, use defaults
+            return validator.remoteSigner || this.keystore.remoteSigner;
         };
         // Check the attester configuration
         const { attester } = validator;