Skip to content
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
2 changes: 1 addition & 1 deletion spartan/environments/alpha-net.env
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=10
SEQ_MAX_TX_PER_CHECKPOINT=72
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/five-tps-long-epoch.env
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=180
SEQ_MAX_TX_PER_CHECKPOINT=180
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/five-tps-short-epoch.env
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=180
SEQ_MAX_TX_PER_CHECKPOINT=180
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
10 changes: 5 additions & 5 deletions spartan/environments/network-defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,11 @@ networks:
SPONSORED_FPC: true
TRANSACTIONS_DISABLED: false
# Sequencer
# Gives ~0.1 TPS @ 72s slot time, 36s publish time, 6s block time - max 4 blocks per slot
SEQ_MAX_TX_PER_BLOCK: 2
SEQ_MAX_TX_PER_CHECKPOINT: 72 # 1 TPS
# Prover
PROVER_REAL_PROOFS: true
# P2P
P2P_MAX_PENDING_TX_COUNT: 1000
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true
# Slasher penalties
SLASH_PRUNE_PENALTY: 10e18
Expand Down Expand Up @@ -326,16 +326,16 @@ networks:
# Genesis state - no test accounts, no sponsored FPC
TEST_ACCOUNTS: false
SPONSORED_FPC: false
TRANSACTIONS_DISABLED: true # Initially disabled
TRANSACTIONS_DISABLED: false
# Sequencer
SEQ_MAX_TX_PER_BLOCK: 0
SEQ_MAX_TX_PER_CHECKPOINT: 72
# Prover
PROVER_REAL_PROOFS: true
# Sync
SYNC_SNAPSHOTS_URLS: "https://aztec-labs-snapshots.com/mainnet/"
BLOB_ALLOW_EMPTY_SOURCES: true
# P2P
P2P_MAX_PENDING_TX_COUNT: 0
P2P_MAX_PENDING_TX_COUNT: 1000
P2P_TX_POOL_DELETE_TXS_AFTER_REORG: true
# Telemetry
PUBLIC_OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
Expand Down
4 changes: 2 additions & 2 deletions spartan/environments/next-net.env
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ TEST_ACCOUNTS=true
SPONSORED_FPC=true

SEQ_MIN_TX_PER_BLOCK=0
# Gives ~0.1 TPS @ 72s slot time, 36s publish time, 6s block time - max 4 blocks per slot
SEQ_MAX_TX_PER_BLOCK=2

SEQ_MAX_TX_PER_CHECKPOINT=7

# Build checkpoint even if block is empty.
SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/prove-n-tps-fake.env
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PUBLISHERS_PER_PROVER=1
PROVER_TEST_DELAY_TYPE=realistic
PROVER_TEST_VERIFICATION_DELAY_MS=250

SEQ_MAX_TX_PER_BLOCK=80
SEQ_MAX_TX_PER_CHECKPOINT=80
SEQ_MIN_TX_PER_BLOCK=0
P2P_MAX_TX_POOL_SIZE=1000000000
DEBUG_P2P_INSTRUMENT_MESSAGES=true
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/prove-n-tps-real.env
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ PROVER_PUBLISHER_MNEMONIC_START_INDEX=8000
PROVER_AGENT_POLL_INTERVAL_MS=10000
PUBLISHERS_PER_PROVER=1

SEQ_MAX_TX_PER_BLOCK=18
SEQ_MAX_TX_PER_CHECKPOINT=72
SEQ_MIN_TX_PER_BLOCK=0
SEQ_BLOCK_DURATION_MS=6000
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT=36
Expand Down
3 changes: 1 addition & 2 deletions spartan/environments/staging-public.env
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ TEST_ACCOUNTS=false
SPONSORED_FPC=true

SEQ_MIN_TX_PER_BLOCK=0
# Gives ~0.1 TPS @ 72s slot time, 36s publish time, 6s block time - max 4 blocks per slot
SEQ_MAX_TX_PER_BLOCK=2
SEQ_MAX_TX_PER_CHECKPOINT=7 # 0.1 TPS

# Build checkpoint even if block is empty.
SEQ_BUILD_CHECKPOINT_IF_EMPTY=true
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/ten-tps-long-epoch.env
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=360
SEQ_MAX_TX_PER_CHECKPOINT=360
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/ten-tps-short-epoch.env
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=360
SEQ_MAX_TX_PER_CHECKPOINT=360
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
1 change: 1 addition & 0 deletions spartan/environments/testnet.env
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ BOT_TRANSFERS_FOLLOW_CHAIN=PENDING
BOT_SWAPS_REPLICAS=0

P2P_TX_POOL_DELETE_TXS_AFTER_REORG=true
SEQ_MAX_TX_PER_CHECKPOINT=72

DEPLOY_ARCHIVAL_NODE=true

Expand Down
2 changes: 1 addition & 1 deletion spartan/environments/tps-scenario.env
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS=0
AZTEC_SLASHING_OFFSET_IN_ROUNDS=1
AZTEC_LOCAL_EJECTION_THRESHOLD=90000000000000000000

SEQ_MAX_TX_PER_BLOCK=15 # approx 0.2 TPS
SEQ_MAX_TX_PER_CHECKPOINT=15 # approx 0.2 TPS
SEQ_MIN_TX_PER_BLOCK=0

# Override L1 tx utils bump percentages for scenario tests
Expand Down
4 changes: 3 additions & 1 deletion spartan/scripts/deploy_network.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ fi

PROVER_FAILED_PROOF_STORE=${PROVER_FAILED_PROOF_STORE:-}
SEQ_MIN_TX_PER_BLOCK=${SEQ_MIN_TX_PER_BLOCK:-0}
SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-8}
SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-null}
SEQ_MAX_TX_PER_CHECKPOINT=${SEQ_MAX_TX_PER_CHECKPOINT:-8}
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we sure we want to silently set such a low default?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think it should be ok. It's the same as the previous setting. What I will do however is add the appropriate entry to testnet.env so that we don't override the network default value with this default.

This is actually an appropriate value for most of our networks.

SEQ_BLOCK_DURATION_MS=${SEQ_BLOCK_DURATION_MS:-}
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT=${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-}
SEQ_BUILD_CHECKPOINT_IF_EMPTY=${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-}
Expand Down Expand Up @@ -530,6 +531,7 @@ VALIDATOR_PUBLISHERS_PER_REPLICA = ${VALIDATOR_PUBLISHERS_PER_REPLICA}
VALIDATOR_HA_REPLICAS = ${VALIDATOR_HA_REPLICAS}
SEQ_MIN_TX_PER_BLOCK = ${SEQ_MIN_TX_PER_BLOCK}
SEQ_MAX_TX_PER_BLOCK = ${SEQ_MAX_TX_PER_BLOCK}
SEQ_MAX_TX_PER_CHECKPOINT = ${SEQ_MAX_TX_PER_CHECKPOINT}
SEQ_BLOCK_DURATION_MS = ${SEQ_BLOCK_DURATION_MS:-null}
SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT = ${SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT:-null}
SEQ_BUILD_CHECKPOINT_IF_EMPTY = ${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-null}
Expand Down
1 change: 1 addition & 0 deletions spartan/terraform/deploy-aztec-infra/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ locals {
"validator.node.proverRealProofs" = var.PROVER_REAL_PROOFS
"validator.node.env.SEQ_MIN_TX_PER_BLOCK" = var.SEQ_MIN_TX_PER_BLOCK
"validator.node.env.SEQ_MAX_TX_PER_BLOCK" = var.SEQ_MAX_TX_PER_BLOCK
"validator.node.env.SEQ_MAX_TX_PER_CHECKPOINT" = var.SEQ_MAX_TX_PER_CHECKPOINT
"validator.node.env.SEQ_BLOCK_DURATION_MS" = var.SEQ_BLOCK_DURATION_MS
"validator.node.env.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT" = var.SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT
"validator.node.env.SEQ_BUILD_CHECKPOINT_IF_EMPTY" = var.SEQ_BUILD_CHECKPOINT_IF_EMPTY
Expand Down
6 changes: 6 additions & 0 deletions spartan/terraform/deploy-aztec-infra/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,12 @@ variable "SEQ_MAX_TX_PER_BLOCK" {
default = "8"
}

variable "SEQ_MAX_TX_PER_CHECKPOINT" {
description = "Maximum number of sequencer transactions per checkpoint"
type = string
default = null
}

variable "SEQ_ENFORCE_TIME_TABLE" {
description = "Whether to enforce the time table when building blocks"
type = string
Expand Down
Loading