chore: Backport of ignition fix attempt 2

.github/workflows/deploy-staging-networks.yml

@@ -118,6 +118,8 @@ jobs:
           PROVER_FAILED_PROOF_STORE=gs://aztec-develop/staging-public/failed-proofs
           TEST_ACCOUNTS=false
           SPONSORED_FPC=true
+          SEQ_MIN_TX_PER_BLOCK=0
+          SEQ_MAX_TX_PER_BLOCK=8
 
           BOT_TRANSFERS_REPLICAS=1
           BOT_TRANSFERS_TX_INTERVAL_SECONDS=250
@@ -172,6 +174,8 @@ jobs:
           TRANSACTIONS_DISABLED=true
           TEST_ACCOUNTS=false
           SPONSORED_FPC=false
+          SEQ_MIN_TX_PER_BLOCK=0
+          SEQ_MAX_TX_PER_BLOCK=0
           NETWORK=staging-ignition
 
           ETHEREUM_CHAIN_ID=11155111
@@ -228,6 +232,8 @@ jobs:
           AZTEC_DOCKER_IMAGE="aztecprotocol/aztec:${SEMVER}"
           TEST_ACCOUNTS=false
           SPONSORED_FPC=true
+          SEQ_MIN_TX_PER_BLOCK=0
+          SEQ_MAX_TX_PER_BLOCK=8
           NETWORK=testnet
 
           ETHEREUM_CHAIN_ID=11155111

spartan/aztec-node/templates/_pod-template.yaml

@@ -257,6 +257,10 @@ spec:
           value: {{ .Values.node.storage.worldStateMapSize | quote }}
         - name: USE_GCLOUD_LOGGING
           value: {{ .Values.global.useGcloudLogging | quote }}
+        - name: SPONSORED_FPC
+          value: {{ .Values.global.sponsoredFPC | quote }}
+        - name: TEST_ACCOUNTS
+          value: {{ .Values.global.testAccounts | quote }}
         {{- if .Values.global.otelCollectorEndpoint }}
         - name: OTEL_EXCLUDE_METRICS
           value: {{ .Values.node.otelExcludeMetrics | quote }}

spartan/aztec-node/values.yaml

@@ -44,6 +44,9 @@ global:
   # -- Use GCP logging
   useGcloudLogging: false
 
+  sponsoredFPC: false
+  testAccounts: false
+
 # -- Use host network - this will disable nodePort service and use host networking instead
 hostNetwork: false
 

spartan/scripts/deploy_network.sh

@@ -65,6 +65,8 @@ PROVER_MNEMONIC_START_INDEX=${PROVER_MNEMONIC_START_INDEX:-1000}
 PROVER_REAL_PROOFS=${REAL_VERIFIER:-true}
 STORE_SNAPSHOT_URL=${STORE_SNAPSHOT_URL:-null}
 PROVER_FAILED_PROOF_STORE=${PROVER_FAILED_PROOF_STORE:-}
+SEQ_MIN_TX_PER_BLOCK=${SEQ_MIN_TX_PER_BLOCK:-0}
+SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-8}
 
 OTEL_COLLECTOR_ENDPOINT=${OTEL_COLLECTOR_ENDPOINT:-}
 DEPLOY_INTERNAL_BOOTNODE=${DEPLOY_INTERNAL_BOOTNODE:-}
@@ -265,6 +267,8 @@ VALIDATOR_RESOURCE_PROFILE = "${RESOURCE_PROFILE}"
 PROVER_RESOURCE_PROFILE = "${RESOURCE_PROFILE}"
 RPC_RESOURCE_PROFILE = "${RESOURCE_PROFILE}"
 AZTEC_DOCKER_IMAGE = "${AZTEC_DOCKER_IMAGE}"
+SPONSORED_FPC = ${SPONSORED_FPC}
+TEST_ACCOUNTS = ${TEST_ACCOUNTS}
 L1_CHAIN_ID = "${ETHEREUM_CHAIN_ID}"
 L1_RPC_URLS = ${L1_RPC_URLS_JSON}
 L1_CONSENSUS_HOST_URLS = ${L1_CONSENSUS_HOST_URLS_JSON}
@@ -277,6 +281,8 @@ VALIDATOR_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
 VALIDATOR_MNEMONIC_START_INDEX = ${VALIDATOR_MNEMONIC_START_INDEX}
 VALIDATORS_PER_NODE = ${VALIDATORS_PER_NODE}
 VALIDATOR_REPLICAS = ${VALIDATOR_REPLICAS}
+SEQ_MIN_TX_PER_BLOCK = ${SEQ_MIN_TX_PER_BLOCK}
+SEQ_MAX_TX_PER_BLOCK = ${SEQ_MAX_TX_PER_BLOCK}
 PROVER_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
 PROVER_MNEMONIC_START_INDEX = ${PROVER_MNEMONIC_START_INDEX}
 SENTINEL_ENABLED = ${SENTINEL_ENABLED:-null}

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

@@ -56,6 +56,8 @@ locals {
     "global.customAztecNetwork.feeAssetHandlerContractAddress" = var.FEE_ASSET_HANDLER_CONTRACT_ADDRESS
     "global.customAztecNetwork.l1ChainId"                      = var.L1_CHAIN_ID
     "global.otelCollectorEndpoint"                             = var.OTEL_COLLECTOR_ENDPOINT
+    "global.sponsoredFPC"                                      = var.SPONSORED_FPC
+    "global.testAccounts"                                      = var.TEST_ACCOUNTS
   }
 
   common_list_settings = {
@@ -126,6 +128,8 @@ locals {
         "validator.slash.maxPayloadSize"                    = var.SLASH_MAX_PAYLOAD_SIZE
         "validator.node.env.TRANSACTIONS_DISABLED"          = var.TRANSACTIONS_DISABLED
         "validator.node.env.NETWORK"                        = var.NETWORK
+        "validator.node.env.SEQ_MIN_TX_PER_BLOCK"           = var.SEQ_MIN_TX_PER_BLOCK
+        "validator.node.env.SEQ_MAX_TX_PER_BLOCK"           = var.SEQ_MAX_TX_PER_BLOCK
       }
       boot_node_host_path  = "validator.node.env.BOOT_NODE_HOST"
       bootstrap_nodes_path = "validator.node.env.BOOTSTRAP_NODES"

spartan/terraform/deploy-aztec-infra/values/prover.yaml

@@ -1,7 +1,6 @@
 node:
   node:
     env:
-      SPONSORED_FPC: true
       L1_FIXED_PRIORITY_FEE_PER_GAS: 3
     preStartScript: |
       source /scripts/get-private-key.sh

spartan/terraform/deploy-aztec-infra/values/rpc.yaml

@@ -1,7 +1,6 @@
 node:
   env:
     OTEL_SERVICE_NAME: "node"
-    SPONSORED_FPC: true
 
   preStartScript: |
     if [ -n "${BOOT_NODE_HOST:-}" ] && [ -z "${NETWORK:-}" ]; then

spartan/terraform/deploy-aztec-infra/values/validator.yaml

@@ -15,9 +15,6 @@ validator:
       fi
 
     env:
-      SPONSORED_FPC: true
-      SEQ_MIN_TX_PER_BLOCK: 0
-      SEQ_MAX_TX_PER_BLOCK: 8
       L1_FIXED_PRIORITY_FEE_PER_GAS: 3
 
   persistence:

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

@@ -188,6 +188,28 @@ variable "OTEL_COLLECTOR_ENDPOINT" {
   nullable    = true
 }
 
+variable "SPONSORED_FPC" {
+  description = "Enable sponsored FPC"
+  type        = bool
+}
+
+variable "TEST_ACCOUNTS" {
+  description = "Enable test accounts"
+  type        = bool
+}
+
+variable "SEQ_MIN_TX_PER_BLOCK" {
+  description = "Minimum number of sequencer transactions per block"
+  type        = string
+  default     = "0"
+}
+
+variable "SEQ_MAX_TX_PER_BLOCK" {
+  description = "Maximum number of sequencer transactions per block"
+  type        = string
+  default     = "8"
+}
+
 variable "SENTINEL_ENABLED" {
   description = "Whether to enable sentinel"
   type        = string