@aztec/aztec-node 0.1.0-alpha20 → 0.1.0-alpha21

package/dest/aztec-node/http-node.test.js

@@ -0,0 +1,322 @@
+import { AztecAddress, CircuitsWasm, Fr } from '@aztec/circuits.js';
+import { randomBytes } from '@aztec/foundation/crypto';
+import { Pedersen, SiblingPath } from '@aztec/merkle-tree';
+import { ContractData, ContractPublicData, L1ToL2Message, L2Block, L2BlockL2Logs, LogType, MerkleTreeId, mockTx, TxHash, } from '@aztec/types';
+import { jest } from '@jest/globals';
+import { HttpNode } from './http-node.js';
+const TEST_URL = 'http://aztec-node-url.com/';
+const setFetchMock = (response, status = 200) => {
+    global.fetch = jest
+        .fn()
+        .mockImplementation((_input, _init) => {
+        return Promise.resolve({
+            status,
+            ok: true,
+            json: () => response,
+            arrayBuffer: () => response,
+        });
+    });
+};
+describe('HttpNode', () => {
+    let httpNode;
+    let pedersen;
+    beforeAll(async () => {
+        httpNode = new HttpNode(TEST_URL);
+        pedersen = new Pedersen(await CircuitsWasm.get());
+    });
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+    describe('isReady', () => {
+        it.each([true, false])('should return %s when the node is ready', async () => {
+            const response = { isReady: true };
+            setFetchMock(response);
+            const result = await httpNode.isReady();
+            expect(fetch).toHaveBeenCalledWith(TEST_URL);
+            expect(result).toBe(true);
+        });
+    });
+    describe('getBlocks', () => {
+        it('should fetch and parse blocks', async () => {
+            const block1 = L2Block.random(1);
+            const block2 = L2Block.random(2);
+            const response = {
+                blocks: [block1.encode(), block2.encode()],
+            };
+            setFetchMock(response);
+            const result = await httpNode.getBlocks(0, 3);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&take=3`);
+            expect(result).toEqual([block1, block2]);
+        });
+        it('should return an empty array if blocks are not available', async () => {
+            const response = { blocks: [] };
+            setFetchMock(response);
+            const result = await httpNode.getBlocks(0, 2);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&take=2`);
+            expect(result).toEqual([]);
+        });
+    });
+    describe('getBlockHeight', () => {
+        it('should fetch and return the block height', async () => {
+            const response = { blockHeight: 100 };
+            setFetchMock(response);
+            const result = await httpNode.getBlockHeight();
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block-height`);
+            expect(result).toBe(100);
+        });
+    });
+    describe('getVersion', () => {
+        it('should fetch and return the version', async () => {
+            const response = { version: 5 };
+            setFetchMock(response);
+            const result = await httpNode.getVersion();
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-version`);
+            expect(result).toBe(5);
+        });
+    });
+    describe('getChainId', () => {
+        it('should fetch and return the chain ID', async () => {
+            const response = { chainId: 1234 };
+            setFetchMock(response);
+            const result = await httpNode.getChainId();
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-chain-id`);
+            expect(result).toBe(1234);
+        });
+    });
+    describe('getContractData', () => {
+        it('should fetch and return contract public data', async () => {
+            const contractData = ContractPublicData.random();
+            const response = {
+                contractData: contractData.toBuffer(),
+            };
+            setFetchMock(response);
+            const result = await httpNode.getContractData(contractData.contractData.contractAddress);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${contractData.contractData.contractAddress.toString()}`);
+            expect(result).toEqual(contractData);
+        });
+        it('should return undefined if contract data is not available', async () => {
+            const response = {
+                contractData: undefined,
+            };
+            setFetchMock(response);
+            const randomAddress = AztecAddress.random();
+            const result = await httpNode.getContractData(randomAddress);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${randomAddress.toString()}`);
+            expect(result).toEqual(undefined);
+        });
+    });
+    describe('getLogs', () => {
+        it.each(['encrypted', 'unencrypted'])('should fetch and return %s logs', async (logType) => {
+            const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
+            const from = 0;
+            const take = 3;
+            const log1 = L2BlockL2Logs.random(2, 3, 4);
+            const log2 = L2BlockL2Logs.random(1, 5, 2);
+            const response = {
+                logs: [log1.toBuffer(), log2.toBuffer()],
+            };
+            setFetchMock(response);
+            const result = await httpNode.getLogs(from, take, processedLogType);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&take=${take}&logType=${processedLogType}`);
+            expect(result).toEqual([log1, log2]);
+        });
+        it.each(['encrypted', 'unencrypted'])('should return an empty array if %s logs are not available', async (logType) => {
+            const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
+            const from = 0;
+            const take = 2;
+            const response = {};
+            setFetchMock(response);
+            const result = await httpNode.getLogs(from, take, processedLogType);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&take=${take}&logType=${processedLogType}`);
+            expect(result).toEqual([]);
+        });
+    });
+    describe('getContractInfo', () => {
+        it('should fetch and return contract data', async () => {
+            const contractInfo = ContractData.random();
+            const response = {
+                contractInfo: contractInfo.toBuffer(),
+            };
+            setFetchMock(response);
+            const result = await httpNode.getContractInfo(contractInfo.contractAddress);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-info?address=${contractInfo.contractAddress.toString()}`);
+            expect(result).toEqual(contractInfo);
+        });
+        it('should return undefined if contract data is not available', async () => {
+            const response = {
+                contractInfo: undefined,
+            };
+            setFetchMock(response);
+            const randomAddress = AztecAddress.random();
+            const result = await httpNode.getContractInfo(randomAddress);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-info?address=${randomAddress.toString()}`);
+            expect(result).toBeUndefined();
+        });
+    });
+    describe('sendTx', () => {
+        it('should submit a transaction to the p2p pool', async () => {
+            const tx = mockTx();
+            const irrelevantResponse = {};
+            setFetchMock(irrelevantResponse);
+            await httpNode.sendTx(tx);
+            const init = {
+                method: 'POST',
+                body: tx.toBuffer(),
+            };
+            const call = fetch.mock.calls[0];
+            expect(call[0].href).toBe(`${TEST_URL}tx`);
+            expect(call[1]).toStrictEqual(init);
+        });
+    });
+    describe('getPendingTxByHash', () => {
+        it('should fetch and return a pending tx', async () => {
+            const txHash = new TxHash(randomBytes(TxHash.SIZE));
+            const tx = mockTx();
+            const response = tx.toBuffer();
+            setFetchMock(response);
+            const result = await httpNode.getPendingTxByHash(txHash);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-pending-tx?hash=${txHash}`);
+            expect(result).toEqual(tx);
+        });
+        it('should return undefined if the pending tx does not exist', async () => {
+            const txHash = new TxHash(randomBytes(TxHash.SIZE));
+            const response = undefined;
+            setFetchMock(response, 404);
+            const result = await httpNode.getPendingTxByHash(txHash);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-pending-tx?hash=${txHash}`);
+            expect(result).toBeUndefined();
+        });
+    });
+    describe('findContractIndex', () => {
+        it('should fetch and return the index of the given contract', async () => {
+            const leafValue = Buffer.from('abc123', 'hex');
+            const index = '123456';
+            const response = { index };
+            setFetchMock(response);
+            const result = await httpNode.findContractIndex(leafValue);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-index?leaf=${leafValue.toString('hex')}`);
+            expect(result).toBe(BigInt(index));
+        });
+        it('should return undefined if the contract index is not found', async () => {
+            const leafValue = Buffer.from('def456', 'hex');
+            const response = {};
+            setFetchMock(response);
+            const result = await httpNode.findContractIndex(leafValue);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-index?leaf=${leafValue.toString('hex')}`);
+            expect(result).toBeUndefined();
+        });
+    });
+    describe('getContractPath', () => {
+        it('should fetch and return the sibling path for the given leaf index', async () => {
+            const leafIndex = BigInt(123456);
+            const siblingPath = SiblingPath.ZERO(3, Buffer.alloc(32), pedersen);
+            const response = { path: siblingPath.toBuffer().toString('hex') };
+            setFetchMock(response);
+            const result = await httpNode.getContractPath(leafIndex);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-path?leaf=${leafIndex.toString()}`);
+            expect(result).toEqual(siblingPath);
+        });
+    });
+    describe('findCommitmentIndex', () => {
+        it('should fetch and return the index of the given leaf', async () => {
+            const leafValue = Buffer.from('0123456789', 'hex');
+            const expectedIndex = BigInt(123);
+            const response = { index: expectedIndex.toString() };
+            setFetchMock(response);
+            const result = await httpNode.findCommitmentIndex(leafValue);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}commitment-index?leaf=${leafValue.toString('hex')}`);
+            expect(result).toBe(expectedIndex);
+        });
+        it('should return undefined if the commitment index is not found', async () => {
+            const leafValue = Buffer.from('def456', 'hex');
+            const response = {};
+            setFetchMock(response);
+            const result = await httpNode.findCommitmentIndex(leafValue);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}commitment-index?leaf=${leafValue.toString('hex')}`);
+            expect(result).toBeUndefined();
+        });
+    });
+    describe('getDataTreePath', () => {
+        it('should fetch and return the sibling path for the given leaf index', async () => {
+            const leafIndex = BigInt(123456);
+            const siblingPath = SiblingPath.ZERO(3, Buffer.alloc(32), pedersen);
+            const response = { path: siblingPath.toBuffer().toString('hex') };
+            setFetchMock(response);
+            const result = await httpNode.getDataTreePath(leafIndex);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}data-path?leaf=${leafIndex.toString()}`);
+            expect(result).toEqual(siblingPath);
+        });
+    });
+    describe('getL1ToL2MessageAndIndex', () => {
+        it('should fetch and return the L1 to L2 message and index for the given message key', async () => {
+            const messageKey = new Fr(789);
+            const expectedMessage = L1ToL2Message.random();
+            const expectedIndex = BigInt(123);
+            const response = { message: expectedMessage.toBuffer().toString('hex'), index: expectedIndex.toString() };
+            setFetchMock(response);
+            const result = await httpNode.getL1ToL2MessageAndIndex(messageKey);
+            expect(fetch).toHaveBeenCalledWith(`${TEST_URL}l1-l2-message?messageKey=${messageKey.toString()}`);
+            expect(result).toEqual({
+                message: expectedMessage,
+                index: expectedIndex,
+            });
+        });
+    });
+    describe('getL1ToL2MessagesTreePath', () => {
+        it('should fetch and return the sibling path for the given leaf index', async () => {
+            const leafIndex = BigInt(123456);
+            const siblingPath = SiblingPath.ZERO(3, Buffer.alloc(32), pedersen);
+            const response = { path: siblingPath.toBuffer().toString('hex') };
+            setFetchMock(response);
+            const result = await httpNode.getL1ToL2MessagesTreePath(leafIndex);
+            const url = `${TEST_URL}l1-l2-path?leaf=${leafIndex.toString()}`;
+            expect(fetch).toHaveBeenCalledWith(url);
+            expect(result).toEqual(siblingPath);
+        });
+    });
+    describe('getStorageAt', () => {
+        it('should fetch and return the storage value at the given contract slot', async () => {
+            const contractAddress = AztecAddress.random();
+            const slot = BigInt(789);
+            const storageValue = Buffer.from('0123456789', 'hex');
+            const response = { value: storageValue.toString('hex') };
+            setFetchMock(response);
+            const result = await httpNode.getStorageAt(contractAddress, slot);
+            const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
+            expect(fetch).toHaveBeenCalledWith(url);
+            expect(result).toEqual(storageValue);
+        });
+        it('should return undefined if the storage value is not found', async () => {
+            const contractAddress = AztecAddress.random();
+            const slot = BigInt(987);
+            const response = {};
+            setFetchMock(response);
+            const result = await httpNode.getStorageAt(contractAddress, slot);
+            const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
+            expect(fetch).toHaveBeenCalledWith(url);
+            expect(result).toBeUndefined();
+        });
+    });
+    describe('getTreeRoots', () => {
+        it('should fetch and return the current committed roots for the data trees', async () => {
+            const roots = {
+                [MerkleTreeId.CONTRACT_TREE]: Fr.random(),
+                [MerkleTreeId.PRIVATE_DATA_TREE]: Fr.random(),
+                [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(),
+            };
+            const rootsInResponse = Object.fromEntries(Object.entries(roots).map(([key, value]) => [key, value.toString()]));
+            const response = { roots: rootsInResponse };
+            setFetchMock(response);
+            const result = await httpNode.getTreeRoots();
+            const url = `${TEST_URL}tree-roots`;
+            expect(fetch).toHaveBeenCalledWith(url);
+            expect(result).toEqual(roots);
+        });
+    });
+});
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"http-node.test.js","sourceRoot":"","sources":["../../src/aztec-node/http-node.test.ts"],"names":[],"mappings":"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"}

package/dest/aztec-node/server.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
-import { CONTRACT_TREE_HEIGHT, Fr, L1_TO_L2_MESSAGES_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
+import { CONTRACT_TREE_HEIGHT, Fr, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { SiblingPath } from '@aztec/merkle-tree';
 import { P2P } from '@aztec/p2p';
 import { SequencerClient } from '@aztec/sequencer-client';
-import { ContractData, ContractDataSource, ContractPublicData, L1ToL2MessageAndIndex, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, MerkleTreeId, Tx, TxHash } from '@aztec/types';
+import { ContractData, ContractDataSource, ContractPublicData, L1ToL2MessageAndIndex, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogType, MerkleTreeId, Tx, TxHash } from '@aztec/types';
 import { MerkleTrees, WorldStateSynchroniser } from '@aztec/world-state';
 import { MemDown } from 'memdown';
 import { AztecNode } from './aztec-node.js';
@@ -23,9 +23,9 @@ export declare class AztecNodeService implements AztecNode {
     protected merkleTreeDB: MerkleTrees;
     protected worldStateSynchroniser: WorldStateSynchroniser;
     protected sequencer: SequencerClient;
-    protected chainId: Fr;
-    protected version: Fr;
-    constructor(p2pClient: P2P, blockSource: L2BlockSource, encryptedLogsSource: L2LogsSource, unencryptedLogsSource: L2LogsSource, contractDataSource: ContractDataSource, l1ToL2MessageSource: L1ToL2MessageSource, merkleTreeDB: MerkleTrees, worldStateSynchroniser: WorldStateSynchroniser, sequencer: SequencerClient, chainId: Fr, version: Fr);
+    protected chainId: number;
+    protected version: number;
+    constructor(p2pClient: P2P, blockSource: L2BlockSource, encryptedLogsSource: L2LogsSource, unencryptedLogsSource: L2LogsSource, contractDataSource: ContractDataSource, l1ToL2MessageSource: L1ToL2MessageSource, merkleTreeDB: MerkleTrees, worldStateSynchroniser: WorldStateSynchroniser, sequencer: SequencerClient, chainId: number, version: number);
     /**
      * Initialises the Aztec Node, wait for component to sync.
      * @param config - The configuration to be used by the aztec node.
@@ -53,12 +53,12 @@ export declare class AztecNodeService implements AztecNode {
      * Method to fetch the version of the rollup the node is connected to.
      * @returns The rollup version.
      */
-    getVersion(): Promise<Fr>;
+    getVersion(): Promise<number>;
     /**
      * Method to fetch the chain id of the base-layer for the rollup.
      * @returns The chain id.
      */
-    getChainId(): Promise<Fr>;
+    getChainId(): Promise<number>;
     /**
      * Lookup the L2 contract data for this contract.
      * Contains the ethereum portal address and bytecode.
@@ -74,19 +74,13 @@ export declare class AztecNodeService implements AztecNode {
      */
     getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
     /**
-     * Gets the `take` amount of encrypted logs starting from `from`.
-     * @param from - Number of the L2 block to which corresponds the first encrypted log to be returned.
-     * @param take - The number of encrypted logs to return.
-     * @returns The requested encrypted logs.
+     * Gets the `take` 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 logType - Specifies whether to return encrypted or unencrypted logs.
+     * @returns The requested logs.
      */
-    getEncryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
-    /**
-     * Gets the `take` amount of unencrypted logs starting from `from`.
-     * @param from - Number of the L2 block to which corresponds the first unencrypted log to be returned.
-     * @param take - The number of unencrypted logs to return.
-     * @returns The requested unencrypted logs.
-     */
-    getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
+    getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
     /**
      * Method to submit a transaction to the p2p pool.
      * @param tx - The transaction to be submitted.
@@ -143,7 +137,7 @@ export declare class AztecNodeService implements AztecNode {
      * @param leafIndex - Index of the leaf in the tree.
      * @returns The sibling path.
      */
-    getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MESSAGES_TREE_HEIGHT>>;
+    getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
     /**
      * Gets the storage value at the given contract slot.
      * @param contract - Address of the contract to query.

package/dest/aztec-node/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}

package/dest/aztec-node/server.js

@@ -2,7 +2,7 @@ import { Archiver } from '@aztec/archiver';
 import { CircuitsWasm, Fr, } from '@aztec/circuits.js';
 import { InMemoryTxPool, createP2PClient } from '@aztec/p2p';
 import { SequencerClient, getCombinedHistoricTreeRoots } from '@aztec/sequencer-client';
-import { MerkleTreeId, } from '@aztec/types';
+import { LogType, MerkleTreeId, } from '@aztec/types';
 import { MerkleTrees, ServerWorldStateSynchroniser, computePublicDataTreeLeafIndex, } from '@aztec/world-state';
 import { default as levelup } from 'levelup';
 import { default as memdown } from 'memdown';
@@ -44,7 +44,7 @@ export class AztecNodeService {
         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, merkleTreeDB, worldStateSynchroniser, sequencer, new Fr(config.chainId), new Fr(config.version));
+        return new AztecNodeService(p2pClient, archiver, archiver, archiver, archiver, archiver, merkleTreeDB, worldStateSynchroniser, sequencer, config.chainId, config.version);
     }
     /**
      * Method to determine if the node is ready to accept transactions.
@@ -102,22 +102,15 @@ export class AztecNodeService {
         return await this.contractDataSource.getL2ContractInfo(contractAddress);
     }
     /**
-     * Gets the `take` amount of encrypted logs starting from `from`.
-     * @param from - Number of the L2 block to which corresponds the first encrypted log to be returned.
-     * @param take - The number of encrypted logs to return.
-     * @returns The requested encrypted logs.
+     * Gets the `take` 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 logType - Specifies whether to return encrypted or unencrypted logs.
+     * @returns The requested logs.
      */
-    getEncryptedLogs(from, take) {
-        return this.encryptedLogsSource.getEncryptedLogs(from, take);
-    }
-    /**
-     * Gets the `take` amount of unencrypted logs starting from `from`.
-     * @param from - Number of the L2 block to which corresponds the first unencrypted log to be returned.
-     * @param take - The number of unencrypted logs to return.
-     * @returns The requested unencrypted logs.
-     */
-    getUnencryptedLogs(from, take) {
-        return this.unencryptedLogsSource.getUnencryptedLogs(from, take);
+    getLogs(from, take, logType) {
+        const logSource = logType === LogType.ENCRYPTED ? this.encryptedLogsSource : this.unencryptedLogsSource;
+        return logSource.getLogs(from, take, logType);
     }
     /**
      * Method to submit a transaction to the p2p pool.
@@ -236,4 +229,4 @@ export class AztecNodeService {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBRUwsWUFBWSxFQUNaLEVBQUUsR0FHSCxNQUFNLG9CQUFvQixDQUFDO0FBRzVCLE9BQU8sRUFBRSxjQUFjLEVBQU8sZUFBZSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxlQUFlLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RixPQUFPLEVBVUwsWUFBWSxHQUdiLE1BQU0sY0FBYyxDQUFDO0FBQ3RCLE9BQU8sRUFDTCxXQUFXLEVBQ1gsNEJBQTRCLEVBRTVCLDhCQUE4QixHQUMvQixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxPQUFPLElBQUksT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBQzdDLE9BQU8sRUFBVyxPQUFPLElBQUksT0FBTyxFQUFFLE1BQU0sU0FBUyxDQUFDO0FBSXRELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxHQUFHLEVBQUUsQ0FBRSxPQUFlLEVBQXVCLENBQUM7QUFFM0U7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZ0JBQWdCO0lBQzNCLFlBQ1ksU0FBYyxFQUNkLFdBQTBCLEVBQzFCLG1CQUFpQyxFQUNqQyxxQkFBbUMsRUFDbkMsa0JBQXNDLEVBQ3RDLG1CQUF3QyxFQUN4QyxZQUF5QixFQUN6QixzQkFBOEMsRUFDOUMsU0FBMEIsRUFDMUIsT0FBVyxFQUNYLE9BQVc7UUFWWCxjQUFTLEdBQVQsU0FBUyxDQUFLO1FBQ2QsZ0JBQVcsR0FBWCxXQUFXLENBQWU7UUFDMUIsd0JBQW1CLEdBQW5CLG1CQUFtQixDQUFjO1FBQ2pDLDBCQUFxQixHQUFyQixxQkFBcUIsQ0FBYztRQUNuQyx1QkFBa0IsR0FBbEIsa0JBQWtC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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F6dGVjLW5vZGUvc2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUMzQyxPQUFPLEVBRUwsWUFBWSxFQUNaLEVBQUUsR0FHSCxNQUFNLG9CQUFvQixDQUFDO0FBRzVCLE9BQU8sRUFBRSxjQUFjLEVBQU8sZUFBZSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBQ2xFLE9BQU8sRUFBRSxlQUFlLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUN4RixPQUFPLEVBVUwsT0FBTyxFQUNQLFlBQVksR0FHYixNQUFNLGNBQWMsQ0FBQztBQUN0QixPQUFPLEVBQ0wsV0FBVyxFQUNYLDRCQUE0QixFQUU1Qiw4QkFBOEIsR0FDL0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUM3QyxPQUFPLEVBQVcsT0FBTyxJQUFJLE9BQU8sRUFBRSxNQUFNLFNBQVMsQ0FBQztBQUl0RCxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsR0FBRyxFQUFFLENBQUUsT0FBZSxFQUF1QixDQUFDO0FBRTNFOztHQUVHO0FBQ0gsTUFBTSxPQUFPLGdCQUFnQjtJQUMzQixZQUNZLFNBQWMsRUFDZCxXQUEwQixFQUMxQixtQkFBaUMsRUFDakMscUJBQW1DLEVBQ25DLGtCQUFzQyxFQUN0QyxtQkFBd0MsRUFDeEMsWUFBeUIsRUFDekIsc0JBQThDLEVBQzlDLFNBQTBCLEVBQzFCLE9BQWUsRUFDZixPQUFlO1FBVmYsY0FBUyxHQUFULFNBQVMsQ0FBSztRQUNkLGdCQUFXLEdBQVgsV0FBVyxDQUFlO1FBQzFCLHdCQUFtQixHQUFuQixtQkFBbUIsQ0FBYztRQUNqQywwQkFBcUIsR0FBckIscUJBQXFCLENBQWM7UUFDbkMsdUJBQWtCLEdB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

package/package.json

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

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

@@ -1,4 +1,4 @@
-import { CONTRACT_TREE_HEIGHT, L1_TO_L2_MESSAGES_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
+import { CONTRACT_TREE_HEIGHT, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import {
   ContractPublicData,
@@ -9,6 +9,7 @@ import {
   L2BlockL2Logs,
   TxHash,
   Tx,
+  LogType,
 } from '@aztec/types';
 import { SiblingPath } from '@aztec/merkle-tree';
 import { Fr } from '@aztec/foundation/fields';
@@ -41,13 +42,13 @@ export interface AztecNode {
    * Method to fetch the version of the rollup the node is connected to.
    * @returns The rollup version.
    */
-  getVersion(): Promise<Fr>;
+  getVersion(): Promise<number>;
 
   /**
    * Method to fetch the chain id of the base-layer for the rollup.
    * @returns The chain id.
    */
-  getChainId(): Promise<Fr>;
+  getChainId(): Promise<number>;
 
   /**
    * Lookup the L2 contract data for this contract.
@@ -66,20 +67,13 @@ export interface AztecNode {
   getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
 
   /**
-   * Gets the `take` amount of encrypted logs starting from `from`.
-   * @param from - Number of the L2 block to which corresponds the first encrypted logs to be returned.
-   * @param take - The number of encrypted logs to return.
-   * @returns The requested encrypted logs.
+   * Gets the `take` 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 logType - Specifies whether to return encrypted or unencrypted logs.
+   * @returns The requested logs.
    */
-  getEncryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
-
-  /**
-   * Gets the `take` amount of unencrypted logs starting from `from`.
-   * @param from - Number of the L2 block to which corresponds the first unencrypted logs to be returned.
-   * @param take - The number of unencrypted logs to return.
-   * @returns The requested unencrypted logs.
-   */
-  getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
+  getLogs(from: number, take: number, logType: LogType): Promise<L2BlockL2Logs[]>;
 
   /**
    * Method to submit a transaction to the p2p pool.
@@ -141,7 +135,7 @@ export interface AztecNode {
    * @param leafIndex - Index of the leaf in the tree.
    * @returns The sibling path.
    */
-  getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MESSAGES_TREE_HEIGHT>>;
+  getL1ToL2MessagesTreePath(leafIndex: bigint): Promise<SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>>;
 
   /**
    * Gets the storage value at the given contract slot. Our version of eth_getStorageAt.