chore: set enrs and contract addresses in ignition-testnet

spartan/aztec-network/files/config/config-full-node-env.sh

@@ -6,6 +6,7 @@ if [ -n "$REGISTRY_CONTRACT_ADDRESS" ] && [ -n "$BOOTSTRAP_NODES" ]; then
   cat <<EOF >/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 <<EOF >/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

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
@@ -98,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 }}
@@ -221,6 +230,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" . }}

spartan/aztec-network/values/ignition-testnet.yaml

@@ -3,12 +3,18 @@ telemetry:
 
 aztec:
   realProofs: true
-  l1DeploymentMnemonic: ""
   validatorKeyIndexStart: 0
   proverKeyIndexStart: 3
+  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"
+    slashFactoryAddress: "0x0f216a792a4cc3691010e7870ae2c0f4fadd952a"
 
 network:
+  public: true
   setupL2Contracts: false
+  p2pBootstrapNodesAsFullPeers: false
 
 bot:
   enabled: false
@@ -19,13 +25,18 @@ pxe:
 faucet:
   enabled: false
 
+bootNode:
+  enabled: false
+  # unused.
+  externalHost: "http://localhost:8080"
+
 proverNode:
   l1FixedPriorityFeePerGas: 3
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 500
 
 validator:
-  replicas: 3
+  replicas: 1
   l1FixedPriorityFeePerGas: 3
   l1GasLimitBufferPercentage: 15
   l1GasPriceMax: 500
@@ -38,19 +49,8 @@ validator:
     requests:
       cpu: "1"
 
-bootNode:
-  resources:
-    requests:
-      cpu: "1"
-
-proverBroker:
-  resources:
-    requests:
-      memory: "2Gi"
-      cpu: "1"
-
 proverAgent:
-  replicas: 2
+  replicas: 8
   bb:
     hardwareConcurrency: 31
   gke:
@@ -64,27 +64,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