@aztec/p2p 0.0.0-test.0 → 0.0.1-commit.24de95ac

package/dest/config.d.ts

@@ -1,130 +1,110 @@
-import { type ConfigMappingsType } from '@aztec/foundation/config';
+import { type ConfigMappingsType, SecretValue } from '@aztec/foundation/config';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
-import { type ChainConfig } from '@aztec/stdlib/config';
+import { type AllowedElement, type ChainConfig } from '@aztec/stdlib/config';
 import { type P2PReqRespConfig } from './services/reqresp/config.js';
+import { type TxCollectionConfig } from './services/tx_collection/config.js';
 /**
  * P2P client configuration values.
  */
-export interface P2PConfig extends P2PReqRespConfig, ChainConfig {
-    /**
-     * A flag dictating whether the P2P subsystem should be enabled.
-     */
+export interface P2PConfig extends P2PReqRespConfig, ChainConfig, TxCollectionConfig {
+    /** A flag dictating whether the P2P subsystem should be enabled. */
     p2pEnabled: boolean;
-    /**
-     * The frequency in which to check for new L2 blocks.
-     */
+    /** The frequency in which to check for new L2 blocks. */
     blockCheckIntervalMS: number;
-    /**
-     * The number of blocks to fetch in a single batch.
-     */
+    /** The number of blocks to fetch in a single batch. */
     blockRequestBatchSize: number;
-    /**
-     * DEBUG: Disable colocation penalty - for testing purposes only
-     */
+    /** DEBUG: Disable colocation penalty - for testing purposes only */
     debugDisableColocationPenalty: boolean;
-    /**
-     * The frequency in which to check for new peers.
-     */
+    /** The frequency in which to check for new peers. */
     peerCheckIntervalMS: number;
-    /**
-     * Size of queue of L2 blocks to store.
-     */
+    /** Size of queue of L2 blocks to store. */
     l2QueueSize: number;
-    /**
-     * The announce address for TCP.
-     */
-    tcpAnnounceAddress?: string;
-    /**
-     * The announce address for UDP.
-     */
-    udpAnnounceAddress?: string;
-    /**
-     * The listen address for TCP.
-     */
-    tcpListenAddress: string;
-    /**
-     * The listen address for UDP.
-     */
-    udpListenAddress: string;
-    /**
-     * An optional peer id private key. If blank, will generate a random key.
-     */
-    peerIdPrivateKey?: string;
-    /**
-     * A list of bootstrap peers to connect to.
-     */
+    /** The port for the P2P service. */
+    p2pPort: number;
+    /** The port to broadcast the P2P service on (included in the node's ENR). */
+    p2pBroadcastPort?: number;
+    /** The IP address for the P2P service. */
+    p2pIp?: string;
+    /** The listen address. */
+    listenAddress: string;
+    /** An optional peer id private key. If blank, will generate a random key. */
+    peerIdPrivateKey?: SecretValue<string>;
+    /** An optional path to store generated peer id private keys. If blank, will default to storing any generated keys in the data directory. */
+    peerIdPrivateKeyPath?: string;
+    /** A list of bootstrap peers to connect to. */
     bootstrapNodes: string[];
     /** Whether to execute the version check in the bootstrap node ENR. */
     bootstrapNodeEnrVersionCheck: boolean;
     /** Whether to consider any configured bootnodes as full peers, e.g. for transaction gossiping */
     bootstrapNodesAsFullPeers: boolean;
-    /**
-     * The maximum number of peers (a peer count above this will cause the node to refuse connection attempts)
-     */
+    /** The maximum number of peers (a peer count above this will cause the node to refuse connection attempts) */
     maxPeerCount: number;
-    /**
-     * If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false.
-     */
+    /** If announceUdpAddress or announceTcpAddress are not provided, query for the IP address of the machine. Default is false. */
     queryForIp: boolean;
-    /** How many blocks have to pass after a block is proven before its txs are deleted (zero to delete immediately once proven) */
-    keepProvenTxsInPoolFor: number;
-    /** How many slots to keep attestations for. */
-    keepAttestationsInPoolFor: number;
-    /**
-     * The interval of the gossipsub heartbeat to perform maintenance tasks.
-     */
+    /** The interval of the gossipsub heartbeat to perform maintenance tasks. */
     gossipsubInterval: number;
-    /**
-     * The D parameter for the gossipsub protocol.
-     */
+    /** The D parameter for the gossipsub protocol. */
     gossipsubD: number;
-    /**
-     * The Dlo parameter for the gossipsub protocol.
-     */
+    /** The Dlo parameter for the gossipsub protocol. */
     gossipsubDlo: number;
-    /**
-     * The Dhi parameter for the gossipsub protocol.
-     */
+    /** The Dhi parameter for the gossipsub protocol. */
     gossipsubDhi: number;
-    /**
-     * The Dlazy parameter for the gossipsub protocol.
-     */
+    /** The Dlazy parameter for the gossipsub protocol. */
     gossipsubDLazy: number;
-    /**
-     * Whether to flood publish messages. - For testing purposes only
-     */
+    /** Whether to flood publish messages. - For testing purposes only */
     gossipsubFloodPublish: boolean;
-    /**
-     * The number of gossipsub interval message cache windows to keep.
-     */
+    /** The number of gossipsub interval message cache windows to keep. */
     gossipsubMcacheLength: number;
-    /**
-     * How many message cache windows to include when gossiping with other pears.
-     */
+    /** How many message cache windows to include when gossiping with other pears. */
     gossipsubMcacheGossip: number;
-    /**
-     * The 'age' (in # of L2 blocks) of a processed tx after which we heavily penalize a peer for re-sending it.
-     */
+    /** How long to keep message IDs in the seen cache (ms). */
+    gossipsubSeenTTL: number;
+    /** The 'age' (in # of L2 blocks) of a processed tx after which we heavily penalize a peer for re-sending it. */
     doubleSpendSeverePeerPenaltyWindow: number;
-    /**
-     * The weight of the tx topic for the gossipsub protocol.  This determines how much the score for this specific topic contributes to the overall peer score.
-     */
+    /** The weight of the tx topic for the gossipsub protocol.  This determines how much the score for this specific topic contributes to the overall peer score. */
     gossipsubTxTopicWeight: number;
-    /**
-     * This is the weight applied to the penalty for delivering invalid messages.
-     */
+    /** This is the weight applied to the penalty for delivering invalid messages. */
     gossipsubTxInvalidMessageDeliveriesWeight: number;
-    /**
-     * determines how quickly the penalty for invalid message deliveries decays over time. Between 0 and 1.
-     */
+    /** determines how quickly the penalty for invalid message deliveries decays over time. Between 0 and 1. */
     gossipsubTxInvalidMessageDeliveriesDecay: number;
-    /**
-     * The values for the peer scoring system. Passed as a comma separated list of values in order: low, mid, high tolerance errors.
-     */
+    /** The values for the peer scoring system. Passed as a comma separated list of values in order: low, mid, high tolerance errors. */
     peerPenaltyValues: number[];
     /** Limit of transactions to archive in the tx pool. Once the archived tx limit is reached, the oldest archived txs will be purged. */
     archivedTxLimit: number;
+    /** A list of trusted peers. */
+    trustedPeers: string[];
+    /** A list of private peers. */
+    privatePeers: string[];
+    /** A list of preferred peers. */
+    preferredPeers: string[];
+    /** The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb. */
+    p2pStoreMapSizeKb?: number;
+    /** Which calls are allowed in the public setup phase of a tx. */
+    txPublicSetupAllowList: AllowedElement[];
+    /** The maximum cumulative tx size (in bytes) of pending txs before evicting lower priority txs. */
+    maxTxPoolSize: number;
+    /** If the pool is full, it will still accept a few more txs until it reached maxTxPoolOverspillFactor * maxTxPoolSize. Then it will evict */
+    txPoolOverflowFactor: number;
+    /** The node's seen message ID cache size */
+    seenMessageCacheSize: number;
+    /** True to disable the status handshake on peer connected. */
+    p2pDisableStatusHandshake?: boolean;
+    /** True to only permit validators to connect */
+    p2pAllowOnlyValidators?: boolean;
+    /** True to disable participating in discovery */
+    p2pDiscoveryDisabled?: boolean;
+    /** Number of auth attempts to allow before peer is banned. Number is inclusive*/
+    p2pMaxFailedAuthAttemptsAllowed: number;
+    /** Whether transactions are disabled for this node. This means transactions will be rejected at the RPC and P2P layers. */
+    disableTransactions: boolean;
+    /** True to simulate discarding transactions. - For testing purposes only*/
+    dropTransactions: boolean;
+    /** The probability that a transaction is discarded. - For testing purposes only */
+    dropTransactionsProbability: number;
+    /** Whether to delete transactions from the pool after a reorg instead of moving them back to pending. */
+    txPoolDeleteTxsAfterReorg: boolean;
 }
+export declare const DEFAULT_P2P_PORT = 40400;
 export declare const p2pConfigMappings: ConfigMappingsType<P2PConfig>;
 /**
  * Gets the config values for p2p client from environment variables.
@@ -135,33 +115,44 @@ export declare function getP2PDefaultConfig(): P2PConfig;
 /**
  * Required P2P config values for a bootstrap node.
  */
-export type BootnodeConfig = Pick<P2PConfig, 'udpAnnounceAddress' | 'peerIdPrivateKey' | 'bootstrapNodes'> & Required<Pick<P2PConfig, 'udpListenAddress'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKB'> & Pick<ChainConfig, 'l1ChainId'>;
+export type BootnodeConfig = Pick<P2PConfig, 'p2pIp' | 'p2pPort' | 'p2pBroadcastPort' | 'peerIdPrivateKey' | 'peerIdPrivateKeyPath' | 'bootstrapNodes' | 'listenAddress' | 'queryForIp'> & Required<Pick<P2PConfig, 'p2pIp' | 'p2pPort'>> & Pick<DataStoreConfig, 'dataDirectory' | 'dataStoreMapSizeKb'> & Pick<ChainConfig, 'l1ChainId'>;
 export declare const bootnodeConfigMappings: ConfigMappingsType<Pick<{
     l1ChainId: unknown;
-    version: unknown;
+    rollupVersion: unknown;
     l1Contracts: unknown;
     dataDirectory: unknown;
-    dataStoreMapSizeKB: unknown;
+    dataStoreMapSizeKb: unknown;
     overallRequestTimeoutMs: unknown;
     individualRequestTimeoutMs: unknown;
+    p2pOptimisticNegotiation: unknown;
+    dialTimeoutMs: unknown;
+    txCollectionFastNodesTimeoutBeforeReqRespMs: unknown;
+    txCollectionSlowNodesIntervalMs: unknown;
+    txCollectionSlowReqRespIntervalMs: unknown;
+    txCollectionSlowReqRespTimeoutMs: unknown;
+    txCollectionReconcileIntervalMs: unknown;
+    txCollectionDisableSlowDuringFastRequests: unknown;
+    txCollectionFastNodeIntervalMs: unknown;
+    txCollectionNodeRpcUrls: unknown;
+    txCollectionFastMaxParallelRequestsPerNode: unknown;
+    txCollectionNodeRpcMaxBatchSize: unknown;
     p2pEnabled: unknown;
     blockCheckIntervalMS: unknown;
     blockRequestBatchSize: unknown;
     debugDisableColocationPenalty: unknown;
     peerCheckIntervalMS: unknown;
     l2QueueSize: unknown;
-    tcpAnnounceAddress: unknown;
-    udpAnnounceAddress: unknown;
-    tcpListenAddress: unknown;
-    udpListenAddress: unknown;
+    p2pPort: unknown;
+    p2pBroadcastPort: unknown;
+    p2pIp: unknown;
+    listenAddress: unknown;
     peerIdPrivateKey: unknown;
+    peerIdPrivateKeyPath: unknown;
     bootstrapNodes: unknown;
     bootstrapNodeEnrVersionCheck: unknown;
     bootstrapNodesAsFullPeers: unknown;
     maxPeerCount: unknown;
     queryForIp: unknown;
-    keepProvenTxsInPoolFor: unknown;
-    keepAttestationsInPoolFor: unknown;
     gossipsubInterval: unknown;
     gossipsubD: unknown;
     gossipsubDlo: unknown;
@@ -170,11 +161,40 @@ export declare const bootnodeConfigMappings: ConfigMappingsType<Pick<{
     gossipsubFloodPublish: unknown;
     gossipsubMcacheLength: unknown;
     gossipsubMcacheGossip: unknown;
+    gossipsubSeenTTL: unknown;
     doubleSpendSeverePeerPenaltyWindow: unknown;
     gossipsubTxTopicWeight: unknown;
     gossipsubTxInvalidMessageDeliveriesWeight: unknown;
     gossipsubTxInvalidMessageDeliveriesDecay: unknown;
     peerPenaltyValues: unknown;
     archivedTxLimit: unknown;
-}, "udpAnnounceAddress" | "udpListenAddress" | "peerIdPrivateKey" | "bootstrapNodes" | "l1ChainId" | "dataDirectory" | "dataStoreMapSizeKB">>;
+    trustedPeers: unknown;
+    privatePeers: unknown;
+    preferredPeers: unknown;
+    p2pStoreMapSizeKb: unknown;
+    txPublicSetupAllowList: unknown;
+    maxTxPoolSize: unknown;
+    txPoolOverflowFactor: unknown;
+    seenMessageCacheSize: unknown;
+    p2pDisableStatusHandshake: unknown;
+    p2pAllowOnlyValidators: unknown;
+    p2pDiscoveryDisabled: unknown;
+    p2pMaxFailedAuthAttemptsAllowed: unknown;
+    disableTransactions: unknown;
+    dropTransactions: unknown;
+    dropTransactionsProbability: unknown;
+    txPoolDeleteTxsAfterReorg: unknown;
+}, "p2pPort" | "p2pBroadcastPort" | "p2pIp" | "listenAddress" | "peerIdPrivateKey" | "peerIdPrivateKeyPath" | "bootstrapNodes" | "queryForIp" | "l1ChainId" | "dataDirectory" | "dataStoreMapSizeKb">>;
+/**
+ * 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}`
+ *
+ * @param value The string to parse
+ * @returns A list of allowed elements
+ */
+export declare function parseAllowList(value: string): AllowedElement[];
 //# sourceMappingURL=config.d.ts.map

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,wBAAwB,CAAC;AAClF,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,sBAAsB,CAAC;AAE7E,OAAO,EAAE,KAAK,gBAAgB,EAA4B,MAAM,8BAA8B,CAAC;AAE/F;;GAEG;AACH,MAAM,WAAW,SAAU,SAAQ,gBAAgB,EAAE,WAAW;IAC9D;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,6BAA6B,EAAE,OAAO,CAAC;IAEvC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IAEzB,sEAAsE;IACtE,4BAA4B,EAAE,OAAO,CAAC;IAEtC,iGAAiG;IACjG,yBAAyB,EAAE,OAAO,CAAC;IAEnC;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB,+HAA+H;IAC/H,sBAAsB,EAAE,MAAM,CAAC;IAE/B,+CAA+C;IAC/C,yBAAyB,EAAE,MAAM,CAAC;IAElC;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,qBAAqB,EAAE,OAAO,CAAC;IAE/B;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,kCAAkC,EAAE,MAAM,CAAC;IAE3C;;OAEG;IACH,sBAAsB,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,yCAAyC,EAAE,MAAM,CAAC;IAElD;;OAEG;IACH,wCAAwC,EAAE,MAAM,CAAC;IAEjD;;OAEG;IACH,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAE5B,sIAAsI;IACtI,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,iBAAiB,EAAE,kBAAkB,CAAC,SAAS,CAuK3D,CAAC;AAEF;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED,wBAAgB,mBAAmB,IAAI,SAAS,CAE/C;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,oBAAoB,GAAG,kBAAkB,GAAG,gBAAgB,CAAC,GACxG,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC,GAC7C,IAAI,CAAC,eAAe,EAAE,eAAe,GAAG,oBAAoB,CAAC,GAC7D,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAYjC,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6IAGlC,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dest/config.js

@@ -1,13 +1,23 @@
-import { booleanConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, pickConfigMappings } from '@aztec/foundation/config';
+import { booleanConfigHelper, floatConfigHelper, getConfigFromMappings, getDefaultConfig, numberConfigHelper, pickConfigMappings, secretStringConfigHelper } from '@aztec/foundation/config';
+import { Fr } from '@aztec/foundation/fields';
 import { dataConfigMappings } from '@aztec/kv-store/config';
+import { FunctionSelector } from '@aztec/stdlib/abi';
+import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import { chainConfigMappings } from '@aztec/stdlib/config';
 import { p2pReqRespConfigMappings } from './services/reqresp/config.js';
+import { txCollectionConfigMappings } from './services/tx_collection/config.js';
+export const DEFAULT_P2P_PORT = 40400;
 export const p2pConfigMappings = {
     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.',
@@ -28,32 +38,38 @@ export const p2pConfigMappings = {
         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,16 +91,6 @@ 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)
-    },
     gossipsubInterval: {
         env: 'P2P_GOSSIPSUB_INTERVAL_MS',
         description: 'The interval of the gossipsub heartbeat to perform maintenance tasks.',
@@ -113,7 +119,7 @@ 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',
@@ -122,9 +128,14 @@ export const p2pConfigMappings = {
     },
     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 +176,88 @@ 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',
+        parseEnv: (val)=>val ? +val : undefined,
+        description: 'The maximum possible size of the P2P DB in KB. Overwrites the general dataStoreMapSizeKb.'
+    },
+    txPublicSetupAllowList: {
+        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'
+    },
+    maxTxPoolSize: {
+        env: 'P2P_MAX_TX_POOL_SIZE',
+        description: 'The maximum cumulative tx size of pending txs (in bytes) before evicting lower priority txs.',
+        ...numberConfigHelper(100_000_000)
+    },
+    txPoolOverflowFactor: {
+        env: 'P2P_TX_POOL_OVERFLOW_FACTOR',
+        description: 'How much the tx pool can overflow before it starts evicting txs. Must be greater than 1',
+        ...floatConfigHelper(1.1)
+    },
+    seenMessageCacheSize: {
+        env: 'P2P_SEEN_MSG_CACHE_SIZE',
+        description: 'The number of messages to keep in the seen message cache',
+        ...numberConfigHelper(100_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)
+    },
+    dropTransactions: {
+        env: 'P2P_DROP_TX',
+        description: 'True to simulate discarding transactions. - For testing purposes only',
+        ...booleanConfigHelper(false)
+    },
+    dropTransactionsProbability: {
+        env: 'P2P_DROP_TX_CHANCE',
+        description: 'The probability that a transaction is discarded. - For testing purposes only',
+        ...floatConfigHelper(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)
+    },
     ...p2pReqRespConfigMappings,
-    ...chainConfigMappings
+    ...chainConfigMappings,
+    ...txCollectionConfigMappings
 };
 /**
  * Gets the config values for p2p client from environment variables.
@@ -178,16 +269,64 @@ export function getP2PDefaultConfig() {
     return getDefaultConfig(p2pConfigMappings);
 }
 const bootnodeConfigKeys = [
-    'udpAnnounceAddress',
+    'p2pIp',
+    'p2pPort',
+    'p2pBroadcastPort',
+    'listenAddress',
     'peerIdPrivateKey',
-    'udpListenAddress',
+    'peerIdPrivateKeyPath',
     'dataDirectory',
-    'dataStoreMapSizeKB',
+    'dataStoreMapSizeKb',
     'bootstrapNodes',
-    'l1ChainId'
+    'l1ChainId',
+    'queryForIp'
 ];
 export const bootnodeConfigMappings = pickConfigMappings({
     ...p2pConfigMappings,
     ...dataConfigMappings,
     ...chainConfigMappings
 }, bootnodeConfigKeys);
+/**
+ * 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}`
+ *
+ * @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 [typeString, identifierString, selectorString] = val.split(':');
+        const selector = selectorString !== undefined ? FunctionSelector.fromString(selectorString) : undefined;
+        if (typeString === 'I') {
+            if (selector) {
+                entries.push({
+                    address: AztecAddress.fromString(identifierString),
+                    selector
+                });
+            } else {
+                entries.push({
+                    address: AztecAddress.fromString(identifierString)
+                });
+            }
+        } else if (typeString === 'C') {
+            if (selector) {
+                entries.push({
+                    classId: Fr.fromHexString(identifierString),
+                    selector
+                });
+            } else {
+                entries.push({
+                    classId: Fr.fromHexString(identifierString)
+                });
+            }
+        }
+    }
+    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

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"}