@aztec/simulator 0.32.1 → 0.33.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 (118) hide show
  1. package/README.md +5 -3
  2. package/dest/acvm/oracle/index.d.ts +0 -1
  3. package/dest/acvm/oracle/index.d.ts.map +1 -1
  4. package/dest/acvm/oracle/index.js +1 -2
  5. package/dest/acvm/oracle/oracle.d.ts.map +1 -1
  6. package/dest/acvm/oracle/oracle.js +2 -3
  7. package/dest/avm/avm_context.d.ts +4 -14
  8. package/dest/avm/avm_context.d.ts.map +1 -1
  9. package/dest/avm/avm_context.js +10 -22
  10. package/dest/avm/avm_gas.d.ts +71 -0
  11. package/dest/avm/avm_gas.d.ts.map +1 -0
  12. package/dest/avm/avm_gas.js +161 -0
  13. package/dest/avm/avm_machine_state.d.ts +4 -2
  14. package/dest/avm/avm_machine_state.d.ts.map +1 -1
  15. package/dest/avm/avm_machine_state.js +8 -2
  16. package/dest/avm/avm_memory_types.d.ts +53 -1
  17. package/dest/avm/avm_memory_types.d.ts.map +1 -1
  18. package/dest/avm/avm_memory_types.js +95 -2
  19. package/dest/avm/avm_simulator.d.ts.map +1 -1
  20. package/dest/avm/avm_simulator.js +10 -8
  21. package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
  22. package/dest/avm/opcodes/accrued_substate.js +44 -16
  23. package/dest/avm/opcodes/addressing_mode.d.ts +5 -3
  24. package/dest/avm/opcodes/addressing_mode.d.ts.map +1 -1
  25. package/dest/avm/opcodes/addressing_mode.js +5 -1
  26. package/dest/avm/opcodes/arithmetic.d.ts +7 -3
  27. package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
  28. package/dest/avm/opcodes/arithmetic.js +27 -16
  29. package/dest/avm/opcodes/bitwise.d.ts +21 -20
  30. package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
  31. package/dest/avm/opcodes/bitwise.js +43 -65
  32. package/dest/avm/opcodes/comparators.d.ts +12 -9
  33. package/dest/avm/opcodes/comparators.d.ts.map +1 -1
  34. package/dest/avm/opcodes/comparators.js +22 -32
  35. package/dest/avm/opcodes/context_getters.d.ts +20 -0
  36. package/dest/avm/opcodes/context_getters.d.ts.map +1 -0
  37. package/dest/avm/opcodes/context_getters.js +26 -0
  38. package/dest/avm/opcodes/contract.d.ts +14 -0
  39. package/dest/avm/opcodes/contract.d.ts.map +1 -0
  40. package/dest/avm/opcodes/contract.js +49 -0
  41. package/dest/avm/opcodes/control_flow.d.ts.map +1 -1
  42. package/dest/avm/opcodes/control_flow.js +12 -2
  43. package/dest/avm/opcodes/environment_getters.d.ts +30 -33
  44. package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
  45. package/dest/avm/opcodes/environment_getters.js +34 -43
  46. package/dest/avm/opcodes/external_calls.d.ts +13 -19
  47. package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
  48. package/dest/avm/opcodes/external_calls.js +50 -68
  49. package/dest/avm/opcodes/hashing.d.ts +2 -1
  50. package/dest/avm/opcodes/hashing.d.ts.map +1 -1
  51. package/dest/avm/opcodes/hashing.js +37 -18
  52. package/dest/avm/opcodes/index.d.ts +1 -0
  53. package/dest/avm/opcodes/index.d.ts.map +1 -1
  54. package/dest/avm/opcodes/index.js +2 -1
  55. package/dest/avm/opcodes/instruction.d.ts +10 -15
  56. package/dest/avm/opcodes/instruction.d.ts.map +1 -1
  57. package/dest/avm/opcodes/instruction.js +12 -22
  58. package/dest/avm/opcodes/instruction_impl.d.ts +14 -0
  59. package/dest/avm/opcodes/instruction_impl.d.ts.map +1 -1
  60. package/dest/avm/opcodes/instruction_impl.js +37 -16
  61. package/dest/avm/opcodes/memory.d.ts +4 -3
  62. package/dest/avm/opcodes/memory.d.ts.map +1 -1
  63. package/dest/avm/opcodes/memory.js +38 -19
  64. package/dest/avm/opcodes/storage.d.ts +5 -0
  65. package/dest/avm/opcodes/storage.d.ts.map +1 -1
  66. package/dest/avm/opcodes/storage.js +21 -7
  67. package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
  68. package/dest/avm/serialization/bytecode_serialization.js +7 -5
  69. package/dest/avm/serialization/instruction_serialization.d.ts +12 -11
  70. package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
  71. package/dest/avm/serialization/instruction_serialization.js +13 -12
  72. package/dest/avm/temporary_executor_migration.d.ts +2 -0
  73. package/dest/avm/temporary_executor_migration.d.ts.map +1 -1
  74. package/dest/avm/temporary_executor_migration.js +14 -3
  75. package/dest/client/private_execution.d.ts.map +1 -1
  76. package/dest/client/private_execution.js +6 -2
  77. package/dest/public/executor.d.ts +10 -2
  78. package/dest/public/executor.d.ts.map +1 -1
  79. package/dest/public/executor.js +59 -20
  80. package/dest/public/index.d.ts +1 -1
  81. package/dest/public/index.d.ts.map +1 -1
  82. package/package.json +15 -9
  83. package/src/acvm/oracle/index.ts +0 -1
  84. package/src/acvm/oracle/oracle.ts +1 -2
  85. package/src/avm/avm_context.ts +11 -33
  86. package/src/avm/{avm_gas_cost.ts → avm_gas.ts} +75 -21
  87. package/src/avm/avm_machine_state.ts +9 -2
  88. package/src/avm/avm_memory_types.ts +130 -2
  89. package/src/avm/avm_simulator.ts +9 -7
  90. package/src/avm/opcodes/accrued_substate.ts +57 -22
  91. package/src/avm/opcodes/addressing_mode.ts +8 -3
  92. package/src/avm/opcodes/arithmetic.ts +32 -22
  93. package/src/avm/opcodes/bitwise.ts +49 -83
  94. package/src/avm/opcodes/comparators.ts +28 -43
  95. package/src/avm/opcodes/context_getters.ts +32 -0
  96. package/src/avm/opcodes/contract.ts +58 -0
  97. package/src/avm/opcodes/control_flow.ts +23 -5
  98. package/src/avm/opcodes/environment_getters.ts +35 -44
  99. package/src/avm/opcodes/external_calls.ts +65 -84
  100. package/src/avm/opcodes/hashing.ts +45 -22
  101. package/src/avm/opcodes/index.ts +1 -0
  102. package/src/avm/opcodes/instruction.ts +14 -26
  103. package/src/avm/opcodes/instruction_impl.ts +45 -15
  104. package/src/avm/opcodes/memory.ts +48 -28
  105. package/src/avm/opcodes/storage.ts +26 -12
  106. package/src/avm/serialization/bytecode_serialization.ts +6 -3
  107. package/src/avm/serialization/instruction_serialization.ts +1 -0
  108. package/src/avm/temporary_executor_migration.ts +16 -2
  109. package/src/client/private_execution.ts +8 -2
  110. package/src/public/executor.ts +75 -22
  111. package/src/public/index.ts +2 -2
  112. package/dest/acvm/oracle/debug.d.ts +0 -19
  113. package/dest/acvm/oracle/debug.d.ts.map +0 -1
  114. package/dest/acvm/oracle/debug.js +0 -95
  115. package/dest/avm/avm_gas_cost.d.ts +0 -322
  116. package/dest/avm/avm_gas_cost.d.ts.map +0 -1
  117. package/dest/avm/avm_gas_cost.js +0 -118
  118. package/src/acvm/oracle/debug.ts +0 -109
@@ -1,6 +1,7 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  import { Fr } from '@aztec/foundation/fields';
3
3
  import { type DebugLogger } from '@aztec/foundation/log';
4
+ import { type FunctionsOf } from '@aztec/foundation/types';
4
5
  /** MemoryValue gathers the common operations for all memory types. */
5
6
  export declare abstract class MemoryValue {
6
7
  abstract add(rhs: MemoryValue): MemoryValue;
@@ -13,6 +14,7 @@ export declare abstract class MemoryValue {
13
14
  abstract toBigInt(): bigint;
14
15
  abstract toBuffer(): Buffer;
15
16
  toFr(): Fr;
17
+ toNumber(): number;
16
18
  toString(): string;
17
19
  }
18
20
  /** IntegralValue gathers the common operations for all integral memory types. */
@@ -43,6 +45,7 @@ declare const Uint8_base: {
43
45
  toBigInt(): bigint;
44
46
  toBuffer(): Buffer;
45
47
  toFr(): Fr;
48
+ toNumber(): number;
46
49
  toString(): string;
47
50
  };
48
51
  readonly mod: bigint;
@@ -69,6 +72,7 @@ declare const Uint16_base: {
69
72
  toBigInt(): bigint;
70
73
  toBuffer(): Buffer;
71
74
  toFr(): Fr;
75
+ toNumber(): number;
72
76
  toString(): string;
73
77
  };
74
78
  readonly mod: bigint;
@@ -95,6 +99,7 @@ declare const Uint32_base: {
95
99
  toBigInt(): bigint;
96
100
  toBuffer(): Buffer;
97
101
  toFr(): Fr;
102
+ toNumber(): number;
98
103
  toString(): string;
99
104
  };
100
105
  readonly mod: bigint;
@@ -121,6 +126,7 @@ declare const Uint64_base: {
121
126
  toBigInt(): bigint;
122
127
  toBuffer(): Buffer;
123
128
  toFr(): Fr;
129
+ toNumber(): number;
124
130
  toString(): string;
125
131
  };
126
132
  readonly mod: bigint;
@@ -147,6 +153,7 @@ declare const Uint128_base: {
147
153
  toBigInt(): bigint;
148
154
  toBuffer(): Buffer;
149
155
  toFr(): Fr;
156
+ toNumber(): number;
150
157
  toString(): string;
151
158
  };
152
159
  readonly mod: bigint;
@@ -179,11 +186,15 @@ export declare enum TypeTag {
179
186
  FIELD = 6,
180
187
  INVALID = 7
181
188
  }
182
- export declare class TaggedMemory {
189
+ export type TaggedMemoryInterface = FunctionsOf<TaggedMemory>;
190
+ export declare class TaggedMemory implements TaggedMemoryInterface {
183
191
  static readonly log: DebugLogger;
192
+ static readonly TRACK_MEMORY_ACCESSES: boolean;
184
193
  static readonly MAX_MEMORY_SIZE: number;
185
194
  private _mem;
186
195
  constructor();
196
+ /** Returns a MeteredTaggedMemory instance to track the number of reads and writes if TRACK_MEMORY_ACCESSES is set. */
197
+ track(type?: string): this | MeteredTaggedMemory;
187
198
  get(offset: number): MemoryValue;
188
199
  getAs<T>(offset: number): T;
189
200
  getSlice(offset: number, size: number): MemoryValue[];
@@ -209,6 +220,47 @@ export declare class TaggedMemory {
209
220
  static getTag(v: MemoryValue | undefined): TypeTag;
210
221
  static integralFromTag(v: bigint | number, tag: TypeTag): IntegralValue;
211
222
  static buildFromTagOrDie(v: bigint | number, tag: TypeTag): MemoryValue;
223
+ /** No-op. Implemented here for compatibility with the MeteredTaggedMemory. */
224
+ assert(_operations: Partial<MemoryOperations & {
225
+ indirect: number;
226
+ }>): void;
212
227
  }
228
+ /** Tagged memory wrapper with metering for each memory read and write operation. */
229
+ export declare class MeteredTaggedMemory implements TaggedMemoryInterface {
230
+ private wrapped;
231
+ private type;
232
+ private reads;
233
+ private writes;
234
+ constructor(wrapped: TaggedMemory, type?: string);
235
+ /** Returns the number of reads and writes tracked so far and resets them to zero. */
236
+ reset(): MemoryOperations;
237
+ /**
238
+ * Asserts that the exact number of memory operations have been performed.
239
+ * Indirect represents the flags for indirect accesses: each bit set to one counts as an extra read.
240
+ */
241
+ assert(operations: Partial<MemoryOperations & {
242
+ indirect: number;
243
+ }>): void;
244
+ track(type?: string): MeteredTaggedMemory;
245
+ get(offset: number): MemoryValue;
246
+ getSliceAs<T>(offset: number, size: number): T[];
247
+ getAs<T>(offset: number): T;
248
+ getSlice(offset: number, size: number): MemoryValue[];
249
+ set(offset: number, v: MemoryValue): void;
250
+ setSlice(offset: number, vs: MemoryValue[]): void;
251
+ getSliceTags(offset: number, size: number): TypeTag[];
252
+ getTag(offset: number): TypeTag;
253
+ checkTag(tag: TypeTag, offset: number): void;
254
+ checkIsValidMemoryOffsetTag(offset: number): void;
255
+ checkTags(tag: TypeTag, ...offsets: number[]): void;
256
+ checkTagsRange(tag: TypeTag, startOffset: number, size: number): void;
257
+ }
258
+ /** Tracks number of memory reads and writes. */
259
+ export type MemoryOperations = {
260
+ /** How many total reads are performed. Slice reads are count as one per element. */
261
+ reads: number;
262
+ /** How many total writes are performed. Slice writes are count as one per element. */
263
+ writes: number;
264
+ };
213
265
  export {};
214
266
  //# sourceMappingURL=avm_memory_types.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
@@ -2,13 +2,18 @@ import { toBufferBE } from '@aztec/foundation/bigint-buffer';
2
2
  import { Fr } from '@aztec/foundation/fields';
3
3
  import { createDebugLogger } from '@aztec/foundation/log';
4
4
  import { strict as assert } from 'assert';
5
- import { TagCheckError } from './errors.js';
5
+ import { InstructionExecutionError, TagCheckError } from './errors.js';
6
+ import { Addressing, AddressingMode } from './opcodes/addressing_mode.js';
6
7
  /** MemoryValue gathers the common operations for all memory types. */
7
8
  export class MemoryValue {
8
9
  // To field
9
10
  toFr() {
10
11
  return new Fr(this.toBigInt());
11
12
  }
13
+ // To number. Throws if exceeds max safe int.
14
+ toNumber() {
15
+ return this.toFr().toNumber();
16
+ }
12
17
  toString() {
13
18
  return `${this.constructor.name}(0x${this.toBigInt().toString(16)})`;
14
19
  }
@@ -150,6 +155,10 @@ export class TaggedMemory {
150
155
  // We do not initialize memory size here because otherwise tests blow up when diffing.
151
156
  this._mem = [];
152
157
  }
158
+ /** Returns a MeteredTaggedMemory instance to track the number of reads and writes if TRACK_MEMORY_ACCESSES is set. */
159
+ track(type = 'instruction') {
160
+ return TaggedMemory.TRACK_MEMORY_ACCESSES ? new MeteredTaggedMemory(this, type) : this;
161
+ }
153
162
  get(offset) {
154
163
  assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
155
164
  const value = this.getAs(offset);
@@ -159,6 +168,9 @@ export class TaggedMemory {
159
168
  assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
160
169
  const word = this._mem[offset];
161
170
  TaggedMemory.log(`get(${offset}) = ${word}`);
171
+ if (word === undefined) {
172
+ TaggedMemory.log.warn(`Memory at offset ${offset} is undefined! This might be OK if it's stack dumping.`);
173
+ }
162
174
  return word;
163
175
  }
164
176
  getSlice(offset, size) {
@@ -166,6 +178,7 @@ export class TaggedMemory {
166
178
  assert(offset + size < TaggedMemory.MAX_MEMORY_SIZE);
167
179
  const value = this._mem.slice(offset, offset + size);
168
180
  TaggedMemory.log(`getSlice(${offset}, ${size}) = ${value}`);
181
+ assert(!value.some(e => e === undefined), 'Memory slice contains undefined values.');
169
182
  assert(value.length === size, `Expected slice of size ${size}, got ${value.length}.`);
170
183
  return value;
171
184
  }
@@ -295,8 +308,88 @@ export class TaggedMemory {
295
308
  throw new Error(`${TypeTag[tag]} is not a valid integral type.`);
296
309
  }
297
310
  }
311
+ /** No-op. Implemented here for compatibility with the MeteredTaggedMemory. */
312
+ assert(_operations) { }
298
313
  }
299
314
  TaggedMemory.log = createDebugLogger('aztec:avm_simulator:memory');
315
+ // Whether to track and validate memory accesses for each instruction.
316
+ TaggedMemory.TRACK_MEMORY_ACCESSES = process.env.NODE_ENV === 'test';
300
317
  // FIXME: memory should be 2^32, but TS doesn't allow for arrays that big.
301
318
  TaggedMemory.MAX_MEMORY_SIZE = Number((1n << 32n) - 2n);
302
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avm_memory_types.js","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
319
+ /** Tagged memory wrapper with metering for each memory read and write operation. */
320
+ export class MeteredTaggedMemory {
321
+ constructor(wrapped, type = 'instruction') {
322
+ this.wrapped = wrapped;
323
+ this.type = type;
324
+ this.reads = 0;
325
+ this.writes = 0;
326
+ }
327
+ /** Returns the number of reads and writes tracked so far and resets them to zero. */
328
+ reset() {
329
+ const stats = { reads: this.reads, writes: this.writes };
330
+ this.reads = 0;
331
+ this.writes = 0;
332
+ return stats;
333
+ }
334
+ /**
335
+ * Asserts that the exact number of memory operations have been performed.
336
+ * Indirect represents the flags for indirect accesses: each bit set to one counts as an extra read.
337
+ */
338
+ assert(operations) {
339
+ const { reads: expectedReads, writes: expectedWrites, indirect } = { reads: 0, writes: 0, ...operations };
340
+ const totalExpectedReads = expectedReads + Addressing.fromWire(indirect ?? 0).count(AddressingMode.INDIRECT);
341
+ const { reads: actualReads, writes: actualWrites } = this.reset();
342
+ if (actualReads !== totalExpectedReads) {
343
+ throw new InstructionExecutionError(`Incorrect number of memory reads for ${this.type}: expected ${totalExpectedReads} but executed ${actualReads}`);
344
+ }
345
+ if (actualWrites !== expectedWrites) {
346
+ throw new InstructionExecutionError(`Incorrect number of memory writes for ${this.type}: expected ${expectedWrites} but executed ${actualWrites}`);
347
+ }
348
+ }
349
+ track(type = 'instruction') {
350
+ return new MeteredTaggedMemory(this.wrapped, type);
351
+ }
352
+ get(offset) {
353
+ this.reads++;
354
+ return this.wrapped.get(offset);
355
+ }
356
+ getSliceAs(offset, size) {
357
+ this.reads += size;
358
+ return this.wrapped.getSliceAs(offset, size);
359
+ }
360
+ getAs(offset) {
361
+ this.reads++;
362
+ return this.wrapped.getAs(offset);
363
+ }
364
+ getSlice(offset, size) {
365
+ this.reads += size;
366
+ return this.wrapped.getSlice(offset, size);
367
+ }
368
+ set(offset, v) {
369
+ this.writes++;
370
+ this.wrapped.set(offset, v);
371
+ }
372
+ setSlice(offset, vs) {
373
+ this.writes += vs.length;
374
+ this.wrapped.setSlice(offset, vs);
375
+ }
376
+ getSliceTags(offset, size) {
377
+ return this.wrapped.getSliceTags(offset, size);
378
+ }
379
+ getTag(offset) {
380
+ return this.wrapped.getTag(offset);
381
+ }
382
+ checkTag(tag, offset) {
383
+ this.wrapped.checkTag(tag, offset);
384
+ }
385
+ checkIsValidMemoryOffsetTag(offset) {
386
+ this.wrapped.checkIsValidMemoryOffsetTag(offset);
387
+ }
388
+ checkTags(tag, ...offsets) {
389
+ this.wrapped.checkTags(tag, ...offsets);
390
+ }
391
+ checkTagsRange(tag, startOffset, size) {
392
+ this.wrapped.checkTagsRange(tag, startOffset, size);
393
+ }
394
+ }
395
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avm_memory_types.js","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../src/avm/avm_simulator.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,YAAY;IAGX,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,GAAG,CAAc;gBAEL,OAAO,EAAE,UAAU;IAMvC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAgBvD;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAI/E;;;OAGG;IACU,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC;CA0C/F"}
1
+ {"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../src/avm/avm_simulator.ts"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGtD,qBAAa,YAAY;IAGX,OAAO,CAAC,OAAO;IAF3B,OAAO,CAAC,GAAG,CAAc;gBAEL,OAAO,EAAE,UAAU;IAMvC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,sBAAsB,CAAC;IAgBvD;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAI/E;;;OAGG;IACU,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC;CA4C/F"}
@@ -34,24 +34,26 @@ export class AvmSimulator {
34
34
  */
35
35
  async executeInstructions(instructions) {
36
36
  assert(instructions.length > 0);
37
+ const { machineState } = this.context;
37
38
  try {
38
39
  // Execute instruction pointed to by the current program counter
39
40
  // continuing until the machine state signifies a halt
40
- while (!this.context.machineState.halted) {
41
- const instruction = instructions[this.context.machineState.pc];
41
+ while (!machineState.halted) {
42
+ const instruction = instructions[machineState.pc];
42
43
  assert(!!instruction, 'AVM attempted to execute non-existent instruction. This should never happen (invalid bytecode or AVM simulator bug)!');
43
- this.log.debug(`@${this.context.machineState.pc} ${instruction.toString()}`);
44
+ const gasLeft = `l1=${machineState.l1GasLeft} l2=${machineState.l2GasLeft} da=${machineState.daGasLeft}`;
45
+ this.log.debug(`@${machineState.pc} (${gasLeft}) ${instruction.toString()}`);
44
46
  // Execute the instruction.
45
47
  // Normal returns and reverts will return normally here.
46
48
  // "Exceptional halts" will throw.
47
- await instruction.run(this.context);
48
- if (this.context.machineState.pc >= instructions.length) {
49
+ await instruction.execute(this.context);
50
+ if (machineState.pc >= instructions.length) {
49
51
  this.log('Passed end of program!');
50
- throw new InvalidProgramCounterError(this.context.machineState.pc, /*max=*/ instructions.length);
52
+ throw new InvalidProgramCounterError(machineState.pc, /*max=*/ instructions.length);
51
53
  }
52
54
  }
53
55
  // Return results for processing by calling context
54
- const results = this.context.machineState.getResults();
56
+ const results = machineState.getResults();
55
57
  this.log(`Context execution results: ${results.toString()}`);
56
58
  return results;
57
59
  }
@@ -69,4 +71,4 @@ export class AvmSimulator {
69
71
  }
70
72
  }
71
73
  }
72
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFNUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHMUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDdEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLDBCQUEwQixFQUFFLDBCQUEwQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXhHLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRS9FLE1BQU0sT0FBTyxZQUFZO0lBR3ZCLFlBQW9CLE9BQW1CO1FBQW5CLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFDckMsSUFBSSxDQUFDLEdBQUcsR0FBRyxpQkFBaUIsQ0FDMUIsOEJBQThCLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQXlCLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FDMUYsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxPQUFPO1FBQ2xCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLHlCQUF5QixDQUFDO1FBQ3BFLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FDdEYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUNoQyxRQUFRLENBQ1QsQ0FBQztRQUVGLGtGQUFrRjtRQUNsRiw2Q0FBNkM7UUFDN0MsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2QsTUFBTSxJQUFJLDBCQUEwQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsV0FB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
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFNUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHMUMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sOEJBQThCLENBQUM7QUFDdEUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLDBCQUEwQixFQUFFLDBCQUEwQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXhHLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBRS9FLE1BQU0sT0FBTyxZQUFZO0lBR3ZCLFlBQW9CLE9BQW1CO1FBQW5CLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFDckMsSUFBSSxDQUFDLEdBQUcsR0FBRyxpQkFBaUIsQ0FDMUIsOEJBQThCLE9BQU8sQ0FBQyxXQUFXLENBQUMseUJBQXlCLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FDMUYsQ0FBQztJQUNKLENBQUM7SUFFRDs7T0FFRztJQUNJLEtBQUssQ0FBQyxPQUFPO1FBQ2xCLE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLHlCQUF5QixDQUFDO1FBQ3BFLE1BQU0sUUFBUSxHQUFHLE1BQU0sSUFBSSxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FDdEYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxFQUNoQyxRQUFRLENBQ1QsQ0FBQztRQUVGLGtGQUFrRjtRQUNsRiw2Q0FBNkM7UUFDN0MsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQ2QsTUFBTSxJQUFJLDBCQUEwQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3pFLENBQUM7UUFFRCxPQUFPLE1BQU0sSUFBSSxDQUFDLGVBQWUsQ0FBQyxRQUFRLENBQUMsQ0FBQztJQUM5QyxDQUFDO0lBRUQ7OztPQUdHO0lBQ0ksS0FBSyxDQUFDLGVBQWUsQ0FBQyxRQUFnQjtRQUMzQyxPQUFPLE1BQU0sSUFBSSxDQUFDLG1CQUFtQixDQUFDLGtCQUFrQixDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7SUFDdEUsQ0FBQztJQUVEOzs7T0FHRztJQUNJLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxZQUEyQjtRQUMxRCxNQUFNLENBQUMsWUFBWSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztRQUNoQyxNQUFNLEVBQUUsWUFBWSxFQUFFLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUN0QyxJQUFJLENBQUM7WUFDSCxnRUFBZ0U7WUFDaEUsc0RBQXNEO1lBQ3RELE9BQU8sQ0FBQyxZQUFZLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQzVCLE1BQU0sV0FBVyxHQUFHLFlBQVksQ0FBQyxZQUFZLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQ2xELE1BQU0sQ0FDSixDQUFDLENBQUMsV0FBVyxFQUNiLHNIQUFzSCxDQUN2SCxDQUFDO2dCQUVGLE1BQU0sT0FBTyxHQUFHLE1BQU0sWUFBWSxDQUFDLFNBQVMsT0FBTyxZQUFZLENBQUMsU0FBUyxPQUFPLFlBQVksQ0FBQyxTQUFTLEVBQUUsQ0FBQztnQkFDekcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBSSxZQUFZLENBQUMsRUFBRSxLQUFLLE9BQU8sS0FBSyxXQUFXLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUM3RSwyQkFBMkI7Z0JBQzNCLHdEQUF3RDtnQkFDeEQsa0NBQWtDO2dCQUNsQyxNQUFNLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUV4QyxJQUFJLFlBQVksQ0FBQyxFQUFFLElBQUksWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO29CQUMzQyxJQUFJLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUM7b0JBQ25DLE1BQU0sSUFBSSwwQkFBMEIsQ0FBQyxZQUFZLENBQUMsRUFBRSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3RGLENBQUM7WUFDSCxDQUFDO1lBRUQsbURBQW1EO1lBQ25ELE1BQU0sT0FBTyxHQUFHLFlBQVksQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUMxQyxJQUFJLENBQUMsR0FBRyxDQUFDLDhCQUE4QixPQUFPLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBQzdELE9BQU8sT0FBTyxDQUFDO1FBQ2pCLENBQUM7UUFBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ1gsSUFBSSxDQUFDLEdBQUcsQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQzdCLElBQUksQ0FBQyxDQUFDLENBQUMsWUFBWSxpQkFBaUIsQ0FBQyxFQUFFLENBQUM7Z0JBQ3RDLElBQUksQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLENBQUMsRUFBRSxDQUFDLENBQUM7Z0JBQzlDLE1BQU0sQ0FBQyxDQUFDO1lBQ1YsQ0FBQztZQUVELG1EQUFtRDtZQUNuRCwrQ0FBK0M7WUFDL0MsTUFBTSxPQUFPLEdBQUcsSUFBSSxzQkFBc0IsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFdBQVcsQ0FBQyxFQUFFLEVBQUUsaUJBQWlCLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDcEcsSUFBSSxDQUFDLEdBQUcsQ0FBQyw4QkFBOEIsT0FBTyxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztZQUM3RCxPQUFPLE9BQU8sQ0FBQztRQUNqQixDQUFDO0lBQ0gsQ0FBQztDQUNGIn0=
@@ -1 +1 @@
1
- {"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"accrued_substate.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.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;AAG/C,qBAAa,cAAe,SAAQ,WAAW;IAa3C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAoB;IACvC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAyB;IAEvD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EACvB,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAmBzD;AAED,qBAAa,YAAa,SAAQ,WAAW;IAM/B,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,cAAc;IAL5D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAkB;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAuB;IAErD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,cAAc,EAAE,MAAM;IAIvD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAezD;AAED,qBAAa,eAAgB,SAAQ,WAAW;IAMlC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAAU,OAAO,CAAC,YAAY;IAL3F,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAAkF;gBAExF,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM,EAAU,YAAY,EAAE,MAAM;IAItF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAazD;AAED,qBAAa,aAAc,SAAQ,WAAW;IAMhC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAL7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAmB;IACtC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAwB;IAEtD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAA8D;gBAEpE,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM;IAIxD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CA0BzD;AAED,qBAAa,mBAAoB,SAAQ,WAAW;IAahD,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,YAAY;IAftB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAqB;IACxC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA0B;IAExD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,kBAAkB,EAAE,MAAM,EAC1B,YAAY,EAAE,MAAM;IAKjB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAazD;AAED,qBAAa,kBAAmB,SAAQ,WAAW;IAa/C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,mBAAmB;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,OAAO;IAfjB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAwB;IAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;IAE3D,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAMxB;gBAGQ,QAAQ,EAAE,MAAM,EAChB,mBAAmB,EAAE,MAAM,EAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM;IAKZ,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBzD;AAED,qBAAa,iBAAkB,SAAQ,WAAW;IAMpC,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,eAAe;IAAU,OAAO,CAAC,aAAa;IAL5F,MAAM,CAAC,IAAI,EAAE,MAAM,CAAmB;IACtC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAwB;IAEtD,MAAM,CAAC,QAAQ,CAAC,UAAU,gBAAkF;gBAExF,QAAQ,EAAE,MAAM,EAAU,eAAe,EAAE,MAAM,EAAU,aAAa,EAAE,MAAM;IAIvF,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBzD"}
@@ -14,11 +14,15 @@ export class NoteHashExists extends Instruction {
14
14
  this.existsOffset = existsOffset;
15
15
  }
16
16
  async execute(context) {
17
+ const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
18
+ const memory = context.machineState.memory.track(this.type);
19
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
17
20
  // Note that this instruction accepts any type in memory, and converts to Field.
18
- const noteHash = context.machineState.memory.get(this.noteHashOffset).toFr();
19
- const leafIndex = context.machineState.memory.get(this.leafIndexOffset).toFr();
21
+ const noteHash = memory.get(this.noteHashOffset).toFr();
22
+ const leafIndex = memory.get(this.leafIndexOffset).toFr();
20
23
  const exists = await context.persistableState.checkNoteHashExists(context.environment.storageAddress, noteHash, leafIndex);
21
- context.machineState.memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
24
+ memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
25
+ memory.assert(memoryOperations);
22
26
  context.machineState.incrementPc();
23
27
  }
24
28
  }
@@ -39,11 +43,15 @@ export class EmitNoteHash extends Instruction {
39
43
  this.noteHashOffset = noteHashOffset;
40
44
  }
41
45
  async execute(context) {
46
+ const memoryOperations = { reads: 1, indirect: this.indirect };
47
+ const memory = context.machineState.memory.track(this.type);
48
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
42
49
  if (context.environment.isStaticCall) {
43
50
  throw new StaticCallStorageAlterError();
44
51
  }
45
- const noteHash = context.machineState.memory.get(this.noteHashOffset).toFr();
52
+ const noteHash = memory.get(this.noteHashOffset).toFr();
46
53
  context.persistableState.writeNoteHash(noteHash);
54
+ memory.assert(memoryOperations);
47
55
  context.machineState.incrementPc();
48
56
  }
49
57
  }
@@ -59,9 +67,13 @@ export class NullifierExists extends Instruction {
59
67
  this.existsOffset = existsOffset;
60
68
  }
61
69
  async execute(context) {
62
- const nullifier = context.machineState.memory.get(this.nullifierOffset).toFr();
70
+ const memoryOperations = { reads: 1, writes: 1, indirect: this.indirect };
71
+ const memory = context.machineState.memory.track(this.type);
72
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
73
+ const nullifier = memory.get(this.nullifierOffset).toFr();
63
74
  const exists = await context.persistableState.checkNullifierExists(context.environment.storageAddress, nullifier);
64
- context.machineState.memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
75
+ memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
76
+ memory.assert(memoryOperations);
65
77
  context.machineState.incrementPc();
66
78
  }
67
79
  }
@@ -79,7 +91,10 @@ export class EmitNullifier extends Instruction {
79
91
  if (context.environment.isStaticCall) {
80
92
  throw new StaticCallStorageAlterError();
81
93
  }
82
- const nullifier = context.machineState.memory.get(this.nullifierOffset).toFr();
94
+ const memoryOperations = { reads: 1, indirect: this.indirect };
95
+ const memory = context.machineState.memory.track(this.type);
96
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
97
+ const nullifier = memory.get(this.nullifierOffset).toFr();
83
98
  try {
84
99
  await context.persistableState.writeNullifier(context.environment.storageAddress, nullifier);
85
100
  }
@@ -92,6 +107,7 @@ export class EmitNullifier extends Instruction {
92
107
  throw e;
93
108
  }
94
109
  }
110
+ memory.assert(memoryOperations);
95
111
  context.machineState.incrementPc();
96
112
  }
97
113
  }
@@ -108,10 +124,14 @@ export class L1ToL2MessageExists extends Instruction {
108
124
  this.existsOffset = existsOffset;
109
125
  }
110
126
  async execute(context) {
111
- const msgHash = context.machineState.memory.get(this.msgHashOffset).toFr();
112
- const msgLeafIndex = context.machineState.memory.get(this.msgLeafIndexOffset).toFr();
127
+ const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
128
+ const memory = context.machineState.memory.track(this.type);
129
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
130
+ const msgHash = memory.get(this.msgHashOffset).toFr();
131
+ const msgLeafIndex = memory.get(this.msgLeafIndexOffset).toFr();
113
132
  const exists = await context.persistableState.checkL1ToL2MessageExists(msgHash, msgLeafIndex);
114
- context.machineState.memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
133
+ memory.set(this.existsOffset, exists ? new Uint8(1) : new Uint8(0));
134
+ memory.assert(memoryOperations);
115
135
  context.machineState.incrementPc();
116
136
  }
117
137
  }
@@ -137,11 +157,15 @@ export class EmitUnencryptedLog extends Instruction {
137
157
  if (context.environment.isStaticCall) {
138
158
  throw new StaticCallStorageAlterError();
139
159
  }
140
- const [eventSelectorOffset, logOffset] = Addressing.fromWire(this.indirect).resolve([this.eventSelectorOffset, this.logOffset], context.machineState.memory);
160
+ const memoryOperations = { reads: 1 + this.logSize, indirect: this.indirect };
161
+ const memory = context.machineState.memory.track(this.type);
162
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
163
+ const [eventSelectorOffset, logOffset] = Addressing.fromWire(this.indirect).resolve([this.eventSelectorOffset, this.logOffset], memory);
141
164
  const contractAddress = context.environment.address;
142
- const event = context.machineState.memory.get(eventSelectorOffset).toFr();
143
- const log = context.machineState.memory.getSlice(logOffset, this.logSize).map(f => f.toFr());
165
+ const event = memory.get(eventSelectorOffset).toFr();
166
+ const log = memory.getSlice(logOffset, this.logSize).map(f => f.toFr());
144
167
  context.persistableState.writeLog(contractAddress, event, log);
168
+ memory.assert(memoryOperations);
145
169
  context.machineState.incrementPc();
146
170
  }
147
171
  }
@@ -166,9 +190,13 @@ export class SendL2ToL1Message extends Instruction {
166
190
  if (context.environment.isStaticCall) {
167
191
  throw new StaticCallStorageAlterError();
168
192
  }
169
- const recipient = context.machineState.memory.get(this.recipientOffset).toFr();
170
- const content = context.machineState.memory.get(this.contentOffset).toFr();
193
+ const memoryOperations = { reads: 2, indirect: this.indirect };
194
+ const memory = context.machineState.memory.track(this.type);
195
+ context.machineState.consumeGas(this.gasCost(memoryOperations));
196
+ const recipient = memory.get(this.recipientOffset).toFr();
197
+ const content = memory.get(this.contentOffset).toFr();
171
198
  context.persistableState.writeL1Message(recipient, content);
199
+ memory.assert(memoryOperations);
172
200
  context.machineState.incrementPc();
173
201
  }
174
202
  }
@@ -176,4 +204,4 @@ SendL2ToL1Message.type = 'SENDL2TOL1MSG';
176
204
  SendL2ToL1Message.opcode = Opcode.SENDL2TOL1MSG;
177
205
  // Informs (de)serialization. See Instruction.deserialize.
178
206
  SendL2ToL1Message.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
179
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accrued_substate.js","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
207
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accrued_substate.js","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE3D,MAAM,OAAO,cAAe,SAAQ,WAAW;IAY7C,YACU,QAAgB,EAChB,cAAsB,EACtB,eAAuB,EACvB,YAAoB;QAE5B,KAAK,EAAE,CAAC;QALA,aAAQ,GAAR,QAAQ,CAAQ;QAChB,mBAAc,GAAd,cAAc,CAAQ;QACtB,oBAAe,GAAf,eAAe,CAAQ;QACvB,iBAAY,GAAZ,YAAY,CAAQ;IAG9B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,gFAAgF;QAChF,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAC/D,OAAO,CAAC,WAAW,CAAC,cAAc,EAClC,QAAQ,EACR,SAAS,CACV,CAAC;QACF,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAtCM,mBAAI,GAAW,gBAAgB,CAAC;AACvB,qBAAM,GAAW,MAAM,CAAC,cAAc,CAAC;AACvD,0DAA0D;AAC1C,yBAAU,GAAG;IAC3B,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;CACnB,CAAC;AAgCJ,MAAM,OAAO,YAAa,SAAQ,WAAW;IAM3C,YAAoB,QAAgB,EAAU,cAAsB;QAClE,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAQ;QAAU,mBAAc,GAAd,cAAc,CAAQ;IAEpE,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,2BAA2B,EAAE,CAAC;QAC1C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;QACxD,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAEjD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAvBM,iBAAI,GAAW,cAAc,CAAC;AACrB,mBAAM,GAAW,MAAM,CAAC,YAAY,CAAC;AACrD,0DAA0D;AAC1C,uBAAU,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;AAuB1F,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAM9C,YAAoB,QAAgB,EAAU,eAAuB,EAAU,YAAoB;QACjG,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAQ;QAAU,oBAAe,GAAf,eAAe,CAAQ;QAAU,iBAAY,GAAZ,YAAY,CAAQ;IAEnG,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAElH,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AArBM,oBAAI,GAAW,iBAAiB,CAAC;AACxB,sBAAM,GAAW,MAAM,CAAC,eAAe,CAAC;AACxD,0DAA0D;AAC1C,0BAAU,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;AAqB9G,MAAM,OAAO,aAAc,SAAQ,WAAW;IAM5C,YAAoB,QAAgB,EAAU,eAAuB;QACnE,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAQ;QAAU,oBAAe,GAAf,eAAe,CAAQ;IAErE,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,2BAA2B,EAAE,CAAC;QAC1C,CAAC;QAED,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;QAC/F,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,uBAAuB,EAAE,CAAC;gBACzC,mHAAmH;gBACnH,MAAM,IAAI,yBAAyB,CACjC,yCAAyC,SAAS,sBAAsB,OAAO,CAAC,WAAW,CAAC,cAAc,IAAI,CAC/G,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,CAAC;YACV,CAAC;QACH,CAAC;QAED,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAlCM,kBAAI,GAAW,eAAe,CAAC;AACtB,oBAAM,GAAW,MAAM,CAAC,aAAa,CAAC;AACtD,0DAA0D;AAC1C,wBAAU,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;AAkC1F,MAAM,OAAO,mBAAoB,SAAQ,WAAW;IAYlD,YACU,QAAgB,EAChB,aAAqB,EACrB,kBAA0B,EAC1B,YAAoB;QAE5B,KAAK,EAAE,CAAC;QALA,aAAQ,GAAR,QAAQ,CAAQ;QAChB,kBAAa,GAAb,aAAa,CAAQ;QACrB,uBAAkB,GAAlB,kBAAkB,CAAQ;QAC1B,iBAAY,GAAZ,YAAY,CAAQ;IAG9B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC1E,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,MAAM,YAAY,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC9F,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAhCM,wBAAI,GAAW,iBAAiB,CAAC;AACxB,0BAAM,GAAW,MAAM,CAAC,eAAe,CAAC;AACxD,0DAA0D;AAC1C,8BAAU,GAAG;IAC3B,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;CACnB,CAAC;AA0BJ,MAAM,OAAO,kBAAmB,SAAQ,WAAW;IAYjD,YACU,QAAgB,EAChB,mBAA2B,EAC3B,SAAiB,EACjB,OAAe;QAEvB,KAAK,EAAE,CAAC;QALA,aAAQ,GAAR,QAAQ,CAAQ;QAChB,wBAAmB,GAAnB,mBAAmB,CAAQ;QAC3B,cAAS,GAAT,SAAS,CAAQ;QACjB,YAAO,GAAP,OAAO,CAAQ;IAGzB,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,2BAA2B,EAAE,CAAC;QAC1C,CAAC;QAED,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9E,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CACjF,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,EAC1C,MAAM,CACP,CAAC;QAEF,MAAM,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACxE,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAE/D,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAzCM,uBAAI,GAAW,oBAAoB,CAAC;AAC3B,yBAAM,GAAW,MAAM,CAAC,kBAAkB,CAAC;AAC3D,0DAA0D;AAC1C,6BAAU,GAAG;IAC3B,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,KAAK;IACjB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;IAClB,WAAW,CAAC,MAAM;CACnB,CAAC;AAmCJ,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAMhD,YAAoB,QAAgB,EAAU,eAAuB,EAAU,aAAqB;QAClG,KAAK,EAAE,CAAC;QADU,aAAQ,GAAR,QAAQ,CAAQ;QAAU,oBAAe,GAAf,eAAe,CAAQ;QAAU,kBAAa,GAAb,aAAa,CAAQ;IAEpG,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,OAAmB;QACtC,IAAI,OAAO,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,IAAI,2BAA2B,EAAE,CAAC;QAC1C,CAAC;QAED,MAAM,gBAAgB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QAC1D,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;QACtD,OAAO,CAAC,gBAAgB,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAE5D,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;QAChC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;IACrC,CAAC;;AAxBM,sBAAI,GAAW,eAAe,CAAC;AACtB,wBAAM,GAAW,MAAM,CAAC,aAAa,CAAC;AACtD,0DAA0D;AAC1C,4BAAU,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { type TaggedMemory } from '../avm_memory_types.js';
1
+ import { type TaggedMemoryInterface } from '../avm_memory_types.js';
2
2
  export declare enum AddressingMode {
3
3
  DIRECT = 0,
4
4
  INDIRECT = 1,
@@ -7,18 +7,20 @@ export declare enum AddressingMode {
7
7
  /** A class to represent the addressing mode of an instruction. */
8
8
  export declare class Addressing {
9
9
  /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
10
- readonly modePerOperand: AddressingMode[];
10
+ private readonly modePerOperand;
11
11
  constructor(
12
12
  /** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
13
13
  modePerOperand: AddressingMode[]);
14
14
  static fromWire(wireModes: number): Addressing;
15
15
  toWire(): number;
16
+ /** Returns how many operands use the given addressing mode. */
17
+ count(mode: AddressingMode): number;
16
18
  /**
17
19
  * Resolves the offsets using the addressing mode.
18
20
  * @param offsets The offsets to resolve.
19
21
  * @param mem The memory to use for resolution.
20
22
  * @returns The resolved offsets. The length of the returned array is the same as the length of the input array.
21
23
  */
22
- resolve(offsets: number[], mem: TaggedMemory): number[];
24
+ resolve(offsets: number[], mem: TaggedMemoryInterface): number[];
23
25
  }
24
26
  //# sourceMappingURL=addressing_mode.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,oBAAY,cAAc;IACxB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,sBAAsB,IAAA;CACvB;AAED,kEAAkE;AAClE,qBAAa,UAAU;IAEnB,mHAAmH;aACnG,cAAc,EAAE,cAAc,EAAE;;IADhD,mHAAmH;IACnG,cAAc,EAAE,cAAc,EAAE;WAKpC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU;IAU9C,MAAM,IAAI,MAAM;IAYvB;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,EAAE;CAmB/D"}
1
+ {"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,oBAAY,cAAc;IACxB,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,sBAAsB,IAAA;CACvB;AAED,kEAAkE;AAClE,qBAAa,UAAU;IAEnB,mHAAmH;IACnH,OAAO,CAAC,QAAQ,CAAC,cAAc;;IAD/B,mHAAmH;IAClG,cAAc,EAAE,cAAc,EAAE;WAKrC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,UAAU;IAU9C,MAAM,IAAI,MAAM;IAYvB,+DAA+D;IACxD,KAAK,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM;IAI1C;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,qBAAqB,GAAG,MAAM,EAAE;CAmBxE"}