@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2

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 (304) hide show
  1. package/dest/acvm/acvm.js +18 -21
  2. package/dest/acvm/acvm_types.js +3 -2
  3. package/dest/acvm/deserialize.js +9 -13
  4. package/dest/acvm/index.js +0 -1
  5. package/dest/acvm/oracle/index.js +0 -1
  6. package/dest/acvm/oracle/oracle.js +42 -23
  7. package/dest/acvm/oracle/typed_oracle.js +36 -38
  8. package/dest/acvm/serialize.js +7 -14
  9. package/dest/avm/avm_context.js +24 -27
  10. package/dest/avm/avm_contract_call_result.js +12 -7
  11. package/dest/avm/avm_execution_environment.js +10 -7
  12. package/dest/avm/avm_gas.js +93 -56
  13. package/dest/avm/avm_machine_state.js +60 -61
  14. package/dest/avm/avm_memory_types.js +166 -255
  15. package/dest/avm/avm_simulator.js +68 -47
  16. package/dest/avm/avm_tree.js +282 -276
  17. package/dest/avm/bytecode_utils.js +8 -6
  18. package/dest/avm/errors.js +46 -63
  19. package/dest/avm/fixtures/avm_simulation_tester.js +18 -17
  20. package/dest/avm/fixtures/base_avm_simulation_tester.js +21 -16
  21. package/dest/avm/fixtures/index.js +27 -26
  22. package/dest/avm/fixtures/simple_contract_data_source.js +9 -13
  23. package/dest/avm/index.js +0 -1
  24. package/dest/avm/journal/index.js +0 -1
  25. package/dest/avm/journal/journal.js +147 -200
  26. package/dest/avm/journal/nullifiers.js +43 -46
  27. package/dest/avm/journal/public_storage.js +73 -87
  28. package/dest/avm/opcodes/accrued_substate.js +140 -110
  29. package/dest/avm/opcodes/addressing_mode.js +29 -31
  30. package/dest/avm/opcodes/arithmetic.js +17 -15
  31. package/dest/avm/opcodes/bitwise.js +40 -26
  32. package/dest/avm/opcodes/comparators.js +12 -10
  33. package/dest/avm/opcodes/contract.js +31 -29
  34. package/dest/avm/opcodes/control_flow.js +47 -43
  35. package/dest/avm/opcodes/conversion.js +30 -26
  36. package/dest/avm/opcodes/ec_add.js +35 -34
  37. package/dest/avm/opcodes/environment_getters.js +33 -33
  38. package/dest/avm/opcodes/external_calls.js +83 -74
  39. package/dest/avm/opcodes/hashing.js +69 -61
  40. package/dest/avm/opcodes/index.js +0 -1
  41. package/dest/avm/opcodes/instruction.js +31 -40
  42. package/dest/avm/opcodes/instruction_impl.js +12 -15
  43. package/dest/avm/opcodes/memory.js +177 -156
  44. package/dest/avm/opcodes/misc.js +27 -25
  45. package/dest/avm/opcodes/multi_scalar_mul.js +43 -41
  46. package/dest/avm/opcodes/storage.js +28 -25
  47. package/dest/avm/serialization/buffer_cursor.js +4 -4
  48. package/dest/avm/serialization/bytecode_serialization.js +292 -89
  49. package/dest/avm/serialization/instruction_serialization.js +67 -28
  50. package/dest/avm/test_utils.js +6 -9
  51. package/dest/client/client_execution_context.js +197 -219
  52. package/dest/client/db_oracle.js +4 -7
  53. package/dest/client/execution_note_cache.js +80 -81
  54. package/dest/client/index.js +0 -1
  55. package/dest/client/pick_notes.js +27 -30
  56. package/dest/client/private_execution.js +13 -14
  57. package/dest/client/simulator.js +44 -48
  58. package/dest/client/unconstrained_execution.js +8 -11
  59. package/dest/client/view_data_oracle.js +130 -139
  60. package/dest/common/debug_fn_name.js +1 -4
  61. package/dest/common/errors.js +30 -39
  62. package/dest/common/hashed_values_cache.js +16 -20
  63. package/dest/common/index.js +0 -1
  64. package/dest/common/message_load_oracle_inputs.js +7 -7
  65. package/dest/common/simulation_provider.js +3 -6
  66. package/dest/common.js +0 -1
  67. package/dest/providers/acvm_native.js +46 -32
  68. package/dest/providers/acvm_wasm.js +18 -10
  69. package/dest/providers/acvm_wasm_with_blobs.js +2 -5
  70. package/dest/providers/factory.js +5 -5
  71. package/dest/providers/index.js +0 -1
  72. package/dest/public/bytecode_errors.js +1 -2
  73. package/dest/public/db_interfaces.js +1 -2
  74. package/dest/public/execution.js +2 -4
  75. package/dest/public/executor_metrics.js +16 -12
  76. package/dest/public/fee_payment.js +2 -5
  77. package/dest/public/fixtures/index.js +0 -1
  78. package/dest/public/fixtures/public_tx_simulation_tester.js +13 -17
  79. package/dest/public/fixtures/utils.js +11 -14
  80. package/dest/public/index.js +0 -1
  81. package/dest/public/public_db_sources.js +79 -87
  82. package/dest/public/public_processor.js +310 -306
  83. package/dest/public/public_processor_metrics.js +46 -27
  84. package/dest/public/public_tx_context.js +97 -118
  85. package/dest/public/public_tx_simulator.js +299 -314
  86. package/dest/public/side_effect_errors.js +1 -2
  87. package/dest/public/side_effect_trace.js +44 -71
  88. package/dest/public/side_effect_trace_interface.js +1 -2
  89. package/dest/public/unique_class_ids.js +22 -27
  90. package/dest/public/utils.js +16 -11
  91. package/dest/server.js +0 -1
  92. package/dest/stats/index.js +0 -1
  93. package/dest/stats/stats.js +1 -2
  94. package/dest/test/utils.js +5 -4
  95. package/package.json +11 -11
  96. package/src/acvm/oracle/typed_oracle.ts +34 -34
  97. package/src/avm/avm_machine_state.ts +18 -14
  98. package/src/avm/avm_memory_types.ts +43 -183
  99. package/src/avm/avm_simulator.ts +37 -11
  100. package/src/avm/opcodes/accrued_substate.ts +7 -21
  101. package/src/avm/opcodes/addressing_mode.ts +9 -2
  102. package/src/avm/opcodes/arithmetic.ts +1 -3
  103. package/src/avm/opcodes/bitwise.ts +2 -6
  104. package/src/avm/opcodes/comparators.ts +1 -3
  105. package/src/avm/opcodes/contract.ts +1 -3
  106. package/src/avm/opcodes/control_flow.ts +1 -9
  107. package/src/avm/opcodes/conversion.ts +1 -3
  108. package/src/avm/opcodes/ec_add.ts +1 -3
  109. package/src/avm/opcodes/environment_getters.ts +1 -3
  110. package/src/avm/opcodes/external_calls.ts +3 -6
  111. package/src/avm/opcodes/hashing.ts +3 -9
  112. package/src/avm/opcodes/memory.ts +6 -20
  113. package/src/avm/opcodes/misc.ts +1 -3
  114. package/src/avm/opcodes/multi_scalar_mul.ts +1 -7
  115. package/src/avm/opcodes/storage.ts +2 -6
  116. package/src/client/index.ts +2 -2
  117. package/dest/acvm/acvm.d.ts +0 -35
  118. package/dest/acvm/acvm.d.ts.map +0 -1
  119. package/dest/acvm/acvm_types.d.ts +0 -10
  120. package/dest/acvm/acvm_types.d.ts.map +0 -1
  121. package/dest/acvm/deserialize.d.ts +0 -36
  122. package/dest/acvm/deserialize.d.ts.map +0 -1
  123. package/dest/acvm/index.d.ts +0 -6
  124. package/dest/acvm/index.d.ts.map +0 -1
  125. package/dest/acvm/oracle/index.d.ts +0 -14
  126. package/dest/acvm/oracle/index.d.ts.map +0 -1
  127. package/dest/acvm/oracle/oracle.d.ts +0 -49
  128. package/dest/acvm/oracle/oracle.d.ts.map +0 -1
  129. package/dest/acvm/oracle/typed_oracle.d.ts +0 -75
  130. package/dest/acvm/oracle/typed_oracle.d.ts.map +0 -1
  131. package/dest/acvm/serialize.d.ts +0 -20
  132. package/dest/acvm/serialize.d.ts.map +0 -1
  133. package/dest/avm/avm_context.d.ts +0 -39
  134. package/dest/avm/avm_context.d.ts.map +0 -1
  135. package/dest/avm/avm_contract_call_result.d.ts +0 -30
  136. package/dest/avm/avm_contract_call_result.d.ts.map +0 -1
  137. package/dest/avm/avm_execution_environment.d.ts +0 -21
  138. package/dest/avm/avm_execution_environment.d.ts.map +0 -1
  139. package/dest/avm/avm_gas.d.ts +0 -60
  140. package/dest/avm/avm_gas.d.ts.map +0 -1
  141. package/dest/avm/avm_machine_state.d.ts +0 -93
  142. package/dest/avm/avm_machine_state.d.ts.map +0 -1
  143. package/dest/avm/avm_memory_types.d.ts +0 -310
  144. package/dest/avm/avm_memory_types.d.ts.map +0 -1
  145. package/dest/avm/avm_simulator.d.ts +0 -37
  146. package/dest/avm/avm_simulator.d.ts.map +0 -1
  147. package/dest/avm/avm_tree.d.ts +0 -281
  148. package/dest/avm/avm_tree.d.ts.map +0 -1
  149. package/dest/avm/bytecode_utils.d.ts +0 -5
  150. package/dest/avm/bytecode_utils.d.ts.map +0 -1
  151. package/dest/avm/errors.d.ts +0 -121
  152. package/dest/avm/errors.d.ts.map +0 -1
  153. package/dest/avm/fixtures/avm_simulation_tester.d.ts +0 -21
  154. package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +0 -1
  155. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +0 -35
  156. package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +0 -1
  157. package/dest/avm/fixtures/index.d.ts +0 -67
  158. package/dest/avm/fixtures/index.d.ts.map +0 -1
  159. package/dest/avm/fixtures/simple_contract_data_source.d.ts +0 -31
  160. package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
  161. package/dest/avm/index.d.ts +0 -4
  162. package/dest/avm/index.d.ts.map +0 -1
  163. package/dest/avm/journal/index.d.ts +0 -2
  164. package/dest/avm/journal/index.d.ts.map +0 -1
  165. package/dest/avm/journal/journal.d.ts +0 -176
  166. package/dest/avm/journal/journal.d.ts.map +0 -1
  167. package/dest/avm/journal/nullifiers.d.ts +0 -62
  168. package/dest/avm/journal/nullifiers.d.ts.map +0 -1
  169. package/dest/avm/journal/public_storage.d.ts +0 -66
  170. package/dest/avm/journal/public_storage.d.ts.map +0 -1
  171. package/dest/avm/opcodes/accrued_substate.d.ts +0 -75
  172. package/dest/avm/opcodes/accrued_substate.d.ts.map +0 -1
  173. package/dest/avm/opcodes/addressing_mode.d.ts +0 -27
  174. package/dest/avm/opcodes/addressing_mode.d.ts.map +0 -1
  175. package/dest/avm/opcodes/arithmetic.d.ts +0 -37
  176. package/dest/avm/opcodes/arithmetic.d.ts.map +0 -1
  177. package/dest/avm/opcodes/bitwise.d.ts +0 -50
  178. package/dest/avm/opcodes/bitwise.d.ts.map +0 -1
  179. package/dest/avm/opcodes/comparators.d.ts +0 -25
  180. package/dest/avm/opcodes/comparators.d.ts.map +0 -1
  181. package/dest/avm/opcodes/contract.d.ts +0 -21
  182. package/dest/avm/opcodes/contract.d.ts.map +0 -1
  183. package/dest/avm/opcodes/control_flow.d.ts +0 -41
  184. package/dest/avm/opcodes/control_flow.d.ts.map +0 -1
  185. package/dest/avm/opcodes/conversion.d.ts +0 -17
  186. package/dest/avm/opcodes/conversion.d.ts.map +0 -1
  187. package/dest/avm/opcodes/ec_add.d.ts +0 -19
  188. package/dest/avm/opcodes/ec_add.d.ts.map +0 -1
  189. package/dest/avm/opcodes/environment_getters.d.ts +0 -28
  190. package/dest/avm/opcodes/environment_getters.d.ts.map +0 -1
  191. package/dest/avm/opcodes/external_calls.d.ts +0 -50
  192. package/dest/avm/opcodes/external_calls.d.ts.map +0 -1
  193. package/dest/avm/opcodes/hashing.d.ts +0 -36
  194. package/dest/avm/opcodes/hashing.d.ts.map +0 -1
  195. package/dest/avm/opcodes/index.d.ts +0 -16
  196. package/dest/avm/opcodes/index.d.ts.map +0 -1
  197. package/dest/avm/opcodes/instruction.d.ts +0 -70
  198. package/dest/avm/opcodes/instruction.d.ts.map +0 -1
  199. package/dest/avm/opcodes/instruction_impl.d.ts +0 -19
  200. package/dest/avm/opcodes/instruction_impl.d.ts.map +0 -1
  201. package/dest/avm/opcodes/memory.d.ts +0 -74
  202. package/dest/avm/opcodes/memory.d.ts.map +0 -1
  203. package/dest/avm/opcodes/misc.d.ts +0 -17
  204. package/dest/avm/opcodes/misc.d.ts.map +0 -1
  205. package/dest/avm/opcodes/multi_scalar_mul.d.ts +0 -16
  206. package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +0 -1
  207. package/dest/avm/opcodes/storage.d.ts +0 -24
  208. package/dest/avm/opcodes/storage.d.ts.map +0 -1
  209. package/dest/avm/serialization/buffer_cursor.d.ts +0 -28
  210. package/dest/avm/serialization/buffer_cursor.d.ts.map +0 -1
  211. package/dest/avm/serialization/bytecode_serialization.d.ts +0 -21
  212. package/dest/avm/serialization/bytecode_serialization.d.ts.map +0 -1
  213. package/dest/avm/serialization/instruction_serialization.d.ts +0 -105
  214. package/dest/avm/serialization/instruction_serialization.d.ts.map +0 -1
  215. package/dest/avm/test_utils.d.ts +0 -16
  216. package/dest/avm/test_utils.d.ts.map +0 -1
  217. package/dest/client/client_execution_context.d.ts +0 -214
  218. package/dest/client/client_execution_context.d.ts.map +0 -1
  219. package/dest/client/db_oracle.d.ts +0 -229
  220. package/dest/client/db_oracle.d.ts.map +0 -1
  221. package/dest/client/execution_note_cache.d.ts +0 -93
  222. package/dest/client/execution_note_cache.d.ts.map +0 -1
  223. package/dest/client/index.d.ts +0 -15
  224. package/dest/client/index.d.ts.map +0 -1
  225. package/dest/client/pick_notes.d.ts +0 -85
  226. package/dest/client/pick_notes.d.ts.map +0 -1
  227. package/dest/client/private_execution.d.ts +0 -19
  228. package/dest/client/private_execution.d.ts.map +0 -1
  229. package/dest/client/simulator.d.ts +0 -60
  230. package/dest/client/simulator.d.ts.map +0 -1
  231. package/dest/client/unconstrained_execution.d.ts +0 -10
  232. package/dest/client/unconstrained_execution.d.ts.map +0 -1
  233. package/dest/client/view_data_oracle.d.ts +0 -159
  234. package/dest/client/view_data_oracle.d.ts.map +0 -1
  235. package/dest/common/debug_fn_name.d.ts +0 -4
  236. package/dest/common/debug_fn_name.d.ts.map +0 -1
  237. package/dest/common/errors.d.ts +0 -54
  238. package/dest/common/errors.d.ts.map +0 -1
  239. package/dest/common/hashed_values_cache.d.ts +0 -28
  240. package/dest/common/hashed_values_cache.d.ts.map +0 -1
  241. package/dest/common/index.d.ts +0 -3
  242. package/dest/common/index.d.ts.map +0 -1
  243. package/dest/common/message_load_oracle_inputs.d.ts +0 -15
  244. package/dest/common/message_load_oracle_inputs.d.ts.map +0 -1
  245. package/dest/common/simulation_provider.d.ts +0 -19
  246. package/dest/common/simulation_provider.d.ts.map +0 -1
  247. package/dest/common.d.ts +0 -2
  248. package/dest/common.d.ts.map +0 -1
  249. package/dest/providers/acvm_native.d.ts +0 -40
  250. package/dest/providers/acvm_native.d.ts.map +0 -1
  251. package/dest/providers/acvm_wasm.d.ts +0 -15
  252. package/dest/providers/acvm_wasm.d.ts.map +0 -1
  253. package/dest/providers/acvm_wasm_with_blobs.d.ts +0 -19
  254. package/dest/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
  255. package/dest/providers/factory.d.ts +0 -12
  256. package/dest/providers/factory.d.ts.map +0 -1
  257. package/dest/providers/index.d.ts +0 -5
  258. package/dest/providers/index.d.ts.map +0 -1
  259. package/dest/public/bytecode_errors.d.ts +0 -4
  260. package/dest/public/bytecode_errors.d.ts.map +0 -1
  261. package/dest/public/db_interfaces.d.ts +0 -105
  262. package/dest/public/db_interfaces.d.ts.map +0 -1
  263. package/dest/public/execution.d.ts +0 -102
  264. package/dest/public/execution.d.ts.map +0 -1
  265. package/dest/public/executor_metrics.d.ts +0 -13
  266. package/dest/public/executor_metrics.d.ts.map +0 -1
  267. package/dest/public/fee_payment.d.ts +0 -11
  268. package/dest/public/fee_payment.d.ts.map +0 -1
  269. package/dest/public/fixtures/index.d.ts +0 -3
  270. package/dest/public/fixtures/index.d.ts.map +0 -1
  271. package/dest/public/fixtures/public_tx_simulation_tester.d.ts +0 -21
  272. package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +0 -1
  273. package/dest/public/fixtures/utils.d.ts +0 -17
  274. package/dest/public/fixtures/utils.d.ts.map +0 -1
  275. package/dest/public/index.d.ts +0 -9
  276. package/dest/public/index.d.ts.map +0 -1
  277. package/dest/public/public_db_sources.d.ts +0 -81
  278. package/dest/public/public_db_sources.d.ts.map +0 -1
  279. package/dest/public/public_processor.d.ts +0 -72
  280. package/dest/public/public_processor.d.ts.map +0 -1
  281. package/dest/public/public_processor_metrics.d.ts +0 -27
  282. package/dest/public/public_processor_metrics.d.ts.map +0 -1
  283. package/dest/public/public_tx_context.d.ts +0 -131
  284. package/dest/public/public_tx_context.d.ts.map +0 -1
  285. package/dest/public/public_tx_simulator.d.ts +0 -99
  286. package/dest/public/public_tx_simulator.d.ts.map +0 -1
  287. package/dest/public/side_effect_errors.d.ts +0 -4
  288. package/dest/public/side_effect_errors.d.ts.map +0 -1
  289. package/dest/public/side_effect_trace.d.ts +0 -126
  290. package/dest/public/side_effect_trace.d.ts.map +0 -1
  291. package/dest/public/side_effect_trace_interface.d.ts +0 -32
  292. package/dest/public/side_effect_trace_interface.d.ts.map +0 -1
  293. package/dest/public/unique_class_ids.d.ts +0 -37
  294. package/dest/public/unique_class_ids.d.ts.map +0 -1
  295. package/dest/public/utils.d.ts +0 -5
  296. package/dest/public/utils.d.ts.map +0 -1
  297. package/dest/server.d.ts +0 -6
  298. package/dest/server.d.ts.map +0 -1
  299. package/dest/stats/index.d.ts +0 -2
  300. package/dest/stats/index.d.ts.map +0 -1
  301. package/dest/stats/stats.d.ts +0 -4
  302. package/dest/stats/stats.d.ts.map +0 -1
  303. package/dest/test/utils.d.ts +0 -12
  304. package/dest/test/utils.d.ts.map +0 -1
@@ -4,19 +4,18 @@ import { poseidon2Hash } from '@aztec/foundation/crypto';
4
4
  import { Fr } from '@aztec/foundation/fields';
5
5
  import { strict as assert } from 'assert';
6
6
  import cloneDeep from 'lodash.clonedeep';
7
- /****************************************************/
8
- /****** The AvmEphemeralForest Class ****************/
9
- /****************************************************/
10
- /**
7
+ /****************************************************/ /****** The AvmEphemeralForest Class ****************/ /****************************************************/ /**
11
8
  * This provides a forkable abstraction over the EphemeralAvmTree class
12
9
  * It contains the logic to look up into a read-only MerkleTreeDb to discover
13
10
  * the sibling paths and low witnesses that weren't inserted as part of this tx
14
- */
15
- export class AvmEphemeralForest {
16
- constructor(treeDb, treeMap,
17
- // This contains the [leaf index,indexed leaf preimages] tuple that were updated or inserted in the ephemeral tree
11
+ */ export class AvmEphemeralForest {
12
+ treeDb;
13
+ treeMap;
14
+ indexedUpdates;
15
+ indexedSortedKeys;
16
+ constructor(treeDb, treeMap, // This contains the [leaf index,indexed leaf preimages] tuple that were updated or inserted in the ephemeral tree
18
17
  // This is needed since we have a sparse collection of keys sorted leaves in the ephemeral tree
19
- indexedUpdates, indexedSortedKeys) {
18
+ indexedUpdates, indexedSortedKeys){
20
19
  this.treeDb = treeDb;
21
20
  this.treeMap = treeMap;
22
21
  this.indexedUpdates = indexedUpdates;
@@ -24,7 +23,11 @@ export class AvmEphemeralForest {
24
23
  }
25
24
  static async create(treeDb) {
26
25
  const treeMap = new Map();
27
- for (const treeType of [MerkleTreeId.NULLIFIER_TREE, MerkleTreeId.NOTE_HASH_TREE, MerkleTreeId.PUBLIC_DATA_TREE]) {
26
+ for (const treeType of [
27
+ MerkleTreeId.NULLIFIER_TREE,
28
+ MerkleTreeId.NOTE_HASH_TREE,
29
+ MerkleTreeId.PUBLIC_DATA_TREE
30
+ ]){
28
31
  const treeInfo = await treeDb.getTreeInfo(treeType);
29
32
  const tree = await EphemeralAvmTree.create(treeInfo.size, treeInfo.depth, treeDb, treeType);
30
33
  treeMap.set(treeType, tree);
@@ -38,12 +41,11 @@ export class AvmEphemeralForest {
38
41
  return new AvmEphemeralForest(this.treeDb, cloneDeep(this.treeMap), cloneDeep(this.indexedUpdates), cloneDeep(this.indexedSortedKeys));
39
42
  }
40
43
  /**
41
- * Gets sibling path for a leaf - if the sibling path is not found in the tree, it is fetched from the DB
42
- * @param treeId - The tree to be queried for a sibling path.
43
- * @param index - The index of the leaf for which a sibling path should be returned.
44
- * @returns The sibling path of the leaf.
45
- */
46
- async getSiblingPath(treeId, index) {
44
+ * Gets sibling path for a leaf - if the sibling path is not found in the tree, it is fetched from the DB
45
+ * @param treeId - The tree to be queried for a sibling path.
46
+ * @param index - The index of the leaf for which a sibling path should be returned.
47
+ * @returns The sibling path of the leaf.
48
+ */ async getSiblingPath(treeId, index) {
47
49
  const tree = this.treeMap.get(treeId);
48
50
  let path = await tree.getSiblingPath(index);
49
51
  if (path === undefined) {
@@ -51,7 +53,7 @@ export class AvmEphemeralForest {
51
53
  path = (await this.treeDb.getSiblingPath(treeId, index)).toFields();
52
54
  // Since the sibling path could be outdated, we compare it with nodes in our tree
53
55
  // if we encounter a mismatch, we replace it with the node we found in our tree.
54
- for (let i = 0; i < path.length; i++) {
56
+ for(let i = 0; i < path.length; i++){
55
57
  const siblingIndex = index ^ 1n;
56
58
  const node = tree.getNode(siblingIndex, tree.depth - i);
57
59
  if (node !== undefined) {
@@ -66,14 +68,13 @@ export class AvmEphemeralForest {
66
68
  return path;
67
69
  }
68
70
  /**
69
- * This does the work of appending the new leaf and updating the low witness
70
- * @param treeId - The tree to be queried for a sibling path.
71
- * @param lowWitnessIndex - The index of the low leaf in the tree.
72
- * @param lowWitness - The preimage of the low leaf.
73
- * @param newLeafPreimage - The preimage of the new leaf to be inserted.
74
- * @returns The sibling path of the new leaf (i.e. the insertion path)
75
- */
76
- async appendIndexedTree(treeId, lowLeafIndex, lowLeafPreimage, newLeafPreimage) {
71
+ * This does the work of appending the new leaf and updating the low witness
72
+ * @param treeId - The tree to be queried for a sibling path.
73
+ * @param lowWitnessIndex - The index of the low leaf in the tree.
74
+ * @param lowWitness - The preimage of the low leaf.
75
+ * @param newLeafPreimage - The preimage of the new leaf to be inserted.
76
+ * @returns The sibling path of the new leaf (i.e. the insertion path)
77
+ */ async appendIndexedTree(treeId, lowLeafIndex, lowLeafPreimage, newLeafPreimage) {
77
78
  const tree = this.treeMap.get(treeId);
78
79
  const newLeaf = await this.hashPreimage(newLeafPreimage);
79
80
  const insertIndex = tree.leafCount;
@@ -84,15 +85,14 @@ export class AvmEphemeralForest {
84
85
  // Append the new leaf
85
86
  tree.appendLeaf(newLeaf);
86
87
  this.setIndexedUpdates(treeId, insertIndex, newLeafPreimage);
87
- return (await tree.getSiblingPath(insertIndex));
88
+ return await tree.getSiblingPath(insertIndex);
88
89
  }
89
90
  /**
90
- * This writes or updates a slot in the public data tree with a value
91
- * @param slot - The slot to be written to.
92
- * @param newValue - The value to be written or updated to
93
- * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
94
- */
95
- async writePublicStorage(slot, newValue) {
91
+ * This writes or updates a slot in the public data tree with a value
92
+ * @param slot - The slot to be written to.
93
+ * @param newValue - The value to be written or updated to
94
+ * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
95
+ */ async writePublicStorage(slot, newValue) {
96
96
  // This only works for the public data tree
97
97
  const treeId = MerkleTreeId.PUBLIC_DATA_TREE;
98
98
  const tree = this.treeMap.get(treeId);
@@ -109,15 +109,19 @@ export class AvmEphemeralForest {
109
109
  updatedPreimage.value = newValue;
110
110
  tree.updateLeaf(await this.hashPreimage(updatedPreimage), lowLeafIndex);
111
111
  this.setIndexedUpdates(treeId, lowLeafIndex, updatedPreimage);
112
- this._updateSortedKeys(treeId, [updatedPreimage.slot], [lowLeafIndex]);
112
+ this._updateSortedKeys(treeId, [
113
+ updatedPreimage.slot
114
+ ], [
115
+ lowLeafIndex
116
+ ]);
113
117
  return {
114
118
  element: updatedPreimage,
115
119
  lowWitness: {
116
120
  preimage: preimage,
117
121
  index: lowLeafIndex,
118
- siblingPath: existingPublicDataSiblingPath,
122
+ siblingPath: existingPublicDataSiblingPath
119
123
  },
120
- update: true,
124
+ update: true
121
125
  };
122
126
  }
123
127
  // We are writing to a new slot, so our preimage is a lowNullifier
@@ -129,42 +133,49 @@ export class AvmEphemeralForest {
129
133
  const insertionPath = await this.appendIndexedTree(treeId, lowLeafIndex, updatedLowLeaf, newPublicDataLeaf);
130
134
  // Even though the low leaf key is not updated, we still need to update the sorted keys in case we have
131
135
  // not seen the low leaf before
132
- this._updateSortedKeys(treeId, [newPublicDataLeaf.slot, updatedLowLeaf.slot], [insertionIndex, lowLeafIndex]);
136
+ this._updateSortedKeys(treeId, [
137
+ newPublicDataLeaf.slot,
138
+ updatedLowLeaf.slot
139
+ ], [
140
+ insertionIndex,
141
+ lowLeafIndex
142
+ ]);
133
143
  return {
134
144
  element: newPublicDataLeaf,
135
145
  lowWitness: {
136
146
  preimage,
137
147
  index: lowLeafIndex,
138
- siblingPath,
148
+ siblingPath
139
149
  },
140
150
  update: false,
141
151
  leafIndex: insertionIndex,
142
- insertionPath: insertionPath,
152
+ insertionPath: insertionPath
143
153
  };
144
154
  }
145
155
  _updateSortedKeys(treeId, keys, index) {
146
156
  // This is a reference
147
157
  const existingKeyVector = this.indexedSortedKeys.get(treeId);
148
158
  // Should already be sorted so not need to re-sort if we just update or splice
149
- for (let i = 0; i < keys.length; i++) {
150
- const foundIndex = existingKeyVector.findIndex(x => x[1] === index[i]);
159
+ for(let i = 0; i < keys.length; i++){
160
+ const foundIndex = existingKeyVector.findIndex((x)=>x[1] === index[i]);
151
161
  if (foundIndex === -1) {
152
162
  // New element, we splice it into the correct location
153
- const spliceIndex = indexOrNextLowestInArray(keys[i], existingKeyVector.map(x => x[0])) + 1;
154
- existingKeyVector.splice(spliceIndex, 0, [keys[i], index[i]]);
155
- }
156
- else {
163
+ const spliceIndex = indexOrNextLowestInArray(keys[i], existingKeyVector.map((x)=>x[0])) + 1;
164
+ existingKeyVector.splice(spliceIndex, 0, [
165
+ keys[i],
166
+ index[i]
167
+ ]);
168
+ } else {
157
169
  // Update the existing element
158
170
  existingKeyVector[foundIndex][0] = keys[i];
159
171
  }
160
172
  }
161
173
  }
162
174
  /**
163
- * This appends a nullifier to the nullifier tree, and throws if the nullifier already exists
164
- * @param value - The nullifier to be appended
165
- * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
166
- */
167
- async appendNullifier(nullifier) {
175
+ * This appends a nullifier to the nullifier tree, and throws if the nullifier already exists
176
+ * @param value - The nullifier to be appended
177
+ * @returns The insertion result which contains the insertion path, low leaf and the new leaf index
178
+ */ async appendNullifier(nullifier) {
168
179
  const treeId = MerkleTreeId.NULLIFIER_TREE;
169
180
  const tree = this.treeMap.get(treeId);
170
181
  const [leafOrLowLeafInfo, pathAbsentInEphemeralTree] = await this._getLeafOrLowLeafInfo(treeId, nullifier);
@@ -184,24 +195,29 @@ export class AvmEphemeralForest {
184
195
  const insertionPath = await this.appendIndexedTree(treeId, index, updatedLowNullifier, newNullifierLeaf);
185
196
  // Even though the low nullifier key is not updated, we still need to update the sorted keys in case we have
186
197
  // not seen the low nullifier before
187
- this._updateSortedKeys(treeId, [newNullifierLeaf.nullifier, updatedLowNullifier.nullifier], [insertionIndex, index]);
198
+ this._updateSortedKeys(treeId, [
199
+ newNullifierLeaf.nullifier,
200
+ updatedLowNullifier.nullifier
201
+ ], [
202
+ insertionIndex,
203
+ index
204
+ ]);
188
205
  return {
189
206
  element: newNullifierLeaf,
190
207
  lowWitness: {
191
208
  preimage,
192
209
  index,
193
- siblingPath,
210
+ siblingPath
194
211
  },
195
212
  leafIndex: insertionIndex,
196
- insertionPath: insertionPath,
213
+ insertionPath: insertionPath
197
214
  };
198
215
  }
199
216
  /**
200
- * This appends a note hash to the note hash tree
201
- * @param value - The note hash to be appended
202
- * @returns The insertion result which contains the insertion path
203
- */
204
- async appendNoteHash(noteHash) {
217
+ * This appends a note hash to the note hash tree
218
+ * @param value - The note hash to be appended
219
+ * @returns The insertion result which contains the insertion path
220
+ */ async appendNoteHash(noteHash) {
205
221
  const tree = this.treeMap.get(MerkleTreeId.NOTE_HASH_TREE);
206
222
  tree.appendLeaf(noteHash);
207
223
  // We use leafCount - 1 here because we would have just appended a leaf
@@ -209,9 +225,8 @@ export class AvmEphemeralForest {
209
225
  return insertionPath;
210
226
  }
211
227
  /**
212
- * This is wrapper around treeId to set values in the indexedUpdates map
213
- */
214
- setIndexedUpdates(treeId, index, preimage) {
228
+ * This is wrapper around treeId to set values in the indexedUpdates map
229
+ */ setIndexedUpdates(treeId, index, preimage) {
215
230
  let updates = this.indexedUpdates.get(treeId);
216
231
  if (updates === undefined) {
217
232
  updates = new Map();
@@ -220,10 +235,9 @@ export class AvmEphemeralForest {
220
235
  updates.set(index, preimage);
221
236
  }
222
237
  /**
223
- * This is wrapper around treeId to get values in the indexedUpdates map.
224
- * Should only be called if we know the value exists.
225
- */
226
- getIndexedUpdate(treeId, index) {
238
+ * This is wrapper around treeId to get values in the indexedUpdates map.
239
+ * Should only be called if we know the value exists.
240
+ */ getIndexedUpdate(treeId, index) {
227
241
  const updates = this.indexedUpdates.get(treeId);
228
242
  assert(updates !== undefined, `No updates exist in the ephemeral ${MerkleTreeId[treeId]} tree.`);
229
243
  const preimage = updates.get(index);
@@ -231,9 +245,8 @@ export class AvmEphemeralForest {
231
245
  return preimage;
232
246
  }
233
247
  /**
234
- * This is wrapper around treeId to check membership (i.e. has()) of index in the indexedUpdates map
235
- */
236
- hasLocalUpdates(treeId, index) {
248
+ * This is wrapper around treeId to check membership (i.e. has()) of index in the indexedUpdates map
249
+ */ hasLocalUpdates(treeId, index) {
237
250
  const updates = this.indexedUpdates.get(treeId);
238
251
  if (updates === undefined) {
239
252
  return false;
@@ -241,30 +254,28 @@ export class AvmEphemeralForest {
241
254
  return updates.has(index);
242
255
  }
243
256
  /**
244
- * Get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
245
- * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
246
- * @param treeId - The tree we are looking up in
247
- * @param key - The key for which we are look up the leaf or low leaf for.
248
- * @param T - The type of the preimage (PublicData or Nullifier)
249
- * @returns The leaf or low leaf info (preimage & leaf index).
250
- */
251
- async getLeafOrLowLeafInfo(treeId, key) {
257
+ * Get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
258
+ * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
259
+ * @param treeId - The tree we are looking up in
260
+ * @param key - The key for which we are look up the leaf or low leaf for.
261
+ * @param T - The type of the preimage (PublicData or Nullifier)
262
+ * @returns The leaf or low leaf info (preimage & leaf index).
263
+ */ async getLeafOrLowLeafInfo(treeId, key) {
252
264
  const [leafOrLowLeafInfo, _] = await this._getLeafOrLowLeafInfo(treeId, key);
253
265
  return leafOrLowLeafInfo;
254
266
  }
255
267
  /**
256
- * Internal helper to get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
257
- * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
258
- * Indicates whethe the sibling path is absent in the ephemeral tree.
259
- * @param treeId - The tree we are looking up in
260
- * @param key - The key for which we are look up the leaf or low leaf for.
261
- * @param T - The type of the preimage (PublicData or Nullifier)
262
- * @returns [
263
- * getLeafResult - The leaf or low leaf info (preimage & leaf index),
264
- * pathAbsentInEphemeralTree - whether its sibling path is absent in the ephemeral tree (useful during insertions)
265
- * ]
266
- */
267
- async _getLeafOrLowLeafInfo(treeId, key) {
268
+ * Internal helper to get the leaf or low leaf preimage and its index in the indexed tree given a key (slot or nullifier value).
269
+ * If the key is not found in the tree, it does an external lookup to the underlying merkle DB.
270
+ * Indicates whethe the sibling path is absent in the ephemeral tree.
271
+ * @param treeId - The tree we are looking up in
272
+ * @param key - The key for which we are look up the leaf or low leaf for.
273
+ * @param T - The type of the preimage (PublicData or Nullifier)
274
+ * @returns [
275
+ * getLeafResult - The leaf or low leaf info (preimage & leaf index),
276
+ * pathAbsentInEphemeralTree - whether its sibling path is absent in the ephemeral tree (useful during insertions)
277
+ * ]
278
+ */ async _getLeafOrLowLeafInfo(treeId, key) {
268
279
  const bigIntKey = key.toBigInt();
269
280
  // In this function, "min" refers to the leaf with the
270
281
  // largest key <= the specified key in the indexedUpdates.
@@ -276,7 +287,10 @@ export class AvmEphemeralForest {
276
287
  const leafOrLowLeafWitnessFromExternalDb = await this._getLeafOrLowLeafWitnessInExternalDb(treeId, bigIntKey);
277
288
  // If the indexed updates are empty, we can return the leaf from the DB
278
289
  if (minIndexedLeafIndex === -1n) {
279
- return [leafOrLowLeafWitnessFromExternalDb, /*pathAbsentInEphemeralTree=*/ true];
290
+ return [
291
+ leafOrLowLeafWitnessFromExternalDb,
292
+ /*pathAbsentInEphemeralTree=*/ true
293
+ ];
280
294
  }
281
295
  // Otherwise, we return the closest one. First fetch the leaf from the indexed updates.
282
296
  const minIndexedUpdate = this.getIndexedUpdate(treeId, minIndexedLeafIndex);
@@ -285,56 +299,61 @@ export class AvmEphemeralForest {
285
299
  const keyFromExternal = leafOrLowLeafWitnessFromExternalDb.preimage.getKey();
286
300
  if (keyFromExternal > keyFromIndexed) {
287
301
  // this.log.debug(`Using leaf from external DB for ${MerkleTreeId[treeId]}`);
288
- return [leafOrLowLeafWitnessFromExternalDb, /*pathAbsentInEphemeralTree=*/ true];
289
- }
290
- else {
302
+ return [
303
+ leafOrLowLeafWitnessFromExternalDb,
304
+ /*pathAbsentInEphemeralTree=*/ true
305
+ ];
306
+ } else {
291
307
  // this.log.debug(`Using leaf from indexed DB for ${MerkleTreeId[treeId]}`);
292
308
  const leafInfo = {
293
309
  preimage: minIndexedUpdate,
294
310
  index: minIndexedLeafIndex,
295
- alreadyPresent: keyFromIndexed === bigIntKey,
311
+ alreadyPresent: keyFromIndexed === bigIntKey
296
312
  };
297
- return [leafInfo, /*pathAbsentInEphemeralTree=*/ false];
313
+ return [
314
+ leafInfo,
315
+ /*pathAbsentInEphemeralTree=*/ false
316
+ ];
298
317
  }
299
318
  }
300
319
  /**
301
- * Helper to search for the leaf with the specified key in the indexedUpdates
302
- * and return its leafIndex.
303
- * If not present, return the leafIndex of the largest leaf <= the specified key
304
- * (the leafIndex of the next lowest key).
305
- *
306
- * If no entry exists in indexedUpdates <= the specified key, return -1.
307
- * @returns - The leafIndex of the leaf with the largest key <= the specified key.
308
- */
309
- _getLeafIndexOrNextLowestInIndexedUpdates(treeId, key) {
320
+ * Helper to search for the leaf with the specified key in the indexedUpdates
321
+ * and return its leafIndex.
322
+ * If not present, return the leafIndex of the largest leaf <= the specified key
323
+ * (the leafIndex of the next lowest key).
324
+ *
325
+ * If no entry exists in indexedUpdates <= the specified key, return -1.
326
+ * @returns - The leafIndex of the leaf with the largest key <= the specified key.
327
+ */ _getLeafIndexOrNextLowestInIndexedUpdates(treeId, key) {
310
328
  const keyOrderedVector = this.indexedSortedKeys.get(treeId);
311
- const indexInVector = indexOrNextLowestInArray(key, keyOrderedVector.map(x => x[0]));
329
+ const indexInVector = indexOrNextLowestInArray(key, keyOrderedVector.map((x)=>x[0]));
312
330
  if (indexInVector !== -1) {
313
331
  const [_, leafIndex] = keyOrderedVector[indexInVector];
314
332
  return leafIndex;
315
- }
316
- else {
333
+ } else {
317
334
  // no leaf <= the specified key was found
318
335
  return -1n;
319
336
  }
320
337
  }
321
338
  /**
322
- * Query the external DB to get leaf if present, low leaf if absent
323
- */
324
- async _getLeafOrLowLeafWitnessInExternalDb(treeId, key) {
339
+ * Query the external DB to get leaf if present, low leaf if absent
340
+ */ async _getLeafOrLowLeafWitnessInExternalDb(treeId, key) {
325
341
  // "key" is siloed slot (leafSlot) or siloed nullifier
326
342
  const previousValueIndex = await this.treeDb.getPreviousValueIndex(treeId, key);
327
343
  assert(previousValueIndex !== undefined, `${MerkleTreeId[treeId]} low leaf index should always be found (even if target leaf does not exist)`);
328
344
  const { index: leafIndex, alreadyPresent } = previousValueIndex;
329
345
  const leafPreimage = await this.treeDb.getLeafPreimage(treeId, leafIndex);
330
346
  assert(leafPreimage !== undefined, `${MerkleTreeId[treeId]} low leaf preimage should never be undefined (even if target leaf does not exist)`);
331
- return { preimage: leafPreimage, index: leafIndex, alreadyPresent };
347
+ return {
348
+ preimage: leafPreimage,
349
+ index: leafIndex,
350
+ alreadyPresent
351
+ };
332
352
  }
333
353
  /**
334
- * This hashes the preimage to a field element
335
- */
336
- hashPreimage(preimage) {
337
- const input = preimage.toHashInputs().map(x => Fr.fromBuffer(x));
354
+ * This hashes the preimage to a field element
355
+ */ hashPreimage(preimage) {
356
+ const input = preimage.toHashInputs().map((x)=>Fr.fromBuffer(x));
338
357
  return poseidon2Hash(input);
339
358
  }
340
359
  async getTreeSnapshot(id) {
@@ -343,42 +362,38 @@ export class AvmEphemeralForest {
343
362
  return new AppendOnlyTreeSnapshot(root, Number(tree.leafCount));
344
363
  }
345
364
  }
346
- /****************************************************/
347
- /****** Some useful Structs and Enums **************/
348
- /****************************************************/
349
- var TreeType;
350
- (function (TreeType) {
365
+ /****************************************************/ /****** Some useful Structs and Enums **************/ /****************************************************/ var TreeType = /*#__PURE__*/ function(TreeType) {
351
366
  TreeType[TreeType["LEAF"] = 0] = "LEAF";
352
367
  TreeType[TreeType["NODE"] = 1] = "NODE";
353
- })(TreeType || (TreeType = {}));
354
- var SiblingStatus;
355
- (function (SiblingStatus) {
368
+ return TreeType;
369
+ }(TreeType || {});
370
+ var SiblingStatus = /*#__PURE__*/ function(SiblingStatus) {
356
371
  SiblingStatus[SiblingStatus["MEMBER"] = 0] = "MEMBER";
357
372
  SiblingStatus[SiblingStatus["NONMEMBER"] = 1] = "NONMEMBER";
358
373
  SiblingStatus[SiblingStatus["ERROR"] = 2] = "ERROR";
359
- })(SiblingStatus || (SiblingStatus = {}));
360
- /****************************************************/
361
- /****** Some Helpful Constructors for Trees ********/
362
- /****************************************************/
363
- const Node = (left, right) => ({
364
- tag: TreeType.NODE,
365
- leftTree: left,
366
- rightTree: right,
367
- });
368
- const Leaf = (value) => ({
369
- tag: TreeType.LEAF,
370
- value,
371
- });
372
- /****************************************************/
373
- /****** The EphemeralAvmTree Class *****************/
374
- /****************************************************/
375
- /**
374
+ return SiblingStatus;
375
+ }(SiblingStatus || {});
376
+ /****************************************************/ /****** Some Helpful Constructors for Trees ********/ /****************************************************/ const Node = (left, right)=>({
377
+ tag: 1,
378
+ leftTree: left,
379
+ rightTree: right
380
+ });
381
+ const Leaf = (value)=>({
382
+ tag: 0,
383
+ value
384
+ });
385
+ /****************************************************/ /****** The EphemeralAvmTree Class *****************/ /****************************************************/ /**
376
386
  * This class contains a recursively defined tree that has leaves at different heights
377
387
  * It is seeded by an existing merkle treeDb for which it derives a frontier
378
388
  * It is intended to be a lightweight tree that contains only the necessary information to suppport appends or updates
379
- */
380
- export class EphemeralAvmTree {
381
- constructor(root, leafCount, depth, zeroHashes) {
389
+ */ export class EphemeralAvmTree {
390
+ root;
391
+ leafCount;
392
+ depth;
393
+ zeroHashes;
394
+ tree;
395
+ frontier;
396
+ constructor(root, leafCount, depth, zeroHashes){
382
397
  this.root = root;
383
398
  this.leafCount = leafCount;
384
399
  this.depth = depth;
@@ -390,82 +405,78 @@ export class EphemeralAvmTree {
390
405
  let zeroHash = Fr.zero();
391
406
  // Can probably cache this elsewhere
392
407
  const zeroHashes = [];
393
- for (let i = 0; i < depth; i++) {
408
+ for(let i = 0; i < depth; i++){
394
409
  zeroHashes.push(zeroHash);
395
- zeroHash = await poseidon2Hash([zeroHash, zeroHash]);
410
+ zeroHash = await poseidon2Hash([
411
+ zeroHash,
412
+ zeroHash
413
+ ]);
396
414
  }
397
415
  const tree = new EphemeralAvmTree(Leaf(zeroHash), forkedLeafCount, depth, zeroHashes);
398
416
  await tree.initializeFrontier(treeDb, merkleId);
399
417
  return tree;
400
418
  }
401
419
  /**
402
- * This is a recursive function that inserts a leaf into the tree
403
- * @param value - The value of the leaf to be inserted
404
- */
405
- appendLeaf(value) {
420
+ * This is a recursive function that inserts a leaf into the tree
421
+ * @param value - The value of the leaf to be inserted
422
+ */ appendLeaf(value) {
406
423
  const insertPath = this._derivePathLE(this.leafCount);
407
424
  this.tree = this._insertLeaf(value, insertPath, this.depth, this.tree);
408
425
  this.leafCount++;
409
426
  }
410
427
  /**
411
- * This is a recursive function that upserts a leaf into the tree at a index and depth
412
- * @param value - The value of the leaf to be inserted
413
- * @param index - The index of the leaf to be inserted
414
- * @param depth - The depth of the leaf to be inserted (defaults to the bottom of the tree)
415
- */
416
- updateLeaf(value, index, depth = this.depth) {
428
+ * This is a recursive function that upserts a leaf into the tree at a index and depth
429
+ * @param value - The value of the leaf to be inserted
430
+ * @param index - The index of the leaf to be inserted
431
+ * @param depth - The depth of the leaf to be inserted (defaults to the bottom of the tree)
432
+ */ updateLeaf(value, index, depth = this.depth) {
417
433
  const insertPath = this._derivePathLE(index, depth);
418
434
  this.tree = this._insertLeaf(value, insertPath, depth, this.tree);
419
435
  }
420
436
  /**
421
- * Get the sibling path of a leaf in the tree
422
- * @param index - The index of the leaf for which a sibling path should be returned.
423
- * @returns The sibling path of the leaf, can fail if the path is not found
424
- */
425
- async getSiblingPath(index) {
437
+ * Get the sibling path of a leaf in the tree
438
+ * @param index - The index of the leaf for which a sibling path should be returned.
439
+ * @returns The sibling path of the leaf, can fail if the path is not found
440
+ */ async getSiblingPath(index) {
426
441
  const searchPath = this._derivePathLE(index);
427
442
  // Handle cases where we error out
428
443
  const { path, status } = await this._getSiblingPath(searchPath, this.tree, []);
429
- if (status === SiblingStatus.ERROR) {
444
+ if (status === 2) {
430
445
  return undefined;
431
446
  }
432
447
  return path;
433
448
  }
434
449
  /**
435
- * This upserts the nodes of the sibling path into the tree
436
- * @param index - The index of the leaf that the sibling path is derived from
437
- * @param siblingPath - The sibling path of the index
438
- */
439
- insertSiblingPath(index, siblingPath) {
440
- for (let i = 0; i < siblingPath.length; i++) {
450
+ * This upserts the nodes of the sibling path into the tree
451
+ * @param index - The index of the leaf that the sibling path is derived from
452
+ * @param siblingPath - The sibling path of the index
453
+ */ insertSiblingPath(index, siblingPath) {
454
+ for(let i = 0; i < siblingPath.length; i++){
441
455
  // Flip(XOR) the last bit because we are inserting siblings of the leaf
442
456
  const sibIndex = index ^ 1n;
443
457
  const node = this.getNode(sibIndex, this.depth - i);
444
458
  // If we are inserting a sibling path and we already have a branch at that index in our
445
459
  // ephemeral tree, we should not overwrite it
446
- if (node === undefined || node.tag === TreeType.LEAF) {
460
+ if (node === undefined || node.tag === 0) {
447
461
  this.updateLeaf(siblingPath[i], sibIndex, this.depth - i);
448
462
  }
449
463
  index >>= 1n;
450
464
  }
451
465
  }
452
466
  /**
453
- * This is a helper function that computes the index of the frontier nodes at each depth
454
- * @param leafCount - The number of leaves in the tree
455
- * @returns An array of frontier indices at each depth, sorted from leaf to root
456
- */
457
- // Do we really need LeafCount to be a bigint - log2 is on numbers only
467
+ * This is a helper function that computes the index of the frontier nodes at each depth
468
+ * @param leafCount - The number of leaves in the tree
469
+ * @returns An array of frontier indices at each depth, sorted from leaf to root
470
+ */ // Do we really need LeafCount to be a bigint - log2 is on numbers only
458
471
  static computeFrontierLeafIndices(leafCount) {
459
472
  const numFrontierEntries = Math.floor(Math.log2(leafCount)) + 1;
460
473
  const frontierIndices = [];
461
- for (let i = 0; i < numFrontierEntries; i++) {
474
+ for(let i = 0; i < numFrontierEntries; i++){
462
475
  if (leafCount === 0) {
463
476
  frontierIndices.push(0);
464
- }
465
- else if (leafCount % 2 === 0) {
477
+ } else if (leafCount % 2 === 0) {
466
478
  frontierIndices.push(leafCount - 2);
467
- }
468
- else {
479
+ } else {
469
480
  frontierIndices.push(leafCount - 1);
470
481
  }
471
482
  leafCount >>= 1;
@@ -473,11 +484,10 @@ export class EphemeralAvmTree {
473
484
  return frontierIndices;
474
485
  }
475
486
  /**
476
- * This derives the frontier and inserts them into the tree
477
- * @param treeDb - The treeDb to be queried for sibling paths
478
- * @param merkleId - The treeId of the tree to be queried for sibling paths
479
- */
480
- async initializeFrontier(treeDb, merkleId) {
487
+ * This derives the frontier and inserts them into the tree
488
+ * @param treeDb - The treeDb to be queried for sibling paths
489
+ * @param merkleId - The treeId of the tree to be queried for sibling paths
490
+ */ async initializeFrontier(treeDb, merkleId) {
481
491
  // The frontier indices are sorted from the leaf to root
482
492
  const frontierIndices = EphemeralAvmTree.computeFrontierLeafIndices(Number(this.leafCount));
483
493
  // The frontier indices are level-based - i.e. index N at level L.
@@ -488,7 +498,7 @@ export class EphemeralAvmTree {
488
498
  // NOTE: This is terribly inefficient and we should probably change the DB API to allow for getting paths to a node
489
499
  const frontierValues = [];
490
500
  // These are leaf indexes that pass through the frontier nodes
491
- for (let i = 0; i < frontierIndices.length; i++) {
501
+ for(let i = 0; i < frontierIndices.length; i++){
492
502
  // Given the index to a frontier, we first xor it so we can get its sibling index at depth L
493
503
  // We then extend the path to that sibling index by shifting left the requisite number of times (for simplicity we just go left down the tree - it doesnt matter)
494
504
  // This provides us the leaf index such that if we ask for this leafIndex's sibling path, it will pass through the frontier node
@@ -507,159 +517,156 @@ export class EphemeralAvmTree {
507
517
  this.frontier = frontierValues;
508
518
  }
509
519
  /**
510
- * Computes the root of the tree
511
- */
512
- getRoot() {
520
+ * Computes the root of the tree
521
+ */ getRoot() {
513
522
  return this.hashTree(this.tree, this.depth);
514
523
  }
515
524
  /**
516
- * Recursively hashes the subtree
517
- * @param tree - The tree to be hashed
518
- * @param depth - The depth of the tree
519
- */
520
- async hashTree(tree, depth) {
521
- switch (tree.tag) {
522
- case TreeType.NODE: {
523
- return poseidon2Hash([
524
- await this.hashTree(tree.leftTree, depth - 1),
525
- await this.hashTree(tree.rightTree, depth - 1),
526
- ]);
527
- }
528
- case TreeType.LEAF: {
529
- return tree.value;
530
- }
525
+ * Recursively hashes the subtree
526
+ * @param tree - The tree to be hashed
527
+ * @param depth - The depth of the tree
528
+ */ async hashTree(tree, depth) {
529
+ switch(tree.tag){
530
+ case 1:
531
+ {
532
+ return poseidon2Hash([
533
+ await this.hashTree(tree.leftTree, depth - 1),
534
+ await this.hashTree(tree.rightTree, depth - 1)
535
+ ]);
536
+ }
537
+ case 0:
538
+ {
539
+ return tree.value;
540
+ }
531
541
  }
532
542
  }
533
543
  /**
534
- * Extracts the subtree from a given index and depth
535
- * @param index - The index of the node to be extracted
536
- * @param depth - The depth of the node to be extracted
537
- * @returns The subtree rooted at the index and depth
538
- */
539
- getNode(index, depth) {
544
+ * Extracts the subtree from a given index and depth
545
+ * @param index - The index of the node to be extracted
546
+ * @param depth - The depth of the node to be extracted
547
+ * @returns The subtree rooted at the index and depth
548
+ */ getNode(index, depth) {
540
549
  const path = this._derivePathBE(index, depth);
541
550
  const truncatedPath = path.slice(0, depth);
542
551
  truncatedPath.reverse();
543
552
  try {
544
553
  return this._getNode(truncatedPath, this.tree);
545
- }
546
- catch (e) {
554
+ } catch (e) {
547
555
  return undefined;
548
556
  }
549
557
  }
550
558
  /**
551
- * This is the recursive helper for getNode
552
- */
553
- _getNode(nodePath, tree) {
559
+ * This is the recursive helper for getNode
560
+ */ _getNode(nodePath, tree) {
554
561
  if (nodePath.length === 0) {
555
562
  return tree;
556
563
  }
557
- switch (tree.tag) {
558
- case TreeType.NODE:
564
+ switch(tree.tag){
565
+ case 1:
559
566
  return nodePath.pop() === 0 ? this._getNode(nodePath, tree.leftTree) : this._getNode(nodePath, tree.rightTree);
560
- case TreeType.LEAF:
567
+ case 0:
561
568
  throw new Error('Node not found');
562
569
  }
563
570
  }
564
571
  /** Our tree traversal uses an array of 1s and 0s to represent the path to a leaf and expects them to be in LE order
565
- * This helps with deriving it given an index and (optionally a depth)
566
- * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
567
- * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
568
- * @returns The path to the leaf in LE order
569
- */
570
- _derivePathLE(index, depth = this.depth) {
572
+ * This helps with deriving it given an index and (optionally a depth)
573
+ * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
574
+ * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
575
+ * @returns The path to the leaf in LE order
576
+ */ _derivePathLE(index, depth = this.depth) {
571
577
  return this._derivePathBE(index, depth).reverse();
572
578
  }
573
579
  /** Sometimes we want it in BE order, to make truncating easier
574
- * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
575
- * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
576
- * @returns The path to the leaf in LE order
577
- */
578
- _derivePathBE(index, depth = this.depth) {
579
- return index
580
- .toString(2)
581
- .padStart(depth, '0')
582
- .split('')
583
- .map(x => parseInt(x));
580
+ * @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
581
+ * @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
582
+ * @returns The path to the leaf in LE order
583
+ */ _derivePathBE(index, depth = this.depth) {
584
+ return index.toString(2).padStart(depth, '0').split('').map((x)=>parseInt(x));
584
585
  }
585
586
  /**
586
- * This is a recursive function that upserts a leaf into the tree given a path
587
- * @param value - The value of the leaf to be upserted
588
- * @param insertPath - The path to the leaf, this should be ordered from leaf to root (i.e. LE encoded)
589
- * @param depth - The depth of the tree
590
- * @param tree - The current tree
591
- * @param appendMode - If true we append the relevant zeroHashes to the tree as we traverse
592
- */
593
- _insertLeaf(value, insertPath, depth, tree) {
587
+ * This is a recursive function that upserts a leaf into the tree given a path
588
+ * @param value - The value of the leaf to be upserted
589
+ * @param insertPath - The path to the leaf, this should be ordered from leaf to root (i.e. LE encoded)
590
+ * @param depth - The depth of the tree
591
+ * @param tree - The current tree
592
+ * @param appendMode - If true we append the relevant zeroHashes to the tree as we traverse
593
+ */ _insertLeaf(value, insertPath, depth, tree) {
594
594
  if (insertPath.length > this.depth || depth > this.depth) {
595
595
  throw new Error('PATH EXCEEDS DEPTH');
596
596
  }
597
597
  if (depth === 0 || insertPath.length === 0) {
598
598
  return Leaf(value);
599
599
  }
600
- switch (tree.tag) {
601
- case TreeType.NODE: {
602
- return insertPath.pop() === 0
603
- ? Node(this._insertLeaf(value, insertPath, depth - 1, tree.leftTree), tree.rightTree)
604
- : Node(tree.leftTree, this._insertLeaf(value, insertPath, depth - 1, tree.rightTree));
605
- }
606
- case TreeType.LEAF: {
607
- const zeroLeaf = Leaf(this.zeroHashes[depth - 1]);
608
- return insertPath.pop() === 0
609
- ? Node(this._insertLeaf(value, insertPath, depth - 1, zeroLeaf), zeroLeaf)
610
- : Node(zeroLeaf, this._insertLeaf(value, insertPath, depth - 1, zeroLeaf));
611
- }
600
+ switch(tree.tag){
601
+ case 1:
602
+ {
603
+ return insertPath.pop() === 0 ? Node(this._insertLeaf(value, insertPath, depth - 1, tree.leftTree), tree.rightTree) : Node(tree.leftTree, this._insertLeaf(value, insertPath, depth - 1, tree.rightTree));
604
+ }
605
+ case 0:
606
+ {
607
+ const zeroLeaf = Leaf(this.zeroHashes[depth - 1]);
608
+ return insertPath.pop() === 0 ? Node(this._insertLeaf(value, insertPath, depth - 1, zeroLeaf), zeroLeaf) : Node(zeroLeaf, this._insertLeaf(value, insertPath, depth - 1, zeroLeaf));
609
+ }
612
610
  }
613
611
  }
614
612
  /* Recursive helper for getSiblingPath, this only looks inside the tree and does not resolve using
615
- * a DB. If a path is not found, it returns an error status that is expected to be handled by the caller
616
- * @param searchPath - The path to the leaf for which we would like the sibling pathin LE order
617
- * @param tree - The current tree
618
- * @param acc - The accumulated sibling path
619
- */
620
- async _getSiblingPath(searchPath, tree, acc) {
613
+ * a DB. If a path is not found, it returns an error status that is expected to be handled by the caller
614
+ * @param searchPath - The path to the leaf for which we would like the sibling pathin LE order
615
+ * @param tree - The current tree
616
+ * @param acc - The accumulated sibling path
617
+ */ async _getSiblingPath(searchPath, tree, acc) {
621
618
  // If we have reached the end of the path, we should be at a leaf or empty node
622
619
  // If it is a leaf, we check if the value is equal to the leaf value
623
620
  // If it is empty we check if the value is equal to zero
624
621
  if (searchPath.length === 0) {
625
- switch (tree.tag) {
626
- case TreeType.LEAF:
627
- return { path: acc, status: SiblingStatus.MEMBER };
628
- case TreeType.NODE:
629
- return { path: [], status: SiblingStatus.ERROR };
622
+ switch(tree.tag){
623
+ case 0:
624
+ return {
625
+ path: acc,
626
+ status: 0
627
+ };
628
+ case 1:
629
+ return {
630
+ path: [],
631
+ status: 2
632
+ };
630
633
  }
631
634
  }
632
635
  // Keep exploring here
633
- switch (tree.tag) {
634
- case TreeType.NODE: {
635
- // Look at the next element of the path to decided if we go left or right, note this mutates!
636
- return searchPath.pop() === 0
637
- ? await this._getSiblingPath(searchPath, tree.leftTree, [await this.hashTree(tree.rightTree, searchPath.length)].concat(acc))
638
- : await this._getSiblingPath(searchPath, tree.rightTree, [await this.hashTree(tree.leftTree, searchPath.length)].concat(acc));
639
- }
636
+ switch(tree.tag){
637
+ case 1:
638
+ {
639
+ // Look at the next element of the path to decided if we go left or right, note this mutates!
640
+ return searchPath.pop() === 0 ? await this._getSiblingPath(searchPath, tree.leftTree, [
641
+ await this.hashTree(tree.rightTree, searchPath.length)
642
+ ].concat(acc)) : await this._getSiblingPath(searchPath, tree.rightTree, [
643
+ await this.hashTree(tree.leftTree, searchPath.length)
644
+ ].concat(acc));
645
+ }
640
646
  // In these two situations we are exploring a subtree we dont have information about
641
647
  // We should return an error and look inside the DB
642
- case TreeType.LEAF:
643
- return { path: [], status: SiblingStatus.ERROR };
648
+ case 0:
649
+ return {
650
+ path: [],
651
+ status: 2
652
+ };
644
653
  }
645
654
  }
646
655
  }
647
656
  /**
648
657
  * Return the index of the key in the array, or index-1 if they key is not found.
649
- */
650
- function indexOrNextLowestInArray(key, arr) {
658
+ */ function indexOrNextLowestInArray(key, arr) {
651
659
  // We are looking for the index of the largest element in the array that is less than the key
652
660
  let start = 0;
653
661
  let end = arr.length;
654
662
  // Note that the easiest way is to increment the search key by 1 and then do a binary search
655
663
  const keyPlus1 = key.add(Fr.ONE);
656
- while (start < end) {
664
+ while(start < end){
657
665
  const mid = Math.floor((start + end) / 2);
658
666
  if (arr[mid].cmp(keyPlus1) < 0) {
659
667
  // The key + 1 is greater than the midpoint, so we can continue searching the top half
660
668
  start = mid + 1;
661
- }
662
- else {
669
+ } else {
663
670
  // The key + 1 is LT or EQ the arr element, so we can continue searching the bottom half
664
671
  end = mid;
665
672
  }
@@ -669,4 +676,3 @@ function indexOrNextLowestInArray(key, arr) {
669
676
  // greater than the key
670
677
  return start - 1;
671
678
  }
672
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avm_tree.js","sourceRoot":"","sources":["../../src/avm/avm_tree.ts"],"names":[],"mappings":"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"}