@aztec/aztec-node 0.14.2 → 0.15.1

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.
Files changed (4) hide show
  1. package/dest/aztec-node/server.d.ts.map +1 -1
  2. package/dest/aztec-node/server.js +6 -6
  3. package/package.json +12 -13
  4. package/src/aztec-node/server.ts +4 -5
package/dest/aztec-node/server.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -1,7 +1,7 @@
1
1
  var _AztecNodeService_instances, _AztecNodeService_getWorldState, _AztecNodeService_syncWorldState;
2
2
  import { __classPrivateFieldGet } from "tslib";
3
3
  import { Archiver } from '@aztec/archiver';
4
- import { CircuitsWasm, Fr, GlobalVariables, HistoricBlockData, } from '@aztec/circuits.js';
4
+ import { Fr, GlobalVariables, HistoricBlockData, } from '@aztec/circuits.js';
5
5
  import { computePublicDataTreeIndex } from '@aztec/circuits.js/abis';
6
6
  import { createEthereumChain } from '@aztec/ethereum';
7
7
  import { createDebugLogger } from '@aztec/foundation/log';
@@ -56,9 +56,9 @@ export class AztecNodeService {
56
56
  config.transactionProtocol = `/aztec/tx/${config.l1Contracts.rollupAddress.toString()}`;
57
57
  // create the tx pool and the p2p client, which will need the l2 block source
58
58
  const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
59
- // now create the merkle trees and the world state syncher
59
+ // now create the merkle trees and the world state synchronizer
60
60
  const db = await openDb(config);
61
- const merkleTrees = await MerkleTrees.new(db, await CircuitsWasm.get());
61
+ const merkleTrees = await MerkleTrees.new(db);
62
62
  const worldStateConfig = getWorldStateConfig();
63
63
  const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(db, merkleTrees, archiver, worldStateConfig);
64
64
  // start both and wait for them to sync from the block source
@@ -262,7 +262,7 @@ export class AztecNodeService {
262
262
  */
263
263
  async getPublicStorageAt(contract, slot) {
264
264
  const committedDb = await __classPrivateFieldGet(this, _AztecNodeService_instances, "m", _AztecNodeService_getWorldState).call(this);
265
- const leafIndex = computePublicDataTreeIndex(await CircuitsWasm.get(), contract, slot);
265
+ const leafIndex = computePublicDataTreeIndex(contract, slot);
266
266
  const value = await committedDb.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex.value);
267
267
  return value ? Fr.fromBuffer(value) : undefined;
268
268
  }
@@ -312,7 +312,7 @@ export class AztecNodeService {
312
312
  // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
313
313
  // So simulation of public functions doesn't affect the merkle trees.
314
314
  const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
315
- await merkleTrees.init(await CircuitsWasm.get(), {
315
+ await merkleTrees.init({
316
316
  globalVariables: prevGlobalVariables,
317
317
  });
318
318
  const publicProcessorFactory = new PublicProcessorFactory(merkleTrees.asLatest(), this.contractDataSource, this.l1ToL2MessageSource);
@@ -347,4 +347,4 @@ async function _AztecNodeService_syncWorldState() {
347
347
  const blockSourceHeight = await this.blockSource.getBlockNumber();
348
348
  await this.worldStateSynchronizer.syncImmediate(blockSourceHeight);
349
349
  };
350
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/aztec-node/server.ts"],"names":[],"mappings":"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"}
350
+ //# 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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/aztec-node",
3
- "version": "0.14.2",
3
+ "version": "0.15.1",
4
4
  "main": "dest/index.js",
5
5
  "type": "module",
6
6
  "exports": "./dest/index.js",
@@ -18,7 +18,7 @@
18
18
  "build:dev": "tsc -b --watch",
19
19
  "clean": "rm -rf ./dest .tsbuildinfo",
20
20
  "formatting": "run -T prettier --check ./src && run -T eslint ./src",
21
- "formatting:fix": "run -T prettier -w ./src",
21
+ "formatting:fix": "run -T eslint --fix ./src && run -T prettier -w ./src",
22
22
  "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
23
23
  },
24
24
  "inherits": [
@@ -33,16 +33,16 @@
33
33
  "rootDir": "./src"
34
34
  },
35
35
  "dependencies": {
36
- "@aztec/archiver": "0.14.2",
37
- "@aztec/circuits.js": "0.14.2",
38
- "@aztec/ethereum": "0.14.2",
39
- "@aztec/foundation": "0.14.2",
40
- "@aztec/l1-artifacts": "0.14.2",
41
- "@aztec/merkle-tree": "0.14.2",
42
- "@aztec/p2p": "0.14.2",
43
- "@aztec/sequencer-client": "0.14.2",
44
- "@aztec/types": "0.14.2",
45
- "@aztec/world-state": "0.14.2",
36
+ "@aztec/archiver": "0.15.1",
37
+ "@aztec/circuits.js": "0.15.1",
38
+ "@aztec/ethereum": "0.15.1",
39
+ "@aztec/foundation": "0.15.1",
40
+ "@aztec/l1-artifacts": "0.15.1",
41
+ "@aztec/merkle-tree": "0.15.1",
42
+ "@aztec/p2p": "0.15.1",
43
+ "@aztec/sequencer-client": "0.15.1",
44
+ "@aztec/types": "0.15.1",
45
+ "@aztec/world-state": "0.15.1",
46
46
  "koa": "^2.14.2",
47
47
  "koa-router": "^12.0.0",
48
48
  "levelup": "^5.1.1",
@@ -51,7 +51,6 @@
51
51
  },
52
52
  "devDependencies": {
53
53
  "@jest/globals": "^29.5.0",
54
- "@rushstack/eslint-patch": "^1.1.4",
55
54
  "@types/jest": "^29.5.0",
56
55
  "@types/leveldown": "^4.0.4",
57
56
  "@types/levelup": "^5.1.2",
package/src/aztec-node/server.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { Archiver } from '@aztec/archiver';
2
2
  import {
3
3
  CONTRACT_TREE_HEIGHT,
4
- CircuitsWasm,
5
4
  Fr,
6
5
  GlobalVariables,
7
6
  HistoricBlockData,
@@ -105,9 +104,9 @@ export class AztecNodeService implements AztecNode {
105
104
  // create the tx pool and the p2p client, which will need the l2 block source
106
105
  const p2pClient = await createP2PClient(config, new InMemoryTxPool(), archiver);
107
106
 
108
- // now create the merkle trees and the world state syncher
107
+ // now create the merkle trees and the world state synchronizer
109
108
  const db = await openDb(config);
110
- const merkleTrees = await MerkleTrees.new(db, await CircuitsWasm.get());
109
+ const merkleTrees = await MerkleTrees.new(db);
111
110
  const worldStateConfig: WorldStateConfig = getWorldStateConfig();
112
111
  const worldStateSynchronizer = await ServerWorldStateSynchronizer.new(db, merkleTrees, archiver, worldStateConfig);
113
112
 
@@ -351,7 +350,7 @@ export class AztecNodeService implements AztecNode {
351
350
  */
352
351
  public async getPublicStorageAt(contract: AztecAddress, slot: Fr): Promise<Fr | undefined> {
353
352
  const committedDb = await this.#getWorldState();
354
- const leafIndex = computePublicDataTreeIndex(await CircuitsWasm.get(), contract, slot);
353
+ const leafIndex = computePublicDataTreeIndex(contract, slot);
355
354
  const value = await committedDb.getLeafValue(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex.value);
356
355
  return value ? Fr.fromBuffer(value) : undefined;
357
356
  }
@@ -418,7 +417,7 @@ export class AztecNodeService implements AztecNode {
418
417
  // TODO we should be able to remove this after https://github.com/AztecProtocol/aztec-packages/issues/1869
419
418
  // So simulation of public functions doesn't affect the merkle trees.
420
419
  const merkleTrees = new MerkleTrees(this.merkleTreesDb, this.log);
421
- await merkleTrees.init(await CircuitsWasm.get(), {
420
+ await merkleTrees.init({
422
421
  globalVariables: prevGlobalVariables,
423
422
  });
424
423