@aztec/end-to-end 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/src/spartan/utils.ts

@@ -1,10 +1,9 @@
-import { createLogger } from '@aztec/aztec.js/log';
+import { createLogger, sleep } from '@aztec/aztec.js';
 import type { RollupCheatCodes } from '@aztec/aztec/testing';
 import type { L1ContractAddresses, ViemPublicClient } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { schemas } from '@aztec/foundation/schemas';
-import { sleep } from '@aztec/foundation/sleep';
 import {
   type AztecNodeAdmin,
   type AztecNodeAdminConfig,
@@ -27,9 +26,6 @@ const testConfigSchema = z.object({
   REAL_VERIFIER: schemas.Boolean.optional().default(true),
   CREATE_ETH_DEVNET: schemas.Boolean.optional().default(false),
   L1_RPC_URLS_JSON: z.string().optional(),
-  L1_ACCOUNT_MNEMONIC: z.string().optional(),
-  AZTEC_SLOT_DURATION: z.coerce.number().optional().default(24),
-  AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().optional().default(5),
 });
 
 export type TestConfig = z.infer<typeof testConfigSchema>;
@@ -208,16 +204,6 @@ export async function deleteResourceByLabel({
   timeout?: string;
   force?: boolean;
 }) {
-  // Check if the resource type exists before attempting to delete
-  try {
-    await execAsync(
-      `kubectl api-resources --api-group="" --no-headers -o name | grep -q "^${resource}$" || kubectl api-resources --no-headers -o name | grep -q "^${resource}$"`,
-    );
-  } catch (error) {
-    logger.warn(`Resource type '${resource}' not found in cluster, skipping deletion ${error}`);
-    return '';
-  }
-
   const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true --timeout=${timeout} ${
     force ? '--force' : ''
   }`;
@@ -249,18 +235,9 @@ export function getChartDir(spartanDir: string, chartName: string) {
   return path.join(spartanDir.trim(), chartName);
 }
 
-function shellQuote(value: string) {
-  // Single-quote safe shell escaping: ' -> '\''
-  return `'${value.replace(/'/g, "'\\''")}'`;
-}
-
-function valuesToArgs(values: Record<string, string | number | boolean>) {
+function valuesToArgs(values: Record<string, string | number>) {
   return Object.entries(values)
-    .map(([key, value]) =>
-      typeof value === 'number' || typeof value === 'boolean'
-        ? `--set ${key}=${value}`
-        : `--set-string ${key}=${shellQuote(String(value))}`,
-    )
+    .map(([key, value]) => `--set ${key}=${value}`)
     .join(' ');
 }
 
@@ -278,7 +255,7 @@ function createHelmCommand({
   namespace: string;
   valuesFile: string | undefined;
   timeout: string;
-  values: Record<string, string | number | boolean>;
+  values: Record<string, string | number>;
   reuseValues?: boolean;
 }) {
   const valuesFileArgs = valuesFile ? `--values ${helmChartDir}/values/${valuesFile}` : '';
@@ -318,7 +295,7 @@ export async function installChaosMeshChart({
   valuesFile,
   helmChartDir,
   chaosMeshNamespace = 'chaos-mesh',
-  timeout = '10m',
+  timeout = '5m',
   clean = true,
   values = {},
   logger,
@@ -337,23 +314,18 @@ export async function installChaosMeshChart({
     // uninstall the helm chart if it exists
     logger.info(`Uninstalling helm chart ${instanceName}`);
     await execAsync(`helm uninstall ${instanceName} --namespace ${chaosMeshNamespace} --wait --ignore-not-found`);
-    // and delete the chaos-mesh resources created by this release
-    const deleteByLabel = async (resource: string) => {
-      const args = {
-        resource,
-        namespace: chaosMeshNamespace,
-        label: `app.kubernetes.io/instance=${instanceName}`,
-      } as const;
-      logger.info(`Deleting ${resource} resources for release ${instanceName}`);
-      await deleteResourceByLabel(args).catch(e => {
-        logger.error(`Error deleting ${resource}: ${e}`);
-        logger.info(`Force deleting ${resource}`);
-        return deleteResourceByLabel({ ...args, force: true });
-      });
+    // and delete the podchaos resource
+    const deleteArgs = {
+      resource: 'podchaos',
+      namespace: chaosMeshNamespace,
+      label: `app.kubernetes.io/instance=${instanceName}`,
     };
-
-    await deleteByLabel('podchaos');
-    await deleteByLabel('networkchaos');
+    logger.info(`Deleting podchaos resource`);
+    await deleteResourceByLabel(deleteArgs).catch(e => {
+      logger.error(`Error deleting podchaos resource: ${e}`);
+      logger.info(`Force deleting podchaos resource`);
+      return deleteResourceByLabel({ ...deleteArgs, force: true });
+    });
   }
 
   return execHelmCommand({
@@ -514,234 +486,12 @@ export async function awaitL2BlockNumber(
 
 export async function restartBot(namespace: string, logger: Logger) {
   logger.info(`Restarting bot`);
-  await deleteResourceByLabel({ resource: 'pods', namespace, label: 'app.kubernetes.io/name=bot' });
+  await deleteResourceByLabel({ resource: 'pods', namespace, label: 'app=bot' });
   await sleep(10 * 1000);
-  // Some bot images may take time to report Ready due to heavy boot-time proving.
-  // Waiting for PodReadyToStartContainers ensures the pod is scheduled and starting without blocking on full readiness.
-  await waitForResourceByLabel({
-    resource: 'pods',
-    namespace,
-    label: 'app.kubernetes.io/name=bot',
-    condition: 'PodReadyToStartContainers',
-  });
+  await waitForResourceByLabel({ resource: 'pods', namespace, label: 'app=bot' });
   logger.info(`Bot restarted`);
 }
 
-/**
- * Installs or upgrades the transfer bot Helm release for the given namespace.
- * Intended for test setup to enable L2 traffic generation only when needed.
- */
-export async function installTransferBot({
-  namespace,
-  spartanDir,
-  logger,
-  replicas = 1,
-  txIntervalSeconds = 10,
-  followChain = 'PENDING',
-  mnemonic = process.env.LABS_INFRA_MNEMONIC ?? 'test test test test test test test test test test test junk',
-  mnemonicStartIndex,
-  botPrivateKey = process.env.BOT_TRANSFERS_L2_PRIVATE_KEY ?? '0xcafe01',
-  nodeUrl,
-  timeout = '15m',
-  reuseValues = true,
-  aztecSlotDuration = Number(process.env.AZTEC_SLOT_DURATION ?? 12),
-}: {
-  namespace: string;
-  spartanDir: string;
-  logger: Logger;
-  replicas?: number;
-  txIntervalSeconds?: number;
-  followChain?: string;
-  mnemonic?: string;
-  mnemonicStartIndex?: number | string;
-  botPrivateKey?: string;
-  nodeUrl?: string;
-  timeout?: string;
-  reuseValues?: boolean;
-  aztecSlotDuration?: number;
-}) {
-  const instanceName = `${namespace}-bot-transfers`;
-  const helmChartDir = getChartDir(spartanDir, 'aztec-bot');
-  const resolvedNodeUrl = nodeUrl ?? `http://${namespace}-rpc-aztec-node.${namespace}.svc.cluster.local:8080`;
-
-  logger.info(`Installing/upgrading transfer bot: replicas=${replicas}, followChain=${followChain}`);
-
-  const values: Record<string, string | number | boolean> = {
-    'bot.replicaCount': replicas,
-    'bot.txIntervalSeconds': txIntervalSeconds,
-    'bot.followChain': followChain,
-    'bot.botPrivateKey': botPrivateKey,
-    'bot.nodeUrl': resolvedNodeUrl,
-    'bot.mnemonic': mnemonic,
-    'bot.feePaymentMethod': 'fee_juice',
-    'aztec.slotDuration': aztecSlotDuration,
-    // Ensure bot can reach its own PXE started in-process (default rpc.port is 8080)
-    // Note: since aztec-bot depends on aztec-node with alias `bot`, env vars go under `bot.node.env`.
-    'bot.node.env.BOT_PXE_URL': 'http://127.0.0.1:8080',
-    // Provide L1 execution RPC for bridging fee juice
-    'bot.node.env.ETHEREUM_HOSTS': `http://${namespace}-eth-execution.${namespace}.svc.cluster.local:8545`,
-    // Provide L1 mnemonic for bridging (falls back to labs mnemonic)
-    'bot.node.env.BOT_L1_MNEMONIC': mnemonic,
-  };
-  // Ensure we derive a funded L1 key (index 0 is funded on anvil default mnemonic)
-  if (mnemonicStartIndex === undefined) {
-    values['bot.mnemonicStartIndex'] = 0;
-  }
-  // Also pass a funded private key directly if available
-  if (process.env.FUNDING_PRIVATE_KEY) {
-    values['bot.node.env.BOT_L1_PRIVATE_KEY'] = process.env.FUNDING_PRIVATE_KEY;
-  }
-  // Align bot image with the running network image: prefer env var, else detect from a validator pod
-  let repositoryFromEnv: string | undefined;
-  let tagFromEnv: string | undefined;
-  const aztecDockerImage = process.env.AZTEC_DOCKER_IMAGE;
-  if (aztecDockerImage && aztecDockerImage.includes(':')) {
-    const lastColon = aztecDockerImage.lastIndexOf(':');
-    repositoryFromEnv = aztecDockerImage.slice(0, lastColon);
-    tagFromEnv = aztecDockerImage.slice(lastColon + 1);
-  }
-
-  let repository = repositoryFromEnv;
-  let tag = tagFromEnv;
-  if (!repository || !tag) {
-    try {
-      const { stdout } = await execAsync(
-        `kubectl get pods -l app.kubernetes.io/component=validator -n ${namespace} -o jsonpath='{.items[0].spec.containers[?(@.name=="aztec")].image}' | cat`,
-      );
-      const image = stdout.trim().replace(/^'|'$/g, '');
-      if (image && image.includes(':')) {
-        const lastColon = image.lastIndexOf(':');
-        repository = image.slice(0, lastColon);
-        tag = image.slice(lastColon + 1);
-      }
-    } catch (err) {
-      logger.warn(`Could not detect aztec image from validator pod: ${String(err)}`);
-    }
-  }
-  if (repository && tag) {
-    values['global.aztecImage.repository'] = repository;
-    values['global.aztecImage.tag'] = tag;
-  }
-  if (mnemonicStartIndex !== undefined) {
-    values['bot.mnemonicStartIndex'] =
-      typeof mnemonicStartIndex === 'string' ? mnemonicStartIndex : Number(mnemonicStartIndex);
-  }
-
-  await execHelmCommand({
-    instanceName,
-    helmChartDir,
-    namespace,
-    valuesFile: undefined,
-    timeout,
-    values: values as unknown as Record<string, string | number | boolean>,
-    reuseValues,
-  });
-
-  if (replicas > 0) {
-    await waitForResourceByLabel({
-      resource: 'pods',
-      namespace,
-      label: 'app.kubernetes.io/name=bot',
-      condition: 'PodReadyToStartContainers',
-    });
-  }
-}
-
-/**
- * Uninstalls the transfer bot Helm release from the given namespace.
- * Intended for test teardown to clean up bot resources.
- */
-export async function uninstallTransferBot(namespace: string, logger: Logger) {
-  const instanceName = `${namespace}-bot-transfers`;
-  logger.info(`Uninstalling transfer bot release ${instanceName}`);
-  await execAsync(`helm uninstall ${instanceName} --namespace ${namespace} --wait --ignore-not-found`);
-  // Ensure any leftover pods are removed
-  await deleteResourceByLabel({ resource: 'pods', namespace, label: 'app.kubernetes.io/name=bot' }).catch(
-    () => undefined,
-  );
-}
-
-/**
- * Enables or disables probabilistic transaction dropping on validators and waits for rollout.
- * Wired to env vars P2P_DROP_TX and P2P_DROP_TX_CHANCE via Helm values.
- */
-export async function setValidatorTxDrop({
-  namespace,
-  enabled,
-  probability,
-  logger,
-}: {
-  namespace: string;
-  enabled: boolean;
-  probability: number;
-  logger: Logger;
-}) {
-  const drop = enabled ? 'true' : 'false';
-  const prob = String(probability);
-
-  const selectors = ['app=validator', 'app.kubernetes.io/component=validator'];
-  let updated = false;
-  for (const selector of selectors) {
-    try {
-      const list = await execAsync(`kubectl get statefulset -l ${selector} -n ${namespace} --no-headers -o name | cat`);
-      const names = list.stdout
-        .split('\n')
-        .map(s => s.trim())
-        .filter(Boolean);
-      if (names.length === 0) {
-        continue;
-      }
-      const cmd = `kubectl set env statefulset -l ${selector} -n ${namespace} P2P_DROP_TX=${drop} P2P_DROP_TX_CHANCE=${prob}`;
-      logger.info(`command: ${cmd}`);
-      await execAsync(cmd);
-      updated = true;
-    } catch (e) {
-      logger.warn(`Failed to update validators with selector ${selector}: ${String(e)}`);
-    }
-  }
-
-  if (!updated) {
-    logger.warn(`No validator StatefulSets found in ${namespace}. Skipping tx drop toggle.`);
-    return;
-  }
-
-  // Restart validator pods to ensure env vars take effect and wait for readiness
-  await restartValidators(namespace, logger);
-}
-
-export async function restartValidators(namespace: string, logger: Logger) {
-  const selectors = ['app=validator', 'app.kubernetes.io/component=validator'];
-  let any = false;
-  for (const selector of selectors) {
-    try {
-      const { stdout } = await execAsync(`kubectl get pods -l ${selector} -n ${namespace} --no-headers -o name | cat`);
-      if (!stdout || stdout.trim().length === 0) {
-        continue;
-      }
-      any = true;
-      await deleteResourceByLabel({ resource: 'pods', namespace, label: selector });
-    } catch (e) {
-      logger.warn(`Error restarting validator pods with selector ${selector}: ${String(e)}`);
-    }
-  }
-
-  if (!any) {
-    logger.warn(`No validator pods found to restart in ${namespace}.`);
-    return;
-  }
-
-  // Wait for either label to be Ready
-  for (const selector of selectors) {
-    try {
-      await waitForResourceByLabel({ resource: 'pods', namespace, label: selector });
-      return;
-    } catch {
-      // try next
-    }
-  }
-  logger.warn(`Validator pods did not report Ready; continuing.`);
-}
-
 export async function enableValidatorDynamicBootNode(
   instanceName: string,
   namespace: string,