@aztec/simulator 0.66.0 → 0.67.1-devnet

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 (158) hide show
  1. package/dest/acvm/acvm.js +3 -3
  2. package/dest/acvm/oracle/oracle.d.ts +2 -2
  3. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  4. package/dest/acvm/oracle/oracle.js +5 -5
  5. package/dest/acvm/oracle/typed_oracle.d.ts +3 -3
  6. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  7. package/dest/acvm/oracle/typed_oracle.js +5 -5
  8. package/dest/acvm/serialize.js +2 -2
  9. package/dest/avm/avm_context.d.ts +2 -2
  10. package/dest/avm/avm_context.d.ts.map +1 -1
  11. package/dest/avm/avm_context.js +3 -4
  12. package/dest/avm/avm_execution_environment.d.ts +4 -6
  13. package/dest/avm/avm_execution_environment.d.ts.map +1 -1
  14. package/dest/avm/avm_execution_environment.js +8 -13
  15. package/dest/avm/avm_memory_types.d.ts +3 -3
  16. package/dest/avm/avm_memory_types.d.ts.map +1 -1
  17. package/dest/avm/avm_memory_types.js +29 -29
  18. package/dest/avm/avm_simulator.d.ts +3 -3
  19. package/dest/avm/avm_simulator.d.ts.map +1 -1
  20. package/dest/avm/avm_simulator.js +27 -15
  21. package/dest/avm/avm_tree.d.ts +2 -1
  22. package/dest/avm/avm_tree.d.ts.map +1 -1
  23. package/dest/avm/avm_tree.js +6 -2
  24. package/dest/avm/errors.d.ts +3 -3
  25. package/dest/avm/errors.d.ts.map +1 -1
  26. package/dest/avm/errors.js +8 -15
  27. package/dest/avm/fixtures/index.d.ts +2 -0
  28. package/dest/avm/fixtures/index.d.ts.map +1 -1
  29. package/dest/avm/fixtures/index.js +7 -7
  30. package/dest/avm/journal/journal.d.ts +31 -8
  31. package/dest/avm/journal/journal.d.ts.map +1 -1
  32. package/dest/avm/journal/journal.js +139 -42
  33. package/dest/avm/opcodes/conversion.d.ts +4 -4
  34. package/dest/avm/opcodes/conversion.d.ts.map +1 -1
  35. package/dest/avm/opcodes/conversion.js +22 -18
  36. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  37. package/dest/avm/opcodes/external_calls.js +4 -11
  38. package/dest/avm/opcodes/misc.d.ts.map +1 -1
  39. package/dest/avm/opcodes/misc.js +3 -3
  40. package/dest/avm/test_utils.d.ts +1 -0
  41. package/dest/avm/test_utils.d.ts.map +1 -1
  42. package/dest/avm/test_utils.js +4 -1
  43. package/dest/client/client_execution_context.d.ts +3 -3
  44. package/dest/client/client_execution_context.d.ts.map +1 -1
  45. package/dest/client/client_execution_context.js +15 -8
  46. package/dest/client/db_oracle.d.ts +9 -5
  47. package/dest/client/db_oracle.d.ts.map +1 -1
  48. package/dest/client/execution_note_cache.d.ts +9 -1
  49. package/dest/client/execution_note_cache.d.ts.map +1 -1
  50. package/dest/client/execution_note_cache.js +10 -3
  51. package/dest/client/index.d.ts +1 -0
  52. package/dest/client/index.d.ts.map +1 -1
  53. package/dest/client/index.js +2 -1
  54. package/dest/client/private_execution.d.ts.map +1 -1
  55. package/dest/client/private_execution.js +4 -4
  56. package/dest/client/simulator.d.ts.map +1 -1
  57. package/dest/client/simulator.js +4 -4
  58. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  59. package/dest/client/unconstrained_execution.js +3 -3
  60. package/dest/client/view_data_oracle.d.ts +4 -4
  61. package/dest/client/view_data_oracle.d.ts.map +1 -1
  62. package/dest/client/view_data_oracle.js +9 -9
  63. package/dest/common/debug_fn_name.d.ts +2 -2
  64. package/dest/common/debug_fn_name.d.ts.map +1 -1
  65. package/dest/common/debug_fn_name.js +8 -14
  66. package/dest/providers/acvm_native.js +4 -4
  67. package/dest/providers/acvm_wasm.js +2 -2
  68. package/dest/providers/factory.d.ts +2 -2
  69. package/dest/providers/factory.d.ts.map +1 -1
  70. package/dest/providers/factory.js +4 -4
  71. package/dest/providers/index.d.ts +0 -1
  72. package/dest/providers/index.d.ts.map +1 -1
  73. package/dest/providers/index.js +1 -2
  74. package/dest/public/enqueued_call_side_effect_trace.d.ts +15 -26
  75. package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
  76. package/dest/public/enqueued_call_side_effect_trace.js +42 -62
  77. package/dest/public/execution.d.ts +2 -2
  78. package/dest/public/execution.d.ts.map +1 -1
  79. package/dest/public/execution.js +1 -1
  80. package/dest/public/executor_metrics.d.ts.map +1 -1
  81. package/dest/public/executor_metrics.js +2 -5
  82. package/dest/public/fee_payment.d.ts.map +1 -1
  83. package/dest/public/fee_payment.js +4 -3
  84. package/dest/public/fixtures/index.d.ts +24 -1
  85. package/dest/public/fixtures/index.d.ts.map +1 -1
  86. package/dest/public/fixtures/index.js +17 -11
  87. package/dest/public/index.d.ts +0 -1
  88. package/dest/public/index.d.ts.map +1 -1
  89. package/dest/public/index.js +1 -2
  90. package/dest/public/public_db_sources.d.ts.map +1 -1
  91. package/dest/public/public_db_sources.js +10 -9
  92. package/dest/public/public_processor.d.ts +12 -12
  93. package/dest/public/public_processor.d.ts.map +1 -1
  94. package/dest/public/public_processor.js +80 -68
  95. package/dest/public/public_processor_metrics.d.ts +1 -1
  96. package/dest/public/public_processor_metrics.d.ts.map +1 -1
  97. package/dest/public/public_tx_context.d.ts +13 -10
  98. package/dest/public/public_tx_context.d.ts.map +1 -1
  99. package/dest/public/public_tx_context.js +72 -45
  100. package/dest/public/public_tx_simulator.d.ts +2 -2
  101. package/dest/public/public_tx_simulator.d.ts.map +1 -1
  102. package/dest/public/public_tx_simulator.js +54 -23
  103. package/dest/public/side_effect_trace_interface.d.ts +6 -18
  104. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  105. package/dest/public/transitional_adapters.d.ts +2 -2
  106. package/dest/public/transitional_adapters.d.ts.map +1 -1
  107. package/dest/public/transitional_adapters.js +10 -39
  108. package/package.json +16 -9
  109. package/src/acvm/acvm.ts +2 -2
  110. package/src/acvm/oracle/oracle.ts +4 -4
  111. package/src/acvm/oracle/typed_oracle.ts +5 -5
  112. package/src/acvm/serialize.ts +1 -1
  113. package/src/avm/avm_context.ts +2 -3
  114. package/src/avm/avm_execution_environment.ts +6 -31
  115. package/src/avm/avm_memory_types.ts +31 -29
  116. package/src/avm/avm_simulator.ts +28 -22
  117. package/src/avm/avm_tree.ts +6 -1
  118. package/src/avm/errors.ts +12 -14
  119. package/src/avm/fixtures/index.ts +6 -5
  120. package/src/avm/journal/journal.ts +230 -71
  121. package/src/avm/opcodes/conversion.ts +21 -16
  122. package/src/avm/opcodes/external_calls.ts +3 -19
  123. package/src/avm/opcodes/misc.ts +2 -2
  124. package/src/avm/test_utils.ts +4 -0
  125. package/src/client/client_execution_context.ts +19 -9
  126. package/src/client/db_oracle.ts +10 -5
  127. package/src/client/execution_note_cache.ts +13 -3
  128. package/src/client/index.ts +1 -0
  129. package/src/client/private_execution.ts +3 -3
  130. package/src/client/simulator.ts +4 -4
  131. package/src/client/unconstrained_execution.ts +2 -2
  132. package/src/client/view_data_oracle.ts +11 -9
  133. package/src/common/debug_fn_name.ts +7 -13
  134. package/src/providers/acvm_native.ts +3 -3
  135. package/src/providers/acvm_wasm.ts +2 -2
  136. package/src/providers/factory.ts +3 -3
  137. package/src/providers/index.ts +0 -1
  138. package/src/public/enqueued_call_side_effect_trace.ts +62 -86
  139. package/src/public/execution.ts +1 -2
  140. package/src/public/executor_metrics.ts +0 -4
  141. package/src/public/fee_payment.ts +3 -2
  142. package/src/public/fixtures/index.ts +25 -12
  143. package/src/public/index.ts +0 -1
  144. package/src/public/public_db_sources.ts +9 -8
  145. package/src/public/public_processor.ts +109 -105
  146. package/src/public/public_processor_metrics.ts +1 -1
  147. package/src/public/public_tx_context.ts +97 -50
  148. package/src/public/public_tx_simulator.ts +69 -38
  149. package/src/public/side_effect_trace_interface.ts +10 -16
  150. package/src/public/transitional_adapters.ts +12 -48
  151. package/dest/public/dual_side_effect_trace.d.ts +0 -77
  152. package/dest/public/dual_side_effect_trace.d.ts.map +0 -1
  153. package/dest/public/dual_side_effect_trace.js +0 -119
  154. package/dest/public/side_effect_trace.d.ts +0 -96
  155. package/dest/public/side_effect_trace.d.ts.map +0 -1
  156. package/dest/public/side_effect_trace.js +0 -309
  157. package/src/public/dual_side_effect_trace.ts +0 -242
  158. package/src/public/side_effect_trace.ts +0 -536
@@ -1,9 +1,9 @@
1
1
  import { MerkleTreeId } from '@aztec/circuit-types';
2
- import { SerializableContractInstance, } from '@aztec/circuits.js';
3
- import { computePublicDataTreeLeafSlot, siloNoteHash, siloNullifier } from '@aztec/circuits.js/hash';
2
+ import { AztecAddress, CANONICAL_AUTH_REGISTRY_ADDRESS, DEPLOYER_CONTRACT_ADDRESS, FEE_JUICE_ADDRESS, MULTI_CALL_ENTRYPOINT_ADDRESS, NullifierLeafPreimage, REGISTERER_CONTRACT_ADDRESS, ROUTER_ADDRESS, SerializableContractInstance, } from '@aztec/circuits.js';
3
+ import { computeNoteHashNonce, computePublicDataTreeLeafSlot, computeUniqueNoteHash, siloNoteHash, siloNullifier, } from '@aztec/circuits.js/hash';
4
4
  import { Fr } from '@aztec/foundation/fields';
5
5
  import { jsonStringify } from '@aztec/foundation/json-rpc';
6
- import { createDebugLogger } from '@aztec/foundation/log';
6
+ import { createLogger } from '@aztec/foundation/log';
7
7
  import { strict as assert } from 'assert';
8
8
  import { getPublicFunctionDebugName } from '../../common/debug_fn_name.js';
9
9
  import { AvmEphemeralForest } from '../avm_tree.js';
@@ -30,42 +30,43 @@ export class AvmPersistableStateManager {
30
30
  /** Nullifier set, including cached/recently-emitted nullifiers */
31
31
  nullifiers = new NullifierManager(worldStateDB), doMerkleOperations = false,
32
32
  /** Ephmeral forest for merkle tree operations */
33
- merkleTrees) {
33
+ merkleTrees, txHash) {
34
34
  this.worldStateDB = worldStateDB;
35
35
  this.trace = trace;
36
36
  this.publicStorage = publicStorage;
37
37
  this.nullifiers = nullifiers;
38
38
  this.doMerkleOperations = doMerkleOperations;
39
39
  this.merkleTrees = merkleTrees;
40
- this.log = createDebugLogger('aztec:avm_simulator:state_manager');
40
+ this.txHash = txHash;
41
+ this.log = createLogger('simulator:avm:state_manager');
41
42
  /** Make sure a forked state is never merged twice. */
42
43
  this.alreadyMergedIntoParent = false;
43
44
  }
44
45
  /**
45
46
  * Create a new state manager with some preloaded pending siloed nullifiers
46
47
  */
47
- static async newWithPendingSiloedNullifiers(worldStateDB, trace, pendingSiloedNullifiers, doMerkleOperations = false) {
48
+ static async newWithPendingSiloedNullifiers(worldStateDB, trace, pendingSiloedNullifiers, doMerkleOperations = false, txHash) {
48
49
  const parentNullifiers = NullifierManager.newWithPendingSiloedNullifiers(worldStateDB, pendingSiloedNullifiers);
49
50
  const ephemeralForest = await AvmEphemeralForest.create(worldStateDB.getMerkleInterface());
50
51
  return new AvmPersistableStateManager(worldStateDB, trace,
51
52
  /*publicStorage=*/ new PublicStorage(worldStateDB),
52
- /*nullifiers=*/ parentNullifiers.fork(), doMerkleOperations, ephemeralForest);
53
+ /*nullifiers=*/ parentNullifiers.fork(), doMerkleOperations, ephemeralForest, txHash);
53
54
  }
54
55
  /**
55
56
  * Create a new state manager
56
57
  */
57
- static async create(worldStateDB, trace, doMerkleOperations = false) {
58
+ static async create(worldStateDB, trace, doMerkleOperations = false, txHash) {
58
59
  const ephemeralForest = await AvmEphemeralForest.create(worldStateDB.getMerkleInterface());
59
60
  return new AvmPersistableStateManager(worldStateDB, trace,
60
61
  /*publicStorage=*/ new PublicStorage(worldStateDB),
61
62
  /*nullifiers=*/ new NullifierManager(worldStateDB),
62
- /*doMerkleOperations=*/ doMerkleOperations, ephemeralForest);
63
+ /*doMerkleOperations=*/ doMerkleOperations, ephemeralForest, txHash);
63
64
  }
64
65
  /**
65
66
  * Create a new state manager forked from this one
66
67
  */
67
68
  fork() {
68
- return new AvmPersistableStateManager(this.worldStateDB, this.trace.fork(), this.publicStorage.fork(), this.nullifiers.fork(), this.doMerkleOperations, this.merkleTrees.fork());
69
+ return new AvmPersistableStateManager(this.worldStateDB, this.trace.fork(), this.publicStorage.fork(), this.nullifiers.fork(), this.doMerkleOperations, this.merkleTrees.fork(), this.txHash);
69
70
  }
70
71
  /**
71
72
  * Accept forked world state modifications & traced side effects / hints
@@ -100,14 +101,15 @@ export class AvmPersistableStateManager {
100
101
  * @param slot - the slot in the contract's storage being written to
101
102
  * @param value - the value being written to the slot
102
103
  */
103
- async writeStorage(contractAddress, slot, value) {
104
+ async writeStorage(contractAddress, slot, value, protocolWrite = false) {
104
105
  this.log.debug(`Storage write (address=${contractAddress}, slot=${slot}): value=${value}`);
106
+ const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
107
+ this.log.debug(`leafSlot=${leafSlot}`);
105
108
  // Cache storage writes for later reference/reads
106
109
  this.publicStorage.write(contractAddress, slot, value);
107
- const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
108
110
  if (this.doMerkleOperations) {
109
111
  const result = await this.merkleTrees.writePublicStorage(leafSlot, value);
110
- assert(result !== undefined, 'Public data tree insertion error. You might want to disable skipMerkleOperations.');
112
+ assert(result !== undefined, 'Public data tree insertion error. You might want to disable doMerkleOperations.');
111
113
  this.log.debug(`Inserted public data tree leaf at leafSlot ${leafSlot}, value: ${value}`);
112
114
  const lowLeafInfo = result.lowWitness;
113
115
  const lowLeafPreimage = result.lowWitness.preimage;
@@ -117,11 +119,12 @@ export class AvmPersistableStateManager {
117
119
  let insertionPath;
118
120
  if (!result.update) {
119
121
  insertionPath = result.insertionPath;
122
+ assert(newLeafPreimage.value.equals(value), `Value mismatch when performing public data write (got value: ${value}, value in ephemeral tree: ${newLeafPreimage.value})`);
120
123
  }
121
- this.trace.tracePublicStorageWrite(contractAddress, slot, value, lowLeafPreimage, new Fr(lowLeafIndex), lowLeafPath, newLeafPreimage, insertionPath);
124
+ this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage, new Fr(lowLeafIndex), lowLeafPath, newLeafPreimage, insertionPath);
122
125
  }
123
126
  else {
124
- this.trace.tracePublicStorageWrite(contractAddress, slot, value);
127
+ this.trace.tracePublicStorageWrite(contractAddress, slot, value, protocolWrite);
125
128
  }
126
129
  }
127
130
  /**
@@ -135,6 +138,7 @@ export class AvmPersistableStateManager {
135
138
  const { value, cached } = await this.publicStorage.read(contractAddress, slot);
136
139
  this.log.debug(`Storage read (address=${contractAddress}, slot=${slot}): value=${value}, cached=${cached}`);
137
140
  const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
141
+ this.log.debug(`leafSlot=${leafSlot}`);
138
142
  if (this.doMerkleOperations) {
139
143
  // Get leaf if present, low leaf if absent
140
144
  // If leaf is present, hint/trace it. Otherwise, hint/trace the low leaf.
@@ -143,14 +147,17 @@ export class AvmPersistableStateManager {
143
147
  // In either case, we just want the sibling path to this leaf - it's up to the avm to distinguish if it's a low leaf or not
144
148
  const leafPath = await this.merkleTrees.getSiblingPath(MerkleTreeId.PUBLIC_DATA_TREE, leafIndex);
145
149
  const leafPreimage = preimage;
146
- this.log.debug(`leafPreimage.nextSlot: ${leafPreimage.nextSlot}, leafPreimage.nextIndex: ${Number(leafPreimage.nextIndex)}`);
147
150
  this.log.debug(`leafPreimage.slot: ${leafPreimage.slot}, leafPreimage.value: ${leafPreimage.value}`);
148
- if (!alreadyPresent) {
151
+ this.log.debug(`leafPreimage.nextSlot: ${leafPreimage.nextSlot}, leafPreimage.nextIndex: ${Number(leafPreimage.nextIndex)}`);
152
+ if (alreadyPresent) {
153
+ assert(leafPreimage.value.equals(value), `Value mismatch when performing public data read (got value: ${value}, value in ephemeral tree: ${leafPreimage.value})`);
154
+ }
155
+ else {
156
+ this.log.debug(`Slot has never been written before!`);
149
157
  // Sanity check that the leaf slot is skipped by low leaf when it doesn't exist
150
158
  assert(leafPreimage.slot.toBigInt() < leafSlot.toBigInt() &&
151
159
  (leafPreimage.nextIndex === 0n || leafPreimage.nextSlot.toBigInt() > leafSlot.toBigInt()), 'Public data tree low leaf should skip the target leaf slot when the target leaf does not exist or is the max value.');
152
160
  }
153
- this.log.debug(`Tracing storage leaf preimage slot=${slot}, leafSlot=${leafSlot}, value=${value}, nextKey=${leafPreimage.nextSlot}, nextIndex=${leafPreimage.nextIndex}`);
154
161
  // On non-existence, AVM circuit will need to recognize that leafPreimage.slot != leafSlot,
155
162
  // prove that this is a low leaf that skips leafSlot, and then prove membership of the leaf.
156
163
  this.trace.tracePublicStorageRead(contractAddress, slot, value, leafPreimage, new Fr(leafIndex), leafPath);
@@ -197,20 +204,37 @@ export class AvmPersistableStateManager {
197
204
  return Promise.resolve(exists);
198
205
  }
199
206
  /**
200
- * Write a note hash, trace the write.
207
+ * Write a raw note hash, silo it and make it unique, then trace the write.
201
208
  * @param noteHash - the unsiloed note hash to write
202
209
  */
203
210
  writeNoteHash(contractAddress, noteHash) {
204
- this.log.debug(`noteHashes(${contractAddress}) += @${noteHash}.`);
211
+ const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
212
+ this.writeSiloedNoteHash(siloedNoteHash);
213
+ }
214
+ /**
215
+ * Write a note hash, make it unique, trace the write.
216
+ * @param noteHash - the non unique note hash to write
217
+ */
218
+ writeSiloedNoteHash(noteHash) {
219
+ const txHash = Fr.fromBuffer(this.txHash.toBuffer());
220
+ const nonce = computeNoteHashNonce(txHash, this.trace.getNoteHashCount());
221
+ const uniqueNoteHash = computeUniqueNoteHash(nonce, noteHash);
222
+ this.writeUniqueNoteHash(uniqueNoteHash);
223
+ }
224
+ /**
225
+ * Write a note hash, trace the write.
226
+ * @param noteHash - the siloed unique hash to write
227
+ */
228
+ writeUniqueNoteHash(noteHash) {
229
+ this.log.debug(`noteHashes += @${noteHash}.`);
205
230
  if (this.doMerkleOperations) {
206
231
  // Should write a helper for this
207
232
  const leafIndex = new Fr(this.merkleTrees.treeMap.get(MerkleTreeId.NOTE_HASH_TREE).leafCount);
208
- const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
209
- const insertionPath = this.merkleTrees.appendNoteHash(siloedNoteHash);
210
- this.trace.traceNewNoteHash(contractAddress, noteHash, leafIndex, insertionPath);
233
+ const insertionPath = this.merkleTrees.appendNoteHash(noteHash);
234
+ this.trace.traceNewNoteHash(noteHash, leafIndex, insertionPath);
211
235
  }
212
236
  else {
213
- this.trace.traceNewNoteHash(contractAddress, noteHash);
237
+ this.trace.traceNewNoteHash(noteHash);
214
238
  }
215
239
  }
216
240
  /**
@@ -222,29 +246,49 @@ export class AvmPersistableStateManager {
222
246
  async checkNullifierExists(contractAddress, nullifier) {
223
247
  this.log.debug(`Checking existence of nullifier (address=${contractAddress}, nullifier=${nullifier})`);
224
248
  const siloedNullifier = siloNullifier(contractAddress, nullifier);
249
+ const [exists, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(siloedNullifier);
250
+ if (this.doMerkleOperations) {
251
+ this.trace.traceNullifierCheck(siloedNullifier, exists, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
252
+ }
253
+ else {
254
+ this.trace.traceNullifierCheck(siloedNullifier, exists);
255
+ }
256
+ return Promise.resolve(exists);
257
+ }
258
+ /**
259
+ * Helper to get membership information for a siloed nullifier when checking its existence.
260
+ * Optionally trace the nullifier check.
261
+ *
262
+ * @param siloedNullifier - the siloed nullifier to get membership information for
263
+ * @returns
264
+ * - exists - whether the nullifier exists in the nullifier set
265
+ * - leafOrLowLeafPreimage - the preimage of the nullifier leaf or its low-leaf if it doesn't exist
266
+ * - leafOrLowLeafIndex - the leaf index of the nullifier leaf or its low-leaf if it doesn't exist
267
+ * - leafOrLowLeafPath - the sibling path of the nullifier leaf or its low-leaf if it doesn't exist
268
+ */
269
+ async getNullifierMembership(siloedNullifier) {
225
270
  const [exists, isPending, _] = await this.nullifiers.checkExists(siloedNullifier);
226
- this.log.debug(`Checked siloed nullifier ${siloedNullifier} (exists=${exists}, pending=${isPending})`);
271
+ this.log.debug(`Checked siloed nullifier ${siloedNullifier} (exists=${exists}), pending=${isPending}`);
227
272
  if (this.doMerkleOperations) {
228
273
  // Get leaf if present, low leaf if absent
229
274
  // If leaf is present, hint/trace it. Otherwise, hint/trace the low leaf.
230
275
  const { preimage, index: leafIndex, alreadyPresent, } = await this.merkleTrees.getLeafOrLowLeafInfo(MerkleTreeId.NULLIFIER_TREE, siloedNullifier);
231
276
  const leafPreimage = preimage;
232
277
  const leafPath = await this.merkleTrees.getSiblingPath(MerkleTreeId.NULLIFIER_TREE, leafIndex);
233
- assert(alreadyPresent == exists, 'WorldStateDB contains nullifier leaf, but merkle tree does not.... This is a bug!');
278
+ assert(alreadyPresent == exists, 'WorldStateDB contains nullifier leaf, but merkle tree does not (or vice versa).... This is a bug!');
234
279
  if (exists) {
235
280
  this.log.debug(`Siloed nullifier ${siloedNullifier} exists at leafIndex=${leafIndex}`);
236
281
  }
237
282
  else {
238
283
  // Sanity check that the leaf value is skipped by low leaf when it doesn't exist
239
- assert(siloedNullifier.toBigInt() > leafPreimage.nullifier.toBigInt() &&
240
- siloedNullifier.toBigInt() < leafPreimage.nextNullifier.toBigInt(), 'Nullifier tree low leaf should skip the target leaf nullifier when the target leaf does not exist.');
284
+ assert(leafPreimage.nullifier.toBigInt() < siloedNullifier.toBigInt() &&
285
+ (leafPreimage.nextIndex === 0n || leafPreimage.nextNullifier.toBigInt() > siloedNullifier.toBigInt()), 'Nullifier tree low leaf should skip the target leaf nullifier when the target leaf does not exist.');
241
286
  }
242
- this.trace.traceNullifierCheck(siloedNullifier, exists, leafPreimage, new Fr(leafIndex), leafPath);
287
+ return [exists, leafPreimage, new Fr(leafIndex), leafPath];
243
288
  }
244
289
  else {
245
- this.trace.traceNullifierCheck(siloedNullifier, exists);
290
+ return [exists, NullifierLeafPreimage.empty(), Fr.ZERO, []];
246
291
  }
247
- return Promise.resolve(exists);
248
292
  }
249
293
  /**
250
294
  * Write a nullifier to the nullifier set, trace the write.
@@ -355,16 +399,38 @@ export class AvmPersistableStateManager {
355
399
  this.log.debug(`Getting contract instance for address ${contractAddress}`);
356
400
  const instanceWithAddress = await this.worldStateDB.getContractInstance(contractAddress);
357
401
  const exists = instanceWithAddress !== undefined;
358
- // TODO: nullifier check!
402
+ let [existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = [
403
+ exists,
404
+ NullifierLeafPreimage.empty(),
405
+ Fr.ZERO,
406
+ new Array(),
407
+ ];
408
+ if (!contractAddressIsCanonical(contractAddress)) {
409
+ const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
410
+ [existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(
411
+ /*siloedNullifier=*/ contractAddressNullifier);
412
+ assert(exists == existsInTree, 'WorldStateDB contains contract instance, but nullifier tree does not contain contract address (or vice versa).... This is a bug!');
413
+ }
359
414
  if (exists) {
360
415
  const instance = new SerializableContractInstance(instanceWithAddress);
361
416
  this.log.debug(`Got contract instance (address=${contractAddress}): exists=${exists}, instance=${jsonStringify(instance)}`);
362
- this.trace.traceGetContractInstance(contractAddress, exists, instance);
417
+ if (this.doMerkleOperations) {
418
+ this.trace.traceGetContractInstance(contractAddress, exists, instance, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
419
+ }
420
+ else {
421
+ this.trace.traceGetContractInstance(contractAddress, exists, instance);
422
+ }
363
423
  return Promise.resolve(instance);
364
424
  }
365
425
  else {
366
426
  this.log.debug(`Contract instance NOT FOUND (address=${contractAddress})`);
367
- this.trace.traceGetContractInstance(contractAddress, exists);
427
+ if (this.doMerkleOperations) {
428
+ this.trace.traceGetContractInstance(contractAddress, exists,
429
+ /*instance=*/ undefined, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
430
+ }
431
+ else {
432
+ this.trace.traceGetContractInstance(contractAddress, exists);
433
+ }
368
434
  return Promise.resolve(undefined);
369
435
  }
370
436
  }
@@ -375,6 +441,18 @@ export class AvmPersistableStateManager {
375
441
  this.log.debug(`Getting bytecode for contract address ${contractAddress}`);
376
442
  const instanceWithAddress = await this.worldStateDB.getContractInstance(contractAddress);
377
443
  const exists = instanceWithAddress !== undefined;
444
+ let [existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = [
445
+ exists,
446
+ NullifierLeafPreimage.empty(),
447
+ Fr.ZERO,
448
+ new Array(),
449
+ ];
450
+ if (!contractAddressIsCanonical(contractAddress)) {
451
+ const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractAddress.toField());
452
+ [existsInTree, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath] = await this.getNullifierMembership(
453
+ /*siloedNullifier=*/ contractAddressNullifier);
454
+ assert(exists == existsInTree, 'WorldStateDB contains contract instance, but nullifier tree does not contain contract address (or vice versa).... This is a bug!');
455
+ }
378
456
  if (exists) {
379
457
  const instance = new SerializableContractInstance(instanceWithAddress);
380
458
  const contractClass = await this.worldStateDB.getContractClass(instance.contractClassId);
@@ -386,24 +464,43 @@ export class AvmPersistableStateManager {
386
464
  privateFunctionsRoot: contractClass.privateFunctionsRoot,
387
465
  publicBytecodeCommitment: bytecodeCommitment,
388
466
  };
389
- this.trace.traceGetBytecode(contractAddress, exists, contractClass.packedBytecode, instance, contractClassPreimage);
467
+ if (this.doMerkleOperations) {
468
+ this.trace.traceGetBytecode(contractAddress, exists, contractClass.packedBytecode, instance, contractClassPreimage, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
469
+ }
470
+ else {
471
+ this.trace.traceGetBytecode(contractAddress, exists, contractClass.packedBytecode, instance, contractClassPreimage);
472
+ }
390
473
  return contractClass.packedBytecode;
391
474
  }
392
475
  else {
393
476
  // If the contract instance is not found, we assume it has not been deployed.
394
477
  // It doesnt matter what the values of the contract instance are in this case, as long as we tag it with exists=false.
395
478
  // This will hint to the avm circuit to just perform the non-membership check on the address and disregard the bytecode hash
396
- this.trace.traceGetBytecode(contractAddress, exists); // bytecode, instance, class undefined
479
+ if (this.doMerkleOperations) {
480
+ this.trace.traceGetBytecode(contractAddress, exists,
481
+ /*instance=*/ undefined,
482
+ /*contractClass=*/ undefined,
483
+ /*bytecode=*/ undefined, leafOrLowLeafPreimage, leafOrLowLeafIndex, leafOrLowLeafPath);
484
+ }
485
+ else {
486
+ this.trace.traceGetBytecode(contractAddress, exists); // bytecode, instance, class undefined
487
+ }
397
488
  return undefined;
398
489
  }
399
490
  }
400
- async traceNestedCall(forkedState, nestedEnvironment, startGasLeft, bytecode, avmCallResults) {
401
- const functionName = await getPublicFunctionDebugName(this.worldStateDB, nestedEnvironment.address, nestedEnvironment.functionSelector, nestedEnvironment.calldata);
402
- this.log.verbose(`[AVM] Tracing nested external contract call ${functionName}`);
403
- this.trace.traceNestedCall(forkedState.trace, nestedEnvironment, startGasLeft, bytecode, avmCallResults, functionName);
404
- }
405
491
  traceEnqueuedCall(publicCallRequest, calldata, reverted) {
406
492
  this.trace.traceEnqueuedCall(publicCallRequest, calldata, reverted);
407
493
  }
494
+ async getPublicFunctionDebugName(avmEnvironment) {
495
+ return await getPublicFunctionDebugName(this.worldStateDB, avmEnvironment.address, avmEnvironment.calldata);
496
+ }
497
+ }
498
+ function contractAddressIsCanonical(contractAddress) {
499
+ return (contractAddress.equals(AztecAddress.fromNumber(CANONICAL_AUTH_REGISTRY_ADDRESS)) ||
500
+ contractAddress.equals(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS)) ||
501
+ contractAddress.equals(AztecAddress.fromNumber(REGISTERER_CONTRACT_ADDRESS)) ||
502
+ contractAddress.equals(AztecAddress.fromNumber(MULTI_CALL_ENTRYPOINT_ADDRESS)) ||
503
+ contractAddress.equals(AztecAddress.fromNumber(FEE_JUICE_ADDRESS)) ||
504
+ contractAddress.equals(AztecAddress.fromNumber(ROUTER_ADDRESS)));
408
505
  }
409
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":"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"}
506
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../../src/avm/journal/journal.ts"],"names":[],"mappings":"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"}
@@ -4,14 +4,14 @@ import { Instruction } from './instruction.js';
4
4
  export declare class ToRadixBE extends Instruction {
5
5
  private indirect;
6
6
  private srcOffset;
7
- private dstOffset;
8
7
  private radixOffset;
9
- private numLimbs;
10
- private outputBits;
8
+ private numLimbsOffset;
9
+ private outputBitsOffset;
10
+ private dstOffset;
11
11
  static type: string;
12
12
  static readonly opcode: Opcode;
13
13
  static readonly wireFormat: OperandType[];
14
- constructor(indirect: number, srcOffset: number, dstOffset: number, radixOffset: number, numLimbs: number, outputBits: number);
14
+ constructor(indirect: number, srcOffset: number, radixOffset: number, numLimbsOffset: number, outputBitsOffset: number, dstOffset: number);
15
15
  execute(context: AvmContext): Promise<void>;
16
16
  }
17
17
  //# sourceMappingURL=conversion.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"conversion.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IAgBtC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,UAAU;IApBpB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAoB;IAGlD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAQvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM;IAKf,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAkCzD"}
1
+ {"version":3,"file":"conversion.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/conversion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAGpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IAgBtC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,SAAS;IApBnB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAoB;IAGlD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAQvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM;IAKd,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAuCzD"}
@@ -4,43 +4,47 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization.
4
4
  import { Addressing } from './addressing_mode.js';
5
5
  import { Instruction } from './instruction.js';
6
6
  export class ToRadixBE extends Instruction {
7
- constructor(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits) {
7
+ constructor(indirect, srcOffset, radixOffset, numLimbsOffset, outputBitsOffset, dstOffset) {
8
8
  super();
9
9
  this.indirect = indirect;
10
10
  this.srcOffset = srcOffset;
11
- this.dstOffset = dstOffset;
12
11
  this.radixOffset = radixOffset;
13
- this.numLimbs = numLimbs;
14
- this.outputBits = outputBits;
12
+ this.numLimbsOffset = numLimbsOffset;
13
+ this.outputBitsOffset = outputBitsOffset;
14
+ this.dstOffset = dstOffset;
15
15
  }
16
16
  async execute(context) {
17
17
  const memory = context.machineState.memory.track(this.type);
18
- const operands = [this.srcOffset, this.dstOffset, this.radixOffset];
18
+ const operands = [this.srcOffset, this.radixOffset, this.numLimbsOffset, this.outputBitsOffset, this.dstOffset];
19
19
  const addressing = Addressing.fromWire(this.indirect, operands.length);
20
- const [srcOffset, dstOffset, radixOffset] = addressing.resolve(operands, memory);
21
- context.machineState.consumeGas(this.gasCost(this.numLimbs));
20
+ const [srcOffset, radixOffset, numLimbsOffset, outputBitsOffset, dstOffset] = addressing.resolve(operands, memory);
22
21
  // The radix gadget only takes in a Field
23
22
  memory.checkTag(TypeTag.FIELD, srcOffset);
24
23
  memory.checkTag(TypeTag.UINT32, radixOffset);
24
+ memory.checkTag(TypeTag.UINT32, numLimbsOffset);
25
+ memory.checkTag(TypeTag.UINT1, outputBitsOffset);
26
+ const numLimbs = memory.get(numLimbsOffset).toNumber();
27
+ context.machineState.consumeGas(this.gasCost(numLimbs));
28
+ const outputBits = memory.get(outputBitsOffset).toNumber();
25
29
  let value = memory.get(srcOffset).toBigInt();
26
30
  const radix = memory.get(radixOffset).toBigInt();
27
- if (this.numLimbs < 1) {
28
- throw new InstructionExecutionError(`ToRadixBE instruction's numLimbs should be > 0 (was ${this.numLimbs})`);
31
+ if (numLimbs < 1) {
32
+ throw new InstructionExecutionError(`ToRadixBE instruction's numLimbs should be > 0 (was ${numLimbs})`);
29
33
  }
30
34
  if (radix > 256) {
31
35
  throw new InstructionExecutionError(`ToRadixBE instruction's radix should be <= 256 (was ${radix})`);
32
36
  }
33
37
  const radixBN = BigInt(radix);
34
- const limbArray = new Array(this.numLimbs);
35
- for (let i = this.numLimbs - 1; i >= 0; i--) {
38
+ const limbArray = new Array(numLimbs);
39
+ for (let i = numLimbs - 1; i >= 0; i--) {
36
40
  const limb = value % radixBN;
37
41
  limbArray[i] = limb;
38
42
  value /= radixBN;
39
43
  }
40
- const outputType = this.outputBits != 0 ? Uint1 : Uint8;
44
+ const outputType = outputBits != 0 ? Uint1 : Uint8;
41
45
  const res = limbArray.map(byte => new outputType(byte));
42
46
  memory.setSlice(dstOffset, res);
43
- memory.assert({ reads: 2, writes: this.numLimbs, addressing });
47
+ memory.assert({ reads: 4, writes: numLimbs, addressing });
44
48
  }
45
49
  }
46
50
  ToRadixBE.type = 'TORADIXLE';
@@ -48,11 +52,11 @@ ToRadixBE.opcode = Opcode.TORADIXBE;
48
52
  // Informs (de)serialization. See Instruction.deserialize.
49
53
  ToRadixBE.wireFormat = [
50
54
  OperandType.UINT8, // Opcode
51
- OperandType.UINT8, // Indirect
55
+ OperandType.UINT16, // Indirect
52
56
  OperandType.UINT16, // src memory address
53
- OperandType.UINT16, // dst memory address
54
57
  OperandType.UINT16, // radix memory address
55
- OperandType.UINT16, // number of limbs (Immediate)
56
- OperandType.UINT8, // output is in "bits" mode (Immediate - Uint1 still takes up a whole byte)
58
+ OperandType.UINT16, // number of limbs address
59
+ OperandType.UINT16, // output is in "bits" mode memory address (boolean/Uint1 is stored)
60
+ OperandType.UINT16, // dst memory address
57
61
  ];
58
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9jb252ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUN6RCxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQ3BGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsTUFBTSxPQUFPLFNBQVUsU0FBUSxXQUFXO0lBZXhDLFlBQ1UsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIsU0FBaUIsRUFDakIsV0FBbUIsRUFDbkIsUUFBZ0IsRUFDaEIsVUFBa0I7UUFFMUIsS0FBSyxFQUFFLENBQUM7UUFQQSxhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQ2hCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFDakIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixnQkFBVyxHQUFYLFdBQVcsQ0FBUTtRQUNuQixhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQ2hCLGVBQVUsR0FBVixVQUFVLENBQVE7SUFHNUIsQ0FBQztJQUVNLEtBQUssQ0FBQyxPQUFPLENBQUMsT0FBbUI7UUFDdEMsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUM1RCxNQUFNLFFBQVEsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLFNBQVMsRUFBRSxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEUsTUFBTSxVQUFVLEdBQUcsVUFBVSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN2RSxNQUFNLENBQUMsU0FBUyxFQUFFLFNBQVMsRUFBRSxXQUFXLENBQUMsR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNqRixPQUFPLENBQUMsWUFBWSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBRTdELHlDQUF5QztRQUN6QyxNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDMUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxDQUFDO1FBRTdDLElBQUksS0FBSyxHQUFXLE1BQU0sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDckQsTUFBTSxLQUFLLEdBQVcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUN6RCxJQUFJLElBQUksQ0FBQyxRQUFRLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDdEIsTUFBTSxJQUFJLHlCQUF5QixDQUFDLHVEQUF1RCxJQUFJLENBQUMsUUFBUSxHQUFHLENBQUMsQ0FBQztRQUMvRyxDQUFDO1FBQ0QsSUFBSSxLQUFLLEdBQUcsR0FBRyxFQUFFLENBQUM7WUFDaEIsTUFBTSxJQUFJLHlCQUF5QixDQUFDLHVEQUF1RCxLQUFLLEdBQUcsQ0FBQyxDQUFDO1FBQ3ZHLENBQUM7UUFDRCxNQUFNLE9BQU8sR0FBVyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDdEMsTUFBTSxTQUFTLEdBQUcsSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBRTNDLEtBQUssSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLFFBQVEsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDO1lBQzVDLE1BQU0sSUFBSSxHQUFHLEtBQUssR0FBRyxPQUFPLENBQUM7WUFDN0IsU0FBUyxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQztZQUNwQixLQUFLLElBQUksT0FBTyxDQUFDO1FBQ25CLENBQUM7UUFFRCxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsVUFBVSxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7UUFDeEQsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7UUFDeEQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFFaEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksQ0FBQyxRQUFRLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztJQUNqRSxDQUFDOztBQTFETSxjQUFJLEdBQVcsV0FBVyxDQUFDO0FBQ2xCLGdCQUFNLEdBQVcsTUFBTSxDQUFDLFNBQVMsQ0FBQztBQUVsRCwwREFBMEQ7QUFDMUMsb0JBQVUsR0FBa0I7SUFDMUMsV0FBVyxDQUFDLEtBQUssRUFBRSxTQUFTO0lBQzVCLFdBQVcsQ0FBQyxLQUFLLEVBQUUsV0FBVztJQUM5QixXQUFXLENBQUMsTUFBTSxFQUFFLHFCQUFxQjtJQUN6QyxXQUFXLENBQUMsTUFBTSxFQUFFLHFCQUFxQjtJQUN6QyxXQUFXLENBQUMsTUFBTSxFQUFFLHVCQUF1QjtJQUMzQyxXQUFXLENBQUMsTUFBTSxFQUFFLDhCQUE4QjtJQUNsRCxXQUFXLENBQUMsS0FBSyxFQUFFLDJFQUEyRTtDQUMvRixDQUFDIn0=
62
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9jb252ZXJzaW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sRUFBRSx5QkFBeUIsRUFBRSxNQUFNLGNBQWMsQ0FBQztBQUN6RCxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQ3BGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFL0MsTUFBTSxPQUFPLFNBQVUsU0FBUSxXQUFXO0lBZXhDLFlBQ1UsUUFBZ0IsRUFDaEIsU0FBaUIsRUFDakIsV0FBbUIsRUFDbkIsY0FBc0IsRUFDdEIsZ0JBQXdCLEVBQ3hCLFNBQWlCO1FBRXpCLEtBQUssRUFBRSxDQUFDO1FBUEEsYUFBUSxHQUFSLFFBQVEsQ0FBUTtRQUNoQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBQ2pCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQ25CLG1CQUFjLEdBQWQsY0FBYyxDQUFRO1FBQ3RCLHFCQUFnQixHQUFoQixnQkFBZ0IsQ0FBUTtRQUN4QixjQUFTLEdBQVQsU0FBUyxDQUFRO0lBRzNCLENBQUM7SUFFTSxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQW1CO1FBQ3RDLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDNUQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLGNBQWMsRUFBRSxJQUFJLENBQUMsZ0JBQWdCLEVBQUUs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
@@ -1 +1 @@
1
- {"version":3,"file":"external_calls.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,uBAAe,YAAa,SAAQ,WAAW;IAa3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa;IAhBvB,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAQvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM;IAKlB,OAAO,CAAC,OAAO,EAAE,UAAU;IAkFxC,aAA6B,IAAI,IAAI,MAAM,GAAG,YAAY,CAAC;CAC5D;AAED,qBAAa,IAAK,SAAQ,YAAY;IACpC,MAAM,CAAC,IAAI,SAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAe;IAE7C,IAAW,IAAI,WAEd;CACF;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,MAAM,CAAC,IAAI,eAAyB;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAqB;IAEnD,IAAW,IAAI,iBAEd;CACF;AAED,qBAAa,MAAO,SAAQ,WAAW;IAWzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,gBAAgB;IAV5F,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAE/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,gBAAgB,EAAE,MAAM;IAIvF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxC,SAAS,IAAI,OAAO;CAGrC;AAED,qBAAa,MAAO,SAAQ,WAAW;IAiBzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,aAAa;IAhBzF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAEjD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,CAKxC;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE,CAKzC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,aAAa,EAAE,MAAM;IAIpF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxC,SAAS,IAAI,OAAO;CAGrC"}
1
+ {"version":3,"file":"external_calls.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/external_calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,uBAAe,YAAa,SAAQ,WAAW;IAa3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,aAAa;IAhBvB,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAQvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM;IAKlB,OAAO,CAAC,OAAO,EAAE,UAAU;IAoExC,aAA6B,IAAI,IAAI,MAAM,GAAG,YAAY,CAAC;CAC5D;AAED,qBAAa,IAAK,SAAQ,YAAY;IACpC,MAAM,CAAC,IAAI,SAAmB;IAC9B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAe;IAE7C,IAAW,IAAI,WAEd;CACF;AAED,qBAAa,UAAW,SAAQ,YAAY;IAC1C,MAAM,CAAC,IAAI,eAAyB;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAqB;IAEnD,IAAW,IAAI,iBAEd;CACF;AAED,qBAAa,MAAO,SAAQ,WAAW;IAWzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,gBAAgB;IAV5F,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAE/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAKvC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,gBAAgB,EAAE,MAAM;IAIvF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxC,SAAS,IAAI,OAAO;CAGrC;AAED,qBAAa,MAAO,SAAQ,WAAW;IAiBzB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,YAAY;IAAU,OAAO,CAAC,aAAa;IAhBzF,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAEjD,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,EAAE,CAKxC;IACF,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE,CAKzC;gBAEkB,QAAQ,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM,EAAU,aAAa,EAAE,MAAM;IAIpF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBxC,SAAS,IAAI,OAAO;CAGrC"}