chore: update devenv env (#20385)

- update devnet.env
- deploy contracts when patch===0 otherwise use what's in the network
config (we'll have to manually update AztecProtcolol/networks)
- update RPC domain name (now follows `v{major}-devnet-{iteration}`
pattern)
- stores snapshots, blobs in a folder based on devnet name

Author: alexghr

.github/workflows/deploy-network.yml

@@ -25,6 +25,11 @@ on:
         description: "Kubernetes namespace override (optional, defaults to env file value)"
         required: false
         type: string
+      deploy_contracts:
+        description: "Whether to deploy contracts fresh (true for first patch, false to read from network config)"
+        required: false
+        type: boolean
+        default: false
   workflow_dispatch:
     inputs:
       network:
@@ -49,6 +54,11 @@ on:
         description: "Kubernetes namespace override (optional, defaults to env file value)"
         required: false
         type: string
+      deploy_contracts:
+        description: "Whether to deploy contracts fresh (true for first patch, false to read from network config)"
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: deploy-network-${{ inputs.network }}-${{ inputs.namespace || inputs.network }}-${{ inputs.semver }}-${{ github.ref || github.ref_name }}
@@ -138,6 +148,8 @@ jobs:
           GCP_PROJECT_ID: ${{ secrets.GCP_PROJECT_ID }}
           NAMESPACE: ${{ inputs.namespace }}
           AZTEC_DOCKER_IMAGE: "aztecprotocol/aztec:${{ inputs.docker_image_tag || inputs.semver }}"
+          CREATE_ROLLUP_CONTRACTS: ${{ inputs.deploy_contracts == true && 'true' || '' }}
+          USE_NETWORK_CONFIG: ${{ inputs.deploy_contracts == true && 'false' || '' }}
         run: |
           echo "Deploying network: ${{ inputs.network }}"
           echo "Using image: $AZTEC_DOCKER_IMAGE"

.github/workflows/devnet-deploys.yml

@@ -23,6 +23,7 @@ jobs:
       semver: ${{ steps.create-tag.outputs.semver }}
       namespace: ${{ steps.create-tag.outputs.namespace }}
       ref: ${{ steps.create-tag.outputs.ref }}
+      patch: ${{ steps.create-tag.outputs.patch }}
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -78,3 +79,4 @@ jobs:
       semver: ${{ needs.tag.outputs.semver }}
       namespace: ${{ needs.tag.outputs.namespace }}
       ref: ${{ needs.tag.outputs.ref }}
+      deploy_contracts: ${{ needs.tag.outputs.patch == '0' }}

spartan/environments/devnet-next.env

@@ -1,54 +1,65 @@
-CREATE_ETH_DEVNET=false
 GCP_REGION=us-west1-a
 CLUSTER=aztec-gke-private
-NETWORK=devnet
+
+NETWORK=${NETWORK:-$NAMESPACE}
 NAMESPACE=${NAMESPACE:-devnet}
+
+CREATE_ETH_DEVNET=false
 ETHEREUM_CHAIN_ID=11155111
 ETHEREUM_RPC_URLS=REPLACE_WITH_GCP_SECRET
 ETHEREUM_CONSENSUS_HOST_URLS=REPLACE_WITH_GCP_SECRET
 ETHEREUM_CONSENSUS_HOST_API_KEYS=REPLACE_WITH_GCP_SECRET
 ETHEREUM_CONSENSUS_HOST_API_KEY_HEADERS=REPLACE_WITH_GCP_SECRET
+
 FUNDING_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
 LABS_INFRA_MNEMONIC=REPLACE_WITH_GCP_SECRET
 ROLLUP_DEPLOYMENT_PRIVATE_KEY=REPLACE_WITH_GCP_SECRET
 OTEL_COLLECTOR_ENDPOINT=REPLACE_WITH_GCP_SECRET
+
+SNAPSHOT_BUCKET_DIRECTORY=${SNAPSHOT_BUCKET_DIRECTORY:-"devnet/$NETWORK/snapshots"}
+BLOB_BUCKET_DIRECTORY=${BLOB_BUCKET_DIRECTORY:-"devnet/$NETWORK/blobs"}
+R2_ACCESS_KEY_ID=REPLACE_WITH_GCP_SECRET
+R2_SECRET_ACCESS_KEY=REPLACE_WITH_GCP_SECRET
+
+CREATE_ROLLUP_CONTRACTS=${CREATE_ROLLUP_CONTRACTS:-false}
 VERIFY_CONTRACTS=false
-DEPLOY_INTERNAL_BOOTNODE=true
-STORE_SNAPSHOT_URL=
-TEST_ACCOUNTS=true
-SPONSORED_FPC=true
-SEQ_MIN_TX_PER_BLOCK=0
-SEQ_MAX_TX_PER_BLOCK=32
-DESTROY_NAMESPACE=false
+REDEPLOY_ROLLUP_CONTRACTS=false
+USE_NETWORK_CONFIG=${USE_NETWORK_CONFIG:-true}
+
+DEPLOY_INTERNAL_BOOTNODE=false
 
 AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=1
 AZTEC_LAG_IN_EPOCHS_FOR_RANDAO=1
+AZTEC_SLOT_DURATION=36
 AZTEC_EPOCH_DURATION=8
+TEST_ACCOUNTS=true
+SPONSORED_FPC=true
+FLUSH_ENTRY_QUEUE=true
 
 VALIDATOR_REPLICAS=1
 VALIDATORS_PER_NODE=1
 TOTAL_VALIDATORS=$((VALIDATOR_REPLICAS * VALIDATORS_PER_NODE))
 VALIDATOR_INDICES=$(seq -s ',' 1 $TOTAL_VALIDATORS)
 PUBLISHERS_PER_VALIDATOR_KEY=1
 VALIDATOR_PUBLISHER_MNEMONIC_START_INDEX=5000
+SEQ_MIN_TX_PER_BLOCK=0
+SEQ_MAX_TX_PER_BLOCK=32
 
 PUBLISHERS_PER_PROVER=1
 PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000
 PROVER_REPLICAS=1
 PROVER_AGENTS_PER_PROVER=4
 
 BOT_TRANSFERS_REPLICAS=0
-
 BOT_SWAPS_REPLICAS=0
 
-FLUSH_ENTRY_QUEUE=true
-
 REAL_VERIFIER=false
 PROVER_RESOURCE_PROFILE="dev"
+DEBUG_FORCE_TX_PROOF_VERIFICATION=true
 
 RPC_INGRESS_ENABLED=true
-RPC_INGRESS_HOSTS='["devnet.aztec-labs.com"]'
-RPC_INGRESS_STATIC_IP_NAME=devnet-rpc-ip
-RPC_INGRESS_SSL_CERT_NAMES='["devnet-rpc-cert"]'
+RPC_INGRESS_HOSTS="["$NETWORK.aztec-labs.com"]"
+RPC_INGRESS_STATIC_IP_NAME=$NETWORK-rpc-ip
+RPC_INGRESS_SSL_CERT_NAMES="["$NETWORK-rpc-cert"]"
 
 WS_NUM_HISTORIC_BLOCKS=300

spartan/environments/devnet.env

@@ -84,5 +84,5 @@ if (dryRun) {
   console.log(`Tag ${tag} created and pushed.`);
 
   // 5. Write outputs for CI
-  writeGithubOutputs({ tag, semver, namespace, ref: branch });
+  writeGithubOutputs({ tag, semver, namespace, ref: branch, patch: String(nextPatch) });
 }

spartan/scripts/create_devnet_tag.ts

@@ -87,9 +87,14 @@ resource "google_compute_managed_ssl_certificate" "devnet_next_rpc_cert" {
 }
 
 locals {
-  devnet_offset = 6 # we've had 5 prior devnets. The sixth one is the first to use this format
+  devnet_offset = 6 # deprecated. Naming has changed
+
+  devnets = [
+    "v4-devnet-1"
+  ]
 }
 
+# deprecated
 resource "google_compute_global_address" "devnet_n_rpc_ip" {
   count       = 1
   name        = "devnet-${count.index + local.devnet_offset}-rpc-ip"
@@ -100,6 +105,7 @@ resource "google_compute_global_address" "devnet_n_rpc_ip" {
   }
 }
 
+# deprecated
 resource "google_compute_managed_ssl_certificate" "devnet_n_rpc_cert" {
   count       = 1
   name        = "devnet-${count.index + local.devnet_offset}-rpc-cert"
@@ -113,3 +119,27 @@ resource "google_compute_managed_ssl_certificate" "devnet_n_rpc_cert" {
     prevent_destroy = true
   }
 }
+
+resource "google_compute_global_address" "devnet_network_rpc_ip" {
+  for_each    = toset(local.devnets)
+  name        = "${each.key}-rpc-ip"
+  description = "Static IP for ${each.key} RPC ingress"
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
+resource "google_compute_managed_ssl_certificate" "devnet_network_rpc_cert" {
+  for_each    = toset(local.devnets)
+  name        = "${each.key}-rpc-cert"
+  description = "Managed SSL certificate for ${each.key} RPC ingress"
+
+  managed {
+    domains = ["${each.key}.aztec-labs.com"]
+  }
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}