@aztec/aztec.js 0.32.1 → 0.34.0

package/src/contract/deploy_sent_tx.ts

@@ -1,5 +1,6 @@
 import { type PXE, type TxHash, type TxReceipt } from '@aztec/circuit-types';
 import { type AztecAddress } from '@aztec/circuits.js';
+import { createDebugLogger } from '@aztec/foundation/log';
 import { type FieldsOf } from '@aztec/foundation/types';
 import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 
@@ -24,6 +25,8 @@ export type DeployTxReceipt<TContract extends ContractBase = Contract> = FieldsO
  * A contract deployment transaction sent to the network, extending SentTx with methods to create a contract instance.
  */
 export class DeploySentTx<TContract extends Contract = Contract> extends SentTx {
+  private log = createDebugLogger('aztec:js:deploy_sent_tx');
+
   constructor(
     wallet: PXE | Wallet,
     txHashPromise: Promise<TxHash>,
@@ -41,6 +44,7 @@ export class DeploySentTx<TContract extends Contract = Contract> extends SentTx
    */
   public async deployed(opts?: DeployedWaitOpts): Promise<TContract> {
     const receipt = await this.wait(opts);
+    this.log.info(`Contract ${this.instance.address.toString()} successfully deployed.`);
     return receipt.contract;
   }
 

package/src/contract/index.ts

@@ -6,8 +6,8 @@
  *
  * The {@link Contract} class is the main class in this module, and provides static methods for deploying
  * a contract or interacting with an already deployed one. The `methods` property of the contract instance
- * provides access to private, public, and view methods, that can be invoked in a transaction via `send()`,
- * or can be queried via `view()`.
+ * provides access to private, public, and simulate methods, that can be invoked in a transaction via `send()`,
+ * or can be queried via `simulate()`.
  *
  * ```ts
  * const contract = await Contract.deploy(wallet, MyContractArtifact, [...constructorArgs]).send().deployed();
@@ -17,7 +17,7 @@
  * ```ts
  * const contract = await Contract.at(address, MyContractArtifact, wallet);
  * await contract.methods.mint(1000, owner).send().wait();
- * console.log(`Total supply is now ${await contract.methods.totalSupply().view()}`);
+ * console.log(`Total supply is now ${await contract.methods.totalSupply().simulate()}`);
  * ```
  *
  * The result of calling a method in a contract instance, such as `contract.methods.mint(1000, owner)`

package/src/contract/sent_tx.ts

@@ -82,10 +82,10 @@ export class SentTx {
       const tx = (await this.pxe.getTxEffect(txHash))!;
       const visibleNotes = await this.pxe.getNotes({ txHash });
       receipt.debugInfo = {
-        noteHashes: tx.noteHashes.filter(n => !n.isZero()),
-        nullifiers: tx.nullifiers.filter(n => !n.isZero()),
-        publicDataWrites: tx.publicDataWrites.filter(p => !p.isEmpty()),
-        l2ToL1Msgs: tx.l2ToL1Msgs.filter(l => !l.isZero()),
+        noteHashes: tx.noteHashes,
+        nullifiers: tx.nullifiers,
+        publicDataWrites: tx.publicDataWrites,
+        l2ToL1Msgs: tx.l2ToL1Msgs,
         visibleNotes,
       };
     }

package/src/index.ts

@@ -25,6 +25,8 @@ export {
   Contract,
   ContractBase,
   ContractMethod,
+  ContractStorageLayout,
+  ContractNotes,
   SentTx,
   BatchCall,
   DeployMethod,

package/src/rpc_clients/pxe_client.ts

@@ -8,6 +8,7 @@ import {
   Note,
   NullifierMembershipWitness,
   type PXE,
+  SimulatedTx,
   Tx,
   TxEffect,
   TxExecutionRequest,
@@ -53,7 +54,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       TxExecutionRequest,
       TxHash,
     },
-    { Tx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
+    { Tx, SimulatedTx, TxReceipt, EncryptedL2BlockL2Logs, UnencryptedL2BlockL2Logs, NullifierMembershipWitness },
     false,
     'pxe',
     fetch,

package/src/utils/cheat_codes.ts

@@ -90,7 +90,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error mining: ${res.error.message}`);
     }
-    this.logger(`Mined ${numberOfBlocks} blocks`);
+    this.logger.info(`Mined ${numberOfBlocks} blocks`);
   }
 
   /**
@@ -102,7 +102,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting next block timestamp: ${res.error.message}`);
     }
-    this.logger(`Set next block timestamp to ${timestamp}`);
+    this.logger.info(`Set next block timestamp to ${timestamp}`);
   }
 
   /**
@@ -116,7 +116,7 @@ export class EthCheatCodes {
     }
     const jsonContent = JSON.stringify(res.result);
     fs.writeFileSync(`${fileName}.json`, jsonContent, 'utf8');
-    this.logger(`Dumped state to ${fileName}`);
+    this.logger.info(`Dumped state to ${fileName}`);
   }
 
   /**
@@ -129,7 +129,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error loading state: ${res.error.message}`);
     }
-    this.logger(`Loaded state from ${fileName}`);
+    this.logger.info(`Loaded state from ${fileName}`);
   }
 
   /**
@@ -155,7 +155,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting storage for contract ${contract} at ${slot}: ${res.error.message}`);
     }
-    this.logger(`Set storage for contract ${contract} at ${slot} to ${value}`);
+    this.logger.info(`Set storage for contract ${contract} at ${slot} to ${value}`);
   }
 
   /**
@@ -179,7 +179,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error impersonating ${who}: ${res.error.message}`);
     }
-    this.logger(`Impersonating ${who}`);
+    this.logger.info(`Impersonating ${who}`);
   }
 
   /**
@@ -191,7 +191,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error when stopping the impersonation of ${who}: ${res.error.message}`);
     }
-    this.logger(`Stopped impersonating ${who}`);
+    this.logger.info(`Stopped impersonating ${who}`);
   }
 
   /**
@@ -204,7 +204,7 @@ export class EthCheatCodes {
     if (res.error) {
       throw new Error(`Error setting bytecode for ${contract}: ${res.error.message}`);
     }
-    this.logger(`Set bytecode for ${contract} to ${bytecode}`);
+    this.logger.info(`Set bytecode for ${contract} to ${bytecode}`);
   }
 
   /**

package/src/utils/pxe.ts

@@ -5,11 +5,11 @@ import { retryUntil } from '@aztec/foundation/retry';
 export const waitForPXE = async (pxe: PXE, logger?: DebugLogger) => {
   await retryUntil(async () => {
     try {
-      logger?.('Attempting to contact PXE...');
+      logger?.debug('Attempting to contact PXE...');
       await pxe.getNodeInfo();
       return true;
     } catch (error) {
-      logger?.('Failed to contact PXE!');
+      logger?.verbose('Failed to contact PXE');
     }
     return undefined;
   }, 'RPC Get Node Info');

package/src/wallet/account_wallet.ts

@@ -161,7 +161,7 @@ export class AccountWallet extends BaseWallet {
       messageHash,
     ]);
 
-    const [isValidInPrivate, isValidInPublic] = await interaction.view();
+    const [isValidInPrivate, isValidInPublic] = (await interaction.simulate()) as [boolean, boolean];
     return { isValidInPrivate, isValidInPublic };
   }
 

package/src/wallet/base_wallet.ts

@@ -7,6 +7,7 @@ import {
   type LogFilter,
   type NoteFilter,
   type PXE,
+  type SimulatedTx,
   type SyncStatus,
   type Tx,
   type TxEffect,
@@ -101,8 +102,11 @@ export abstract class BaseWallet implements Wallet {
   getContracts(): Promise<AztecAddress[]> {
     return this.pxe.getContracts();
   }
-  simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean): Promise<Tx> {
-    return this.pxe.simulateTx(txRequest, simulatePublic);
+  proveTx(txRequest: TxExecutionRequest, simulatePublic: boolean): Promise<Tx> {
+    return this.pxe.proveTx(txRequest, simulatePublic);
+  }
+  simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, msgSender: AztecAddress): Promise<SimulatedTx> {
+    return this.pxe.simulateTx(txRequest, simulatePublic, msgSender);
   }
   sendTx(tx: Tx): Promise<TxHash> {
     return this.pxe.sendTx(tx);