diff --git a/noir-projects/aztec-nr/aztec/src/macros/mod.nr b/noir-projects/aztec-nr/aztec/src/macros/mod.nr index 883a2028326..aa688409088 100644 --- a/noir-projects/aztec-nr/aztec/src/macros/mod.nr +++ b/noir-projects/aztec-nr/aztec/src/macros/mod.nr @@ -114,7 +114,11 @@ comptime fn generate_compute_note_hash_and_optionally_a_nullifier() -> Quoted { max_note_length = notes.fold( 0, |acc, (_, (_, len, _, _)): (Type, (StructDefinition, u32, Field, [(Quoted, u32, bool)]))| { - acc + len + if len > acc { + len + } else { + acc + } }, ); diff --git a/spartan/aztec-network/templates/reth.yaml b/spartan/aztec-network/templates/reth.yaml index e621630327c..899c67aa234 100644 --- a/spartan/aztec-network/templates/reth.yaml +++ b/spartan/aztec-network/templates/reth.yaml @@ -100,7 +100,6 @@ spec: name: {{ include "aztec-network.fullname" . }}-reth-genesis - name: genesis-output emptyDir: {} -{{if not .Values.network.public }} --- apiVersion: v1 kind: Service @@ -109,7 +108,12 @@ metadata: labels: {{- include "aztec-network.labels" . | nindent 4 }} spec: - type: {{ .Values.ethereum.service.type }} + {{- if .Values.network.public }} + type: LoadBalancer + {{- else }} + type: ClusterIP + clusterIP: None + {{- end }} selector: {{- include "aztec-network.selectorLabels" . | nindent 4 }} app: ethereum @@ -117,10 +121,6 @@ spec: - protocol: TCP port: {{ .Values.ethereum.service.port }} targetPort: {{ .Values.ethereum.service.targetPort }} - {{- if and (eq .Values.ethereum.service.type "NodePort") .Values.ethereum.service.nodePort }} - nodePort: {{ .Values.ethereum.service.nodePort }} - {{- end }} -{{ end }} --- apiVersion: v1 kind: ConfigMap diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 9f7ee290d30..d82bd3461c6 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -219,10 +219,8 @@ ethereum: gasLimit: "1000000000" args: "" service: - type: ClusterIP port: 8545 targetPort: 8545 - nodePort: "" readinessProbe: initialDelaySeconds: 5 periodSeconds: 10 diff --git a/spartan/aztec-network/values/1-validators-public.yaml b/spartan/aztec-network/values/1-validators-public.yaml new file mode 100644 index 00000000000..f1e814a7ca8 --- /dev/null +++ b/spartan/aztec-network/values/1-validators-public.yaml @@ -0,0 +1,20 @@ +network: + public: true + +validator: + replicas: 1 + validatorKeys: + - 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 + validatorAddresses: + - 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266 + validator: + disabled: false + +bootNode: + validator: + disabled: true + +bot: + followChain: "PENDING" + enabled: true + txIntervalSeconds: 10 diff --git a/spartan/releases/testnet/aztec-spartan.sh b/spartan/releases/testnet/aztec-spartan.sh index 2d05a936d8f..ee3230344c8 100755 --- a/spartan/releases/testnet/aztec-spartan.sh +++ b/spartan/releases/testnet/aztec-spartan.sh @@ -277,7 +277,7 @@ PROVER_REAL_PROOFS=true PXE_PROVER_ENABLED=true ETHEREUM_SLOT_DURATION=12sec AZTEC_SLOT_DURATION=36 -AZTEC_EPOCH_DURATION=32 +AZTEC_EPOCH_DURATION=48 AZTEC_EPOCH_PROOF_CLAIM_WINDOW_IN_L2_SLOTS=13 ETHEREUM_HOST=${ETHEREUM_HOST} BOOTSTRAP_NODES=${BOOTSTRAP_NODES}