@aztec/p2p 0.0.1-commit.fcb71a6 → 0.0.1-commit.ff7989d6c

package/src/mem_pools/tx_pool/eviction/insufficient_fee_payer_balance_rule.ts

@@ -1,108 +0,0 @@
-import { createLogger } from '@aztec/foundation/log';
-import { ProtocolContractAddress } from '@aztec/protocol-contracts';
-import { GasFees } from '@aztec/stdlib/gas';
-import type { ReadonlyWorldStateAccess } from '@aztec/stdlib/interfaces/server';
-import { DatabasePublicStateSource, type MerkleTreeReadOperations } from '@aztec/stdlib/trees';
-import type { TxHash } from '@aztec/stdlib/tx';
-
-import { GasTxValidator } from '../../../msg_validators/index.js';
-import type { TxPoolOptions } from '../tx_pool.js';
-import {
-  type EvictionContext,
-  EvictionEvent,
-  type EvictionResult,
-  type EvictionRule,
-  type PendingTxInfo,
-  type TxPoolOperations,
-} from './eviction_strategy.js';
-
-export class InsufficientFeePayerBalanceRule implements EvictionRule {
-  public readonly name = 'InsufficientFeePayerBalance';
-  public readonly reason = 'insufficient_fee_juice';
-
-  public constructor(private worldState: ReadonlyWorldStateAccess) {}
-
-  private log = createLogger('p2p:mempool:tx_pool:insufficient_fee_payer_balance_rule');
-
-  async evict(context: EvictionContext, txPool: TxPoolOperations): Promise<EvictionResult> {
-    try {
-      if (context.event === EvictionEvent.CHAIN_PRUNED) {
-        const affectedTxs = await txPool.getPendingTxInfos();
-        return this.evictTxs(affectedTxs, context.blockNumber, txPool);
-      }
-
-      if (context.event === EvictionEvent.BLOCK_MINED) {
-        const affectedTxs = await txPool.getPendingTxsWithFeePayer(context.minedFeePayers);
-
-        // TODO: fix this edge-case
-        // This can lead to a race condition if we are catching up in the p2p client.
-        // Let's say we have 3 txs for the same fee payer, which get mined in blocks 1, 2, 3.
-        // Tx1 consumes fee juice, tx2 increases it, tx3 consumes it again. We see block1 with tx1 first, run this rule, and evict tx3.
-        // But tx3 was valid (due to tx2) and mined on block3. And we have just removed from the mempool a tx we needed for proving/reexec.
-        // -----
-        // Proposed fix: evict only if node is synched
-        return this.evictTxs(affectedTxs, context.block.getBlockNumber(), txPool);
-      }
-
-      return {
-        reason: this.reason,
-        success: true,
-        txsEvicted: [],
-      };
-    } catch (err) {
-      this.log.error('Failed to evict invalid transactions after mining', { err });
-      return {
-        reason: this.reason,
-        success: false,
-        txsEvicted: [],
-        error: new Error('Failed to evict invalid txs after mining', { cause: err }),
-      };
-    }
-  }
-
-  private async evictTxs(
-    candidateTxs: PendingTxInfo[],
-    blockNumber: number,
-    txPool: TxPoolOperations,
-  ): Promise<EvictionResult> {
-    const txsToEvict: TxHash[] = [];
-    const gasValidator = this.createGasTxValidator(this.worldState.getSnapshot(blockNumber));
-
-    for (const { txHash, isEvictable } of candidateTxs) {
-      if (!isEvictable) {
-        continue;
-      }
-
-      const tx = await txPool.getTxByHash(txHash);
-      if (!tx) {
-        continue;
-      }
-
-      this.log.debug(`Validating tx balance ${txHash}`);
-
-      if ((await gasValidator.validateTxFee(tx)).result === 'invalid') {
-        this.log.verbose(`Evicting tx ${txHash} from pool due to an insufficient fee payer balance`);
-        txsToEvict.push(txHash);
-        continue;
-      }
-    }
-
-    if (txsToEvict.length > 0) {
-      await txPool.deleteTxs(txsToEvict);
-    }
-
-    this.log.verbose(`Evicted ${txsToEvict.length} invalid txs after block mined`, { txsToEvict });
-
-    return {
-      reason: this.reason,
-      success: true,
-      txsEvicted: txsToEvict,
-    };
-  }
-
-  private createGasTxValidator(db: MerkleTreeReadOperations): GasTxValidator {
-    return new GasTxValidator(new DatabasePublicStateSource(db), ProtocolContractAddress.FeeJuice, GasFees.empty());
-  }
-
-  updateConfig(_config: TxPoolOptions): void {}
-}

package/src/msg_validators/block_proposal_validator/block_proposal_validator.ts

@@ -1,97 +0,0 @@
-import type { EpochCacheInterface } from '@aztec/epoch-cache';
-import { NoCommitteeError } from '@aztec/ethereum/contracts';
-import { type Logger, createLogger } from '@aztec/foundation/log';
-import { type BlockProposal, type P2PValidator, PeerErrorSeverity } from '@aztec/stdlib/p2p';
-
-export class BlockProposalValidator implements P2PValidator<BlockProposal> {
-  private epochCache: EpochCacheInterface;
-  private logger: Logger;
-  private txsPermitted: boolean;
-
-  constructor(epochCache: EpochCacheInterface, opts: { txsPermitted: boolean }) {
-    this.epochCache = epochCache;
-    this.txsPermitted = opts.txsPermitted;
-    this.logger = createLogger('p2p:block_proposal_validator');
-  }
-
-  async validate(block: BlockProposal): Promise<PeerErrorSeverity | undefined> {
-    try {
-      // Check signature validity first - invalid signatures are a high-severity issue
-      const proposer = block.getSender();
-      if (!proposer) {
-        this.logger.debug(`Penalizing peer for block proposal with invalid signature`);
-        return PeerErrorSeverity.MidToleranceError;
-      }
-
-      // Check if transactions are permitted when the proposal contains transaction hashes
-      const embeddedTxCount = block.txs?.length ?? 0;
-      if (!this.txsPermitted && (block.txHashes.length > 0 || embeddedTxCount > 0)) {
-        this.logger.debug(
-          `Penalizing peer for block proposal with ${block.txHashes.length} transaction(s) when transactions are not permitted`,
-        );
-        return PeerErrorSeverity.MidToleranceError;
-      }
-
-      // If there are embedded txs, they must be listed in txHashes; if there are no txHashes, there must be no txs
-      const hashSet = new Set(block.txHashes.map(h => h.toString()));
-      const missingTxHashes =
-        embeddedTxCount > 0
-          ? block.txs!.filter(tx => !hashSet.has(tx.getTxHash().toString())).map(tx => tx.getTxHash().toString())
-          : [];
-      if (embeddedTxCount > 0 && missingTxHashes.length > 0) {
-        this.logger.warn('Penalizing peer for embedded transaction(s) not included in txHashes', {
-          embeddedTxCount,
-          txHashesLength: block.txHashes.length,
-          missingTxHashes,
-        });
-        return PeerErrorSeverity.MidToleranceError;
-      }
-
-      const { currentProposer, nextProposer, currentSlot, nextSlot } =
-        await this.epochCache.getProposerAttesterAddressInCurrentOrNextSlot();
-
-      // Check that the attestation is for the current or next slot
-      const slotNumber = block.payload.header.slotNumber;
-      if (slotNumber !== currentSlot && slotNumber !== nextSlot) {
-        this.logger.debug(`Penalizing peer for invalid slot number ${slotNumber}`, { currentSlot, nextSlot });
-        return PeerErrorSeverity.HighToleranceError;
-      }
-
-      // Check that the block proposal is from the current or next proposer
-      if (slotNumber === currentSlot && currentProposer !== undefined && !proposer.equals(currentProposer)) {
-        this.logger.debug(`Penalizing peer for invalid proposer for current slot ${slotNumber}`, {
-          currentProposer,
-          nextProposer,
-          proposer: proposer.toString(),
-        });
-        return PeerErrorSeverity.MidToleranceError;
-      }
-
-      if (slotNumber === nextSlot && nextProposer !== undefined && !proposer.equals(nextProposer)) {
-        this.logger.debug(`Penalizing peer for invalid proposer for next slot ${slotNumber}`, {
-          currentProposer,
-          nextProposer,
-          proposer: proposer.toString(),
-        });
-        return PeerErrorSeverity.MidToleranceError;
-      }
-
-      // Validate tx hashes for all txs embedded in the proposal
-      if (!(await Promise.all(block.txs?.map(tx => tx.validateTxHash()) ?? [])).every(v => v)) {
-        this.logger.warn(`Penalizing peer for invalid tx hashes in block proposal`, {
-          proposer,
-          slotNumber,
-        });
-        return PeerErrorSeverity.LowToleranceError;
-      }
-
-      return undefined;
-    } catch (e) {
-      // People shouldn't be sending us block proposals if the committee doesn't exist
-      if (e instanceof NoCommitteeError) {
-        return PeerErrorSeverity.LowToleranceError;
-      }
-      throw e;
-    }
-  }
-}

package/src/msg_validators/block_proposal_validator/index.ts

@@ -1 +0,0 @@
-export * from './block_proposal_validator.js';