@aztec/simulator 0.65.2 → 0.67.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (136) hide show
  1. package/dest/acvm/acvm.js +3 -3
  2. package/dest/acvm/oracle/oracle.d.ts +1 -4
  3. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  4. package/dest/acvm/oracle/oracle.js +3 -19
  5. package/dest/acvm/oracle/typed_oracle.d.ts +2 -7
  6. package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
  7. package/dest/acvm/oracle/typed_oracle.js +3 -12
  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 +2 -2
  16. package/dest/avm/avm_memory_types.d.ts.map +1 -1
  17. package/dest/avm/avm_memory_types.js +7 -7
  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 +26 -16
  21. package/dest/avm/avm_tree.d.ts +31 -14
  22. package/dest/avm/avm_tree.d.ts.map +1 -1
  23. package/dest/avm/avm_tree.js +34 -40
  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.map +1 -1
  28. package/dest/avm/fixtures/index.js +4 -4
  29. package/dest/avm/journal/journal.d.ts +15 -4
  30. package/dest/avm/journal/journal.d.ts.map +1 -1
  31. package/dest/avm/journal/journal.js +121 -36
  32. package/dest/avm/opcodes/environment_getters.d.ts +10 -11
  33. package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
  34. package/dest/avm/opcodes/environment_getters.js +12 -15
  35. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  36. package/dest/avm/opcodes/external_calls.js +4 -11
  37. package/dest/avm/opcodes/misc.d.ts.map +1 -1
  38. package/dest/avm/opcodes/misc.js +3 -3
  39. package/dest/client/client_execution_context.d.ts +6 -33
  40. package/dest/client/client_execution_context.d.ts.map +1 -1
  41. package/dest/client/client_execution_context.js +18 -54
  42. package/dest/client/db_oracle.d.ts +2 -2
  43. package/dest/client/db_oracle.d.ts.map +1 -1
  44. package/dest/client/execution_note_cache.d.ts +9 -1
  45. package/dest/client/execution_note_cache.d.ts.map +1 -1
  46. package/dest/client/execution_note_cache.js +10 -3
  47. package/dest/client/private_execution.d.ts.map +1 -1
  48. package/dest/client/private_execution.js +5 -7
  49. package/dest/client/simulator.d.ts.map +1 -1
  50. package/dest/client/simulator.js +4 -4
  51. package/dest/client/unconstrained_execution.d.ts.map +1 -1
  52. package/dest/client/unconstrained_execution.js +3 -3
  53. package/dest/client/view_data_oracle.d.ts +2 -2
  54. package/dest/client/view_data_oracle.d.ts.map +1 -1
  55. package/dest/client/view_data_oracle.js +5 -6
  56. package/dest/common/debug_fn_name.d.ts +2 -2
  57. package/dest/common/debug_fn_name.d.ts.map +1 -1
  58. package/dest/common/debug_fn_name.js +8 -14
  59. package/dest/providers/acvm_native.js +4 -4
  60. package/dest/providers/factory.d.ts +2 -2
  61. package/dest/providers/factory.d.ts.map +1 -1
  62. package/dest/providers/factory.js +4 -4
  63. package/dest/public/enqueued_call_side_effect_trace.d.ts +11 -23
  64. package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
  65. package/dest/public/enqueued_call_side_effect_trace.js +51 -72
  66. package/dest/public/executor_metrics.d.ts.map +1 -1
  67. package/dest/public/executor_metrics.js +2 -5
  68. package/dest/public/fixtures/index.d.ts +25 -7
  69. package/dest/public/fixtures/index.d.ts.map +1 -1
  70. package/dest/public/fixtures/index.js +20 -17
  71. package/dest/public/index.d.ts +0 -1
  72. package/dest/public/index.d.ts.map +1 -1
  73. package/dest/public/index.js +1 -2
  74. package/dest/public/public_db_sources.d.ts.map +1 -1
  75. package/dest/public/public_db_sources.js +30 -16
  76. package/dest/public/public_processor.d.ts +7 -8
  77. package/dest/public/public_processor.d.ts.map +1 -1
  78. package/dest/public/public_processor.js +37 -26
  79. package/dest/public/public_processor_metrics.d.ts +1 -1
  80. package/dest/public/public_processor_metrics.d.ts.map +1 -1
  81. package/dest/public/public_tx_context.d.ts +13 -14
  82. package/dest/public/public_tx_context.d.ts.map +1 -1
  83. package/dest/public/public_tx_context.js +63 -54
  84. package/dest/public/public_tx_simulator.d.ts +2 -2
  85. package/dest/public/public_tx_simulator.d.ts.map +1 -1
  86. package/dest/public/public_tx_simulator.js +43 -25
  87. package/dest/public/side_effect_trace_interface.d.ts +4 -17
  88. package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
  89. package/dest/public/transitional_adapters.d.ts +2 -6
  90. package/dest/public/transitional_adapters.d.ts.map +1 -1
  91. package/dest/public/transitional_adapters.js +29 -88
  92. package/package.json +16 -9
  93. package/src/acvm/acvm.ts +2 -2
  94. package/src/acvm/oracle/oracle.ts +2 -32
  95. package/src/acvm/oracle/typed_oracle.ts +3 -20
  96. package/src/acvm/serialize.ts +1 -1
  97. package/src/avm/avm_context.ts +2 -3
  98. package/src/avm/avm_execution_environment.ts +6 -31
  99. package/src/avm/avm_memory_types.ts +6 -6
  100. package/src/avm/avm_simulator.ts +28 -23
  101. package/src/avm/avm_tree.ts +67 -53
  102. package/src/avm/errors.ts +12 -14
  103. package/src/avm/fixtures/index.ts +2 -3
  104. package/src/avm/journal/journal.ts +206 -68
  105. package/src/avm/opcodes/environment_getters.ts +1 -4
  106. package/src/avm/opcodes/external_calls.ts +3 -19
  107. package/src/avm/opcodes/misc.ts +2 -2
  108. package/src/client/client_execution_context.ts +22 -68
  109. package/src/client/db_oracle.ts +2 -2
  110. package/src/client/execution_note_cache.ts +13 -3
  111. package/src/client/private_execution.ts +3 -7
  112. package/src/client/simulator.ts +4 -4
  113. package/src/client/unconstrained_execution.ts +2 -2
  114. package/src/client/view_data_oracle.ts +5 -6
  115. package/src/common/debug_fn_name.ts +7 -13
  116. package/src/providers/acvm_native.ts +3 -3
  117. package/src/providers/factory.ts +3 -3
  118. package/src/public/enqueued_call_side_effect_trace.ts +68 -90
  119. package/src/public/executor_metrics.ts +0 -4
  120. package/src/public/fixtures/index.ts +28 -17
  121. package/src/public/index.ts +0 -1
  122. package/src/public/public_db_sources.ts +32 -19
  123. package/src/public/public_processor.ts +52 -55
  124. package/src/public/public_processor_metrics.ts +1 -1
  125. package/src/public/public_tx_context.ts +89 -76
  126. package/src/public/public_tx_simulator.ts +58 -49
  127. package/src/public/side_effect_trace_interface.ts +8 -15
  128. package/src/public/transitional_adapters.ts +43 -215
  129. package/dest/public/dual_side_effect_trace.d.ts +0 -77
  130. package/dest/public/dual_side_effect_trace.d.ts.map +0 -1
  131. package/dest/public/dual_side_effect_trace.js +0 -119
  132. package/dest/public/side_effect_trace.d.ts +0 -96
  133. package/dest/public/side_effect_trace.d.ts.map +0 -1
  134. package/dest/public/side_effect_trace.js +0 -309
  135. package/src/public/dual_side_effect_trace.ts +0 -242
  136. package/src/public/side_effect_trace.ts +0 -536
@@ -1,26 +1,27 @@
1
1
  import { UnencryptedFunctionL2Logs, UnencryptedL2Log } from '@aztec/circuit-types';
2
- import { AvmAccumulatedData, AvmAppendTreeHint, AvmCircuitPublicInputs, AvmContractBytecodeHints, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmExternalCallHint, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, EthAddress, Gas, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, LogHash, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NoteHash, Nullifier, NullifierLeafPreimage, PUBLIC_DATA_TREE_HEIGHT, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, PublicDataWrite, ScopedL2ToL1Message, ScopedLogHash, SerializableContractInstance, } from '@aztec/circuits.js';
2
+ import { AvmAccumulatedData, AvmAppendTreeHint, AvmCircuitPublicInputs, AvmContractBytecodeHints, AvmContractInstanceHint, AvmEnqueuedCallHint, AvmExecutionHints, AvmNullifierReadTreeHint, AvmNullifierWriteTreeHint, AvmPublicDataReadTreeHint, AvmPublicDataWriteTreeHint, EthAddress, Gas, L1_TO_L2_MSG_TREE_HEIGHT, L2ToL1Message, LogHash, MAX_ENQUEUED_CALLS_PER_TX, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, MAX_UNENCRYPTED_LOGS_PER_TX, NOTE_HASH_TREE_HEIGHT, NULLIFIER_TREE_HEIGHT, NoteHash, Nullifier, NullifierLeafPreimage, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PUBLIC_DATA_TREE_HEIGHT, PrivateToAvmAccumulatedData, PrivateToAvmAccumulatedDataArrayLengths, PublicCallRequest, PublicDataTreeLeafPreimage, PublicDataUpdateRequest, PublicDataWrite, ScopedL2ToL1Message, ScopedLogHash, SerializableContractInstance, } from '@aztec/circuits.js';
3
3
  import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
4
4
  import { padArrayEnd } from '@aztec/foundation/collection';
5
5
  import { Fr } from '@aztec/foundation/fields';
6
6
  import { jsonStringify } from '@aztec/foundation/json-rpc';
7
- import { createDebugLogger } from '@aztec/foundation/log';
8
- import { assert } from 'console';
7
+ import { createLogger } from '@aztec/foundation/log';
8
+ import { strict as assert } from 'assert';
9
9
  import { SideEffectLimitReachedError } from './side_effect_errors.js';
10
10
  const emptyPublicDataPath = () => new Array(PUBLIC_DATA_TREE_HEIGHT).fill(Fr.zero());
11
11
  const emptyNoteHashPath = () => new Array(NOTE_HASH_TREE_HEIGHT).fill(Fr.zero());
12
12
  const emptyNullifierPath = () => new Array(NULLIFIER_TREE_HEIGHT).fill(Fr.zero());
13
13
  const emptyL1ToL2MessagePath = () => new Array(L1_TO_L2_MSG_TREE_HEIGHT).fill(Fr.zero());
14
14
  export class SideEffectArrayLengths {
15
- constructor(publicDataWrites, noteHashes, nullifiers, l2ToL1Msgs, unencryptedLogs) {
15
+ constructor(publicDataWrites, protocolPublicDataWrites, noteHashes, nullifiers, l2ToL1Msgs, unencryptedLogs) {
16
16
  this.publicDataWrites = publicDataWrites;
17
+ this.protocolPublicDataWrites = protocolPublicDataWrites;
17
18
  this.noteHashes = noteHashes;
18
19
  this.nullifiers = nullifiers;
19
20
  this.l2ToL1Msgs = l2ToL1Msgs;
20
21
  this.unencryptedLogs = unencryptedLogs;
21
22
  }
22
23
  static empty() {
23
- return new this(0, 0, 0, 0, 0);
24
+ return new this(0, 0, 0, 0, 0, 0);
24
25
  }
25
26
  }
26
27
  /**
@@ -36,9 +37,11 @@ export class PublicEnqueuedCallSideEffectTrace {
36
37
  previousSideEffectArrayLengths = SideEffectArrayLengths.empty()) {
37
38
  this.startSideEffectCounter = startSideEffectCounter;
38
39
  this.previousSideEffectArrayLengths = previousSideEffectArrayLengths;
39
- this.log = createDebugLogger('aztec:public_enqueued_call_side_effect_trace');
40
+ this.log = createLogger('simulator:public_enqueued_call_side_effect_trace');
40
41
  this.enqueuedCalls = [];
41
42
  this.publicDataWrites = [];
43
+ this.protocolPublicDataWritesLength = 0;
44
+ this.userPublicDataWritesLength = 0;
42
45
  this.noteHashes = [];
43
46
  this.nullifiers = [];
44
47
  this.l2ToL1Messages = [];
@@ -51,7 +54,7 @@ export class PublicEnqueuedCallSideEffectTrace {
51
54
  this.avmCircuitHints = AvmExecutionHints.empty();
52
55
  }
53
56
  fork() {
54
- return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new SideEffectArrayLengths(this.previousSideEffectArrayLengths.publicDataWrites + this.publicDataWrites.length, this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length, this.previousSideEffectArrayLengths.nullifiers + this.nullifiers.length, this.previousSideEffectArrayLengths.l2ToL1Msgs + this.l2ToL1Messages.length, this.previousSideEffectArrayLengths.unencryptedLogs + this.unencryptedLogs.length));
57
+ return new PublicEnqueuedCallSideEffectTrace(this.sideEffectCounter, new SideEffectArrayLengths(this.previousSideEffectArrayLengths.publicDataWrites + this.userPublicDataWritesLength, this.previousSideEffectArrayLengths.protocolPublicDataWrites + this.protocolPublicDataWritesLength, this.previousSideEffectArrayLengths.noteHashes + this.noteHashes.length, this.previousSideEffectArrayLengths.nullifiers + this.nullifiers.length, this.previousSideEffectArrayLengths.l2ToL1Msgs + this.l2ToL1Messages.length, this.previousSideEffectArrayLengths.unencryptedLogs + this.unencryptedLogs.length));
55
58
  }
56
59
  merge(forkedTrace, reverted = false) {
57
60
  // sanity check to avoid merging the same forked trace twice
@@ -71,20 +74,15 @@ export class PublicEnqueuedCallSideEffectTrace {
71
74
  }
72
75
  mergeHints(forkedTrace) {
73
76
  this.avmCircuitHints.enqueuedCalls.items.push(...forkedTrace.avmCircuitHints.enqueuedCalls.items);
74
- this.avmCircuitHints.storageValues.items.push(...forkedTrace.avmCircuitHints.storageValues.items);
75
- this.avmCircuitHints.noteHashExists.items.push(...forkedTrace.avmCircuitHints.noteHashExists.items);
76
- this.avmCircuitHints.nullifierExists.items.push(...forkedTrace.avmCircuitHints.nullifierExists.items);
77
- this.avmCircuitHints.l1ToL2MessageExists.items.push(...forkedTrace.avmCircuitHints.l1ToL2MessageExists.items);
78
- this.avmCircuitHints.externalCalls.items.push(...forkedTrace.avmCircuitHints.externalCalls.items);
79
77
  this.avmCircuitHints.contractInstances.items.push(...forkedTrace.avmCircuitHints.contractInstances.items);
80
78
  this.avmCircuitHints.contractBytecodeHints.items.push(...forkedTrace.avmCircuitHints.contractBytecodeHints.items);
81
- this.avmCircuitHints.storageReadRequest.items.push(...forkedTrace.avmCircuitHints.storageReadRequest.items);
82
- this.avmCircuitHints.storageUpdateRequest.items.push(...forkedTrace.avmCircuitHints.storageUpdateRequest.items);
83
- this.avmCircuitHints.nullifierReadRequest.items.push(...forkedTrace.avmCircuitHints.nullifierReadRequest.items);
84
- this.avmCircuitHints.nullifierWriteHints.items.push(...forkedTrace.avmCircuitHints.nullifierWriteHints.items);
85
- this.avmCircuitHints.noteHashReadRequest.items.push(...forkedTrace.avmCircuitHints.noteHashReadRequest.items);
86
- this.avmCircuitHints.noteHashWriteRequest.items.push(...forkedTrace.avmCircuitHints.noteHashWriteRequest.items);
87
- this.avmCircuitHints.l1ToL2MessageReadRequest.items.push(...forkedTrace.avmCircuitHints.l1ToL2MessageReadRequest.items);
79
+ this.avmCircuitHints.publicDataReads.items.push(...forkedTrace.avmCircuitHints.publicDataReads.items);
80
+ this.avmCircuitHints.publicDataWrites.items.push(...forkedTrace.avmCircuitHints.publicDataWrites.items);
81
+ this.avmCircuitHints.nullifierReads.items.push(...forkedTrace.avmCircuitHints.nullifierReads.items);
82
+ this.avmCircuitHints.nullifierWrites.items.push(...forkedTrace.avmCircuitHints.nullifierWrites.items);
83
+ this.avmCircuitHints.noteHashReads.items.push(...forkedTrace.avmCircuitHints.noteHashReads.items);
84
+ this.avmCircuitHints.noteHashWrites.items.push(...forkedTrace.avmCircuitHints.noteHashWrites.items);
85
+ this.avmCircuitHints.l1ToL2MessageReads.items.push(...forkedTrace.avmCircuitHints.l1ToL2MessageReads.items);
88
86
  }
89
87
  getCounter() {
90
88
  return this.sideEffectCounter;
@@ -92,36 +90,38 @@ export class PublicEnqueuedCallSideEffectTrace {
92
90
  incrementSideEffectCounter() {
93
91
  this.sideEffectCounter++;
94
92
  }
95
- tracePublicStorageRead(_contractAddress, slot, value, leafPreimage = PublicDataTreeLeafPreimage.empty(), leafIndex = Fr.zero(), path = emptyPublicDataPath()) {
96
- if (!leafIndex.equals(Fr.zero())) {
97
- // if we have real merkle hint content, make sure the value matches the the provided preimage
98
- assert(leafPreimage.value.equals(value), 'Value mismatch when tracing in public data write');
99
- }
100
- this.avmCircuitHints.storageReadRequest.items.push(new AvmPublicDataReadTreeHint(leafPreimage, leafIndex, path));
101
- this.log.debug(`SLOAD cnt: ${this.sideEffectCounter} val: ${value} slot: ${slot}`);
93
+ tracePublicStorageRead(contractAddress, slot, value, leafPreimage = PublicDataTreeLeafPreimage.empty(), leafIndex = Fr.zero(), path = emptyPublicDataPath()) {
94
+ this.avmCircuitHints.publicDataReads.items.push(new AvmPublicDataReadTreeHint(leafPreimage, leafIndex, path));
95
+ this.log.debug(`Tracing storage read (address=${contractAddress}, slot=${slot}): value=${value} (counter=${this.sideEffectCounter})`);
102
96
  this.incrementSideEffectCounter();
103
97
  }
104
- tracePublicStorageWrite(contractAddress, slot, value, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
105
- if (!lowLeafIndex.equals(Fr.zero())) {
106
- // if we have real merkle hint content, make sure the value matches the the provided preimage
107
- assert(newLeafPreimage.value.equals(value), 'Value mismatch when tracing in public data read');
98
+ tracePublicStorageWrite(contractAddress, slot, value, protocolWrite, lowLeafPreimage = PublicDataTreeLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyPublicDataPath(), newLeafPreimage = PublicDataTreeLeafPreimage.empty(), insertionPath = emptyPublicDataPath()) {
99
+ if (protocolWrite) {
100
+ if (this.protocolPublicDataWritesLength + this.previousSideEffectArrayLengths.protocolPublicDataWrites >=
101
+ PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
102
+ throw new SideEffectLimitReachedError('protocol public data (contract storage) write', PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
103
+ }
104
+ this.protocolPublicDataWritesLength++;
108
105
  }
109
- if (this.publicDataWrites.length + this.previousSideEffectArrayLengths.publicDataWrites >=
110
- MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
111
- throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
106
+ else {
107
+ if (this.userPublicDataWritesLength + this.previousSideEffectArrayLengths.publicDataWrites >=
108
+ MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX) {
109
+ throw new SideEffectLimitReachedError('public data (contract storage) write', MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX);
110
+ }
111
+ this.userPublicDataWritesLength++;
112
112
  }
113
113
  const leafSlot = computePublicDataTreeLeafSlot(contractAddress, slot);
114
114
  this.publicDataWrites.push(new PublicDataUpdateRequest(leafSlot, value, this.sideEffectCounter));
115
115
  // New hinting
116
116
  const readHint = new AvmPublicDataReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
117
- this.avmCircuitHints.storageUpdateRequest.items.push(new AvmPublicDataWriteTreeHint(readHint, newLeafPreimage, insertionPath));
118
- this.log.debug(`Traced public data write (address=${contractAddress}, slot=${slot}, leafSlot=${leafSlot}): value=${value} (counter=${this.sideEffectCounter})`);
117
+ this.avmCircuitHints.publicDataWrites.items.push(new AvmPublicDataWriteTreeHint(readHint, newLeafPreimage, insertionPath));
118
+ this.log.debug(`Traced public data write (address=${contractAddress}, slot=${slot}): value=${value} (counter=${this.sideEffectCounter}, isProtocol:${protocolWrite})`);
119
119
  this.incrementSideEffectCounter();
120
120
  }
121
121
  // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
122
122
  traceNoteHashCheck(_contractAddress, noteHash, leafIndex, _exists, path = emptyNoteHashPath()) {
123
123
  // New Hinting
124
- this.avmCircuitHints.noteHashReadRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
124
+ this.avmCircuitHints.noteHashReads.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
125
125
  // NOTE: counter does not increment for note hash checks (because it doesn't rely on pending note hashes)
126
126
  }
127
127
  traceNewNoteHash(contractAddress, noteHash, leafIndex = Fr.zero(), path = emptyNoteHashPath()) {
@@ -132,11 +132,11 @@ export class PublicEnqueuedCallSideEffectTrace {
132
132
  //const siloedNoteHash = siloNoteHash(contractAddress, noteHash);
133
133
  this.noteHashes.push(new NoteHash(noteHash, this.sideEffectCounter).scope(contractAddress));
134
134
  this.log.debug(`NEW_NOTE_HASH cnt: ${this.sideEffectCounter}`);
135
- this.avmCircuitHints.noteHashWriteRequest.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
135
+ this.avmCircuitHints.noteHashWrites.items.push(new AvmAppendTreeHint(leafIndex, noteHash, path));
136
136
  this.incrementSideEffectCounter();
137
137
  }
138
138
  traceNullifierCheck(_siloedNullifier, _exists, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
139
- this.avmCircuitHints.nullifierReadRequest.items.push(new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath));
139
+ this.avmCircuitHints.nullifierReads.items.push(new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath));
140
140
  this.log.debug(`NULLIFIER_EXISTS cnt: ${this.sideEffectCounter}`);
141
141
  this.incrementSideEffectCounter();
142
142
  }
@@ -146,13 +146,13 @@ export class PublicEnqueuedCallSideEffectTrace {
146
146
  }
147
147
  this.nullifiers.push(new Nullifier(siloedNullifier, this.sideEffectCounter, /*noteHash=*/ Fr.ZERO));
148
148
  const lowLeafReadHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
149
- this.avmCircuitHints.nullifierWriteHints.items.push(new AvmNullifierWriteTreeHint(lowLeafReadHint, insertionPath));
149
+ this.avmCircuitHints.nullifierWrites.items.push(new AvmNullifierWriteTreeHint(lowLeafReadHint, insertionPath));
150
150
  this.log.debug(`NEW_NULLIFIER cnt: ${this.sideEffectCounter}`);
151
151
  this.incrementSideEffectCounter();
152
152
  }
153
153
  // TODO(8287): _exists can be removed once we have the vm properly handling the equality check
154
154
  traceL1ToL2MessageCheck(_contractAddress, msgHash, msgLeafIndex, _exists, path = emptyL1ToL2MessagePath()) {
155
- this.avmCircuitHints.l1ToL2MessageReadRequest.items.push(new AvmAppendTreeHint(msgLeafIndex, msgHash, path));
155
+ this.avmCircuitHints.l1ToL2MessageReads.items.push(new AvmAppendTreeHint(msgLeafIndex, msgHash, path));
156
156
  }
157
157
  traceNewL2ToL1Message(contractAddress, recipient, content) {
158
158
  if (this.l2ToL1Messages.length + this.previousSideEffectArrayLengths.l2ToL1Msgs >= MAX_L2_TO_L1_MSGS_PER_TX) {
@@ -177,8 +177,9 @@ export class PublicEnqueuedCallSideEffectTrace {
177
177
  this.log.debug(`NEW_UNENCRYPTED_LOG cnt: ${this.sideEffectCounter}`);
178
178
  this.incrementSideEffectCounter();
179
179
  }
180
- traceGetContractInstance(contractAddress, exists, instance = SerializableContractInstance.default()) {
181
- this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(contractAddress, exists, instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeys));
180
+ traceGetContractInstance(contractAddress, exists, instance = SerializableContractInstance.default(), lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
181
+ const membershipHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
182
+ this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(contractAddress, exists, instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeys, membershipHint));
182
183
  this.log.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
183
184
  this.incrementSideEffectCounter();
184
185
  }
@@ -189,37 +190,13 @@ export class PublicEnqueuedCallSideEffectTrace {
189
190
  artifactHash: Fr.zero(),
190
191
  privateFunctionsRoot: Fr.zero(),
191
192
  publicBytecodeCommitment: Fr.zero(),
192
- }) {
193
- const instance = new AvmContractInstanceHint(contractAddress, exists, contractInstance.salt, contractInstance.deployer, contractInstance.contractClassId, contractInstance.initializationHash, contractInstance.publicKeys);
193
+ }, lowLeafPreimage = NullifierLeafPreimage.empty(), lowLeafIndex = Fr.zero(), lowLeafPath = emptyNullifierPath()) {
194
+ const membershipHint = new AvmNullifierReadTreeHint(lowLeafPreimage, lowLeafIndex, lowLeafPath);
195
+ const instance = new AvmContractInstanceHint(contractAddress, exists, contractInstance.salt, contractInstance.deployer, contractInstance.contractClassId, contractInstance.initializationHash, contractInstance.publicKeys, membershipHint);
194
196
  // We need to deduplicate the contract instances based on addresses
195
197
  this.avmCircuitHints.contractBytecodeHints.items.push(new AvmContractBytecodeHints(bytecode, instance, contractClass));
196
198
  this.log.debug(`Bytecode retrieval for contract execution traced: exists=${exists}, instance=${jsonStringify(contractInstance)}`);
197
199
  }
198
- /**
199
- * Trace a nested call.
200
- * Accept some results from a finished nested call's trace into this one.
201
- */
202
- traceNestedCall(
203
- /** The trace of the nested call. */
204
- _nestedCallTrace,
205
- /** The execution environment of the nested call. */
206
- nestedEnvironment,
207
- /** How much gas was available for this public execution. */
208
- startGasLeft,
209
- /** Bytecode used for this execution. */
210
- _bytecode,
211
- /** The call's results */
212
- avmCallResults,
213
- /** Function name for logging */
214
- _functionName = 'unknown') {
215
- // TODO(4805): check if some threshold is reached for max nested calls (to unique contracts?)
216
- //
217
- // Store end side effect counter before it gets updated by absorbing nested call trace
218
- const endSideEffectCounter = new Fr(this.sideEffectCounter);
219
- const gasUsed = new Gas(startGasLeft.daGas - avmCallResults.gasLeft.daGas, startGasLeft.l2Gas - avmCallResults.gasLeft.l2Gas);
220
- this.avmCircuitHints.externalCalls.items.push(new AvmExternalCallHint(
221
- /*success=*/ new Fr(avmCallResults.reverted ? 0 : 1), avmCallResults.output, gasUsed, endSideEffectCounter, nestedEnvironment.address));
222
- }
223
200
  /**
224
201
  * Trace an enqueued call.
225
202
  * Accept some results from a finished call's trace into this one.
@@ -278,6 +255,8 @@ export class PublicEnqueuedCallSideEffectTrace {
278
255
  startGasUsed,
279
256
  /** How much gas was available for this public execution. */
280
257
  gasLimits,
258
+ /** Address of the fee payer. */
259
+ feePayer,
281
260
  /** Call requests for setup phase. */
282
261
  publicSetupCallRequests,
283
262
  /** Call requests for app logic phase. */
@@ -295,7 +274,7 @@ export class PublicEnqueuedCallSideEffectTrace {
295
274
  transactionFee,
296
275
  /** The call's results */
297
276
  reverted) {
298
- return new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasLimits, padArrayEnd(publicSetupCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), padArrayEnd(publicAppLogicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest,
277
+ return new AvmCircuitPublicInputs(globalVariables, startTreeSnapshots, startGasUsed, gasLimits, feePayer, padArrayEnd(publicSetupCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), padArrayEnd(publicAppLogicCallRequests, PublicCallRequest.empty(), MAX_ENQUEUED_CALLS_PER_TX), publicTeardownCallRequest,
299
278
  /*previousNonRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
300
279
  /*previousRevertibleAccumulatedDataArrayLengths=*/ PrivateToAvmAccumulatedDataArrayLengths.empty(),
301
280
  /*previousNonRevertibleAccumulatedDataArray=*/ PrivateToAvmAccumulatedData.empty(),
@@ -322,7 +301,7 @@ export class PublicEnqueuedCallSideEffectTrace {
322
301
  return this.avmCircuitHints;
323
302
  }
324
303
  getAvmAccumulatedData() {
325
- return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n => n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map(n => n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.unencryptedLogsHashes, ScopedLogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map(w => new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
304
+ return new AvmAccumulatedData(padArrayEnd(this.noteHashes.map(n => n.value), Fr.zero(), MAX_NOTE_HASHES_PER_TX), padArrayEnd(this.nullifiers.map(n => n.value), Fr.zero(), MAX_NULLIFIERS_PER_TX), padArrayEnd(this.l2ToL1Messages, ScopedL2ToL1Message.empty(), MAX_L2_TO_L1_MSGS_PER_TX), padArrayEnd(this.unencryptedLogsHashes, ScopedLogHash.empty(), MAX_UNENCRYPTED_LOGS_PER_TX), padArrayEnd(this.publicDataWrites.map(w => new PublicDataWrite(w.leafSlot, w.newValue)), PublicDataWrite.empty(), MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX));
326
305
  }
327
306
  }
328
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACnF,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,wBAAwB,EACxB,yBAAyB,EACzB,yBAAyB,EACzB,0BAA0B,EAG1B,UAAU,EACV,GAAG,EAGH,wBAAwB,EACxB,aAAa,EACb,OAAO,EACP,yBAAyB,EACzB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,sCAAsC,EACtC,2BAA2B,EAC3B,qBAAqB,EACrB,qBAAqB,EACrB,QAAQ,EACR,SAAS,EACT,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,uCAAuC,EACvC,iBAAiB,EACjB,0BAA0B,EAC1B,uBAAuB,EACvB,eAAe,EACf,mBAAmB,EACnB,aAAa,EAEb,4BAA4B,GAE7B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAKjC,OAAO,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAGtE,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACrF,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACjF,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAClF,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AAmBzF,MAAM,OAAO,sBAAsB;IACjC,YACkB,gBAAwB,EACxB,UAAkB,EAClB,UAAkB,EAClB,UAAkB,EAClB,eAAuB;QAJvB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;QAClB,eAAU,GAAV,UAAU,CAAQ;QAClB,oBAAe,GAAf,eAAe,CAAQ;IACtC,CAAC;IAEJ,MAAM,CAAC,KAAK;QACV,OAAO,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACjC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,iCAAiC;IAoB5C;IACE,qDAAqD;IACrC,yBAAiC,CAAC;IAClD;;OAEG;IACc,iCAAyD,sBAAsB,CAAC,KAAK,EAAE;QAJxF,2BAAsB,GAAtB,sBAAsB,CAAY;QAIjC,mCAA8B,GAA9B,8BAA8B,CAAyD;QAzBnG,QAAG,GAAG,iBAAiB,CAAC,8CAA8C,CAAC,CAAC;QAKvE,kBAAa,GAAwB,EAAE,CAAC;QAExC,qBAAgB,GAA8B,EAAE,CAAC;QACjD,eAAU,GAAqB,EAAE,CAAC;QAClC,eAAU,GAAgB,EAAE,CAAC;QAC7B,mBAAc,GAA0B,EAAE,CAAC;QAC3C,oBAAe,GAAuB,EAAE,CAAC;QACzC,0BAAqB,GAAoB,EAAE,CAAC;QAIpD,sDAAsD;QAC9C,4BAAuB,GAAG,KAAK,CAAC;QAUtC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wDAAwD,sBAAsB,EAAE,CAAC,CAAC;QACjG,IAAI,CAAC,iBAAiB,GAAG,sBAAsB,CAAC;QAChD,IAAI,CAAC,eAAe,GAAG,iBAAiB,CAAC,KAAK,EAAE,CAAC;IACnD,CAAC;IAEM,IAAI;QACT,OAAO,IAAI,iCAAiC,CAC1C,IAAI,CAAC,iBAAiB,EACtB,IAAI,sBAAsB,CACxB,IAAI,CAAC,8BAA8B,CAAC,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EACnF,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EACvE,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,EACvE,IAAI,CAAC,8BAA8B,CAAC,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAC3E,IAAI,CAAC,8BAA8B,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAClF,CACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,WAAiB,EAAE,WAAoB,KAAK;QACvD,4DAA4D;QAC5D,MAAM,CACJ,CAAC,WAAW,CAAC,uBAAuB,EACpC,2EAA2E,CAC5E,CAAC;QACF,WAAW,CAAC,uBAAuB,GAAG,IAAI,CAAC;QAE3C,IAAI,CAAC,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;QACvD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;QAEtD,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC;YAC5D,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;YAChD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;YACxD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;YAC1D,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,qBAAqB,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC;IAEO,UAAU,CAAC,WAAiB;QAClC,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAElG,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAClG,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACpG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACtG,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAE9G,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAElG,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC1G,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAElH,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAC5G,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAChH,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAChH,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC9G,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC9G,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QAChH,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,KAAK,CAAC,IAAI,CACtD,GAAG,WAAW,CAAC,eAAe,CAAC,wBAAwB,CAAC,KAAK,CAC9D,CAAC;IACJ,CAAC;IAEM,UAAU;QACf,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAEO,0BAA0B;QAChC,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEM,sBAAsB,CAC3B,gBAA8B,EAC9B,IAAQ,EACR,KAAS,EACT,eAA2C,0BAA0B,CAAC,KAAK,EAAE,EAC7E,YAAgB,EAAE,CAAC,IAAI,EAAE,EACzB,OAAa,mBAAmB,EAAE;QAElC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACjC,6FAA6F;YAC7F,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,kDAAkD,CAAC,CAAC;QAC/F,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;QACjH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,iBAAiB,SAAS,KAAK,UAAU,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,uBAAuB,CAC5B,eAA6B,EAC7B,IAAQ,EACR,KAAS,EACT,kBAA8C,0BAA0B,CAAC,KAAK,EAAE,EAChF,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,mBAAmB,EAAE,EACzC,kBAA8C,0BAA0B,CAAC,KAAK,EAAE,EAChF,gBAAsB,mBAAmB,EAAE;QAE3C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;YACpC,6FAA6F;YAC7F,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,iDAAiD,CAAC,CAAC;QACjG,CAAC;QACD,IACE,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,gBAAgB;YACnF,sCAAsC,EACtC,CAAC;YACD,MAAM,IAAI,2BAA2B,CACnC,sCAAsC,EACtC,sCAAsC,CACvC,CAAC;QACJ,CAAC;QAED,MAAM,QAAQ,GAAG,6BAA6B,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QACtE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,uBAAuB,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEjG,cAAc;QACd,MAAM,QAAQ,GAAG,IAAI,yBAAyB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QAC3F,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAClD,IAAI,0BAA0B,CAAC,QAAQ,EAAE,eAAe,EAAE,aAAa,CAAC,CACzE,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qCAAqC,eAAe,UAAU,IAAI,cAAc,QAAQ,YAAY,KAAK,aAAa,IAAI,CAAC,iBAAiB,GAAG,CAChJ,CAAC;QACF,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,kBAAkB,CACvB,gBAA8B,EAC9B,QAAY,EACZ,SAAa,EACb,OAAgB,EAChB,OAAa,iBAAiB,EAAE;QAEhC,cAAc;QACd,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QACtG,yGAAyG;IAC3G,CAAC;IAEM,gBAAgB,CACrB,eAA6B,EAC7B,QAAY,EACZ,YAAgB,EAAE,CAAC,IAAI,EAAE,EACzB,OAAa,iBAAiB,EAAE;QAEhC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,sBAAsB,EAAE,CAAC;YACtG,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;QAC7E,CAAC;QAED,0DAA0D;QAC1D,iEAAiE;QACjE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC5F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;QACvG,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,mBAAmB,CACxB,gBAAoB,EACpB,OAAgB,EAChB,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE;QAExC,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,KAAK,CAAC,IAAI,CAClD,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CACzE,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,iBAAiB,CACtB,eAAmB,EACnB,kBAAyC,qBAAqB,CAAC,KAAK,EAAE,EACtE,eAAmB,EAAE,CAAC,IAAI,EAAE,EAC5B,cAAoB,kBAAkB,EAAE,EACxC,gBAAsB,kBAAkB,EAAE;QAE1C,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,qBAAqB,EAAE,CAAC;YACrG,MAAM,IAAI,2BAA2B,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;QAC5E,CAAC;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE,IAAI,CAAC,iBAAiB,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpG,MAAM,eAAe,GAAG,IAAI,wBAAwB,CAAC,eAAe,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;QACjG,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC,CAAC;QACnH,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,8FAA8F;IACvF,uBAAuB,CAC5B,gBAA8B,EAC9B,OAAW,EACX,YAAgB,EAChB,OAAgB,EAChB,OAAa,sBAAsB,EAAE;QAErC,IAAI,CAAC,eAAe,CAAC,wBAAwB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,iBAAiB,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/G,CAAC;IAEM,qBAAqB,CAAC,eAA6B,EAAE,SAAa,EAAE,OAAW;QACpF,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,UAAU,IAAI,wBAAwB,EAAE,CAAC;YAC5G,MAAM,IAAI,2BAA2B,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,CAAC,IAAI,CACtB,IAAI,aAAa,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAC5F,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,mBAAmB,CAAC,eAA6B,EAAE,GAAS;QACjE,IACE,IAAI,CAAC,eAAe,CAAC,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,eAAe;YACjF,2BAA2B,EAC3B,CAAC;YACD,MAAM,IAAI,2BAA2B,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;QACxF,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,gBAAgB,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9F,MAAM,YAAY,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,uGAAuG;QACvG,uDAAuD;QACvD,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAC7B,IAAI,OAAO,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAClG,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACrE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAEM,wBAAwB,CAC7B,eAA6B,EAC7B,MAAe,EACf,WAAyC,4BAA4B,CAAC,OAAO,EAAE;QAE/E,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAC/C,IAAI,uBAAuB,CACzB,eAAe,EACf,MAAM,EACN,QAAQ,CAAC,IAAI,EACb,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,EACxB,QAAQ,CAAC,kBAAkB,EAC3B,QAAQ,CAAC,UAAU,CACpB,CACF,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,0BAA0B,EAAE,CAAC;IACpC,CAAC;IAED,6EAA6E;IAC7E,4FAA4F;IAC5F,sDAAsD;IAC/C,gBAAgB,CACrB,eAA6B,EAC7B,MAAe,EACf,WAAmB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAClC,mBAAiD,4BAA4B,CAAC,OAAO,EAAE,EACvF,gBAAyC;QACvC,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,oBAAoB,EAAE,EAAE,CAAC,IAAI,EAAE;QAC/B,wBAAwB,EAAE,EAAE,CAAC,IAAI,EAAE;KACpC;QAED,MAAM,QAAQ,GAAG,IAAI,uBAAuB,CAC1C,eAAe,EACf,MAAM,EACN,gBAAgB,CAAC,IAAI,EACrB,gBAAgB,CAAC,QAAQ,EACzB,gBAAgB,CAAC,eAAe,EAChC,gBAAgB,CAAC,kBAAkB,EACnC,gBAAgB,CAAC,UAAU,CAC5B,CAAC;QACF,mEAAmE;QACnE,IAAI,CAAC,eAAe,CAAC,qBAAqB,CAAC,KAAK,CAAC,IAAI,CACnD,IAAI,wBAAwB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAChE,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4DAA4D,MAAM,cAAc,aAAa,CAAC,gBAAgB,CAAC,EAAE,CAClH,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,eAAe;IACpB,oCAAoC;IACpC,gBAAsB;IACtB,oDAAoD;IACpD,iBAA0C;IAC1C,4DAA4D;IAC5D,YAAiB;IACjB,wCAAwC;IACxC,SAAiB;IACjB,yBAAyB;IACzB,cAAqC;IACrC,gCAAgC;IAChC,gBAAwB,SAAS;QAEjC,6FAA6F;QAC7F,EAAE;QACF,sFAAsF;QACtF,MAAM,oBAAoB,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE5D,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,YAAY,CAAC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,EACjD,YAAY,CAAC,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAClD,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAC3C,IAAI,mBAAmB;QACrB,YAAY,CAAC,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EACpD,cAAc,CAAC,MAAM,EACrB,OAAO,EACP,oBAAoB,EACpB,iBAAiB,CAAC,OAAO,CAC1B,CACF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,iBAAiB;IACtB,6DAA6D;IAC7D,iBAAoC;IACpC,0BAA0B;IAC1B,QAAc;IACd,2BAA2B;IAC3B,SAAkB;QAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACxC,yGAAyG;QACzG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC3C,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;IACtH,CAAC;IAEM,cAAc;QACnB,OAAO;YACL,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;SAClD,CAAC;IACJ,CAAC;IAED;;OAEG;IACI,mCAAmC;IACxC,yBAAyB;IACzB,cAAsC;QAEtC,OAAO;YACL,UAAU,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YAC5C,oBAAoB,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC;YACpD,YAAY,EAAE,cAAc,CAAC,MAAM;YACnC,QAAQ,EAAE,cAAc,CAAC,QAAQ;YACjC,YAAY,EAAE,cAAc,CAAC,YAAY;YACzC,WAAW,EAAE;gBACX,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EAAE,UAAU;gBAC7D,eAAe,EAAE,IAAI,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC;aACrE;SACF,CAAC;IACJ,CAAC;IAEM,wBAAwB;IAC7B,eAAe;IACf,eAAgC;IAChC,4BAA4B;IAC5B,kBAAiC;IACjC,+BAA+B;IAC/B,YAAiB;IACjB,4DAA4D;IAC5D,SAAsB;IACtB,qCAAqC;IACrC,uBAA4C;IAC5C,yCAAyC;IACzC,0BAA+C;IAC/C,uCAAuC;IACvC,yBAA4C;IAC5C,0BAA0B;IAC1B,gBAA+B;IAC/B;;;OAGG;IACH,UAAe;IACf,uBAAuB;IACvB,cAAkB;IAClB,yBAAyB;IACzB,QAAiB;QAEjB,OAAO,IAAI,sBAAsB,CAC/B,eAAe,EACf,kBAAkB,EAClB,YAAY,EACZ,SAAS,EACT,WAAW,CAAC,uBAAuB,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,yBAAyB,CAAC,EAC1F,WAAW,CAAC,0BAA0B,EAAE,iBAAiB,CAAC,KAAK,EAAE,EAAE,yBAAyB,CAAC,EAC7F,yBAAyB;QACzB,qDAAqD,CAAC,uCAAuC,CAAC,KAAK,EAAE;QACrG,kDAAkD,CAAC,uCAAuC,CAAC,KAAK,EAAE;QAClG,8CAA8C,CAAC,2BAA2B,CAAC,KAAK,EAAE;QAClF,2CAA2C,CAAC,2BAA2B,CAAC,KAAK,EAAE,EAC/E,gBAAgB,EAChB,UAAU;QACV,oBAAoB,CAAC,IAAI,CAAC,qBAAqB,EAAE,EACjD,cAAc,EACd,QAAQ,CACT,CAAC;IACJ,CAAC;IAEM,0BAA0B;IAC/B,oDAAoD;IACpD,eAAwC;IACxC,4DAA4D;IAC5D,aAAkB;IAClB,wCAAwC;IACxC,SAAiB;IACjB,yBAAyB;IACzB,eAAuC;IACvC,gCAAgC;IAChC,gBAAwB,SAAS;QAEjC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEM,kBAAkB;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,kBAAkB,CAC3B,WAAW,CACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EACjC,EAAE,CAAC,IAAI,EAAE,EACT,sBAAsB,CACvB,EACD,WAAW,CACT,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EACjC,EAAE,CAAC,IAAI,EAAE,EACT,qBAAqB,CACtB,EACD,WAAW,CAAC,IAAI,CAAC,cAAc,EAAE,mBAAmB,CAAC,KAAK,EAAE,EAAE,wBAAwB,CAAC,EACvF,WAAW,CAAC,IAAI,CAAC,qBAAqB,EAAE,aAAa,CAAC,KAAK,EAAE,EAAE,2BAA2B,CAAC,EAC3F,WAAW,CACT,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAC3E,eAAe,CAAC,KAAK,EAAE,EACvB,sCAAsC,CACvC,CACF,CAAC;IACJ,CAAC;CACF"}
307
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"enqueued_call_side_effect_trace.js","sourceRoot":"","sources":["../../src/public/enqueued_call_side_effect_trace.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAIZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,eAAe;IAC1B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAY;gBAErB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAmB;IAwB5D,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAe7E,+BAA+B;CAKhC"}
1
+ {"version":3,"file":"executor_metrics.d.ts","sourceRoot":"","sources":["../../src/public/executor_metrics.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,MAAM,EAGZ,MAAM,yBAAyB,CAAC;AAEjC,qBAAa,eAAe;IAC1B,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,aAAa,CAAY;gBAErB,MAAM,EAAE,eAAe,EAAE,IAAI,SAAmB;IAqB5D,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAe7E,+BAA+B;CAKhC"}
@@ -1,4 +1,4 @@
1
- import { Attributes, Metrics, ValueType, linearBuckets, } from '@aztec/telemetry-client';
1
+ import { Attributes, Metrics, ValueType, } from '@aztec/telemetry-client';
2
2
  export class ExecutorMetrics {
3
3
  constructor(client, name = 'PublicExecutor') {
4
4
  this.tracer = client.getTracer(name);
@@ -15,9 +15,6 @@ export class ExecutorMetrics {
15
15
  description: 'Mana used per second',
16
16
  unit: 'mana/s',
17
17
  valueType: ValueType.INT,
18
- advice: {
19
- explicitBucketBoundaries: linearBuckets(0, 10000000, 10),
20
- },
21
18
  });
22
19
  }
23
20
  recordFunctionSimulation(durationMs, manaUsed, fnName) {
@@ -40,4 +37,4 @@ export class ExecutorMetrics {
40
37
  });
41
38
  }
42
39
  }
43
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUVWLE9BQU8sRUFJUCxTQUFTLEVBQ1QsYUFBYSxHQUNkLE1BQU0seUJBQXlCLENBQUM7QUFFakMsTUFBTSxPQUFPLGVBQWU7SUFNMUIsWUFBWSxNQUF1QixFQUFFLElBQUksR0FBRyxnQkFBZ0I7UUFDMUQsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JDLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7UUFFcEMsSUFBSSxDQUFDLE9BQU8sR0FBRyxLQUFLLENBQUMsbUJBQW1CLENBQUMsT0FBTyxDQUFDLGdDQUFnQyxFQUFFO1lBQ2pGLFdBQVcsRUFBRSw4QkFBOEI7U0FDNUMsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxtQ0FBbUMsRUFBRTtZQUNuRixXQUFXLEVBQUUseUNBQXlDO1lBQ3RELElBQUksRUFBRSxJQUFJO1lBQ1YsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxhQUFhLEdBQUcsS0FBSyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsMENBQTBDLEVBQUU7WUFDN0YsV0FBVyxFQUFFLHNCQUFzQjtZQUNuQyxJQUFJLEVBQUUsUUFBUTtZQUNkLFNBQVMsRUFBRSxTQUFTLENBQUMsR0FBRztZQUN4QixNQUFNLEVBQUU7Z0JBQ04sd0JBQXdCLEVBQUUsYUFBYSxDQUFDLENBQUMsRUFBRSxRQUFVLEVBQUUsRUFBRSxDQUFDO2FBQzNEO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVELHdCQUF3QixDQUFDLFVBQWtCLEVBQUUsUUFBZ0IsRUFBRSxNQUFjO1FBQzNFLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxJQUFJO1lBQ3JCLENBQUMsVUFBVSxDQUFDLGdCQUFnQixDQUFDLEVBQUUsTUFBTTtZQUNyQyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxRQUFRO1NBQ2pDLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQztRQUM5QyxJQUFJLFVBQVUsR0FBRyxDQUFDLElBQUksUUFBUSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ25DLE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxRQUFRLEdBQUcsSUFBSSxDQUFDLEdBQUcsVUFBVSxDQUFDLENBQUM7WUFDakUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFO2dCQUN2QyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU07YUFDdEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztJQUNILENBQUM7SUFFRCwrQkFBK0I7UUFDN0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFO1lBQ2xCLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxFQUFFLEtBQUs7U0FDdkIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGIn0=
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3JfbWV0cmljcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wdWJsaWMvZXhlY3V0b3JfbWV0cmljcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQ0wsVUFBVSxFQUVWLE9BQU8sRUFJUCxTQUFTLEdBQ1YsTUFBTSx5QkFBeUIsQ0FBQztBQUVqQyxNQUFNLE9BQU8sZUFBZTtJQU0xQixZQUFZLE1BQXVCLEVBQUUsSUFBSSxHQUFHLGdCQUFnQjtRQUMxRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDckMsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUVwQyxJQUFJLENBQUMsT0FBTyxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsZ0NBQWdDLEVBQUU7WUFDakYsV0FBVyxFQUFFLDhCQUE4QjtTQUM1QyxDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxlQUFlLENBQUMsT0FBTyxDQUFDLG1DQUFtQyxFQUFFO1lBQ25GLFdBQVcsRUFBRSx5Q0FBeUM7WUFDdEQsSUFBSSxFQUFFLElBQUk7WUFDVixTQUFTLEVBQUUsU0FBUyxDQUFDLEdBQUc7U0FDekIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLGFBQWEsR0FBRyxLQUFLLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQywwQ0FBMEMsRUFBRTtZQUM3RixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLElBQUksRUFBRSxRQUFRO1lBQ2QsU0FBUyxFQUFFLFNBQVMsQ0FBQyxHQUFHO1NBQ3pCLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCx3QkFBd0IsQ0FBQyxVQUFrQixFQUFFLFFBQWdCLEVBQUUsTUFBYztRQUMzRSxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUU7WUFDbEIsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLEVBQUUsSUFBSTtZQUNyQixDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxFQUFFLE1BQU07WUFDckMsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLEVBQUUsUUFBUTtTQUNqQyxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDOUMsSUFBSSxVQUFVLEdBQUcsQ0FBQyxJQUFJLFFBQVEsR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQyxHQUFHLFVBQVUsQ0FBQyxDQUFDO1lBQ2pFLElBQUksQ0FBQyxhQUFhLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRTtnQkFDdkMsQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsRUFBRSxNQUFNO2FBQ3RDLENBQUMsQ0FBQztRQUNMLENBQUM7SUFDSCxDQUFDO0lBRUQsK0JBQStCO1FBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRTtZQUNsQixDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLO1NBQ3ZCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRiJ9
@@ -1,14 +1,32 @@
1
1
  import { PublicExecutionRequest, Tx } from '@aztec/circuit-types';
2
- import { type AvmCircuitInputs, Gas } from '@aztec/circuits.js';
2
+ import { type AvmCircuitInputs, type ContractClassPublic, type ContractInstanceWithAddress, FunctionSelector, Gas, type PublicFunction } from '@aztec/circuits.js';
3
+ import { type ContractArtifact } from '@aztec/foundation/abi';
4
+ import { AztecAddress } from '@aztec/foundation/aztec-address';
3
5
  import { Fr } from '@aztec/foundation/fields';
4
- /**
5
- * If assertionErrString is set, we expect a (non exceptional halting) revert due to a failing assertion and
6
- * we check that the revert reason error contains this string. However, the circuit must correctly prove the
7
- * execution.
8
- */
9
- export declare function simulateAvmTestContractGenerateCircuitInputs(functionName: string, calldata?: Fr[], assertionErrString?: string): Promise<AvmCircuitInputs>;
6
+ export declare function simulateAvmTestContractGenerateCircuitInputs(functionName: string, calldata?: Fr[], expectRevert?: boolean, assertionErrString?: string): Promise<AvmCircuitInputs>;
10
7
  /**
11
8
  * Craft a carrier transaction for a public call for simulation by PublicTxSimulator.
12
9
  */
13
10
  export declare function createTxForPublicCall(executionRequest: PublicExecutionRequest, gasUsedByPrivate?: Gas, isTeardown?: boolean): Tx;
11
+ export declare class MockedAvmTestContractDataSource {
12
+ private fnName;
13
+ private bytecode;
14
+ fnSelector: FunctionSelector;
15
+ private publicFn;
16
+ private contractClass;
17
+ contractInstance: ContractInstanceWithAddress;
18
+ private bytecodeCommitment;
19
+ otherContractInstance: ContractInstanceWithAddress;
20
+ constructor();
21
+ getPublicFunction(_address: AztecAddress, _selector: FunctionSelector): Promise<PublicFunction>;
22
+ getBlockNumber(): Promise<number>;
23
+ getContractClass(_id: Fr): Promise<ContractClassPublic>;
24
+ getBytecodeCommitment(_id: Fr): Promise<Fr>;
25
+ addContractClass(_contractClass: ContractClassPublic): Promise<void>;
26
+ getContract(address: AztecAddress): Promise<ContractInstanceWithAddress>;
27
+ getContractClassIds(): Promise<Fr[]>;
28
+ getContractArtifact(_address: AztecAddress): Promise<ContractArtifact | undefined>;
29
+ getContractFunctionName(_address: AztecAddress, _selector: FunctionSelector): Promise<string>;
30
+ addContractArtifact(_address: AztecAddress, _contract: ContractArtifact): Promise<void>;
31
+ }
14
32
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EACL,KAAK,gBAAgB,EAMrB,GAAG,EAeJ,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AASrD;;;;GAIG;AACH,wBAAsB,4CAA4C,CAChE,YAAY,EAAE,MAAM,EACpB,QAAQ,GAAE,EAAE,EAAO,EACnB,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAgD3B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,sBAAsB,EACxC,gBAAgB,GAAE,GAAiB,EACnC,UAAU,GAAE,OAAe,GAC1B,EAAE,CAgCJ"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,sBAAsB,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EACL,KAAK,gBAAgB,EAGrB,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAGhC,gBAAgB,EAChB,GAAG,EAOH,KAAK,cAAc,EAOpB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,gBAAgB,EAAyB,MAAM,uBAAuB,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAS,MAAM,0BAA0B,CAAC;AASrD,wBAAsB,4CAA4C,CAChE,YAAY,EAAE,MAAM,EACpB,QAAQ,GAAE,EAAE,EAAO,EACnB,YAAY,GAAE,OAAe,EAC7B,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CA4D3B;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,sBAAsB,EACxC,gBAAgB,GAAE,GAAiB,EACnC,UAAU,GAAE,OAAe,GAC1B,EAAE,CAgCJ;AAED,qBAAa,+BAA+B;IAC1C,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAAS;IAClB,UAAU,EAAE,gBAAgB,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,aAAa,CAAsB;IACpC,gBAAgB,EAAE,2BAA2B,CAAC;IACrD,OAAO,CAAC,kBAAkB,CAAK;IACxB,qBAAqB,EAAE,2BAA2B,CAAC;;IA0B1D,iBAAiB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAI/F,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAIjC,gBAAgB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAIvD,qBAAqB,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;IAI3C,gBAAgB,CAAC,cAAc,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAQxE,mBAAmB,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;IAIpC,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAIlF,uBAAuB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI7F,mBAAmB,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;CAGxF"}
@@ -1,20 +1,16 @@
1
- import { PublicExecutionRequest, Tx } from '@aztec/circuit-types';
2
- import { CallContext, DEFAULT_GAS_LIMIT, FunctionSelector, Gas, GasFees, GasSettings, GlobalVariables, Header, MAX_L2_GAS_PER_ENQUEUED_CALL, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PublicKeys, RollupValidationRequests, SerializableContractInstance, TxConstantData, TxContext, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
1
+ import { MerkleTreeId, PublicExecutionRequest, Tx } from '@aztec/circuit-types';
2
+ import { BlockHeader, CallContext, DEFAULT_GAS_LIMIT, DEPLOYER_CONTRACT_ADDRESS, FunctionSelector, Gas, GasFees, GasSettings, GlobalVariables, MAX_L2_GAS_PER_TX_PUBLIC_PORTION, PartialPrivateTailPublicInputsForPublic, PrivateKernelTailCircuitPublicInputs, PublicKeys, RollupValidationRequests, SerializableContractInstance, TxConstantData, TxContext, computePublicBytecodeCommitment, } from '@aztec/circuits.js';
3
+ import { siloNullifier } from '@aztec/circuits.js/hash';
3
4
  import { makeContractClassPublic, makeContractInstanceFromClassId } from '@aztec/circuits.js/testing';
4
5
  import { AztecAddress } from '@aztec/foundation/aztec-address';
5
6
  import { Fr, Point } from '@aztec/foundation/fields';
6
- import { openTmpStore } from '@aztec/kv-store/utils';
7
+ import { openTmpStore } from '@aztec/kv-store/lmdb';
7
8
  import { AvmTestContractArtifact } from '@aztec/noir-contracts.js';
8
9
  import { PublicTxSimulator, WorldStateDB } from '@aztec/simulator';
9
10
  import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
10
11
  import { MerkleTrees } from '@aztec/world-state';
11
12
  import { strict as assert } from 'assert';
12
- /**
13
- * If assertionErrString is set, we expect a (non exceptional halting) revert due to a failing assertion and
14
- * we check that the revert reason error contains this string. However, the circuit must correctly prove the
15
- * execution.
16
- */
17
- export async function simulateAvmTestContractGenerateCircuitInputs(functionName, calldata = [], assertionErrString) {
13
+ export async function simulateAvmTestContractGenerateCircuitInputs(functionName, calldata = [], expectRevert = false, assertionErrString) {
18
14
  const sender = AztecAddress.random();
19
15
  const functionSelector = getAvmTestContractFunctionSelector(functionName);
20
16
  calldata = [functionSelector.toField(), ...calldata];
@@ -26,22 +22,28 @@ export async function simulateAvmTestContractGenerateCircuitInputs(functionName,
26
22
  const contractDataSource = new MockedAvmTestContractDataSource();
27
23
  const worldStateDB = new WorldStateDB(merkleTrees, contractDataSource);
28
24
  const contractInstance = contractDataSource.contractInstance;
25
+ const contractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractInstance.address.toField());
26
+ await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [contractAddressNullifier.toBuffer()], 0);
27
+ // other contract address used by the bulk test's GETCONTRACTINSTANCE test
28
+ const otherContractAddressNullifier = siloNullifier(AztecAddress.fromNumber(DEPLOYER_CONTRACT_ADDRESS), contractDataSource.otherContractInstance.address.toField());
29
+ await merkleTrees.batchInsert(MerkleTreeId.NULLIFIER_TREE, [otherContractAddressNullifier.toBuffer()], 0);
29
30
  const simulator = new PublicTxSimulator(merkleTrees, worldStateDB, new NoopTelemetryClient(), globalVariables,
30
- /*realAvmProving=*/ true,
31
31
  /*doMerkleOperations=*/ true);
32
32
  const callContext = new CallContext(sender, contractInstance.address, contractDataSource.fnSelector,
33
33
  /*isStaticCall=*/ false);
34
34
  const executionRequest = new PublicExecutionRequest(callContext, calldata);
35
35
  const tx = createTxForPublicCall(executionRequest);
36
36
  const avmResult = await simulator.simulate(tx);
37
- if (assertionErrString == undefined) {
37
+ if (!expectRevert) {
38
38
  expect(avmResult.revertCode.isOK()).toBe(true);
39
39
  }
40
40
  else {
41
41
  // Explicit revert when an assertion failed.
42
42
  expect(avmResult.revertCode.isOK()).toBe(false);
43
43
  expect(avmResult.revertReason).toBeDefined();
44
- expect(avmResult.revertReason?.getMessage()).toContain(assertionErrString);
44
+ if (assertionErrString !== undefined) {
45
+ expect(avmResult.revertReason?.getMessage()).toContain(assertionErrString);
46
+ }
45
47
  }
46
48
  const avmCircuitInputs = avmResult.avmProvingRequest.inputs;
47
49
  return avmCircuitInputs;
@@ -52,7 +54,7 @@ export async function simulateAvmTestContractGenerateCircuitInputs(functionName,
52
54
  export function createTxForPublicCall(executionRequest, gasUsedByPrivate = Gas.empty(), isTeardown = false) {
53
55
  const callRequest = executionRequest.toCallRequest();
54
56
  // use max limits
55
- const gasLimits = new Gas(DEFAULT_GAS_LIMIT, MAX_L2_GAS_PER_ENQUEUED_CALL);
57
+ const gasLimits = new Gas(DEFAULT_GAS_LIMIT, MAX_L2_GAS_PER_TX_PUBLIC_PORTION);
56
58
  const forPublic = PartialPrivateTailPublicInputsForPublic.empty();
57
59
  // TODO(#9269): Remove this fake nullifier method as we move away from 1st nullifier as hash.
58
60
  forPublic.nonRevertibleAccumulatedData.nullifiers[0] = Fr.random(); // fake tx nullifier
@@ -65,7 +67,7 @@ export function createTxForPublicCall(executionRequest, gasUsedByPrivate = Gas.e
65
67
  const teardownGasLimits = isTeardown ? gasLimits : Gas.empty();
66
68
  const gasSettings = new GasSettings(gasLimits, teardownGasLimits, GasFees.empty());
67
69
  const txContext = new TxContext(Fr.zero(), Fr.zero(), gasSettings);
68
- const constantData = new TxConstantData(Header.empty(), txContext, Fr.zero(), Fr.zero());
70
+ const constantData = new TxConstantData(BlockHeader.empty(), txContext, Fr.zero(), Fr.zero());
69
71
  const txData = new PrivateKernelTailCircuitPublicInputs(constantData, RollupValidationRequests.empty(),
70
72
  /*gasUsed=*/ gasUsedByPrivate, AztecAddress.zero(), forPublic);
71
73
  const tx = isTeardown ? Tx.newWithTxData(txData, executionRequest) : Tx.newWithTxData(txData);
@@ -74,7 +76,7 @@ export function createTxForPublicCall(executionRequest, gasUsedByPrivate = Gas.e
74
76
  }
75
77
  return tx;
76
78
  }
77
- class MockedAvmTestContractDataSource {
79
+ export class MockedAvmTestContractDataSource {
78
80
  constructor() {
79
81
  this.fnName = 'public_dispatch';
80
82
  this.bytecode = getAvmTestContractBytecode(this.fnName);
@@ -84,6 +86,7 @@ class MockedAvmTestContractDataSource {
84
86
  this.contractInstance = makeContractInstanceFromClassId(this.contractClass.id);
85
87
  this.bytecodeCommitment = computePublicBytecodeCommitment(this.bytecode);
86
88
  // The values here should match those in `avm_simulator.test.ts`
89
+ // Used for GETCONTRACTINSTANCE test
87
90
  this.otherContractInstance = new SerializableContractInstance({
88
91
  version: 1,
89
92
  salt: new Fr(0x123),
@@ -91,7 +94,7 @@ class MockedAvmTestContractDataSource {
91
94
  contractClassId: new Fr(0x789),
92
95
  initializationHash: new Fr(0x101112),
93
96
  publicKeys: new PublicKeys(new Point(new Fr(0x131415), new Fr(0x161718), false), new Point(new Fr(0x192021), new Fr(0x222324), false), new Point(new Fr(0x252627), new Fr(0x282930), false), new Point(new Fr(0x313233), new Fr(0x343536), false)),
94
- }).withAddress(this.contractInstance.address);
97
+ }).withAddress(AztecAddress.fromNumber(0x4444));
95
98
  }
96
99
  getPublicFunction(_address, _selector) {
97
100
  return Promise.resolve(this.publicFn);
@@ -144,4 +147,4 @@ function getAvmTestContractBytecode(functionName) {
144
147
  const artifact = getAvmTestContractArtifact(functionName);
145
148
  return artifact.bytecode;
146
149
  }
147
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"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"}
150
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/public/fixtures/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAEL,WAAW,EACX,WAAW,EAGX,iBAAiB,EACjB,yBAAyB,EACzB,gBAAgB,EAChB,GAAG,EACH,OAAO,EACP,WAAW,EACX,eAAe,EACf,gCAAgC,EAChC,uCAAuC,EACvC,oCAAoC,EAEpC,UAAU,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,cAAc,EACd,SAAS,EACT,+BAA+B,GAChC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,4BAA4B,CAAC;AAEtG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,EAAE,MAAM,IAAI,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,4CAA4C,CAChE,YAAoB,EACpB,WAAiB,EAAE,EACnB,eAAwB,KAAK,EAC7B,kBAA2B;IAE3B,MAAM,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC;IACrC,MAAM,gBAAgB,GAAG,kCAAkC,CAAC,YAAY,CAAC,CAAC;IAC1E,QAAQ,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,EAAE,GAAG,QAAQ,CAAC,CAAC;IAErD,MAAM,eAAe,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC;IAChD,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAC1C,eAAe,CAAC,SAAS,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IAE1C,MAAM,SAAS,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,WAAW,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACpF,MAAM,kBAAkB,GAAG,IAAI,+BAA+B,EAAE,CAAC;IACjE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAEvE,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;IAC7D,MAAM,wBAAwB,GAAG,aAAa,CAC5C,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAClD,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,CACnC,CAAC;IACF,MAAM,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACrG,0EAA0E;IAC1E,MAAM,6BAA6B,GAAG,aAAa,CACjD,YAAY,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAClD,kBAAkB,CAAC,qBAAqB,CAAC,OAAO,CAAC,OAAO,EAAE,CAC3D,CAAC;IACF,MAAM,WAAW,CAAC,WAAW,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,6BAA6B,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAE1G,MAAM,SAAS,GAAG,IAAI,iBAAiB,CACrC,WAAW,EACX,YAAY,EACZ,IAAI,mBAAmB,EAAE,EACzB,eAAe;IACf,uBAAuB,CAAC,IAAI,CAC7B,CAAC;IAEF,MAAM,WAAW,GAAG,IAAI,WAAW,CACjC,MAAM,EACN,gBAAgB,CAAC,OAAO,EACxB,kBAAkB,CAAC,UAAU;IAC7B,iBAAiB,CAAC,KAAK,CACxB,CAAC;IACF,MAAM,gBAAgB,GAAG,IAAI,sBAAsB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE3E,MAAM,EAAE,GAAO,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IAEvD,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAE/C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,CAAC;SAAM,CAAC;QACN,4CAA4C;QAC5C,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;QAC7C,IAAI,kBAAkB,KAAK,SAAS,EAAE,CAAC;YACrC,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC7E,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAqB,SAAS,CAAC,iBAAiB,CAAC,MAAM,CAAC;IAC9E,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,gBAAwC,EACxC,mBAAwB,GAAG,CAAC,KAAK,EAAE,EACnC,aAAsB,KAAK;IAE3B,MAAM,WAAW,GAAG,gBAAgB,CAAC,aAAa,EAAE,CAAC;IACrD,iBAAiB;IACjB,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,iBAAiB,EAAE,gCAAgC,CAAC,CAAC;IAE/E,MAAM,SAAS,GAAG,uCAAuC,CAAC,KAAK,EAAE,CAAC;IAClE,6FAA6F;IAC7F,SAAS,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,oBAAoB;IACxF,IAAI,UAAU,EAAE,CAAC;QACf,SAAS,CAAC,yBAAyB,GAAG,WAAW,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,SAAS,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC;IAC1E,CAAC;IAED,MAAM,iBAAiB,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAC/D,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC,SAAS,EAAE,iBAAiB,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,WAAW,CAAC,CAAC;IACnE,MAAM,YAAY,GAAG,IAAI,cAAc,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9F,MAAM,MAAM,GAAG,IAAI,oCAAoC,CACrD,YAAY,EACZ,wBAAwB,CAAC,KAAK,EAAE;IAChC,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,IAAI,EAAE,EACnB,SAAS,CACV,CAAC;IACF,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC9F,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;IACvD,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,OAAO,+BAA+B;IAU1C;QATQ,WAAM,GAAG,iBAAiB,CAAC;QAUjC,IAAI,CAAC,QAAQ,GAAG,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,GAAG,kCAAkC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,GAAG,uBAAuB,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,CAAC,gBAAgB,GAAG,+BAA+B,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC/E,IAAI,CAAC,kBAAkB,GAAG,+BAA+B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzE,gEAAgE;QAChE,oCAAoC;QACpC,IAAI,CAAC,qBAAqB,GAAG,IAAI,4BAA4B,CAAC;YAC5D,OAAO,EAAE,CAAC;YACV,IAAI,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC;YACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;YACzC,eAAe,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC;YAC9B,kBAAkB,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC;YACpC,UAAU,EAAE,IAAI,UAAU,CACxB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EACpD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EACpD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,EACpD,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CACrD;SACF,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,iBAAiB,CAAC,QAAsB,EAAE,SAA2B;QACnE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAED,cAAc;QACZ,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,GAAO;QACtB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED,qBAAqB,CAAC,GAAO;QAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC;IAED,gBAAgB,CAAC,cAAmC;QAClD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,WAAW,CAAC,OAAqB;QAC/B,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAED,mBAAmB;QACjB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,mBAAmB,CAAC,QAAsB;QACxC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,uBAAuB,CAAC,QAAsB,EAAE,SAA2B;QACzE,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,mBAAmB,CAAC,QAAsB,EAAE,SAA2B;QACrE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF;AAED,SAAS,kCAAkC,CAAC,YAAoB;IAC9D,MAAM,QAAQ,GAAG,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAE,CAAC;IACvF,MAAM,CAAC,CAAC,CAAC,QAAQ,EAAE,YAAY,YAAY,uCAAuC,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;IACnC,OAAO,gBAAgB,CAAC,qBAAqB,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,0BAA0B,CAAC,YAAoB;IACtD,MAAM,QAAQ,GAAG,uBAAuB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAE,CAAC;IACvF,MAAM,CACJ,CAAC,CAAC,QAAQ,EAAE,QAAQ,EACpB,kCAAkC,YAAY,uDAAuD,CACtG,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,0BAA0B,CAAC,YAAoB;IACtD,MAAM,QAAQ,GAAG,0BAA0B,CAAC,YAAY,CAAC,CAAC;IAC1D,OAAO,QAAQ,CAAC,QAAQ,CAAC;AAC3B,CAAC"}
@@ -4,7 +4,6 @@ export { type EnqueuedPublicCallExecutionResult, type PublicFunctionCallResult }
4
4
  export * from './fee_payment.js';
5
5
  export * from './public_db_sources.js';
6
6
  export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
7
- export { PublicSideEffectTrace } from './side_effect_trace.js';
8
7
  export { PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
9
8
  export { getExecutionRequestsByPhase } from './utils.js';
10
9
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,KAAK,iCAAiC,EAAE,KAAK,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AACvG,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/public/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,KAAK,iCAAiC,EAAE,KAAK,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AACvG,cAAc,kBAAkB,CAAC;AACjC,cAAc,wBAAwB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,iCAAiC,EAAE,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC"}
@@ -3,7 +3,6 @@ export * from './public_tx_simulator.js';
3
3
  export * from './fee_payment.js';
4
4
  export * from './public_db_sources.js';
5
5
  export { PublicProcessor, PublicProcessorFactory } from './public_processor.js';
6
- export { PublicSideEffectTrace } from './side_effect_trace.js';
7
6
  export { PublicEnqueuedCallSideEffectTrace } from './enqueued_call_side_effect_trace.js';
8
7
  export { getExecutionRequestsByPhase } from './utils.js';
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYywwQkFBMEIsQ0FBQztBQUV6QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsT0FBTyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2hGLE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBQy9ELE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3pGLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLFlBQVksQ0FBQyJ9
8
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLGNBQWMsb0JBQW9CLENBQUM7QUFDbkMsY0FBYywwQkFBMEIsQ0FBQztBQUV6QyxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMsd0JBQXdCLENBQUM7QUFDdkMsT0FBTyxFQUFFLGVBQWUsRUFBRSxzQkFBc0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ2hGLE9BQU8sRUFBRSxpQ0FBaUMsRUFBRSxNQUFNLHNDQUFzQyxDQUFDO0FBQ3pGLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLFlBQVksQ0FBQyJ9