chore: Cleanup config vars for alpha-testnet

docs/docs/run_node/guides/run_nodes/how_to_run_prover_draft.md

@@ -85,7 +85,6 @@ For S&P Testnet, we will be providing an Ethereum host, a Boot Node URL and a sp
 The prover agent, on the other hand, relies on the following environment variables:
 
 - **PROVER_BROKER_HOST**: URL to the Prover Node that acts as a proving job source.
-- **PROVER_AGENT_CONCURRENCY**: Maximum concurrency for this given prover agent. Defaults to `1`.
 
 Both the prover node and agent also rely on the following:
 

spartan/aztec-network/templates/full-node.yaml

@@ -160,6 +160,8 @@ spec:
               value: "{{ .Values.aztec.sponsoredFPC }}"
             - name: SYNC_SNAPSHOTS_URL
               value: "{{ .Values.snapshots.syncUrl }}"
+            - name: SENTINEL_ENABLED
+              value: "{{ .Values.fullNode.sentinelEnabled }}"
             {{- if .Values.blobSink.enabled }}
             - name: BLOB_SINK_URL
               value: {{ include "aztec-network.blobSinkUrl" . }}

spartan/aztec-network/templates/prover-node.yaml

@@ -75,16 +75,6 @@ spec:
               source /shared/config/service-addresses
               cat /shared/config/service-addresses
 
-              if [ "${PROVER_BROKER_ENABLED}" == "false" ]; then
-                until curl -s -X POST ${PROVER_BROKER_HOST}/status; do
-                  echo "Waiting for broker ${PROVER_BROKER_HOST} ..."
-                  sleep 5
-                done
-                echo "Broker is ready!"
-              else
-                echo "Using built-in job broker"
-              fi
-
               # 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"
@@ -102,9 +92,6 @@ spec:
           volumeMounts:
             - name: config
               mountPath: /shared/config
-          env:
-            - name: PROVER_BROKER_ENABLED
-              value: "{{ .Values.proverNode.proverBroker.enabled }}"
 
         - name: configure-prover-env
           {{- include "aztec-network.image" . | nindent 10 }}
@@ -182,8 +169,6 @@ spec:
               value: "{{ .Values.proverNode.proverAgent.pollIntervalMs }}"
             - name: PROVER_AGENT_PROOF_TYPES
               value: {{ join "," .Values.proverNode.proverAgent.proofTypes | quote }}
-            - name: PROVER_BROKER_ENABLED
-              value: "{{ .Values.proverNode.proverBroker.enabled }}"
             - name: PROVER_BROKER_POLL_INTERVAL_MS
               value: "{{ .Values.proverNode.proverBroker.pollIntervalMs }}"
             - name: PROVER_BROKER_JOB_TIMEOUT_MS

spartan/aztec-network/values.yaml

@@ -146,6 +146,7 @@ fullNode:
   stakingAssetAddress: ""
   storageSize: "1Gi"
   dataDir: "/data"
+  sentinelEnabled: false
 
 validator:
   # If true, the validator will use its peers to serve as the boot node.

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

@@ -44,6 +44,17 @@ bootNode:
   # unused.
   externalHost: "http://localhost:8080"
 
+fullNode:
+  enabled: true
+  replicas: 1
+  maxOldSpaceSize: "8192"
+  storageSize: "512Gi"
+  resources:
+    requests:
+      cpu: "3"
+      memory: "10Gi"
+  sentinelEnabled: true
+
 proverNode:
   l1FixedPriorityFeePerGas: 3
   l1GasLimitBufferPercentage: 15

yarn-project/aztec-node/src/sentinel/config.ts

@@ -14,6 +14,6 @@ export const sentinelConfigMappings: ConfigMappingsType<SentinelConfig> = {
   sentinelEnabled: {
     description: 'Whether the sentinel is enabled or not.',
     env: 'SENTINEL_ENABLED',
-    ...booleanConfigHelper(true),
+    ...booleanConfigHelper(false),
   },
 };

yarn-project/aztec/terraform/node/main.tf

@@ -412,10 +412,6 @@ resource "aws_ecs_task_definition" "aztec-node" {
           name  = "PROVER_AGENT_ENABLED"
           value = "false"
         },
-        {
-          name  = "PROVER_AGENT_CONCURRENCY",
-          value = "0"
-        },
         {
           name  = "PROVER_REAL_PROOFS"
           value = tostring(var.PROVING_ENABLED)

yarn-project/aztec/terraform/prover-node/main.tf

@@ -258,7 +258,6 @@ resource "aws_ecs_task_definition" "aztec-prover-node" {
         // Prover
         { name = "PROVER_PUBLISHER_PRIVATE_KEY", value = local.prover_private_keys[count.index] },
         { name = "PROVER_AGENT_ENABLED", value = "false" },
-        { name = "PROVER_AGENT_CONCURRENCY", value = "0" },
         { name = "PROVER_REAL_PROOFS", value = tostring(var.PROVING_ENABLED) },
         { name = "BB_WORKING_DIRECTORY", value = "${local.data_dir}/prover_node_${count.index + 1}/temp" },
         { name = "ACVM_WORKING_DIRECTORY", value = "${local.data_dir}/prover_node_${count.index + 1}/temp" },

yarn-project/aztec/terraform/prover/main.tf

@@ -265,10 +265,6 @@ resource "aws_ecs_task_definition" "aztec-proving-agent" {
         "name": "PROVER_AGENT_ENABLED",
         "value": "true"
       },
-      {
-        "name": "PROVER_AGENT_CONCURRENCY",
-        "value": "1"
-      },
       {
         "name": "PROVER_REAL_PROOFS",
         "value": "${var.PROVING_ENABLED}"

yarn-project/end-to-end/src/fixtures/snapshot_manager.ts

@@ -308,6 +308,8 @@ async function setupFromFresh(
   aztecNodeConfig.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
   // Only enable proving if specifically requested.
   aztecNodeConfig.realProofs = !!opts.realProofs;
+  // Only enforce the time table if requested
+  aztecNodeConfig.enforceTimeTable = !!opts.enforceTimeTable;
   aztecNodeConfig.listenAddress = '127.0.0.1';
 
   // Create a temp directory for all ephemeral state and cleanup afterwards

yarn-project/end-to-end/src/fixtures/utils.ts

@@ -363,6 +363,8 @@ export async function setup(
     config.peerCheckIntervalMS = TEST_PEER_CHECK_INTERVAL_MS;
     // For tests we only want proving enabled if specifically requested
     config.realProofs = !!opts.realProofs;
+    // Only enforce the time table if requested
+    config.enforceTimeTable = !!opts.enforceTimeTable;
 
     const logger = getLogger();
 

yarn-project/foundation/src/config/env_var.ts

@@ -117,12 +117,10 @@ export type EnvVar =
   | 'P2P_ATTESTATION_POOL_KEEP_FOR'
   | 'P2P_ARCHIVED_TX_LIMIT'
   | 'PEER_ID_PRIVATE_KEY'
-  | 'PROVER_AGENT_CONCURRENCY'
   | 'PROVER_AGENT_COUNT'
   | 'PROVER_AGENT_PROOF_TYPES'
   | 'PROVER_AGENT_POLL_INTERVAL_MS'
   | 'PROVER_BROKER_HOST'
-  | 'PROVER_BROKER_ENABLED'
   | 'PROVER_BROKER_JOB_TIMEOUT_MS'
   | 'PROVER_BROKER_POLL_INTERVAL_MS'
   | 'PROVER_BROKER_JOB_MAX_RETRIES'
@@ -132,7 +130,6 @@ export type EnvVar =
   | 'PROVER_COORDINATION_NODE_URL'
   | 'PROVER_FAILED_PROOF_STORE'
   | 'PROVER_ID'
-  | 'PROVER_JOB_TIMEOUT_MS'
   | 'PROVER_NODE_POLLING_INTERVAL_MS'
   | 'PROVER_NODE_MAX_PENDING_JOBS'
   | 'PROVER_NODE_MAX_PARALLEL_BLOCKS_PER_EPOCH'

yarn-project/sequencer-client/src/config.ts

@@ -99,7 +99,7 @@ export const sequencerConfigMappings: ConfigMappingsType<SequencerConfig> = {
     env: 'SEQ_ENFORCE_TIME_TABLE',
     description: 'Whether to enforce the time table when building blocks',
     ...booleanConfigHelper(),
-    defaultValue: false,
+    defaultValue: true,
   },
   governanceProposerPayload: {
     env: 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS',