From 6599eced6cd726a9f031158a19078e845ac28299 Mon Sep 17 00:00:00 2001 From: Mitch Date: Wed, 11 Dec 2024 11:06:58 -0500 Subject: [PATCH 1/5] chore: load balancer for boot node --- spartan/aztec-network/templates/boot-node.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml index 1774c16fd66..8a9e8900341 100644 --- a/spartan/aztec-network/templates/boot-node.yaml +++ b/spartan/aztec-network/templates/boot-node.yaml @@ -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 @@ -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 + {{- 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 }} From d6d19c172dcef42364bbb5770587715341be8060 Mon Sep 17 00:00:00 2001 From: Mitch Date: Wed, 11 Dec 2024 12:14:13 -0500 Subject: [PATCH 2/5] chore: disable spot instances on agents --- spartan/aztec-network/values/rc-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spartan/aztec-network/values/rc-1.yaml b/spartan/aztec-network/values/rc-1.yaml index 0999275cef1..5b685691ca6 100644 --- a/spartan/aztec-network/values/rc-1.yaml +++ b/spartan/aztec-network/values/rc-1.yaml @@ -133,7 +133,7 @@ proverAgent: bb: hardwareConcurrency: 31 gke: - spotEnabled: true + spotEnabled: false resources: requests: memory: "116Gi" From e191dceed3fc05f36aa4c8363cbd0a043f2e37d1 Mon Sep 17 00:00:00 2001 From: Mitch Date: Wed, 11 Dec 2024 12:31:53 -0500 Subject: [PATCH 3/5] chore: slowwww down --- spartan/aztec-network/values/rc-1.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spartan/aztec-network/values/rc-1.yaml b/spartan/aztec-network/values/rc-1.yaml index 5b685691ca6..1f50b6b21b0 100644 --- a/spartan/aztec-network/values/rc-1.yaml +++ b/spartan/aztec-network/values/rc-1.yaml @@ -3,7 +3,7 @@ network: aztec: slotDuration: 36 - epochDuration: 32 + epochDuration: 48 realProofs: true images: @@ -129,11 +129,11 @@ bootNode: storageSize: "100Gi" proverAgent: - replicas: 16 + replicas: 24 bb: hardwareConcurrency: 31 gke: - spotEnabled: false + spotEnabled: true resources: requests: memory: "116Gi" @@ -142,7 +142,7 @@ proverAgent: bot: followChain: "PENDING" enabled: true - txIntervalSeconds: 200 + txIntervalSeconds: 300 jobs: deployL1Verifier: From 741aa80c43794667bf551ae37aa05a3543e39b9d Mon Sep 17 00:00:00 2001 From: Mitch Date: Wed, 11 Dec 2024 12:56:25 -0500 Subject: [PATCH 4/5] chore: bump max aztec epoch duration --- .../noir-protocol-circuits/crates/types/src/constants.nr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr index 1eccf5c8554..7dd7fa27906 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr @@ -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; // 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 = From 1573f427b4c37715adb5157f3426641a2f4495c1 Mon Sep 17 00:00:00 2001 From: Mitch Date: Wed, 11 Dec 2024 13:26:21 -0500 Subject: [PATCH 5/5] fix: remake constants --- l1-contracts/src/core/libraries/ConstantsGen.sol | 6 +++--- yarn-project/circuits.js/src/constants.gen.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/l1-contracts/src/core/libraries/ConstantsGen.sol b/l1-contracts/src/core/libraries/ConstantsGen.sol index 5c827dbabb4..ce952a6fb6d 100644 --- a/l1-contracts/src/core/libraries/ConstantsGen.sol +++ b/l1-contracts/src/core/libraries/ConstantsGen.sol @@ -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; @@ -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; diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts index 684c4093d3a..fd9eea48da4 100644 --- a/yarn-project/circuits.js/src/constants.gen.ts +++ b/yarn-project/circuits.js/src/constants.gen.ts @@ -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; @@ -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;