@aztec/p2p 0.0.1-commit.85d7d01 → 0.0.1-commit.8655d4a

package/dest/config.js

@@ -1,15 +1,41 @@
-import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, percentageConfigHelper, pickConfigMappings, secretStringConfigHelper } from '@aztec/foundation/config';
+import { bigintConfigHelper, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper, percentageConfigHelper, pickConfigMappings, secretStringConfigHelper } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/curves/bn254';
-import { dataConfigMappings } from '@aztec/kv-store/config';
 import { FunctionSelector } from '@aztec/stdlib/abi/function-selector';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { chainConfigMappings, sharedSequencerConfigMappings } from '@aztec/stdlib/config';
+import { dataConfigMappings } from '@aztec/stdlib/kv-store';
 import { batchTxRequesterConfigMappings } from './services/reqresp/batch-tx-requester/config.js';
 import { p2pReqRespConfigMappings } from './services/reqresp/config.js';
 import { txCollectionConfigMappings } from './services/tx_collection/config.js';
 import { txFileStoreConfigMappings } from './services/tx_file_store/config.js';
 export const DEFAULT_P2P_PORT = 40400;
+/** Default endpoints used to discover this machine's public IPv4 when `queryForIp` is enabled. */ export const DEFAULT_PUBLIC_IP_SERVICES = [
+    'https://api.ipify.org/',
+    'https://checkip.amazonaws.com/',
+    'https://ifconfig.me/ip',
+    'https://icanhazip.com/'
+];
 export const p2pConfigMappings = {
+    validateMaxTxsPerBlock: {
+        env: 'VALIDATOR_MAX_TX_PER_BLOCK',
+        description: 'Maximum transactions per block for validation. Overrides maxTxsPerBlock for gossip validation when set.',
+        ...optionalNumberConfigHelper()
+    },
+    validateMaxTxsPerCheckpoint: {
+        env: 'VALIDATOR_MAX_TX_PER_CHECKPOINT',
+        description: 'Maximum transactions per checkpoint for validation. Used as fallback for maxTxsPerBlock when that is not set.',
+        ...optionalNumberConfigHelper()
+    },
+    validateMaxL2BlockGas: {
+        env: 'VALIDATOR_MAX_L2_BLOCK_GAS',
+        description: 'Maximum L2 gas per block for validation. When set, txs exceeding this limit are rejected.',
+        ...optionalNumberConfigHelper()
+    },
+    validateMaxDABlockGas: {
+        env: 'VALIDATOR_MAX_DA_BLOCK_GAS',
+        description: 'Maximum DA gas per block for validation. When set, txs exceeding this limit are rejected.',
+        ...optionalNumberConfigHelper()
+    },
     p2pEnabled: {
         env: 'P2P_ENABLED',
         description: 'A flag dictating whether the P2P subsystem should be enabled.',
@@ -40,6 +66,11 @@ export const p2pConfigMappings = {
         description: 'The frequency in which to check for new peers.',
         ...numberConfigHelper(30_000)
     },
+    peerFailedBanTimeMs: {
+        env: 'P2P_PEER_FAILED_BAN_TIME_MS',
+        description: 'How long to ban a peer after it fails maximum dial attempts.',
+        ...numberConfigHelper(5 * 60 * 1000)
+    },
     l2QueueSize: {
         env: 'P2P_L2_QUEUE_SIZE',
         description: 'Size of queue of L2 blocks to store.',
@@ -98,6 +129,12 @@ export const p2pConfigMappings = {
         description: 'If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false.',
         ...booleanConfigHelper()
     },
+    publicIpServices: {
+        env: 'P2P_PUBLIC_IP_SERVICES',
+        parseEnv: (val)=>val.split(',').map((s)=>s.trim()).filter(Boolean),
+        description: 'Comma-separated HTTPS URLs that return plain-text public IPv4. Used when P2P_QUERY_FOR_IP is true and P2P_IP is unset. Tried in order until one succeeds.',
+        defaultValue: DEFAULT_PUBLIC_IP_SERVICES
+    },
     gossipsubInterval: {
         env: 'P2P_GOSSIPSUB_INTERVAL_MS',
         description: 'The interval of the gossipsub heartbeat to perform maintenance tasks.',
@@ -131,7 +168,7 @@ export const p2pConfigMappings = {
     gossipsubMcacheLength: {
         env: 'P2P_GOSSIPSUB_MCACHE_LENGTH',
         description: 'The number of gossipsub interval message cache windows to keep.',
-        ...numberConfigHelper(6)
+        ...numberConfigHelper(12)
     },
     gossipsubMcacheGossip: {
         env: 'P2P_GOSSIPSUB_MCACHE_GOSSIP',
@@ -203,14 +240,14 @@ export const p2pConfigMappings = {
     },
     p2pStoreMapSizeKb: {
         env: 'P2P_STORE_MAP_SIZE_KB',
-        parseEnv: (val)=>val ? +val : undefined,
+        ...optionalNumberConfigHelper(),
         description: 'The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.'
     },
-    txPublicSetupAllowList: {
+    txPublicSetupAllowListExtend: {
         env: 'TX_PUBLIC_SETUP_ALLOWLIST',
         parseEnv: (val)=>parseAllowList(val),
-        description: 'The list of functions calls allowed to run in setup',
-        printDefault: ()=>'AuthRegistry, FeeJuice.increase_public_balance, Token.increase_public_balance, FPC.prepare_fee'
+        description: 'Additional entries to extend the default setup allow list. Format: I:address:selector[:flags],C:classId:selector[:flags]. Flags: os (onlySelf), rn (rejectNullMsgSender), cl=N (calldataLength), joined with +.',
+        printDefault: ()=>'Default: AuthRegistry._set_authorized, AuthRegistry.set_authorized, FeeJuice._increase_public_balance'
     },
     maxPendingTxCount: {
         env: 'P2P_MAX_PENDING_TX_COUNT',
@@ -224,6 +261,11 @@ export const p2pConfigMappings = {
         description: 'The number of messages to keep in the seen message cache',
         ...numberConfigHelper(100_000)
     },
+    txValidationCacheSize: {
+        env: 'P2P_TX_VALIDATION_CACHE_SIZE',
+        description: 'Maximum number of items to keep in the tx validation LRU cache.',
+        ...numberConfigHelper(5_000)
+    },
     p2pDisableStatusHandshake: {
         env: 'P2P_DISABLE_STATUS_HANDSHAKE',
         description: 'True to disable the status handshake on peer connected.',
@@ -259,6 +301,11 @@ export const p2pConfigMappings = {
         description: 'Alters the format of p2p messages to include things like broadcast timestamp FOR TESTING ONLY',
         ...booleanConfigHelper(false)
     },
+    l1PublishingTime: {
+        env: 'SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT',
+        description: 'How much time (in seconds) we allow in the slot for publishing the L1 tx (defaults to 1 L1 slot).',
+        ...optionalNumberConfigHelper()
+    },
     fishermanMode: {
         env: 'FISHERMAN_MODE',
         description: 'Whether to run in fisherman mode: validates all proposals and attestations but does not broadcast attestations or participate in consensus.',
@@ -268,11 +315,38 @@ export const p2pConfigMappings = {
         description: 'Broadcast block proposals even when a conflicting proposal for the same slot already exists in the pool (for testing purposes only).',
         ...booleanConfigHelper(false)
     },
+    skipIncomingProposals: {
+        description: 'Drop incoming block and checkpoint proposals at the libp2p dispatch layer (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    skipProposalSlotValidation: {
+        description: 'Accept proposal gossip regardless of slot timing (for testing only)',
+        ...booleanConfigHelper(false)
+    },
+    skipCheckpointProposalValidation: {
+        description: 'Skip checkpoint proposal validation and always attest, broadcasting the attestation before processing the embedded last block',
+        ...booleanConfigHelper(false)
+    },
     minTxPoolAgeMs: {
         env: 'P2P_MIN_TX_POOL_AGE_MS',
         description: 'Minimum age (ms) a transaction must have been in the pool before it is eligible for block building.',
         ...numberConfigHelper(2_000)
     },
+    slashDataWithholdingToleranceSlots: {
+        env: 'SLASH_DATA_WITHHOLDING_TOLERANCE_SLOTS',
+        description: 'L2 slots to wait after a checkpoint slot before declaring its txs missing. Drives both the data-withholding slasher check and the missing-tx collection deadline.',
+        ...numberConfigHelper(3)
+    },
+    p2pMissingTxCollectionDeadlineSlots: {
+        env: 'P2P_MISSING_TX_COLLECTION_DEADLINE_SLOTS',
+        description: 'Optional deadline (in L2 slots after the block slot) for collecting missing txs for unproven mined blocks. Clamped up to the data-withholding tolerance window so collection never gives up before the slash verdict.',
+        ...optionalNumberConfigHelper()
+    },
+    priceBumpPercentage: {
+        env: 'P2P_RPC_PRICE_BUMP_PERCENTAGE',
+        description: 'Minimum percentage fee increase required to replace an existing tx via RPC. Even at 0%, replacement still requires paying at least 1 unit more.',
+        ...bigintConfigHelper(10n)
+    },
     ...sharedSequencerConfigMappings,
     ...p2pReqRespConfigMappings,
     ...batchTxRequesterConfigMappings,
@@ -300,20 +374,45 @@ const bootnodeConfigKeys = [
     'dataStoreMapSizeKb',
     'bootstrapNodes',
     'l1ChainId',
-    'queryForIp'
+    'queryForIp',
+    'publicIpServices'
 ];
 export const bootnodeConfigMappings = pickConfigMappings({
     ...p2pConfigMappings,
     ...dataConfigMappings,
     ...chainConfigMappings
 }, bootnodeConfigKeys);
+/**
+ * Parses a `+`-separated flags string into validation properties for an allow list entry.
+ * Supported flags: `os` (onlySelf), `rn` (rejectNullMsgSender), `cl=N` (calldataLength).
+ */ function parseFlags(flags, entry) {
+    const result = {};
+    for (const flag of flags.split('+')){
+        if (flag === 'os') {
+            result.onlySelf = true;
+        } else if (flag === 'rn') {
+            result.rejectNullMsgSender = true;
+        } else if (flag.startsWith('cl=')) {
+            const n = parseInt(flag.slice(3), 10);
+            if (isNaN(n) || n < 0) {
+                throw new Error(`Invalid allow list entry "${entry}": invalid calldataLength in flag "${flag}". Expected a non-negative integer.`);
+            }
+            result.calldataLength = n;
+        } else {
+            throw new Error(`Invalid allow list entry "${entry}": unknown flag "${flag}". Supported flags: os, rn, cl=N.`);
+        }
+    }
+    return result;
+}
 /**
  * Parses a string to a list of allowed elements.
- * Each encoded is expected to be of one of the following formats
- * `I:${address}`
- * `I:${address}:${selector}`
- * `C:${classId}`
- * `C:${classId}:${selector}`
+ * Each entry is expected to be of one of the following formats:
+ * `I:${address}:${selector}` — instance (contract address) with function selector
+ * `C:${classId}:${selector}` — class with function selector
+ *
+ * An optional flags segment can be appended after the selector:
+ * `I:${address}:${selector}:${flags}` or `C:${classId}:${selector}:${flags}`
+ * where flags is a `+`-separated list of: `os` (onlySelf), `rn` (rejectNullMsgSender), `cl=N` (calldataLength).
  *
  * @param value The string to parse
  * @returns A list of allowed elements
@@ -323,30 +422,30 @@ export const bootnodeConfigMappings = pickConfigMappings({
         return entries;
     }
     for (const val of value.split(',')){
-        const [typeString, identifierString, selectorString] = val.split(':');
-        const selector = selectorString !== undefined ? FunctionSelector.fromString(selectorString) : undefined;
+        const trimmed = val.trim();
+        if (!trimmed) {
+            continue;
+        }
+        const [typeString, identifierString, selectorString, flagsString] = trimmed.split(':');
+        if (!selectorString) {
+            throw new Error(`Invalid allow list entry "${trimmed}": selector is required. Expected format: I:address:selector or C:classId:selector`);
+        }
+        const selector = FunctionSelector.fromString(selectorString);
+        const flags = flagsString ? parseFlags(flagsString, trimmed) : {};
         if (typeString === 'I') {
-            if (selector) {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    address: AztecAddress.fromString(identifierString)
-                });
-            }
+            entries.push({
+                address: AztecAddress.fromString(identifierString),
+                selector,
+                ...flags
+            });
         } else if (typeString === 'C') {
-            if (selector) {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString),
-                    selector
-                });
-            } else {
-                entries.push({
-                    classId: Fr.fromHexString(identifierString)
-                });
-            }
+            entries.push({
+                classId: Fr.fromHexString(identifierString),
+                selector,
+                ...flags
+            });
+        } else {
+            throw new Error(`Invalid allow list entry "${trimmed}": unknown type "${typeString}". Expected "I" (instance) or "C" (class).`);
         }
     }
     return entries;

package/dest/errors/p2p-service.error.d.ts

@@ -0,0 +1,9 @@
+/** Checkpoint Proposal Received Callback Not Registered Error
+ *
+ * Error triggered if the allNodesCheckpointReceivedCallback is not registered
+ * @category Errors
+ */
+export declare class CheckpointProposalReceivedCallbackNotRegisteredError extends Error {
+    constructor();
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicDJwLXNlcnZpY2UuZXJyb3IuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lcnJvcnMvcDJwLXNlcnZpY2UuZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7R0FJRztBQUNILHFCQUFhLG9EQUFxRCxTQUFRLEtBQUs7SUFDN0UsY0FHQztDQUNGIn0=

package/dest/errors/p2p-service.error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"p2p-service.error.d.ts","sourceRoot":"","sources":["../../src/errors/p2p-service.error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,oDAAqD,SAAQ,KAAK;IAC7E,cAGC;CACF"}

package/dest/errors/p2p-service.error.js

@@ -0,0 +1,10 @@
+/** Checkpoint Proposal Received Callback Not Registered Error
+ *
+ * Error triggered if the allNodesCheckpointReceivedCallback is not registered
+ * @category Errors
+ */ export class CheckpointProposalReceivedCallbackNotRegisteredError extends Error {
+    constructor(){
+        super('FATAL (allNodesCheckpointReceivedCallback): All nodes should register a checkpoint proposal handler');
+        this.name = 'CheckpointProposalReceivedCallbackNotRegisteredError';
+    }
+}

package/dest/errors/reqresp.error.d.ts

@@ -6,23 +6,4 @@
 export declare class IndividualReqRespTimeoutError extends Error {
     constructor();
 }
-/** Collective request timeout error
- *
- * This error will be thrown when a req resp request times out regardless of the peer.
- * @category Errors
- */
-export declare class CollectiveReqRespTimeoutError extends Error {
-    constructor();
-}
-/** Invalid response error
- *
- * This error will be thrown when a response is received that is not valid.
- *
- * This error does not need to be punished as message validators will handle punishing invalid
- * requests
- * @category Errors
- */
-export declare class InvalidResponseError extends Error {
-    constructor();
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxcmVzcC5lcnJvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Vycm9ycy9yZXFyZXNwLmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELGNBRUM7Q0FDRjtBQUVEOzs7O0dBSUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELGNBRUM7Q0FDRjtBQUVEOzs7Ozs7O0dBT0c7QUFDSCxxQkFBYSxvQkFBcUIsU0FBUSxLQUFLO0lBQzdDLGNBRUM7Q0FDRiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxcmVzcC5lcnJvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Vycm9ycy9yZXFyZXNwLmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7O0dBSUc7QUFDSCxxQkFBYSw2QkFBOEIsU0FBUSxLQUFLO0lBQ3RELGNBRUM7Q0FDRiJ9

package/dest/errors/reqresp.error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reqresp.error.d.ts","sourceRoot":"","sources":["../../src/errors/reqresp.error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,cAEC;CACF;AAED;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,cAEC;CACF;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,cAEC;CACF"}
+{"version":3,"file":"reqresp.error.d.ts","sourceRoot":"","sources":["../../src/errors/reqresp.error.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;IACtD,cAEC;CACF"}

package/dest/errors/reqresp.error.js

@@ -7,24 +7,3 @@
         super(`Request to peer timed out`);
     }
 }
-/** Collective request timeout error
- *
- * This error will be thrown when a req resp request times out regardless of the peer.
- * @category Errors
- */ export class CollectiveReqRespTimeoutError extends Error {
-    constructor(){
-        super(`Request to all peers timed out`);
-    }
-}
-/** Invalid response error
- *
- * This error will be thrown when a response is received that is not valid.
- *
- * This error does not need to be punished as message validators will handle punishing invalid
- * requests
- * @category Errors
- */ export class InvalidResponseError extends Error {
-    constructor(){
-        super(`Invalid response received`);
-    }
-}

package/dest/index.d.ts

@@ -5,8 +5,7 @@ export * from './client/index.js';
 export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
-export * from './mem_pools/tx_pool/index.js';
 export * from './mem_pools/tx_pool_v2/index.js';
 export * from './msg_validators/index.js';
 export * from './services/index.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyx1Q0FBdUMsQ0FBQztBQUN0RCxjQUFjLDhCQUE4QixDQUFDO0FBQzdDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywyQkFBMkIsQ0FBQztBQUMxQyxjQUFjLHFCQUFxQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyx1Q0FBdUMsQ0FBQztBQUN0RCxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxxQkFBcUIsQ0FBQyJ9

package/dest/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,YAAY,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,uCAAuC,CAAC;AACtD,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qBAAqB,CAAC"}

package/dest/index.js

@@ -4,7 +4,6 @@ export * from './client/index.js';
 export * from './enr/index.js';
 export * from './config.js';
 export * from './mem_pools/attestation_pool/index.js';
-export * from './mem_pools/tx_pool/index.js';
 export * from './mem_pools/tx_pool_v2/index.js';
 export * from './msg_validators/index.js';
 export * from './services/index.js';

package/dest/mem_pools/attestation_pool/attestation_pool.d.ts

@@ -1,91 +1,123 @@
-import { SlotNumber } from '@aztec/foundation/branded-types';
+import type { CheckpointProposalHash, SlotNumber } from '@aztec/foundation/branded-types';
 import type { AztecAsyncKVStore } from '@aztec/kv-store';
 import { BlockProposal, CheckpointAttestation, type CheckpointProposalCore } from '@aztec/stdlib/p2p';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 /** Result of trying to add an item (proposal or attestation) to the pool */
 export type TryAddResult = {
-    /** Whether the item was added */
+    /** Whether the item was accepted into pool state. False when it already existed, was invalid, or hit a cap. */
     added: boolean;
-    /** Whether the exact item already existed */
+    /** Whether the exact signed payload (matched by payload hash) already existed in the pool. */
     alreadyExists: boolean;
-    /** Count of items for the position. Meaning varies by method:
-     *  - tryAddBlockProposal: proposals at (slot, indexWithinCheckpoint)
-     *  - tryAddCheckpointProposal: proposals at slot
-     *  - tryAddCheckpointAttestation: attestations by this signer for this slot */
+    /** Number of distinct signed-payload hashes seen for the position. Meaning varies by method:
+     *  - tryAddBlockProposal: distinct payload hashes at (slot, indexWithinCheckpoint)
+     *  - tryAddCheckpointProposal: distinct payload hashes at slot
+     *  - tryAddCheckpointAttestation: distinct payload hashes by this signer for this slot */
     count: number;
 };
-export declare const MAX_CHECKPOINT_PROPOSALS_PER_SLOT = 5;
-export declare const MAX_BLOCK_PROPOSALS_PER_POSITION = 3;
+export type ProposalsForSlot = {
+    blockProposals: BlockProposal[];
+    checkpointProposals: CheckpointProposalCore[];
+};
+export declare const MAX_CHECKPOINT_PROPOSALS_PER_SLOT = 2;
+export declare const MAX_BLOCK_PROPOSALS_PER_POSITION = 2;
 /** Maximum attestations a single signer can make per slot before being rejected. */
-export declare const MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER = 3;
+export declare const MAX_ATTESTATIONS_PER_SLOT_AND_SIGNER = 2;
 /** Public API interface for attestation pools. Used for typing mocks and test implementations. */
-export type AttestationPoolApi = Pick<AttestationPool, 'tryAddBlockProposal' | 'getBlockProposal' | 'tryAddCheckpointProposal' | 'getCheckpointProposal' | 'addOwnCheckpointAttestations' | 'tryAddCheckpointAttestation' | 'deleteOlderThan' | 'getCheckpointAttestationsForSlot' | 'getCheckpointAttestationsForSlotAndProposal' | 'hasBlockProposalsForSlot' | 'isEmpty'>;
+export type AttestationPoolApi = Pick<AttestationPool, 'tryAddBlockProposal' | 'getBlockProposalByArchive' | 'getProposalsForSlot' | 'tryAddCheckpointProposal' | 'getCheckpointProposal' | 'addOwnCheckpointAttestations' | 'tryAddCheckpointAttestation' | 'deleteOlderThan' | 'getCheckpointAttestationsForSlot' | 'getCheckpointAttestationsForSlotAndProposal' | 'hasBlockProposalsForSlot' | 'isEmpty'>;
 /**
  * Pool for storing attestations and proposals collected by a validator.
  *
  * Attestations and proposals observed via the p2p network are stored for requests
  * from the validator to produce a block, or to serve to other peers.
+ *
+ * Equivocation detection: distinct *signed payload hashes* arriving at the same
+ * position are tracked in the matching index multimap so the equivocation count
+ * reaches 2 even when archive collides on `feeAssetPriceModifier` variants.
+ * Proposal bytes are retained per accepted payload hash, up to the same equivocation
+ * caps, for slashing watchers that need signed P2P proposals.
  */
 export declare class AttestationPool {
     private store;
     private log;
     private metrics;
-    private checkpointAttestations;
-    private checkpointProposals;
-    private checkpointProposalsForSlot;
-    private blockProposals;
-    private blockProposalsForSlotAndIndex;
-    private checkpointAttestationsPerSlotAndSigner;
+    private attestationPerSlotAndSigner;
+    private attestationHashesPerSlotAndSigner;
+    private checkpointProposalsPerSlotAndHash;
+    private checkpointProposalHashesPerSlot;
+    private blockProposalsPerSlotIndexAndHash;
+    private blockProposalHashesPerSlotAndIndex;
+    private blockProposalKeysPerArchive;
     constructor(store: AztecAsyncKVStore, telemetry?: TelemetryClient, log?: import("@aztec/foundation/log").Logger);
     private poolStats;
     /** Returns whether the pool is empty. */
     isEmpty(): Promise<boolean>;
-    private getProposalKey;
-    private getAttestationKey;
-    /** Returns range bounds for querying all attestations for a given slot. */
-    private getAttestationKeyRangeForSlot;
-    /** Returns range bounds for querying all attestations for a given (slot, proposalId). */
-    private getAttestationKeyRangeForProposal;
-    /** Creates a key for the per-signer-per-slot attestation index. Uses padded slot for lexicographic ordering. */
-    private getSlotSignerKey;
     /** Number of bits reserved for indexWithinCheckpoint in position keys. */
     private static readonly INDEX_BITS;
     /** Maximum indexWithinCheckpoint value (2^10 - 1 = 1023). */
     private static readonly MAX_INDEX;
-    /** Creates a position key for block proposals: (slot << 10) | indexWithinCheckpoint. */
+    /** Decimal digits used to left-pad slot numbers in string keys.
+     * 10 digits ≈ 3500 years at 36 s/slot, leaving ample headroom. */
+    private static readonly SLOT_PAD_DIGITS;
+    /** Fixed-width decimal slot string for use in composite string keys. */
+    private slotPaddedKey;
+    /** Fixed-width decimal index string for use in composite string keys. */
+    private indexPaddedKey;
+    /** Key for retained block proposals. */
+    private getBlockProposalKey;
+    /** Range bounds for all retained block proposals in a slot. */
+    private getBlockProposalKeyRangeForSlot;
+    /** Key for retained checkpoint proposals. */
+    private getCheckpointProposalKey;
+    /** Range bounds for all retained checkpoint proposals in a slot. */
+    private getCheckpointProposalKeyRangeForSlot;
+    /** Key for the per-(slot, signer) attestation main store and equivocation index. */
+    private getSlotSignerKey;
+    /**
+     * Returns range bounds for querying all attestations for a given slot.
+     * Fixed-width padding ensures the slot prefix sorts cleanly, so using the next
+     * slot's prefix as the upper bound captures exactly the current slot's entries.
+     */
+    private getAttestationKeyRangeForSlot;
+    /** Creates a position key for block proposals: slot * 1024 + indexWithinCheckpoint.
+     * Uses multiplication instead of bit-shift to avoid 32-bit signed integer overflow
+     * (bit-shift overflows after slot ~2^21, roughly 278 days of uptime). */
     private getBlockPositionKey;
+    private multimapHasValue;
     /**
      * Attempts to add a block proposal to the pool.
      *
-     * This method performs validation and addition in a single call:
-     * - Checks if the proposal already exists (returns alreadyExists: true if so)
-     * - Checks if the position has reached the proposal cap (returns added: false if so)
-     * - Adds the proposal if validation passes
+     * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+     *   exact same signed payload returns `alreadyExists: true`.
+     * - Distinct payload hashes at the same `(slot, indexWithinCheckpoint)` are tracked
+     *   in the equivocation index and retained up to the cap.
      *
      * @param blockProposal - The block proposal to add
      * @returns Result indicating whether the proposal was added and duplicate detection info
      */
     tryAddBlockProposal(blockProposal: BlockProposal): Promise<TryAddResult>;
-    /** Gets the count of block proposals for a given position (slot, indexWithinCheckpoint). */
-    private getBlockProposalCountForPosition;
-    private addBlockProposal;
     /**
-     * Get block proposal by its ID.
+     * Get block proposal by archive root.
      *
-     * @param id - The ID of the block proposal to retrieve. The ID is proposal.payload.archive
+     * Resolves the archive root through the archive index and returns the first
+     * retained proposal for that archive. This lookup is used by block-txs req/resp,
+     * where any retained proposal for the requested archive gives the tx hash list.
      *
-     * @return The block proposal if it exists, otherwise undefined.
+     * @param archiveRoot - The archive root to look up
+     * @return The block proposal if it exists and its archive matches, otherwise undefined.
      */
-    getBlockProposal(id: string): Promise<BlockProposal | undefined>;
+    getBlockProposalByArchive(archiveRoot: string): Promise<BlockProposal | undefined>;
+    /** Returns retained signed proposals for a slot. */
+    getProposalsForSlot(slot: SlotNumber): Promise<ProposalsForSlot>;
     /** Checks if any block proposals exist for a given slot (at index 0). */
     hasBlockProposalsForSlot(slot: SlotNumber): Promise<boolean>;
     /**
      * Attempts to add a checkpoint proposal to the pool.
      *
-     * This method performs validation and addition in a single call:
-     * - Checks if the proposal already exists (returns alreadyExists: true if so)
-     * - Checks if the slot has reached the proposal cap (returns added: false if so)
-     * - Adds the proposal if validation passes
+     * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+     *   exact same signed payload returns `alreadyExists: true`.
+     * - Distinct payload hashes at the same slot are tracked in the equivocation index.
+     *   Distinct payload bytes are retained up to the same cap so slashing watchers
+     *   can recover signed proposals.
      *
      * Note: This method only handles the CheckpointProposalCore. If the original
      * CheckpointProposal contains a lastBlock, the caller should extract it via
@@ -95,37 +127,44 @@ export declare class AttestationPool {
      * @returns Result indicating whether the proposal was added and duplicate detection info
      */
     tryAddCheckpointProposal(proposal: CheckpointProposalCore): Promise<TryAddResult>;
-    private addCheckpointProposal;
     /**
-     * Get checkpoint proposal by its ID.
+     * Get a retained checkpoint proposal stored for the given slot.
+     * If multiple proposals were retained for an equivocation, returns the lowest
+     * payload hash deterministically.
      *
      * Returns a CheckpointProposalCore (without lastBlock info) since the lastBlock
      * is extracted and stored separately as a BlockProposal when added.
      *
-     * @param id - The ID of the checkpoint proposal to retrieve (proposal.archive)
-     * @return The checkpoint proposal core if it exists, otherwise undefined.
+     * @param slot - The slot to look up
+     * @return The checkpoint proposal core if one is stored, otherwise undefined.
      */
-    getCheckpointProposal(id: string): Promise<CheckpointProposalCore | undefined>;
+    getCheckpointProposal(slot: SlotNumber): Promise<CheckpointProposalCore | undefined>;
     /**
      * Adds own checkpoint attestations to the pool.
-     * Skips validations on number of checkpoint attestations stored for the given slot.
+     * Skips per-signer cap and equivocation tracking; the caller is trusted.
+     * Each (slot, signer) gets a single stored attestation; later additions overwrite.
      */
     addOwnCheckpointAttestations(attestations: CheckpointAttestation[]): Promise<void>;
     /**
      * Get all checkpoint attestations for a given slot.
      *
+     * Returns one attestation per (slot, signer) — the first seen for each signer.
+     * Later equivocating attestations from the same signer are tracked in the index
+     * but their bytes are not retained.
+     *
      * @param slot - The slot to query
      * @return CheckpointAttestations
      */
     getCheckpointAttestationsForSlot(slot: SlotNumber): Promise<CheckpointAttestation[]>;
     /**
-     * Get checkpoint attestations for slot and given proposal.
+     * Get checkpoint attestations for a slot whose signed payload matches the given
+     * proposal payload hash.
      *
      * @param slot - The slot to query
-     * @param proposalId - The proposal to query
-     * @return CheckpointAttestations
+     * @param proposalPayloadHash - Hex-encoded keccak256 of the target proposal's signed payload
+     * @return CheckpointAttestations whose `getPayloadHash()` matches `proposalPayloadHash`
      */
-    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalId: string): Promise<CheckpointAttestation[]>;
+    getCheckpointAttestationsForSlotAndProposal(slot: SlotNumber, proposalPayloadHash: CheckpointProposalHash): Promise<CheckpointAttestation[]>;
     /**
      * Delete all pool data (attestations, proposals) older than the given slot.
      *
@@ -135,18 +174,19 @@ export declare class AttestationPool {
     /**
      * Attempts to add a checkpoint attestation to the pool.
      *
-     * This method performs validation and addition in a single call:
-     * - Checks if the attestation already exists (returns alreadyExists: true if so)
-     * - Checks if this signer has reached the per-signer attestation cap for this slot
-     * - Adds the attestation if validation passes
+     * - Detects duplicates by signed-payload hash (not archive); a re-broadcast of the
+     *   exact same signed payload from the same signer returns `alreadyExists: true`.
+     * - Distinct payload hashes from the same (slot, signer) are tracked in the
+     *   equivocation index. The first one's bytes are stored; later distinct hashes
+     *   bump `count` so libp2p can fire its duplicate callback.
      *
      * @param attestation - The checkpoint attestation to add
-     * @returns Result indicating whether the attestation was added, existence info, and count of
-     *          attestations by this signer for this slot (for equivocation detection)
+     * @returns Result indicating whether the attestation was added, existence info,
+     *          and number of distinct payload hashes by this signer for this slot
+     *          (for equivocation detection).
      */
     tryAddCheckpointAttestation(attestation: CheckpointAttestation): Promise<TryAddResult>;
-    private getSignerAttestationCountForSlot;
 }
 /** Creates an AttestationPool backed by a temporary store for testing. */
 export declare function createTestAttestationPool(telemetry?: TelemetryClient): Promise<AttestationPool>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUF5QixVQUFVLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUlwRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBcUMsTUFBTSxpQkFBaUIsQ0FBQztBQUM1RixPQUFPLEVBQ0wsYUFBYSxFQUNiLHFCQUFxQixFQUVyQixLQUFLLHNCQUFzQixFQUM1QixNQUFNLG1CQUFtQixDQUFDO0FBQzNCLE9BQU8sRUFBRSxLQUFLLGVBQWUsRUFBc0IsTUFBTSx5QkFBeUIsQ0FBQztBQUluRiw0RUFBNEU7QUFDNUUsTUFBTSxNQUFNLFlBQVksR0FBRztJQUN6QixpQ0FBaUM7SUFDakMsS0FBSyxFQUFFLE9BQU8sQ0FBQztJQUNmLDZDQUE2QztJQUM3QyxhQUFhLEVBQUUsT0FBTyxDQUFDO0lBQ3ZCOzs7bUZBRytFO0lBQy9FLEtBQUssRUFBRSxNQUFNLENBQUM7Q0FDZixDQUFDO0FBRUYsZUFBTyxNQUFNLGlDQUFpQyxJQUFJLENBQUM7QUFDbkQsZUFBTyxNQUFNLGdDQUFnQyxJQUFJLENBQUM7QUFDbEQsb0ZBQW9GO0FBQ3BGLGVBQU8sTUFBTSxvQ0FBb0MsSUFBSSxDQUFDO0FBRXRELGtHQUFrRztBQUNsRyxNQUFNLE1BQU0sa0JBQWtCLEdBQUcsSUFBSSxDQUNuQyxlQUFlLEVBQ2IscUJBQXFCLEdBQ3JCLGtCQUFrQixHQUNsQiwwQkFBMEIsR0FDMUIsdUJBQXVCLEdBQ3ZCLDhCQUE4QixHQUM5Qiw2QkFBNkIsR0FDN0IsaUJBQWlCLEdBQ2pCLGtDQUFrQyxHQUNsQyw2Q0FBNkMsR0FDN0MsMEJBQTBCLEdBQzFCLFNBQVMsQ0FDWixDQUFDO0FBRUY7Ozs7O0dBS0c7QUFDSCxxQkFBYSxlQUFlO0lBMEJ4QixPQUFP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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb25fcG9vbC5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL21lbV9wb29scy9hdHRlc3RhdGlvbl9wb29sL2F0dGVzdGF0aW9uX3Bvb2wudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQXFCLHNCQUFzQixFQUFFLFVBQVUsRUFBRSxNQUFNLGlDQUFpQyxDQUFDO0FBRzdHLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFxQyxNQUFNLGlCQUFpQixDQUFDO0FBQzVGLE9BQU8sRUFDTCxhQUFhLEVBQ2IscUJBQXFCLEVBRXJCLEtBQUssc0JBQXNCLEVBQzVCLE1BQU0sbUJBQW1CLENBQUM7QUFDM0IsT0FBTyxFQUFFLEtBQUssZUFBZSxFQUFzQixNQUFNLHlCQUF5QixDQUFDO0FBSW5GLDRFQUE0RTtBQUM1RSxNQUFNLE1BQU0sWUFBWSxHQUFHO0lBQ3pCLCtHQUErRztJQUMvRyxLQUFLLEVBQUUsT0FBTyxDQUFDO0lBQ2YsOEZBQThGO0lBQzlGLGFBQWEsRUFBRSxPQUFPLENBQUM7SUFDdkI7Ozs4RkFHMEY7SUFDMUYsS0FBSyxFQUFFLE1BQU0sQ0FBQztDQUNmLENBQUM7QUFFRixNQUFNLE1BQU0sZ0JBQWdCLEdBQUc7SUFDN0IsY0FBYyxFQUFFLGFBQWEsRUFBRSxDQUFDO0lBQ2hDLG1CQUFtQixFQUFFLHNCQUFzQixFQUFFLENBQUM7Q0FDL0MsQ0FBQztBQUVGLGVBQU8sTUFBTSxpQ0FBaUMsSUFBSSxDQUFDO0FBQ25ELGVBQU8sTUFBTSxnQ0FBZ0MsSUFBSSxDQUFDO0FBQ2xELG9GQUFvRjtBQUNwRixlQUFPLE1BQU0sb0NBQW9DLElBQUksQ0FBQztBQUV0RCxrR0FBa0c7QUFDbEcsTUFBTSxNQUFNLGtCQUFrQixHQUFHLElBQUksQ0FDbkMsZUFBZSxFQUNiLHFCQUFxQixHQUNyQiwyQkFBMkIsR0FDM0IscUJBQXFCLEdBQ3JCLDBCQUEwQixHQUMxQix1QkFBdUIsR0FDdkIs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