@aztec/aztec-node 0.1.0-alpha46 → 0.1.0-alpha48

package/dest/aztec-node/server.js

@@ -1,8 +1,8 @@
 import { Archiver } from '@aztec/archiver';
-import { CircuitsWasm, Fr, HistoricBlockData, } from '@aztec/circuits.js';
+import { CircuitsWasm, Fr, GlobalVariables, HistoricBlockData, } from '@aztec/circuits.js';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InMemoryTxPool, createP2PClient } from '@aztec/p2p';
-import { SequencerClient } from '@aztec/sequencer-client';
+import { PublicProcessorFactory, SequencerClient, getGlobalVariableBuilder, } from '@aztec/sequencer-client';
 import { LogType, MerkleTreeId, } from '@aztec/types';
 import { MerkleTrees, ServerWorldStateSynchroniser, computePublicDataTreeLeafIndex, getConfigEnvVars as getWorldStateConfig, } from '@aztec/world-state';
 import { default as levelup } from 'levelup';
@@ -12,7 +12,7 @@ export const createMemDown = () => memdown();
  * The aztec node.
  */
 export class AztecNodeService {
-    constructor(p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchroniser, sequencer, chainId, version, log = createDebugLogger('aztec:node')) {
+    constructor(p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, worldStateSynchroniser, sequencer, chainId, version, globalVariableBuilder, merkleTreesDb, log = createDebugLogger('aztec:node')) {
         this.p2pClient = p2pClient;
         this.blockSource = blockSource;
         this.encryptedLogsSource = encryptedLogsSource;
@@ -23,6 +23,8 @@ export class AztecNodeService {
         this.sequencer = sequencer;
         this.chainId = chainId;
         this.version = version;
+        this.globalVariableBuilder = globalVariableBuilder;
+        this.merkleTreesDb = merkleTreesDb;
         this.log = log;
     }
     /**
@@ -39,14 +41,15 @@ export class AztecNodeService {
         // create the tx pool and the p2p client, which will need the l2 block source
         const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
         // now create the merkle trees and the world state syncher
-        const merkleTreeDB = await MerkleTrees.new(levelup(createMemDown()), await CircuitsWasm.get());
+        const merkleTreesDb = levelup(createMemDown());
+        const merkleTrees = await MerkleTrees.new(merkleTreesDb, await CircuitsWasm.get());
         const worldStateConfig = getWorldStateConfig();
-        const worldStateSynchroniser = new ServerWorldStateSynchroniser(merkleTreeDB, archiver, worldStateConfig);
+        const worldStateSynchroniser = new ServerWorldStateSynchroniser(merkleTrees, archiver, worldStateConfig);
         // start both and wait for them to sync from the block source
         await Promise.all([p2pClient.start(), worldStateSynchroniser.start()]);
         // now create the sequencer
         const sequencer = await SequencerClient.new(config, p2pClient, worldStateSynchroniser, archiver, archiver, archiver);
-        return new AztecNodeService(p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchroniser, sequencer, config.chainId, config.version);
+        return new AztecNodeService(p2pClient, archiver, archiver, archiver, archiver, archiver, worldStateSynchroniser, sequencer, config.chainId, config.version, getGlobalVariableBuilder(config), merkleTreesDb);
     }
     /**
      * Method to determine if the node is ready to accept transactions.
@@ -101,13 +104,12 @@ export class AztecNodeService {
         return this.blockSource.getRollupAddress();
     }
     /**
-     * Lookup the L2 contract data for this contract.
-     * Contains the ethereum portal address and bytecode.
+     * Get the extended contract data for this contract.
      * @param contractAddress - The contract data address.
-     * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
+     * @returns The extended contract data or undefined if not found.
      */
-    async getContractDataAndBytecode(contractAddress) {
-        return await this.contractDataSource.getContractDataAndBytecode(contractAddress);
+    async getExtendedContractData(contractAddress) {
+        return await this.contractDataSource.getExtendedContractData(contractAddress);
     }
     /**
      * Lookup the contract data for this contract.
@@ -137,6 +139,9 @@ export class AztecNodeService {
         this.log.info(`Received tx ${await tx.getTxHash()}`);
         await this.p2pClient.sendTx(tx);
     }
+    getTx(txHash) {
+        return this.blockSource.getL2Tx(txHash);
+    }
     /**
      * Method to stop the aztec node.
      */
@@ -265,6 +270,30 @@ export class AztecNodeService {
         const [roots, globalsHash] = await Promise.all([this.getTreeRoots(), committedDb.getLatestGlobalVariablesHash()]);
         return new HistoricBlockData(roots[MerkleTreeId.PRIVATE_DATA_TREE], roots[MerkleTreeId.NULLIFIER_TREE], roots[MerkleTreeId.CONTRACT_TREE], roots[MerkleTreeId.L1_TO_L2_MESSAGES_TREE], roots[MerkleTreeId.BLOCKS_TREE], Fr.ZERO, roots[MerkleTreeId.PUBLIC_DATA_TREE], globalsHash);
     }
+    /**
+     * Simulates the public part of a transaction with the current state.
+     * @param tx - The transaction to simulate.
+     **/
+    async simulatePublicCalls(tx) {
+        this.log.info(`Simulating tx ${await tx.getTxHash()}`);
+        const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
+        const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(new Fr(blockNumber));
+        const prevGlobalVariables = (await this.blockSource.getL2Block(-1))?.globalVariables ?? GlobalVariables.empty();
+        // Instantiate merkle trees so uncommited updates by this simulation are local to it.
+        // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
+        // So simulation of public functions doesn't affect the merkle trees.
+        const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
+        await merkleTrees.init(await CircuitsWasm.get(), {
+            globalVariables: prevGlobalVariables,
+        });
+        const publicProcessorFactory = new PublicProcessorFactory(merkleTrees.asLatest(), this.contractDataSource, this.l1ToL2MessageSource);
+        const processor = await publicProcessorFactory.create(prevGlobalVariables, newGlobalVariables);
+        const [, failedTxs] = await processor.process([tx]);
+        if (failedTxs.length) {
+            throw failedTxs[0].error;
+        }
+        this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
+    }
     /**
      * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
      * @returns An instance of a committed MerkleTreeOperations
@@ -288,4 +317,4 @@ export class AztecNodeService {
         await this.worldStateSynchroniser.syncImmediate(blockSourceHeight);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "@aztec/aztec-node",
-  "version": "0.1.0-alpha46",
+  "version": "0.1.0-alpha48",
   "exports": "./dest/index.js",
   "main": "dest/index.js",
   "type": "module",
   "dependencies": {
-    "@aztec/archiver": "0.1.0-alpha46",
-    "@aztec/circuits.js": "0.1.0-alpha46",
-    "@aztec/foundation": "0.1.0-alpha46",
-    "@aztec/l1-artifacts": "0.1.0-alpha46",
-    "@aztec/merkle-tree": "0.1.0-alpha46",
-    "@aztec/p2p": "0.1.0-alpha46",
-    "@aztec/sequencer-client": "0.1.0-alpha46",
-    "@aztec/types": "0.1.0-alpha46",
-    "@aztec/world-state": "0.1.0-alpha46",
+    "@aztec/archiver": "0.1.0-alpha48",
+    "@aztec/circuits.js": "0.1.0-alpha48",
+    "@aztec/foundation": "0.1.0-alpha48",
+    "@aztec/l1-artifacts": "0.1.0-alpha48",
+    "@aztec/merkle-tree": "0.1.0-alpha48",
+    "@aztec/p2p": "0.1.0-alpha48",
+    "@aztec/sequencer-client": "0.1.0-alpha48",
+    "@aztec/types": "0.1.0-alpha48",
+    "@aztec/world-state": "0.1.0-alpha48",
     "tslib": "^2.4.0"
   }
 }

package/src/aztec-node/http-node.test.ts

@@ -1,15 +1,16 @@
-import { AztecAddress, CircuitsWasm, EthAddress, Fr, HistoricBlockData } from '@aztec/circuits.js';
+import { AztecAddress, CircuitsWasm, EthAddress, Fr, FunctionSelector, HistoricBlockData } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
 import { Pedersen } from '@aztec/merkle-tree';
 import {
   ContractData,
-  ContractDataAndBytecode,
+  ExtendedContractData,
   L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   LogType,
   MerkleTreeId,
   SiblingPath,
+  SimulationError,
   TxHash,
   mockTx,
 } from '@aztec/types';
@@ -158,21 +159,21 @@ describe('HttpNode', () => {
     });
   });
 
-  describe('getContractDataAndBytecode', () => {
+  describe('getExtendedContractData', () => {
     it('should fetch and return contract public data', async () => {
-      const contractDataAndBytecode = ContractDataAndBytecode.random();
+      const extendedContractData = ExtendedContractData.random();
       const response = {
-        contractData: contractDataAndBytecode.toBuffer(),
+        contractData: extendedContractData.toBuffer(),
       };
 
       setFetchMock(response);
 
-      const result = await httpNode.getContractDataAndBytecode(contractDataAndBytecode.contractData.contractAddress);
+      const result = await httpNode.getExtendedContractData(extendedContractData.contractData.contractAddress);
 
       expect(fetch).toHaveBeenCalledWith(
-        `${TEST_URL}contract-data-and-bytecode?address=${contractDataAndBytecode.contractData.contractAddress.toString()}`,
+        `${TEST_URL}contract-data-and-bytecode?address=${extendedContractData.contractData.contractAddress.toString()}`,
       );
-      expect(result).toEqual(contractDataAndBytecode);
+      expect(result).toEqual(extendedContractData);
     });
 
     it('should return undefined if contract data is not available', async () => {
@@ -183,7 +184,7 @@ describe('HttpNode', () => {
 
       const randomAddress = AztecAddress.random();
 
-      const result = await httpNode.getContractDataAndBytecode(randomAddress);
+      const result = await httpNode.getExtendedContractData(randomAddress);
 
       expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data-and-bytecode?address=${randomAddress.toString()}`);
       expect(result).toEqual(undefined);
@@ -482,4 +483,36 @@ describe('HttpNode', () => {
       expect(result).toEqual(blockData);
     });
   });
+
+  describe('simulatePublicCalls', () => {
+    it('should fetch a successful simulation response', async () => {
+      const tx = mockTx();
+      const response = {};
+      setFetchMock(response);
+
+      await httpNode.simulatePublicCalls(tx);
+
+      const init: RequestInit = {
+        method: 'POST',
+        body: tx.toBuffer(),
+      };
+      const call = (fetch as jest.Mock).mock.calls[0] as any[];
+      expect(call[0].href).toBe(`${TEST_URL}simulate-tx`);
+      expect(call[1]).toStrictEqual(init);
+    });
+
+    it('should fetch a simulation error', async () => {
+      const tx = mockTx();
+      const simulationError = new SimulationError('Failing function', {
+        contractAddress: AztecAddress.ZERO,
+        functionSelector: FunctionSelector.empty(),
+      });
+      const response = {
+        simulationError: simulationError.toJSON(),
+      };
+      setFetchMock(response);
+
+      await expect(httpNode.simulatePublicCalls(tx)).rejects.toThrow(simulationError);
+    });
+  });
 });

package/src/aztec-node/http-node.ts

@@ -11,14 +11,16 @@ import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import {
   AztecNode,
   ContractData,
-  ContractDataAndBytecode,
+  ExtendedContractData,
   L1ToL2Message,
   L1ToL2MessageAndIndex,
   L2Block,
   L2BlockL2Logs,
+  L2Tx,
   LogType,
   MerkleTreeId,
   SiblingPath,
+  SimulationError,
   Tx,
   TxHash,
 } from '@aztec/types';
@@ -119,12 +121,11 @@ export class HttpNode implements AztecNode {
   }
 
   /**
-   * Lookup the contract data for this contract.
-   * Contains the ethereum portal address and bytecode.
+   * Get the extended contract data for this contract.
    * @param contractAddress - The contract data address.
-   * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
+   * @returns The extended contract data or undefined if not found.
    */
-  async getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined> {
+  async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
     const url = new URL(`${this.baseUrl}/contract-data-and-bytecode`);
     url.searchParams.append('address', contractAddress.toString());
     const response = await (await fetch(url.toString())).json();
@@ -132,7 +133,7 @@ export class HttpNode implements AztecNode {
       return undefined;
     }
     const contract = response.contractData as string;
-    return Promise.resolve(ContractDataAndBytecode.fromBuffer(Buffer.from(contract, 'hex')));
+    return Promise.resolve(ExtendedContractData.fromBuffer(Buffer.from(contract, 'hex')));
   }
 
   /**
@@ -187,6 +188,24 @@ export class HttpNode implements AztecNode {
     await fetch(url, init);
   }
 
+  /**
+   * Gets an l2 tx.
+   * @param txHash - The txHash of the l2 tx.
+   * @returns The requested L2 tx.
+   */
+  async getTx(txHash: TxHash): Promise<L2Tx | undefined> {
+    const url = new URL(`${this.baseUrl}/get-tx`);
+    url.searchParams.append('hash', txHash.toString());
+    const response = await fetch(url.toString());
+    if (response.status === 404) {
+      this.log.info(`Tx ${txHash.toString()} not found`);
+      return undefined;
+    }
+    const txBuffer = Buffer.from(await response.arrayBuffer());
+    const tx = L2Tx.fromBuffer(txBuffer);
+    return Promise.resolve(tx);
+  }
+
   /**
    * Method to retrieve pending txs.
    * @returns - The pending txs.
@@ -208,7 +227,7 @@ export class HttpNode implements AztecNode {
       this.log.info(`Tx ${txHash.toString()} not found`);
       return undefined;
     }
-    const txBuffer = Buffer.from(await (await fetch(url.toString())).arrayBuffer());
+    const txBuffer = Buffer.from(await response.arrayBuffer());
     const tx = Tx.fromBuffer(txBuffer);
     return Promise.resolve(tx);
   }
@@ -351,4 +370,19 @@ export class HttpNode implements AztecNode {
     const response = await (await fetch(url.toString())).json();
     return response.blockData;
   }
+
+  /**
+   * Simulates the public part of a transaction with the current state.
+   * @param tx - The transaction to simulate.
+   **/
+  public async simulatePublicCalls(tx: Tx) {
+    const url = new URL(`${this.baseUrl}/simulate-tx`);
+    const init: RequestInit = {};
+    init['method'] = 'POST';
+    init['body'] = tx.toBuffer();
+    const response = await (await fetch(url, init)).json();
+    if (response.simulationError) {
+      throw SimulationError.fromJSON(response.simulationError);
+    }
+  }
 }

package/src/aztec-node/server.ts

@@ -4,6 +4,7 @@ import {
   CircuitsWasm,
   EthAddress,
   Fr,
+  GlobalVariables,
   HistoricBlockData,
   L1_TO_L2_MSG_TREE_HEIGHT,
   PRIVATE_DATA_TREE_HEIGHT,
@@ -11,18 +12,24 @@ import {
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { InMemoryTxPool, P2P, createP2PClient } from '@aztec/p2p';
-import { SequencerClient } from '@aztec/sequencer-client';
+import {
+  GlobalVariableBuilder,
+  PublicProcessorFactory,
+  SequencerClient,
+  getGlobalVariableBuilder,
+} from '@aztec/sequencer-client';
 import {
   AztecNode,
   ContractData,
-  ContractDataAndBytecode,
   ContractDataSource,
+  ExtendedContractData,
   L1ToL2MessageAndIndex,
   L1ToL2MessageSource,
   L2Block,
   L2BlockL2Logs,
   L2BlockSource,
   L2LogsSource,
+  L2Tx,
   LogType,
   MerkleTreeId,
   SiblingPath,
@@ -60,6 +67,8 @@ export class AztecNodeService implements AztecNode {
     protected sequencer: SequencerClient,
     protected chainId: number,
     protected version: number,
+    protected globalVariableBuilder: GlobalVariableBuilder,
+    protected merkleTreesDb: levelup.LevelUp,
     private log = createDebugLogger('aztec:node'),
   ) {}
 
@@ -80,9 +89,10 @@ export class AztecNodeService implements AztecNode {
     const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
 
     // now create the merkle trees and the world state syncher
-    const merkleTreeDB = await MerkleTrees.new(levelup(createMemDown()), await CircuitsWasm.get());
+    const merkleTreesDb = levelup(createMemDown());
+    const merkleTrees = await MerkleTrees.new(merkleTreesDb, await CircuitsWasm.get());
     const worldStateConfig: WorldStateConfig = getWorldStateConfig();
-    const worldStateSynchroniser = new ServerWorldStateSynchroniser(merkleTreeDB, archiver, worldStateConfig);
+    const worldStateSynchroniser = new ServerWorldStateSynchroniser(merkleTrees, archiver, worldStateConfig);
 
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchroniser.start()]);
@@ -107,6 +117,8 @@ export class AztecNodeService implements AztecNode {
       sequencer,
       config.chainId,
       config.version,
+      getGlobalVariableBuilder(config),
+      merkleTreesDb,
     );
   }
 
@@ -170,13 +182,12 @@ export class AztecNodeService implements AztecNode {
   }
 
   /**
-   * Lookup the L2 contract data for this contract.
-   * Contains the ethereum portal address and bytecode.
+   * Get the extended contract data for this contract.
    * @param contractAddress - The contract data address.
-   * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
+   * @returns The extended contract data or undefined if not found.
    */
-  public async getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined> {
-    return await this.contractDataSource.getContractDataAndBytecode(contractAddress);
+  async getExtendedContractData(contractAddress: AztecAddress): Promise<ExtendedContractData | undefined> {
+    return await this.contractDataSource.getExtendedContractData(contractAddress);
   }
 
   /**
@@ -210,6 +221,10 @@ export class AztecNodeService implements AztecNode {
     await this.p2pClient!.sendTx(tx);
   }
 
+  public getTx(txHash: TxHash): Promise<L2Tx | undefined> {
+    return this.blockSource.getL2Tx(txHash);
+  }
+
   /**
    * Method to stop the aztec node.
    */
@@ -363,6 +378,37 @@ export class AztecNodeService implements AztecNode {
     );
   }
 
+  /**
+   * Simulates the public part of a transaction with the current state.
+   * @param tx - The transaction to simulate.
+   **/
+  public async simulatePublicCalls(tx: Tx) {
+    this.log.info(`Simulating tx ${await tx.getTxHash()}`);
+    const blockNumber = (await this.blockSource.getBlockNumber()) + 1;
+    const newGlobalVariables = await this.globalVariableBuilder.buildGlobalVariables(new Fr(blockNumber));
+    const prevGlobalVariables = (await this.blockSource.getL2Block(-1))?.globalVariables ?? GlobalVariables.empty();
+
+    // Instantiate merkle trees so uncommited updates by this simulation are local to it.
+    // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
+    // So simulation of public functions doesn't affect the merkle trees.
+    const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
+    await merkleTrees.init(await CircuitsWasm.get(), {
+      globalVariables: prevGlobalVariables,
+    });
+
+    const publicProcessorFactory = new PublicProcessorFactory(
+      merkleTrees.asLatest(),
+      this.contractDataSource,
+      this.l1ToL2MessageSource,
+    );
+    const processor = await publicProcessorFactory.create(prevGlobalVariables, newGlobalVariables);
+    const [, failedTxs] = await processor.process([tx]);
+    if (failedTxs.length) {
+      throw failedTxs[0].error;
+    }
+    this.log.info(`Simulated tx ${await tx.getTxHash()} succeeds`);
+  }
+
   /**
    * Returns an instance of MerkleTreeOperations having first ensured the world state is fully synched
    * @returns An instance of a committed MerkleTreeOperations