From 1d16f76a0f76da9ea1fa24760c49d7d54c3d7ae2 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Mon, 15 Sep 2025 14:37:13 +0000 Subject: [PATCH] chore: fix next-rc-1 deployments --- .github/workflows/nightly-nextnet-deploy.yml | 2 +- .../files/config/deploy-l1-contracts.sh | 2 +- .../files/config/setup-attester-keystore.sh | 5 +- spartan/aztec-network/resources/default.yaml | 9 -- spartan/aztec-network/resources/gcloud.yaml | 6 - .../aztec-network/resources/mainframe.yaml | 6 - spartan/aztec-network/templates/faucet.yaml | 138 ------------------ spartan/aztec-network/values.yaml | 9 -- .../aztec-network/values/archival-node.yaml | 3 - .../aztec-network/values/ignition-reth.yaml | 3 - .../values/ignition-testnet.yaml | 3 - spartan/aztec-network/values/slim.yaml | 2 - spartan/terraform/deploy-release/main.tf | 5 +- .../aztec/src/cli/aztec_start_options.ts | 2 +- 14 files changed, 8 insertions(+), 187 deletions(-) delete mode 100644 spartan/aztec-network/templates/faucet.yaml diff --git a/.github/workflows/nightly-nextnet-deploy.yml b/.github/workflows/nightly-nextnet-deploy.yml index c0e85bdaa6c3..01e659c854cb 100644 --- a/.github/workflows/nightly-nextnet-deploy.yml +++ b/.github/workflows/nightly-nextnet-deploy.yml @@ -40,7 +40,7 @@ jobs: needs: get-latest-tag uses: ./.github/workflows/network-deploy.yml with: - ref: next + ref: ${{ github.ref }} cluster: aztec-gke-private namespace: next-rc-1 values_file: rc-1.yaml diff --git a/spartan/aztec-network/files/config/deploy-l1-contracts.sh b/spartan/aztec-network/files/config/deploy-l1-contracts.sh index a41e1362c370..0996e741cb8b 100755 --- a/spartan/aztec-network/files/config/deploy-l1-contracts.sh +++ b/spartan/aztec-network/files/config/deploy-l1-contracts.sh @@ -71,7 +71,7 @@ FLUSH_ENTRY_QUEUE_ARG="--flush-entry-queue" for attempt in $(seq 1 $MAX_RETRIES); do # Construct base command - base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG $FLUSH_ENTRY_QUEUE" + base_cmd="LOG_LEVEL=debug node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js deploy-l1-contracts $TEST_ACCOUNTS_ARG $ACCELERATED_TEST_DEPLOYMENTS_ARG $SPONSORED_FPC_ARG $REAL_VERIFIER_ARG $FLUSH_ENTRY_QUEUE_ARG" # Add account - use private key if set, otherwise use mnemonic if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then diff --git a/spartan/aztec-network/files/config/setup-attester-keystore.sh b/spartan/aztec-network/files/config/setup-attester-keystore.sh index 520664ba3a1c..7b6e5738fa88 100755 --- a/spartan/aztec-network/files/config/setup-attester-keystore.sh +++ b/spartan/aztec-network/files/config/setup-attester-keystore.sh @@ -65,8 +65,9 @@ publishers=() if [ -n "$WEB3_SIGNER_URL" ]; then remoteSigner=$(jq -n '{remoteSignerUrl: $url}' --arg url "$WEB3_SIGNER_URL") attesters=(${addresses[*]}) - # With web3signer, use addresses for publishers too - publishers=(${publisher_addresses[*]}) + # TODO: use addresses here when web3signer supports EIP-4844 txs. See PR https://github.com/Consensys/web3signer/pull/1096 + # publishers=(${publisher_addresses[*]}) + publishers=(${publisher_private_keys[*]}) else remoteSigner="null" attesters=(${private_keys[*]}) diff --git a/spartan/aztec-network/resources/default.yaml b/spartan/aztec-network/resources/default.yaml index d2ff754ef254..4fb43319c200 100644 --- a/spartan/aztec-network/resources/default.yaml +++ b/spartan/aztec-network/resources/default.yaml @@ -71,15 +71,6 @@ blobSink: memory: "512Mi" cpu: "500m" -faucet: - resources: - requests: - memory: "512Mi" - cpu: "200m" - limits: - memory: "512Mi" - cpu: "200m" - ethereum: execution: resources: diff --git a/spartan/aztec-network/resources/gcloud.yaml b/spartan/aztec-network/resources/gcloud.yaml index 196420d56e17..341f74f184b7 100644 --- a/spartan/aztec-network/resources/gcloud.yaml +++ b/spartan/aztec-network/resources/gcloud.yaml @@ -44,12 +44,6 @@ proverBroker: blobSink: resources: -faucet: - resources: - requests: - memory: "2Gi" - cpu: "200m" - ethereum: execution: resources: diff --git a/spartan/aztec-network/resources/mainframe.yaml b/spartan/aztec-network/resources/mainframe.yaml index 0a9a21d270d9..6fcfce28b4dc 100644 --- a/spartan/aztec-network/resources/mainframe.yaml +++ b/spartan/aztec-network/resources/mainframe.yaml @@ -43,12 +43,6 @@ proverBroker: blobSink: resources: -faucet: - resources: - requests: - memory: "2Gi" - cpu: "200m" - ethereum: execution: resources: diff --git a/spartan/aztec-network/templates/faucet.yaml b/spartan/aztec-network/templates/faucet.yaml deleted file mode 100644 index 160778e68a11..000000000000 --- a/spartan/aztec-network/templates/faucet.yaml +++ /dev/null @@ -1,138 +0,0 @@ -{{- if and (not .Values.ethereum.execution.externalHosts) .Values.pxe.enabled }} -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "aztec-network.fullname" . }}-faucet - labels: - {{- include "aztec-network.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.faucet.replicas }} - selector: - matchLabels: - {{- include "aztec-network.selectorLabels" . | nindent 6 }} - app: faucet - template: - metadata: - labels: - {{- include "aztec-network.selectorLabels" . | nindent 8 }} - app: faucet - spec: - {{- if .Values.network.gke }} - nodeSelector: - node-type: network - {{- end }} - {{- if .Values.network.public }} - serviceAccountName: {{ include "aztec-network.fullname" . }}-node - hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet - {{- end }} - volumes: - - name: config - emptyDir: {} - - name: scripts - configMap: - name: {{ include "aztec-network.fullname" . }}-scripts - defaultMode: 0755 - - name: scripts-output - emptyDir: {} - terminationGracePeriodSeconds: 5 # default is 30 - speed up initcontainer termination - initContainers: - {{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }} - - name: wait-for-dependencies - image: {{ .Values.images.curl.image }} - command: - - /bin/sh - - -c - - | - source /shared/config/service-addresses - cat /shared/config/service-addresses - {{- include "aztec-network.waitForEthereum" . | nindent 14 }} - volumeMounts: - - name: config - mountPath: /shared/config - - name: scripts - mountPath: /shared/scripts - containers: - - name: faucet - {{ include "aztec-network.image" . | nindent 10 }} - volumeMounts: - - name: config - mountPath: /shared/config - command: - - "/bin/bash" - - "-c" - - | - source /shared/config/service-addresses - cat /shared/config/service-addresses - node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js start --faucet --faucet.apiServer --faucet.apiServerPort {{ .Values.faucet.apiServerPort }} - env: - - name: AZTEC_PORT - value: "{{ .Values.faucet.service.nodePort }}" - - name: L1_CHAIN_ID - value: "{{ .Values.ethereum.chainId }}" - - name: MNEMONIC - value: "{{ .Values.aztec.l1DeploymentMnemonic }}" - - name: FAUCET_MNEMONIC_ADDRESS_INDEX - value: "{{ .Values.faucet.addressIndex }}" - - name: FAUCET_L1_ASSETS - value: "{{ .Values.faucet.l1Assets }}" - - name: LOG_JSON - value: "1" - - name: LOG_LEVEL - value: "{{ .Values.faucet.logLevel }}" - - name: K8S_POD_UID - valueFrom: - fieldRef: - fieldPath: metadata.uid - - name: K8S_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - ports: - - name: http - containerPort: {{ .Values.faucet.service.nodePort }} - protocol: TCP - resources: - {{- toYaml .Values.faucet.resources | nindent 12 }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "aztec-network.fullname" . }}-faucet - labels: - {{- include "aztec-network.labels" . | nindent 4 }} - app: faucet -spec: - type: ClusterIP - selector: - {{- include "aztec-network.selectorLabels" . | nindent 4 }} - app: faucet - ports: - - protocol: TCP - port: {{ .Values.faucet.service.nodePort }} - targetPort: {{ .Values.faucet.service.nodePort }} - {{- if and (eq .Values.faucet.service.type "NodePort") .Values.faucet.service.nodePort }} - nodePort: {{ .Values.faucet.service.nodePort }} - {{- end }} ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ include "aztec-network.fullname" . }}-faucet-api - labels: - {{- include "aztec-network.labels" . | nindent 4 }} -spec: - {{- if .Values.network.public }} - type: LoadBalancer - {{- else }} - type: ClusterIP - clusterIP: None - {{- end }} - selector: - {{- include "aztec-network.selectorLabels" . | nindent 4 }} - app: faucet - ports: - - protocol: TCP - port: {{ .Values.faucet.apiServerPort }} - targetPort: {{ .Values.faucet.apiServerPort }} -{{ end }} diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 296f7810a094..35afb6c98b2c 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -423,12 +423,3 @@ blobSink: storageSize: "8Gi" dataStoreMapSize: "134217728" # 128 GB -faucet: - enabled: true - replicas: 1 - service: - nodePort: 8085 - apiServerPort: 8086 - addressIndex: 0 - l1Assets: "" - logLevel: "" diff --git a/spartan/aztec-network/values/archival-node.yaml b/spartan/aztec-network/values/archival-node.yaml index 3adeb4ae1e5a..d173cda56172 100644 --- a/spartan/aztec-network/values/archival-node.yaml +++ b/spartan/aztec-network/values/archival-node.yaml @@ -68,8 +68,5 @@ proverBroker: pxe: enabled: false -faucet: - enabled: false - bot: enabled: false diff --git a/spartan/aztec-network/values/ignition-reth.yaml b/spartan/aztec-network/values/ignition-reth.yaml index 5ba204b09de2..ba6ec1d6614e 100644 --- a/spartan/aztec-network/values/ignition-reth.yaml +++ b/spartan/aztec-network/values/ignition-reth.yaml @@ -10,9 +10,6 @@ bot: pxe: enabled: false -faucet: - enabled: false - validator: replicas: 3 sequencer: diff --git a/spartan/aztec-network/values/ignition-testnet.yaml b/spartan/aztec-network/values/ignition-testnet.yaml index 8d7c90aa874a..089484dcce93 100644 --- a/spartan/aztec-network/values/ignition-testnet.yaml +++ b/spartan/aztec-network/values/ignition-testnet.yaml @@ -23,9 +23,6 @@ bot: pxe: enabled: false -faucet: - enabled: false - bootNode: enabled: false # unused. diff --git a/spartan/aztec-network/values/slim.yaml b/spartan/aztec-network/values/slim.yaml index 9698956e23cc..2f3d5941f3a7 100644 --- a/spartan/aztec-network/values/slim.yaml +++ b/spartan/aztec-network/values/slim.yaml @@ -17,5 +17,3 @@ bootNode: bot: enabled: false -faucet: - enabled: false diff --git a/spartan/terraform/deploy-release/main.tf b/spartan/terraform/deploy-release/main.tf index 0bfedd26937e..7786532d9abc 100644 --- a/spartan/terraform/deploy-release/main.tf +++ b/spartan/terraform/deploy-release/main.tf @@ -141,7 +141,6 @@ resource "helm_release" "aztec-gke-cluster" { # Setting timeout and wait conditions timeout = 600 - wait = true - wait_for_jobs = true - + wait = false + wait_for_jobs = false } diff --git a/yarn-project/aztec/src/cli/aztec_start_options.ts b/yarn-project/aztec/src/cli/aztec_start_options.ts index 89b65aef16a5..e5f06b1d79f2 100644 --- a/yarn-project/aztec/src/cli/aztec_start_options.ts +++ b/yarn-project/aztec/src/cli/aztec_start_options.ts @@ -168,7 +168,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = { ], 'L1 CONTRACTS': [ configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress), - configToFlag('--rollup-version', chainConfigMappings.rollupVersion, 'canonical'), + configToFlag('--rollup-version', chainConfigMappings.rollupVersion), ], STORAGE: [ configToFlag('--data-directory', dataConfigMappings.dataDirectory),