@aztec/aztec.js 0.47.1 → 0.49.2

package/src/rpc_clients/node/index.ts

@@ -0,0 +1,69 @@
+import { type PXE } from '@aztec/circuit-types';
+import { type DebugLogger } from '@aztec/foundation/log';
+import { NoRetryError } from '@aztec/foundation/retry';
+
+import axios, { type AxiosError, type AxiosResponse } from 'axios';
+
+import { createPXEClient } from '../pxe_client.js';
+
+/**
+ * A fetch implementation using axios.
+ * @param host - The URL of the host.
+ * @param rpcMethod - The RPC method to call.
+ * @param body - The body of the request.
+ * @param useApiEndpoints - Whether to use the API endpoints or inject the method in the body.
+ * @param _noRetry - Whether to retry on non-server errors.
+ * @returns The response data.
+ */
+async function axiosFetch(host: string, rpcMethod: string, body: any, useApiEndpoints: boolean, _noRetry = true) {
+  let resp: AxiosResponse;
+  if (useApiEndpoints) {
+    resp = await axios
+      .post(`${host}/${rpcMethod}`, body, {
+        headers: { 'content-type': 'application/json' },
+      })
+      .catch((error: AxiosError) => {
+        if (error.response) {
+          return error.response;
+        }
+        throw error;
+      });
+  } else {
+    resp = await axios
+      .post(
+        host,
+        { ...body, method: rpcMethod },
+        {
+          headers: { 'content-type': 'application/json' },
+        },
+      )
+      .catch((error: AxiosError) => {
+        if (error.response) {
+          return error.response;
+        }
+        throw error;
+      });
+  }
+
+  const isOK = resp.status >= 200 && resp.status < 300;
+  if (isOK) {
+    return resp.data;
+  } else if (resp.status >= 400 && resp.status < 500) {
+    throw new NoRetryError('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
+  } else {
+    throw new Error('(JSON-RPC PROPAGATED) ' + resp.data.error.message);
+  }
+}
+
+/**
+ * Creates a PXE client with a given set of retries on non-server errors.
+ * Checks that PXE matches the expected version, and warns if not.
+ * @param rpcUrl - URL of the RPC server wrapping the PXE.
+ * @param _logger - Debug logger to warn version incompatibilities.
+ * @returns A PXE client.
+ */
+export function createCompatibleClient(rpcUrl: string, _logger: DebugLogger): Promise<PXE> {
+  // Use axios due to timeout issues with fetch when proving TXs.
+  const pxe = createPXEClient(rpcUrl, axiosFetch);
+  return Promise.resolve(pxe);
+}

package/src/rpc_clients/pxe_client.ts

@@ -15,6 +15,7 @@ import {
   TxHash,
   TxReceipt,
   UnencryptedL2BlockL2Logs,
+  UniqueNote,
 } from '@aztec/circuit-types';
 import {
   AztecAddress,
@@ -26,6 +27,7 @@ import {
   Point,
 } from '@aztec/circuits.js';
 import { NoteSelector } from '@aztec/foundation/abi';
+import { BaseHashType } from '@aztec/foundation/hash';
 import { createJsonRpcClient, makeFetch } from '@aztec/foundation/json-rpc/client';
 
 /**
@@ -44,6 +46,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       FunctionSelector,
       EthAddress,
       ExtendedNote,
+      UniqueNote,
       ExtendedUnencryptedL2Log,
       Fr,
       GrumpkinScalar,
@@ -54,6 +57,7 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       Point,
       TxExecutionRequest,
       TxHash,
+      BaseHashType,
     },
     {
       EncryptedNoteL2BlockL2Logs,

package/src/utils/authwit.ts

@@ -1,6 +1,6 @@
 import { type FunctionCall, PackedValues } from '@aztec/circuit-types';
 import { type AztecAddress, Fr, GeneratorIndex } from '@aztec/circuits.js';
-import { pedersenHash } from '@aztec/foundation/crypto';
+import { poseidon2HashWithSeparator } from '@aztec/foundation/crypto';
 
 import { ContractFunctionInteraction } from '../contract/contract_function_interaction.js';
 
@@ -81,7 +81,7 @@ export const computeInnerAuthWitHashFromAction = (caller: AztecAddress, action:
  * @returns The inner hash for the witness
  */
 export const computeInnerAuthWitHash = (args: Fr[]) => {
-  return pedersenHash(args, GeneratorIndex.AUTHWIT_INNER);
+  return poseidon2HashWithSeparator(args, GeneratorIndex.AUTHWIT_INNER);
 };
 
 /**
@@ -99,5 +99,5 @@ export const computeInnerAuthWitHash = (args: Fr[]) => {
  * @returns The outer hash for the witness
  */
 const computeOuterAuthWitHash = (consumer: AztecAddress, chainId: Fr, version: Fr, innerHash: Fr) => {
-  return pedersenHash([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
+  return poseidon2HashWithSeparator([consumer.toField(), chainId, version, innerHash], GeneratorIndex.AUTHWIT_OUTER);
 };

package/src/utils/cheat_codes.ts

@@ -1,7 +1,8 @@
 import { type Note, type PXE } from '@aztec/circuit-types';
 import { type AztecAddress, type EthAddress, Fr } from '@aztec/circuits.js';
+import { deriveStorageSlotInMap } from '@aztec/circuits.js/hash';
 import { toBigIntBE, toHex } from '@aztec/foundation/bigint-buffer';
-import { keccak256, pedersenHash } from '@aztec/foundation/crypto';
+import { keccak256 } from '@aztec/foundation/crypto';
 import { createDebugLogger } from '@aztec/foundation/log';
 
 import fs from 'fs';
@@ -93,6 +94,18 @@ export class EthCheatCodes {
     this.logger.info(`Mined ${numberOfBlocks} blocks`);
   }
 
+  /**
+   * Set the interval between blocks (block time)
+   * @param interval - The interval to use between blocks
+   */
+  public async setBlockInterval(interval: number): Promise<void> {
+    const res = await this.rpcCall('anvil_setBlockTimestampInterval', [interval]);
+    if (res.error) {
+      throw new Error(`Error setting block interval: ${res.error.message}`);
+    }
+    this.logger.info(`Set block interval to ${interval}`);
+  }
+
   /**
    * Set the next block timestamp
    * @param timestamp - The timestamp to set the next block to
@@ -105,6 +118,19 @@ export class EthCheatCodes {
     this.logger.info(`Set next block timestamp to ${timestamp}`);
   }
 
+  /**
+   * Set the next block timestamp and mines the block
+   * @param timestamp - The timestamp to set the next block to
+   */
+  public async warp(timestamp: number): Promise<void> {
+    const res = await this.rpcCall('evm_setNextBlockTimestamp', [timestamp]);
+    if (res.error) {
+      throw new Error(`Error warping: ${res.error.message}`);
+    }
+    await this.mine();
+    this.logger.info(`Warped to ${timestamp}`);
+  }
+
   /**
    * Dumps the current chain state to a file.
    * @param fileName - The file name to dump state into
@@ -239,14 +265,12 @@ export class AztecCheatCodes {
 
   /**
    * Computes the slot value for a given map and key.
-   * @param baseSlot - The base slot of the map (specified in Aztec.nr contract)
+   * @param mapSlot - The slot of the map (specified in Aztec.nr contract)
    * @param key - The key to lookup in the map
    * @returns The storage slot of the value in the map
    */
-  public computeSlotInMap(baseSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
-    // Based on `at` function in
-    // aztec3-packages/aztec-nr/aztec/src/state_vars/map.nr
-    return pedersenHash([new Fr(baseSlot), new Fr(key)]);
+  public computeSlotInMap(mapSlot: Fr | bigint, key: Fr | bigint | AztecAddress): Fr {
+    return deriveStorageSlotInMap(mapSlot, new Fr(key));
   }
 
   /**
@@ -258,18 +282,12 @@ export class AztecCheatCodes {
   }
 
   /**
-   * Set time of the next execution on aztec.
-   * It also modifies time on eth for next execution and stores this time as the last rollup block on the rollup contract.
-   * @param to - The timestamp to set the next block to (must be greater than current time)
+   * Get the current timestamp
+   * @returns The current timestamp
    */
-  public async warp(to: number): Promise<void> {
-    const rollupContract = (await this.pxe.getNodeInfo()).l1ContractAddresses.rollupAddress;
-    await this.eth.setNextBlockTimestamp(to);
-    // also store this time on the rollup contract (slot 2 tracks `lastBlockTs`).
-    // This is because when the sequencer executes public functions, it uses the timestamp stored in the rollup contract.
-    await this.eth.store(rollupContract, 7n, BigInt(to));
-    // also store this on slot of the rollup contract (`lastWarpedBlockTs`) which tracks the last time warp was used.
-    await this.eth.store(rollupContract, 8n, BigInt(to));
+  public async timestamp(): Promise<number> {
+    const res = await this.pxe.getBlock(await this.blockNumber());
+    return res?.header.globalVariables.timestamp.toNumber() ?? 0;
   }
 
   /**

package/src/wallet/account_wallet.ts

@@ -19,7 +19,7 @@ import { BaseWallet } from './base_wallet.js';
  */
 export class AccountWallet extends BaseWallet {
   constructor(pxe: PXE, protected account: AccountInterface) {
-    super(pxe);
+    super(pxe, [account.getAddress()]);
   }
 
   createTxExecutionRequest(exec: ExecutionRequestInit): Promise<TxExecutionRequest> {

package/src/wallet/base_wallet.ts

@@ -17,6 +17,7 @@ import {
   type TxExecutionRequest,
   type TxHash,
   type TxReceipt,
+  type UniqueNote,
 } from '@aztec/circuit-types';
 import { type NoteProcessorStats } from '@aztec/circuit-types/stats';
 import {
@@ -39,7 +40,7 @@ import { type IntentAction, type IntentInnerHash } from '../utils/authwit.js';
  * A base class for Wallet implementations
  */
 export abstract class BaseWallet implements Wallet {
-  constructor(protected readonly pxe: PXE) {}
+  constructor(protected readonly pxe: PXE, private scopes?: AztecAddress[]) {}
 
   abstract getCompleteAddress(): CompleteAddress;
 
@@ -53,6 +54,10 @@ export abstract class BaseWallet implements Wallet {
 
   abstract rotateNullifierKeys(newNskM: Fq): Promise<void>;
 
+  setScopes(scopes: AztecAddress[]) {
+    this.scopes = scopes;
+  }
+
   getAddress() {
     return this.getCompleteAddress().address;
   }
@@ -102,10 +107,15 @@ export abstract class BaseWallet implements Wallet {
     return this.pxe.getContracts();
   }
   proveTx(txRequest: TxExecutionRequest, simulatePublic: boolean): Promise<Tx> {
-    return this.pxe.proveTx(txRequest, simulatePublic);
+    return this.pxe.proveTx(txRequest, simulatePublic, this.scopes);
   }
-  simulateTx(txRequest: TxExecutionRequest, simulatePublic: boolean, msgSender?: AztecAddress): Promise<SimulatedTx> {
-    return this.pxe.simulateTx(txRequest, simulatePublic, msgSender);
+  simulateTx(
+    txRequest: TxExecutionRequest,
+    simulatePublic: boolean,
+    msgSender?: AztecAddress,
+    skipTxValidation?: boolean,
+  ): Promise<SimulatedTx> {
+    return this.pxe.simulateTx(txRequest, simulatePublic, msgSender, skipTxValidation, this.scopes);
   }
   sendTx(tx: Tx): Promise<TxHash> {
     return this.pxe.sendTx(tx);
@@ -116,21 +126,17 @@ export abstract class BaseWallet implements Wallet {
   getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
     return this.pxe.getTxReceipt(txHash);
   }
-  getIncomingNotes(filter: IncomingNotesFilter): Promise<ExtendedNote[]> {
+  getIncomingNotes(filter: IncomingNotesFilter): Promise<UniqueNote[]> {
     return this.pxe.getIncomingNotes(filter);
   }
-  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<ExtendedNote[]> {
+  getOutgoingNotes(filter: OutgoingNotesFilter): Promise<UniqueNote[]> {
     return this.pxe.getOutgoingNotes(filter);
   }
-  // TODO(#4956): Un-expose this
-  getNoteNonces(note: ExtendedNote): Promise<Fr[]> {
-    return this.pxe.getNoteNonces(note);
-  }
   getPublicStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any> {
     return this.pxe.getPublicStorageAt(contract, storageSlot);
   }
   addNote(note: ExtendedNote): Promise<void> {
-    return this.pxe.addNote(note);
+    return this.pxe.addNote(note, this.getAddress());
   }
   addNullifiedNote(note: ExtendedNote): Promise<void> {
     return this.pxe.addNullifiedNote(note);

package/dest/fee/native_fee_payment_method.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"native_fee_payment_method.d.ts","sourceRoot":"","sources":["../../src/fee/native_fee_payment_method.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,qBAAa,sBAAuB,YAAW,gBAAgB;IACjD,SAAS,CAAC,MAAM,EAAE,YAAY;gBAApB,MAAM,EAAE,YAAY;IAE1C,QAAQ;IAIR,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI3C,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC;CAGrC"}

package/dest/fee/native_fee_payment_method.js

@@ -1,19 +0,0 @@
-import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
-/**
- * Pay fee directly in the native gas token.
- */
-export class NativeFeePaymentMethod {
-    constructor(sender) {
-        this.sender = sender;
-    }
-    getAsset() {
-        return GasTokenAddress;
-    }
-    getFunctionCalls() {
-        return Promise.resolve([]);
-    }
-    getFeePayer() {
-        return Promise.resolve(this.sender);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlX2ZlZV9wYXltZW50X21ldGhvZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9mZWUvbmF0aXZlX2ZlZV9wYXltZW50X21ldGhvZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFJdEU7O0dBRUc7QUFDSCxNQUFNLE9BQU8sc0JBQXNCO0lBQ2pDLFlBQXNCLE1BQW9CO1FBQXBCLFdBQU0sR0FBTixNQUFNLENBQWM7SUFBRyxDQUFDO0lBRTlDLFFBQVE7UUFDTixPQUFPLGVBQWUsQ0FBQztJQUN6QixDQUFDO0lBRUQsZ0JBQWdCO1FBQ2QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQzdCLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUN0QyxDQUFDO0NBQ0YifQ==

package/dest/fee/native_fee_payment_method_with_claim.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"native_fee_payment_method_with_claim.d.ts","sourceRoot":"","sources":["../../src/fee/native_fee_payment_method_with_claim.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAoB,MAAM,oBAAoB,CAAC;AAI7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;GAEG;AACH,qBAAa,+BAAgC,SAAQ,sBAAsB;IACvC,OAAO,CAAC,WAAW;IAAe,OAAO,CAAC,WAAW;gBAA3E,MAAM,EAAE,YAAY,EAAU,WAAW,EAAE,MAAM,GAAG,EAAE,EAAU,WAAW,EAAE,EAAE;IAI3F;;;OAGG;IACM,gBAAgB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;CAarD"}

package/dest/fee/native_fee_payment_method_with_claim.js

@@ -1,32 +0,0 @@
-import { Fr, FunctionSelector } from '@aztec/circuits.js';
-import { FunctionType } from '@aztec/foundation/abi';
-import { GasTokenAddress } from '@aztec/protocol-contracts/gas-token';
-import { NativeFeePaymentMethod } from './native_fee_payment_method.js';
-/**
- * Pay fee directly with native gas token claimed on the same tx.
- */
-export class NativeFeePaymentMethodWithClaim extends NativeFeePaymentMethod {
-    constructor(sender, claimAmount, claimSecret) {
-        super(sender);
-        this.claimAmount = claimAmount;
-        this.claimSecret = claimSecret;
-    }
-    /**
-     * Creates a function call to pay the fee in gas token.
-     * @returns A function call
-     */
-    getFunctionCalls() {
-        return Promise.resolve([
-            {
-                to: GasTokenAddress,
-                name: 'claim',
-                selector: FunctionSelector.fromSignature('claim((Field),Field,Field)'),
-                isStatic: false,
-                args: [this.sender, new Fr(this.claimAmount), this.claimSecret],
-                returnTypes: [],
-                type: FunctionType.PRIVATE,
-            },
-        ]);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmF0aXZlX2ZlZV9wYXltZW50X21ldGhvZF93aXRoX2NsYWltLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2ZlZS9uYXRpdmVfZmVlX3BheW1lbnRfbWV0aG9kX3dpdGhfY2xhaW0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFxQixFQUFFLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUM3RSxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFDckQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBRXRFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBRXhFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLCtCQUFnQyxTQUFRLHNCQUFzQjtJQUN6RSxZQUFZLE1BQW9CLEVBQVUsV0FBd0IsRUFBVSxXQUFlO1FBQ3pGLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUQwQixnQkFBVyxHQUFYLFdBQVcsQ0FBYTtRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFJO0lBRTNGLENBQUM7SUFFRDs7O09BR0c7SUFDTSxnQkFBZ0I7UUFDdkIsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDO1lBQ3JCO2dCQUNFLEVBQUUsRUFBRSxlQUFlO2dCQUNuQixJQUFJLEVBQUUsT0FBTztnQkFDYixRQUFRLEVBQUUsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLDRCQUE0QixDQUFDO2dCQUN0RSxRQUFRLEVBQUUsS0FBSztnQkFDZixJQUFJLEVBQUUsQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDO2dCQUMvRCxXQUFXLEVBQUUsRUFBRTtnQkFDZixJQUFJLEVBQUUsWUFBWSxDQUFDLE9BQU87YUFDM0I7U0FDRixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0YifQ==