fix: accept single prover publisher (#16651)

This PR lifts `mnemonicConfigSchema` to the `ethAccountSchema` union
instead of `ethAccountsSchema` (plural) allowing the use of mnemonics
for publishers and attesters as well. Also the type `prover.publisher`
is now `EthAccounts` rather than `EthAccounts[]` allowing keystores to
specify a single publisher or an array of publishers (previously only
array and array of array were accepted)

Author: alexghr

yarn-project/node-keystore/examples/everything.json

@@ -69,19 +69,17 @@
         "mnemonic": "test test test test test test test test test test test junk",
         "addressCount": 1
       },
-      [
-        "0x5555555555555555555555555555555555555555555555555555555555555555",
-        "0x6666666666666666666666666666666666666666",
-        {
-          "address": "0x7777777777777777777777777777777777777777",
-          "remoteSignerUrl": "https://localhost:9300",
-          "certPath": "/path/to/prover-cert.pem"
-        },
-        {
-          "path": "/tmp/prover-publishers",
-          "password": "prover-pass"
-        }
-      ]
+      "0x5555555555555555555555555555555555555555555555555555555555555555",
+      "0x6666666666666666666666666666666666666666",
+      {
+        "address": "0x7777777777777777777777777777777777777777",
+        "remoteSignerUrl": "https://localhost:9300",
+        "certPath": "/path/to/prover-cert.pem"
+      },
+      {
+        "path": "/tmp/prover-publishers",
+        "password": "prover-pass"
+      }
     ]
   }
 }

yarn-project/node-keystore/examples/prover-with-single-publisher.json

@@ -0,0 +1,7 @@
+{
+  "schemaVersion": 1,
+  "prover": {
+    "id": "0x1234567890123456789012345678901234567890",
+    "publisher": "0x1234567890123456789012345678901234567890123456789012345678901234"
+  }
+}

yarn-project/node-keystore/src/keystore_manager.ts

@@ -218,19 +218,10 @@ export class KeystoreManager {
       };
     }
 
-    // Handle complex prover case with id and publishers
-    const proverConfig = this.keystore.prover;
-    const signers: EthSigner[] = [];
-
-    for (const publisherAccounts of proverConfig.publisher) {
-      const publisherSigners = this.createSignersFromEthAccounts(publisherAccounts, this.keystore.remoteSigner);
-      signers.push(...publisherSigners);
-    }
+    const id = EthAddress.fromString(this.keystore.prover.id);
+    const signers = this.createSignersFromEthAccounts(this.keystore.prover.publisher, this.keystore.remoteSigner);
 
-    return {
-      id: EthAddress.fromString(proverConfig.id),
-      signers,
-    };
+    return { id, signers };
   }
 
   /**

yarn-project/node-keystore/src/schemas.test.ts

@@ -57,6 +57,17 @@ describe('Keystore Schema Validation', () => {
     expect((parsed.prover as any).publisher).toHaveLength(2);
   });
 
+  it('should validate prover with single publisher example', () => {
+    const keystore = loadExample('prover-with-single-publisher.json');
+    expect(() => keystoreSchema.parse(keystore)).not.toThrow();
+
+    const parsed = keystoreSchema.parse(keystore);
+    expect(parsed.schemaVersion).toBe(1);
+    expect(typeof parsed.prover).toBe('object');
+    expect((parsed.prover as any).id).toBe('0x1234567890123456789012345678901234567890');
+    expect((parsed.prover as any).publisher).toBe('0x1234567890123456789012345678901234567890123456789012345678901234');
+  });
+
   it('should reject keystore with invalid schema version', () => {
     const keystore = {
       schemaVersion: 2, // Invalid

yarn-project/node-keystore/src/schemas.ts

@@ -51,17 +51,22 @@ const mnemonicConfigSchema = z.object({
 });
 
 // EthAccount schema
-const ethAccountSchema = z.union([ethPrivateKeySchema, remoteSignerAccountSchema, jsonKeyFileV3Schema]);
+const ethAccountSchema = z.union([
+  ethPrivateKeySchema,
+  remoteSignerAccountSchema,
+  jsonKeyFileV3Schema,
+  mnemonicConfigSchema,
+]);
 
 // EthAccounts schema
-const ethAccountsSchema = z.union([ethAccountSchema, z.array(ethAccountSchema), mnemonicConfigSchema]);
+const ethAccountsSchema = z.union([ethAccountSchema, z.array(ethAccountSchema)]);
 
 // Prover keystore schema
 const proverKeyStoreSchema = z.union([
   ethAccountSchema,
   z.object({
     id: ethAddressSchema,
-    publisher: z.array(ethAccountsSchema),
+    publisher: ethAccountsSchema,
   }),
 ]);
 

yarn-project/node-keystore/src/types.ts

@@ -68,7 +68,7 @@ export type ProverKeyStore =
       /** Address that identifies the prover. This address will receive the rewards. */
       id: EthAddressHex;
       /** One or more EOAs used for sending proof L1 txs. */
-      publisher: EthAccounts[];
+      publisher: EthAccounts;
     }
   | EthAccount;