@aztec/aztec-node 0.1.0-alpha23 → 0.1.0-alpha40

package/dest/index.js

@@ -1,5 +1,4 @@
-export * from './aztec-node/aztec-node.js';
 export * from './aztec-node/config.js';
 export * from './aztec-node/server.js';
 export * from './aztec-node/http-node.js';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsY0FBYywyQkFBMkIsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHdCQUF3QixDQUFDO0FBQ3ZDLGNBQWMsMkJBQTJCLENBQUMifQ==

package/package.json

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

package/src/aztec-node/config.ts

@@ -1,6 +1,7 @@
 import { ArchiverConfig, getConfigEnvVars as getArchiverVars } from '@aztec/archiver';
-import { SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client';
 import { P2PConfig, getP2PConfigEnvVars } from '@aztec/p2p';
+import { SequencerClientConfig, getConfigEnvVars as getSequencerVars } from '@aztec/sequencer-client';
+import { getConfigEnvVars as getWorldStateVars } from '@aztec/world-state';
 
 /**
  * The configuration the aztec node.
@@ -16,6 +17,7 @@ export function getConfigEnvVars(): AztecNodeConfig {
     ...getSequencerVars(),
     ...getArchiverVars(),
     ...getP2PConfigEnvVars(),
+    ...getWorldStateVars(),
   };
 
   return allEnvVars;

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

@@ -1,18 +1,21 @@
-import { AztecAddress, CircuitsWasm, Fr } from '@aztec/circuits.js';
+import { AztecAddress, CircuitsWasm, EthAddress, Fr, HistoricBlockData } from '@aztec/circuits.js';
 import { randomBytes } from '@aztec/foundation/crypto';
-import { Pedersen, SiblingPath } from '@aztec/merkle-tree';
+import { Pedersen } from '@aztec/merkle-tree';
 import {
   ContractData,
-  ContractPublicData,
+  ContractDataAndBytecode,
   L1ToL2Message,
   L2Block,
   L2BlockL2Logs,
   LogType,
   MerkleTreeId,
-  mockTx,
+  SiblingPath,
   TxHash,
+  mockTx,
 } from '@aztec/types';
+
 import { jest } from '@jest/globals';
+
 import { HttpNode } from './http-node.js';
 
 const TEST_URL = 'http://aztec-node-url.com/';
@@ -66,7 +69,7 @@ describe('HttpNode', () => {
 
       const result = await httpNode.getBlocks(0, 3);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&take=3`);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&limit=3`);
       expect(result).toEqual([block1, block2]);
     });
 
@@ -76,11 +79,36 @@ describe('HttpNode', () => {
 
       const result = await httpNode.getBlocks(0, 2);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&take=2`);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&limit=2`);
       expect(result).toEqual([]);
     });
   });
 
+  describe('getBlock', () => {
+    it('should fetch and parse a block', async () => {
+      const block1 = L2Block.random(1);
+      const response = {
+        block: block1.encode(),
+      };
+      setFetchMock(response);
+
+      const result = await httpNode.getBlock(1);
+
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block?number=1`);
+      expect(result).toEqual(block1);
+    });
+
+    it('should return undefined if the block is not available', async () => {
+      const response = { block: undefined };
+      setFetchMock(response);
+
+      const result = await httpNode.getBlock(2);
+
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block?number=2`);
+      expect(result).toEqual(undefined);
+    });
+  });
+
   describe('getBlockHeight', () => {
     it('should fetch and return the block height', async () => {
       const response = { blockHeight: 100 };
@@ -117,21 +145,34 @@ describe('HttpNode', () => {
     });
   });
 
-  describe('getContractData', () => {
+  describe('getRollupAddress', () => {
+    it('should fetch and return the rollup address', async () => {
+      const addr = EthAddress.random();
+      const response = { rollupAddress: addr.toString() };
+      setFetchMock(response);
+
+      const result = await httpNode.getRollupAddress();
+
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-rollup-address`);
+      expect(result).toEqual(addr);
+    });
+  });
+
+  describe('getContractDataAndBytecode', () => {
     it('should fetch and return contract public data', async () => {
-      const contractData = ContractPublicData.random();
+      const contractDataAndBytecode = ContractDataAndBytecode.random();
       const response = {
-        contractData: contractData.toBuffer(),
+        contractData: contractDataAndBytecode.toBuffer(),
       };
 
       setFetchMock(response);
 
-      const result = await httpNode.getContractData(contractData.contractData.contractAddress);
+      const result = await httpNode.getContractDataAndBytecode(contractDataAndBytecode.contractData.contractAddress);
 
       expect(fetch).toHaveBeenCalledWith(
-        `${TEST_URL}contract-data?address=${contractData.contractData.contractAddress.toString()}`,
+        `${TEST_URL}contract-data-and-bytecode?address=${contractDataAndBytecode.contractData.contractAddress.toString()}`,
       );
-      expect(result).toEqual(contractData);
+      expect(result).toEqual(contractDataAndBytecode);
     });
 
     it('should return undefined if contract data is not available', async () => {
@@ -142,9 +183,9 @@ describe('HttpNode', () => {
 
       const randomAddress = AztecAddress.random();
 
-      const result = await httpNode.getContractData(randomAddress);
+      const result = await httpNode.getContractDataAndBytecode(randomAddress);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${randomAddress.toString()}`);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data-and-bytecode?address=${randomAddress.toString()}`);
       expect(result).toEqual(undefined);
     });
   });
@@ -154,7 +195,7 @@ describe('HttpNode', () => {
       const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
 
       const from = 0;
-      const take = 3;
+      const limit = 3;
       const log1 = L2BlockL2Logs.random(2, 3, 4);
       const log2 = L2BlockL2Logs.random(1, 5, 2);
       const response = {
@@ -162,9 +203,9 @@ describe('HttpNode', () => {
       };
       setFetchMock(response);
 
-      const result = await httpNode.getLogs(from, take, processedLogType);
+      const result = await httpNode.getLogs(from, limit, processedLogType);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&take=${take}&logType=${processedLogType}`);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&limit=${limit}&logType=${processedLogType}`);
       expect(result).toEqual([log1, log2]);
     });
 
@@ -174,43 +215,45 @@ describe('HttpNode', () => {
         const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
 
         const from = 0;
-        const take = 2;
+        const limit = 2;
         const response = {};
         setFetchMock(response);
 
-        const result = await httpNode.getLogs(from, take, processedLogType);
+        const result = await httpNode.getLogs(from, limit, processedLogType);
 
-        expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&take=${take}&logType=${processedLogType}`);
+        expect(fetch).toHaveBeenCalledWith(
+          `${TEST_URL}get-logs?from=${from}&limit=${limit}&logType=${processedLogType}`,
+        );
         expect(result).toEqual([]);
       },
     );
   });
 
-  describe('getContractInfo', () => {
+  describe('getContractData', () => {
     it('should fetch and return contract data', async () => {
-      const contractInfo = ContractData.random();
+      const contractData = ContractData.random();
       const response = {
-        contractInfo: contractInfo.toBuffer(),
+        contractData: contractData.toBuffer(),
       };
       setFetchMock(response);
 
-      const result = await httpNode.getContractInfo(contractInfo.contractAddress);
+      const result = await httpNode.getContractData(contractData.contractAddress);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-info?address=${contractInfo.contractAddress.toString()}`);
-      expect(result).toEqual(contractInfo);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${contractData.contractAddress.toString()}`);
+      expect(result).toEqual(contractData);
     });
 
     it('should return undefined if contract data is not available', async () => {
       const response = {
-        contractInfo: undefined,
+        contractData: undefined,
       };
       setFetchMock(response);
 
       const randomAddress = AztecAddress.random();
 
-      const result = await httpNode.getContractInfo(randomAddress);
+      const result = await httpNode.getContractData(randomAddress);
 
-      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-info?address=${randomAddress.toString()}`);
+      expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${randomAddress.toString()}`);
       expect(result).toBeUndefined();
     });
   });
@@ -369,7 +412,7 @@ describe('HttpNode', () => {
     });
   });
 
-  describe('getStorageAt', () => {
+  describe('getPublicStorageAt', () => {
     it('should fetch and return the storage value at the given contract slot', async () => {
       const contractAddress = AztecAddress.random();
       const slot = BigInt(789);
@@ -377,9 +420,9 @@ describe('HttpNode', () => {
       const response = { value: storageValue.toString('hex') };
       setFetchMock(response);
 
-      const result = await httpNode.getStorageAt(contractAddress, slot);
+      const result = await httpNode.getPublicStorageAt(contractAddress, slot);
 
-      const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
+      const url = `${TEST_URL}public-storage-at?address=${contractAddress}&slot=${slot.toString()}`;
       expect(fetch).toHaveBeenCalledWith(url);
       expect(result).toEqual(storageValue);
     });
@@ -390,9 +433,9 @@ describe('HttpNode', () => {
       const response = {};
       setFetchMock(response);
 
-      const result = await httpNode.getStorageAt(contractAddress, slot);
+      const result = await httpNode.getPublicStorageAt(contractAddress, slot);
 
-      const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
+      const url = `${TEST_URL}public-storage-at?address=${contractAddress}&slot=${slot.toString()}`;
       expect(fetch).toHaveBeenCalledWith(url);
       expect(result).toBeUndefined();
     });
@@ -406,9 +449,7 @@ describe('HttpNode', () => {
         [MerkleTreeId.NULLIFIER_TREE]: Fr.random(),
         [MerkleTreeId.PUBLIC_DATA_TREE]: Fr.random(),
         [MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: Fr.random(),
-        [MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE]: Fr.random(),
-        [MerkleTreeId.CONTRACT_TREE_ROOTS_TREE]: Fr.random(),
-        [MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE]: Fr.random(),
+        [MerkleTreeId.BLOCKS_TREE]: Fr.random(),
       };
 
       const rootsInResponse: Record<MerkleTreeId, string> = Object.fromEntries(
@@ -425,4 +466,20 @@ describe('HttpNode', () => {
       expect(result).toEqual(roots);
     });
   });
+
+  describe('getHistoricBlockData', () => {
+    it('should fetch and return the current committed roots for the data trees', async () => {
+      const blockData = HistoricBlockData.random();
+
+      const response = { blockData };
+
+      setFetchMock(response);
+
+      const result = await httpNode.getHistoricBlockData();
+
+      const url = `${TEST_URL}historic-block-data`;
+      expect(fetch).toHaveBeenCalledWith(url);
+      expect(result).toEqual(blockData);
+    });
+  });
 });

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

@@ -1,22 +1,24 @@
-import { AztecNode } from '@aztec/aztec-node';
 import {
   AztecAddress,
   CONTRACT_TREE_HEIGHT,
+  EthAddress,
   Fr,
+  HistoricBlockData,
   L1_TO_L2_MSG_TREE_HEIGHT,
   PRIVATE_DATA_TREE_HEIGHT,
 } from '@aztec/circuits.js';
-import { Logger, createLogger } from '@aztec/foundation/log';
-import { SiblingPath } from '@aztec/merkle-tree';
+import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import {
+  AztecNode,
   ContractData,
-  ContractPublicData,
+  ContractDataAndBytecode,
   L1ToL2Message,
   L1ToL2MessageAndIndex,
   L2Block,
   L2BlockL2Logs,
   LogType,
   MerkleTreeId,
+  SiblingPath,
   Tx,
   TxHash,
 } from '@aztec/types';
@@ -26,9 +28,9 @@ import {
  */
 export class HttpNode implements AztecNode {
   private baseUrl: string;
-  private log: Logger;
+  private log: DebugLogger;
 
-  constructor(baseUrl: string, log = createLogger('aztec:http-node')) {
+  constructor(baseUrl: string, log = createDebugLogger('aztec:http-node')) {
     this.baseUrl = baseUrl.toString().replace(/\/$/, '');
     this.log = log;
   }
@@ -43,17 +45,30 @@ export class HttpNode implements AztecNode {
     return respJson.isReady;
   }
 
+  /**
+   * Method to request a block at the provided block number.
+   * @param number - The block number to request.
+   * @returns The block requested. Or undefined if it does not exist.
+   */
+  async getBlock(number: number): Promise<L2Block | undefined> {
+    const url = new URL(`${this.baseUrl}/get-block`);
+    url.searchParams.append('number', number.toString());
+    const response = await (await fetch(url.toString())).json();
+    const { block } = response;
+    return Promise.resolve(block ? L2Block.decode(Buffer.from(block, 'hex')) : block);
+  }
+
   /**
    * Method to request blocks. Will attempt to return all requested blocks but will return only those available.
    * @param from - The start of the range of blocks to return.
-   * @param take - The number of blocks desired.
+   * @param limit - Maximum number of blocks to obtain.
    * @returns The blocks requested.
    */
-  async getBlocks(from: number, take: number): Promise<L2Block[]> {
+  async getBlocks(from: number, limit: number): Promise<L2Block[]> {
     const url = new URL(`${this.baseUrl}/get-blocks`);
     url.searchParams.append('from', from.toString());
-    if (take !== undefined) {
-      url.searchParams.append('take', take.toString());
+    if (limit !== undefined) {
+      url.searchParams.append('limit', limit.toString());
     }
     const response = await (await fetch(url.toString())).json();
     const blocks = response.blocks as string[];
@@ -85,6 +100,13 @@ export class HttpNode implements AztecNode {
     return respJson.version;
   }
 
+  public async getRollupAddress(): Promise<EthAddress> {
+    const url = new URL(`${this.baseUrl}/get-rollup-address`);
+    const response = await fetch(url.toString());
+    const respJson = await response.json();
+    return EthAddress.fromString(respJson.rollupAddress);
+  }
+
   /**
    * Method to fetch the chain id of the base-layer for the rollup.
    * @returns The chain id.
@@ -97,34 +119,34 @@ export class HttpNode implements AztecNode {
   }
 
   /**
-   * Lookup the L2 contract data for this contract.
+   * Lookup the contract data for this contract.
    * Contains the ethereum portal address and bytecode.
    * @param contractAddress - The contract data address.
    * @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
    */
-  async getContractData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined> {
-    const url = new URL(`${this.baseUrl}/contract-data`);
+  async getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | 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();
     if (!response || !response.contractData) {
       return undefined;
     }
     const contract = response.contractData as string;
-    return Promise.resolve(ContractPublicData.fromBuffer(Buffer.from(contract, 'hex')));
+    return Promise.resolve(ContractDataAndBytecode.fromBuffer(Buffer.from(contract, 'hex')));
   }
 
   /**
-   * Gets the `take` amount of logs starting from `from`.
+   * Gets up to `limit` amount of logs starting from `from`.
    * @param from - Number of the L2 block to which corresponds the first logs to be returned.
-   * @param take - The number of logs to return.
+   * @param limit - The maximum number of logs to return.
    * @param logType - Specifies whether to return encrypted or unencrypted logs.
    * @returns The requested logs.
    */
-  public async getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]> {
+  public async getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]> {
     const url = new URL(`${this.baseUrl}/get-logs`);
 
     url.searchParams.append('from', from.toString());
-    url.searchParams.append('take', take.toString());
+    url.searchParams.append('limit', limit.toString());
     url.searchParams.append('logType', logType.toString());
 
     const response = await (await fetch(url.toString())).json();
@@ -137,19 +159,19 @@ export class HttpNode implements AztecNode {
   }
 
   /**
-   * Lookup the L2 contract info for this contract.
+   * Lookup the contract data for this contract.
    * Contains the ethereum portal address.
    * @param contractAddress - The contract data address.
    * @returns The contract's address & portal address.
    */
-  async getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    const url = new URL(`${this.baseUrl}/contract-info`);
+  async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
+    const url = new URL(`${this.baseUrl}/contract-data`);
     url.searchParams.append('address', contractAddress.toString());
     const response = await (await fetch(url.toString())).json();
-    if (!response || !response.contractInfo) {
+    if (!response || !response.contractData) {
       return undefined;
     }
-    const contract = response.contractInfo as string;
+    const contract = response.contractData as string;
     return Promise.resolve(ContractData.fromBuffer(Buffer.from(contract, 'hex')));
   }
 
@@ -183,7 +205,7 @@ export class HttpNode implements AztecNode {
     url.searchParams.append('hash', txHash.toString());
     const response = await fetch(url.toString());
     if (response.status === 404) {
-      this.log(`Tx ${txHash.toString()} not found`);
+      this.log.info(`Tx ${txHash.toString()} not found`);
       return undefined;
     }
     const txBuffer = Buffer.from(await (await fetch(url.toString())).arrayBuffer());
@@ -284,8 +306,8 @@ export class HttpNode implements AztecNode {
    * @returns Storage value at the given contract slot (or undefined if not found).
    * Note: Aztec's version of `eth_getStorageAt`.
    */
-  async getStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined> {
-    const url = new URL(`${this.baseUrl}/storage-at`);
+  async getPublicStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined> {
+    const url = new URL(`${this.baseUrl}/public-storage-at`);
     url.searchParams.append('address', contract.toString());
     url.searchParams.append('slot', slot.toString());
     const response = await (await fetch(url.toString())).json();
@@ -316,9 +338,17 @@ export class HttpNode implements AztecNode {
       [MerkleTreeId.NULLIFIER_TREE]: extractRoot(MerkleTreeId.NULLIFIER_TREE),
       [MerkleTreeId.PUBLIC_DATA_TREE]: extractRoot(MerkleTreeId.PUBLIC_DATA_TREE),
       [MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: extractRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
-      [MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE]: extractRoot(MerkleTreeId.L1_TO_L2_MESSAGES_ROOTS_TREE),
-      [MerkleTreeId.CONTRACT_TREE_ROOTS_TREE]: extractRoot(MerkleTreeId.CONTRACT_TREE_ROOTS_TREE),
-      [MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE]: extractRoot(MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE),
+      [MerkleTreeId.BLOCKS_TREE]: extractRoot(MerkleTreeId.BLOCKS_TREE),
     };
   }
+
+  /**
+   * Returns the currently committed historic block data.
+   * @returns The current committed block data.
+   */
+  public async getHistoricBlockData(): Promise<HistoricBlockData> {
+    const url = new URL(`${this.baseUrl}/historic-block-data`);
+    const response = await (await fetch(url.toString())).json();
+    return response.blockData;
+  }
 }