diff --git a/spartan/environments/mbps-pipeline.env b/spartan/environments/mbps-pipeline.env index fd1074f94155..0127d1f4eae8 100644 --- a/spartan/environments/mbps-pipeline.env +++ b/spartan/environments/mbps-pipeline.env @@ -13,7 +13,8 @@ DEPLOY_INTERNAL_BOOTNODE=true TEST_ACCOUNTS=true SPONSORED_FPC=true SEQ_MIN_TX_PER_BLOCK=0 -SEQ_MAX_TX_PER_BLOCK=8 +SEQ_MAX_TX_PER_BLOCK=4 +SEQ_MAX_TX_PER_CHECKPOINT=72 AZTEC_EPOCH_DURATION=8 REAL_VERIFIER=false PROVER_REAL_PROOFS=false @@ -23,9 +24,10 @@ VERIFY_CONTRACTS=false DESTROY_AZTEC_INFRA=true SEQ_BUILD_CHECKPOINT_IF_EMPTY=true -SEQ_BLOCK_DURATION_MS=6000 +SEQ_BLOCK_DURATION_MS=5800 +SEQ_LAST_BLOCK_DURATION_MS=3000 SEQ_ENABLE_PROPOSER_PIPELINING=true -SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=1.1 +SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=1 LOG_LEVEL=verbose AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET=2 diff --git a/spartan/scripts/deploy_network.sh b/spartan/scripts/deploy_network.sh index 412ca3529844..21d409535cd5 100755 --- a/spartan/scripts/deploy_network.sh +++ b/spartan/scripts/deploy_network.sh @@ -109,6 +109,7 @@ SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-null} SEQ_MAX_TX_PER_CHECKPOINT=${SEQ_MAX_TX_PER_CHECKPOINT:-8} SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER=${SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER:-null} SEQ_BLOCK_DURATION_MS=${SEQ_BLOCK_DURATION_MS:-} +SEQ_LAST_BLOCK_DURATION_MS=${SEQ_LAST_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:-} SEQ_ENABLE_PROPOSER_PIPELINING=${SEQ_ENABLE_PROPOSER_PIPELINING:-false} @@ -538,6 +539,7 @@ SEQ_MAX_TX_PER_BLOCK = ${SEQ_MAX_TX_PER_BLOCK} SEQ_MAX_TX_PER_CHECKPOINT = ${SEQ_MAX_TX_PER_CHECKPOINT} SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER = ${SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER} SEQ_BLOCK_DURATION_MS = ${SEQ_BLOCK_DURATION_MS:-null} +SEQ_LAST_BLOCK_DURATION_MS = ${SEQ_LAST_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} SEQ_ENABLE_PROPOSER_PIPELINING = ${SEQ_ENABLE_PROPOSER_PIPELINING} diff --git a/spartan/terraform/deploy-aztec-infra/main.tf b/spartan/terraform/deploy-aztec-infra/main.tf index 8f975974cd4d..03c7cf36b12b 100644 --- a/spartan/terraform/deploy-aztec-infra/main.tf +++ b/spartan/terraform/deploy-aztec-infra/main.tf @@ -215,6 +215,7 @@ locals { "validator.node.env.SEQ_MAX_TX_PER_CHECKPOINT" = var.SEQ_MAX_TX_PER_CHECKPOINT "validator.node.env.SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER" = var.SEQ_PER_BLOCK_ALLOCATION_MULTIPLIER "validator.node.env.SEQ_BLOCK_DURATION_MS" = var.SEQ_BLOCK_DURATION_MS + "validator.node.env.SEQ_LAST_BLOCK_DURATION_MS" = var.SEQ_LAST_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 "validator.node.env.SEQ_ENABLE_PROPOSER_PIPELINING" = var.SEQ_ENABLE_PROPOSER_PIPELINING diff --git a/spartan/terraform/deploy-aztec-infra/variables.tf b/spartan/terraform/deploy-aztec-infra/variables.tf index 2f0f0e435962..3696e8096704 100644 --- a/spartan/terraform/deploy-aztec-infra/variables.tf +++ b/spartan/terraform/deploy-aztec-infra/variables.tf @@ -389,6 +389,13 @@ variable "SEQ_BLOCK_DURATION_MS" { default = null } +variable "SEQ_LAST_BLOCK_DURATION_MS" { + description = "Duration of the last block in ms when building multiple blocks per slot" + type = string + nullable = true + default = null +} + variable "SEQ_L1_PUBLISHING_TIME_ALLOWANCE_IN_SLOT" { description = "Time allocated for publishing to L1, in seconds" type = string