@aztec/aztec 0.0.1-commit.b655e406 → 0.0.1-commit.c7c42ec

package/src/testing/anvil_test_watcher.ts

@@ -1,5 +1,6 @@
-import type { ViemClient } from '@aztec/ethereum';
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import type { ViemClient } from '@aztec/ethereum/types';
+import { SlotNumber } from '@aztec/foundation/branded-types';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
@@ -16,11 +17,11 @@ import { type GetContractReturnType, getAddress, getContract } from 'viem';
  * block within the slot. And if so, it will time travel into the next slot.
  */
 export class AnvilTestWatcher {
-  private isSandbox: boolean = false;
+  private isLocalNetwork: boolean = false;
 
   private rollup: GetContractReturnType<typeof RollupAbi, ViemClient>;
   private rollupCheatCodes: RollupCheatCodes;
-  private l2SlotDuration!: bigint;
+  private l2SlotDuration!: number;
 
   private filledRunningPromise?: RunningPromise;
   private syncDateProviderPromise?: RunningPromise;
@@ -54,8 +55,8 @@ export class AnvilTestWatcher {
     this.isMarkingAsProven = isMarkingAsProven;
   }
 
-  setIsSandbox(isSandbox: boolean) {
-    this.isSandbox = isSandbox;
+  setisLocalNetwork(isLocalNetwork: boolean) {
+    this.isLocalNetwork = isLocalNetwork;
   }
 
   async start() {
@@ -68,7 +69,7 @@ export class AnvilTestWatcher {
 
     // If auto mining is not supported (e.g., we are on a real network), then we
     // will simple do nothing. But if on an anvil or the like, this make sure that
-    // the sandbox and tests don't break because time is frozen and we never get to
+    // the local network and tests don't break because time is frozen and we never get to
     // the next slot.
     const isAutoMining = await this.cheatcodes.isAutoMining();
 
@@ -105,7 +106,7 @@ export class AnvilTestWatcher {
   }
 
   async syncDateProviderToL1IfBehind() {
-    // this doesn't apply to the sandbox, because we don't have a date provider in the sandbox
+    // this doesn't apply to the local network, because we don't have a date provider in the local network
     if (!this.dateProvider) {
       return;
     }
@@ -123,12 +124,13 @@ export class AnvilTestWatcher {
 
   async warpTimeIfNeeded() {
     try {
-      const currentSlot = await this.rollup.read.getCurrentSlot();
-      const pendingBlockNumber = BigInt(await this.rollup.read.getPendingBlockNumber());
-      const blockLog = await this.rollup.read.getBlock([pendingBlockNumber]);
-      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([currentSlot + 1n]));
+      const currentSlot = SlotNumber.fromBigInt(await this.rollup.read.getCurrentSlot());
+      const pendingCheckpointNumber = await this.rollup.read.getPendingCheckpointNumber();
+      const checkpointLog = await this.rollup.read.getCheckpoint([pendingCheckpointNumber]);
+      const nextSlot = SlotNumber(currentSlot + 1);
+      const nextSlotTimestamp = Number(await this.rollup.read.getTimestampForSlot([BigInt(nextSlot)]));
 
-      if (currentSlot === blockLog.slotNumber) {
+      if (BigInt(currentSlot) === checkpointLog.slotNumber) {
         // We should jump to the next slot
         try {
           await this.cheatcodes.warp(nextSlotTimestamp, {
@@ -142,8 +144,8 @@ export class AnvilTestWatcher {
         return;
       }
 
-      // If we are not in sandbox, we don't need to warp time
-      if (!this.isSandbox) {
+      // If we are not in local network, we don't need to warp time
+      if (!this.isLocalNetwork) {
         return;
       }
 

package/src/testing/cheat_codes.ts

@@ -1,4 +1,5 @@
 import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import { BlockNumber } from '@aztec/foundation/branded-types';
 import { retryUntil } from '@aztec/foundation/retry';
 import type { DateProvider } from '@aztec/foundation/timer';
 import type { SequencerClient } from '@aztec/sequencer-client';
@@ -37,7 +38,7 @@ export class CheatCodes {
    * @param targetTimestamp - The target timestamp to warp to (in seconds)
    */
   async warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number) {
-    const currentL2BlockNumber = await node.getBlockNumber();
+    const currentL2BlockNumber: BlockNumber = await node.getBlockNumber();
 
     // We warp the L1 timestamp
     await this.eth.warp(targetTimestamp, { resetBlockInterval: true });
@@ -49,7 +50,7 @@ export class CheatCodes {
 
     await retryUntil(
       async () => {
-        const newL2BlockNumber = await node.getBlockNumber();
+        const newL2BlockNumber: BlockNumber = await node.getBlockNumber();
         return newL2BlockNumber > currentL2BlockNumber;
       },
       'new block after warping L2 time',

package/dest/cli/cmds/start_blob_sink.d.ts

@@ -1,3 +0,0 @@
-import type { LogFn } from '@aztec/foundation/log';
-export declare function startBlobSink(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn): Promise<void>;
-//# sourceMappingURL=start_blob_sink.d.ts.map

package/dest/cli/cmds/start_blob_sink.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"start_blob_sink.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_blob_sink.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAKnD,wBAAsB,aAAa,CAAC,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,iBA4CxG"}

package/dest/cli/cmds/start_blob_sink.js

@@ -1,33 +0,0 @@
-import { blobSinkConfigMappings, createBlobSinkServer, getBlobSinkConfigFromEnv } from '@aztec/blob-sink/server';
-import { getL1Config } from '@aztec/cli/config';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { extractRelevantOptions } from '../util.js';
-export async function startBlobSink(options, signalHandlers, userLog) {
-    if (options.prover || options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-        userLog(`Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`);
-        process.exit(1);
-    }
-    let blobSinkConfig = {
-        ...getBlobSinkConfigFromEnv(),
-        ...extractRelevantOptions(options, blobSinkConfigMappings, 'blobSink')
-    };
-    if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
-        throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
-    }
-    if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
-        throw new Error('ETHEREUM_HOSTS not set');
-    }
-    if (typeof blobSinkConfig.l1ChainId !== 'number') {
-        throw new Error('L1_CHAIN_ID');
-    }
-    const telemetry = initTelemetryClient(getTelemetryClientConfig());
-    const { config: chainConfig, addresses } = await getL1Config(blobSinkConfig.l1Contracts.registryAddress, blobSinkConfig.l1RpcUrls, blobSinkConfig.l1ChainId, blobSinkConfig.rollupVersion);
-    blobSinkConfig = {
-        ...blobSinkConfig,
-        l1Contracts: addresses,
-        ...chainConfig
-    };
-    const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
-    signalHandlers.push(blobSink.stop.bind(blobSink));
-    await blobSink.start();
-}

package/dest/sandbox/banana_fpc.d.ts

@@ -1,10 +0,0 @@
-import { type InitialAccountData } from '@aztec/accounts/testing';
-import type { Wallet } from '@aztec/aztec.js/wallet';
-import type { LogFn } from '@aztec/foundation/log';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-export declare function getBananaCoinAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function getBananaFPCAddress(initialAccounts: InitialAccountData[]): Promise<AztecAddress>;
-export declare function setupBananaFPC(initialAccounts: InitialAccountData[], wallet: Wallet, log: LogFn): Promise<void>;
-export declare function registerDeployedBananaCoinInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-export declare function registerDeployedBananaFPCInWalletAndGetAddress(wallet: Wallet): Promise<AztecAddress>;
-//# sourceMappingURL=banana_fpc.d.ts.map

package/dest/sandbox/banana_fpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"banana_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/banana_fpc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,kBAAkB,EAA8B,MAAM,yBAAyB,CAAC;AAC9F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAwB3D,wBAAsB,oBAAoB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE/E;AAWD,wBAAsB,mBAAmB,CAAC,eAAe,EAAE,kBAAkB,EAAE,yBAE9E;AAED,wBAAsB,cAAc,CAAC,eAAe,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,iBAcrG;AAED,wBAAsB,+CAA+C,CAAC,MAAM,EAAE,MAAM,yBAMnF;AAED,wBAAsB,8CAA8C,CAAC,MAAM,EAAE,MAAM,yBAMlF"}

package/dest/sandbox/index.d.ts

@@ -1,4 +0,0 @@
-export * from './sandbox.js';
-export { registerDeployedBananaCoinInWalletAndGetAddress, registerDeployedBananaFPCInWalletAndGetAddress, } from './banana_fpc.js';
-export { registerDeployedSponsoredFPCInWalletAndGetAddress } from './sponsored_fpc.js';
-//# sourceMappingURL=index.d.ts.map

package/dest/sandbox/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/sandbox/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAE7B,OAAO,EACL,+CAA+C,EAC/C,8CAA8C,GAC/C,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,iDAAiD,EAAE,MAAM,oBAAoB,CAAC"}

package/dest/sandbox/sandbox.d.ts

@@ -1,74 +0,0 @@
-#!/usr/bin/env -S node --no-warnings
-import { type AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
-import { EthAddress } from '@aztec/aztec.js/addresses';
-import { type BlobSinkClientInterface } from '@aztec/blob-sink/client';
-import { Fr } from '@aztec/foundation/fields';
-import { type LogFn } from '@aztec/foundation/log';
-import { DateProvider } from '@aztec/foundation/timer';
-import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
-import { type TelemetryClient } from '@aztec/telemetry-client';
-import { type HDAccount, type PrivateKeyAccount } from 'viem';
-/**
- * Function to deploy our L1 contracts to the sandbox L1
- * @param aztecNodeConfig - The Aztec Node Config
- * @param hdAccount - Account for publishing L1 contracts
- */
-export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hdAccount: HDAccount | PrivateKeyAccount, contractDeployLogger?: import("@aztec/foundation/log").Logger, opts?: {
-    assumeProvenThroughBlockNumber?: number;
-    salt?: number;
-    genesisArchiveRoot?: Fr;
-    feeJuicePortalInitialBalance?: bigint;
-}): Promise<{
-    rollupAddress: EthAddress;
-    registryAddress: EthAddress;
-    inboxAddress: EthAddress;
-    outboxAddress: EthAddress;
-    feeJuiceAddress: EthAddress;
-    feeJuicePortalAddress: EthAddress;
-    coinIssuerAddress: EthAddress;
-    rewardDistributorAddress: EthAddress;
-    governanceProposerAddress: EthAddress;
-    governanceAddress: EthAddress;
-    stakingAssetAddress: EthAddress;
-} & {
-    slashFactoryAddress?: EthAddress | undefined;
-    feeAssetHandlerAddress?: EthAddress | undefined;
-    stakingAssetHandlerAddress?: EthAddress | undefined;
-    zkPassportVerifierAddress?: EthAddress | undefined;
-    gseAddress?: EthAddress | undefined;
-    dateGatedRelayerAddress?: EthAddress | undefined;
-} & {
-    rollupAddress: EthAddress;
-} & {
-    rollupAddress: EthAddress;
-}>;
-/** Sandbox settings. */
-export type SandboxConfig = AztecNodeConfig & {
-    /** Mnemonic used to derive the L1 deployer private key.*/
-    l1Mnemonic: string;
-    /** Salt used to deploy L1 contracts.*/
-    deployAztecContractsSalt: string;
-    /** Whether to deploy test accounts on sandbox start.*/
-    testAccounts: boolean;
-};
-/**
- * Create and start a new Aztec Node and PXE. Deploys L1 contracts.
- * Does not start any HTTP services nor populate any initial accounts.
- * @param config - Optional Sandbox settings.
- */
-export declare function createSandbox(config: Partial<SandboxConfig> | undefined, userLog: LogFn): Promise<{
-    node: AztecNodeService;
-    stop: () => Promise<void>;
-}>;
-/**
- * Create and start a new Aztec RPC HTTP Server
- * @param config - Optional Aztec node settings.
- */
-export declare function createAztecNode(config?: Partial<AztecNodeConfig>, deps?: {
-    telemetry?: TelemetryClient;
-    blobSinkClient?: BlobSinkClientInterface;
-    dateProvider?: DateProvider;
-}, options?: {
-    prefilledPublicData?: PublicDataTreeLeaf[];
-}): Promise<AztecNodeService>;
-//# sourceMappingURL=sandbox.d.ts.map

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAY7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAIjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,yCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;GAgHtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D"}

package/dest/sandbox/sponsored_fpc.d.ts

@@ -1,4 +0,0 @@
-import type { Wallet } from '@aztec/aztec.js/wallet';
-export declare function getSponsoredFPCAddress(): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
-export declare function registerDeployedSponsoredFPCInWalletAndGetAddress(wallet: Wallet): Promise<import("@aztec/aztec.js/addresses").AztecAddress>;
-//# sourceMappingURL=sponsored_fpc.d.ts.map

package/dest/sandbox/sponsored_fpc.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sponsored_fpc.d.ts","sourceRoot":"","sources":["../../src/sandbox/sponsored_fpc.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAUrD,wBAAsB,sBAAsB,8DAE3C;AAED,wBAAsB,iDAAiD,CAAC,MAAM,EAAE,MAAM,6DAKrF"}

package/src/cli/cmds/start_blob_sink.ts

@@ -1,57 +0,0 @@
-import {
-  type BlobSinkConfig,
-  blobSinkConfigMappings,
-  createBlobSinkServer,
-  getBlobSinkConfigFromEnv,
-} from '@aztec/blob-sink/server';
-import { getL1Config } from '@aztec/cli/config';
-import type { LogFn } from '@aztec/foundation/log';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-
-import { extractRelevantOptions } from '../util.js';
-
-export async function startBlobSink(options: any, signalHandlers: (() => Promise<void>)[], userLog: LogFn) {
-  if (options.prover || options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
-    userLog(
-      `Starting a blob sink with --node, --sequencer, --pxe, --p2p-bootstrap, --prover or --txe is not supported.`,
-    );
-    process.exit(1);
-  }
-
-  let blobSinkConfig: BlobSinkConfig = {
-    ...getBlobSinkConfigFromEnv(), // get default config from env
-    ...extractRelevantOptions<BlobSinkConfig>(options, blobSinkConfigMappings, 'blobSink'), // override with command line options
-  };
-
-  if (!blobSinkConfig.l1Contracts?.registryAddress || blobSinkConfig.l1Contracts.registryAddress.isZero()) {
-    throw new Error('REGISTRY_CONTRACT_ADDRESS not set');
-  }
-
-  if (!blobSinkConfig.l1RpcUrls || blobSinkConfig.l1RpcUrls.length === 0) {
-    throw new Error('ETHEREUM_HOSTS not set');
-  }
-
-  if (typeof blobSinkConfig.l1ChainId !== 'number') {
-    throw new Error('L1_CHAIN_ID');
-  }
-
-  const telemetry = initTelemetryClient(getTelemetryClientConfig());
-
-  const { config: chainConfig, addresses } = await getL1Config(
-    blobSinkConfig.l1Contracts.registryAddress,
-    blobSinkConfig.l1RpcUrls,
-    blobSinkConfig.l1ChainId,
-    blobSinkConfig.rollupVersion,
-  );
-
-  blobSinkConfig = {
-    ...blobSinkConfig,
-    l1Contracts: addresses,
-    ...chainConfig,
-  };
-
-  const blobSink = await createBlobSinkServer(blobSinkConfig, telemetry);
-  signalHandlers.push(blobSink.stop.bind(blobSink));
-
-  await blobSink.start();
-}