@aztec/aztec.js 0.66.0 → 0.67.1-devnet

package/src/index.ts

@@ -13,29 +13,12 @@
  * ```typescript
  *   import { TxHash } from '@aztec.js/tx_hash'
  *   import { type ContractArtifact, type FunctionArtifact, FunctionSelector } from '@aztec/aztec.js/abi';
- *   import { AztecAddress } from '@aztec/aztec.js/aztec_address';
+ *   import { AztecAddress } from '@aztec/aztec.js/addresses';
  *   import { EthAddress } from '@aztec/aztec.js/eth_address';
  * ```
  *
  * TODO: Ultimately reimplement this mega exporter by mega exporting a granular api (then deprecate it).
  */
-export {
-  BatchCall,
-  Contract,
-  ContractBase,
-  ContractFunctionInteraction,
-  DefaultWaitOpts,
-  DeployMethod,
-  DeploySentTx,
-  SentTx,
-  type ContractMethod,
-  type ContractNotes,
-  type ContractStorageLayout,
-  type DeployOptions,
-  type ProfileResult,
-  type SendMethodOptions,
-  type WaitOpts,
-} from './contract/index.js';
 
 export { ContractDeployer } from './deployment/index.js';
 
@@ -53,6 +36,7 @@ export {
   generatePublicKey,
   readFieldCompressedString,
   waitForPXE,
+  waitForNode,
   type AztecAddressLike,
   type EthAddressLike,
   type EventSelectorLike,
@@ -78,7 +62,6 @@ export { AccountWallet, AccountWalletWithSecretKey, SignerlessWallet, type Walle
 // // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
 // // here once the issue is resolved.
 export {
-  AztecAddress,
   ContractClassWithId,
   ContractInstanceWithAddress,
   EthAddress,
@@ -109,7 +92,6 @@ export {
   AuthWitness,
   Body,
   Comparator,
-  CompleteAddress,
   ContractClass2BlockL2Logs,
   EncryptedLogPayload,
   EpochProofQuote,
@@ -148,7 +130,6 @@ export {
   type PXE,
   type PartialAddress,
   type PublicKey,
-  type SyncStatus,
 } from '@aztec/circuit-types';
 
 // TODO: These kinds of things have no place on our public api.
@@ -158,7 +139,7 @@ export { decodeFromAbi, encodeArguments, type AbiType } from '@aztec/foundation/
 export { toBigIntBE } from '@aztec/foundation/bigint-buffer';
 export { sha256 } from '@aztec/foundation/crypto';
 export { makeFetch } from '@aztec/foundation/json-rpc/client';
-export { createDebugLogger, type DebugLogger } from '@aztec/foundation/log';
+export { createLogger, type Logger } from '@aztec/foundation/log';
 export { retry, retryUntil } from '@aztec/foundation/retry';
 export { to2Fields, toBigInt } from '@aztec/foundation/serialize';
 export { sleep } from '@aztec/foundation/sleep';
@@ -174,3 +155,6 @@ export { EthCheatCodes, deployL1Contract, deployL1Contracts, type DeployL1Contra
 export * from './api/abi.js';
 export * from './api/fee.js';
 export * from './api/init.js';
+// Granular export, even if not in the api folder
+export * from './contract/index.js';
+export * from './api/addresses.js';

package/src/rpc_clients/node/index.ts

@@ -1,6 +1,6 @@
 import { type PXE } from '@aztec/circuit-types';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
-import { type DebugLogger } from '@aztec/foundation/log';
+import { type Logger } from '@aztec/foundation/log';
 import { NoRetryError, makeBackoff, retry } from '@aztec/foundation/retry';
 
 import { Axios, type AxiosError } from 'axios';
@@ -51,7 +51,7 @@ async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndp
  * @param _logger - Debug logger to warn version incompatibilities.
  * @returns A PXE client.
  */
-export function createCompatibleClient(rpcUrl: string, logger: DebugLogger): Promise<PXE> {
+export function createCompatibleClient(rpcUrl: string, logger: Logger): Promise<PXE> {
   // Use axios due to timeout issues with fetch when proving TXs.
   const fetch = async (host: string, rpcMethod: string, body: any, useApiEndpoints: boolean) => {
     return await retry(

package/src/rpc_clients/pxe_client.ts

@@ -1,4 +1,4 @@
-import { type PXE, PXESchema } from '@aztec/circuit-types';
+import { type PXE, PXESchema } from '@aztec/circuit-types/interfaces';
 import { createSafeJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**

package/src/utils/anvil_test_watcher.ts

@@ -1,4 +1,4 @@
-import { type DebugLogger, type EthCheatCodes, createDebugLogger } from '@aztec/aztec.js';
+import { type EthCheatCodes, type Logger, createLogger } from '@aztec/aztec.js';
 import { type EthAddress } from '@aztec/circuits.js';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { RollupAbi } from '@aztec/l1-artifacts';
@@ -18,7 +18,7 @@ export class AnvilTestWatcher {
 
   private filledRunningPromise?: RunningPromise;
 
-  private logger: DebugLogger = createDebugLogger(`aztec:utils:watcher`);
+  private logger: Logger = createLogger(`aztecjs:utils:watcher`);
 
   constructor(
     private cheatcodes: EthCheatCodes,
@@ -31,7 +31,7 @@ export class AnvilTestWatcher {
       client: publicClient,
     });
 
-    this.logger.info(`Watcher created for rollup at ${rollupAddress}`);
+    this.logger.debug(`Watcher created for rollup at ${rollupAddress}`);
   }
 
   async start() {
@@ -46,9 +46,9 @@ export class AnvilTestWatcher {
     const isAutoMining = await this.cheatcodes.isAutoMining();
 
     if (isAutoMining) {
-      this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), 1000);
+      this.filledRunningPromise = new RunningPromise(() => this.mineIfSlotFilled(), this.logger, 1000);
       this.filledRunningPromise.start();
-      this.logger.info(`Watcher started`);
+      this.logger.info(`Watcher started for rollup at ${this.rollup.address}`);
     } else {
       this.logger.info(`Watcher not started because not auto mining`);
     }

package/src/utils/cheat_codes.ts

@@ -2,7 +2,7 @@ import { type EpochProofClaim, type Note, type PXE } from '@aztec/circuit-types'
 import { type AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
 import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
 import { EthCheatCodes, type L1ContractAddresses } from '@aztec/ethereum';
-import { createDebugLogger } from '@aztec/foundation/log';
+import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 
 import {
@@ -51,7 +51,7 @@ export class RollupCheatCodes {
   private client: WalletClient & PublicClient;
   private rollup: GetContractReturnType<typeof RollupAbi, WalletClient>;
 
-  private logger = createDebugLogger('aztec:js:cheat_codes');
+  private logger = createLogger('aztecjs:cheat_codes');
 
   constructor(private ethCheatCodes: EthCheatCodes, addresses: Pick<L1ContractAddresses, 'rollupAddress'>) {
     this.client = createWalletClient({ chain: foundry, transport: http(ethCheatCodes.rpcUrl) }).extend(publicActions);
@@ -197,7 +197,7 @@ export class AztecCheatCodes {
     /**
      * The logger to use for the aztec cheatcodes
      */
-    public logger = createDebugLogger('aztec:cheat_codes:aztec'),
+    public logger = createLogger('aztecjs:cheat_codes'),
   ) {}
 
   /**

package/src/utils/index.ts

@@ -4,6 +4,7 @@ export * from './abi_types.js';
 export * from './cheat_codes.js';
 export * from './authwit.js';
 export * from './pxe.js';
+export * from './node.js';
 export * from './anvil_test_watcher.js';
 export * from './field_compressed_string.js';
 export * from './portal_manager.js';

package/src/utils/node.ts

@@ -0,0 +1,17 @@
+import { type AztecNode } from '@aztec/circuit-types';
+import { type Logger } from '@aztec/foundation/log';
+import { retryUntil } from '@aztec/foundation/retry';
+
+export const waitForNode = async (node: AztecNode, logger?: Logger) => {
+  await retryUntil(async () => {
+    try {
+      logger?.verbose('Attempting to contact Aztec node...');
+      await node.getNodeInfo();
+      logger?.verbose('Contacted Aztec node');
+      return true;
+    } catch (error) {
+      logger?.verbose('Failed to contact Aztec Node');
+    }
+    return undefined;
+  }, 'RPC Get Node Info');
+};

package/src/utils/portal_manager.ts

@@ -1,8 +1,8 @@
 import {
   type AztecAddress,
-  type DebugLogger,
   EthAddress,
   Fr,
+  type Logger,
   type PXE,
   type SiblingPath,
   computeSecretHash,
@@ -49,7 +49,7 @@ function stringifyEthAddress(address: EthAddress | Hex, name?: string) {
 }
 
 /** Generates a pair secret and secret hash */
-export function generateClaimSecret(logger?: DebugLogger): [Fr, Fr] {
+export function generateClaimSecret(logger?: Logger): [Fr, Fr] {
   const secret = Fr.random();
   const secretHash = computeSecretHash(secret);
   logger?.verbose(`Generated claim secret=${secret.toString()} hash=${secretHash.toString()}`);
@@ -65,7 +65,7 @@ export class L1TokenManager {
     public readonly address: EthAddress,
     private publicClient: PublicClient<HttpTransport, Chain>,
     private walletClient: WalletClient<HttpTransport, Chain, Account>,
-    private logger: DebugLogger,
+    private logger: Logger,
   ) {
     this.contract = getContract({
       address: this.address.toString(),
@@ -122,7 +122,7 @@ export class L1FeeJuicePortalManager {
     tokenAddress: EthAddress,
     private readonly publicClient: PublicClient<HttpTransport, Chain>,
     private readonly walletClient: WalletClient<HttpTransport, Chain, Account>,
-    private readonly logger: DebugLogger,
+    private readonly logger: Logger,
   ) {
     this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
     this.contract = getContract({
@@ -192,7 +192,7 @@ export class L1FeeJuicePortalManager {
     pxe: PXE,
     publicClient: PublicClient<HttpTransport, Chain>,
     walletClient: WalletClient<HttpTransport, Chain, Account>,
-    logger: DebugLogger,
+    logger: Logger,
   ): Promise<L1FeeJuicePortalManager> {
     const {
       l1ContractAddresses: { feeJuiceAddress, feeJuicePortalAddress },
@@ -216,7 +216,7 @@ export class L1ToL2TokenPortalManager {
     tokenAddress: EthAddress,
     protected publicClient: PublicClient<HttpTransport, Chain>,
     protected walletClient: WalletClient<HttpTransport, Chain, Account>,
-    protected logger: DebugLogger,
+    protected logger: Logger,
   ) {
     this.tokenManager = new L1TokenManager(tokenAddress, publicClient, walletClient, logger);
     this.portal = getContract({
@@ -334,7 +334,7 @@ export class L1TokenPortalManager extends L1ToL2TokenPortalManager {
     outboxAddress: EthAddress,
     publicClient: PublicClient<HttpTransport, Chain>,
     walletClient: WalletClient<HttpTransport, Chain, Account>,
-    logger: DebugLogger,
+    logger: Logger,
   ) {
     super(portalAddress, tokenAddress, publicClient, walletClient, logger);
     this.outbox = getContract({

package/src/utils/pxe.ts

@@ -1,8 +1,8 @@
 import { type PXE } from '@aztec/circuit-types';
-import { type DebugLogger } from '@aztec/foundation/log';
+import { type Logger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 
-export const waitForPXE = async (pxe: PXE, logger?: DebugLogger) => {
+export const waitForPXE = async (pxe: PXE, logger?: Logger) => {
   await retryUntil(async () => {
     try {
       logger?.verbose('Attempting to contact PXE...');

package/src/wallet/base_wallet.ts

@@ -6,12 +6,10 @@ import {
   type IncomingNotesFilter,
   type L2Block,
   type LogFilter,
-  type OutgoingNotesFilter,
   type PXE,
   type PXEInfo,
   type PrivateExecutionResult,
   type SiblingPath,
-  type SyncStatus,
   type Tx,
   type TxExecutionRequest,
   type TxHash,
@@ -133,9 +131,6 @@ export abstract class BaseWallet implements Wallet {
   getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]> {
     return this.pxe.getIncomingNotes(filter);
   }
-  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]> {
-    return this.pxe.getOutgoingNotes(filter);
-  }
   getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {
     return this.pxe.getPublicStorageAt(contract, storageSlot);
   }
@@ -174,12 +169,6 @@ export abstract class BaseWallet implements Wallet {
   getNodeInfo(): Promise<NodeInfo> {
     return this.pxe.getNodeInfo();
   }
-  isGlobalStateSynchronized() {
-    return this.pxe.isGlobalStateSynchronized();
-  }
-  getSyncStatus(): Promise<SyncStatus> {
-    return this.pxe.getSyncStatus();
-  }
   addAuthWitness(authWitness: AuthWitness) {
     return this.pxe.addAuthWitness(authWitness);
   }
@@ -202,10 +191,7 @@ export abstract class BaseWallet implements Wallet {
     event: EventMetadataDefinition,
     from: number,
     limit: number,
-    vpks: Point[] = [
-      this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey,
-      this.getCompleteAddress().publicKeys.masterOutgoingViewingPublicKey,
-    ],
+    vpks: Point[] = [this.getCompleteAddress().publicKeys.masterIncomingViewingPublicKey],
   ): Promise<T[]> {
     return this.pxe.getEncryptedEvents(event, from, limit, vpks);
   }

package/dest/api/aztec_address.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"aztec_address.d.ts","sourceRoot":"","sources":["../../src/api/aztec_address.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC"}

package/dest/api/aztec_address.js

@@ -1,2 +0,0 @@
-export { AztecAddress } from '@aztec/foundation/aztec-address';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXp0ZWNfYWRkcmVzcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hcGkvYXp0ZWNfYWRkcmVzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUNBQWlDLENBQUMifQ==