@aztec/end-to-end 0.81.0 → 0.82.1-alpha-testnet.1

package/src/simulators/lending_simulator.ts

@@ -1,14 +1,11 @@
 // Convenience struct to hold an account's address and secret that can easily be passed around.
 import { AztecAddress, Fr } from '@aztec/aztec.js';
 import { CheatCodes } from '@aztec/aztec.js/testing';
+import type { RollupContract } from '@aztec/ethereum';
 import { pedersenHash } from '@aztec/foundation/crypto';
 import type { TestDateProvider } from '@aztec/foundation/timer';
-import type { RollupAbi } from '@aztec/l1-artifacts';
 import type { LendingContract } from '@aztec/noir-contracts.js/Lending';
 
-import type { Account, GetContractReturnType, HttpTransport, WalletClient } from 'viem';
-import type * as chains from 'viem/chains';
-
 import type { TokenSimulator } from './token_simulator.js';
 
 /**
@@ -84,7 +81,7 @@ export class LendingSimulator {
     private rate: bigint,
     private ethereumSlotDuration: number,
     /** the rollup contract */
-    public rollup: GetContractReturnType<typeof RollupAbi, WalletClient<HttpTransport, chains.Chain, Account>>,
+    public rollup: RollupContract,
     /** the lending contract */
     public lendingContract: LendingContract,
     /** the collateral asset used in the lending contract */
@@ -95,10 +92,8 @@ export class LendingSimulator {
 
   async prepare() {
     this.accumulator = BASE;
-    const slot = await this.rollup.read.getSlotAt([
-      BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration),
-    ]);
-    this.time = Number(await this.rollup.read.getTimestampForSlot([slot]));
+    const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()) + BigInt(this.ethereumSlotDuration));
+    this.time = Number(await this.rollup.getTimestampForSlot(slot));
   }
 
   async progressSlots(diff: number, dateProvider?: TestDateProvider) {
@@ -106,8 +101,8 @@ export class LendingSimulator {
       return;
     }
 
-    const slot = await this.rollup.read.getSlotAt([BigInt(await this.cc.eth.timestamp())]);
-    const ts = Number(await this.rollup.read.getTimestampForSlot([slot + BigInt(diff)]));
+    const slot = await this.rollup.getSlotAt(BigInt(await this.cc.eth.timestamp()));
+    const ts = Number(await this.rollup.getTimestampForSlot(slot + BigInt(diff)));
     const timeDiff = ts - this.time;
     this.time = ts;
 
@@ -116,7 +111,7 @@ export class LendingSimulator {
     if (dateProvider) {
       dateProvider.setTime(this.time * 1000);
     }
-    await this.cc.rollup.markAsProven(await this.rollup.read.getPendingBlockNumber());
+    await this.cc.rollup.markAsProven(await this.rollup.getBlockNumber());
     this.accumulator = muldivDown(this.accumulator, computeMultiplier(this.rate, BigInt(timeDiff)), BASE);
   }
 

package/src/spartan/setup_test_wallets.ts

@@ -15,6 +15,7 @@ import {
 import { createEthereumChain, createL1Clients } from '@aztec/ethereum';
 import type { Logger } from '@aztec/foundation/log';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
+import type { AztecNodeAdmin } from '@aztec/stdlib/interfaces/client';
 
 export interface TestWallets {
   pxe: PXE;
@@ -55,7 +56,6 @@ export async function deployTestWalletWithTokens(
   mintAmount: bigint,
   logger: Logger,
   numberOfFundedWallets = 1,
-  initialFeeJuice = 10n ** 22n,
 ): Promise<TestWallets> {
   const pxe = await createCompatibleClient(pxeUrl, logger);
   const node = createAztecNodeClient(nodeUrl);
@@ -70,9 +70,7 @@ export async function deployTestWalletWithTokens(
   const fundedAccounts = await Promise.all(funded.map(a => getSchnorrAccount(pxe, a.secret, a.signingKey, a.salt)));
 
   const claims = await Promise.all(
-    fundedAccounts.map(a =>
-      bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), initialFeeJuice, logger),
-    ),
+    fundedAccounts.map(a => bridgeL1FeeJuice(l1RpcUrls, mnemonicOrPrivateKey, pxe, a.getAddress(), undefined, logger)),
   );
 
   // Progress by 2 L2 blocks so that the l1ToL2Message added above will be available to use on L2.
@@ -101,15 +99,17 @@ async function bridgeL1FeeJuice(
   mnemonicOrPrivateKey: string,
   pxe: PXE,
   recipient: AztecAddress,
-  amount: bigint,
+  amount: bigint | undefined,
   log: Logger,
 ) {
   const { l1ChainId } = await pxe.getNodeInfo();
   const chain = createEthereumChain(l1RpcUrls, l1ChainId);
   const { publicClient, walletClient } = createL1Clients(chain.rpcUrls, mnemonicOrPrivateKey, chain.chainInfo);
 
+  // docs:start:bridge_fee_juice
   const portal = await L1FeeJuicePortalManager.new(pxe, publicClient, walletClient, log);
   const claim = await portal.bridgeTokensPublic(recipient, amount, true /* mint */);
+  // docs:end:bridge_fee_juice
 
   const isSynced = async () => await pxe.isL1ToL2MessageSynced(Fr.fromHexString(claim.messageHash));
   await retryUntil(isSynced, `message ${claim.messageHash} sync`, 24, 0.5);
@@ -118,9 +118,9 @@ async function bridgeL1FeeJuice(
   return claim;
 }
 
-async function advanceL2Block(node: AztecNode) {
+async function advanceL2Block(node: AztecNode, nodeAdmin?: AztecNodeAdmin) {
   const initialBlockNumber = await node.getBlockNumber();
-  await node!.flushTxs();
+  await nodeAdmin?.flushTxs();
   await retryUntil(async () => (await node.getBlockNumber()) >= initialBlockNumber + 1);
 }
 

package/src/spartan/utils.ts

@@ -1,8 +1,9 @@
-import { createAztecNodeClient, createLogger, sleep } from '@aztec/aztec.js';
+import { createLogger, sleep } from '@aztec/aztec.js';
 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';
+import { createAztecNodeAdminClient } from '@aztec/stdlib/interfaces/client';
 
 import { ChildProcess, exec, execSync, spawn } from 'child_process';
 import path from 'path';
@@ -36,6 +37,7 @@ const k8sLocalConfigSchema = z.object({
   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),
+  CONTAINER_NODE_ADMIN_PORT: z.coerce.number().default(8880),
   CONTAINER_SEQUENCER_PORT: z.coerce.number().default(8080),
   CONTAINER_PROVER_NODE_PORT: z.coerce.number().default(8080),
   CONTAINER_PXE_PORT: z.coerce.number().default(8080),
@@ -59,6 +61,7 @@ const k8sGCloudConfigSchema = k8sLocalConfigSchema.extend({
 const directConfigSchema = z.object({
   PXE_URL: z.string().url('PXE_URL must be a valid URL'),
   NODE_URL: z.string().url('NODE_URL must be a valid URL'),
+  NODE_ADMIN_URL: z.string().url('NODE_ADMIN_URL must be a valid URL'),
   ETHEREUM_HOSTS: ethereumHostsSchema,
   K8S: z.literal('false'),
 });
@@ -559,7 +562,7 @@ export async function runAlertCheck(config: EnvConfig, alerts: AlertConfig[], lo
 }
 
 export async function updateSequencerConfig(url: string, config: Partial<SequencerConfig>) {
-  const node = createAztecNodeClient(url);
+  const node = createAztecNodeAdminClient(url);
   // Retry incase the port forward is not ready yet
   await retry(() => node.setConfig(config), 'Update sequencer config', makeBackoff([1, 3, 6]), logger);
 }
@@ -570,7 +573,7 @@ export async function getSequencers(namespace: string) {
   return stdout.split(' ');
 }
 
-export async function updateK8sSequencersConfig(args: {
+async function updateK8sSequencersConfig(args: {
   containerPort: number;
   namespace: string;
   config: Partial<SequencerConfig>;
@@ -593,12 +596,12 @@ export async function updateK8sSequencersConfig(args: {
 export async function updateSequencersConfig(env: EnvConfig, config: Partial<SequencerConfig>) {
   if (isK8sConfig(env)) {
     await updateK8sSequencersConfig({
-      containerPort: env.CONTAINER_NODE_PORT,
+      containerPort: env.CONTAINER_NODE_ADMIN_PORT,
       namespace: env.NAMESPACE,
       config,
     });
   } else {
-    await updateSequencerConfig(env.NODE_URL, config);
+    await updateSequencerConfig(env.NODE_ADMIN_URL, config);
   }
 }