From 54b501921db07761db458249350ac77652dd7d92 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Wed, 16 Apr 2025 16:26:17 +0100 Subject: [PATCH 1/3] feat: expose mempool limit through helm chart (#13616) --- spartan/aztec-network/templates/boot-node.yaml | 2 ++ spartan/aztec-network/templates/full-node.yaml | 2 ++ spartan/aztec-network/templates/prover-node.yaml | 2 ++ spartan/aztec-network/templates/validator.yaml | 2 ++ spartan/aztec-network/values.yaml | 2 ++ spartan/aztec-network/values/rc-1.yaml | 1 + 6 files changed, 11 insertions(+) diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml index bdce9e48b3d4..3967b6acfb35 100644 --- a/spartan/aztec-network/templates/boot-node.yaml +++ b/spartan/aztec-network/templates/boot-node.yaml @@ -177,6 +177,8 @@ spec: value: "{{ .Values.bootNode.p2p.enabled }}" - name: P2P_GOSSIPSUB_FLOOD_PUBLISH value: "{{ .Values.bootNode.p2p.floodPublish }}" + - name: P2P_MAX_TX_POOL_SIZE + value: "{{ .Values.network.mempoolLimitBytes }}" - name: COINBASE value: "{{ .Values.bootNode.coinbaseAddress }}" - name: VALIDATOR_DISABLED diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml index 398aa9780962..2156b2d33aaf 100644 --- a/spartan/aztec-network/templates/full-node.yaml +++ b/spartan/aztec-network/templates/full-node.yaml @@ -110,6 +110,8 @@ spec: value: "1" - name: P2P_ENABLED value: "{{ .Values.fullNode.p2p.enabled }}" + - name: P2P_MAX_TX_POOL_SIZE + value: "{{ .Values.network.mempoolLimitBytes }}" - name: P2P_GOSSIPSUB_FLOOD_PUBLISH value: "{{ .Values.fullNode.p2p.floodPublish }}" - name: COINBASE diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml index 5decc31384e8..7191cbd0b48a 100644 --- a/spartan/aztec-network/templates/prover-node.yaml +++ b/spartan/aztec-network/templates/prover-node.yaml @@ -160,6 +160,8 @@ spec: value: {{ .Values.proverNode.l1GasPriceMax | quote }} - name: P2P_ENABLED value: "{{ .Values.proverNode.p2p.enabled }}" + - name: P2P_MAX_TX_POOL_SIZE + value: "{{ .Values.network.mempoolLimitBytes }}" - name: P2P_GOSSIPSUB_FLOOD_PUBLISH value: "{{ .Values.proverNode.p2p.floodPublish }}" - name: P2P_PORT diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml index 3c0c76a961a8..518cb7f6cf0f 100644 --- a/spartan/aztec-network/templates/validator.yaml +++ b/spartan/aztec-network/templates/validator.yaml @@ -121,6 +121,8 @@ spec: value: "1" - name: P2P_ENABLED value: "{{ .Values.validator.p2p.enabled }}" + - name: P2P_MAX_TX_POOL_SIZE + value: "{{ .Values.network.mempoolLimitBytes }}" - name: P2P_GOSSIPSUB_FLOOD_PUBLISH value: "{{ .Values.validator.p2p.floodPublish }}" - name: VALIDATOR_DISABLED diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 54d14ba3f821..afc69d013202 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -17,6 +17,8 @@ network: # If true then configured bootnodes are considered non-gossiping peers p2pBootstrapNodesAsFullPeers: true + mempoolLimitBytes: 100000000 # approx 100MB + storage: localSsd: false dataStoreMapSize: "134217728" # 128 GB diff --git a/spartan/aztec-network/values/rc-1.yaml b/spartan/aztec-network/values/rc-1.yaml index 57b0ce89ae1e..716ced85c086 100644 --- a/spartan/aztec-network/values/rc-1.yaml +++ b/spartan/aztec-network/values/rc-1.yaml @@ -1,5 +1,6 @@ network: public: true + mempoolLimitBytes: 1000000 # approx 1MB aztec: slotDuration: 36 From cb990dbbc67953b19066f5801529d2da96328bc1 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Sat, 19 Apr 2025 13:06:11 +0100 Subject: [PATCH 2/3] fix: quote numbers (#13654) --- spartan/aztec-network/values.yaml | 2 +- spartan/aztec-network/values/rc-1.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index afc69d013202..4acc40115b16 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -17,7 +17,7 @@ network: # If true then configured bootnodes are considered non-gossiping peers p2pBootstrapNodesAsFullPeers: true - mempoolLimitBytes: 100000000 # approx 100MB + mempoolLimitBytes: "100000000" # approx 100MB storage: localSsd: false diff --git a/spartan/aztec-network/values/rc-1.yaml b/spartan/aztec-network/values/rc-1.yaml index 716ced85c086..287e04010c60 100644 --- a/spartan/aztec-network/values/rc-1.yaml +++ b/spartan/aztec-network/values/rc-1.yaml @@ -1,6 +1,6 @@ network: public: true - mempoolLimitBytes: 1000000 # approx 1MB + mempoolLimitBytes: "10000000" # approx 10MB aztec: slotDuration: 36 From 787838b7da6984e6835e9b10a0bb4bb37bb9101e Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Mon, 28 Apr 2025 10:07:36 +0000 Subject: [PATCH 3/3] feat: add default tx pool size --- yarn-project/aztec/src/cli/chain_l2_config.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/yarn-project/aztec/src/cli/chain_l2_config.ts b/yarn-project/aztec/src/cli/chain_l2_config.ts index 52755e6b8586..636650835748 100644 --- a/yarn-project/aztec/src/cli/chain_l2_config.ts +++ b/yarn-project/aztec/src/cli/chain_l2_config.ts @@ -22,6 +22,7 @@ export type L2ChainConfig = { seqMaxTxsPerBlock: number; realProofs: boolean; snapshotsUrl: string; + maxTxPoolSize: number; }; export const testnetIgnitionL2ChainConfig: L2ChainConfig = { @@ -41,6 +42,7 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = { seqMaxTxsPerBlock: 0, realProofs: true, snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/', + maxTxPoolSize: 100_000_000, }; export const alphaTestnetL2ChainConfig: L2ChainConfig = { @@ -60,6 +62,7 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = { seqMaxTxsPerBlock: 4, realProofs: true, snapshotsUrl: 'https://storage.googleapis.com/aztec-testnet/snapshots/', + maxTxPoolSize: 100_000_000, // approx 100mb }; export async function getBootnodes(networkName: NetworkNames) { @@ -125,6 +128,7 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames enrichVar('PROVER_REAL_PROOFS', config.realProofs.toString()); enrichVar('PXE_PROVER_ENABLED', config.realProofs.toString()); enrichVar('SYNC_SNAPSHOTS_URL', config.snapshotsUrl); + enrichVar('P2P_MAX_TX_POOL_SIZE', config.maxTxPoolSize.toString()); enrichEthAddressVar('REGISTRY_CONTRACT_ADDRESS', config.registryAddress); enrichEthAddressVar('SLASH_FACTORY_CONTRACT_ADDRESS', config.slashFactoryAddress);