Skip to content

Commit 001bbb1

Browse files
authored
chore: load balancers for the boot node, longer epochs (#10632)
Test: ``` curl -X POST -H 'Content-Type: application/json' \ -d '{"jsonrpc":"2.0","method":"node_getPendingTxs","params":[],"id":67}' \ http://34.168.131.2:8080/ ```
1 parent 835e6fd commit 001bbb1

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

l1-contracts/src/core/libraries/ConstantsGen.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ library Constants {
9292
uint256 internal constant INITIAL_L2_BLOCK_NUM = 1;
9393
uint256 internal constant PRIVATE_LOG_SIZE_IN_FIELDS = 18;
9494
uint256 internal constant BLOB_SIZE_IN_BYTES = 126976;
95-
uint256 internal constant AZTEC_MAX_EPOCH_DURATION = 32;
95+
uint256 internal constant AZTEC_MAX_EPOCH_DURATION = 48;
9696
uint256 internal constant GENESIS_ARCHIVE_ROOT =
9797
1002640778211850180189505934749257244705296832326768971348723156503780793518;
9898
uint256 internal constant FEE_JUICE_INITIAL_MINT = 200000000000000000000;
@@ -200,8 +200,8 @@ library Constants {
200200
uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 958;
201201
uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 13;
202202
uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
203-
uint256 internal constant BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 90;
204-
uint256 internal constant ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 76;
203+
uint256 internal constant BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 122;
204+
uint256 internal constant ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 108;
205205
uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
206206
uint256 internal constant NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
207207
uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;

noir-projects/noir-protocol-circuits/crates/types/src/constants.nr

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub global INITIALIZATION_SLOT_SEPARATOR: Field = 1000_000_000;
129129
pub global INITIAL_L2_BLOCK_NUM: Field = 1;
130130
pub global PRIVATE_LOG_SIZE_IN_FIELDS: u32 = 18; // This is currently affected by the size of the log overhead defined in aztec-nr/aztec/src/encrypted_logs/payload.nr.
131131
pub global BLOB_SIZE_IN_BYTES: Field = 31 * 4096;
132-
pub global AZTEC_MAX_EPOCH_DURATION: u32 = 32;
132+
pub global AZTEC_MAX_EPOCH_DURATION: u32 = 48;
133133
// The following is taken from building a block and looking at the `lastArchive` value in it.
134134
// You can run the `integration_l1_publisher.test.ts` and look at the first blocks in the fixtures.
135135
pub global GENESIS_ARCHIVE_ROOT: Field =

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

+9-2
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ data:
224224
export STAKING_ASSET_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.stakingAssetAddress }}
225225
export FEE_JUICE_PORTAL_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.feeJuicePortalAddress }}
226226
{{- end }}
227-
{{if not .Values.network.public }}
228227
---
229228
# Headless service for StatefulSet DNS entries
230229
apiVersion: v1
@@ -234,16 +233,24 @@ metadata:
234233
labels:
235234
{{- include "aztec-network.labels" . | nindent 4 }}
236235
spec:
236+
# If this is a public network, we want to expose the boot node as a LoadBalancer
237+
{{- if .Values.network.public }}
238+
type: LoadBalancer
239+
{{- else }}
240+
type: ClusterIP
237241
clusterIP: None
242+
{{- end }}
238243
selector:
239244
{{- include "aztec-network.selectorLabels" . | nindent 4 }}
240245
app: boot-node
241246
ports:
247+
# External load balancers cannot handle mixed TCP/UDP ports, so we only expose the node port
248+
{{- if not .Values.network.public }}
242249
- port: {{ .Values.bootNode.service.p2pTcpPort }}
243250
name: p2p-tpc
244251
- port: {{ .Values.bootNode.service.p2pUdpPort }}
245252
name: p2p-udp
246253
protocol: UDP
254+
{{- end }}
247255
- port: {{ .Values.bootNode.service.nodePort }}
248256
name: node
249-
{{ end }}

spartan/aztec-network/values/rc-1.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ network:
33

44
aztec:
55
slotDuration: 36
6-
epochDuration: 32
6+
epochDuration: 48
77
realProofs: true
88

99
images:
@@ -129,7 +129,7 @@ bootNode:
129129
storageSize: "100Gi"
130130

131131
proverAgent:
132-
replicas: 16
132+
replicas: 24
133133
bb:
134134
hardwareConcurrency: 31
135135
gke:
@@ -142,7 +142,7 @@ proverAgent:
142142
bot:
143143
followChain: "PENDING"
144144
enabled: true
145-
txIntervalSeconds: 200
145+
txIntervalSeconds: 300
146146

147147
jobs:
148148
deployL1Verifier:

yarn-project/circuits.js/src/constants.gen.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export const INITIALIZATION_SLOT_SEPARATOR = 1000000000;
7979
export const INITIAL_L2_BLOCK_NUM = 1;
8080
export const PRIVATE_LOG_SIZE_IN_FIELDS = 18;
8181
export const BLOB_SIZE_IN_BYTES = 126976;
82-
export const AZTEC_MAX_EPOCH_DURATION = 32;
82+
export const AZTEC_MAX_EPOCH_DURATION = 48;
8383
export const GENESIS_ARCHIVE_ROOT = 1002640778211850180189505934749257244705296832326768971348723156503780793518n;
8484
export const FEE_JUICE_INITIAL_MINT = 200000000000000000000n;
8585
export const PUBLIC_DISPATCH_SELECTOR = 3578010381;
@@ -180,8 +180,8 @@ export const KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 958;
180180
export const AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1009;
181181
export const CONSTANT_ROLLUP_DATA_LENGTH = 13;
182182
export const BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
183-
export const BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 90;
184-
export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 76;
183+
export const BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 122;
184+
export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 108;
185185
export const GET_NOTES_ORACLE_RETURN_LENGTH = 674;
186186
export const NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
187187
export const NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;

0 commit comments

Comments
 (0)