Merge pull request #584 from AztecProtocol/stack/choe-fix-bad-merge

chore: fix bad merge

Author: alexghr

spartan/environments/next-net.env

@@ -39,8 +39,6 @@ SEQ_MAX_TX_PER_CHECKPOINT=12
 SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
 SEQ_BLOCK_DURATION_MS=5500
 
-AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=2
-AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=2
 AZTEC_INBOX_LAG=2
 
 VALIDATOR_REPLICAS=2

spartan/environments/testnet-v4.env

@@ -6,6 +6,12 @@ NAMESPACE=${NAMESPACE:-testnet-v4}
 NETWORK=testnet
 
 RPC_GATEWAY_ENABLED=false
+PROVER_NODE_RPC_GATEWAY_ENABLED=true
+RPC_GATEWAY_FRONTEND_STATIC_IP_NAME=testnet-v4-infra-rpc-frontend
+RPC_GATEWAY_KONG_HELM_RELEASE_NAME=testnet-v4-infra-rpc-kong
+RPC_GATEWAY_KONG_INGRESS_CLASS=testnet-v4-infra-rpc-kong
+PROVER_NODE_RPC_GATEWAY_HOSTS='["prover-v4.testnet.rpc.aztec-labs.com"]'
+PROVER_NODE_RPC_GATEWAY_API_KEY_SECRET_NAMES='["testnet-prover-rpc-consumer-client1"]'
 
 REAL_VERIFIER=true
 

spartan/environments/tps-scenario.env

@@ -26,13 +26,10 @@ VERIFY_CONTRACTS=true
 ETHERSCAN_API_KEY=REPLACE_WITH_GCP_SECRET
 
 CREATE_ROLLUP_CONTRACTS=true
-VERIFY_CONTRACTS=true
 
 DESTROY_NAMESPACE=true
 DESTROY_AZTEC_INFRA=true
 
-OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
-
 AZTEC_MANA_TARGET=2147483647
 
 VALIDATOR_REPLICAS=12

spartan/scripts/deploy_network.sh

@@ -584,7 +584,6 @@ L1_CONSENSUS_HOST_API_KEY_HEADERS = ${L1_CONSENSUS_HOST_API_KEY_HEADERS_JSON:-nu
 REGISTRY_CONTRACT_ADDRESS = "${REGISTRY_ADDRESS}"
 ROLLUP_VERSION = "${ROLLUP_VERSION}"
 FEE_ASSET_HANDLER_CONTRACT_ADDRESS = "${FEE_ASSET_HANDLER_ADDRESS}"
-ROLLUP_VERSION = "${ROLLUP_VERSION:-}"
 VALIDATOR_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
 VALIDATOR_MNEMONIC_START_INDEX = ${VALIDATOR_MNEMONIC_START_INDEX}
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX = ${VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX}

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

@@ -184,7 +184,6 @@ locals {
     "global.aztecEnv.ROLLUP_VERSION"                           = var.ROLLUP_VERSION
     "global.customAztecNetwork.feeAssetHandlerContractAddress" = var.FEE_ASSET_HANDLER_CONTRACT_ADDRESS
     "global.customAztecNetwork.l1ChainId"                      = var.L1_CHAIN_ID
-    "global.aztecEnv.ROLLUP_VERSION"                           = var.ROLLUP_VERSION
     "global.otelCollectorEndpoint"                             = var.OTEL_COLLECTOR_ENDPOINT
     "global.sponsoredFPC"                                      = var.SPONSORED_FPC
     "global.testAccounts"                                      = var.TEST_ACCOUNTS

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

@@ -174,12 +174,6 @@ variable "FEE_ASSET_HANDLER_CONTRACT_ADDRESS" {
   type        = string
 }
 
-variable "ROLLUP_VERSION" {
-  description = "Rollup version selected from the registry. Leave empty to use the canonical rollup."
-  type        = string
-  default     = ""
-}
-
 variable "VALIDATOR_MNEMONIC" {
   description = "The validator mnemonic"
   type        = string