fix: transaction bot proper configuration (#9106)

AztecProtocol · Oct 9, 2024 · 666fc38 · 666fc38
1 parent bba5674
commit 666fc38
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/spartan/aztec-network/templates/transaction-bot.yaml b/spartan/aztec-network/templates/transaction-bot.yaml
@@ -52,8 +52,8 @@ spec:
               value: "{{ .Values.bot.privateTransfersPerTx }}"
             - name: BOT_PUBLIC_TRANSFERS_PER_TX
               value: "{{ .Values.bot.publicTransfersPerTx }}"
-            - name: BOT_NO_WAIT_FOR_TRANSFERS
-              value: "{{ .Values.bot.noWaitForTransfers }}"
+            - name: BOT_FOLLOW_CHAIN
+              value: "{{ .Values.bot.followChain }}"
             - name: BOT_NO_START
               value: "{{ .Values.bot.botNoStart }}"
             - name: PXE_PROVER_ENABLED

diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml
@@ -80,9 +80,9 @@ spec:
             - name: VALIDATOR_DISABLED
               value: "{{ .Values.validator.validator.disabled }}"
             - name: SEQ_MAX_SECONDS_BETWEEN_BLOCKS
-              value: "{{ .Values.bootNode.sequencer.maxSecondsBetweenBlocks }}"
+              value: "{{ .Values.validator.sequencer.maxSecondsBetweenBlocks }}"
             - name: SEQ_MIN_TX_PER_BLOCK
-              value: "{{ .Values.bootNode.sequencer.minTxsPerBlock }}"
+              value: "{{ .Values.validator.sequencer.minTxsPerBlock }}"
             - name: P2P_TCP_ANNOUNCE_ADDR
               value: "$(POD_DNS_NAME):{{ .Values.validator.service.p2pPort }}"
             - name: P2P_UDP_ANNOUNCE_ADDR

diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml
@@ -105,7 +105,8 @@ bot:
   txIntervalSeconds: 5
   privateTransfersPerTx: 1
   publicTransfersPerTx: 0
-  noWaitForTransfers: true
+  # Do not wait for transactions
+  followChain: "NONE"
   botNoStart: false
   pxeProverEnabled: false
   proverRealProofs: false

diff --git a/spartan/aztec-network/values/16-validators.yaml b/spartan/aztec-network/values/16-validators.yaml
@@ -49,6 +49,8 @@ validator:
 
 bot:
   txIntervalSeconds: 2
+  privateTransfersPerTx: 1
+  publicTransfersPerTx: 2
 
 bootNode:
   validator:

diff --git a/yarn-project/bot/src/bot.ts b/yarn-project/bot/src/bot.ts
@@ -87,7 +87,10 @@ export class Bot {
       return;
     }
 
-    this.log.verbose(`Awaiting tx ${txHash} to be on the ${followChain} (timeout ${txMinedWaitSeconds}s)`, logCtx);
+    this.log.verbose(
+      `Awaiting tx ${txHash} to be on the ${followChain} chain (timeout ${txMinedWaitSeconds}s)`,
+      logCtx,
+    );
     const receipt = await tx.wait({
       timeout: txMinedWaitSeconds,
       provenTimeout: txMinedWaitSeconds,

diff --git a/yarn-project/bot/src/config.ts b/yarn-project/bot/src/config.ts
@@ -116,7 +116,7 @@ export const botConfigMappings: ConfigMappingsType<BotConfig> = {
   followChain: {
     env: 'BOT_FOLLOW_CHAIN',
     description: 'Which chain the bot follows',
-    defaultValue: 'none',
+    defaultValue: 'NONE',
     parseEnv(val) {
       if (!botFollowChain.includes(val as any)) {
         throw new Error(`Invalid value for BOT_FOLLOW_CHAIN: ${val}`);