@aztec/aztec.js 0.35.1 → 0.37.0

package/src/contract/deploy_method.ts

@@ -1,4 +1,4 @@
-import { type FunctionCall, type PublicKey, type Tx, type TxExecutionRequest } from '@aztec/circuit-types';
+import { type FunctionCall, type Tx, type TxExecutionRequest } from '@aztec/circuit-types';
 import {
   AztecAddress,
   computePartialAddress,
@@ -6,7 +6,6 @@ import {
   getContractInstanceFromDeployParams,
 } from '@aztec/circuits.js';
 import { type ContractArtifact, type FunctionArtifact, getInitializer } from '@aztec/foundation/abi';
-import { type EthAddress } from '@aztec/foundation/eth-address';
 import { type Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
@@ -23,11 +22,9 @@ import { DeploySentTx } from './deploy_sent_tx.js';
 
 /**
  * Options for deploying a contract on the Aztec network.
- * Allows specifying a portal contract, contract address salt, and additional send method options.
+ * Allows specifying a contract address salt, and additional send method options.
  */
 export type DeployOptions = {
-  /** The Ethereum address of the Portal contract. */
-  portalContract?: EthAddress;
   /** An optional salt value used to deterministically calculate the contract address. */
   contractAddressSalt?: Fr;
   /** Set to true to *not* include the sender in the address computation. */
@@ -59,7 +56,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
   private log = createDebugLogger('aztec:js:deploy_method');
 
   constructor(
-    private publicKey: PublicKey,
+    private publicKeysHash: Fr,
     protected wallet: Wallet,
     private artifact: ContractArtifact,
     private postDeployCtor: (address: AztecAddress, wallet: Wallet) => Promise<TContract>,
@@ -76,7 +73,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    * the transaction for deployment. The resulting signed transaction can be
    * later sent using the `send()` method.
    *
-   * @param options - An object containing optional deployment settings, including portalContract, contractAddressSalt, and from.
+   * @param options - An object containing optional deployment settings, contractAddressSalt, and from.
    * @returns A Promise resolving to an object containing the signed transaction data and other relevant information.
    */
   public async create(options: DeployOptions = {}): Promise<TxExecutionRequest> {
@@ -186,10 +183,10 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    * This function extends the 'send' method from the ContractFunctionInteraction class,
    * allowing us to send a transaction specifically for contract deployment.
    *
-   * @param options - An object containing various deployment options such as portalContract, contractAddressSalt, and from.
+   * @param options - An object containing various deployment options such as contractAddressSalt and from.
    * @returns A SentTx object that returns the receipt and the deployed contract instance.
    */
-  public send(options: DeployOptions = {}): DeploySentTx<TContract> {
+  public override send(options: DeployOptions = {}): DeploySentTx<TContract> {
     const txHashPromise = super.send(options).getTxHash();
     const instance = this.getInstance(options);
     this.log.debug(
@@ -209,8 +206,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
       this.instance = getContractInstanceFromDeployParams(this.artifact, {
         constructorArgs: this.args,
         salt: options.contractAddressSalt,
-        portalAddress: options.portalContract,
-        publicKey: this.publicKey,
+        publicKeysHash: this.publicKeysHash,
         constructorArtifact: this.constructorArtifact,
         deployer: options.universalDeploy ? AztecAddress.ZERO : this.wallet.getAddress(),
       });
@@ -223,7 +219,7 @@ export class DeployMethod<TContract extends ContractBase = Contract> extends Bas
    * @param options - Deployment options.
    * @returns The proven tx.
    */
-  public prove(options: DeployOptions): Promise<Tx> {
+  public override prove(options: DeployOptions): Promise<Tx> {
     return super.prove(options);
   }
 

package/src/contract/deploy_sent_tx.ts

@@ -53,7 +53,7 @@ export class DeploySentTx<TContract extends Contract = Contract> extends SentTx
    * @param opts - Options for configuring the waiting for the tx to be mined.
    * @returns The transaction receipt with the deployed contract instance.
    */
-  public async wait(opts?: DeployedWaitOpts): Promise<DeployTxReceipt<TContract>> {
+  public override async wait(opts?: DeployedWaitOpts): Promise<DeployTxReceipt<TContract>> {
     const receipt = await super.wait(opts);
     const contract = await this.getContractObject(opts?.wallet);
     return { ...receipt, contract };

package/src/deployment/contract_deployer.ts

@@ -1,7 +1,6 @@
-import { type PublicKey } from '@aztec/circuit-types';
 import { type AztecAddress } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
-import { Point } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 
 import { type Wallet } from '../account/wallet.js';
 import { DeployMethod } from '../contract/deploy_method.js';
@@ -15,7 +14,7 @@ export class ContractDeployer {
   constructor(
     private artifact: ContractArtifact,
     private wallet: Wallet,
-    private publicKey?: PublicKey,
+    private publicKeysHash?: Fr,
     private constructorName?: string,
   ) {}
 
@@ -31,7 +30,7 @@ export class ContractDeployer {
   public deploy(...args: any[]) {
     const postDeployCtor = (address: AztecAddress, wallet: Wallet) => Contract.at(address, this.artifact, wallet);
     return new DeployMethod(
-      this.publicKey ?? Point.ZERO,
+      this.publicKeysHash ?? Fr.ZERO,
       this.wallet,
       this.artifact,
       postDeployCtor,

package/src/deployment/deploy_instance.ts

@@ -11,7 +11,7 @@ import { getDeployerContract } from './protocol_contracts.js';
  */
 export function deployInstance(wallet: Wallet, instance: ContractInstanceWithAddress): ContractFunctionInteraction {
   const deployerContract = getDeployerContract(wallet);
-  const { salt, contractClassId, portalContractAddress, publicKeysHash, deployer } = instance;
+  const { salt, contractClassId, publicKeysHash, deployer } = instance;
   const isUniversalDeploy = deployer.isZero();
   if (!isUniversalDeploy && !wallet.getAddress().equals(deployer)) {
     throw new Error(
@@ -22,7 +22,6 @@ export function deployInstance(wallet: Wallet, instance: ContractInstanceWithAdd
     salt,
     contractClassId,
     instance.initializationHash,
-    portalContractAddress,
     publicKeysHash,
     isUniversalDeploy,
   );

package/src/entrypoint/default_entrypoint.ts

@@ -18,7 +18,8 @@ export class DefaultEntrypoint implements EntrypointInterface {
 
     const call = calls[0];
     const entrypointPackedValues = PackedValues.fromValues(call.args);
-    const txContext = TxContext.empty(this.chainId, this.protocolVersion);
+    const gasSettings = exec.fee?.gasSettings ?? GasSettings.default();
+    const txContext = new TxContext(this.chainId, this.protocolVersion, gasSettings);
     return Promise.resolve(
       new TxExecutionRequest(
         call.to,
@@ -27,7 +28,6 @@ export class DefaultEntrypoint implements EntrypointInterface {
         txContext,
         [...packedArguments, entrypointPackedValues],
         authWitnesses,
-        exec.fee?.gasSettings ?? GasSettings.default(),
       ),
     );
   }

package/src/entrypoint/default_multi_call_entrypoint.ts

@@ -19,15 +19,15 @@ export class DefaultMultiCallEntrypoint implements EntrypointInterface {
     const payload = EntrypointPayload.fromAppExecution(calls);
     const abi = this.getEntrypointAbi();
     const entrypointPackedArgs = PackedValues.fromValues(encodeArguments(abi, [payload]));
+    const gasSettings = executions.fee?.gasSettings ?? GasSettings.default();
 
     const txRequest = TxExecutionRequest.from({
-      argsHash: entrypointPackedArgs.hash,
+      firstCallArgsHash: entrypointPackedArgs.hash,
       origin: this.address,
       functionData: FunctionData.fromAbi(abi),
-      txContext: TxContext.empty(this.chainId, this.version),
-      packedArguments: [...payload.packedArguments, ...packedArguments, entrypointPackedArgs],
+      txContext: new TxContext(this.chainId, this.version, gasSettings),
+      argsOfCalls: [...payload.packedArguments, ...packedArguments, entrypointPackedArgs],
       authWitnesses,
-      gasSettings: executions.fee?.gasSettings ?? GasSettings.default(),
     });
 
     return Promise.resolve(txRequest);

package/src/fee/private_fee_payment_method.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall } from '@aztec/circuit-types';
 import { FunctionData, type GasSettings } from '@aztec/circuits.js';
-import { computeMessageSecretHash } from '@aztec/circuits.js/hash';
+import { computeSecretHash } from '@aztec/circuits.js/hash';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
@@ -71,7 +71,7 @@ export class PrivateFeePaymentMethod implements FeePaymentMethod {
     );
     await this.wallet.createAuthWit(messageHash);
 
-    const secretHashForRebate = computeMessageSecretHash(this.rebateSecret);
+    const secretHashForRebate = computeSecretHash(this.rebateSecret);
 
     return [
       {

package/src/index.ts

@@ -58,7 +58,7 @@ export { AuthWitnessProvider } from './account/index.js';
 export { AccountContract } from './account/index.js';
 export { AccountManager } from './account_manager/index.js';
 
-export { AccountWalletWithPrivateKey, AccountWallet, Wallet, SignerlessWallet } from './wallet/index.js';
+export { AccountWalletWithSecretKey, AccountWallet, Wallet, SignerlessWallet } from './wallet/index.js';
 
 // // TODO https://github.com/AztecProtocol/aztec-packages/issues/2632 --> FunctionSelector might not need to be exposed
 // // here once the issue is resolved.
@@ -75,7 +75,14 @@ export {
   INITIAL_L2_BLOCK_NUM,
 } from '@aztec/circuits.js';
 
-export { computeMessageSecretHash } from '@aztec/circuits.js/hash';
+export { computeSecretHash } from '@aztec/circuits.js/hash';
+
+export {
+  computeAppNullifierSecretKey,
+  deriveKeys,
+  deriveMasterIncomingViewingSecretKey,
+  deriveMasterNullifierSecretKey,
+} from '@aztec/circuits.js/keys';
 
 export { Grumpkin, Schnorr } from '@aztec/circuits.js/barretenberg';
 

package/src/wallet/account_wallet.ts

@@ -16,6 +16,10 @@ export class AccountWallet extends BaseWallet {
     super(pxe);
   }
 
+  getPublicKeysHash(): Fr {
+    return this.account.getPublicKeysHash();
+  }
+
   createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {
     return this.account.createTxExecutionRequest(exec);
   }
@@ -196,7 +200,7 @@ export class AccountWallet extends BaseWallet {
   }
 
   /** Returns the address of the account that implements this wallet. */
-  public getAddress() {
+  public override getAddress() {
     return this.getCompleteAddress().address;
   }
 

package/src/wallet/account_wallet_with_private_key.ts

@@ -1,5 +1,5 @@
 import { type PXE } from '@aztec/circuit-types';
-import { type GrumpkinPrivateKey } from '@aztec/circuits.js';
+import { type Fr } from '@aztec/circuits.js';
 
 import { type Salt } from '../account/index.js';
 import { type AccountInterface } from '../account/interface.js';
@@ -10,11 +10,11 @@ import { AccountWallet } from './account_wallet.js';
  * implementing the wallet interface but useful for testing purposes or exporting
  * an account to another pxe.
  */
-export class AccountWalletWithPrivateKey extends AccountWallet {
+export class AccountWalletWithSecretKey extends AccountWallet {
   constructor(
     pxe: PXE,
     account: AccountInterface,
-    private encryptionPrivateKey: GrumpkinPrivateKey,
+    private secretKey: Fr,
     /** Deployment salt for this account contract. */
     public readonly salt: Salt,
   ) {
@@ -22,7 +22,7 @@ export class AccountWalletWithPrivateKey extends AccountWallet {
   }
 
   /** Returns the encryption private key associated with this account. */
-  public getEncryptionPrivateKey() {
-    return this.encryptionPrivateKey;
+  public getSecretKey() {
+    return this.secretKey;
   }
 }

package/src/wallet/base_wallet.ts

@@ -15,13 +15,7 @@ import {
   type TxHash,
   type TxReceipt,
 } from '@aztec/circuit-types';
-import {
-  type AztecAddress,
-  type CompleteAddress,
-  type Fr,
-  type GrumpkinPrivateKey,
-  type PartialAddress,
-} from '@aztec/circuits.js';
+import { type AztecAddress, type CompleteAddress, type Fr, type PartialAddress } from '@aztec/circuits.js';
 import { type ContractArtifact } from '@aztec/foundation/abi';
 import { type ContractClassWithId, type ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { type NodeInfo } from '@aztec/types/interfaces';
@@ -38,6 +32,8 @@ export abstract class BaseWallet implements Wallet {
 
   abstract getCompleteAddress(): CompleteAddress;
 
+  abstract getPublicKeysHash(): Fr;
+
   abstract getChainId(): Fr;
 
   abstract getVersion(): Fr;
@@ -72,8 +68,8 @@ export abstract class BaseWallet implements Wallet {
   addCapsule(capsule: Fr[]): Promise<void> {
     return this.pxe.addCapsule(capsule);
   }
-  registerAccount(privKey: GrumpkinPrivateKey, partialAddress: PartialAddress): Promise<CompleteAddress> {
-    return this.pxe.registerAccount(privKey, partialAddress);
+  registerAccount(secretKey: Fr, partialAddress: PartialAddress): Promise<CompleteAddress> {
+    return this.pxe.registerAccount(secretKey, partialAddress);
   }
   registerRecipient(account: CompleteAddress): Promise<void> {
     return this.pxe.registerRecipient(account);
@@ -84,6 +80,9 @@ export abstract class BaseWallet implements Wallet {
   getRegisteredAccount(address: AztecAddress): Promise<CompleteAddress | undefined> {
     return this.pxe.getRegisteredAccount(address);
   }
+  getRegisteredAccountPublicKeysHash(address: AztecAddress): Promise<Fr | undefined> {
+    return this.pxe.getRegisteredAccountPublicKeysHash(address);
+  }
   getRecipients(): Promise<CompleteAddress[]> {
     return this.pxe.getRecipients();
   }

package/src/wallet/index.ts

@@ -25,7 +25,11 @@ export async function getWallet(
   if (!completeAddress) {
     throw new Error(`Account ${address} not found`);
   }
+  const publicKeysHash = await pxe.getRegisteredAccountPublicKeysHash(address);
+  if (!publicKeysHash) {
+    throw new Error(`Public keys hash for account ${address} not found`);
+  }
   const nodeInfo = await pxe.getNodeInfo();
-  const entrypoint = accountContract.getInterface(completeAddress, nodeInfo);
+  const entrypoint = accountContract.getInterface(completeAddress, publicKeysHash, nodeInfo);
   return new AccountWallet(pxe, entrypoint);
 }

package/src/wallet/signerless_wallet.ts

@@ -31,6 +31,10 @@ export class SignerlessWallet extends BaseWallet {
     throw new Error('Method not implemented.');
   }
 
+  getPublicKeysHash(): Fr {
+    throw new Error('Method not implemented.');
+  }
+
   getCompleteAddress(): CompleteAddress {
     throw new Error('Method not implemented.');
   }