From 3d3f4b1bea922ac9556dbaf8b4588f1718f1e9dd Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 10:46:54 +0000 Subject: [PATCH 01/10] Don't spam the logs --- spartan/aztec-network/templates/boot-node.yaml | 2 -- .../aztec-network/templates/prover-node.yaml | 2 -- spartan/aztec-network/templates/validator.yaml | 2 -- spartan/aztec-network/values.yaml | 17 +++++++---------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml index 62dbcab873c..f6f52b4b9b2 100644 --- a/spartan/aztec-network/templates/boot-node.yaml +++ b/spartan/aztec-network/templates/boot-node.yaml @@ -175,8 +175,6 @@ spec: value: "{{ .Values.bootNode.logLevel }}" - name: LOG_JSON value: "1" - - name: DEBUG - value: "{{ .Values.bootNode.debug }}" - name: P2P_ENABLED value: "{{ .Values.bootNode.p2p.enabled }}" - name: COINBASE diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml index 3cdfb76721c..908c30902bd 100644 --- a/spartan/aztec-network/templates/prover-node.yaml +++ b/spartan/aztec-network/templates/prover-node.yaml @@ -125,8 +125,6 @@ spec: value: "{{ .Values.proverNode.logLevel }}" - name: LOG_JSON value: "1" - - name: DEBUG - value: "{{ .Values.proverNode.debug }}" - name: PROVER_REAL_PROOFS value: "{{ .Values.aztec.realProofs }}" - name: PROVER_AGENT_COUNT diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml index bc88443986d..af782ea779e 100644 --- a/spartan/aztec-network/templates/validator.yaml +++ b/spartan/aztec-network/templates/validator.yaml @@ -162,8 +162,6 @@ spec: value: "{{ .Values.validator.logLevel }}" - name: LOG_JSON value: "1" - - name: DEBUG - value: "{{ .Values.validator.debug }}" - name: P2P_ENABLED value: "{{ .Values.validator.p2p.enabled }}" - name: VALIDATOR_DISABLED diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 26cf80bb5f7..187564d9f8c 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -45,8 +45,7 @@ bootNode: p2pTcpPort: 40400 p2pUdpPort: 40400 nodePort: 8080 - logLevel: "debug" - debug: "" + logLevel: "debug; info: aztec:simulator, json-rpc" coinbaseAddress: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" sequencer: maxSecondsBetweenBlocks: 0 @@ -90,8 +89,7 @@ validator: p2pTcpPort: 40400 p2pUdpPort: 40400 nodePort: 8080 - logLevel: "debug" - debug: "" + logLevel: "debug; info: aztec:simulator, json-rpc" sequencer: maxSecondsBetweenBlocks: 0 minTxsPerBlock: 1 @@ -122,8 +120,7 @@ proverNode: p2pTcpPort: 40400 p2pUdpPort: 40400 nodePort: 8080 - logLevel: "debug" - debug: "" + logLevel: "debug; info: aztec:simulator, json-rpc" proverAgent: count: 0 pollIntervalMs: 1000 @@ -141,7 +138,7 @@ proverNode: storage: "8Gi" pxe: - logLevel: "debug" + logLevel: "debug; info: aztec:simulator, json-rpc" replicas: 1 service: nodePort: 8081 @@ -159,7 +156,7 @@ pxe: bot: enabled: true nodeUrl: "" - logLevel: "debug" + logLevel: "debug; info: aztec:simulator, json-rpc" replicas: 1 botPrivateKey: "0xcafe" txIntervalSeconds: 24 @@ -219,7 +216,7 @@ proverAgent: proofTypes: ["foo", "bar", "baz"] gke: spotEnabled: false - logLevel: "debug" + logLevel: "debug; info: aztec:simulator, json-rpc" bb: hardwareConcurrency: "" nodeSelector: {} @@ -234,7 +231,7 @@ proverBroker: pollIntervalMs: 1000 jobMaxRetries: 3 dataDirectory: "" - logLevel: "debug" + logLevel: "debug; info: aztec:simulator, json-rpc" nodeSelector: {} resources: {} From cc7c8c295b1eb3557676030326436d249fa42e98 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 12:12:28 +0000 Subject: [PATCH 02/10] More horsepower --- spartan/aztec-network/values.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 187564d9f8c..51bdccb6953 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -57,7 +57,7 @@ bootNode: resources: requests: memory: "2Gi" - cpu: "200m" + cpu: "1.9" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -108,7 +108,7 @@ validator: resources: requests: memory: "2Gi" - cpu: "200m" + cpu: "1.9" storageSize: "1Gi" dataDir: "/data" @@ -134,7 +134,7 @@ proverNode: resources: requests: memory: "2Gi" - cpu: "200m" + cpu: "1.9" storage: "8Gi" pxe: @@ -204,7 +204,7 @@ ethereum: resources: requests: memory: "2Gi" - cpu: "200m" + cpu: "1.9" storage: "80Gi" proverAgent: @@ -233,7 +233,10 @@ proverBroker: dataDirectory: "" logLevel: "debug; info: aztec:simulator, json-rpc" nodeSelector: {} - resources: {} + resources: + requests: + memory: "2Gi" + cpu: "1.9" jobs: deployL1Verifier: From 77dc8799fc86970b1ca67e42a53f2ef2924173bb Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 13:51:13 +0000 Subject: [PATCH 03/10] More horsepower --- spartan/aztec-network/values.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 51bdccb6953..4f15aa72245 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -56,8 +56,8 @@ bootNode: enabled: "true" resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -107,8 +107,8 @@ validator: failureThreshold: 120 resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" storageSize: "1Gi" dataDir: "/data" @@ -133,8 +133,8 @@ proverNode: dataDirectory: "" resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" storage: "8Gi" pxe: @@ -203,8 +203,8 @@ ethereum: failureThreshold: 3 resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" storage: "80Gi" proverAgent: @@ -235,8 +235,8 @@ proverBroker: nodeSelector: {} resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" jobs: deployL1Verifier: From 7acad265d49673121c557e35c3bb90da3a58d6c6 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 14:38:15 +0000 Subject: [PATCH 04/10] Revert previous change --- spartan/aztec-network/values.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 4f15aa72245..51bdccb6953 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -56,8 +56,8 @@ bootNode: enabled: "true" resources: requests: - memory: "8Gi" - cpu: "3.8" + memory: "2Gi" + cpu: "1.9" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -107,8 +107,8 @@ validator: failureThreshold: 120 resources: requests: - memory: "8Gi" - cpu: "3.8" + memory: "2Gi" + cpu: "1.9" storageSize: "1Gi" dataDir: "/data" @@ -133,8 +133,8 @@ proverNode: dataDirectory: "" resources: requests: - memory: "8Gi" - cpu: "3.8" + memory: "2Gi" + cpu: "1.9" storage: "8Gi" pxe: @@ -203,8 +203,8 @@ ethereum: failureThreshold: 3 resources: requests: - memory: "8Gi" - cpu: "3.8" + memory: "2Gi" + cpu: "1.9" storage: "80Gi" proverAgent: @@ -235,8 +235,8 @@ proverBroker: nodeSelector: {} resources: requests: - memory: "8Gi" - cpu: "3.8" + memory: "2Gi" + cpu: "1.9" jobs: deployL1Verifier: From 0e00e43182bfab4a6f8527ffad0081f216943937 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 16:14:03 +0000 Subject: [PATCH 05/10] Increase agent count --- spartan/aztec-network/values/exp-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/exp-1.yaml b/spartan/aztec-network/values/exp-1.yaml index 05247cd7722..bcb2d8c829a 100644 --- a/spartan/aztec-network/values/exp-1.yaml +++ b/spartan/aztec-network/values/exp-1.yaml @@ -131,7 +131,7 @@ bootNode: disabled: true proverAgent: - replicas: 4 + replicas: 8 bot: replicas: 6 From 347da6b040a34532d69ec79f24f4d4a1a726dd26 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 17:27:55 +0000 Subject: [PATCH 06/10] More bots --- spartan/aztec-network/values/exp-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/exp-1.yaml b/spartan/aztec-network/values/exp-1.yaml index bcb2d8c829a..cffb4508c31 100644 --- a/spartan/aztec-network/values/exp-1.yaml +++ b/spartan/aztec-network/values/exp-1.yaml @@ -134,7 +134,7 @@ proverAgent: replicas: 8 bot: - replicas: 6 + replicas: 8 followChain: "NONE" enabled: true txIntervalSeconds: 1 From 5d1779919ac9d0fd133a1324f35f31c5ea176f33 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 17:50:24 +0000 Subject: [PATCH 07/10] More bots and memory for prover components --- spartan/aztec-network/values.yaml | 4 ++-- spartan/aztec-network/values/exp-1.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 51bdccb6953..e36967c755e 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -133,7 +133,7 @@ proverNode: dataDirectory: "" resources: requests: - memory: "2Gi" + memory: "8Gi" cpu: "1.9" storage: "8Gi" @@ -235,7 +235,7 @@ proverBroker: nodeSelector: {} resources: requests: - memory: "2Gi" + memory: "8Gi" cpu: "1.9" jobs: diff --git a/spartan/aztec-network/values/exp-1.yaml b/spartan/aztec-network/values/exp-1.yaml index cffb4508c31..f6181329e49 100644 --- a/spartan/aztec-network/values/exp-1.yaml +++ b/spartan/aztec-network/values/exp-1.yaml @@ -134,7 +134,7 @@ proverAgent: replicas: 8 bot: - replicas: 8 + replicas: 10 followChain: "NONE" enabled: true txIntervalSeconds: 1 From 58c4023bee99769f7272904cd878c33ec1621821 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 18:58:56 +0000 Subject: [PATCH 08/10] More juice --- spartan/aztec-network/values.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index e36967c755e..4f15aa72245 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -56,8 +56,8 @@ bootNode: enabled: "true" resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -107,8 +107,8 @@ validator: failureThreshold: 120 resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" storageSize: "1Gi" dataDir: "/data" @@ -134,7 +134,7 @@ proverNode: resources: requests: memory: "8Gi" - cpu: "1.9" + cpu: "3.8" storage: "8Gi" pxe: @@ -203,8 +203,8 @@ ethereum: failureThreshold: 3 resources: requests: - memory: "2Gi" - cpu: "1.9" + memory: "8Gi" + cpu: "3.8" storage: "80Gi" proverAgent: @@ -236,7 +236,7 @@ proverBroker: resources: requests: memory: "8Gi" - cpu: "1.9" + cpu: "3.8" jobs: deployL1Verifier: From b1db1c2de1a5e5da5fe916be98e133f6e388892d Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 17 Dec 2024 19:46:50 +0000 Subject: [PATCH 09/10] Drop CPU allocation --- spartan/aztec-network/values.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 4f15aa72245..c0119b63d7a 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -57,7 +57,7 @@ bootNode: resources: requests: memory: "8Gi" - cpu: "3.8" + cpu: "3.5" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -108,7 +108,7 @@ validator: resources: requests: memory: "8Gi" - cpu: "3.8" + cpu: "3.5" storageSize: "1Gi" dataDir: "/data" @@ -134,7 +134,7 @@ proverNode: resources: requests: memory: "8Gi" - cpu: "3.8" + cpu: "3.5" storage: "8Gi" pxe: @@ -204,7 +204,7 @@ ethereum: resources: requests: memory: "8Gi" - cpu: "3.8" + cpu: "3.5" storage: "80Gi" proverAgent: @@ -236,7 +236,7 @@ proverBroker: resources: requests: memory: "8Gi" - cpu: "3.8" + cpu: "3.5" jobs: deployL1Verifier: From 86fc828ea82948fe3c4ceafc6b3f4c0d3891a8ea Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Wed, 18 Dec 2024 12:56:44 +0000 Subject: [PATCH 10/10] Updated values --- spartan/aztec-network/values.yaml | 20 ++++++++++---------- spartan/aztec-network/values/exp-1.yaml | 25 ++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index c0119b63d7a..bfc183f5705 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -56,8 +56,8 @@ bootNode: enabled: "true" resources: requests: - memory: "8Gi" - cpu: "3.5" + memory: "2Gi" + cpu: "200m" deployContracts: true # Set to false to use manual contract addresses startupProbe: periodSeconds: 10 @@ -107,8 +107,8 @@ validator: failureThreshold: 120 resources: requests: - memory: "8Gi" - cpu: "3.5" + memory: "2Gi" + cpu: "200m" storageSize: "1Gi" dataDir: "/data" @@ -133,8 +133,8 @@ proverNode: dataDirectory: "" resources: requests: - memory: "8Gi" - cpu: "3.5" + memory: "2Gi" + cpu: "200m" storage: "8Gi" pxe: @@ -203,8 +203,8 @@ ethereum: failureThreshold: 3 resources: requests: - memory: "8Gi" - cpu: "3.5" + memory: "2Gi" + cpu: "200m" storage: "80Gi" proverAgent: @@ -235,8 +235,8 @@ proverBroker: nodeSelector: {} resources: requests: - memory: "8Gi" - cpu: "3.5" + memory: "2Gi" + cpu: "200m" jobs: deployL1Verifier: diff --git a/spartan/aztec-network/values/exp-1.yaml b/spartan/aztec-network/values/exp-1.yaml index f6181329e49..0f086a93c65 100644 --- a/spartan/aztec-network/values/exp-1.yaml +++ b/spartan/aztec-network/values/exp-1.yaml @@ -117,7 +117,8 @@ validator: - 0x3c3E2E178C69D4baD964568415a0f0c84fd6320A resources: requests: - memory: "512Mi" + memory: "8Gi" + cpu: "3.5" validator: disabled: false sequencer: @@ -129,10 +130,26 @@ bootNode: storageSize: "100Gi" validator: disabled: true + resources: + requests: + memory: "8Gi" + cpu: "3.5" proverAgent: replicas: 8 +proverBroker: + resources: + requests: + memory: "8Gi" + cpu: "3.5" + +proverNode: + resources: + requests: + memory: "8Gi" + cpu: "3.5" + bot: replicas: 10 followChain: "NONE" @@ -142,3 +159,9 @@ bot: jobs: deployL1Verifier: enable: false + +ethereum: + resources: + requests: + memory: "8Gi" + cpu: "3.5"