@aztec/p2p 0.0.0-test.1 → 0.0.1-commit.017a351

package/dest/config.js

@@ -1,18 +1,61 @@
-import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
-import { dataConfigMappings } from '@aztec/kv-store/config';
-import { chainConfigMappings } from '@aztec/stdlib/config';
+import { bigintConfigHelper, booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, optionalNumberConfigHelper, percentageConfigHelper, pickConfigMappings, secretStringConfigHelper } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/curves/bn254';
+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.',
         ...booleanConfigHelper()
     },
+    p2pDiscoveryDisabled: {
+        env: 'P2P_DISCOVERY_DISABLED',
+        description: 'A flag dictating whether the P2P discovery system should be disabled.',
+        ...booleanConfigHelper(false)
+    },
     blockCheckIntervalMS: {
         env: 'P2P_BLOCK_CHECK_INTERVAL_MS',
         description: 'The frequency in which to check for new L2 blocks.',
         ...numberConfigHelper(100)
     },
+    slotCheckIntervalMS: {
+        env: 'P2P_SLOT_CHECK_INTERVAL_MS',
+        description: 'The frequency in which to check for new L2 slots.',
+        ...numberConfigHelper(1000)
+    },
     debugDisableColocationPenalty: {
         env: 'DEBUG_P2P_DISABLE_COLOCATION_PENALTY',
         description: 'DEBUG: Disable colocation penalty - NEVER set to true in production',
@@ -23,37 +66,48 @@ 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.',
         ...numberConfigHelper(1_000)
     },
-    tcpListenAddress: {
-        env: 'P2P_TCP_LISTEN_ADDR',
-        defaultValue: '0.0.0.0:40400',
-        description: 'The listen address for TCP. Format: <IP_ADDRESS>:<PORT>.'
+    listenAddress: {
+        env: 'P2P_LISTEN_ADDR',
+        defaultValue: '0.0.0.0',
+        description: 'The listen address. ipv4 address.'
     },
-    udpListenAddress: {
-        env: 'P2P_UDP_LISTEN_ADDR',
-        defaultValue: '0.0.0.0:40400',
-        description: 'The listen address for UDP. Format: <IP_ADDRESS>:<PORT>.'
+    p2pPort: {
+        env: 'P2P_PORT',
+        description: `The port for the P2P service. Defaults to ${DEFAULT_P2P_PORT}`,
+        ...numberConfigHelper(DEFAULT_P2P_PORT)
     },
-    tcpAnnounceAddress: {
-        env: 'P2P_TCP_ANNOUNCE_ADDR',
-        description: 'The announce address for TCP. Format: <IP_ADDRESS>:<PORT>. Leave IP_ADDRESS blank to query for public IP.'
+    p2pBroadcastPort: {
+        env: 'P2P_BROADCAST_PORT',
+        description: `The port to broadcast the P2P service on (included in the node's ENR). Defaults to P2P_PORT.`
     },
-    udpAnnounceAddress: {
-        env: 'P2P_UDP_ANNOUNCE_ADDR',
-        description: 'The announce address for UDP. Format: <IP_ADDRESS>:<PORT>. Leave IP_ADDRESS blank to query for public IP.'
+    p2pIp: {
+        env: 'P2P_IP',
+        description: 'The IP address for the P2P service. ipv4 address.'
     },
     peerIdPrivateKey: {
         env: 'PEER_ID_PRIVATE_KEY',
-        description: 'An optional peer id private key. If blank, will generate a random key.'
+        description: 'An optional peer id private key. If blank, will generate a random key.',
+        ...secretStringConfigHelper()
+    },
+    peerIdPrivateKeyPath: {
+        env: 'PEER_ID_PRIVATE_KEY_PATH',
+        description: 'An optional path to store generated peer id private keys. If blank, will default to storing any generated keys in the root of the data directory.'
     },
     bootstrapNodes: {
         env: 'BOOTSTRAP_NODES',
         parseEnv: (val)=>val.split(','),
-        description: 'A list of bootstrap peer ENRs to connect to. Separated by commas.'
+        description: 'A list of bootstrap peer ENRs to connect to. Separated by commas.',
+        defaultValue: []
     },
     bootstrapNodeEnrVersionCheck: {
         env: 'P2P_BOOTSTRAP_NODE_ENR_VERSION_CHECK',
@@ -75,15 +129,11 @@ export const p2pConfigMappings = {
         description: 'If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false.',
         ...booleanConfigHelper()
     },
-    keepProvenTxsInPoolFor: {
-        env: 'P2P_TX_POOL_KEEP_PROVEN_FOR',
-        description: 'How many blocks have to pass after a block is proven before its txs are deleted (zero to delete immediately once proven)',
-        ...numberConfigHelper(0)
-    },
-    keepAttestationsInPoolFor: {
-        env: 'P2P_ATTESTATION_POOL_KEEP_FOR',
-        description: 'How many slots to keep attestations for.',
-        ...numberConfigHelper(96)
+    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',
@@ -113,18 +163,23 @@ export const p2pConfigMappings = {
     gossipsubFloodPublish: {
         env: 'P2P_GOSSIPSUB_FLOOD_PUBLISH',
         description: 'Whether to flood publish messages. - For testing purposes only',
-        ...booleanConfigHelper(true)
+        ...booleanConfigHelper(false)
     },
     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',
-        description: 'How many message cache windows to include when gossiping with other pears.',
+        description: 'How many message cache windows to include when gossiping with other peers.',
         ...numberConfigHelper(3)
     },
+    gossipsubSeenTTL: {
+        env: 'P2P_GOSSIPSUB_SEEN_TTL',
+        description: 'How long to keep message IDs in the seen cache.',
+        ...numberConfigHelper(20 * 60 * 1000)
+    },
     gossipsubTxTopicWeight: {
         env: 'P2P_GOSSIPSUB_TX_TOPIC_WEIGHT',
         description: 'The weight of the tx topic for the gossipsub protocol.',
@@ -165,8 +220,139 @@ export const p2pConfigMappings = {
         description: 'The number of transactions that will be archived. If the limit is set to 0 then archiving will be disabled.',
         ...numberConfigHelper(0)
     },
+    trustedPeers: {
+        env: 'P2P_TRUSTED_PEERS',
+        parseEnv: (val)=>val.split(','),
+        description: 'A list of trusted peer ENRs that will always be persisted. Separated by commas.',
+        defaultValue: []
+    },
+    privatePeers: {
+        env: 'P2P_PRIVATE_PEERS',
+        parseEnv: (val)=>val.split(','),
+        description: 'A list of private peer ENRs that will always be persisted and not be used for discovery. Separated by commas.',
+        defaultValue: []
+    },
+    preferredPeers: {
+        env: 'P2P_PREFERRED_PEERS',
+        parseEnv: (val)=>val.split(','),
+        description: 'A list of preferred peer ENRs that will always be persisted and not be used for discovery. Separated by commas.',
+        defaultValue: []
+    },
+    p2pStoreMapSizeKb: {
+        env: 'P2P_STORE_MAP_SIZE_KB',
+        ...optionalNumberConfigHelper(),
+        description: 'The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.'
+    },
+    txPublicSetupAllowListExtend: {
+        env: 'TX_PUBLIC_SETUP_ALLOWLIST',
+        parseEnv: (val)=>parseAllowList(val),
+        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',
+        description: 'The maximum number of pending txs before evicting lower priority txs.',
+        // Worst case scenario: Uncompressed public/private tx is ~ 156kb
+        // This implies we are using ~156MB of memory for pending pool
+        ...numberConfigHelper(1_000)
+    },
+    seenMessageCacheSize: {
+        env: 'P2P_SEEN_MSG_CACHE_SIZE',
+        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.',
+        ...booleanConfigHelper(false)
+    },
+    p2pAllowOnlyValidators: {
+        env: 'P2P_ALLOW_ONLY_VALIDATORS',
+        description: 'True to only permit validators to connect.',
+        ...booleanConfigHelper(false)
+    },
+    p2pMaxFailedAuthAttemptsAllowed: {
+        env: 'P2P_MAX_AUTH_FAILED_ATTEMPTS_ALLOWED',
+        description: 'Number of auth attempts to allow before peer is banned. Number is inclusive',
+        ...numberConfigHelper(3)
+    },
+    dropTransactionsProbability: {
+        env: 'P2P_DROP_TX_CHANCE',
+        description: 'The probability that a transaction is discarded (0 - 1). - For testing purposes only',
+        ...percentageConfigHelper(0)
+    },
+    disableTransactions: {
+        env: 'TRANSACTIONS_DISABLED',
+        description: 'Whether transactions are disabled for this node. This means transactions will be rejected at the RPC and P2P layers.',
+        ...booleanConfigHelper(false)
+    },
+    txPoolDeleteTxsAfterReorg: {
+        env: 'P2P_TX_POOL_DELETE_TXS_AFTER_REORG',
+        description: 'Whether to delete transactions from the pool after a reorg instead of moving them back to pending.',
+        ...booleanConfigHelper(false)
+    },
+    debugP2PInstrumentMessages: {
+        env: 'DEBUG_P2P_INSTRUMENT_MESSAGES',
+        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.',
+        ...booleanConfigHelper(false)
+    },
+    broadcastEquivocatedProposals: {
+        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,
-    ...chainConfigMappings
+    ...batchTxRequesterConfigMappings,
+    ...chainConfigMappings,
+    ...txCollectionConfigMappings,
+    ...txFileStoreConfigMappings
 };
 /**
  * Gets the config values for p2p client from environment variables.
@@ -178,16 +364,89 @@ export function getP2PDefaultConfig() {
     return getDefaultConfig(p2pConfigMappings);
 }
 const bootnodeConfigKeys = [
-    'udpAnnounceAddress',
+    'p2pIp',
+    'p2pPort',
+    'p2pBroadcastPort',
+    'listenAddress',
     'peerIdPrivateKey',
-    'udpListenAddress',
+    'peerIdPrivateKeyPath',
     'dataDirectory',
-    'dataStoreMapSizeKB',
+    'dataStoreMapSizeKb',
     'bootstrapNodes',
-    'l1ChainId'
+    'l1ChainId',
+    '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 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
+ */ export function parseAllowList(value) {
+    const entries = [];
+    if (!value) {
+        return entries;
+    }
+    for (const val of value.split(',')){
+        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') {
+            entries.push({
+                address: AztecAddress.fromString(identifierString),
+                selector,
+                ...flags
+            });
+        } else if (typeString === 'C') {
+            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/enr/generate-enr.d.ts

@@ -1,9 +1,17 @@
 import type { LogFn } from '@aztec/foundation/log';
-import { SignableENR } from '@chainsafe/enr';
+import { type ChainConfig } from '@aztec/stdlib/config';
+import type { ComponentsVersions } from '@aztec/stdlib/versioning';
 import type { PeerId } from '@libp2p/interface';
-export declare function createBootnodeENRandPeerId(privateKey: string, udpAnnounceAddress: string, l1ChainId: number): Promise<{
+import { type Multiaddr } from '@multiformats/multiaddr';
+import { ENR, SignableENR } from '@nethermindeth/enr';
+export { ENR };
+export declare function createBootnodeENRandPeerId(privateKey: string, p2pIp: string, p2pBroadcastPort: number, l1ChainId: number): Promise<{
     enr: SignableENR;
     peerId: PeerId;
 }>;
+export declare function createNodeENR(peerId: PeerId, multiAddrUdp: Multiaddr | undefined, multiAddrTcp: Multiaddr | undefined, chainConfig: ChainConfig, packageVersion: string): {
+    enr: SignableENR;
+    versions: ComponentsVersions;
+};
 export declare function printENR(enr: string, log: LogFn): Promise<void>;
-//# sourceMappingURL=generate-enr.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGUtZW5yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW5yL2dlbmVyYXRlLWVuci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUNuRCxPQUFPLEVBQUUsS0FBSyxXQUFXLEVBQW9CLE1BQU0sc0JBQXNCLENBQUM7QUFDMUUsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUVuRSxPQUFPLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUNoRCxPQUFPLEVBQUUsS0FBSyxTQUFTLEVBQWEsTUFBTSx5QkFBeUIsQ0FBQztBQUNwRSxPQUFPLEVBQUUsR0FBRyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBTXRELE9BQU8sRUFBRSxHQUFHLEVBQUUsQ0FBQztBQUVmLHdCQUFzQiwwQkFBMEIsQ0FDOUMsVUFBVSxFQUFFLE1BQU0sRUFDbEIsS0FBSyxFQUFFLE1BQU0sRUFDYixnQkFBZ0IsRUFBRSxNQUFNLEVBQ3hCLFNBQVMsRUFBRSxNQUFNLEdBQ2hCLE9BQU8sQ0FBQztJQUFFLEdBQUcsRUFBRSxXQUFXLENBQUM7SUFBQyxNQUFNLEVBQUUsTUFBTSxDQUFBO0NBQUUsQ0FBQyxDQWEvQztBQUVELHdCQUFnQixhQUFhLENBQzNCLE1BQU0sRUFBRSxNQUFNLEVBQ2QsWUFBWSxFQUFFLFNBQVMsR0FBRyxTQUFTLEVBQ25DLFlBQVksRUFBRSxTQUFTLEdBQUcsU0FBUyxFQUNuQyxXQUFXLEVBQUUsV0FBVyxFQUN4QixjQUFjLEVBQUUsTUFBTSxHQUNyQjtJQUFFLEdBQUcsRUFBRSxXQUFXLENBQUM7SUFBQyxRQUFRLEVBQUUsa0JBQWtCLENBQUE7Q0FBRSxDQWlCcEQ7QUFFRCx3QkFBc0IsUUFBUSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLEtBQUssaUJBWXJEIn0=

package/dest/enr/generate-enr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate-enr.d.ts","sourceRoot":"","sources":["../../src/enr/generate-enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAO,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAOhD,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAQrD"}
+{"version":3,"file":"generate-enr.d.ts","sourceRoot":"","sources":["../../src/enr/generate-enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,KAAK,WAAW,EAAoB,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAMtD,OAAO,EAAE,GAAG,EAAE,CAAC;AAEf,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAa/C;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,YAAY,EAAE,SAAS,GAAG,SAAS,EACnC,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,MAAM,GACrB;IAAE,GAAG,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,kBAAkB,CAAA;CAAE,CAiBpD;AAED,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAYrD"}

package/dest/enr/generate-enr.js

@@ -1,13 +1,14 @@
 import { emptyChainConfig } from '@aztec/stdlib/config';
-import { ENR, SignableENR } from '@chainsafe/enr';
 import { multiaddr } from '@multiformats/multiaddr';
-import { AZTEC_ENR_KEY } from '../types/index.js';
+import { ENR, SignableENR } from '@nethermindeth/enr';
+import { AZTEC_ENR_CLIENT_VERSION_KEY, AZTEC_ENR_KEY } from '../types/index.js';
 import { convertToMultiaddr, createLibP2PPeerIdFromPrivateKey } from '../util.js';
-import { setAztecEnrKey } from '../versioning.js';
-export async function createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId) {
+import { setAztecClientVersionEnrKey, setAztecEnrKey } from '../versioning.js';
+export { ENR };
+export async function createBootnodeENRandPeerId(privateKey, p2pIp, p2pBroadcastPort, l1ChainId) {
     const peerId = await createLibP2PPeerIdFromPrivateKey(privateKey);
     const enr = SignableENR.createFromPeerId(peerId);
-    const publicAddr = multiaddr(convertToMultiaddr(udpAnnounceAddress, 'udp'));
+    const publicAddr = multiaddr(convertToMultiaddr(p2pIp, p2pBroadcastPort, 'udp'));
     enr.setLocationMultiaddr(publicAddr);
     const config = {
         ...emptyChainConfig,
@@ -19,6 +20,25 @@ export async function createBootnodeENRandPeerId(privateKey, udpAnnounceAddress,
         peerId
     };
 }
+export function createNodeENR(peerId, multiAddrUdp, multiAddrTcp, chainConfig, packageVersion) {
+    // create ENR from PeerId
+    const enr = SignableENR.createFromPeerId(peerId);
+    // Add aztec identification to ENR
+    const versions = setAztecEnrKey(enr, chainConfig);
+    // Add aztec client version to ENR
+    setAztecClientVersionEnrKey(enr, packageVersion);
+    // set location multiaddr in ENR record
+    if (multiAddrUdp) {
+        enr.setLocationMultiaddr(multiAddrUdp);
+    }
+    if (multiAddrTcp) {
+        enr.setLocationMultiaddr(multiAddrTcp);
+    }
+    return {
+        enr,
+        versions
+    };
+}
 export async function printENR(enr, log) {
     const decoded = ENR.decodeTxt(enr);
     log(`PeerID: ${await decoded.peerId()}`);
@@ -27,4 +47,6 @@ export async function printENR(enr, log) {
     log(`TCP: ${decoded.tcp}`);
     const aztec = decoded.kvs.get(AZTEC_ENR_KEY);
     log(`Aztec version: ${aztec?.toString()}`);
+    const aztecClientVersion = decoded.kvs.get(AZTEC_ENR_CLIENT_VERSION_KEY);
+    log(`Aztec client version ${aztecClientVersion ? aztecClientVersion.toString() : 'N/A'}`);
 }

package/dest/enr/index.d.ts

@@ -1,2 +1,2 @@
 export * from './generate-enr.js';
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9lbnIvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxtQkFBbUIsQ0FBQyJ9

package/dest/errors/attestation-pool.error.d.ts

@@ -0,0 +1,7 @@
+export declare class AttestationPoolError extends Error {
+    constructor(message?: string);
+}
+export declare class ProposalSlotCapExceededError extends AttestationPoolError {
+    constructor(message?: string);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXR0ZXN0YXRpb24tcG9vbC5lcnJvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Vycm9ycy9hdHRlc3RhdGlvbi1wb29sLmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHFCQUFhLG9CQUFxQixTQUFRLEtBQUs7SUFDN0MsWUFBWSxPQUFPLENBQUMsRUFBRSxNQUFNLEVBRzNCO0NBQ0Y7QUFFRCxxQkFBYSw0QkFBNkIsU0FBUSxvQkFBb0I7SUFDcEUsWUFBWSxPQUFPLENBQUMsRUFBRSxNQUFNLEVBRzNCO0NBQ0YifQ==

package/dest/errors/attestation-pool.error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attestation-pool.error.d.ts","sourceRoot":"","sources":["../../src/errors/attestation-pool.error.ts"],"names":[],"mappings":"AAAA,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,YAAY,OAAO,CAAC,EAAE,MAAM,EAG3B;CACF;AAED,qBAAa,4BAA6B,SAAQ,oBAAoB;IACpE,YAAY,OAAO,CAAC,EAAE,MAAM,EAG3B;CACF"}

package/dest/errors/attestation-pool.error.js

@@ -0,0 +1,12 @@
+export class AttestationPoolError extends Error {
+    constructor(message){
+        super(message);
+        this.name = 'AttestationPoolError';
+    }
+}
+export class ProposalSlotCapExceededError extends AttestationPoolError {
+    constructor(message){
+        super(message);
+        this.name = 'ProposalSlotCapExceededError';
+    }
+}

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=reqresp.error.d.ts.map
+//# 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;;CAIvD;AAED;;;;GAIG;AACH,qBAAa,6BAA8B,SAAQ,KAAK;;CAIvD;AAED;;;;;;;GAOG;AACH,qBAAa,oBAAqB,SAAQ,KAAK;;CAI9C"}
+{"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/errors/tx-pool.error.d.ts

@@ -0,0 +1,8 @@
+import type { TxPoolRejectionError } from '../mem_pools/tx_pool_v2/eviction/interfaces.js';
+/** Error thrown when a transaction is not added to the mempool. */
+export declare class TxPoolError extends Error {
+    readonly reason: TxPoolRejectionError;
+    readonly data: TxPoolRejectionError;
+    constructor(reason: TxPoolRejectionError);
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHgtcG9vbC5lcnJvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2Vycm9ycy90eC1wb29sLmVycm9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sZ0RBQWdELENBQUM7QUFFM0YsbUVBQW1FO0FBQ25FLHFCQUFhLFdBQVksU0FBUSxLQUFLO2FBR1IsTUFBTSxFQUFFLG9CQUFvQjtJQUZ4RCxTQUFnQixJQUFJLEVBQUUsb0JBQW9CLENBQUM7SUFFM0MsWUFBNEIsTUFBTSxFQUFFLG9CQUFvQixFQUl2RDtDQUNGIn0=

package/dest/errors/tx-pool.error.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tx-pool.error.d.ts","sourceRoot":"","sources":["../../src/errors/tx-pool.error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAE3F,mEAAmE;AACnE,qBAAa,WAAY,SAAQ,KAAK;aAGR,MAAM,EAAE,oBAAoB;IAFxD,SAAgB,IAAI,EAAE,oBAAoB,CAAC;IAE3C,YAA4B,MAAM,EAAE,oBAAoB,EAIvD;CACF"}

package/dest/errors/tx-pool.error.js

@@ -0,0 +1,9 @@
+/** Error thrown when a transaction is not added to the mempool. */ export class TxPoolError extends Error {
+    reason;
+    data;
+    constructor(reason){
+        super(reason.message), this.reason = reason;
+        this.name = 'TxPoolError';
+        this.data = reason;
+    }
+}

package/dest/index.d.ts

@@ -1,8 +1,11 @@
+export { createSecp256k1PeerId } from '@libp2p/peer-id-factory';
+export type { PeerId } from '@libp2p/interface';
 export * from './bootstrap/bootstrap.js';
 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=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUscUJBQXFCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUNoRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sbUJBQW1CLENBQUM7QUFFaEQsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZ0JBQWdCLENBQUM7QUFDL0IsY0FBYyxhQUFhLENBQUM7QUFDNUIsY0FBYyx1Q0FBdUMsQ0FBQztBQUN0RCxjQUFjLGlDQUFpQyxDQUFDO0FBQ2hELGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyxxQkFBcUIsQ0FBQyJ9