@aztec/validator-client 0.85.0-alpha-testnet.5 → 0.85.0-alpha-testnet.7

package/dest/duties/validation_service.d.ts

@@ -1,6 +1,6 @@
 import type { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
 import type { ValidatorKeyStore } from '../key_store/interface.js';
 export declare class ValidationService {
     private keyStore;
@@ -14,7 +14,7 @@ export declare class ValidationService {
      *
      * @returns A block proposal signing the above information (not the current implementation!!!)
      */
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal>;
+    createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal>;
     /**
      * Attest to the given block proposal constructed by the current sequencer
      *

package/dest/duties/validation_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAA8C,MAAM,mBAAmB,CAAC;AAChH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;OAQG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAM5F;;;;;;;;OAQG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAS3E"}
+{"version":3,"file":"validation_service.d.ts","sourceRoot":"","sources":["../../src/duties/validation_service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAA8C,MAAM,mBAAmB,CAAC;AAChH,OAAO,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,iBAAiB;IAE/C;;;;;;;;OAQG;IACG,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAQ9F;;;;;;;;OAQG;IACG,gBAAgB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAS3E"}

package/dest/duties/validation_service.js

@@ -14,9 +14,11 @@ export class ValidationService {
    * @param txs - TxHash[] ordered list of transactions
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
-   */ createBlockProposal(header, archive, txs) {
+   */ async createBlockProposal(header, archive, txs) {
         const payloadSigner = (payload)=>this.keyStore.signMessage(payload);
-        return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txs), payloadSigner);
+        // TODO: check if this is calculated earlier / can not be recomputed
+        const txHashes = await Promise.all(txs.map((tx)=>tx.getTxHash()));
+        return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txHashes), txs, payloadSigner);
     }
     /**
    * Attest to the given block proposal constructed by the current sequencer

package/dest/validator.d.ts

@@ -5,7 +5,7 @@ import { DateProvider, type Timer } from '@aztec/foundation/timer';
 import type { P2P } from '@aztec/p2p';
 import type { L2Block } from '@aztec/stdlib/block';
 import type { BlockAttestation, BlockProposal } from '@aztec/stdlib/p2p';
-import type { BlockHeader, GlobalVariables, Tx, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, GlobalVariables, Tx } from '@aztec/stdlib/tx';
 import { type TelemetryClient, WithTracer } from '@aztec/telemetry-client';
 import type { ValidatorClientConfig } from './config.js';
 import type { ValidatorKeyStore } from './key_store/interface.js';
@@ -27,7 +27,7 @@ export interface Validator {
     start(): Promise<void>;
     registerBlockProposalHandler(): void;
     registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
+    createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal | undefined>;
     attestToProposal(proposal: BlockProposal): void;
     broadcastBlockProposal(proposal: BlockProposal): void;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
@@ -68,7 +68,7 @@ export declare class ValidatorClient extends WithTracer implements Validator {
      * Re-execute the transactions in the proposal and check that the state updates match the header state
      * @param proposal - The proposal to re-execute
      */
-    reExecuteTransactions(proposal: BlockProposal): Promise<void>;
+    reExecuteTransactions(proposal: BlockProposal, txs: Tx[]): Promise<void>;
     /**
      * Ensure that all of the transactions in the proposal are available in the tx pool before attesting
      *
@@ -77,8 +77,8 @@ export declare class ValidatorClient extends WithTracer implements Validator {
      * 3. If we cannot retrieve them from the network, throw an error
      * @param proposal - The proposal to attest to
      */
-    ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<void>;
-    createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
+    ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]>;
+    createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal | undefined>;
     broadcastBlockProposal(proposal: BlockProposal): void;
     collectAttestations(proposal: BlockProposal, required: number, deadline: Date): Promise<BlockAttestation[]>;
     private doAttestToProposal;

package/dest/validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}

package/dest/validator.js

@@ -122,10 +122,10 @@ import { ValidatorMetrics } from './metrics.js';
         // Check that all of the transactions in the proposal are available in the tx pool before attesting
         this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
         try {
-            await this.ensureTransactionsAreAvailable(proposal);
+            const txs = await this.ensureTransactionsAreAvailable(proposal);
             if (this.config.validatorReexecute) {
                 this.log.verbose(`Re-executing transactions in the proposal before attesting`);
-                await this.reExecuteTransactions(proposal);
+                await this.reExecuteTransactions(proposal, txs);
             }
         } catch (error) {
             if (error instanceof Error) {
@@ -152,12 +152,13 @@ import { ValidatorMetrics } from './metrics.js';
     /**
    * Re-execute the transactions in the proposal and check that the state updates match the header state
    * @param proposal - The proposal to re-execute
-   */ async reExecuteTransactions(proposal) {
+   */ async reExecuteTransactions(proposal, txs) {
         const { header, txHashes } = proposal.payload;
-        const txs = (await Promise.all(txHashes.map((tx)=>this.p2pClient.getTxByHash(tx)))).filter((tx)=>tx !== undefined);
-        // If we cannot request all of the transactions, then we should fail
+        // If we do not have all of the transactions, then we should fail
         if (txs.length !== txHashes.length) {
-            throw new TransactionsNotAvailableError(txHashes);
+            const foundTxHashes = await Promise.all(txs.map(async (tx)=>(await tx.getTxHash()).toString()));
+            const missingTxHashes = txHashes.filter((txHash)=>!foundTxHashes.includes(txHash.toString()));
+            throw new TransactionsNotAvailableError(missingTxHashes);
         }
         // Assertion: This check will fail if re-execution is not enabled
         if (this.blockBuilder === undefined) {
@@ -192,17 +193,70 @@ import { ValidatorMetrics } from './metrics.js';
    * 3. If we cannot retrieve them from the network, throw an error
    * @param proposal - The proposal to attest to
    */ async ensureTransactionsAreAvailable(proposal) {
+        if (proposal.payload.txHashes.length === 0) {
+            this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
+            return [];
+        }
+        // Is this a new style proposal?
+        if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
+            // Yes, any txs that we already have we should use
+            this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
+            // Request from the pool based on the signed hashes in the payload
+            const hashesFromPayload = proposal.payload.txHashes;
+            const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
+            const missingTxs = txsToUse.filter((tx)=>tx === undefined).length;
+            if (missingTxs > 0) {
+                this.log.verbose(`Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`);
+            }
+            let usedFromProposal = 0;
+            // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
+            for(let i = 0; i < txsToUse.length; i++){
+                if (txsToUse[i] === undefined) {
+                    // We don't have the transaction, take from the proposal, provided the hash is the same
+                    const hashOfTxInProposal = await proposal.txs[i].getTxHash();
+                    if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
+                        // Hash is equal, we can use the tx from the proposal
+                        txsToUse[i] = proposal.txs[i];
+                        usedFromProposal++;
+                    } else {
+                        this.log.warn(`Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[i].toString()}`);
+                    }
+                }
+            }
+            // See if we still have any holes, if there are then we were not successful and will try the old method
+            if (txsToUse.some((tx)=>tx === undefined)) {
+                this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
+            } else {
+                this.log.info(`Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`);
+                await this.p2pClient.validate(txsToUse);
+                return txsToUse;
+            }
+        }
+        this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
+        // Old style proposal, we will perform a request by hash from pool
+        // This will request from network any txs that are missing
         const txHashes = proposal.payload.txHashes;
+        // This part is just for logging that we are requesting from the network
         const availability = await this.p2pClient.hasTxsInPool(txHashes);
-        const missingTxs = txHashes.filter((_, index)=>!availability[index]);
-        if (missingTxs.length === 0) {
-            return; // All transactions are available
+        const notAvailable = availability.filter((availability)=>availability === false);
+        if (notAvailable.length) {
+            this.log.verbose(`Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`);
         }
-        this.log.verbose(`Missing ${missingTxs.length} transactions in the tx pool, requesting from the network`);
-        const requestedTxs = await this.p2pClient.requestTxsByHash(missingTxs);
-        if (requestedTxs.some((tx)=>tx === undefined)) {
+        // This will request from the network any txs that are missing
+        const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
+        const missingTxs = retrievedTxs.map((tx, index)=>{
+            // Return the hash of any that we did not get
+            if (tx === undefined) {
+                return txHashes[index];
+            } else {
+                return undefined;
+            }
+        }).filter((hash)=>hash !== undefined);
+        if (missingTxs.length > 0) {
             throw new TransactionsNotAvailableError(missingTxs);
         }
+        await this.p2pClient.validate(retrievedTxs);
+        return retrievedTxs;
     }
     async createBlockProposal(header, archive, txs) {
         if (this.previousProposal?.slotNumber.equals(header.globalVariables.slotNumber)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/validator-client",
-  "version": "0.85.0-alpha-testnet.5",
+  "version": "0.85.0-alpha-testnet.7",
   "main": "dest/index.js",
   "type": "module",
   "exports": {
@@ -62,12 +62,12 @@
     ]
   },
   "dependencies": {
-    "@aztec/epoch-cache": "0.85.0-alpha-testnet.5",
-    "@aztec/ethereum": "0.85.0-alpha-testnet.5",
-    "@aztec/foundation": "0.85.0-alpha-testnet.5",
-    "@aztec/p2p": "0.85.0-alpha-testnet.5",
-    "@aztec/stdlib": "0.85.0-alpha-testnet.5",
-    "@aztec/telemetry-client": "0.85.0-alpha-testnet.5",
+    "@aztec/epoch-cache": "0.85.0-alpha-testnet.7",
+    "@aztec/ethereum": "0.85.0-alpha-testnet.7",
+    "@aztec/foundation": "0.85.0-alpha-testnet.7",
+    "@aztec/p2p": "0.85.0-alpha-testnet.7",
+    "@aztec/stdlib": "0.85.0-alpha-testnet.7",
+    "@aztec/telemetry-client": "0.85.0-alpha-testnet.7",
     "koa": "^2.16.1",
     "koa-router": "^12.0.0",
     "tslib": "^2.4.0",

package/src/duties/validation_service.ts

@@ -2,7 +2,7 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256 } from '@aztec/foundation/crypto';
 import type { Fr } from '@aztec/foundation/fields';
 import { BlockAttestation, BlockProposal, ConsensusPayload, SignatureDomainSeparator } from '@aztec/stdlib/p2p';
-import type { BlockHeader, TxHash } from '@aztec/stdlib/tx';
+import type { BlockHeader, Tx } from '@aztec/stdlib/tx';
 
 import type { ValidatorKeyStore } from '../key_store/interface.js';
 
@@ -18,10 +18,12 @@ export class ValidationService {
    *
    * @returns A block proposal signing the above information (not the current implementation!!!)
    */
-  createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal> {
+  async createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal> {
     const payloadSigner = (payload: Buffer32) => this.keyStore.signMessage(payload);
+    // TODO: check if this is calculated earlier / can not be recomputed
+    const txHashes = await Promise.all(txs.map(tx => tx.getTxHash()));
 
-    return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txs), payloadSigner);
+    return BlockProposal.createProposalFromSigner(new ConsensusPayload(header, archive, txHashes), txs, payloadSigner);
   }
 
   /**

package/src/validator.ts

@@ -51,7 +51,7 @@ export interface Validator {
   registerBlockBuilder(blockBuilder: BlockBuilderCallback): void;
 
   // Block validation responsibilities
-  createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined>;
+  createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal | undefined>;
   attestToProposal(proposal: BlockProposal): void;
 
   broadcastBlockProposal(proposal: BlockProposal): void;
@@ -204,11 +204,11 @@ export class ValidatorClient extends WithTracer implements Validator {
     // Check that all of the transactions in the proposal are available in the tx pool before attesting
     this.log.verbose(`Processing attestation for slot ${slotNumber}`, proposalInfo);
     try {
-      await this.ensureTransactionsAreAvailable(proposal);
+      const txs = await this.ensureTransactionsAreAvailable(proposal);
 
       if (this.config.validatorReexecute) {
         this.log.verbose(`Re-executing transactions in the proposal before attesting`);
-        await this.reExecuteTransactions(proposal);
+        await this.reExecuteTransactions(proposal, txs);
       }
     } catch (error: any) {
       if (error instanceof Error) {
@@ -240,16 +240,14 @@ export class ValidatorClient extends WithTracer implements Validator {
    * Re-execute the transactions in the proposal and check that the state updates match the header state
    * @param proposal - The proposal to re-execute
    */
-  async reExecuteTransactions(proposal: BlockProposal) {
+  async reExecuteTransactions(proposal: BlockProposal, txs: Tx[]) {
     const { header, txHashes } = proposal.payload;
 
-    const txs = (await Promise.all(txHashes.map(tx => this.p2pClient.getTxByHash(tx)))).filter(
-      tx => tx !== undefined,
-    ) as Tx[];
-
-    // If we cannot request all of the transactions, then we should fail
+    // If we do not have all of the transactions, then we should fail
     if (txs.length !== txHashes.length) {
-      throw new TransactionsNotAvailableError(txHashes);
+      const foundTxHashes = await Promise.all(txs.map(async tx => (await tx.getTxHash()).toString()));
+      const missingTxHashes = txHashes.filter(txHash => !foundTxHashes.includes(txHash.toString()));
+      throw new TransactionsNotAvailableError(missingTxHashes);
     }
 
     // Assertion: This check will fail if re-execution is not enabled
@@ -291,24 +289,98 @@ export class ValidatorClient extends WithTracer implements Validator {
    * 3. If we cannot retrieve them from the network, throw an error
    * @param proposal - The proposal to attest to
    */
-  async ensureTransactionsAreAvailable(proposal: BlockProposal) {
+  async ensureTransactionsAreAvailable(proposal: BlockProposal): Promise<Tx[]> {
+    if (proposal.payload.txHashes.length === 0) {
+      this.log.verbose(`Received block proposal with no transactions, skipping transaction availability check`);
+      return [];
+    }
+    // Is this a new style proposal?
+    if (proposal.txs && proposal.txs.length > 0 && proposal.txs.length === proposal.payload.txHashes.length) {
+      // Yes, any txs that we already have we should use
+      this.log.info(`Using new style proposal with ${proposal.txs.length} transactions`);
+
+      // Request from the pool based on the signed hashes in the payload
+      const hashesFromPayload = proposal.payload.txHashes;
+      const txsToUse = await this.p2pClient.getTxsByHashFromPool(hashesFromPayload);
+
+      const missingTxs = txsToUse.filter(tx => tx === undefined).length;
+      if (missingTxs > 0) {
+        this.log.verbose(
+          `Missing ${missingTxs}/${hashesFromPayload.length} transactions in the tx pool, will attempt to take from the proposal`,
+        );
+      }
+
+      let usedFromProposal = 0;
+
+      // Fill any holes with txs in the proposal, provided their hash matches the hash in the payload
+      for (let i = 0; i < txsToUse.length; i++) {
+        if (txsToUse[i] === undefined) {
+          // We don't have the transaction, take from the proposal, provided the hash is the same
+          const hashOfTxInProposal = await proposal.txs[i].getTxHash();
+          if (hashOfTxInProposal.equals(hashesFromPayload[i])) {
+            // Hash is equal, we can use the tx from the proposal
+            txsToUse[i] = proposal.txs[i];
+            usedFromProposal++;
+          } else {
+            this.log.warn(
+              `Unable to take tx: ${hashOfTxInProposal.toString()} from the proposal, it does not match payload hash: ${hashesFromPayload[
+                i
+              ].toString()}`,
+            );
+          }
+        }
+      }
+
+      // See if we still have any holes, if there are then we were not successful and will try the old method
+      if (txsToUse.some(tx => tx === undefined)) {
+        this.log.warn(`Failed to use transactions from proposal. Falling back to old proposal logic`);
+      } else {
+        this.log.info(
+          `Successfully used ${usedFromProposal}/${hashesFromPayload.length} transactions from the proposal`,
+        );
+
+        await this.p2pClient.validate(txsToUse as Tx[]);
+        return txsToUse as Tx[];
+      }
+    }
+
+    this.log.info(`Using old style proposal with ${proposal.payload.txHashes.length} transactions`);
+
+    // Old style proposal, we will perform a request by hash from pool
+    // This will request from network any txs that are missing
     const txHashes: TxHash[] = proposal.payload.txHashes;
+
+    // This part is just for logging that we are requesting from the network
     const availability = await this.p2pClient.hasTxsInPool(txHashes);
-    const missingTxs = txHashes.filter((_, index) => !availability[index]);
+    const notAvailable = availability.filter(availability => availability === false);
+    if (notAvailable.length) {
+      this.log.verbose(
+        `Missing ${notAvailable.length} transactions in the tx pool, will need to request from the network`,
+      );
+    }
 
-    if (missingTxs.length === 0) {
-      return; // All transactions are available
+    // This will request from the network any txs that are missing
+    const retrievedTxs = await this.p2pClient.getTxsByHash(txHashes);
+    const missingTxs = retrievedTxs
+      .map((tx, index) => {
+        // Return the hash of any that we did not get
+        if (tx === undefined) {
+          return txHashes[index];
+        } else {
+          return undefined;
+        }
+      })
+      .filter(hash => hash !== undefined);
+    if (missingTxs.length > 0) {
+      throw new TransactionsNotAvailableError(missingTxs as TxHash[]);
     }
 
-    this.log.verbose(`Missing ${missingTxs.length} transactions in the tx pool, requesting from the network`);
+    await this.p2pClient.validate(retrievedTxs as Tx[]);
 
-    const requestedTxs = await this.p2pClient.requestTxsByHash(missingTxs);
-    if (requestedTxs.some(tx => tx === undefined)) {
-      throw new TransactionsNotAvailableError(missingTxs);
-    }
+    return retrievedTxs as Tx[];
   }
 
-  async createBlockProposal(header: BlockHeader, archive: Fr, txs: TxHash[]): Promise<BlockProposal | undefined> {
+  async createBlockProposal(header: BlockHeader, archive: Fr, txs: Tx[]): Promise<BlockProposal | undefined> {
     if (this.previousProposal?.slotNumber.equals(header.globalVariables.slotNumber)) {
       this.log.verbose(`Already made a proposal for the same slot, skipping proposal`);
       return Promise.resolve(undefined);