Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

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;
 

yarn-project/prover-node/src/prover-node-publisher.test.ts

@@ -1,12 +1,14 @@
 import { BatchedBlob } from '@aztec/blob-lib';
 import type { L1TxUtils, RollupContract } from '@aztec/ethereum';
 import { SecretValue } from '@aztec/foundation/config';
+import { randomBytes } from '@aztec/foundation/crypto';
 import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import type { PublisherConfig, TxSenderConfig } from '@aztec/sequencer-client';
 import { Proof } from '@aztec/stdlib/proofs';
 import { RootRollupPublicInputs } from '@aztec/stdlib/rollup';
 
+import { jest } from '@jest/globals';
 import { type MockProxy, mock } from 'jest-mock-extended';
 
 import { ProverNodePublisher } from './prover-node-publisher.js';
@@ -193,4 +195,87 @@ describe('prover-node-publisher', () => {
       }
     },
   );
+
+  it('handles reverted txs correctly', async () => {
+    const blocks = [RootRollupPublicInputs.random(), RootRollupPublicInputs.random()];
+
+    // Return the tips specified by the test
+    rollup.getTips.mockResolvedValue({
+      pendingBlockNumber: 2n,
+      provenBlockNumber: 1n,
+    });
+
+    // Return the requested block
+    rollup.getBlock.mockImplementation((i: bigint) =>
+      Promise.resolve({
+        archive: blocks[Number(i) - 1].endArchiveRoot.toString(),
+        attestationsHash: '0x', // unused,
+        payloadDigest: '0x', // unused,
+        headerHash: '0x', // unused,
+        blobCommitmentsHash: '0x', // unused,
+        slotNumber: 0n, // unused,
+        feeHeader: {
+          excessMana: 0n, // unused
+          manaUsed: 0n, // unused
+          feeAssetPriceNumerator: 0n, // unused
+          congestionCost: 0n, // unused
+          proverCost: 0n, // unused
+        },
+      }),
+    );
+
+    // We have built a rollup proof of the range fromBlock - toBlock
+    // so we need to set our archives and hashes accordingly
+    const ourPublicInputs = RootRollupPublicInputs.random();
+    ourPublicInputs.previousArchiveRoot = blocks[0].endArchiveRoot ?? Fr.ZERO;
+    ourPublicInputs.endArchiveRoot = blocks[1].endArchiveRoot ?? Fr.ZERO;
+
+    const ourBatchedBlob = new BatchedBlob(
+      ourPublicInputs.blobPublicInputs.blobCommitmentsHash,
+      ourPublicInputs.blobPublicInputs.z,
+      ourPublicInputs.blobPublicInputs.y,
+      ourPublicInputs.blobPublicInputs.c,
+      ourPublicInputs.blobPublicInputs.c.negate(), // Fill with dummy value
+    );
+
+    // Return our public inputs
+    const totalFields = ourPublicInputs.toFields();
+    rollup.getEpochProofPublicInputs.mockResolvedValue(totalFields.map(x => x.toString()));
+
+    jest.spyOn(l1Utils, 'getSenderBalance').mockResolvedValue(42n);
+    jest.spyOn(l1Utils, 'getSenderAddress').mockReturnValue(EthAddress.random());
+
+    jest.spyOn(l1Utils, 'sendAndMonitorTransaction').mockResolvedValue({
+      gasPrice: {} as any,
+      receipt: {
+        status: 'reverted',
+        effectiveGasPrice: 1n,
+        gasUsed: 1n,
+        transactionHash: `0x${randomBytes(32).toString('hex')}`,
+        cumulativeGasUsed: 1n,
+        blockNumber: 42n,
+        blockHash: `0x${randomBytes(32).toString('hex')}`,
+        from: EthAddress.random().toString(),
+      } as any,
+    });
+
+    jest.spyOn(l1Utils, 'getTransactionStats').mockResolvedValue({
+      calldataGas: 1,
+      calldataSize: 1,
+      sender: EthAddress.random().toString(),
+      transactionHash: `0x${randomBytes(32).toString('hex')}`,
+    });
+
+    const result = await publisher.submitEpochProof({
+      epochNumber: 2,
+      fromBlock: 2,
+      toBlock: 2,
+      publicInputs: ourPublicInputs,
+      proof: Proof.empty(),
+      batchedBlobInputs: ourBatchedBlob,
+      attestations: [],
+    });
+
+    expect(result).toBe(false);
+  });
 });

yarn-project/prover-node/src/prover-node-publisher.ts

@@ -123,7 +123,7 @@ export class ProverNodePublisher {
       }
 
       // Tx was mined successfully
-      if (txReceipt.status) {
+      if (txReceipt.status === 'success') {
         const tx = await this.l1TxUtils.getTransactionStats(txReceipt.transactionHash);
         const stats: L1PublishProofStats = {
           gasPrice: txReceipt.effectiveGasPrice,