Skip to content

Commit 26f3d4d

Browse files
PhilWindlePhilWindle
authored
chore: Backport prover resource changes (#17939)
2 parents dbf7a1b + 8f6798a commit 26f3d4d

File tree

6 files changed

+66
-44
lines changed

6 files changed

+66
-44
lines changed

‎spartan/environments/staging-public.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ SEQ_MIN_TX_PER_BLOCK=0
2626
SEQ_MAX_TX_PER_BLOCK=1
2727
PROVER_REPLICAS=8
2828

29+
P2P_TX_POOL_DELETE_TXS_AFTER_REORG=true
30+
2931
VALIDATOR_REPLICAS=5
3032
VALIDATORS_PER_NODE=16
3133
PUBLISHERS_PER_VALIDATOR_KEY=2

‎spartan/environments/testnet.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ BOT_TRANSFERS_REPLICAS=0
2929
BOT_SWAPS_REPLICAS=0
3030
FLUSH_ENTRY_QUEUE=false
3131

32+
P2P_TX_POOL_DELETE_TXS_AFTER_REORG=true
33+
3234
DEPLOY_ARCHIVAL_NODE=true
3335

3436
RPC_INGRESS_ENABLED=true

‎spartan/scripts/deploy_network.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ RPC_REPLICAS=${RPC_REPLICAS:-1}
100100
FLUSH_ENTRY_QUEUE=${FLUSH_ENTRY_QUEUE:-true}
101101

102102
PROVER_NODE_DISABLE_PROOF_PUBLISH=${PROVER_NODE_DISABLE_PROOF_PUBLISH:-false}
103+
P2P_TX_POOL_DELETE_TXS_AFTER_REORG=${P2P_TX_POOL_DELETE_TXS_AFTER_REORG:-false}
103104

104105
########################
105106
# CHAOS MESH VARIABLES
@@ -382,6 +383,7 @@ DEPLOY_ARCHIVAL_NODE = ${DEPLOY_ARCHIVAL_NODE}
382383
PROVER_REPLICAS = ${PROVER_REPLICAS}
383384
384385
PROVER_NODE_DISABLE_PROOF_PUBLISH = ${PROVER_NODE_DISABLE_PROOF_PUBLISH}
386+
P2P_TX_POOL_DELETE_TXS_AFTER_REORG = ${P2P_TX_POOL_DELETE_TXS_AFTER_REORG}
385387
EOF
386388

387389
tf_run "${DEPLOY_AZTEC_INFRA_DIR}" "${DESTROY_AZTEC_INFRA}" "${CREATE_AZTEC_INFRA}"

‎spartan/terraform/deploy-aztec-infra/main.tf‎

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -132,36 +132,37 @@ locals {
132132
"validator-resources-${var.VALIDATOR_RESOURCE_PROFILE}.yaml"
133133
]
134134
custom_settings = {
135-
"validator.web3signerUrl" = "http://${var.RELEASE_PREFIX}-signer-web3signer.${var.NAMESPACE}.svc.cluster.local:9000/"
136-
"validator.mnemonic" = var.VALIDATOR_MNEMONIC
137-
"validator.mnemonicStartIndex" = var.VALIDATOR_MNEMONIC_START_INDEX
138-
"validator.validatorsPerNode" = var.VALIDATORS_PER_NODE
139-
"validator.publishersPerValidatorKey" = var.VALIDATOR_PUBLISHERS_PER_VALIDATOR_KEY
140-
"validator.publisherMnemonicStartIndex" = var.VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX
141-
"validator.replicaCount" = var.VALIDATOR_REPLICAS
142-
"validator.sentinel.enabled" = var.SENTINEL_ENABLED
143-
"validator.slash.minPenaltyPercentage" = var.SLASH_MIN_PENALTY_PERCENTAGE
144-
"validator.slash.maxPenaltyPercentage" = var.SLASH_MAX_PENALTY_PERCENTAGE
145-
"validator.slash.inactivityTargetPercentage" = var.SLASH_INACTIVITY_TARGET_PERCENTAGE
146-
"validator.slash.inactivityPenalty" = var.SLASH_INACTIVITY_PENALTY
147-
"validator.slash.prunePenalty" = var.SLASH_PRUNE_PENALTY
148-
"validator.slash.dataWithholdingPenalty" = var.SLASH_DATA_WITHHOLDING_PENALTY
149-
"validator.slash.proposeInvalidAttestationsPenalty" = var.SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY
150-
"validator.slash.attestDescendantOfInvalidPenalty" = var.SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY
151-
"validator.slash.unknownPenalty" = var.SLASH_UNKNOWN_PENALTY
152-
"validator.slash.invalidBlockPenalty" = var.SLASH_INVALID_BLOCK_PENALTY
153-
"validator.slash.offenseExpirationRounds" = var.SLASH_OFFENSE_EXPIRATION_ROUNDS
154-
"validator.slash.maxPayloadSize" = var.SLASH_MAX_PAYLOAD_SIZE
155-
"validator.node.env.TRANSACTIONS_DISABLED" = var.TRANSACTIONS_DISABLED
156-
"validator.node.env.NETWORK" = var.NETWORK
157-
"validator.node.env.KEY_INDEX_START" = var.VALIDATOR_MNEMONIC_START_INDEX
158-
"validator.node.env.PUBLISHER_KEY_INDEX_START" = var.VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX
159-
"validator.node.env.VALIDATORS_PER_NODE" = var.VALIDATORS_PER_NODE
160-
"validator.node.env.PUBLISHERS_PER_VALIDATOR_KEY" = var.VALIDATOR_PUBLISHERS_PER_VALIDATOR_KEY
161-
"validator.node.proverRealProofs" = var.PROVER_REAL_PROOFS
162-
"validator.node.env.SEQ_MIN_TX_PER_BLOCK" = var.SEQ_MIN_TX_PER_BLOCK
163-
"validator.node.env.SEQ_MAX_TX_PER_BLOCK" = var.SEQ_MAX_TX_PER_BLOCK
164-
"validator.node.proverRealProofs" = var.PROVER_REAL_PROOFS
135+
"validator.web3signerUrl" = "http://${var.RELEASE_PREFIX}-signer-web3signer.${var.NAMESPACE}.svc.cluster.local:9000/"
136+
"validator.mnemonic" = var.VALIDATOR_MNEMONIC
137+
"validator.mnemonicStartIndex" = var.VALIDATOR_MNEMONIC_START_INDEX
138+
"validator.validatorsPerNode" = var.VALIDATORS_PER_NODE
139+
"validator.publishersPerValidatorKey" = var.VALIDATOR_PUBLISHERS_PER_VALIDATOR_KEY
140+
"validator.publisherMnemonicStartIndex" = var.VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX
141+
"validator.replicaCount" = var.VALIDATOR_REPLICAS
142+
"validator.sentinel.enabled" = var.SENTINEL_ENABLED
143+
"validator.slash.minPenaltyPercentage" = var.SLASH_MIN_PENALTY_PERCENTAGE
144+
"validator.slash.maxPenaltyPercentage" = var.SLASH_MAX_PENALTY_PERCENTAGE
145+
"validator.slash.inactivityTargetPercentage" = var.SLASH_INACTIVITY_TARGET_PERCENTAGE
146+
"validator.slash.inactivityPenalty" = var.SLASH_INACTIVITY_PENALTY
147+
"validator.slash.prunePenalty" = var.SLASH_PRUNE_PENALTY
148+
"validator.slash.dataWithholdingPenalty" = var.SLASH_DATA_WITHHOLDING_PENALTY
149+
"validator.slash.proposeInvalidAttestationsPenalty" = var.SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY
150+
"validator.slash.attestDescendantOfInvalidPenalty" = var.SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY
151+
"validator.slash.unknownPenalty" = var.SLASH_UNKNOWN_PENALTY
152+
"validator.slash.invalidBlockPenalty" = var.SLASH_INVALID_BLOCK_PENALTY
153+
"validator.slash.offenseExpirationRounds" = var.SLASH_OFFENSE_EXPIRATION_ROUNDS
154+
"validator.slash.maxPayloadSize" = var.SLASH_MAX_PAYLOAD_SIZE
155+
"validator.node.env.TRANSACTIONS_DISABLED" = var.TRANSACTIONS_DISABLED
156+
"validator.node.env.NETWORK" = var.NETWORK
157+
"validator.node.env.KEY_INDEX_START" = var.VALIDATOR_MNEMONIC_START_INDEX
158+
"validator.node.env.PUBLISHER_KEY_INDEX_START" = var.VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX
159+
"validator.node.env.VALIDATORS_PER_NODE" = var.VALIDATORS_PER_NODE
160+
"validator.node.env.PUBLISHERS_PER_VALIDATOR_KEY" = var.VALIDATOR_PUBLISHERS_PER_VALIDATOR_KEY
161+
"validator.node.proverRealProofs" = var.PROVER_REAL_PROOFS
162+
"validator.node.env.SEQ_MIN_TX_PER_BLOCK" = var.SEQ_MIN_TX_PER_BLOCK
163+
"validator.node.env.SEQ_MAX_TX_PER_BLOCK" = var.SEQ_MAX_TX_PER_BLOCK
164+
"validator.node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
165+
"validator.node.proverRealProofs" = var.PROVER_REAL_PROOFS
165166
}
166167
boot_node_host_path = "validator.node.env.BOOT_NODE_HOST"
167168
bootstrap_nodes_path = "validator.node.env.BOOTSTRAP_NODES"
@@ -194,6 +195,7 @@ locals {
194195
"agent.node.env.NETWORK" = var.NETWORK
195196
"agent.replicaCount" = var.PROVER_REPLICAS
196197
"agent.node.env.BOOTSTRAP_NODES" = "asdf"
198+
"agent.node.env.AGENT_COUNT" = var.PROVER_AGENTS_PER_PROVER
197199
}
198200
boot_node_host_path = "node.node.env.BOOT_NODE_HOST"
199201
bootstrap_nodes_path = "node.node.env.BOOTSTRAP_NODES"
@@ -231,14 +233,15 @@ locals {
231233
}
232234
})] : []
233235
custom_settings = {
234-
"nodeType" = "rpc"
235-
"replicaCount" = var.RPC_REPLICAS
236-
"node.env.NETWORK" = var.NETWORK
237-
"node.proverRealProofs" = var.PROVER_REAL_PROOFS
238-
"ingress.rpc.enabled" = var.RPC_INGRESS_ENABLED
239-
"ingress.rpc.host" = var.RPC_INGRESS_HOST
240-
"node.env.AWS_ACCESS_KEY_ID" = var.R2_ACCESS_KEY_ID
241-
"node.env.AWS_SECRET_ACCESS_KEY" = var.R2_SECRET_ACCESS_KEY
236+
"nodeType" = "rpc"
237+
"replicaCount" = var.RPC_REPLICAS
238+
"node.env.NETWORK" = var.NETWORK
239+
"node.proverRealProofs" = var.PROVER_REAL_PROOFS
240+
"ingress.rpc.enabled" = var.RPC_INGRESS_ENABLED
241+
"ingress.rpc.host" = var.RPC_INGRESS_HOST
242+
"node.env.AWS_ACCESS_KEY_ID" = var.R2_ACCESS_KEY_ID
243+
"node.env.AWS_SECRET_ACCESS_KEY" = var.R2_SECRET_ACCESS_KEY
244+
"node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
242245
}
243246
boot_node_host_path = "node.env.BOOT_NODE_HOST"
244247
bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"
@@ -254,9 +257,10 @@ locals {
254257
"archive-resources-dev.yaml"
255258
]
256259
custom_settings = {
257-
"nodeType" = "archive"
258-
"node.env.NETWORK" = var.NETWORK
259-
"node.env.P2P_ARCHIVED_TX_LIMIT" = "10000000"
260+
"nodeType" = "archive"
261+
"node.env.NETWORK" = var.NETWORK
262+
"node.env.P2P_ARCHIVED_TX_LIMIT" = "10000000"
263+
"node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
260264
}
261265
boot_node_host_path = "node.env.BOOT_NODE_HOST"
262266
bootstrap_nodes_path = "node.env.BOOTSTRAP_NODES"

‎spartan/terraform/deploy-aztec-infra/values/prover-resources-prod.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ agent:
6666

6767
node:
6868
env:
69-
HARDWARE_CONCURRENCY: "15"
69+
HARDWARE_CONCURRENCY: "31"
7070
resources:
7171
requests:
72-
memory: "60Gi"
73-
cpu: "15"
72+
memory: "115Gi"
73+
cpu: "31"
7474

7575
affinity:
7676
nodeAffinity:

‎spartan/terraform/deploy-aztec-infra/variables.tf‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,3 +482,15 @@ variable "RPC_REPLICAS" {
482482
type = string
483483
default = 1
484484
}
485+
486+
variable "P2P_TX_POOL_DELETE_TXS_AFTER_REORG" {
487+
description = "Whether to delete transactions from the P2P transaction pool after a reorg"
488+
type = bool
489+
default = false
490+
}
491+
492+
variable "PROVER_AGENTS_PER_PROVER" {
493+
description = "Number of prover agents per prover"
494+
type = string
495+
default = 1
496+
}

0 commit comments

Comments
 (0)