Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: load balancers for the boot node, longer epochs #10632

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions l1-contracts/src/core/libraries/ConstantsGen.sol
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ library Constants {
uint256 internal constant INITIAL_L2_BLOCK_NUM = 1;
uint256 internal constant PRIVATE_LOG_SIZE_IN_FIELDS = 18;
uint256 internal constant BLOB_SIZE_IN_BYTES = 126976;
uint256 internal constant AZTEC_MAX_EPOCH_DURATION = 32;
uint256 internal constant AZTEC_MAX_EPOCH_DURATION = 48;
uint256 internal constant GENESIS_ARCHIVE_ROOT =
1002640778211850180189505934749257244705296832326768971348723156503780793518;
uint256 internal constant FEE_JUICE_INITIAL_MINT = 200000000000000000000;
Expand Down Expand Up @@ -200,8 +200,8 @@ library Constants {
uint256 internal constant KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 958;
uint256 internal constant CONSTANT_ROLLUP_DATA_LENGTH = 13;
uint256 internal constant BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
uint256 internal constant BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 90;
uint256 internal constant ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 76;
uint256 internal constant BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 122;
uint256 internal constant ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 108;
uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
uint256 internal constant NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub global INITIALIZATION_SLOT_SEPARATOR: Field = 1000_000_000;
pub global INITIAL_L2_BLOCK_NUM: Field = 1;
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.
pub global BLOB_SIZE_IN_BYTES: Field = 31 * 4096;
pub global AZTEC_MAX_EPOCH_DURATION: u32 = 32;
pub global AZTEC_MAX_EPOCH_DURATION: u32 = 48;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm if no further propagation needed, curious how this affects circuit compilation

// The following is taken from building a block and looking at the `lastArchive` value in it.
// You can run the `integration_l1_publisher.test.ts` and look at the first blocks in the fixtures.
pub global GENESIS_ARCHIVE_ROOT: Field =
Expand Down
11 changes: 9 additions & 2 deletions spartan/aztec-network/templates/boot-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ data:
export STAKING_ASSET_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.stakingAssetAddress }}
export FEE_JUICE_PORTAL_CONTRACT_ADDRESS={{ .Values.bootNode.contracts.feeJuicePortalAddress }}
{{- end }}
{{if not .Values.network.public }}
---
# Headless service for StatefulSet DNS entries
apiVersion: v1
Expand All @@ -234,16 +233,24 @@ metadata:
labels:
{{- include "aztec-network.labels" . | nindent 4 }}
spec:
# If this is a public network, we want to expose the boot node as a LoadBalancer
{{- if .Values.network.public }}
type: LoadBalancer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we had this in the past, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of. We had a load balancer, but I removed it for public networks because it didn't work as "external" when mixing tcp/udp.

So this incarnation always creates a service (public/private), but when it is a public network, we don't try to allow it to be used as something you can do p2p through.

{{- else }}
type: ClusterIP
clusterIP: None
{{- end }}
selector:
{{- include "aztec-network.selectorLabels" . | nindent 4 }}
app: boot-node
ports:
# External load balancers cannot handle mixed TCP/UDP ports, so we only expose the node port
{{- if not .Values.network.public }}
- port: {{ .Values.bootNode.service.p2pTcpPort }}
name: p2p-tpc
- port: {{ .Values.bootNode.service.p2pUdpPort }}
name: p2p-udp
protocol: UDP
{{- end }}
- port: {{ .Values.bootNode.service.nodePort }}
name: node
{{ end }}
6 changes: 3 additions & 3 deletions spartan/aztec-network/values/rc-1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ network:

aztec:
slotDuration: 36
epochDuration: 32
epochDuration: 48
realProofs: true

images:
Expand Down Expand Up @@ -129,7 +129,7 @@ bootNode:
storageSize: "100Gi"

proverAgent:
replicas: 16
replicas: 24
bb:
hardwareConcurrency: 31
gke:
Expand All @@ -142,7 +142,7 @@ proverAgent:
bot:
followChain: "PENDING"
enabled: true
txIntervalSeconds: 200
txIntervalSeconds: 300

jobs:
deployL1Verifier:
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/circuits.js/src/constants.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const INITIALIZATION_SLOT_SEPARATOR = 1000000000;
export const INITIAL_L2_BLOCK_NUM = 1;
export const PRIVATE_LOG_SIZE_IN_FIELDS = 18;
export const BLOB_SIZE_IN_BYTES = 126976;
export const AZTEC_MAX_EPOCH_DURATION = 32;
export const AZTEC_MAX_EPOCH_DURATION = 48;
export const GENESIS_ARCHIVE_ROOT = 1002640778211850180189505934749257244705296832326768971348723156503780793518n;
export const FEE_JUICE_INITIAL_MINT = 200000000000000000000n;
export const PUBLIC_DISPATCH_SELECTOR = 3578010381;
Expand Down Expand Up @@ -180,8 +180,8 @@ export const KERNEL_CIRCUIT_PUBLIC_INPUTS_LENGTH = 958;
export const AVM_CIRCUIT_PUBLIC_INPUTS_LENGTH = 1009;
export const CONSTANT_ROLLUP_DATA_LENGTH = 13;
export const BASE_OR_MERGE_PUBLIC_INPUTS_LENGTH = 31;
export const BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 90;
export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 76;
export const BLOCK_ROOT_OR_BLOCK_MERGE_PUBLIC_INPUTS_LENGTH = 122;
export const ROOT_ROLLUP_PUBLIC_INPUTS_LENGTH = 108;
export const GET_NOTES_ORACLE_RETURN_LENGTH = 674;
export const NOTE_HASHES_NUM_BYTES_PER_BASE_ROLLUP = 2048;
export const NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
Expand Down
Loading