From 2919d91465440fcf84a7ff05326c30427662b6f3 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 10:35:03 -0500 Subject: [PATCH 01/13] chore: set enrs and contract addresses in ignition-testnet --- .../values/ignition-testnet.yaml | 35 +++++-------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 3417593e30be..66b7a6d0df50 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -3,9 +3,12 @@ telemetry: aztec: realProofs: true - l1DeploymentMnemonic: "" validatorKeyIndexStart: 0 proverKeyIndexStart: 3 + contracts: + registryAddress: "0x12b3ebc176a1646b911391eab3760764f2e05fe3" + slashFactoryAddress: "0x0f216a792a4cc3691010e7870ae2c0f4fadd952a" + bootstrapENRs: "enr:-LO4QDwlKJN0BqMc4hYPsI-MQoR1O7qLVr4TK6DhqGsZT_pPTmg3gS-JD072rKI4vlaR0N4SdeH2gCD09oh-zMVT3JkEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI-XzqolzZWNwMjU2azGhA0da3IZGbY1tLdqXgdQKG-SW-Z4D6dvXJBeoXn8EZsCVg3VkcIKd0A,enr:-LO4QPJR493G_BQG1UU0_h-g0TEBnZEJ-zgWYH3YctVAn3GzfM9dWVIO7_TSETXYLy-h34bF6sSoSfpP5O44qsZnp00EhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEIlle64lzZWNwMjU2azGhAwuSF_VE1cRfSc3MvtDZvvaTl2Qo_dJK-Qp7TcnhYWBtg3VkcIKd0A,enr:-LO4QKq488wXvw6vAHToGWJYkxMmKsjQCsFjPs5Pt_MrawlnZ7G-xIfwhkXR1afddf8lFj_RNVZdBfGzHHR262pXNhMEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI8VFSYlzZWNwMjU2azGhA2xqOyFaHAARgLAi3dORuPmFHbxgoMDWBZJnnbiatW8jg3VkcIKd0A" network: setupL2Contracts: false @@ -19,6 +22,9 @@ pxe: faucet: enabled: false +bootNode: + enabled: false + proverNode: l1FixedPriorityFeePerGas: 3 l1GasLimitBufferPercentage: 15 @@ -38,11 +44,6 @@ validator: requests: cpu: "1" -bootNode: - resources: - requests: - cpu: "1" - proverBroker: resources: requests: @@ -64,27 +65,7 @@ ethereum: chainId: "11155111" l1GasPriceMax: 500 l1FixedPriorityFeePerGas: 3 - deployL1ContractsPrivateKey: - execution: - externalHosts: - resources: - requests: - memory: "1Gi" - cpu: "0.5" - beacon: - externalHost: - apiKey: "" - apiKeyHeader: "" - resources: - requests: - memory: "1Gi" - cpu: "0.5" - validator: - resources: - requests: - memory: "1Gi" - cpu: "0.5" jobs: deployL1Verifier: - enable: true + enable: false From 8d3bbefe3cffd6bb3c0abc045b166fb238c2a1e9 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 10:54:01 -0500 Subject: [PATCH 02/13] fix: wrong indent --- spartan/aztec-network/values/ignition-testnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 66b7a6d0df50..f0e548155fb9 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -5,10 +5,10 @@ aztec: realProofs: true validatorKeyIndexStart: 0 proverKeyIndexStart: 3 + bootstrapENRs: "enr:-LO4QDwlKJN0BqMc4hYPsI-MQoR1O7qLVr4TK6DhqGsZT_pPTmg3gS-JD072rKI4vlaR0N4SdeH2gCD09oh-zMVT3JkEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI-XzqolzZWNwMjU2azGhA0da3IZGbY1tLdqXgdQKG-SW-Z4D6dvXJBeoXn8EZsCVg3VkcIKd0A,enr:-LO4QPJR493G_BQG1UU0_h-g0TEBnZEJ-zgWYH3YctVAn3GzfM9dWVIO7_TSETXYLy-h34bF6sSoSfpP5O44qsZnp00EhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEIlle64lzZWNwMjU2azGhAwuSF_VE1cRfSc3MvtDZvvaTl2Qo_dJK-Qp7TcnhYWBtg3VkcIKd0A,enr:-LO4QKq488wXvw6vAHToGWJYkxMmKsjQCsFjPs5Pt_MrawlnZ7G-xIfwhkXR1afddf8lFj_RNVZdBfGzHHR262pXNhMEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI8VFSYlzZWNwMjU2azGhA2xqOyFaHAARgLAi3dORuPmFHbxgoMDWBZJnnbiatW8jg3VkcIKd0A" contracts: registryAddress: "0x12b3ebc176a1646b911391eab3760764f2e05fe3" slashFactoryAddress: "0x0f216a792a4cc3691010e7870ae2c0f4fadd952a" - bootstrapENRs: "enr:-LO4QDwlKJN0BqMc4hYPsI-MQoR1O7qLVr4TK6DhqGsZT_pPTmg3gS-JD072rKI4vlaR0N4SdeH2gCD09oh-zMVT3JkEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI-XzqolzZWNwMjU2azGhA0da3IZGbY1tLdqXgdQKG-SW-Z4D6dvXJBeoXn8EZsCVg3VkcIKd0A,enr:-LO4QPJR493G_BQG1UU0_h-g0TEBnZEJ-zgWYH3YctVAn3GzfM9dWVIO7_TSETXYLy-h34bF6sSoSfpP5O44qsZnp00EhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEIlle64lzZWNwMjU2azGhAwuSF_VE1cRfSc3MvtDZvvaTl2Qo_dJK-Qp7TcnhYWBtg3VkcIKd0A,enr:-LO4QKq488wXvw6vAHToGWJYkxMmKsjQCsFjPs5Pt_MrawlnZ7G-xIfwhkXR1afddf8lFj_RNVZdBfGzHHR262pXNhMEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI8VFSYlzZWNwMjU2azGhA2xqOyFaHAARgLAi3dORuPmFHbxgoMDWBZJnnbiatW8jg3VkcIKd0A" network: setupL2Contracts: false From 6e8c0b0d1a7b35f17429f86efe404a8d2549c6f3 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 11:08:00 -0500 Subject: [PATCH 03/13] fix: don't await boot node on full node if we dont need to --- spartan/aztec-network/templates/full-node.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml index 4d119b470ab3..21dd8a8d191e 100644 --- a/spartan/aztec-network/templates/full-node.yaml +++ b/spartan/aztec-network/templates/full-node.yaml @@ -50,10 +50,17 @@ spec: - /bin/bash - -c - | + # If we already have a registry address, and the bootstrap nodes are set, then we don't need to wait for the services + if [ -n "{{ .Values.aztec.contracts.registryAddress }}" ] && [ -n "{{ .Values.aztec.bootstrapENRs }}" ]; then + echo "Registry address and bootstrap nodes already set, skipping wait for services" + exit 0 + fi + source /shared/config/service-addresses cat /shared/config/service-addresses {{- include "aztec-network.waitForEthereum" . | nindent 14 }} + if [ "{{ .Values.validator.dynamicBootNode }}" = "true" ]; then echo "{{ include "aztec-network.pxeUrl" . }}" > /shared/pxe/pxe_url else From 49d0bde4112a9fdc040ba5b78a77b78840ceaee6 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 11:11:04 -0500 Subject: [PATCH 04/13] fix: no test accounts --- spartan/aztec-network/values/ignition-testnet.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index f0e548155fb9..3c4a8371d3f1 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -5,6 +5,7 @@ aztec: realProofs: true validatorKeyIndexStart: 0 proverKeyIndexStart: 3 + testAccounts: false bootstrapENRs: "enr:-LO4QDwlKJN0BqMc4hYPsI-MQoR1O7qLVr4TK6DhqGsZT_pPTmg3gS-JD072rKI4vlaR0N4SdeH2gCD09oh-zMVT3JkEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI-XzqolzZWNwMjU2azGhA0da3IZGbY1tLdqXgdQKG-SW-Z4D6dvXJBeoXn8EZsCVg3VkcIKd0A,enr:-LO4QPJR493G_BQG1UU0_h-g0TEBnZEJ-zgWYH3YctVAn3GzfM9dWVIO7_TSETXYLy-h34bF6sSoSfpP5O44qsZnp00EhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEIlle64lzZWNwMjU2azGhAwuSF_VE1cRfSc3MvtDZvvaTl2Qo_dJK-Qp7TcnhYWBtg3VkcIKd0A,enr:-LO4QKq488wXvw6vAHToGWJYkxMmKsjQCsFjPs5Pt_MrawlnZ7G-xIfwhkXR1afddf8lFj_RNVZdBfGzHHR262pXNhMEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI8VFSYlzZWNwMjU2azGhA2xqOyFaHAARgLAi3dORuPmFHbxgoMDWBZJnnbiatW8jg3VkcIKd0A" contracts: registryAddress: "0x12b3ebc176a1646b911391eab3760764f2e05fe3" From af18d766511d67c3409174f61b35ac7634c77017 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Mon, 3 Mar 2025 16:36:09 +0000 Subject: [PATCH 05/13] Don't consider bootnodes as full peers --- spartan/aztec-network/values/ignition-testnet.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 3c4a8371d3f1..89e8942c1f9e 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -13,6 +13,7 @@ aztec: network: setupL2Contracts: false + p2pBootstrapNodesAsFullPeers: false bot: enabled: false From d0b912ad93a228b438edea3ebca1791e91f244e9 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 12:00:58 -0500 Subject: [PATCH 06/13] fix: plumb test_accounts into full node --- spartan/aztec-network/templates/full-node.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml index 21dd8a8d191e..df004aa39389 100644 --- a/spartan/aztec-network/templates/full-node.yaml +++ b/spartan/aztec-network/templates/full-node.yaml @@ -228,6 +228,8 @@ spec: value: "{{ .Values.telemetry.excludeMetrics }}" - name: P2P_BOOTSTRAP_NODES_AS_FULL_PEERS value: "{{ .Values.network.p2pBootstrapNodesAsFullPeers }}" + - name: TEST_ACCOUNTS + value: "{{ .Values.aztec.testAccounts }}" {{- if .Values.blobSink.enabled }} - name: BLOB_SINK_URL value: {{ include "aztec-network.blobSinkUrl" . }} From 7ffab4c639a9123c52fd03a04f0123285ccf60d2 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 12:15:07 -0500 Subject: [PATCH 07/13] fix: bump prover agents --- spartan/aztec-network/values/ignition-testnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 89e8942c1f9e..e4987483739d 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -53,7 +53,7 @@ proverBroker: cpu: "1" proverAgent: - replicas: 2 + replicas: 4 bb: hardwareConcurrency: 31 gke: From 6585f220fdb6fb53df7e9bf169cf79879d821213 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 12:51:07 -0500 Subject: [PATCH 08/13] chore: drop validators to 1 --- spartan/aztec-network/values/ignition-testnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index e4987483739d..e2b6b809dfcc 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -33,7 +33,7 @@ proverNode: l1GasPriceMax: 500 validator: - replicas: 3 + replicas: 1 l1FixedPriorityFeePerGas: 3 l1GasLimitBufferPercentage: 15 l1GasPriceMax: 500 From 6bfe69a72db4bb6689c4a96f01f39b1b7d113956 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 13:10:23 -0500 Subject: [PATCH 09/13] fix: public network --- spartan/aztec-network/values/ignition-testnet.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index e2b6b809dfcc..107c383da788 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -12,6 +12,7 @@ aztec: slashFactoryAddress: "0x0f216a792a4cc3691010e7870ae2c0f4fadd952a" network: + public: true setupL2Contracts: false p2pBootstrapNodesAsFullPeers: false From 458f4949514b7bf649266f4002a39a8d5071bb1f Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 13:14:21 -0500 Subject: [PATCH 10/13] fix: slash factory address --- spartan/aztec-network/files/config/config-full-node-env.sh | 3 +++ spartan/aztec-network/templates/full-node.yaml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/spartan/aztec-network/files/config/config-full-node-env.sh b/spartan/aztec-network/files/config/config-full-node-env.sh index bd04f01da7bd..9dc01c19cd0c 100644 --- a/spartan/aztec-network/files/config/config-full-node-env.sh +++ b/spartan/aztec-network/files/config/config-full-node-env.sh @@ -6,6 +6,7 @@ if [ -n "$REGISTRY_CONTRACT_ADDRESS" ] && [ -n "$BOOTSTRAP_NODES" ]; then cat </shared/contracts/contracts.env export BOOTSTRAP_NODES=$BOOTSTRAP_NODES export REGISTRY_CONTRACT_ADDRESS=$REGISTRY_CONTRACT_ADDRESS +export SLASH_FACTORY_CONTRACT_ADDRESS=$SLASH_FACTORY_CONTRACT_ADDRESS EOF cat /shared/contracts/contracts.env exit 0 @@ -23,11 +24,13 @@ if [ "$P2P_ENABLED" = "true" ]; then boot_node_enr=$(echo "$output" | grep -oP 'Node ENR: \Kenr:[a-zA-Z0-9\-\_\.]+') fi registry_address=$(echo "$output" | grep -oP 'Registry Address: \K0x[a-fA-F0-9]{40}') +slash_factory_address=$(echo "$output" | grep -oP 'Slash Factory Address: \K0x[a-fA-F0-9]{40}') # Write the addresses to a file in the shared volume cat </shared/contracts/contracts.env export BOOTSTRAP_NODES=$boot_node_enr export REGISTRY_CONTRACT_ADDRESS=$registry_address +export SLASH_FACTORY_CONTRACT_ADDRESS=$slash_factory_address EOF cat /shared/contracts/contracts.env diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml index df004aa39389..7e1683c0b86d 100644 --- a/spartan/aztec-network/templates/full-node.yaml +++ b/spartan/aztec-network/templates/full-node.yaml @@ -105,6 +105,8 @@ spec: value: "{{ .Values.aztec.bootstrapENRs }}" - name: REGISTRY_CONTRACT_ADDRESS value: "{{ .Values.aztec.contracts.registryAddress }}" + - name: SLASH_FACTORY_CONTRACT_ADDRESS + value: "{{ .Values.aztec.contracts.slashFactoryAddress }}" - name: wait-for-ethereum {{- include "aztec-network.image" . | nindent 10 }} From 56e2446599b3bd3b3b7d8db948cbb1ce47380053 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 14:02:08 -0500 Subject: [PATCH 11/13] chore: bump prover agents and public network --- spartan/aztec-network/values/ignition-testnet.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 107c383da788..cf870eae099c 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -47,14 +47,8 @@ validator: requests: cpu: "1" -proverBroker: - resources: - requests: - memory: "2Gi" - cpu: "1" - proverAgent: - replicas: 4 + replicas: 8 bb: hardwareConcurrency: 31 gke: From 5212ba6e4c7e7b9e6adaf60f3ffc9a318a82db7f Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 14:25:45 -0500 Subject: [PATCH 12/13] fix: bootnode external host --- spartan/aztec-network/values/ignition-testnet.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index cf870eae099c..abaad7f1de77 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -27,6 +27,8 @@ faucet: bootNode: enabled: false + # unused. + externalHost: "http://localhost:8080" proverNode: l1FixedPriorityFeePerGas: 3 From bd6296816294c01a3a41600071e808c2ee330909 Mon Sep 17 00:00:00 2001 From: Mitch Date: Mon, 3 Mar 2025 16:34:19 -0500 Subject: [PATCH 13/13] turn on test accounts --- spartan/aztec-network/values/ignition-testnet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index abaad7f1de77..56855d692abd 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -5,7 +5,7 @@ aztec: realProofs: true validatorKeyIndexStart: 0 proverKeyIndexStart: 3 - testAccounts: false + testAccounts: true bootstrapENRs: "enr:-LO4QDwlKJN0BqMc4hYPsI-MQoR1O7qLVr4TK6DhqGsZT_pPTmg3gS-JD072rKI4vlaR0N4SdeH2gCD09oh-zMVT3JkEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI-XzqolzZWNwMjU2azGhA0da3IZGbY1tLdqXgdQKG-SW-Z4D6dvXJBeoXn8EZsCVg3VkcIKd0A,enr:-LO4QPJR493G_BQG1UU0_h-g0TEBnZEJ-zgWYH3YctVAn3GzfM9dWVIO7_TSETXYLy-h34bF6sSoSfpP5O44qsZnp00EhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEIlle64lzZWNwMjU2azGhAwuSF_VE1cRfSc3MvtDZvvaTl2Qo_dJK-Qp7TcnhYWBtg3VkcIKd0A,enr:-LO4QKq488wXvw6vAHToGWJYkxMmKsjQCsFjPs5Pt_MrawlnZ7G-xIfwhkXR1afddf8lFj_RNVZdBfGzHHR262pXNhMEhWF6dGVjqDAwLTExMTU1MTExLTAwMDAwMDAwLTAtMmM4ZmM0NjMtMjM3YWFkY2WCaWSCdjSCaXCEI8VFSYlzZWNwMjU2azGhA2xqOyFaHAARgLAi3dORuPmFHbxgoMDWBZJnnbiatW8jg3VkcIKd0A" contracts: registryAddress: "0x12b3ebc176a1646b911391eab3760764f2e05fe3"