@aztec/end-to-end 1.0.0-nightly.20250708 → 1.0.0-staging.0

package/src/spartan/setup_test_wallets.ts

@@ -5,11 +5,9 @@ import {
   type AztecAddress,
   type AztecNode,
   FeeJuicePaymentMethodWithClaim,
-  type FeePaymentMethod,
   Fr,
   L1FeeJuicePortalManager,
   type PXE,
-  SponsoredFeePaymentMethod,
   createAztecNodeClient,
   createCompatibleClient,
   retryUntil,
@@ -17,13 +15,8 @@ import {
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
-import { createPXEService } from '@aztec/pxe/server';
 import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
-import { getACVMConfig } from '../fixtures/get_acvm_config.js';
-import { getBBConfig } from '../fixtures/get_bb_config.js';
-import { getSponsoredFPCAddress, registerSponsoredFPC } from '../fixtures/utils.js';
-
 export interface TestWallets {
   pxe: PXE;
   wallets: AccountWalletWithSecretKey[];
@@ -49,47 +42,7 @@ export async function setupTestWalletsWithTokens(
   const [recipientWallet, ...wallets] = (await getDeployedTestAccountsWallets(pxe)).slice(0, WALLET_COUNT + 1);
 
   const tokenAdmin = wallets[0];
-  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
-  const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
-
-  return { pxe, wallets, tokenAdminWallet, tokenName: TOKEN_NAME, tokenAddress, recipientWallet };
-}
-
-export async function deploySponsoredTestWallets(
-  pxe: PXE,
-  mintAmount: bigint,
-  logger: Logger,
-  numberOfFundedWallets = 1,
-): Promise<TestWallets> {
-  const [recipient, ...funded] = await generateSchnorrAccounts(numberOfFundedWallets + 1);
-  const recipientWallet = await getSchnorrWalletWithSecretKey(
-    pxe,
-    recipient.secret,
-    recipient.signingKey,
-    recipient.salt,
-  );
-  const fundedAccounts = await Promise.all(funded.map(a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
-
-  await registerSponsoredFPC(pxe);
-
-  const wallets = await Promise.all(
-    fundedAccounts.map(async a => {
-      const wallet = await a.getWallet();
-      const paymentMethod = new SponsoredFeePaymentMethod(await getSponsoredFPCAddress());
-      await a.deploy({ fee: { paymentMethod } }).wait({ timeout: 2400 }); // increase timeout on purpose in order to account for two empty epochs
-      logger.info(`Account deployed at ${a.getAddress()}`);
-      return wallet;
-    }),
-  );
-
-  const tokenAdmin = wallets[0];
-  const tokenAddress = await deployTokenAndMint(
-    wallets,
-    tokenAdmin.getAddress(),
-    mintAmount,
-    new SponsoredFeePaymentMethod(await getSponsoredFPCAddress()),
-    logger,
-  );
+  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
   const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
 
   return { pxe, wallets, tokenAdminWallet, tokenName: TOKEN_NAME, tokenAddress, recipientWallet };
@@ -136,7 +89,7 @@ export async function deployTestWalletWithTokens(
   );
 
   const tokenAdmin = wallets[0];
-  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, undefined, logger);
+  const tokenAddress = await deployTokenAndMint(wallets, tokenAdmin.getAddress(), mintAmount, logger);
   const tokenAdminWallet = await TokenContract.at(tokenAddress, tokenAdmin);
 
   return { pxe, wallets, tokenAdminWallet, tokenName: TOKEN_NAME, tokenAddress, recipientWallet };
@@ -176,16 +129,11 @@ async function deployTokenAndMint(
   wallets: AccountWalletWithSecretKey[],
   admin: AztecAddress,
   mintAmount: bigint,
-  paymentMethod: FeePaymentMethod | undefined,
   logger: Logger,
 ) {
   logger.verbose(`Deploying TokenContract...`);
   const tokenContract = await TokenContract.deploy(wallets[0], admin, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS)
-    .send({
-      fee: {
-        paymentMethod,
-      },
-    })
+    .send()
     .deployed({ timeout: 600 });
 
   const tokenAddress = tokenContract.address;
@@ -196,7 +144,7 @@ async function deployTokenAndMint(
     wallets.map(async w =>
       (await TokenContract.at(tokenAddress, w)).methods
         .mint_to_public(w.getAddress(), mintAmount)
-        .send({ fee: { paymentMethod } })
+        .send()
         .wait({ timeout: 600 }),
     ),
   );
@@ -238,28 +186,3 @@ export async function performTransfers({
     logger.info(`Completed round ${i + 1} / ${rounds}`);
   }
 }
-
-export async function startCompatiblePXE(
-  nodeUrl: string,
-  proverEnabled: boolean,
-  logger: Logger,
-): Promise<{ pxe: PXE; cleanup: () => Promise<void> }> {
-  const node = createAztecNodeClient(nodeUrl);
-  const [bbConfig, acvmConfig] = await Promise.all([getBBConfig(logger), getACVMConfig(logger)]);
-  const pxe = await createPXEService(node, {
-    dataDirectory: undefined,
-    dataStoreMapSizeKB: 1024 * 1024,
-    ...bbConfig,
-    ...acvmConfig,
-    proverEnabled,
-  });
-
-  return {
-    pxe,
-    async cleanup() {
-      await pxe.stop();
-      await bbConfig?.cleanup();
-      await acvmConfig?.cleanup();
-    },
-  };
-}

package/src/spartan/utils.ts

@@ -1,5 +1,5 @@
 import { createLogger, sleep } from '@aztec/aztec.js';
-import type { RollupCheatCodes } from '@aztec/aztec/testing';
+import type { RollupCheatCodes } from '@aztec/aztec.js/testing';
 import type { Logger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import type { SequencerConfig } from '@aztec/sequencer-client';
@@ -34,7 +34,6 @@ const k8sLocalConfigSchema = z.object({
   AZTEC_SLOT_DURATION: z.coerce.number().min(1, 'AZTEC_SLOT_DURATION env variable must be set'),
   AZTEC_EPOCH_DURATION: z.coerce.number().min(1, 'AZTEC_EPOCH_DURATION env variable must be set'),
   AZTEC_PROOF_SUBMISSION_WINDOW: z.coerce.number().min(1, 'AZTEC_PROOF_SUBMISSION_WINDOW env variable must be set'),
-  AZTEC_REAL_PROOFS: z.string().default('false'),
   INSTANCE_NAME: z.string().min(1, 'INSTANCE_NAME env variable must be set'),
   NAMESPACE: z.string().min(1, 'NAMESPACE env variable must be set'),
   CONTAINER_NODE_PORT: z.coerce.number().default(8080),
@@ -57,7 +56,6 @@ const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
   K8S: z.literal('gcloud'),
   CLUSTER_NAME: z.string().min(1, 'CLUSTER_NAME env variable must be set'),
   REGION: z.string().min(1, 'REGION env variable must be set'),
-  PROJECT_ID: z.string().min(1, 'PROJECT_ID env variable must be set'),
 });
 
 const directConfigSchema = z.object({
@@ -86,7 +84,7 @@ export function isGCloudConfig(config: EnvConfig): config is K8sGCloudConfig {
 export function setupEnvironment(env: unknown): EnvConfig {
   const config = envSchema.parse(env);
   if (isGCloudConfig(config)) {
-    const command = `gcloud container clusters get-credentials ${config.CLUSTER_NAME} --region=${config.REGION} --project=${config.PROJECT_ID}`;
+    const command = `gcloud container clusters get-credentials ${config.CLUSTER_NAME} --region=${config.REGION}`;
     execSync(command);
   }
   return config;
@@ -235,14 +233,12 @@ export async function deleteResourceByLabel({
   resource,
   namespace,
   label,
-  timeout = '5m',
 }: {
   resource: string;
   namespace: string;
   label: string;
-  timeout?: string;
 }) {
-  const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true --timeout=${timeout}`;
+  const command = `kubectl delete ${resource} -l ${label} -n ${namespace} --ignore-not-found=true --wait=true`;
   logger.info(`command: ${command}`);
   const { stdout } = await execAsync(command);
   return stdout;