Skip to content

Commit bc949c2

Browse files
authored
chore: remove deploy-l1-verifier cmd (#16434)
The ability to set the verifier on a rollup was removed in #14819. This PR just updates the network deployment to use the new `--real-verfier` argument which initializes the deployment with the appropriate UltraHonk verifier.
2 parents 4087b0c + f7c571f commit bc949c2

23 files changed

+8
-365
lines changed

spartan/aztec-network/files/config/deploy-l1-contracts.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,14 @@ if [ "$ACCELERATED_TEST_DEPLOYMENTS" = "true" ]; then
6262
ACCELERATED_TEST_DEPLOYMENTS_ARG="--accelerated-test-deployments"
6363
fi
6464

65+
REAL_VERIFIER_ARG=""
66+
if [ "$REAL_VERIFIER" = "true" ]; then
67+
REAL_VERIFIER_ARG="--real-verifier"
68+
fi
69+
6570
for attempt in $(seq 1 $MAX_RETRIES); do
6671
# Construct base command
67-
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"
72+
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"
6873

6974
# Add account - use private key if set, otherwise use mnemonic
7075
if [ -n "${L1_DEPLOYMENT_PRIVATE_KEY:-}" ]; then

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ spec:
104104
value: "{{ .Values.ethereum.l1FixedPriorityFeePerGas }}"
105105
- name: AZTEC_MANA_TARGET
106106
value: "{{ .Values.aztec.manaTarget }}"
107+
- name: REAL_VERIFIER
108+
value: "{{ .Values.aztec.realProofs }}"
107109
- name: K8S_POD_UID
108110
valueFrom:
109111
fieldRef:

spartan/aztec-network/templates/deploy-l1-verifier.yaml

Lines changed: 0 additions & 123 deletions
This file was deleted.

spartan/aztec-network/values.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,6 @@ proverBroker:
372372
dataDir: "/data"
373373
maxOldSpaceSize: "4608"
374374

375-
jobs:
376-
deployL1Verifier:
377-
enable: false
378-
379375
blobSink:
380376
enabled: false
381377
logLevel: "debug; info: aztec:simulator, json-rpc"

spartan/aztec-network/values/1-validator-with-proving-and-metrics.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,5 @@ bot:
2626
enabled: true
2727
txIntervalSeconds: 200
2828

29-
jobs:
30-
deployL1Verifier:
31-
enable: true
32-
3329
telemetry:
3430
enabled: true

spartan/aztec-network/values/1-validator-with-proving.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,3 @@ bot:
2222
enabled: true
2323
txIntervalSeconds: 200
2424

25-
jobs:
26-
deployL1Verifier:
27-
enable: true

spartan/aztec-network/values/192-val-1-tps.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ bot:
8383
enabled: true
8484
txIntervalSeconds: 1
8585

86-
jobs:
87-
deployL1Verifier:
88-
enable: false
89-
9086
ethereum:
9187
execution:
9288
resources:

spartan/aztec-network/values/256-val-256-node-1.5tps.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ bot:
7272
enabled: true
7373
txIntervalSeconds: 1
7474

75-
jobs:
76-
deployL1Verifier:
77-
enable: false
78-
7975
ethereum:
8076
execution:
8177
resources:

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,3 @@ ethereum:
8686
l1GasPriceMax: 1000
8787
l1FixedPriorityFeePerGas: 3
8888

89-
jobs:
90-
deployL1Verifier:
91-
enable: false

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,3 @@ ethereum:
8888
l1GasPriceMax: 1000
8989
l1FixedPriorityFeePerGas: 3
9090

91-
jobs:
92-
deployL1Verifier:
93-
enable: false

0 commit comments

Comments
 (0)