@aztec/aztec-node 0.1.0-alpha23 → 0.1.0-alpha40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.tsbuildinfo +1 -1
- package/dest/aztec-node/config.d.ts +1 -1
- package/dest/aztec-node/config.d.ts.map +1 -1
- package/dest/aztec-node/config.js +4 -2
- package/dest/aztec-node/http-node.d.ts +26 -16
- package/dest/aztec-node/http-node.d.ts.map +1 -1
- package/dest/aztec-node/http-node.js +53 -29
- package/dest/aztec-node/http-node.test.js +75 -37
- package/dest/aztec-node/server.d.ts +29 -14
- package/dest/aztec-node/server.d.ts.map +1 -1
- package/dest/aztec-node/server.js +46 -24
- package/dest/index.d.ts +0 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +1 -2
- package/package.json +10 -10
- package/src/aztec-node/config.ts +3 -1
- package/src/aztec-node/http-node.test.ts +94 -37
- package/src/aztec-node/http-node.ts +59 -29
- package/src/aztec-node/server.ts +65 -25
- package/src/index.ts +0 -1
- package/dest/aztec-node/aztec-node.d.ts +0 -126
- package/dest/aztec-node/aztec-node.d.ts.map +0 -1
- package/dest/aztec-node/aztec-node.js +0 -2
- package/src/aztec-node/aztec-node.ts +0 -153
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { AztecAddress, CircuitsWasm, Fr } from '@aztec/circuits.js';
|
|
1
|
+
import { AztecAddress, CircuitsWasm, EthAddress, Fr, HistoricBlockData } from '@aztec/circuits.js';
|
|
2
2
|
import { randomBytes } from '@aztec/foundation/crypto';
|
|
3
|
-
import { Pedersen
|
|
4
|
-
import { ContractData,
|
|
3
|
+
import { Pedersen } from '@aztec/merkle-tree';
|
|
4
|
+
import { ContractData, ContractDataAndBytecode, L1ToL2Message, L2Block, L2BlockL2Logs, LogType, MerkleTreeId, SiblingPath, TxHash, mockTx, } from '@aztec/types';
|
|
5
5
|
import { jest } from '@jest/globals';
|
|
6
6
|
import { HttpNode } from './http-node.js';
|
|
7
7
|
const TEST_URL = 'http://aztec-node-url.com/';
|
|
@@ -45,17 +45,36 @@ describe('HttpNode', () => {
|
|
|
45
45
|
};
|
|
46
46
|
setFetchMock(response);
|
|
47
47
|
const result = await httpNode.getBlocks(0, 3);
|
|
48
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&
|
|
48
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&limit=3`);
|
|
49
49
|
expect(result).toEqual([block1, block2]);
|
|
50
50
|
});
|
|
51
51
|
it('should return an empty array if blocks are not available', async () => {
|
|
52
52
|
const response = { blocks: [] };
|
|
53
53
|
setFetchMock(response);
|
|
54
54
|
const result = await httpNode.getBlocks(0, 2);
|
|
55
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&
|
|
55
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-blocks?from=0&limit=2`);
|
|
56
56
|
expect(result).toEqual([]);
|
|
57
57
|
});
|
|
58
58
|
});
|
|
59
|
+
describe('getBlock', () => {
|
|
60
|
+
it('should fetch and parse a block', async () => {
|
|
61
|
+
const block1 = L2Block.random(1);
|
|
62
|
+
const response = {
|
|
63
|
+
block: block1.encode(),
|
|
64
|
+
};
|
|
65
|
+
setFetchMock(response);
|
|
66
|
+
const result = await httpNode.getBlock(1);
|
|
67
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block?number=1`);
|
|
68
|
+
expect(result).toEqual(block1);
|
|
69
|
+
});
|
|
70
|
+
it('should return undefined if the block is not available', async () => {
|
|
71
|
+
const response = { block: undefined };
|
|
72
|
+
setFetchMock(response);
|
|
73
|
+
const result = await httpNode.getBlock(2);
|
|
74
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-block?number=2`);
|
|
75
|
+
expect(result).toEqual(undefined);
|
|
76
|
+
});
|
|
77
|
+
});
|
|
59
78
|
describe('getBlockHeight', () => {
|
|
60
79
|
it('should fetch and return the block height', async () => {
|
|
61
80
|
const response = { blockHeight: 100 };
|
|
@@ -83,16 +102,26 @@ describe('HttpNode', () => {
|
|
|
83
102
|
expect(result).toBe(1234);
|
|
84
103
|
});
|
|
85
104
|
});
|
|
86
|
-
describe('
|
|
105
|
+
describe('getRollupAddress', () => {
|
|
106
|
+
it('should fetch and return the rollup address', async () => {
|
|
107
|
+
const addr = EthAddress.random();
|
|
108
|
+
const response = { rollupAddress: addr.toString() };
|
|
109
|
+
setFetchMock(response);
|
|
110
|
+
const result = await httpNode.getRollupAddress();
|
|
111
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-rollup-address`);
|
|
112
|
+
expect(result).toEqual(addr);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
describe('getContractDataAndBytecode', () => {
|
|
87
116
|
it('should fetch and return contract public data', async () => {
|
|
88
|
-
const
|
|
117
|
+
const contractDataAndBytecode = ContractDataAndBytecode.random();
|
|
89
118
|
const response = {
|
|
90
|
-
contractData:
|
|
119
|
+
contractData: contractDataAndBytecode.toBuffer(),
|
|
91
120
|
};
|
|
92
121
|
setFetchMock(response);
|
|
93
|
-
const result = await httpNode.
|
|
94
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${
|
|
95
|
-
expect(result).toEqual(
|
|
122
|
+
const result = await httpNode.getContractDataAndBytecode(contractDataAndBytecode.contractData.contractAddress);
|
|
123
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data-and-bytecode?address=${contractDataAndBytecode.contractData.contractAddress.toString()}`);
|
|
124
|
+
expect(result).toEqual(contractDataAndBytecode);
|
|
96
125
|
});
|
|
97
126
|
it('should return undefined if contract data is not available', async () => {
|
|
98
127
|
const response = {
|
|
@@ -100,8 +129,8 @@ describe('HttpNode', () => {
|
|
|
100
129
|
};
|
|
101
130
|
setFetchMock(response);
|
|
102
131
|
const randomAddress = AztecAddress.random();
|
|
103
|
-
const result = await httpNode.
|
|
104
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${randomAddress.toString()}`);
|
|
132
|
+
const result = await httpNode.getContractDataAndBytecode(randomAddress);
|
|
133
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data-and-bytecode?address=${randomAddress.toString()}`);
|
|
105
134
|
expect(result).toEqual(undefined);
|
|
106
135
|
});
|
|
107
136
|
});
|
|
@@ -109,47 +138,47 @@ describe('HttpNode', () => {
|
|
|
109
138
|
it.each(['encrypted', 'unencrypted'])('should fetch and return %s logs', async (logType) => {
|
|
110
139
|
const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
|
|
111
140
|
const from = 0;
|
|
112
|
-
const
|
|
141
|
+
const limit = 3;
|
|
113
142
|
const log1 = L2BlockL2Logs.random(2, 3, 4);
|
|
114
143
|
const log2 = L2BlockL2Logs.random(1, 5, 2);
|
|
115
144
|
const response = {
|
|
116
145
|
logs: [log1.toBuffer(), log2.toBuffer()],
|
|
117
146
|
};
|
|
118
147
|
setFetchMock(response);
|
|
119
|
-
const result = await httpNode.getLogs(from,
|
|
120
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&
|
|
148
|
+
const result = await httpNode.getLogs(from, limit, processedLogType);
|
|
149
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&limit=${limit}&logType=${processedLogType}`);
|
|
121
150
|
expect(result).toEqual([log1, log2]);
|
|
122
151
|
});
|
|
123
152
|
it.each(['encrypted', 'unencrypted'])('should return an empty array if %s logs are not available', async (logType) => {
|
|
124
153
|
const processedLogType = logType === 'encrypted' ? LogType.ENCRYPTED : LogType.UNENCRYPTED;
|
|
125
154
|
const from = 0;
|
|
126
|
-
const
|
|
155
|
+
const limit = 2;
|
|
127
156
|
const response = {};
|
|
128
157
|
setFetchMock(response);
|
|
129
|
-
const result = await httpNode.getLogs(from,
|
|
130
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&
|
|
158
|
+
const result = await httpNode.getLogs(from, limit, processedLogType);
|
|
159
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}get-logs?from=${from}&limit=${limit}&logType=${processedLogType}`);
|
|
131
160
|
expect(result).toEqual([]);
|
|
132
161
|
});
|
|
133
162
|
});
|
|
134
|
-
describe('
|
|
163
|
+
describe('getContractData', () => {
|
|
135
164
|
it('should fetch and return contract data', async () => {
|
|
136
|
-
const
|
|
165
|
+
const contractData = ContractData.random();
|
|
137
166
|
const response = {
|
|
138
|
-
|
|
167
|
+
contractData: contractData.toBuffer(),
|
|
139
168
|
};
|
|
140
169
|
setFetchMock(response);
|
|
141
|
-
const result = await httpNode.
|
|
142
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-
|
|
143
|
-
expect(result).toEqual(
|
|
170
|
+
const result = await httpNode.getContractData(contractData.contractAddress);
|
|
171
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${contractData.contractAddress.toString()}`);
|
|
172
|
+
expect(result).toEqual(contractData);
|
|
144
173
|
});
|
|
145
174
|
it('should return undefined if contract data is not available', async () => {
|
|
146
175
|
const response = {
|
|
147
|
-
|
|
176
|
+
contractData: undefined,
|
|
148
177
|
};
|
|
149
178
|
setFetchMock(response);
|
|
150
179
|
const randomAddress = AztecAddress.random();
|
|
151
|
-
const result = await httpNode.
|
|
152
|
-
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-
|
|
180
|
+
const result = await httpNode.getContractData(randomAddress);
|
|
181
|
+
expect(fetch).toHaveBeenCalledWith(`${TEST_URL}contract-data?address=${randomAddress.toString()}`);
|
|
153
182
|
expect(result).toBeUndefined();
|
|
154
183
|
});
|
|
155
184
|
});
|
|
@@ -274,15 +303,15 @@ describe('HttpNode', () => {
|
|
|
274
303
|
expect(result).toEqual(siblingPath);
|
|
275
304
|
});
|
|
276
305
|
});
|
|
277
|
-
describe('
|
|
306
|
+
describe('getPublicStorageAt', () => {
|
|
278
307
|
it('should fetch and return the storage value at the given contract slot', async () => {
|
|
279
308
|
const contractAddress = AztecAddress.random();
|
|
280
309
|
const slot = BigInt(789);
|
|
281
310
|
const storageValue = Buffer.from('0123456789', 'hex');
|
|
282
311
|
const response = { value: storageValue.toString('hex') };
|
|
283
312
|
setFetchMock(response);
|
|
284
|
-
const result = await httpNode.
|
|
285
|
-
const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
|
|
313
|
+
const result = await httpNode.getPublicStorageAt(contractAddress, slot);
|
|
314
|
+
const url = `${TEST_URL}public-storage-at?address=${contractAddress}&slot=${slot.toString()}`;
|
|
286
315
|
expect(fetch).toHaveBeenCalledWith(url);
|
|
287
316
|
expect(result).toEqual(storageValue);
|
|
288
317
|
});
|
|
@@ -291,8 +320,8 @@ describe('HttpNode', () => {
|
|
|
291
320
|
const slot = BigInt(987);
|
|
292
321
|
const response = {};
|
|
293
322
|
setFetchMock(response);
|
|
294
|
-
const result = await httpNode.
|
|
295
|
-
const url = `${TEST_URL}storage-at?address=${contractAddress}&slot=${slot.toString()}`;
|
|
323
|
+
const result = await httpNode.getPublicStorageAt(contractAddress, slot);
|
|
324
|
+
const url = `${TEST_URL}public-storage-at?address=${contractAddress}&slot=${slot.toString()}`;
|
|
296
325
|
expect(fetch).toHaveBeenCalledWith(url);
|
|
297
326
|
expect(result).toBeUndefined();
|
|
298
327
|
});
|
|
@@ -305,9 +334,7 @@ describe('HttpNode', () => {
|
|
|
305
334
|
[MerkleTreeId.NULLIFIER_TREE]: Fr.random(),
|
|
306
335
|
[MerkleTreeId.PUBLIC_DATA_TREE]: Fr.random(),
|
|
307
336
|
[MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: Fr.random(),
|
|
308
|
-
[MerkleTreeId.
|
|
309
|
-
[MerkleTreeId.CONTRACT_TREE_ROOTS_TREE]: Fr.random(),
|
|
310
|
-
[MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE]: Fr.random(),
|
|
337
|
+
[MerkleTreeId.BLOCKS_TREE]: Fr.random(),
|
|
311
338
|
};
|
|
312
339
|
const rootsInResponse = Object.fromEntries(Object.entries(roots).map(([key, value]) => [key, value.toString()]));
|
|
313
340
|
const response = { roots: rootsInResponse };
|
|
@@ -318,5 +345,16 @@ describe('HttpNode', () => {
|
|
|
318
345
|
expect(result).toEqual(roots);
|
|
319
346
|
});
|
|
320
347
|
});
|
|
348
|
+
describe('getHistoricBlockData', () => {
|
|
349
|
+
it('should fetch and return the current committed roots for the data trees', async () => {
|
|
350
|
+
const blockData = HistoricBlockData.random();
|
|
351
|
+
const response = { blockData };
|
|
352
|
+
setFetchMock(response);
|
|
353
|
+
const result = await httpNode.getHistoricBlockData();
|
|
354
|
+
const url = `${TEST_URL}historic-block-data`;
|
|
355
|
+
expect(fetch).toHaveBeenCalledWith(url);
|
|
356
|
+
expect(result).toEqual(blockData);
|
|
357
|
+
});
|
|
358
|
+
});
|
|
321
359
|
});
|
|
322
|
-
//# 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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"}
|
|
360
|
+
//# 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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"}
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import { CONTRACT_TREE_HEIGHT, Fr, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
2
|
+
import { CONTRACT_TREE_HEIGHT, EthAddress, Fr, HistoricBlockData, L1_TO_L2_MSG_TREE_HEIGHT, PRIVATE_DATA_TREE_HEIGHT } from '@aztec/circuits.js';
|
|
3
3
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
|
-
import { SiblingPath } from '@aztec/merkle-tree';
|
|
5
4
|
import { P2P } from '@aztec/p2p';
|
|
6
5
|
import { SequencerClient } from '@aztec/sequencer-client';
|
|
7
|
-
import { ContractData,
|
|
6
|
+
import { AztecNode, ContractData, ContractDataAndBytecode, ContractDataSource, L1ToL2MessageAndIndex, L1ToL2MessageSource, L2Block, L2BlockL2Logs, L2BlockSource, L2LogsSource, LogType, MerkleTreeId, SiblingPath, Tx, TxHash } from '@aztec/types';
|
|
8
7
|
import { MerkleTrees, WorldStateSynchroniser } from '@aztec/world-state';
|
|
9
8
|
import { MemDown } from 'memdown';
|
|
10
|
-
import { AztecNode } from './aztec-node.js';
|
|
11
9
|
import { AztecNodeConfig } from './config.js';
|
|
12
10
|
export declare const createMemDown: () => MemDown<any, any>;
|
|
13
11
|
/**
|
|
@@ -25,7 +23,8 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
25
23
|
protected sequencer: SequencerClient;
|
|
26
24
|
protected chainId: number;
|
|
27
25
|
protected version: number;
|
|
28
|
-
|
|
26
|
+
private log;
|
|
27
|
+
constructor(p2pClient: P2P, blockSource: L2BlockSource, encryptedLogsSource: L2LogsSource, unencryptedLogsSource: L2LogsSource, contractDataSource: ContractDataSource, l1ToL2MessageSource: L1ToL2MessageSource, merkleTreeDB: MerkleTrees, worldStateSynchroniser: WorldStateSynchroniser, sequencer: SequencerClient, chainId: number, version: number, log?: import("@aztec/foundation/log").DebugLogger);
|
|
29
28
|
/**
|
|
30
29
|
* Initialises the Aztec Node, wait for component to sync.
|
|
31
30
|
* @param config - The configuration to be used by the aztec node.
|
|
@@ -37,13 +36,19 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
37
36
|
* @returns - Flag indicating the readiness for tx submission.
|
|
38
37
|
*/
|
|
39
38
|
isReady(): Promise<boolean>;
|
|
39
|
+
/**
|
|
40
|
+
* Get the a given block.
|
|
41
|
+
* @param number - The block number being requested.
|
|
42
|
+
* @returns The blocks requested.
|
|
43
|
+
*/
|
|
44
|
+
getBlock(number: number): Promise<L2Block | undefined>;
|
|
40
45
|
/**
|
|
41
46
|
* Method to request blocks. Will attempt to return all requested blocks but will return only those available.
|
|
42
47
|
* @param from - The start of the range of blocks to return.
|
|
43
|
-
* @param
|
|
48
|
+
* @param limit - The maximum number of blocks to obtain.
|
|
44
49
|
* @returns The blocks requested.
|
|
45
50
|
*/
|
|
46
|
-
getBlocks(from: number,
|
|
51
|
+
getBlocks(from: number, limit: number): Promise<L2Block[]>;
|
|
47
52
|
/**
|
|
48
53
|
* Method to fetch the current block height.
|
|
49
54
|
* @returns The block height as a number.
|
|
@@ -59,28 +64,33 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
59
64
|
* @returns The chain id.
|
|
60
65
|
*/
|
|
61
66
|
getChainId(): Promise<number>;
|
|
67
|
+
/**
|
|
68
|
+
* Method to fetch the rollup contract address at the base-layer.
|
|
69
|
+
* @returns The rollup address.
|
|
70
|
+
*/
|
|
71
|
+
getRollupAddress(): Promise<EthAddress>;
|
|
62
72
|
/**
|
|
63
73
|
* Lookup the L2 contract data for this contract.
|
|
64
74
|
* Contains the ethereum portal address and bytecode.
|
|
65
75
|
* @param contractAddress - The contract data address.
|
|
66
76
|
* @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
|
|
67
77
|
*/
|
|
68
|
-
|
|
78
|
+
getContractDataAndBytecode(contractAddress: AztecAddress): Promise<ContractDataAndBytecode | undefined>;
|
|
69
79
|
/**
|
|
70
|
-
* Lookup the
|
|
80
|
+
* Lookup the contract data for this contract.
|
|
71
81
|
* Contains the ethereum portal address .
|
|
72
82
|
* @param contractAddress - The contract data address.
|
|
73
83
|
* @returns The contract's address & portal address.
|
|
74
84
|
*/
|
|
75
|
-
|
|
85
|
+
getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
|
|
76
86
|
/**
|
|
77
|
-
* Gets
|
|
87
|
+
* Gets up to `limit` amount of logs starting from `from`.
|
|
78
88
|
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
79
|
-
* @param
|
|
89
|
+
* @param limit - The maximum number of logs to return.
|
|
80
90
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
81
91
|
* @returns The requested logs.
|
|
82
92
|
*/
|
|
83
|
-
getLogs(from: number,
|
|
93
|
+
getLogs(from: number, limit: number, logType: LogType): Promise<L2BlockL2Logs[]>;
|
|
84
94
|
/**
|
|
85
95
|
* Method to submit a transaction to the p2p pool.
|
|
86
96
|
* @param tx - The transaction to be submitted.
|
|
@@ -145,11 +155,16 @@ export declare class AztecNodeService implements AztecNode {
|
|
|
145
155
|
* @returns Storage value at the given contract slot (or undefined if not found).
|
|
146
156
|
* Note: Aztec's version of `eth_getStorageAt`.
|
|
147
157
|
*/
|
|
148
|
-
|
|
158
|
+
getPublicStorageAt(contract: AztecAddress, slot: bigint): Promise<Buffer | undefined>;
|
|
149
159
|
/**
|
|
150
160
|
* Returns the current committed roots for the data trees.
|
|
151
161
|
* @returns The current committed roots for the data trees.
|
|
152
162
|
*/
|
|
153
163
|
getTreeRoots(): Promise<Record<MerkleTreeId, Fr>>;
|
|
164
|
+
/**
|
|
165
|
+
* Returns the currently committed historic block data.
|
|
166
|
+
* @returns The current committed block data.
|
|
167
|
+
*/
|
|
168
|
+
getHistoricBlockData(): Promise<HistoricBlockData>;
|
|
154
169
|
}
|
|
155
170
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":";AACA,OAAO,EACL,oBAAoB,EAEpB,EAAE,EACF,wBAAwB,EACxB,wBAAwB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Archiver } from '@aztec/archiver';
|
|
2
|
-
import { CircuitsWasm, Fr, } from '@aztec/circuits.js';
|
|
2
|
+
import { CircuitsWasm, Fr, HistoricBlockData, } from '@aztec/circuits.js';
|
|
3
|
+
import { createDebugLogger } from '@aztec/foundation/log';
|
|
3
4
|
import { InMemoryTxPool, createP2PClient } from '@aztec/p2p';
|
|
4
|
-
import { SequencerClient
|
|
5
|
+
import { SequencerClient } from '@aztec/sequencer-client';
|
|
5
6
|
import { LogType, MerkleTreeId, } from '@aztec/types';
|
|
6
7
|
import { MerkleTrees, ServerWorldStateSynchroniser, computePublicDataTreeLeafIndex, } from '@aztec/world-state';
|
|
7
8
|
import { default as levelup } from 'levelup';
|
|
@@ -11,7 +12,7 @@ export const createMemDown = () => memdown();
|
|
|
11
12
|
* The aztec node.
|
|
12
13
|
*/
|
|
13
14
|
export class AztecNodeService {
|
|
14
|
-
constructor(p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, merkleTreeDB, worldStateSynchroniser, sequencer, chainId, version) {
|
|
15
|
+
constructor(p2pClient, blockSource, encryptedLogsSource, unencryptedLogsSource, contractDataSource, l1ToL2MessageSource, merkleTreeDB, worldStateSynchroniser, sequencer, chainId, version, log = createDebugLogger('aztec:node')) {
|
|
15
16
|
this.p2pClient = p2pClient;
|
|
16
17
|
this.blockSource = blockSource;
|
|
17
18
|
this.encryptedLogsSource = encryptedLogsSource;
|
|
@@ -23,6 +24,7 @@ export class AztecNodeService {
|
|
|
23
24
|
this.sequencer = sequencer;
|
|
24
25
|
this.chainId = chainId;
|
|
25
26
|
this.version = version;
|
|
27
|
+
this.log = log;
|
|
26
28
|
}
|
|
27
29
|
/**
|
|
28
30
|
* Initialises the Aztec Node, wait for component to sync.
|
|
@@ -53,14 +55,22 @@ export class AztecNodeService {
|
|
|
53
55
|
async isReady() {
|
|
54
56
|
return (await this.p2pClient.isReady()) ?? false;
|
|
55
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* Get the a given block.
|
|
60
|
+
* @param number - The block number being requested.
|
|
61
|
+
* @returns The blocks requested.
|
|
62
|
+
*/
|
|
63
|
+
async getBlock(number) {
|
|
64
|
+
return await this.blockSource.getL2Block(number);
|
|
65
|
+
}
|
|
56
66
|
/**
|
|
57
67
|
* Method to request blocks. Will attempt to return all requested blocks but will return only those available.
|
|
58
68
|
* @param from - The start of the range of blocks to return.
|
|
59
|
-
* @param
|
|
69
|
+
* @param limit - The maximum number of blocks to obtain.
|
|
60
70
|
* @returns The blocks requested.
|
|
61
71
|
*/
|
|
62
|
-
async getBlocks(from,
|
|
63
|
-
return (await this.blockSource.getL2Blocks(from,
|
|
72
|
+
async getBlocks(from, limit) {
|
|
73
|
+
return (await this.blockSource.getL2Blocks(from, limit)) ?? [];
|
|
64
74
|
}
|
|
65
75
|
/**
|
|
66
76
|
* Method to fetch the current block height.
|
|
@@ -83,44 +93,48 @@ export class AztecNodeService {
|
|
|
83
93
|
getChainId() {
|
|
84
94
|
return Promise.resolve(this.chainId);
|
|
85
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* Method to fetch the rollup contract address at the base-layer.
|
|
98
|
+
* @returns The rollup address.
|
|
99
|
+
*/
|
|
100
|
+
getRollupAddress() {
|
|
101
|
+
return this.blockSource.getRollupAddress();
|
|
102
|
+
}
|
|
86
103
|
/**
|
|
87
104
|
* Lookup the L2 contract data for this contract.
|
|
88
105
|
* Contains the ethereum portal address and bytecode.
|
|
89
106
|
* @param contractAddress - The contract data address.
|
|
90
107
|
* @returns The complete contract data including portal address & bytecode (if we didn't throw an error).
|
|
91
108
|
*/
|
|
92
|
-
async
|
|
93
|
-
return await this.contractDataSource.
|
|
109
|
+
async getContractDataAndBytecode(contractAddress) {
|
|
110
|
+
return await this.contractDataSource.getContractDataAndBytecode(contractAddress);
|
|
94
111
|
}
|
|
95
112
|
/**
|
|
96
|
-
* Lookup the
|
|
113
|
+
* Lookup the contract data for this contract.
|
|
97
114
|
* Contains the ethereum portal address .
|
|
98
115
|
* @param contractAddress - The contract data address.
|
|
99
116
|
* @returns The contract's address & portal address.
|
|
100
117
|
*/
|
|
101
|
-
async
|
|
102
|
-
return await this.contractDataSource.
|
|
118
|
+
async getContractData(contractAddress) {
|
|
119
|
+
return await this.contractDataSource.getContractData(contractAddress);
|
|
103
120
|
}
|
|
104
121
|
/**
|
|
105
|
-
* Gets
|
|
122
|
+
* Gets up to `limit` amount of logs starting from `from`.
|
|
106
123
|
* @param from - Number of the L2 block to which corresponds the first logs to be returned.
|
|
107
|
-
* @param
|
|
124
|
+
* @param limit - The maximum number of logs to return.
|
|
108
125
|
* @param logType - Specifies whether to return encrypted or unencrypted logs.
|
|
109
126
|
* @returns The requested logs.
|
|
110
127
|
*/
|
|
111
|
-
getLogs(from,
|
|
128
|
+
getLogs(from, limit, logType) {
|
|
112
129
|
const logSource = logType === LogType.ENCRYPTED ? this.encryptedLogsSource : this.unencryptedLogsSource;
|
|
113
|
-
return logSource.getLogs(from,
|
|
130
|
+
return logSource.getLogs(from, limit, logType);
|
|
114
131
|
}
|
|
115
132
|
/**
|
|
116
133
|
* Method to submit a transaction to the p2p pool.
|
|
117
134
|
* @param tx - The transaction to be submitted.
|
|
118
135
|
*/
|
|
119
136
|
async sendTx(tx) {
|
|
120
|
-
|
|
121
|
-
if (tx.data.constants.historicTreeRoots.privateHistoricTreeRoots.isEmpty()) {
|
|
122
|
-
tx.data.constants.historicTreeRoots = await getCombinedHistoricTreeRoots(this.merkleTreeDB.asLatest());
|
|
123
|
-
}
|
|
137
|
+
this.log.info(`Received tx ${await tx.getTxHash()}`);
|
|
124
138
|
await this.p2pClient.sendTx(tx);
|
|
125
139
|
}
|
|
126
140
|
/**
|
|
@@ -132,6 +146,7 @@ export class AztecNodeService {
|
|
|
132
146
|
await this.worldStateSynchroniser.stop();
|
|
133
147
|
await this.merkleTreeDB.stop();
|
|
134
148
|
await this.blockSource.stop();
|
|
149
|
+
this.log.info(`Stopped`);
|
|
135
150
|
}
|
|
136
151
|
/**
|
|
137
152
|
* Method to retrieve pending txs.
|
|
@@ -207,7 +222,7 @@ export class AztecNodeService {
|
|
|
207
222
|
* @returns Storage value at the given contract slot (or undefined if not found).
|
|
208
223
|
* Note: Aztec's version of `eth_getStorageAt`.
|
|
209
224
|
*/
|
|
210
|
-
async
|
|
225
|
+
async getPublicStorageAt(contract, slot) {
|
|
211
226
|
const leafIndex = computePublicDataTreeLeafIndex(contract, new Fr(slot), await CircuitsWasm.get());
|
|
212
227
|
return this.merkleTreeDB.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex, false);
|
|
213
228
|
}
|
|
@@ -223,10 +238,17 @@ export class AztecNodeService {
|
|
|
223
238
|
[MerkleTreeId.NULLIFIER_TREE]: await getTreeRoot(MerkleTreeId.NULLIFIER_TREE),
|
|
224
239
|
[MerkleTreeId.PUBLIC_DATA_TREE]: await getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE),
|
|
225
240
|
[MerkleTreeId.L1_TO_L2_MESSAGES_TREE]: await getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE),
|
|
226
|
-
[MerkleTreeId.
|
|
227
|
-
[MerkleTreeId.CONTRACT_TREE_ROOTS_TREE]: await getTreeRoot(MerkleTreeId.CONTRACT_TREE_ROOTS_TREE),
|
|
228
|
-
[MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE]: await getTreeRoot(MerkleTreeId.PRIVATE_DATA_TREE_ROOTS_TREE),
|
|
241
|
+
[MerkleTreeId.BLOCKS_TREE]: await getTreeRoot(MerkleTreeId.BLOCKS_TREE),
|
|
229
242
|
};
|
|
230
243
|
}
|
|
244
|
+
/**
|
|
245
|
+
* Returns the currently committed historic block data.
|
|
246
|
+
* @returns The current committed block data.
|
|
247
|
+
*/
|
|
248
|
+
async getHistoricBlockData() {
|
|
249
|
+
const getTreeRoot = async (id) => Fr.fromBuffer((await this.merkleTreeDB.getTreeInfo(id, false)).root);
|
|
250
|
+
const globalsHash = this.worldStateSynchroniser.latestGlobalVariablesHash;
|
|
251
|
+
return new HistoricBlockData(await getTreeRoot(MerkleTreeId.PRIVATE_DATA_TREE), await getTreeRoot(MerkleTreeId.NULLIFIER_TREE), await getTreeRoot(MerkleTreeId.CONTRACT_TREE), await getTreeRoot(MerkleTreeId.L1_TO_L2_MESSAGES_TREE), await getTreeRoot(MerkleTreeId.BLOCKS_TREE), Fr.ZERO, await getTreeRoot(MerkleTreeId.PUBLIC_DATA_TREE), globalsHash);
|
|
252
|
+
}
|
|
231
253
|
}
|
|
232
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
|
package/dest/index.d.ts
CHANGED
package/dest/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC"}
|