Skip to content

Commit ec149cc

Browse files
spypsyspypsy
committed
fix bots, remove more camelCase vars
1 parent 19ffccd commit ec149cc

9 files changed

Lines changed: 113 additions & 97 deletions

File tree

‎.github/workflows/deploy-next-net.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111
inputs:
1212
image_tag:
13-
description: 'Docker image tag (e.g., 2.3.4, 3.0.0-nightly.20251004-amd64, or leave empty for latest nightly)'
13+
description: "Docker image tag (e.g., 2.3.4, 3.0.0-nightly.20251004-amd64, or leave empty for latest nightly)"
1414
required: false
1515
type: string
1616

‎spartan/aztec-bot/templates/env.configmap.yaml‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,16 @@
1+
{{- /*
2+
Init containers reference {{ .Release.Name }}-env; keys match runtime env (BOT_*, PXE_*, AZTEC_*).
3+
Same map is passed to the aztec-node subchart as bot.env → env-from-values ConfigMap.
4+
*/}}
5+
{{- if .Values.bot.env }}
16
apiVersion: v1
27
kind: ConfigMap
38
metadata:
49
name: {{ .Release.Name }}-env
510
labels:
611
{{- include "chart.labels" . | nindent 4 }}
712
data:
8-
BOT_TX_INTERVAL_SECONDS: {{ .Values.bot.txIntervalSeconds | quote }}
9-
BOT_PRIVATE_TRANSFERS_PER_TX: {{ .Values.bot.privateTransfersPerTx | quote }}
10-
BOT_PUBLIC_TRANSFERS_PER_TX: {{ .Values.bot.publicTransfersPerTx | quote }}
11-
BOT_FOLLOW_CHAIN: {{ .Values.bot.followChain | quote }}
12-
PXE_SYNC_CHAIN_TIP: {{ .Values.bot.pxeSyncChainTip | quote }}
13-
BOT_NO_START: {{ .Values.bot.botNoStart | quote }}
14-
BOT_FEE_PAYMENT_METHOD: {{ .Values.bot.feePaymentMethod | quote }}
15-
BOT_MODE: {{ .Values.bot.botMode | quote }}
16-
BOT_MAX_CONSECUTIVE_ERRORS: {{ .Values.bot.maxErrors | quote }}
17-
BOT_STOP_WHEN_UNHEALTHY: {{ .Values.bot.stopIfUnhealthy | quote }}
18-
AZTEC_NODE_URL: {{ .Values.bot.nodeUrl | quote }}
19-
TEST_ACCOUNTS: {{ .Values.bot.testAccounts | quote }}
20-
{{- if .Values.bot.daGasLimit }}
21-
BOT_DA_GAS_LIMIT: {{ .Values.bot.daGasLimit | quote }}
22-
{{- end }}
23-
{{- if .Values.bot.l2GasLimit }}
24-
BOT_L2_GAS_LIMIT: {{ .Values.bot.l2GasLimit | quote }}
25-
{{- end }}
13+
{{- range $key, $value := .Values.bot.env }}
14+
{{ $key }}: {{ $value | quote }}
15+
{{- end }}
16+
{{- end }}

‎spartan/aztec-bot/values.yaml‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,21 @@ global:
77
bot:
88
mnemonic: 'test test test test test test test test test test test junk'
99
mnemonicStartIndex: 3000
10-
txIntervalSeconds: 1
11-
privateTransfersPerTx: 0
12-
publicTransfersPerTx: 1
13-
# Do not wait for transactions
14-
followChain: 'NONE'
15-
pxeSyncChainTip: 'checkpointed'
16-
botNoStart: false
17-
feePaymentMethod: 'fee_juice'
18-
botMode: 'transfer'
19-
maxErrors: 3
20-
stopIfUnhealthy: true
21-
nodeUrl: ''
22-
testAccounts: false
2310
botPrivateKey: '0xcafe'
24-
daGasLimit: ''
25-
l2GasLimit: ''
11+
12+
env:
13+
BOT_TX_INTERVAL_SECONDS: '1'
14+
BOT_PRIVATE_TRANSFERS_PER_TX: '0'
15+
BOT_PUBLIC_TRANSFERS_PER_TX: '1'
16+
BOT_FOLLOW_CHAIN: 'NONE'
17+
PXE_SYNC_CHAIN_TIP: 'checkpointed'
18+
BOT_NO_START: 'false'
19+
BOT_FEE_PAYMENT_METHOD: 'fee_juice'
20+
BOT_MODE: 'transfer'
21+
BOT_MAX_CONSECUTIVE_ERRORS: '3'
22+
BOT_STOP_WHEN_UNHEALTHY: 'true'
23+
AZTEC_NODE_URL: ''
24+
TEST_ACCOUNTS: 'false'
2625

2726
persistence:
2827
enabled: false

‎spartan/environments/networks/next-net.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,4 @@ env:
6565
AZTEC_SLOT_DURATION: '72'
6666
AZTEC_EPOCH_DURATION: '32'
6767
AZTEC_TARGET_COMMITTEE_SIZE: '48'
68-
AZTEC_LAG_IN_EPOCHS_FOR_VALIDATOR_SET: '2'
69-
AZTEC_LAG_IN_EPOCHS_FOR_RANDAO: '2'
7068
AZTEC_PROOF_SUBMISSION_EPOCHS: '1'

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

Lines changed: 54 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,18 @@ locals {
7676
l1_consensus_keys = try(local.d.L1_CONSENSUS_HOST_API_KEYS, [])
7777
l1_consensus_headers = try(local.d.L1_CONSENSUS_HOST_API_KEY_HEADERS, [])
7878

79+
# Network YAMLs set bot tuning under env: (next-net, staging-public, …).
80+
# Prefer var.env over var.deploy defaults — avoids env→deploy duplication in deploy_network.sh.
81+
bot_transfers_tx_interval_seconds = lookup(var.env, "BOT_TRANSFERS_TX_INTERVAL_SECONDS", try(local.d.BOT_TRANSFERS_TX_INTERVAL_SECONDS, ""))
82+
bot_transfers_follow_chain = lookup(var.env, "BOT_TRANSFERS_FOLLOW_CHAIN", try(local.d.BOT_TRANSFERS_FOLLOW_CHAIN, ""))
83+
bot_transfers_pxe_sync_chain_tip = lookup(var.env, "BOT_TRANSFERS_PXE_SYNC_CHAIN_TIP", try(local.d.BOT_TRANSFERS_PXE_SYNC_CHAIN_TIP, ""))
84+
bot_swaps_tx_interval_seconds = lookup(var.env, "BOT_SWAPS_TX_INTERVAL_SECONDS", try(local.d.BOT_SWAPS_TX_INTERVAL_SECONDS, ""))
85+
bot_swaps_follow_chain = lookup(var.env, "BOT_SWAPS_FOLLOW_CHAIN", try(local.d.BOT_SWAPS_FOLLOW_CHAIN, ""))
86+
bot_swaps_pxe_sync_chain_tip = lookup(var.env, "BOT_SWAPS_PXE_SYNC_CHAIN_TIP", try(local.d.BOT_SWAPS_PXE_SYNC_CHAIN_TIP, ""))
87+
bot_cross_chain_tx_interval_seconds = lookup(var.env, "BOT_CROSS_CHAIN_TX_INTERVAL_SECONDS", try(local.d.BOT_CROSS_CHAIN_TX_INTERVAL_SECONDS, ""))
88+
bot_cross_chain_follow_chain = lookup(var.env, "BOT_CROSS_CHAIN_FOLLOW_CHAIN", try(local.d.BOT_CROSS_CHAIN_FOLLOW_CHAIN, ""))
89+
bot_cross_chain_pxe_sync_chain_tip = lookup(var.env, "BOT_CROSS_CHAIN_PXE_SYNC_CHAIN_TIP", try(local.d.BOT_CROSS_CHAIN_PXE_SYNC_CHAIN_TIP, ""))
90+
7991
# ---------------------------------------------------------------------------
8092
# Per-release helm values from the YAML loader.
8193
#
@@ -665,18 +677,20 @@ locals {
665677
"bot-token-transfer.yaml",
666678
"bot-resources-${local.d.BOT_RESOURCE_PROFILE}.yaml",
667679
]
668-
custom_settings = {
669-
"bot.replicaCount" = local.bot_transfers_replicas
670-
"bot.txIntervalSeconds" = local.d.BOT_TRANSFERS_TX_INTERVAL_SECONDS
671-
"bot.followChain" = local.d.BOT_TRANSFERS_FOLLOW_CHAIN
672-
"bot.pxeSyncChainTip" = local.d.BOT_TRANSFERS_PXE_SYNC_CHAIN_TIP
673-
"bot.botPrivateKey" = try(local.d.BOT_TRANSFERS_L2_PRIVATE_KEY, "0xcafe01")
674-
"bot.nodeUrl" = local.internal_rpc_url
675-
"bot.mnemonic" = local.d.BOT_MNEMONIC
676-
"bot.mnemonicStartIndex" = local.d.BOT_TRANSFERS_MNEMONIC_START_INDEX
677-
"bot.daGasLimit" = try(local.d.BOT_DA_GAS_LIMIT, "")
678-
"bot.l2GasLimit" = try(local.d.BOT_L2_GAS_LIMIT, "")
679-
}
680+
custom_settings = merge(
681+
{
682+
"bot.replicaCount" = local.bot_transfers_replicas
683+
"bot.env.BOT_TX_INTERVAL_SECONDS" = local.bot_transfers_tx_interval_seconds
684+
"bot.env.BOT_FOLLOW_CHAIN" = local.bot_transfers_follow_chain
685+
"bot.env.PXE_SYNC_CHAIN_TIP" = local.bot_transfers_pxe_sync_chain_tip
686+
"bot.env.AZTEC_NODE_URL" = local.internal_rpc_url
687+
"bot.botPrivateKey" = try(local.d.BOT_TRANSFERS_L2_PRIVATE_KEY, "0xcafe01")
688+
"bot.mnemonic" = local.d.BOT_MNEMONIC
689+
"bot.mnemonicStartIndex" = local.d.BOT_TRANSFERS_MNEMONIC_START_INDEX
690+
},
691+
try(local.d.BOT_DA_GAS_LIMIT, "") != "" ? { "bot.env.BOT_DA_GAS_LIMIT" = local.d.BOT_DA_GAS_LIMIT } : {},
692+
try(local.d.BOT_L2_GAS_LIMIT, "") != "" ? { "bot.env.BOT_L2_GAS_LIMIT" = local.d.BOT_L2_GAS_LIMIT } : {},
693+
)
680694
boot_node_host_path = ""
681695
bootstrap_nodes_path = ""
682696
wait = false
@@ -691,18 +705,20 @@ locals {
691705
"bot-amm-swaps.yaml",
692706
"bot-resources-${local.d.BOT_RESOURCE_PROFILE}.yaml",
693707
]
694-
custom_settings = {
695-
"bot.replicaCount" = local.bot_swaps_replicas
696-
"bot.txIntervalSeconds" = local.d.BOT_SWAPS_TX_INTERVAL_SECONDS
697-
"bot.followChain" = local.d.BOT_SWAPS_FOLLOW_CHAIN
698-
"bot.pxeSyncChainTip" = local.d.BOT_SWAPS_PXE_SYNC_CHAIN_TIP
699-
"bot.botPrivateKey" = try(local.d.BOT_SWAPS_L2_PRIVATE_KEY, "0xcafe02")
700-
"bot.nodeUrl" = local.internal_rpc_url
701-
"bot.mnemonic" = local.d.BOT_MNEMONIC
702-
"bot.mnemonicStartIndex" = local.d.BOT_SWAPS_MNEMONIC_START_INDEX
703-
"bot.daGasLimit" = try(local.d.BOT_DA_GAS_LIMIT, "")
704-
"bot.l2GasLimit" = try(local.d.BOT_L2_GAS_LIMIT, "")
705-
}
708+
custom_settings = merge(
709+
{
710+
"bot.replicaCount" = local.bot_swaps_replicas
711+
"bot.env.BOT_TX_INTERVAL_SECONDS" = local.bot_swaps_tx_interval_seconds
712+
"bot.env.BOT_FOLLOW_CHAIN" = local.bot_swaps_follow_chain
713+
"bot.env.PXE_SYNC_CHAIN_TIP" = local.bot_swaps_pxe_sync_chain_tip
714+
"bot.env.AZTEC_NODE_URL" = local.internal_rpc_url
715+
"bot.botPrivateKey" = try(local.d.BOT_SWAPS_L2_PRIVATE_KEY, "0xcafe02")
716+
"bot.mnemonic" = local.d.BOT_MNEMONIC
717+
"bot.mnemonicStartIndex" = local.d.BOT_SWAPS_MNEMONIC_START_INDEX
718+
},
719+
try(local.d.BOT_DA_GAS_LIMIT, "") != "" ? { "bot.env.BOT_DA_GAS_LIMIT" = local.d.BOT_DA_GAS_LIMIT } : {},
720+
try(local.d.BOT_L2_GAS_LIMIT, "") != "" ? { "bot.env.BOT_L2_GAS_LIMIT" = local.d.BOT_L2_GAS_LIMIT } : {},
721+
)
706722
boot_node_host_path = ""
707723
bootstrap_nodes_path = ""
708724
wait = false
@@ -717,18 +733,20 @@ locals {
717733
"bot-cross-chain.yaml",
718734
"bot-resources-${local.d.BOT_RESOURCE_PROFILE}.yaml",
719735
]
720-
custom_settings = {
721-
"bot.replicaCount" = local.bot_cross_chain_replicas
722-
"bot.txIntervalSeconds" = local.d.BOT_CROSS_CHAIN_TX_INTERVAL_SECONDS
723-
"bot.followChain" = local.d.BOT_CROSS_CHAIN_FOLLOW_CHAIN
724-
"bot.pxeSyncChainTip" = local.d.BOT_CROSS_CHAIN_PXE_SYNC_CHAIN_TIP
725-
"bot.botPrivateKey" = try(local.d.BOT_CROSS_CHAIN_L2_PRIVATE_KEY, "0xcafe03")
726-
"bot.nodeUrl" = local.internal_rpc_url
727-
"bot.mnemonic" = local.d.BOT_MNEMONIC
728-
"bot.mnemonicStartIndex" = local.d.BOT_CROSS_CHAIN_MNEMONIC_START_INDEX
729-
"bot.daGasLimit" = try(local.d.BOT_DA_GAS_LIMIT, "")
730-
"bot.l2GasLimit" = try(local.d.BOT_L2_GAS_LIMIT, "")
731-
}
736+
custom_settings = merge(
737+
{
738+
"bot.replicaCount" = local.bot_cross_chain_replicas
739+
"bot.env.BOT_TX_INTERVAL_SECONDS" = local.bot_cross_chain_tx_interval_seconds
740+
"bot.env.BOT_FOLLOW_CHAIN" = local.bot_cross_chain_follow_chain
741+
"bot.env.PXE_SYNC_CHAIN_TIP" = local.bot_cross_chain_pxe_sync_chain_tip
742+
"bot.env.AZTEC_NODE_URL" = local.internal_rpc_url
743+
"bot.botPrivateKey" = try(local.d.BOT_CROSS_CHAIN_L2_PRIVATE_KEY, "0xcafe03")
744+
"bot.mnemonic" = local.d.BOT_MNEMONIC
745+
"bot.mnemonicStartIndex" = local.d.BOT_CROSS_CHAIN_MNEMONIC_START_INDEX
746+
},
747+
try(local.d.BOT_DA_GAS_LIMIT, "") != "" ? { "bot.env.BOT_DA_GAS_LIMIT" = local.d.BOT_DA_GAS_LIMIT } : {},
748+
try(local.d.BOT_L2_GAS_LIMIT, "") != "" ? { "bot.env.BOT_L2_GAS_LIMIT" = local.d.BOT_L2_GAS_LIMIT } : {},
749+
)
732750
boot_node_host_path = ""
733751
bootstrap_nodes_path = ""
734752
wait = false

‎spartan/terraform/deploy-aztec-infra/values/bot-amm-swaps.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
bot:
22
replicaCount: 1
3-
txIntervalSeconds: 10
4-
botMode: "amm"
5-
followChain: "PROPOSED"
6-
feePaymentMethod: "fee_juice"
7-
maxErrors: 3
8-
stopIfUnhealthy: true
93
botPrivateKey: "0xcafe02"
104

5+
env:
6+
BOT_MODE: "amm"
7+
BOT_TX_INTERVAL_SECONDS: "10"
8+
BOT_PRIVATE_TRANSFERS_PER_TX: "0"
9+
BOT_PUBLIC_TRANSFERS_PER_TX: "1"
10+
BOT_FOLLOW_CHAIN: "PROPOSED"
11+
BOT_FEE_PAYMENT_METHOD: "fee_juice"
12+
BOT_MAX_CONSECUTIVE_ERRORS: "3"
13+
BOT_STOP_WHEN_UNHEALTHY: "true"
14+
1115
persistence:
1216
enabled: true
1317
statefulSet:

‎spartan/terraform/deploy-aztec-infra/values/bot-cross-chain.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
bot:
22
replicaCount: 1
3-
botMode: "crosschain"
4-
txIntervalSeconds: 10
5-
followChain: "PROPOSED"
6-
feePaymentMethod: "fee_juice"
7-
maxErrors: 3
8-
stopIfUnhealthy: true
93
botPrivateKey: "0xcafe03"
104

5+
env:
6+
BOT_MODE: "crosschain"
7+
BOT_TX_INTERVAL_SECONDS: "10"
8+
BOT_PRIVATE_TRANSFERS_PER_TX: "0"
9+
BOT_PUBLIC_TRANSFERS_PER_TX: "1"
10+
BOT_FOLLOW_CHAIN: "PROPOSED"
11+
BOT_FEE_PAYMENT_METHOD: "fee_juice"
12+
BOT_MAX_CONSECUTIVE_ERRORS: "3"
13+
BOT_STOP_WHEN_UNHEALTHY: "true"
14+
1115
persistence:
1216
enabled: true
1317
statefulSet:

‎spartan/terraform/deploy-aztec-infra/values/bot-token-transfer.yaml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
bot:
22
replicaCount: 1
3-
botMode: "transfer"
4-
txIntervalSeconds: 10
5-
privateTransfersPerTx: 0
6-
publicTransfersPerTx: 1
7-
followChain: "NONE"
8-
feePaymentMethod: "fee_juice"
9-
maxErrors: 3
10-
stopIfUnhealthy: true
113
botPrivateKey: "0xcafe01"
124

5+
env:
6+
BOT_MODE: "transfer"
7+
BOT_TX_INTERVAL_SECONDS: "10"
8+
BOT_PRIVATE_TRANSFERS_PER_TX: "0"
9+
BOT_PUBLIC_TRANSFERS_PER_TX: "1"
10+
BOT_FOLLOW_CHAIN: "NONE"
11+
BOT_FEE_PAYMENT_METHOD: "fee_juice"
12+
BOT_MAX_CONSECUTIVE_ERRORS: "3"
13+
BOT_STOP_WHEN_UNHEALTHY: "true"
14+
1315
persistence:
1416
enabled: true
1517
statefulSet:

‎yarn-project/end-to-end/src/spartan/utils/bot.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ export async function installTransferBot({
6767

6868
const values: Record<string, string | number | boolean> = {
6969
'bot.replicaCount': replicas,
70-
'bot.txIntervalSeconds': txIntervalSeconds,
71-
'bot.followChain': followChain,
72-
'bot.pxeSyncChainTip': pxeSyncChainTip,
70+
'bot.env.BOT_TX_INTERVAL_SECONDS': txIntervalSeconds,
71+
'bot.env.BOT_FOLLOW_CHAIN': followChain,
72+
'bot.env.PXE_SYNC_CHAIN_TIP': pxeSyncChainTip,
7373
'bot.botPrivateKey': botPrivateKey,
74-
'bot.nodeUrl': resolvedNodeUrl,
74+
'bot.env.AZTEC_NODE_URL': resolvedNodeUrl,
7575
'bot.mnemonic': mnemonic,
76-
'bot.feePaymentMethod': 'fee_juice',
76+
'bot.env.BOT_FEE_PAYMENT_METHOD': 'fee_juice',
7777
'aztec.slotDuration': aztecSlotDuration,
7878
// Ensure bot can reach its own PXE started in-process (default rpc.port is 8080)
7979
// Note: since aztec-bot depends on aztec-node with alias `bot`, env vars go under `bot.node.env`.

0 commit comments

Comments
 (0)