@aztec/simulator 0.74.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/acvm/acvm.js +18 -21
- package/dest/acvm/acvm_types.js +3 -2
- package/dest/acvm/deserialize.js +9 -13
- package/dest/acvm/index.js +0 -1
- package/dest/acvm/oracle/index.js +0 -1
- package/dest/acvm/oracle/oracle.js +42 -23
- package/dest/acvm/oracle/typed_oracle.js +36 -38
- package/dest/acvm/serialize.js +7 -14
- package/dest/avm/avm_context.js +24 -27
- package/dest/avm/avm_contract_call_result.js +12 -7
- package/dest/avm/avm_execution_environment.js +10 -7
- package/dest/avm/avm_gas.js +93 -56
- package/dest/avm/avm_machine_state.js +60 -61
- package/dest/avm/avm_memory_types.js +166 -255
- package/dest/avm/avm_simulator.js +68 -47
- package/dest/avm/avm_tree.js +282 -276
- package/dest/avm/bytecode_utils.js +8 -6
- package/dest/avm/errors.js +46 -63
- package/dest/avm/fixtures/avm_simulation_tester.js +18 -17
- package/dest/avm/fixtures/base_avm_simulation_tester.js +21 -16
- package/dest/avm/fixtures/index.js +27 -26
- package/dest/avm/fixtures/simple_contract_data_source.js +9 -13
- package/dest/avm/index.js +0 -1
- package/dest/avm/journal/index.js +0 -1
- package/dest/avm/journal/journal.js +147 -200
- package/dest/avm/journal/nullifiers.js +43 -46
- package/dest/avm/journal/public_storage.js +73 -87
- package/dest/avm/opcodes/accrued_substate.js +140 -110
- package/dest/avm/opcodes/addressing_mode.js +29 -31
- package/dest/avm/opcodes/arithmetic.js +17 -15
- package/dest/avm/opcodes/bitwise.js +40 -26
- package/dest/avm/opcodes/comparators.js +12 -10
- package/dest/avm/opcodes/contract.js +31 -29
- package/dest/avm/opcodes/control_flow.js +47 -43
- package/dest/avm/opcodes/conversion.js +30 -26
- package/dest/avm/opcodes/ec_add.js +35 -34
- package/dest/avm/opcodes/environment_getters.js +33 -33
- package/dest/avm/opcodes/external_calls.js +83 -74
- package/dest/avm/opcodes/hashing.js +69 -61
- package/dest/avm/opcodes/index.js +0 -1
- package/dest/avm/opcodes/instruction.js +31 -40
- package/dest/avm/opcodes/instruction_impl.js +12 -15
- package/dest/avm/opcodes/memory.js +177 -156
- package/dest/avm/opcodes/misc.js +27 -25
- package/dest/avm/opcodes/multi_scalar_mul.js +43 -41
- package/dest/avm/opcodes/storage.js +28 -25
- package/dest/avm/serialization/buffer_cursor.js +4 -4
- package/dest/avm/serialization/bytecode_serialization.js +292 -89
- package/dest/avm/serialization/instruction_serialization.js +67 -28
- package/dest/avm/test_utils.js +6 -9
- package/dest/client/client_execution_context.js +197 -219
- package/dest/client/db_oracle.js +4 -7
- package/dest/client/execution_note_cache.js +80 -81
- package/dest/client/index.js +0 -1
- package/dest/client/pick_notes.js +27 -30
- package/dest/client/private_execution.js +13 -14
- package/dest/client/simulator.js +44 -48
- package/dest/client/unconstrained_execution.js +8 -11
- package/dest/client/view_data_oracle.js +130 -139
- package/dest/common/debug_fn_name.js +1 -4
- package/dest/common/errors.js +30 -39
- package/dest/common/hashed_values_cache.js +16 -20
- package/dest/common/index.js +0 -1
- package/dest/common/message_load_oracle_inputs.js +7 -7
- package/dest/common/simulation_provider.js +3 -6
- package/dest/common.js +0 -1
- package/dest/providers/acvm_native.js +46 -32
- package/dest/providers/acvm_wasm.js +18 -10
- package/dest/providers/acvm_wasm_with_blobs.js +2 -5
- package/dest/providers/factory.js +5 -5
- package/dest/providers/index.js +0 -1
- package/dest/public/bytecode_errors.js +1 -2
- package/dest/public/db_interfaces.js +1 -2
- package/dest/public/execution.js +2 -4
- package/dest/public/executor_metrics.js +16 -12
- package/dest/public/fee_payment.js +2 -5
- package/dest/public/fixtures/index.js +0 -1
- package/dest/public/fixtures/public_tx_simulation_tester.js +13 -17
- package/dest/public/fixtures/utils.js +11 -14
- package/dest/public/index.js +0 -1
- package/dest/public/public_db_sources.js +79 -87
- package/dest/public/public_processor.js +310 -306
- package/dest/public/public_processor_metrics.js +46 -27
- package/dest/public/public_tx_context.js +97 -118
- package/dest/public/public_tx_simulator.js +299 -314
- package/dest/public/side_effect_errors.js +1 -2
- package/dest/public/side_effect_trace.js +44 -71
- package/dest/public/side_effect_trace_interface.js +1 -2
- package/dest/public/unique_class_ids.js +22 -27
- package/dest/public/utils.js +16 -11
- package/dest/server.js +0 -1
- package/dest/stats/index.js +0 -1
- package/dest/stats/stats.js +1 -2
- package/dest/test/utils.js +5 -4
- package/package.json +11 -11
- package/src/acvm/oracle/typed_oracle.ts +34 -34
- package/src/avm/avm_machine_state.ts +18 -14
- package/src/avm/avm_memory_types.ts +43 -183
- package/src/avm/avm_simulator.ts +37 -11
- package/src/avm/opcodes/accrued_substate.ts +7 -21
- package/src/avm/opcodes/addressing_mode.ts +9 -2
- package/src/avm/opcodes/arithmetic.ts +1 -3
- package/src/avm/opcodes/bitwise.ts +2 -6
- package/src/avm/opcodes/comparators.ts +1 -3
- package/src/avm/opcodes/contract.ts +1 -3
- package/src/avm/opcodes/control_flow.ts +1 -9
- package/src/avm/opcodes/conversion.ts +1 -3
- package/src/avm/opcodes/ec_add.ts +1 -3
- package/src/avm/opcodes/environment_getters.ts +1 -3
- package/src/avm/opcodes/external_calls.ts +3 -6
- package/src/avm/opcodes/hashing.ts +3 -9
- package/src/avm/opcodes/memory.ts +6 -20
- package/src/avm/opcodes/misc.ts +1 -3
- package/src/avm/opcodes/multi_scalar_mul.ts +1 -7
- package/src/avm/opcodes/storage.ts +2 -6
- package/src/client/index.ts +2 -2
- package/dest/acvm/acvm.d.ts +0 -35
- package/dest/acvm/acvm.d.ts.map +0 -1
- package/dest/acvm/acvm_types.d.ts +0 -10
- package/dest/acvm/acvm_types.d.ts.map +0 -1
- package/dest/acvm/deserialize.d.ts +0 -36
- package/dest/acvm/deserialize.d.ts.map +0 -1
- package/dest/acvm/index.d.ts +0 -6
- package/dest/acvm/index.d.ts.map +0 -1
- package/dest/acvm/oracle/index.d.ts +0 -14
- package/dest/acvm/oracle/index.d.ts.map +0 -1
- package/dest/acvm/oracle/oracle.d.ts +0 -49
- package/dest/acvm/oracle/oracle.d.ts.map +0 -1
- package/dest/acvm/oracle/typed_oracle.d.ts +0 -75
- package/dest/acvm/oracle/typed_oracle.d.ts.map +0 -1
- package/dest/acvm/serialize.d.ts +0 -20
- package/dest/acvm/serialize.d.ts.map +0 -1
- package/dest/avm/avm_context.d.ts +0 -39
- package/dest/avm/avm_context.d.ts.map +0 -1
- package/dest/avm/avm_contract_call_result.d.ts +0 -30
- package/dest/avm/avm_contract_call_result.d.ts.map +0 -1
- package/dest/avm/avm_execution_environment.d.ts +0 -21
- package/dest/avm/avm_execution_environment.d.ts.map +0 -1
- package/dest/avm/avm_gas.d.ts +0 -60
- package/dest/avm/avm_gas.d.ts.map +0 -1
- package/dest/avm/avm_machine_state.d.ts +0 -93
- package/dest/avm/avm_machine_state.d.ts.map +0 -1
- package/dest/avm/avm_memory_types.d.ts +0 -310
- package/dest/avm/avm_memory_types.d.ts.map +0 -1
- package/dest/avm/avm_simulator.d.ts +0 -37
- package/dest/avm/avm_simulator.d.ts.map +0 -1
- package/dest/avm/avm_tree.d.ts +0 -281
- package/dest/avm/avm_tree.d.ts.map +0 -1
- package/dest/avm/bytecode_utils.d.ts +0 -5
- package/dest/avm/bytecode_utils.d.ts.map +0 -1
- package/dest/avm/errors.d.ts +0 -121
- package/dest/avm/errors.d.ts.map +0 -1
- package/dest/avm/fixtures/avm_simulation_tester.d.ts +0 -21
- package/dest/avm/fixtures/avm_simulation_tester.d.ts.map +0 -1
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts +0 -35
- package/dest/avm/fixtures/base_avm_simulation_tester.d.ts.map +0 -1
- package/dest/avm/fixtures/index.d.ts +0 -67
- package/dest/avm/fixtures/index.d.ts.map +0 -1
- package/dest/avm/fixtures/simple_contract_data_source.d.ts +0 -31
- package/dest/avm/fixtures/simple_contract_data_source.d.ts.map +0 -1
- package/dest/avm/index.d.ts +0 -4
- package/dest/avm/index.d.ts.map +0 -1
- package/dest/avm/journal/index.d.ts +0 -2
- package/dest/avm/journal/index.d.ts.map +0 -1
- package/dest/avm/journal/journal.d.ts +0 -176
- package/dest/avm/journal/journal.d.ts.map +0 -1
- package/dest/avm/journal/nullifiers.d.ts +0 -62
- package/dest/avm/journal/nullifiers.d.ts.map +0 -1
- package/dest/avm/journal/public_storage.d.ts +0 -66
- package/dest/avm/journal/public_storage.d.ts.map +0 -1
- package/dest/avm/opcodes/accrued_substate.d.ts +0 -75
- package/dest/avm/opcodes/accrued_substate.d.ts.map +0 -1
- package/dest/avm/opcodes/addressing_mode.d.ts +0 -27
- package/dest/avm/opcodes/addressing_mode.d.ts.map +0 -1
- package/dest/avm/opcodes/arithmetic.d.ts +0 -37
- package/dest/avm/opcodes/arithmetic.d.ts.map +0 -1
- package/dest/avm/opcodes/bitwise.d.ts +0 -50
- package/dest/avm/opcodes/bitwise.d.ts.map +0 -1
- package/dest/avm/opcodes/comparators.d.ts +0 -25
- package/dest/avm/opcodes/comparators.d.ts.map +0 -1
- package/dest/avm/opcodes/contract.d.ts +0 -21
- package/dest/avm/opcodes/contract.d.ts.map +0 -1
- package/dest/avm/opcodes/control_flow.d.ts +0 -41
- package/dest/avm/opcodes/control_flow.d.ts.map +0 -1
- package/dest/avm/opcodes/conversion.d.ts +0 -17
- package/dest/avm/opcodes/conversion.d.ts.map +0 -1
- package/dest/avm/opcodes/ec_add.d.ts +0 -19
- package/dest/avm/opcodes/ec_add.d.ts.map +0 -1
- package/dest/avm/opcodes/environment_getters.d.ts +0 -28
- package/dest/avm/opcodes/environment_getters.d.ts.map +0 -1
- package/dest/avm/opcodes/external_calls.d.ts +0 -50
- package/dest/avm/opcodes/external_calls.d.ts.map +0 -1
- package/dest/avm/opcodes/hashing.d.ts +0 -36
- package/dest/avm/opcodes/hashing.d.ts.map +0 -1
- package/dest/avm/opcodes/index.d.ts +0 -16
- package/dest/avm/opcodes/index.d.ts.map +0 -1
- package/dest/avm/opcodes/instruction.d.ts +0 -70
- package/dest/avm/opcodes/instruction.d.ts.map +0 -1
- package/dest/avm/opcodes/instruction_impl.d.ts +0 -19
- package/dest/avm/opcodes/instruction_impl.d.ts.map +0 -1
- package/dest/avm/opcodes/memory.d.ts +0 -74
- package/dest/avm/opcodes/memory.d.ts.map +0 -1
- package/dest/avm/opcodes/misc.d.ts +0 -17
- package/dest/avm/opcodes/misc.d.ts.map +0 -1
- package/dest/avm/opcodes/multi_scalar_mul.d.ts +0 -16
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +0 -1
- package/dest/avm/opcodes/storage.d.ts +0 -24
- package/dest/avm/opcodes/storage.d.ts.map +0 -1
- package/dest/avm/serialization/buffer_cursor.d.ts +0 -28
- package/dest/avm/serialization/buffer_cursor.d.ts.map +0 -1
- package/dest/avm/serialization/bytecode_serialization.d.ts +0 -21
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +0 -1
- package/dest/avm/serialization/instruction_serialization.d.ts +0 -105
- package/dest/avm/serialization/instruction_serialization.d.ts.map +0 -1
- package/dest/avm/test_utils.d.ts +0 -16
- package/dest/avm/test_utils.d.ts.map +0 -1
- package/dest/client/client_execution_context.d.ts +0 -214
- package/dest/client/client_execution_context.d.ts.map +0 -1
- package/dest/client/db_oracle.d.ts +0 -229
- package/dest/client/db_oracle.d.ts.map +0 -1
- package/dest/client/execution_note_cache.d.ts +0 -93
- package/dest/client/execution_note_cache.d.ts.map +0 -1
- package/dest/client/index.d.ts +0 -15
- package/dest/client/index.d.ts.map +0 -1
- package/dest/client/pick_notes.d.ts +0 -85
- package/dest/client/pick_notes.d.ts.map +0 -1
- package/dest/client/private_execution.d.ts +0 -19
- package/dest/client/private_execution.d.ts.map +0 -1
- package/dest/client/simulator.d.ts +0 -60
- package/dest/client/simulator.d.ts.map +0 -1
- package/dest/client/unconstrained_execution.d.ts +0 -10
- package/dest/client/unconstrained_execution.d.ts.map +0 -1
- package/dest/client/view_data_oracle.d.ts +0 -159
- package/dest/client/view_data_oracle.d.ts.map +0 -1
- package/dest/common/debug_fn_name.d.ts +0 -4
- package/dest/common/debug_fn_name.d.ts.map +0 -1
- package/dest/common/errors.d.ts +0 -54
- package/dest/common/errors.d.ts.map +0 -1
- package/dest/common/hashed_values_cache.d.ts +0 -28
- package/dest/common/hashed_values_cache.d.ts.map +0 -1
- package/dest/common/index.d.ts +0 -3
- package/dest/common/index.d.ts.map +0 -1
- package/dest/common/message_load_oracle_inputs.d.ts +0 -15
- package/dest/common/message_load_oracle_inputs.d.ts.map +0 -1
- package/dest/common/simulation_provider.d.ts +0 -19
- package/dest/common/simulation_provider.d.ts.map +0 -1
- package/dest/common.d.ts +0 -2
- package/dest/common.d.ts.map +0 -1
- package/dest/providers/acvm_native.d.ts +0 -40
- package/dest/providers/acvm_native.d.ts.map +0 -1
- package/dest/providers/acvm_wasm.d.ts +0 -15
- package/dest/providers/acvm_wasm.d.ts.map +0 -1
- package/dest/providers/acvm_wasm_with_blobs.d.ts +0 -19
- package/dest/providers/acvm_wasm_with_blobs.d.ts.map +0 -1
- package/dest/providers/factory.d.ts +0 -12
- package/dest/providers/factory.d.ts.map +0 -1
- package/dest/providers/index.d.ts +0 -5
- package/dest/providers/index.d.ts.map +0 -1
- package/dest/public/bytecode_errors.d.ts +0 -4
- package/dest/public/bytecode_errors.d.ts.map +0 -1
- package/dest/public/db_interfaces.d.ts +0 -105
- package/dest/public/db_interfaces.d.ts.map +0 -1
- package/dest/public/execution.d.ts +0 -102
- package/dest/public/execution.d.ts.map +0 -1
- package/dest/public/executor_metrics.d.ts +0 -13
- package/dest/public/executor_metrics.d.ts.map +0 -1
- package/dest/public/fee_payment.d.ts +0 -11
- package/dest/public/fee_payment.d.ts.map +0 -1
- package/dest/public/fixtures/index.d.ts +0 -3
- package/dest/public/fixtures/index.d.ts.map +0 -1
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts +0 -21
- package/dest/public/fixtures/public_tx_simulation_tester.d.ts.map +0 -1
- package/dest/public/fixtures/utils.d.ts +0 -17
- package/dest/public/fixtures/utils.d.ts.map +0 -1
- package/dest/public/index.d.ts +0 -9
- package/dest/public/index.d.ts.map +0 -1
- package/dest/public/public_db_sources.d.ts +0 -81
- package/dest/public/public_db_sources.d.ts.map +0 -1
- package/dest/public/public_processor.d.ts +0 -72
- package/dest/public/public_processor.d.ts.map +0 -1
- package/dest/public/public_processor_metrics.d.ts +0 -27
- package/dest/public/public_processor_metrics.d.ts.map +0 -1
- package/dest/public/public_tx_context.d.ts +0 -131
- package/dest/public/public_tx_context.d.ts.map +0 -1
- package/dest/public/public_tx_simulator.d.ts +0 -99
- package/dest/public/public_tx_simulator.d.ts.map +0 -1
- package/dest/public/side_effect_errors.d.ts +0 -4
- package/dest/public/side_effect_errors.d.ts.map +0 -1
- package/dest/public/side_effect_trace.d.ts +0 -126
- package/dest/public/side_effect_trace.d.ts.map +0 -1
- package/dest/public/side_effect_trace_interface.d.ts +0 -32
- package/dest/public/side_effect_trace_interface.d.ts.map +0 -1
- package/dest/public/unique_class_ids.d.ts +0 -37
- package/dest/public/unique_class_ids.d.ts.map +0 -1
- package/dest/public/utils.d.ts +0 -5
- package/dest/public/utils.d.ts.map +0 -1
- package/dest/server.d.ts +0 -6
- package/dest/server.d.ts.map +0 -1
- package/dest/stats/index.d.ts +0 -2
- package/dest/stats/index.d.ts.map +0 -1
- package/dest/stats/stats.d.ts +0 -4
- package/dest/stats/stats.d.ts.map +0 -1
- package/dest/test/utils.d.ts +0 -12
- package/dest/test/utils.d.ts.map +0 -1
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
import { MEM_TAG_FF, MEM_TAG_U1, MEM_TAG_U8, MEM_TAG_U16, MEM_TAG_U32, MEM_TAG_U64, MEM_TAG_U128
|
|
1
|
+
import { MEM_TAG_FF, MEM_TAG_U1, MEM_TAG_U8, MEM_TAG_U16, MEM_TAG_U32, MEM_TAG_U64, MEM_TAG_U128 } from '@aztec/circuits.js';
|
|
2
2
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
3
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
4
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
5
5
|
import { createLogger } from '@aztec/foundation/log';
|
|
6
6
|
import { strict as assert } from 'assert';
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
/** MemoryValue gathers the common operations for all memory types. */
|
|
10
|
-
export class MemoryValue {
|
|
7
|
+
import { InvalidTagValueError, MemorySliceOutOfRangeError, TagCheckError } from './errors.js';
|
|
8
|
+
/** MemoryValue gathers the common operations for all memory types. */ export class MemoryValue {
|
|
11
9
|
// To field
|
|
12
10
|
toFr() {
|
|
13
11
|
return new Fr(this.toBigInt());
|
|
@@ -23,76 +21,73 @@ export class MemoryValue {
|
|
|
23
21
|
return `${this.constructor.name}(0x${this.toBigInt().toString(16)})`;
|
|
24
22
|
}
|
|
25
23
|
}
|
|
26
|
-
/** IntegralValue gathers the common operations for all integral memory types. */
|
|
27
|
-
export class IntegralValue extends MemoryValue {
|
|
24
|
+
/** IntegralValue gathers the common operations for all integral memory types. */ export class IntegralValue extends MemoryValue {
|
|
28
25
|
}
|
|
29
26
|
/**
|
|
30
27
|
* This function creates a class for unsigned integers of a given number of bits.
|
|
31
28
|
* In TypeScript terms, it's a class mixin.
|
|
32
|
-
**/
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
return toBufferBE(this.n, bits / 8);
|
|
29
|
+
**/ function UnsignedIntegerClassFactory(bits) {
|
|
30
|
+
return class NewUintClass extends IntegralValue {
|
|
31
|
+
static mod = 1n << BigInt(bits);
|
|
32
|
+
static bitmask = this.mod - 1n;
|
|
33
|
+
n;
|
|
34
|
+
constructor(n){
|
|
35
|
+
super();
|
|
36
|
+
this.n = BigInt(n);
|
|
37
|
+
assert(n < NewUintClass.mod, `Value ${n} is too large for ${this.constructor.name}.`);
|
|
38
|
+
}
|
|
39
|
+
build(n) {
|
|
40
|
+
return new this.constructor.prototype.constructor(n);
|
|
41
|
+
}
|
|
42
|
+
add(rhs) {
|
|
43
|
+
return this.build(this.n + rhs.n & NewUintClass.bitmask);
|
|
44
|
+
}
|
|
45
|
+
sub(rhs) {
|
|
46
|
+
const res = this.n - rhs.n;
|
|
47
|
+
return this.build(res >= 0 ? res : res + NewUintClass.mod);
|
|
48
|
+
}
|
|
49
|
+
mul(rhs) {
|
|
50
|
+
return this.build(this.n * rhs.n & NewUintClass.bitmask);
|
|
51
|
+
}
|
|
52
|
+
div(rhs) {
|
|
53
|
+
return this.build(this.n / rhs.n);
|
|
54
|
+
}
|
|
55
|
+
// No sign extension.
|
|
56
|
+
shr(rhs) {
|
|
57
|
+
// Note that this.n is > 0 by class invariant.
|
|
58
|
+
return this.build(this.n >> rhs.n);
|
|
59
|
+
}
|
|
60
|
+
shl(rhs) {
|
|
61
|
+
return this.build(this.n << rhs.n & NewUintClass.bitmask);
|
|
62
|
+
}
|
|
63
|
+
and(rhs) {
|
|
64
|
+
return this.build(this.n & rhs.n);
|
|
65
|
+
}
|
|
66
|
+
or(rhs) {
|
|
67
|
+
return this.build(this.n | rhs.n);
|
|
68
|
+
}
|
|
69
|
+
xor(rhs) {
|
|
70
|
+
return this.build(this.n ^ rhs.n);
|
|
71
|
+
}
|
|
72
|
+
not() {
|
|
73
|
+
return this.build(~this.n & NewUintClass.bitmask);
|
|
74
|
+
}
|
|
75
|
+
equals(rhs) {
|
|
76
|
+
return this.n === rhs.n;
|
|
77
|
+
}
|
|
78
|
+
lt(rhs) {
|
|
79
|
+
return this.n < rhs.n;
|
|
80
|
+
}
|
|
81
|
+
toBigInt() {
|
|
82
|
+
return this.n;
|
|
83
|
+
}
|
|
84
|
+
toBuffer() {
|
|
85
|
+
if (bits < 8) {
|
|
86
|
+
return toBufferBE(this.n, 1);
|
|
91
87
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
_a;
|
|
88
|
+
return toBufferBE(this.n, bits / 8);
|
|
89
|
+
}
|
|
90
|
+
};
|
|
96
91
|
}
|
|
97
92
|
// Now we can create the classes for each unsigned integer type.
|
|
98
93
|
// We extend instead of just assigning so that the class has the right name.
|
|
@@ -110,7 +105,9 @@ export class Uint64 extends UnsignedIntegerClassFactory(64) {
|
|
|
110
105
|
export class Uint128 extends UnsignedIntegerClassFactory(128) {
|
|
111
106
|
}
|
|
112
107
|
export class Field extends MemoryValue {
|
|
113
|
-
|
|
108
|
+
static MODULUS = Fr.MODULUS;
|
|
109
|
+
rep;
|
|
110
|
+
constructor(v){
|
|
114
111
|
super();
|
|
115
112
|
this.rep = new Fr(v);
|
|
116
113
|
}
|
|
@@ -147,39 +144,39 @@ export class Field extends MemoryValue {
|
|
|
147
144
|
return this.rep.toBuffer();
|
|
148
145
|
}
|
|
149
146
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
TypeTag[TypeTag["
|
|
154
|
-
TypeTag[TypeTag["
|
|
155
|
-
TypeTag[TypeTag["
|
|
156
|
-
TypeTag[TypeTag["
|
|
157
|
-
TypeTag[TypeTag["
|
|
158
|
-
TypeTag[TypeTag["
|
|
159
|
-
TypeTag
|
|
160
|
-
|
|
161
|
-
})(TypeTag || (TypeTag = {}));
|
|
147
|
+
export var TypeTag = /*#__PURE__*/ function(TypeTag) {
|
|
148
|
+
TypeTag[TypeTag["FIELD"] = MEM_TAG_FF] = "FIELD";
|
|
149
|
+
TypeTag[TypeTag["UINT1"] = MEM_TAG_U1] = "UINT1";
|
|
150
|
+
TypeTag[TypeTag["UINT8"] = MEM_TAG_U8] = "UINT8";
|
|
151
|
+
TypeTag[TypeTag["UINT16"] = MEM_TAG_U16] = "UINT16";
|
|
152
|
+
TypeTag[TypeTag["UINT32"] = MEM_TAG_U32] = "UINT32";
|
|
153
|
+
TypeTag[TypeTag["UINT64"] = MEM_TAG_U64] = "UINT64";
|
|
154
|
+
TypeTag[TypeTag["UINT128"] = MEM_TAG_U128] = "UINT128";
|
|
155
|
+
TypeTag[TypeTag["INVALID"] = void 0] = "INVALID";
|
|
156
|
+
return TypeTag;
|
|
157
|
+
}({});
|
|
162
158
|
export class TaggedMemory {
|
|
163
|
-
|
|
159
|
+
static log = createLogger('simulator:avm:memory');
|
|
160
|
+
// Whether to track and validate memory accesses for each instruction.
|
|
161
|
+
static TRACK_MEMORY_ACCESSES = process.env.NODE_ENV === 'test';
|
|
162
|
+
// Memory is modelled by a map with key type being number.
|
|
163
|
+
// We however restrict the keys to be non-negative integers smaller than
|
|
164
|
+
// MAX_MEMORY_SIZE.
|
|
165
|
+
static MAX_MEMORY_SIZE = Number(1n << 32n);
|
|
166
|
+
_mem;
|
|
167
|
+
constructor(){
|
|
164
168
|
this._mem = new Map();
|
|
165
169
|
}
|
|
166
170
|
getMaxMemorySize() {
|
|
167
171
|
return TaggedMemory.MAX_MEMORY_SIZE;
|
|
168
172
|
}
|
|
169
|
-
/** Returns a MeteredTaggedMemory instance to track the number of reads and writes if TRACK_MEMORY_ACCESSES is set. */
|
|
170
|
-
track(type = 'instruction') {
|
|
171
|
-
return TaggedMemory.TRACK_MEMORY_ACCESSES ? new MeteredTaggedMemory(this, type) : this;
|
|
172
|
-
}
|
|
173
173
|
get(offset) {
|
|
174
|
-
|
|
175
|
-
const value = this.getAs(offset);
|
|
176
|
-
return value;
|
|
174
|
+
return this.getAs(offset);
|
|
177
175
|
}
|
|
178
176
|
getAs(offset) {
|
|
179
|
-
assert(Number.isInteger(offset));
|
|
180
|
-
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
177
|
+
assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
181
178
|
const word = this._mem.get(offset);
|
|
182
|
-
TaggedMemory.log.trace(`get(${offset}) = ${word}`);
|
|
179
|
+
//TaggedMemory.log.trace(`get(${offset}) = ${word}`);
|
|
183
180
|
if (word === undefined) {
|
|
184
181
|
TaggedMemory.log.debug(`WARNING: Memory at offset ${offset} is undefined!`);
|
|
185
182
|
return new Field(0);
|
|
@@ -192,7 +189,7 @@ export class TaggedMemory {
|
|
|
192
189
|
throw new MemorySliceOutOfRangeError(offset, size);
|
|
193
190
|
}
|
|
194
191
|
const slice = new Array(size);
|
|
195
|
-
for
|
|
192
|
+
for(let i = 0; i < size; i++){
|
|
196
193
|
slice[i] = this._mem.get(offset + i) ?? new Field(0);
|
|
197
194
|
}
|
|
198
195
|
TaggedMemory.log.trace(`getSlice(${offset}, ${size}) = ${slice}`);
|
|
@@ -205,30 +202,27 @@ export class TaggedMemory {
|
|
|
205
202
|
return this.getSlice(offset, size).map(TaggedMemory.getTag);
|
|
206
203
|
}
|
|
207
204
|
set(offset, v) {
|
|
208
|
-
assert(Number.isInteger(offset));
|
|
209
|
-
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
205
|
+
assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
210
206
|
this._mem.set(offset, v);
|
|
211
|
-
|
|
207
|
+
//TaggedMemory.log.trace(`set(${offset}, ${v})`);
|
|
212
208
|
}
|
|
213
209
|
setSlice(offset, slice) {
|
|
214
210
|
assert(Number.isInteger(offset));
|
|
215
211
|
if (offset + slice.length > TaggedMemory.MAX_MEMORY_SIZE) {
|
|
216
212
|
throw new MemorySliceOutOfRangeError(offset, slice.length);
|
|
217
213
|
}
|
|
218
|
-
slice.forEach((element, idx)
|
|
214
|
+
slice.forEach((element, idx)=>{
|
|
219
215
|
this._mem.set(offset + idx, element);
|
|
220
216
|
});
|
|
221
217
|
TaggedMemory.log.trace(`setSlice(${offset}, ${slice})`);
|
|
222
218
|
}
|
|
223
219
|
getTag(offset) {
|
|
224
|
-
assert(Number.isInteger(offset));
|
|
225
|
-
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
220
|
+
assert(Number.isInteger(offset) && offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
226
221
|
return TaggedMemory.getTag(this._mem.get(offset));
|
|
227
222
|
}
|
|
228
223
|
/**
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
checkTag(tag, offset) {
|
|
224
|
+
* Check that the memory at the given offset matches the specified tag.
|
|
225
|
+
*/ checkTag(tag, offset) {
|
|
232
226
|
const gotTag = this.getTag(offset);
|
|
233
227
|
if (gotTag !== tag) {
|
|
234
228
|
throw TagCheckError.forOffset(offset, TypeTag[gotTag], TypeTag[tag]);
|
|
@@ -238,192 +232,109 @@ export class TaggedMemory {
|
|
|
238
232
|
this.checkTag(TypeTag.UINT32, offset);
|
|
239
233
|
}
|
|
240
234
|
static checkIsIntegralTag(tag) {
|
|
241
|
-
if (!
|
|
235
|
+
if (!INTEGRAL_TAGS.has(tag)) {
|
|
242
236
|
throw TagCheckError.forTag(TypeTag[tag], 'integral');
|
|
243
237
|
}
|
|
244
238
|
}
|
|
245
239
|
static checkIsValidTag(tagNumber) {
|
|
246
|
-
if (!
|
|
247
|
-
TypeTag.FIELD,
|
|
248
|
-
TypeTag.UINT1,
|
|
249
|
-
TypeTag.UINT8,
|
|
250
|
-
TypeTag.UINT16,
|
|
251
|
-
TypeTag.UINT32,
|
|
252
|
-
TypeTag.UINT64,
|
|
253
|
-
TypeTag.UINT128,
|
|
254
|
-
].includes(tagNumber)) {
|
|
240
|
+
if (!VALID_TAGS.has(tagNumber)) {
|
|
255
241
|
throw new InvalidTagValueError(tagNumber);
|
|
256
242
|
}
|
|
257
243
|
}
|
|
258
244
|
/**
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
for (const offset of offsets) {
|
|
245
|
+
* Check tags for memory at all of the specified offsets.
|
|
246
|
+
*/ checkTags(tag, ...offsets) {
|
|
247
|
+
for (const offset of offsets){
|
|
263
248
|
this.checkTag(tag, offset);
|
|
264
249
|
}
|
|
265
250
|
}
|
|
266
251
|
/**
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
for (let i = 1; i < offsets.length; i++) {
|
|
272
|
-
this.checkTag(tag, offsets[i]);
|
|
273
|
-
}
|
|
252
|
+
* Check that all tags at the given offsets are the same.
|
|
253
|
+
*/ checkTagsAreSame(offset0, offset1) {
|
|
254
|
+
const tag0 = this.getTag(offset0);
|
|
255
|
+
this.checkTag(tag0, offset1);
|
|
274
256
|
}
|
|
275
257
|
/**
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
for (let offset = startOffset; offset < startOffset + size; offset++) {
|
|
258
|
+
* Check tags for all memory in the specified range.
|
|
259
|
+
*/ checkTagsRange(tag, startOffset, size) {
|
|
260
|
+
for(let offset = startOffset; offset < startOffset + size; offset++){
|
|
280
261
|
this.checkTag(tag, offset);
|
|
281
262
|
}
|
|
282
263
|
}
|
|
283
|
-
// TODO: this might be slow, but I don't want to have the types know of their tags.
|
|
284
|
-
// It might be possible to have a map<Prototype, TypeTag>.
|
|
285
264
|
static getTag(v) {
|
|
286
|
-
let tag = TypeTag.INVALID;
|
|
287
|
-
// Not sure why, but using instanceof here doesn't work and leads odd behavior,
|
|
288
|
-
// but using constructor.name does the job...
|
|
289
265
|
if (v === undefined) {
|
|
290
|
-
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
tag = TypeTag.FIELD;
|
|
266
|
+
return TypeTag.FIELD; // uninitialized memory is Field(0)
|
|
267
|
+
} else {
|
|
268
|
+
return TAG_FOR_MEM_VAL.get(v.constructor.name) ?? TypeTag.INVALID;
|
|
294
269
|
}
|
|
295
|
-
else if (v.constructor.name == 'Uint1') {
|
|
296
|
-
tag = TypeTag.UINT1;
|
|
297
|
-
}
|
|
298
|
-
else if (v.constructor.name == 'Uint8') {
|
|
299
|
-
tag = TypeTag.UINT8;
|
|
300
|
-
}
|
|
301
|
-
else if (v.constructor.name == 'Uint16') {
|
|
302
|
-
tag = TypeTag.UINT16;
|
|
303
|
-
}
|
|
304
|
-
else if (v.constructor.name == 'Uint32') {
|
|
305
|
-
tag = TypeTag.UINT32;
|
|
306
|
-
}
|
|
307
|
-
else if (v.constructor.name == 'Uint64') {
|
|
308
|
-
tag = TypeTag.UINT64;
|
|
309
|
-
}
|
|
310
|
-
else if (v.constructor.name == 'Uint128') {
|
|
311
|
-
tag = TypeTag.UINT128;
|
|
312
|
-
}
|
|
313
|
-
return tag;
|
|
314
270
|
}
|
|
315
271
|
// Truncates the value to fit the type.
|
|
316
272
|
static buildFromTagTruncating(v, tag) {
|
|
317
273
|
v = BigInt(v);
|
|
318
|
-
switch
|
|
274
|
+
switch(tag){
|
|
319
275
|
case TypeTag.FIELD:
|
|
320
276
|
return new Field(v);
|
|
321
277
|
case TypeTag.UINT1:
|
|
322
278
|
return new Uint1(v & 1n);
|
|
323
279
|
case TypeTag.UINT8:
|
|
324
|
-
return new Uint8(v & (
|
|
280
|
+
return new Uint8(v & (1n << 8n) - 1n);
|
|
325
281
|
case TypeTag.UINT16:
|
|
326
|
-
return new Uint16(v & (
|
|
282
|
+
return new Uint16(v & (1n << 16n) - 1n);
|
|
327
283
|
case TypeTag.UINT32:
|
|
328
|
-
return new Uint32(v & (
|
|
284
|
+
return new Uint32(v & (1n << 32n) - 1n);
|
|
329
285
|
case TypeTag.UINT64:
|
|
330
|
-
return new Uint64(v & (
|
|
286
|
+
return new Uint64(v & (1n << 64n) - 1n);
|
|
331
287
|
case TypeTag.UINT128:
|
|
332
|
-
return new Uint128(v & (
|
|
288
|
+
return new Uint128(v & (1n << 128n) - 1n);
|
|
333
289
|
default:
|
|
334
290
|
throw new InvalidTagValueError(tag);
|
|
335
291
|
}
|
|
336
292
|
}
|
|
337
|
-
/** No-op. Implemented here for compatibility with the MeteredTaggedMemory. */
|
|
338
|
-
assert(_operations) { }
|
|
339
|
-
}
|
|
340
|
-
TaggedMemory.log = createLogger('simulator:avm:memory');
|
|
341
|
-
// Whether to track and validate memory accesses for each instruction.
|
|
342
|
-
TaggedMemory.TRACK_MEMORY_ACCESSES = process.env.NODE_ENV === 'test';
|
|
343
|
-
// Memory is modelled by a map with key type being number.
|
|
344
|
-
// We however restrict the keys to be non-negative integers smaller than
|
|
345
|
-
// MAX_MEMORY_SIZE.
|
|
346
|
-
TaggedMemory.MAX_MEMORY_SIZE = Number(1n << 32n);
|
|
347
|
-
/** Tagged memory wrapper with metering for each memory read and write operation. */
|
|
348
|
-
export class MeteredTaggedMemory {
|
|
349
|
-
constructor(wrapped, type = 'instruction') {
|
|
350
|
-
this.wrapped = wrapped;
|
|
351
|
-
this.type = type;
|
|
352
|
-
this.reads = 0;
|
|
353
|
-
this.writes = 0;
|
|
354
|
-
}
|
|
355
|
-
/** Returns the number of reads and writes tracked so far and resets them to zero. */
|
|
356
|
-
reset() {
|
|
357
|
-
const stats = { reads: this.reads, writes: this.writes };
|
|
358
|
-
this.reads = 0;
|
|
359
|
-
this.writes = 0;
|
|
360
|
-
return stats;
|
|
361
|
-
}
|
|
362
|
-
/**
|
|
363
|
-
* Asserts that the exact number of memory operations have been performed.
|
|
364
|
-
* Indirect represents the flags for indirect accesses: each bit set to one counts as an extra read.
|
|
365
|
-
*/
|
|
366
|
-
assert(operations) {
|
|
367
|
-
const { reads: expectedReads, writes: expectedWrites, addressing, } = { reads: 0, writes: 0, addressing: new Addressing([]), ...operations };
|
|
368
|
-
const totalExpectedReads = expectedReads + addressing.count(AddressingMode.INDIRECT) + addressing.count(AddressingMode.RELATIVE);
|
|
369
|
-
const { reads: actualReads, writes: actualWrites } = this.reset();
|
|
370
|
-
if (actualReads !== totalExpectedReads) {
|
|
371
|
-
throw new InstructionExecutionError(`Incorrect number of memory reads for ${this.type}: expected ${totalExpectedReads} but executed ${actualReads}`);
|
|
372
|
-
}
|
|
373
|
-
if (actualWrites !== expectedWrites) {
|
|
374
|
-
throw new InstructionExecutionError(`Incorrect number of memory writes for ${this.type}: expected ${expectedWrites} but executed ${actualWrites}`);
|
|
375
|
-
}
|
|
376
|
-
}
|
|
377
|
-
getMaxMemorySize() {
|
|
378
|
-
return this.wrapped.getMaxMemorySize();
|
|
379
|
-
}
|
|
380
|
-
track(type = 'instruction') {
|
|
381
|
-
return new MeteredTaggedMemory(this.wrapped, type);
|
|
382
|
-
}
|
|
383
|
-
get(offset) {
|
|
384
|
-
this.reads++;
|
|
385
|
-
return this.wrapped.get(offset);
|
|
386
|
-
}
|
|
387
|
-
getSliceAs(offset, size) {
|
|
388
|
-
this.reads += size;
|
|
389
|
-
return this.wrapped.getSliceAs(offset, size);
|
|
390
|
-
}
|
|
391
|
-
getAs(offset) {
|
|
392
|
-
this.reads++;
|
|
393
|
-
return this.wrapped.getAs(offset);
|
|
394
|
-
}
|
|
395
|
-
getSlice(offset, size) {
|
|
396
|
-
this.reads += size;
|
|
397
|
-
return this.wrapped.getSlice(offset, size);
|
|
398
|
-
}
|
|
399
|
-
set(offset, v) {
|
|
400
|
-
this.writes++;
|
|
401
|
-
this.wrapped.set(offset, v);
|
|
402
|
-
}
|
|
403
|
-
setSlice(offset, vs) {
|
|
404
|
-
this.writes += vs.length;
|
|
405
|
-
this.wrapped.setSlice(offset, vs);
|
|
406
|
-
}
|
|
407
|
-
getSliceTags(offset, size) {
|
|
408
|
-
return this.wrapped.getSliceTags(offset, size);
|
|
409
|
-
}
|
|
410
|
-
getTag(offset) {
|
|
411
|
-
return this.wrapped.getTag(offset);
|
|
412
|
-
}
|
|
413
|
-
checkTag(tag, offset) {
|
|
414
|
-
this.wrapped.checkTag(tag, offset);
|
|
415
|
-
}
|
|
416
|
-
checkIsValidMemoryOffsetTag(offset) {
|
|
417
|
-
this.wrapped.checkIsValidMemoryOffsetTag(offset);
|
|
418
|
-
}
|
|
419
|
-
checkTags(tag, ...offsets) {
|
|
420
|
-
this.wrapped.checkTags(tag, ...offsets);
|
|
421
|
-
}
|
|
422
|
-
checkTagsAreSame(...offsets) {
|
|
423
|
-
this.wrapped.checkTagsAreSame(...offsets);
|
|
424
|
-
}
|
|
425
|
-
checkTagsRange(tag, startOffset, size) {
|
|
426
|
-
this.wrapped.checkTagsRange(tag, startOffset, size);
|
|
427
|
-
}
|
|
428
293
|
}
|
|
429
|
-
//# 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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"}
|
|
294
|
+
const TAG_FOR_MEM_VAL = new Map([
|
|
295
|
+
[
|
|
296
|
+
'Field',
|
|
297
|
+
TypeTag.FIELD
|
|
298
|
+
],
|
|
299
|
+
[
|
|
300
|
+
'Uint1',
|
|
301
|
+
TypeTag.UINT1
|
|
302
|
+
],
|
|
303
|
+
[
|
|
304
|
+
'Uint8',
|
|
305
|
+
TypeTag.UINT8
|
|
306
|
+
],
|
|
307
|
+
[
|
|
308
|
+
'Uint16',
|
|
309
|
+
TypeTag.UINT16
|
|
310
|
+
],
|
|
311
|
+
[
|
|
312
|
+
'Uint32',
|
|
313
|
+
TypeTag.UINT32
|
|
314
|
+
],
|
|
315
|
+
[
|
|
316
|
+
'Uint64',
|
|
317
|
+
TypeTag.UINT64
|
|
318
|
+
],
|
|
319
|
+
[
|
|
320
|
+
'Uint128',
|
|
321
|
+
TypeTag.UINT128
|
|
322
|
+
]
|
|
323
|
+
]);
|
|
324
|
+
const VALID_TAGS = new Set([
|
|
325
|
+
TypeTag.FIELD,
|
|
326
|
+
TypeTag.UINT1,
|
|
327
|
+
TypeTag.UINT8,
|
|
328
|
+
TypeTag.UINT16,
|
|
329
|
+
TypeTag.UINT32,
|
|
330
|
+
TypeTag.UINT64,
|
|
331
|
+
TypeTag.UINT128
|
|
332
|
+
]);
|
|
333
|
+
const INTEGRAL_TAGS = new Set([
|
|
334
|
+
TypeTag.UINT1,
|
|
335
|
+
TypeTag.UINT8,
|
|
336
|
+
TypeTag.UINT16,
|
|
337
|
+
TypeTag.UINT32,
|
|
338
|
+
TypeTag.UINT64,
|
|
339
|
+
TypeTag.UINT128
|
|
340
|
+
]);
|