@aztec/world-state 0.65.2 → 0.67.0

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 (41) hide show
  1. package/dest/native/merkle_trees_facade.d.ts +7 -6
  2. package/dest/native/merkle_trees_facade.d.ts.map +1 -1
  3. package/dest/native/merkle_trees_facade.js +9 -1
  4. package/dest/native/message.d.ts +26 -15
  5. package/dest/native/message.d.ts.map +1 -1
  6. package/dest/native/message.js +19 -16
  7. package/dest/native/native_world_state.d.ts +3 -3
  8. package/dest/native/native_world_state.d.ts.map +1 -1
  9. package/dest/native/native_world_state.js +7 -7
  10. package/dest/native/native_world_state_instance.d.ts.map +1 -1
  11. package/dest/native/native_world_state_instance.js +7 -7
  12. package/dest/synchronizer/factory.d.ts.map +1 -1
  13. package/dest/synchronizer/factory.js +8 -4
  14. package/dest/synchronizer/instrumentation.d.ts +8 -1
  15. package/dest/synchronizer/instrumentation.d.ts.map +1 -1
  16. package/dest/synchronizer/instrumentation.js +51 -70
  17. package/dest/synchronizer/server_world_state_synchronizer.d.ts.map +1 -1
  18. package/dest/synchronizer/server_world_state_synchronizer.js +8 -9
  19. package/dest/world-state-db/merkle_tree_db.d.ts +2 -12
  20. package/dest/world-state-db/merkle_tree_db.d.ts.map +1 -1
  21. package/dest/world-state-db/merkle_tree_operations_facade.d.ts +4 -3
  22. package/dest/world-state-db/merkle_tree_operations_facade.d.ts.map +1 -1
  23. package/dest/world-state-db/merkle_tree_operations_facade.js +4 -1
  24. package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts +3 -2
  25. package/dest/world-state-db/merkle_tree_snapshot_operations_facade.d.ts.map +1 -1
  26. package/dest/world-state-db/merkle_tree_snapshot_operations_facade.js +5 -2
  27. package/dest/world-state-db/merkle_trees.d.ts +5 -4
  28. package/dest/world-state-db/merkle_trees.d.ts.map +1 -1
  29. package/dest/world-state-db/merkle_trees.js +7 -7
  30. package/package.json +12 -8
  31. package/src/native/merkle_trees_facade.ts +18 -5
  32. package/src/native/message.ts +15 -0
  33. package/src/native/native_world_state.ts +9 -9
  34. package/src/native/native_world_state_instance.ts +10 -12
  35. package/src/synchronizer/factory.ts +9 -6
  36. package/src/synchronizer/instrumentation.ts +55 -83
  37. package/src/synchronizer/server_world_state_synchronizer.ts +7 -8
  38. package/src/world-state-db/merkle_tree_db.ts +2 -14
  39. package/src/world-state-db/merkle_tree_operations_facade.ts +10 -3
  40. package/src/world-state-db/merkle_tree_snapshot_operations_facade.ts +12 -2
  41. package/src/world-state-db/merkle_trees.ts +14 -10
@@ -1 +1 @@
1
- {"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merkle_trees.d.ts","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,12 @@
1
1
  var _MerkleTrees_instances, _MerkleTrees_init, _MerkleTrees_saveInitialStateReference, _MerkleTrees_loadInitialStateReference, _MerkleTrees_updateArchive, _MerkleTrees_getTreeInfo, _MerkleTrees_getIndexedTree, _MerkleTrees_appendLeaves, _MerkleTrees_commit, _MerkleTrees_rollback, _MerkleTrees_snapshot, _MerkleTrees_handleL2BlockAndMessages, _MerkleTrees_isDbPopulated;
2
2
  import { __classPrivateFieldGet } from "tslib";
3
3
  import { MerkleTreeId, TxEffect } from '@aztec/circuit-types';
4
- import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, Fr, Header, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, PublicDataWrite, StateReference, } from '@aztec/circuits.js';
4
+ import { ARCHIVE_HEIGHT, AppendOnlyTreeSnapshot, BlockHeader, Fr, L1_TO_L2_MSG_TREE_HEIGHT, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_SUBTREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, NullifierLeaf, NullifierLeafPreimage, PUBLIC_DATA_SUBTREE_HEIGHT, PUBLIC_DATA_TREE_HEIGHT, PartialStateReference, PublicDataTreeLeaf, PublicDataTreeLeafPreimage, PublicDataWrite, StateReference, } from '@aztec/circuits.js';
5
5
  import { padArrayEnd } from '@aztec/foundation/collection';
6
- import { createDebugLogger } from '@aztec/foundation/log';
6
+ import { createLogger } from '@aztec/foundation/log';
7
7
  import { SerialQueue } from '@aztec/foundation/queue';
8
8
  import { Timer, elapsed } from '@aztec/foundation/timer';
9
- import { openTmpStore } from '@aztec/kv-store/utils';
9
+ import { openTmpStore } from '@aztec/kv-store/lmdb';
10
10
  import { Poseidon, StandardIndexedTree, StandardTree, getTreeMeta, loadTree, newTree, } from '@aztec/merkle-tree';
11
11
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
12
12
  import { buildEmptyWorldStateStatusFull, } from '../native/message.js';
@@ -50,7 +50,7 @@ export class MerkleTrees {
50
50
  * @param store - The db instance to use for data persistance.
51
51
  * @returns - A fully initialized MerkleTrees instance.
52
52
  */
53
- static async new(store, client, log = createDebugLogger('aztec:merkle_trees')) {
53
+ static async new(store, client, log = createLogger('world-state:merkle_trees')) {
54
54
  const merkleTrees = new MerkleTrees(store, client, log);
55
55
  await __classPrivateFieldGet(merkleTrees, _MerkleTrees_instances, "m", _MerkleTrees_init).call(merkleTrees);
56
56
  return merkleTrees;
@@ -90,7 +90,7 @@ export class MerkleTrees {
90
90
  // that can work on a read-only store and one that actually writes to the store. This implies
91
91
  // having read-only versions of the kv-stores, all kv-containers, and all trees.
92
92
  async ephemeralFork() {
93
- const forked = new MerkleTrees(this.store, this.telemetryClient, createDebugLogger('aztec:merkle_trees:ephemeral_fork'));
93
+ const forked = new MerkleTrees(this.store, this.telemetryClient, createLogger('world-state:merkle_trees:ephemeral_fork'));
94
94
  await __classPrivateFieldGet(forked, _MerkleTrees_instances, "m", _MerkleTrees_init).call(forked, true);
95
95
  return new MerkleTreeReadOperationsFacade(forked, true);
96
96
  }
@@ -98,7 +98,7 @@ export class MerkleTrees {
98
98
  await this.store.delete();
99
99
  }
100
100
  getInitialHeader() {
101
- return Header.empty({ state: __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_loadInitialStateReference).call(this) });
101
+ return BlockHeader.empty({ state: __classPrivateFieldGet(this, _MerkleTrees_instances, "m", _MerkleTrees_loadInitialStateReference).call(this) });
102
102
  }
103
103
  /**
104
104
  * Stops the job queue (waits for all jobs to finish).
@@ -460,4 +460,4 @@ async function _MerkleTrees_handleL2BlockAndMessages(l2Block, l1ToL2Messages) {
460
460
  return false;
461
461
  }
462
462
  };
463
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAgB,YAAY,EAAoB,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAS9F,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,EAAE,EACF,MAAM,EACN,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,4CAA4C,EAC5C,qBAAqB,EACrB,wBAAwB,EACxB,qBAAqB,EACrB,mCAAmC,EACnC,aAAa,EACb,qBAAqB,EACrB,0BAA0B,EAC1B,uBAAuB,EACvB,qBAAqB,EACrB,kBAAkB,EAClB,0BAA0B,EAC1B,eAAe,EACf,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAoB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGzD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAGL,QAAQ,EACR,mBAAmB,EACnB,YAAY,EACZ,WAAW,EACX,QAAQ,EACR,OAAO,GACR,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,EAGL,8BAA8B,GAC/B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,GAG9B,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,kCAAkC,EAAE,MAAM,6CAA6C,CAAC;AACjG,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;GAEG;AACH,MAAM,aAAc,SAAQ,mBAAmB;IAC7C,YACE,KAAmB,EACnB,MAAc,EACd,IAAY,EACZ,KAAa,EACb,OAAe,EAAE,EACjB,KAAU,EACV,IAAa;QAEb,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,qBAAqB,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IACtF,CAAC;CACF;AAED;;GAEG;AACH,MAAM,cAAe,SAAQ,mBAAmB;IAC9C,YACE,KAAmB,EACnB,MAAc,EACd,IAAY,EACZ,KAAa,EACb,OAAe,EAAE,EACjB,KAAU,EACV,IAAa;QAEb,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,0BAA0B,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAChG,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,WAAW;IAOtB,YAA4B,KAAmB,EAAU,eAAgC,EAAU,GAAgB;;QAAvF,UAAK,GAAL,KAAK,CAAc;QAAU,oBAAe,GAAf,eAAe,CAAiB;QAAU,QAAG,GAAH,GAAG,CAAa;QANnH,4BAA4B;QACpB,UAAK,GAAkB,IAAW,CAAC;QACnC,aAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;QAKnC,IAAI,CAAC,qBAAqB,GAAG,KAAK,CAAC,aAAa,CAAC,sCAAsC,CAAC,CAAC;QACzF,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,CAAC,eAAe,CAAC,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAmB,EAAE,MAAuB,EAAE,GAAG,GAAG,iBAAiB,CAAC,oBAAoB,CAAC;QACjH,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QACxD,MAAM,uBAAA,WAAW,iDAAM,MAAjB,WAAW,CAAQ,CAAC;QAC1B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,GAAG;QACf,MAAM,KAAK,GAAG,YAAY,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,mBAAmB,EAAE,CAAC,CAAC;IAC3D,CAAC;IAqEM,sBAAsB,CAAC,cAAsB;QAClD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAEM,YAAY,CAAC,cAAsB;QACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAEM,YAAY,CAAC,cAAsB;QACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAEM,gBAAgB;QACrB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAoB;QACpC,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;QAC7E,CAAC;QACD,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE;YACxC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACvC,OAAO,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACpC,OAAO,IAAI,8BAA8B,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,2FAA2F;IAC3F,8FAA8F;IAC9F,6FAA6F;IAC7F,gFAAgF;IACzE,KAAK,CAAC,aAAa;QACxB,MAAM,MAAM,GAAG,IAAI,WAAW,CAC5B,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,eAAe,EACpB,iBAAiB,CAAC,mCAAmC,CAAC,CACvD,CAAC;QACF,MAAM,uBAAA,MAAM,iDAAM,MAAZ,MAAM,EAAO,IAAI,CAAC,CAAC;QACzB,OAAO,IAAI,8BAA8B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC1D,CAAC;IAEM,KAAK,CAAC,MAAM;QACjB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEM,gBAAgB;QACrB,OAAO,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,uBAAA,IAAI,sEAA2B,MAA/B,IAAI,CAA6B,EAAE,CAAC,CAAC;IACpE,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACI,SAAS;QACd,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,8BAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACzE,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,IAAI,8BAA8B,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzD,CAAC;IAEM,WAAW,CAAC,WAAmB;QACpC,OAAO,IAAI,kCAAkC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACnE,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,aAAa,CAAC,MAAc;QACvC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,0DAAe,MAAnB,IAAI,EAAgB,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAC,MAAoB,EAAE,kBAA2B;QACxE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,wDAAa,MAAjB,IAAI,EAAc,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACrF,CAAC;IAED;;;;OAIG;IACI,iBAAiB,CAAC,kBAA2B;QAClD,MAAM,yBAAyB,GAAG,CAAC,MAAoB,EAAE,EAAE;YACzD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAmB,CAAC;YAClD,OAAO,IAAI,sBAAsB,CAC/B,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EAC/C,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAC9C,CAAC;QACJ,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,IAAI,cAAc,CAC9B,yBAAyB,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAC7D,IAAI,qBAAqB,CACvB,yBAAyB,CAAC,YAAY,CAAC,cAAc,CAAC,EACtD,yBAAyB,CAAC,YAAY,CAAC,cAAc,CAAC,EACtD,yBAAyB,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACzD,CACF,CAAC;QACF,OAAO,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,YAAY,CACvB,MAAoB,EACpB,KAAa,EACb,kBAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACnH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,cAAc,CACzB,MAAoB,EACpB,KAAa,EACb,kBAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,cAAc,CAAI,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC;IACvG,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,YAAY,CAA0B,MAAU,EAAE,MAAgC;QAC7F,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,yDAAc,MAAlB,IAAI,EAAe,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,MAAM;QACjB,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,mDAAQ,MAAZ,IAAI,CAAU,CAAC,CAAC;IACtD,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,QAAQ;QACnB,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,qDAAU,MAAd,IAAI,CAAY,CAAC,CAAC;IACxD,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,qBAAqB,CAChC,MAAqB,EACrB,KAAa,EACb,kBAA2B;QAc3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CACjC,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,MAAM,CAAC,CAAC,sBAAsB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAChG,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,eAAe,CAC1B,MAAqB,EACrB,KAAa,EACb,kBAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CACjC,OAAO,CAAC,OAAO,CAAC,uBAAA,IAAI,2DAAgB,MAApB,IAAI,EAAiB,MAAM,CAAC,CAAC,yBAAyB,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CACnG,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,aAAa,CACxB,MAAU,EACV,KAA6B,EAC7B,kBAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;YACjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChC,0BAA0B;YAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,KAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,kBAAkB,CAC7B,MAAU,EACV,KAA6B,EAC7B,UAAkB,EAClB,kBAA2B;QAE3B,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE;YACjC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChC,0BAA0B;YAC1B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAY,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CAAC,KAAc,EAAE,cAAoB;QACxE,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,qEAA0B,MAA9B,IAAI,EAA2B,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;IAC7F,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,WAAW,CAKtB,MAAqB,EACrB,MAAgB,EAChB,aAA4B;QAE5B,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAwB,CAAC;QACvD,IAAI,CAAC,CAAC,aAAa,IAAI,IAAI,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,WAAW,CAAI,EAAoB;QAC/C,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACrC,CAAC;IAuFM,KAAK,CAAC,gBAAgB,CAAC,WAAmB;QAC/C,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;YAClE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,qBAAqB,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;YACvE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC;SAC1D,CAAC,CAAC;QAEH,OAAO;YACL,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC3C,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC3C,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAC7C,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;YAClD,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;SACrC,CAAC;IACJ,CAAC;CAuHF;;AAhlBC;;GAEG;AACH,KAAK,4BAAO,UAAoB;IAC9B,MAAM,MAAM,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAA,IAAI,0DAAe,MAAnB,IAAI,CAAiB,CAAC,CAAC,CAAC,UAAU,CAAC;IAC7E,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAEnD,MAAM,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;IAE9B,MAAM,aAAa,GAAG,MAAM,cAAc,CACxC,aAAa,EACb,IAAI,CAAC,KAAK,EACV,MAAM,EACN,GAAG,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,EAC9C,EAAE,EACF,qBAAqB,EACrB,2BAA2B,CAC5B,CAAC;IACF,MAAM,YAAY,GAAuB,MAAM,cAAc,CAC3D,YAAY,EACZ,IAAI,CAAC,KAAK,EACV,MAAM,EACN,GAAG,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,EAC9C,EAAE,EACF,qBAAqB,CACtB,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,cAAc,CACzC,cAAc,EACd,IAAI,CAAC,KAAK,EACV,MAAM,EACN,GAAG,YAAY,CAAC,YAAY,CAAC,gBAAgB,CAAC,EAAE,EAChD,EAAE,EACF,uBAAuB,EACvB,6BAA6B,CAC9B,CAAC;IACF,MAAM,iBAAiB,GAAuB,MAAM,cAAc,CAChE,YAAY,EACZ,IAAI,CAAC,KAAK,EACV,MAAM,EACN,GAAG,YAAY,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,EACrD,EAAE,EACF,wBAAwB,CACzB,CAAC;IACF,MAAM,OAAO,GAAuB,MAAM,cAAc,CACtD,YAAY,EACZ,IAAI,CAAC,KAAK,EACV,MAAM,EACN,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EACvC,EAAE,EACF,cAAc,CACf,CAAC;IACF,IAAI,CAAC,KAAK,GAAG,CAAC,aAAa,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAEvF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IAEtB,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,mIAAmI;QACnI,yFAAyF;QACzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,uBAAA,IAAI,sEAA2B,MAA/B,IAAI,EAA4B,YAAY,CAAC,CAAC;QACpD,MAAM,uBAAA,IAAI,0DAAe,MAAnB,IAAI,EAAgB,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAEnD,6DAA6D;QAC7D,MAAM,uBAAA,IAAI,mDAAQ,MAAZ,IAAI,CAAU,CAAC;IACvB,CAAC;AACH,CAAC,2FAmT0B,KAAqB;IAC9C,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC1D,CAAC;IAGC,MAAM,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC;IACpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,+BAED,KAAK,qCAAgB,MAAc;IACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAEjD,kHAAkH;IAClH,iBAAiB;IACjB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAChC,MAAM,uBAAA,IAAI,yDAAc,MAAlB,IAAI,EAAe,YAAY,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;AAC9D,CAAC,+DAQY,MAAoB,EAAE,kBAA2B;IAC5D,MAAM,QAAQ,GAAG;QACf,MAAM;QACN,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACpD,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,kBAAkB,CAAC;QACzD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;KACzB,CAAC;IACd,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC,qEAOe,MAAqB;IACnC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAgB,CAAC;AAC3C,CAAC;AAED;;;;;GAKG;AACH,KAAK,oCAAwC,MAAU,EAAE,MAA2C;IAClG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,IAAI,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;IACjE,CAAC;IACD,0BAA0B;IAC1B,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,MAAe,CAAC,CAAC;AAClD,CAAC;AAED;;;GAGG;AACH,KAAK;IACH,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,KAAK;IACH,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;AACH,CAAC,0BAoBD,KAAK,gCAAW,WAAmB;IACjC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7C,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,KAAK,gDAA2B,OAAgB,EAAE,cAAoB;IACpE,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IAE1B,MAAM,mBAAmB,GAAG;QAC1B,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,cAAc,CAAC;QAC9E,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,cAAc,CAAC;QAC7E,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC;QACjF,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,YAAY,CAAC,qBAAqB,CAAC;QACjF,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC;KACpC,CAAC;IACX,MAAM,WAAW,GAAG,CAAC,IAAQ,EAAE,MAAoB,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC1C,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;IAClF,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,OAAO,CAAC,MAAM,kCAAkC,CAAC,CAAC;QAC5E,MAAM,uBAAA,IAAI,mDAAQ,MAAZ,IAAI,CAAU,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,OAAO,CAAC,MAAM,wEAAwE,CAAC,CAAC;QAClH,MAAM,uBAAA,IAAI,qDAAU,MAAd,IAAI,CAAY,CAAC;QAEvB,6GAA6G;QAC7G,eAAe;QACf,MAAM,eAAe,GAAG,WAAW,CACjC,OAAO,CAAC,IAAI,CAAC,SAAS,EACtB,QAAQ,CAAC,KAAK,EAAE,EAChB,OAAO,CAAC,IAAI,CAAC,0BAA0B,CACxC,CAAC;QAEF,6BAA6B;QAC7B,CAAC;YACC,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAC1D,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,sBAAsB,CAAC,CAClE,CAAC;YACF,MAAM,uBAAA,IAAI,yDAAc,MAAlB,IAAI,EAAe,YAAY,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YAExE,MAAM,oBAAoB,GAAG,WAAW,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,EAAE,mCAAmC,CAAC,CAAC;YACvG,MAAM,uBAAA,IAAI,yDAAc,MAAlB,IAAI,EAAe,YAAY,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAC;QACrF,CAAC;QAED,yBAAyB;QACzB,CAAC;YACC,MAAM,gBAAgB,GAAG,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAC1D,WAAW,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,EAAE,qBAAqB,CAAC,CACjE,CAAC;YACF,MAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,cAAc,CAAyB,CAAC,WAAW,CAChF,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,EACvD,wBAAwB,CACzB,CAAC;YAEF,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,gBAAgB,CAAwB,CAAC;YAExF,mGAAmG;YACnG,KAAK,MAAM,QAAQ,IAAI,eAAe,EAAE,CAAC;gBACvC,MAAM,gBAAgB,GAAG,WAAW,CAClC,QAAQ,CAAC,gBAAgB,EACzB,eAAe,CAAC,KAAK,EAAE,EACvB,4CAA4C,CAC7C,CAAC;gBAEF,MAAM,cAAc,CAAC,WAAW,CAC9B,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAC/C,0BAA0B,CAC3B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,oDAAoD;QACpD,MAAM,uBAAA,IAAI,0DAAe,MAAnB,IAAI,EAAgB,OAAO,CAAC,MAAM,CAAC,CAAC;QAE1C,MAAM,uBAAA,IAAI,mDAAQ,MAAZ,IAAI,CAAU,CAAC;IACvB,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,mBAAmB,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,uBAAA,IAAI,wDAAa,MAAjB,IAAI,EAAc,MAAM,EAAE,KAAK,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACnD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChC,gFAAgF;QAChF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CACb,oBAAoB,QAAQ,4CAA4C,SAAS,OAAO,OAAO,EAAE,CAClG,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,QAAQ,sBAAsB,IAAI,CAAC,IAAI,SAAS,OAAO,EAAE,CAAC,CAAC;YAClF,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IACD,MAAM,uBAAA,IAAI,qDAAU,MAAd,IAAI,EAAW,OAAO,CAAC,MAAM,CAAC,CAAC;IAErC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,CAAC;IAChE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACjD,OAAO,8BAA8B,EAAE,CAAC;AAC1C,CAAC;IAGC,IAAI,CAAC;QACH,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;QACnE,0CAA0C;QAC1C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,kDAAkD;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
463
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"merkle_trees.js","sourceRoot":"","sources":["../../src/world-state-db/merkle_trees.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/world-state",
3
- "version": "0.65.2",
3
+ "version": "0.67.0",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  ".": "./dest/index.js",
@@ -59,16 +59,20 @@
59
59
  "summaryThreshold": 9999
60
60
  }
61
61
  ]
62
+ ],
63
+ "testTimeout": 30000,
64
+ "setupFiles": [
65
+ "../../foundation/src/jest/setup.mjs"
62
66
  ]
63
67
  },
64
68
  "dependencies": {
65
- "@aztec/circuit-types": "0.65.2",
66
- "@aztec/circuits.js": "0.65.2",
67
- "@aztec/foundation": "0.65.2",
68
- "@aztec/kv-store": "0.65.2",
69
- "@aztec/merkle-tree": "0.65.2",
70
- "@aztec/telemetry-client": "0.65.2",
71
- "@aztec/types": "0.65.2",
69
+ "@aztec/circuit-types": "0.67.0",
70
+ "@aztec/circuits.js": "0.67.0",
71
+ "@aztec/foundation": "0.67.0",
72
+ "@aztec/kv-store": "0.67.0",
73
+ "@aztec/merkle-tree": "0.67.0",
74
+ "@aztec/telemetry-client": "0.67.0",
75
+ "@aztec/types": "0.67.0",
72
76
  "bindings": "^1.5.0",
73
77
  "msgpackr": "^1.10.2",
74
78
  "tslib": "^2.4.0",
@@ -10,8 +10,8 @@ import {
10
10
  type TreeInfo,
11
11
  } from '@aztec/circuit-types';
12
12
  import {
13
+ type BlockHeader,
13
14
  Fr,
14
- type Header,
15
15
  NullifierLeaf,
16
16
  NullifierLeafPreimage,
17
17
  PartialStateReference,
@@ -37,11 +37,11 @@ import { type NativeWorldStateInstance } from './native_world_state_instance.js'
37
37
  export class MerkleTreesFacade implements MerkleTreeReadOperations {
38
38
  constructor(
39
39
  protected readonly instance: NativeWorldStateInstance,
40
- protected readonly initialHeader: Header,
40
+ protected readonly initialHeader: BlockHeader,
41
41
  protected readonly revision: WorldStateRevision,
42
42
  ) {}
43
43
 
44
- getInitialHeader(): Header {
44
+ getInitialHeader(): BlockHeader {
45
45
  return this.initialHeader;
46
46
  }
47
47
 
@@ -166,16 +166,29 @@ export class MerkleTreesFacade implements MerkleTreeReadOperations {
166
166
  treeId,
167
167
  };
168
168
  }
169
+
170
+ async getBlockNumbersForLeafIndices<ID extends MerkleTreeId>(
171
+ treeId: ID,
172
+ leafIndices: bigint[],
173
+ ): Promise<(bigint | undefined)[]> {
174
+ const response = await this.instance.call(WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES, {
175
+ treeId,
176
+ revision: this.revision,
177
+ leafIndices,
178
+ });
179
+
180
+ return response.blockNumbers.map(x => (x === undefined || x === null ? undefined : BigInt(x)));
181
+ }
169
182
  }
170
183
 
171
184
  export class MerkleTreesForkFacade extends MerkleTreesFacade implements MerkleTreeWriteOperations {
172
- constructor(instance: NativeWorldStateInstance, initialHeader: Header, revision: WorldStateRevision) {
185
+ constructor(instance: NativeWorldStateInstance, initialHeader: BlockHeader, revision: WorldStateRevision) {
173
186
  assert.notEqual(revision.forkId, 0, 'Fork ID must be set');
174
187
  assert.equal(revision.includeUncommitted, true, 'Fork must include uncommitted data');
175
188
  super(instance, initialHeader, revision);
176
189
  }
177
190
 
178
- async updateArchive(header: Header): Promise<void> {
191
+ async updateArchive(header: BlockHeader): Promise<void> {
179
192
  await this.instance.call(WorldStateMessageType.UPDATE_ARCHIVE, {
180
193
  forkId: this.revision.forkId,
181
194
  blockHeaderHash: header.hash().toBuffer(),
@@ -54,6 +54,7 @@ export enum WorldStateMessageType {
54
54
  GET_LEAF_VALUE,
55
55
  GET_LEAF_PREIMAGE,
56
56
  GET_SIBLING_PATH,
57
+ GET_BLOCK_NUMBERS_FOR_LEAF_INDICES,
57
58
 
58
59
  FIND_LEAF_INDEX,
59
60
  FIND_LOW_LEAF,
@@ -139,6 +140,8 @@ export interface TreeDBStats {
139
140
  leafPreimagesDBStats: DBStats;
140
141
  /** Stats for the 'leaf indices' DB */
141
142
  leafIndicesDBStats: DBStats;
143
+ /** Stats for the 'block indices' DB */
144
+ blockIndicesDBStats: DBStats;
142
145
  }
143
146
 
144
147
  export interface WorldStateMeta {
@@ -189,6 +192,7 @@ export function buildEmptyTreeDBStats() {
189
192
  leafIndicesDBStats: buildEmptyDBStats(),
190
193
  leafKeysDBStats: buildEmptyDBStats(),
191
194
  leafPreimagesDBStats: buildEmptyDBStats(),
195
+ blockIndicesDBStats: buildEmptyDBStats(),
192
196
  } as TreeDBStats;
193
197
  }
194
198
 
@@ -271,6 +275,7 @@ export function sanitiseTreeDBStats(stats: TreeDBStats) {
271
275
  stats.blocksDBStats = sanitiseDBStats(stats.blocksDBStats);
272
276
  stats.leafIndicesDBStats = sanitiseDBStats(stats.leafIndicesDBStats);
273
277
  stats.leafPreimagesDBStats = sanitiseDBStats(stats.leafPreimagesDBStats);
278
+ stats.blockIndicesDBStats = sanitiseDBStats(stats.blockIndicesDBStats);
274
279
  stats.nodesDBStats = sanitiseDBStats(stats.nodesDBStats);
275
280
  stats.mapSize = BigInt(stats.mapSize);
276
281
  return stats;
@@ -344,6 +349,14 @@ interface GetTreeInfoResponse {
344
349
  root: Buffer;
345
350
  }
346
351
 
352
+ interface GetBlockNumbersForLeafIndicesRequest extends WithTreeId, WithWorldStateRevision {
353
+ leafIndices: bigint[];
354
+ }
355
+
356
+ interface GetBlockNumbersForLeafIndicesResponse {
357
+ blockNumbers: bigint[];
358
+ }
359
+
347
360
  interface GetSiblingPathRequest extends WithTreeId, WithLeafIndex, WithWorldStateRevision {}
348
361
  type GetSiblingPathResponse = Buffer[];
349
362
 
@@ -446,6 +459,7 @@ export type WorldStateRequest = {
446
459
  [WorldStateMessageType.GET_LEAF_VALUE]: GetLeafRequest;
447
460
  [WorldStateMessageType.GET_LEAF_PREIMAGE]: GetLeafPreImageRequest;
448
461
  [WorldStateMessageType.GET_SIBLING_PATH]: GetSiblingPathRequest;
462
+ [WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES]: GetBlockNumbersForLeafIndicesRequest;
449
463
 
450
464
  [WorldStateMessageType.FIND_LEAF_INDEX]: FindLeafIndexRequest;
451
465
  [WorldStateMessageType.FIND_LOW_LEAF]: FindLowLeafRequest;
@@ -481,6 +495,7 @@ export type WorldStateResponse = {
481
495
  [WorldStateMessageType.GET_LEAF_VALUE]: GetLeafResponse;
482
496
  [WorldStateMessageType.GET_LEAF_PREIMAGE]: GetLeafPreImageResponse;
483
497
  [WorldStateMessageType.GET_SIBLING_PATH]: GetSiblingPathResponse;
498
+ [WorldStateMessageType.GET_BLOCK_NUMBERS_FOR_LEAF_INDICES]: GetBlockNumbersForLeafIndicesResponse;
484
499
 
485
500
  [WorldStateMessageType.FIND_LEAF_INDEX]: FindLeafIndexResponse;
486
501
  [WorldStateMessageType.FIND_LOW_LEAF]: FindLowLeafResponse;
@@ -7,9 +7,9 @@ import {
7
7
  TxEffect,
8
8
  } from '@aztec/circuit-types';
9
9
  import {
10
+ BlockHeader,
10
11
  EthAddress,
11
12
  Fr,
12
- Header,
13
13
  MAX_NOTE_HASHES_PER_TX,
14
14
  MAX_NULLIFIERS_PER_TX,
15
15
  NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP,
@@ -20,7 +20,7 @@ import {
20
20
  StateReference,
21
21
  } from '@aztec/circuits.js';
22
22
  import { padArrayEnd } from '@aztec/foundation/collection';
23
- import { createDebugLogger } from '@aztec/foundation/log';
23
+ import { createLogger } from '@aztec/foundation/log';
24
24
 
25
25
  import assert from 'assert/strict';
26
26
  import { mkdir, mkdtemp, rm } from 'fs/promises';
@@ -52,13 +52,13 @@ export const WORLD_STATE_VERSION_FILE = 'version';
52
52
  export const WORLD_STATE_DB_VERSION = 1; // The initial version
53
53
 
54
54
  export class NativeWorldStateService implements MerkleTreeDatabase {
55
- protected initialHeader: Header | undefined;
55
+ protected initialHeader: BlockHeader | undefined;
56
56
  // This is read heavily and only changes when data is persisted, so we cache it
57
57
  private cachedStatusSummary: WorldStateStatusSummary | undefined;
58
58
 
59
59
  protected constructor(
60
60
  protected readonly instance: NativeWorldState,
61
- protected readonly log = createDebugLogger('aztec:world-state:database'),
61
+ protected readonly log = createLogger('world-state:database'),
62
62
  private readonly cleanup = () => Promise.resolve(),
63
63
  ) {}
64
64
 
@@ -66,7 +66,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
66
66
  rollupAddress: EthAddress,
67
67
  dataDir: string,
68
68
  dbMapSizeKb: number,
69
- log = createDebugLogger('aztec:world-state:database'),
69
+ log = createLogger('world-state:database'),
70
70
  cleanup = () => Promise.resolve(),
71
71
  ): Promise<NativeWorldStateService> {
72
72
  const worldStateDirectory = join(dataDir, 'world_state');
@@ -102,7 +102,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
102
102
  }
103
103
 
104
104
  static async tmp(rollupAddress = EthAddress.ZERO, cleanupTmpDir = true): Promise<NativeWorldStateService> {
105
- const log = createDebugLogger('aztec:world-state:database');
105
+ const log = createLogger('world-state:database');
106
106
  const dataDir = await mkdtemp(join(tmpdir(), 'aztec-world-state-'));
107
107
  const dbMapSizeKb = 10 * 1024 * 1024;
108
108
  log.debug(`Created temporary world state database at: ${dataDir} with size: ${dbMapSizeKb}`);
@@ -156,7 +156,7 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
156
156
  return new MerkleTreesForkFacade(this.instance, this.initialHeader!, worldStateRevision(true, resp.forkId, 0));
157
157
  }
158
158
 
159
- public getInitialHeader(): Header {
159
+ public getInitialHeader(): BlockHeader {
160
160
  return this.initialHeader!;
161
161
  }
162
162
 
@@ -208,9 +208,9 @@ export class NativeWorldStateService implements MerkleTreeDatabase {
208
208
  await this.cleanup();
209
209
  }
210
210
 
211
- private async buildInitialHeader(): Promise<Header> {
211
+ private async buildInitialHeader(): Promise<BlockHeader> {
212
212
  const state = await this.getInitialStateReference();
213
- return Header.empty({ state });
213
+ return BlockHeader.empty({ state });
214
214
  }
215
215
 
216
216
  private sanitiseAndCacheSummaryFromFull(response: WorldStateStatusFull) {
@@ -10,7 +10,7 @@ import {
10
10
  NULLIFIER_TREE_HEIGHT,
11
11
  PUBLIC_DATA_TREE_HEIGHT,
12
12
  } from '@aztec/circuits.js';
13
- import { createDebugLogger, fmtLogData } from '@aztec/foundation/log';
13
+ import { createLogger } from '@aztec/foundation/log';
14
14
  import { SerialQueue } from '@aztec/foundation/queue';
15
15
  import { Timer } from '@aztec/foundation/timer';
16
16
 
@@ -82,7 +82,7 @@ export class NativeWorldState implements NativeWorldStateInstance {
82
82
  private queue = new SerialQueue();
83
83
 
84
84
  /** Creates a new native WorldState instance */
85
- constructor(dataDir: string, dbMapSizeKb: number, private log = createDebugLogger('aztec:world-state:database')) {
85
+ constructor(dataDir: string, dbMapSizeKb: number, private log = createLogger('world-state:database')) {
86
86
  log.info(`Creating world state data store at directory ${dataDir} with map size ${dbMapSizeKb} KB`);
87
87
  this.instance = new NATIVE_MODULE[NATIVE_CLASS_NAME](
88
88
  dataDir,
@@ -203,9 +203,9 @@ export class NativeWorldState implements NativeWorldStateInstance {
203
203
  data['publicDataWritesCount'] = body.publicDataWrites.length;
204
204
  }
205
205
 
206
- this.log.debug(`Calling messageId=${messageId} ${WorldStateMessageType[messageType]} with ${fmtLogData(data)}`);
206
+ this.log.trace(`Calling messageId=${messageId} ${WorldStateMessageType[messageType]}`, data);
207
207
  } else {
208
- this.log.debug(`Calling messageId=${messageId} ${WorldStateMessageType[messageType]}`);
208
+ this.log.trace(`Calling messageId=${messageId} ${WorldStateMessageType[messageType]}`);
209
209
  }
210
210
 
211
211
  const timer = new Timer();
@@ -248,14 +248,12 @@ export class NativeWorldState implements NativeWorldStateInstance {
248
248
  const response = TypedMessage.fromMessagePack<T, WorldStateResponse[T]>(decodedResponse);
249
249
  const decodingDuration = timer.ms() - callDuration;
250
250
  const totalDuration = timer.ms();
251
- this.log.debug(
252
- `Call messageId=${messageId} ${WorldStateMessageType[messageType]} took (ms) ${fmtLogData({
253
- totalDuration,
254
- encodingDuration,
255
- callDuration,
256
- decodingDuration,
257
- })}`,
258
- );
251
+ this.log.trace(`Call messageId=${messageId} ${WorldStateMessageType[messageType]} took (ms)`, {
252
+ totalDuration,
253
+ encodingDuration,
254
+ callDuration,
255
+ decodingDuration,
256
+ });
259
257
 
260
258
  if (response.header.requestId !== request.header.messageId) {
261
259
  throw new Error(
@@ -1,7 +1,7 @@
1
1
  import { type L1ToL2MessageSource, type L2BlockSource } from '@aztec/circuit-types';
2
- import { createDebugLogger } from '@aztec/foundation/log';
2
+ import { createLogger } from '@aztec/foundation/log';
3
3
  import { type DataStoreConfig } from '@aztec/kv-store/config';
4
- import { createStore } from '@aztec/kv-store/utils';
4
+ import { createStore } from '@aztec/kv-store/lmdb';
5
5
  import { type TelemetryClient } from '@aztec/telemetry-client';
6
6
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
7
7
 
@@ -27,11 +27,14 @@ export async function createWorldState(
27
27
  dataDirectory: config.worldStateDataDirectory ?? config.dataDirectory,
28
28
  dataStoreMapSizeKB: config.worldStateDbMapSizeKb ?? config.dataStoreMapSizeKB,
29
29
  } as DataStoreConfig;
30
+
31
+ if (!config.l1Contracts?.rollupAddress) {
32
+ throw new Error('Rollup address is required to create a world state synchronizer.');
33
+ }
34
+
35
+ // If a data directory is provided in config, then create a persistent store.
30
36
  const merkleTrees = ['true', '1'].includes(process.env.USE_LEGACY_WORLD_STATE ?? '')
31
- ? await MerkleTrees.new(
32
- await createStore('world-state', newConfig, createDebugLogger('aztec:world-state:lmdb')),
33
- client,
34
- )
37
+ ? await MerkleTrees.new(await createStore('world-state', newConfig, createLogger('world-state:lmdb')), client)
35
38
  : newConfig.dataDirectory
36
39
  ? await NativeWorldStateService.new(
37
40
  config.l1Contracts.rollupAddress,