Skip to content

Commit c1fdd54

Browse files
alexghralexghr
committed
chore: encode LOG_LEVEL (#20678)
.
1 parent 424bef6 commit c1fdd54

3 files changed

Lines changed: 48 additions & 18 deletions

File tree

‎spartan/scripts/deploy_network.sh‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ k8s_denoise() {
1717
"${SCRIPT_DIR}/k8s_enriched_denoise" "${NAMESPACE}" "$1"
1818
}
1919

20+
tf_str() {
21+
local value="${1:-}"
22+
local default_value="${2:-null}"
23+
if [[ -n "$value" ]]; then
24+
value="${value//\\/\\\\}" # escape backslashes first
25+
value="${value//\"/\\\"}" # then escape double quotes
26+
echo "\"${value}\""
27+
else
28+
echo "$default_value"
29+
fi
30+
}
31+
2032
# We want to separate out these logs.
2133
export DENOISE=1
2234
########################
@@ -97,6 +109,7 @@ SEQ_MIN_TX_PER_BLOCK=${SEQ_MIN_TX_PER_BLOCK:-0}
97109
SEQ_MAX_TX_PER_BLOCK=${SEQ_MAX_TX_PER_BLOCK:-8}
98110
SEQ_BLOCK_DURATION_MS=${SEQ_BLOCK_DURATION_MS:-}
99111
SEQ_BUILD_CHECKPOINT_IF_EMPTY=${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-}
112+
SEQ_ENFORCE_TIME_TABLE=${SEQ_ENFORCE_TIME_TABLE:-}
100113
SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT=${SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT:-0}
101114
PROVER_REPLICAS=${PROVER_REPLICAS:-4}
102115
PROVER_AGENTS_PER_PROVER=${PROVER_AGENTS_PER_PROVER:-1}
@@ -357,13 +370,6 @@ ROLLUP_CONTRACTS_START=$(date +%s)
357370
DEPLOY_ROLLUP_CONTRACTS_DIR="${SCRIPT_DIR}/../terraform/deploy-rollup-contracts"
358371
"${SCRIPT_DIR}/override_terraform_backend.sh" "${DEPLOY_ROLLUP_CONTRACTS_DIR}" "${CLUSTER}" "${BASE_STATE_PATH}/deploy-rollup-contracts"
359372

360-
# Handle NETWORK variable - needs quotes for string values, null for unset
361-
if [[ -n "${NETWORK:-}" ]]; then
362-
NETWORK_TF="\"${NETWORK}\""
363-
else
364-
NETWORK_TF=null
365-
fi
366-
367373
# Handle ETHERSCAN_API_KEY - only set when deploying or redeploying contracts
368374
if [[ "${VERIFY_CONTRACTS:-}" == "true" && ("${CREATE_ROLLUP_CONTRACTS}" == "true" || "${REDEPLOY_ROLLUP_CONTRACTS}" == "true") ]]; then
369375
ETHERSCAN_API_KEY_TF="\"${ETHERSCAN_API_KEY:-}\""
@@ -409,7 +415,7 @@ AZTEC_MANA_TARGET = ${AZTEC_MANA_TARGET:-null}
409415
AZTEC_PROVING_COST_PER_MANA = ${AZTEC_PROVING_COST_PER_MANA:-null}
410416
AZTEC_EXIT_DELAY_SECONDS = ${AZTEC_EXIT_DELAY_SECONDS:-null}
411417
ETHERSCAN_API_KEY = ${ETHERSCAN_API_KEY_TF}
412-
NETWORK = ${NETWORK_TF}
418+
NETWORK = $(tf_str "${NETWORK:-}")
413419
JOB_NAME = "deploy-rollup-contracts"
414420
JOB_BACKOFF_LIMIT = 3
415421
JOB_TTL_SECONDS_AFTER_FINISHED = 3600
@@ -508,6 +514,7 @@ SEQ_MIN_TX_PER_BLOCK = ${SEQ_MIN_TX_PER_BLOCK}
508514
SEQ_MAX_TX_PER_BLOCK = ${SEQ_MAX_TX_PER_BLOCK}
509515
SEQ_BLOCK_DURATION_MS = ${SEQ_BLOCK_DURATION_MS:-null}
510516
SEQ_BUILD_CHECKPOINT_IF_EMPTY = ${SEQ_BUILD_CHECKPOINT_IF_EMPTY:-null}
517+
SEQ_ENFORCE_TIME_TABLE = ${SEQ_ENFORCE_TIME_TABLE:-null}
511518
SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT = ${SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT}
512519
PROVER_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
513520
PROVER_PUBLISHER_MNEMONIC_START_INDEX = ${PROVER_PUBLISHER_MNEMONIC_START_INDEX}
@@ -531,7 +538,7 @@ OTEL_COLLECTOR_ENDPOINT = "${OTEL_COLLECTOR_ENDPOINT}"
531538
DEPLOY_INTERNAL_BOOTNODE = ${DEPLOY_INTERNAL_BOOTNODE:-true}
532539
PROVER_REAL_PROOFS = ${PROVER_REAL_PROOFS}
533540
TRANSACTIONS_DISABLED = ${TRANSACTIONS_DISABLED:-null}
534-
NETWORK = ${NETWORK_TF}
541+
NETWORK = $(tf_str "${NETWORK:-}")
535542
STORE_SNAPSHOT_URL = ${STORE_SNAPSHOT_URL_TF}
536543
BOT_RESOURCE_PROFILE = "${BOT_RESOURCE_PROFILE}"
537544
BOT_MNEMONIC = "${LABS_INFRA_MNEMONIC}"
@@ -594,8 +601,8 @@ DEBUG_P2P_INSTRUMENT_MESSAGES = ${DEBUG_P2P_INSTRUMENT_MESSAGES:-false}
594601
PROVER_AGENT_INCLUDE_METRICS = "${PROVER_AGENT_INCLUDE_METRICS-null}"
595602
FULL_NODE_INCLUDE_METRICS = "${FULL_NODE_INCLUDE_METRICS-null}"
596603
597-
LOG_LEVEL = "${LOG_LEVEL}"
598-
FISHERMAN_LOG_LEVEL = "${FISHERMAN_LOG_LEVEL}"
604+
LOG_LEVEL = $(tf_str "$LOG_LEVEL")
605+
FISHERMAN_LOG_LEVEL = $(tf_str "$FISHERMAN_LOG_LEVEL")
599606
600607
WS_NUM_HISTORIC_CHECKPOINTS = ${WS_NUM_HISTORIC_CHECKPOINTS:-null}
601608

‎spartan/terraform/deploy-aztec-infra/main.tf‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ locals {
148148
service = {
149149
p2p = { publicIP = var.P2P_PUBLIC_IP }
150150
}
151+
node = {
152+
logLevel = var.LOG_LEVEL
153+
}
151154
# spread validator pods to different nodes to avoid having two validators with the same attester keys on the same physical node
152155
topologySpreadConstraints = [{
153156
maxSkew = 1
@@ -202,14 +205,14 @@ locals {
202205
"validator.node.env.SEQ_MAX_TX_PER_BLOCK" = var.SEQ_MAX_TX_PER_BLOCK
203206
"validator.node.env.SEQ_BLOCK_DURATION_MS" = var.SEQ_BLOCK_DURATION_MS
204207
"validator.node.env.SEQ_BUILD_CHECKPOINT_IF_EMPTY" = var.SEQ_BUILD_CHECKPOINT_IF_EMPTY
208+
"validator.node.env.SEQ_ENFORCE_TIME_TABLE" = var.SEQ_ENFORCE_TIME_TABLE
205209
"validator.node.env.P2P_TX_POOL_DELETE_TXS_AFTER_REORG" = var.P2P_TX_POOL_DELETE_TXS_AFTER_REORG
206210
"validator.node.env.L1_PRIORITY_FEE_BUMP_PERCENTAGE" = var.VALIDATOR_L1_PRIORITY_FEE_BUMP_PERCENTAGE
207211
"validator.node.env.L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE" = var.VALIDATOR_L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE
208212
"validator.node.env.BLOB_ALLOW_EMPTY_SOURCES" = var.BLOB_ALLOW_EMPTY_SOURCES
209213
"validator.node.env.P2P_MAX_TX_POOL_SIZE" = var.P2P_MAX_TX_POOL_SIZE
210214
"validator.node.env.PROVER_TEST_VERIFICATION_DELAY_MS" = var.PROVER_TEST_VERIFICATION_DELAY_MS
211215
"validator.node.env.DEBUG_P2P_INSTRUMENT_MESSAGES" = var.DEBUG_P2P_INSTRUMENT_MESSAGES
212-
"validator.node.logLevel" = var.LOG_LEVEL
213216
"validator.node.secret.envEnabled" = true
214217
"validator.node.secret.mnemonic" = var.VALIDATOR_MNEMONIC
215218
"validator.node.secret.mnemonicIndex" = var.VALIDATOR_MNEMONIC_START_INDEX
@@ -305,6 +308,19 @@ locals {
305308
service = {
306309
p2p = { publicIP = var.P2P_PUBLIC_IP }
307310
}
311+
node = {
312+
logLevel = var.LOG_LEVEL
313+
}
314+
}
315+
broker = {
316+
node = {
317+
logLevel = var.LOG_LEVEL
318+
}
319+
}
320+
agent = {
321+
node = {
322+
logLevel = var.LOG_LEVEL
323+
}
308324
}
309325
})], local.is_kind ? [yamlencode({
310326
agent = {
@@ -318,7 +334,6 @@ locals {
318334
"node.mnemonic" = var.PROVER_MNEMONIC
319335
"node.mnemonicStartIndex" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
320336
"node.node.proverRealProofs" = var.PROVER_REAL_PROOFS
321-
"node.node.logLevel" = var.LOG_LEVEL
322337
"node.node.env.PROVER_FAILED_PROOF_STORE" = var.PROVER_FAILED_PROOF_STORE
323338
"node.node.env.PROVER_PROOF_STORE" = var.PROVER_PROOF_STORE
324339
"node.node.env.DEBUG_FORCE_TX_PROOF_VERIFICATION" = var.DEBUG_FORCE_TX_PROOF_VERIFICATION
@@ -332,7 +347,6 @@ locals {
332347
"node.node.secret.mnemonic" = var.PROVER_MNEMONIC
333348
"node.node.secret.mnemonicIndex" = var.PROVER_PUBLISHER_MNEMONIC_START_INDEX
334349
"broker.node.proverRealProofs" = var.PROVER_REAL_PROOFS
335-
"broker.node.logLevel" = var.LOG_LEVEL
336350
"broker.node.env.BOOTSTRAP_NODES" = "asdf"
337351
"broker.node.env.PROVER_BROKER_DEBUG_REPLAY_ENABLED" = var.PROVER_BROKER_DEBUG_REPLAY_ENABLED
338352
"agent.node.image.repository" = local.prover_agent_image.repository
@@ -347,7 +361,6 @@ locals {
347361
"agent.node.env.PROVER_AGENT_PROOF_TYPES" = join(",", var.PROVER_AGENT_PROOF_TYPES)
348362
"agent.node.env.PROVER_PROOF_STORE" = var.PROVER_PROOF_STORE
349363
"agent.node.otelIncludeMetrics" = var.PROVER_AGENT_INCLUDE_METRICS
350-
"agent.node.logLevel" = var.LOG_LEVEL
351364
"node.node.env.L1_PRIORITY_FEE_BUMP_PERCENTAGE" = var.PROVER_L1_PRIORITY_FEE_BUMP_PERCENTAGE
352365
"node.node.env.L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE" = var.PROVER_L1_PRIORITY_FEE_RETRY_BUMP_PERCENTAGE
353366
"node.node.env.P2P_MAX_TX_POOL_SIZE" = var.P2P_MAX_TX_POOL_SIZE
@@ -382,7 +395,7 @@ locals {
382395
"rpc.yaml",
383396
"rpc-resources-${var.RPC_RESOURCE_PROFILE}.yaml"
384397
]
385-
inline_values = var.RPC_INGRESS_ENABLED ? [yamlencode({
398+
inline_values = concat(var.RPC_INGRESS_ENABLED ? [yamlencode({
386399
service = {
387400
p2p = { publicIP = var.P2P_PUBLIC_IP }
388401
rpc = {
@@ -413,7 +426,11 @@ locals {
413426
type = local.is_kind ? "ClusterIP" : "LoadBalancer"
414427
}
415428
}
416-
})]
429+
})], var.FISHERMAN_MODE ? [yamlencode({
430+
node = {
431+
logLevel = var.FISHERMAN_LOG_LEVEL
432+
}
433+
})] : [])
417434

418435
custom_settings = merge({
419436
"replicaCount" = var.RPC_REPLICAS
@@ -449,7 +466,6 @@ locals {
449466
"node.secret.mnemonic" = var.FISHERMAN_MNEMONIC
450467
"node.secret.mnemonicIndex" = var.FISHERMAN_MNEMONIC_START_INDEX
451468
"node.env.KEY_INDEX_START" = var.FISHERMAN_MNEMONIC_START_INDEX
452-
"node.logLevel" = var.FISHERMAN_LOG_LEVEL
453469
"node.env.VALIDATORS_PER_NODE" = "1"
454470
"node.preStartScript" = "source /scripts/get-private-key.sh"
455471
} : {}

‎spartan/terraform/deploy-aztec-infra/variables.tf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,13 @@ variable "SEQ_MAX_TX_PER_BLOCK" {
343343
default = "8"
344344
}
345345

346+
variable "SEQ_ENFORCE_TIME_TABLE" {
347+
description = "Whether to enforce the time table when building blocks"
348+
type = string
349+
nullable = true
350+
default = null
351+
}
352+
346353
variable "SEQ_SKIP_CHECKPOINT_PUBLISH_PERCENT" {
347354
description = "Percentage probability of skipping checkpoint publishing"
348355
type = string

0 commit comments

Comments
 (0)