@aztec/simulator 0.32.1 → 0.34.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.
- package/README.md +5 -3
- package/dest/acvm/acvm.js +2 -2
- package/dest/acvm/oracle/index.d.ts +0 -1
- package/dest/acvm/oracle/index.d.ts.map +1 -1
- package/dest/acvm/oracle/index.js +1 -2
- package/dest/acvm/oracle/oracle.d.ts +1 -1
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +4 -5
- package/dest/avm/avm_context.d.ts +4 -14
- package/dest/avm/avm_context.d.ts.map +1 -1
- package/dest/avm/avm_context.js +10 -22
- package/dest/avm/avm_execution_environment.d.ts +4 -3
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +8 -7
- package/dest/avm/avm_gas.d.ts +71 -0
- package/dest/avm/avm_gas.d.ts.map +1 -0
- package/dest/avm/avm_gas.js +161 -0
- package/dest/avm/avm_machine_state.d.ts +4 -2
- package/dest/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/avm/avm_machine_state.js +8 -2
- package/dest/avm/avm_memory_types.d.ts +53 -1
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +99 -6
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +15 -13
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +3 -3
- package/dest/avm/journal/journal.d.ts +14 -13
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +5 -5
- package/dest/avm/journal/trace.d.ts +8 -19
- package/dest/avm/journal/trace.d.ts.map +1 -1
- package/dest/avm/journal/trace.js +48 -116
- package/dest/avm/journal/trace_types.d.ts +23 -4
- package/dest/avm/journal/trace_types.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +45 -17
- package/dest/avm/opcodes/addressing_mode.d.ts +5 -3
- package/dest/avm/opcodes/addressing_mode.d.ts.map +1 -1
- package/dest/avm/opcodes/addressing_mode.js +5 -1
- package/dest/avm/opcodes/arithmetic.d.ts +7 -3
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +27 -16
- package/dest/avm/opcodes/bitwise.d.ts +21 -20
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +43 -65
- package/dest/avm/opcodes/comparators.d.ts +12 -9
- package/dest/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/avm/opcodes/comparators.js +22 -32
- package/dest/avm/opcodes/context_getters.d.ts +20 -0
- package/dest/avm/opcodes/context_getters.d.ts.map +1 -0
- package/dest/avm/opcodes/context_getters.js +26 -0
- package/dest/avm/opcodes/contract.d.ts +14 -0
- package/dest/avm/opcodes/contract.d.ts.map +1 -0
- package/dest/avm/opcodes/contract.js +49 -0
- package/dest/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/avm/opcodes/control_flow.js +12 -2
- package/dest/avm/opcodes/environment_getters.d.ts +30 -33
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +34 -43
- package/dest/avm/opcodes/external_calls.d.ts +13 -19
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +69 -72
- package/dest/avm/opcodes/hashing.d.ts +2 -1
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +37 -18
- package/dest/avm/opcodes/index.d.ts +1 -0
- package/dest/avm/opcodes/index.d.ts.map +1 -1
- package/dest/avm/opcodes/index.js +2 -1
- package/dest/avm/opcodes/instruction.d.ts +10 -15
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +12 -22
- package/dest/avm/opcodes/instruction_impl.d.ts +14 -0
- package/dest/avm/opcodes/instruction_impl.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction_impl.js +37 -16
- package/dest/avm/opcodes/memory.d.ts +4 -3
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +38 -19
- package/dest/avm/opcodes/storage.d.ts +5 -0
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +21 -7
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +7 -5
- package/dest/avm/serialization/instruction_serialization.d.ts +12 -11
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +13 -12
- package/dest/client/client_execution_context.d.ts +2 -2
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +6 -6
- package/dest/client/private_execution.d.ts +1 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +8 -4
- package/dest/client/unconstrained_execution.d.ts +1 -1
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +2 -2
- package/dest/client/view_data_oracle.d.ts +2 -2
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +2 -2
- package/dest/public/executor.d.ts +2 -8
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +101 -69
- package/dest/public/index.d.ts +1 -1
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/public_execution_context.d.ts +6 -6
- package/dest/public/public_execution_context.d.ts.map +1 -1
- package/dest/public/public_execution_context.js +8 -12
- package/dest/public/transitional_adaptors.d.ts +32 -0
- package/dest/public/transitional_adaptors.d.ts.map +1 -0
- package/dest/public/transitional_adaptors.js +161 -0
- package/package.json +15 -9
- package/src/acvm/acvm.ts +1 -1
- package/src/acvm/oracle/index.ts +0 -1
- package/src/acvm/oracle/oracle.ts +3 -4
- package/src/avm/avm_context.ts +11 -33
- package/src/avm/avm_execution_environment.ts +9 -17
- package/src/avm/{avm_gas_cost.ts → avm_gas.ts} +75 -21
- package/src/avm/avm_machine_state.ts +9 -2
- package/src/avm/avm_memory_types.ts +134 -6
- package/src/avm/avm_simulator.ts +14 -12
- package/src/avm/fixtures/index.ts +2 -1
- package/src/avm/journal/journal.ts +24 -17
- package/src/avm/journal/trace.ts +59 -121
- package/src/avm/journal/trace_types.ts +39 -39
- package/src/avm/opcodes/accrued_substate.ts +58 -23
- package/src/avm/opcodes/addressing_mode.ts +8 -3
- package/src/avm/opcodes/arithmetic.ts +32 -22
- package/src/avm/opcodes/bitwise.ts +49 -83
- package/src/avm/opcodes/comparators.ts +28 -43
- package/src/avm/opcodes/context_getters.ts +32 -0
- package/src/avm/opcodes/contract.ts +58 -0
- package/src/avm/opcodes/control_flow.ts +23 -5
- package/src/avm/opcodes/environment_getters.ts +35 -44
- package/src/avm/opcodes/external_calls.ts +90 -89
- package/src/avm/opcodes/hashing.ts +45 -22
- package/src/avm/opcodes/index.ts +1 -0
- package/src/avm/opcodes/instruction.ts +14 -26
- package/src/avm/opcodes/instruction_impl.ts +45 -15
- package/src/avm/opcodes/memory.ts +48 -28
- package/src/avm/opcodes/storage.ts +26 -12
- package/src/avm/serialization/bytecode_serialization.ts +6 -3
- package/src/avm/serialization/instruction_serialization.ts +1 -0
- package/src/client/client_execution_context.ts +5 -5
- package/src/client/private_execution.ts +10 -4
- package/src/client/unconstrained_execution.ts +1 -1
- package/src/client/view_data_oracle.ts +1 -1
- package/src/public/executor.ts +123 -75
- package/src/public/index.ts +2 -2
- package/src/public/public_execution_context.ts +14 -19
- package/src/public/transitional_adaptors.ts +240 -0
- package/dest/acvm/oracle/debug.d.ts +0 -19
- package/dest/acvm/oracle/debug.d.ts.map +0 -1
- package/dest/acvm/oracle/debug.js +0 -95
- package/dest/avm/avm_gas_cost.d.ts +0 -322
- package/dest/avm/avm_gas_cost.d.ts.map +0 -1
- package/dest/avm/avm_gas_cost.js +0 -118
- package/dest/avm/temporary_executor_migration.d.ts +0 -25
- package/dest/avm/temporary_executor_migration.d.ts.map +0 -1
- package/dest/avm/temporary_executor_migration.js +0 -83
- package/src/acvm/oracle/debug.ts +0 -109
- package/src/avm/temporary_executor_migration.ts +0 -122
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { TypeTag } from './avm_memory_types.js';
|
|
2
|
+
import { InstructionExecutionError } from './errors.js';
|
|
3
|
+
import { Addressing, AddressingMode } from './opcodes/addressing_mode.js';
|
|
4
|
+
import { Opcode } from './serialization/instruction_serialization.js';
|
|
5
|
+
/** Maps a Gas struct to gasLeft properties. */
|
|
6
|
+
export function gasToGasLeft(gas) {
|
|
7
|
+
return { l1GasLeft: gas.l1Gas, l2GasLeft: gas.l2Gas, daGasLeft: gas.daGas };
|
|
8
|
+
}
|
|
9
|
+
/** Maps gasLeft properties to a gas struct. */
|
|
10
|
+
export function gasLeftToGas(gasLeft) {
|
|
11
|
+
return { l1Gas: gasLeft.l1GasLeft, l2Gas: gasLeft.l2GasLeft, daGas: gasLeft.daGasLeft };
|
|
12
|
+
}
|
|
13
|
+
/** Creates a new instance with all values set to zero except the ones set. */
|
|
14
|
+
export function makeGas(gasCost) {
|
|
15
|
+
return { ...EmptyGas, ...gasCost };
|
|
16
|
+
}
|
|
17
|
+
/** Sums together multiple instances of Gas. */
|
|
18
|
+
export function sumGas(...gases) {
|
|
19
|
+
return gases.reduce((acc, gas) => ({
|
|
20
|
+
l1Gas: acc.l1Gas + (gas.l1Gas ?? 0),
|
|
21
|
+
l2Gas: acc.l2Gas + (gas.l2Gas ?? 0),
|
|
22
|
+
daGas: acc.daGas + (gas.daGas ?? 0),
|
|
23
|
+
}), EmptyGas);
|
|
24
|
+
}
|
|
25
|
+
/** Multiplies a gas instance by a scalar. */
|
|
26
|
+
export function mulGas(gas, scalar) {
|
|
27
|
+
return { l1Gas: (gas.l1Gas ?? 0) * scalar, l2Gas: (gas.l2Gas ?? 0) * scalar, daGas: (gas.daGas ?? 0) * scalar };
|
|
28
|
+
}
|
|
29
|
+
/** Zero gas across all gas dimensions. */
|
|
30
|
+
export const EmptyGas = {
|
|
31
|
+
l1Gas: 0,
|
|
32
|
+
l2Gas: 0,
|
|
33
|
+
daGas: 0,
|
|
34
|
+
};
|
|
35
|
+
/** Dimensions of gas usage: L1, L2, and DA. */
|
|
36
|
+
export const GasDimensions = ['l1Gas', 'l2Gas', 'daGas'];
|
|
37
|
+
/** Null object to represent a gas cost that's dynamic instead of fixed for a given instruction. */
|
|
38
|
+
export const DynamicGasCost = Symbol('DynamicGasCost');
|
|
39
|
+
/** Temporary default gas cost. We should eventually remove all usage of this variable in favor of actual gas for each opcode. */
|
|
40
|
+
const TemporaryDefaultGasCost = { l1Gas: 0, l2Gas: 10, daGas: 0 };
|
|
41
|
+
/** Base gas costs for each instruction. Additional gas cost may be added on top due to memory or storage accesses, etc. */
|
|
42
|
+
export const GasCosts = {
|
|
43
|
+
[Opcode.ADD]: TemporaryDefaultGasCost,
|
|
44
|
+
[Opcode.SUB]: TemporaryDefaultGasCost,
|
|
45
|
+
[Opcode.MUL]: TemporaryDefaultGasCost,
|
|
46
|
+
[Opcode.DIV]: TemporaryDefaultGasCost,
|
|
47
|
+
[Opcode.FDIV]: TemporaryDefaultGasCost,
|
|
48
|
+
[Opcode.EQ]: TemporaryDefaultGasCost,
|
|
49
|
+
[Opcode.LT]: TemporaryDefaultGasCost,
|
|
50
|
+
[Opcode.LTE]: TemporaryDefaultGasCost,
|
|
51
|
+
[Opcode.AND]: TemporaryDefaultGasCost,
|
|
52
|
+
[Opcode.OR]: TemporaryDefaultGasCost,
|
|
53
|
+
[Opcode.XOR]: TemporaryDefaultGasCost,
|
|
54
|
+
[Opcode.NOT]: TemporaryDefaultGasCost,
|
|
55
|
+
[Opcode.SHL]: TemporaryDefaultGasCost,
|
|
56
|
+
[Opcode.SHR]: TemporaryDefaultGasCost,
|
|
57
|
+
[Opcode.CAST]: TemporaryDefaultGasCost,
|
|
58
|
+
// Execution environment
|
|
59
|
+
[Opcode.ADDRESS]: TemporaryDefaultGasCost,
|
|
60
|
+
[Opcode.STORAGEADDRESS]: TemporaryDefaultGasCost,
|
|
61
|
+
[Opcode.ORIGIN]: TemporaryDefaultGasCost,
|
|
62
|
+
[Opcode.SENDER]: TemporaryDefaultGasCost,
|
|
63
|
+
[Opcode.PORTAL]: TemporaryDefaultGasCost,
|
|
64
|
+
[Opcode.FEEPERL1GAS]: TemporaryDefaultGasCost,
|
|
65
|
+
[Opcode.FEEPERL2GAS]: TemporaryDefaultGasCost,
|
|
66
|
+
[Opcode.FEEPERDAGAS]: TemporaryDefaultGasCost,
|
|
67
|
+
[Opcode.CONTRACTCALLDEPTH]: TemporaryDefaultGasCost,
|
|
68
|
+
[Opcode.CHAINID]: TemporaryDefaultGasCost,
|
|
69
|
+
[Opcode.VERSION]: TemporaryDefaultGasCost,
|
|
70
|
+
[Opcode.BLOCKNUMBER]: TemporaryDefaultGasCost,
|
|
71
|
+
[Opcode.TIMESTAMP]: TemporaryDefaultGasCost,
|
|
72
|
+
[Opcode.COINBASE]: TemporaryDefaultGasCost,
|
|
73
|
+
[Opcode.BLOCKL1GASLIMIT]: TemporaryDefaultGasCost,
|
|
74
|
+
[Opcode.BLOCKL2GASLIMIT]: TemporaryDefaultGasCost,
|
|
75
|
+
[Opcode.BLOCKDAGASLIMIT]: TemporaryDefaultGasCost,
|
|
76
|
+
[Opcode.CALLDATACOPY]: TemporaryDefaultGasCost,
|
|
77
|
+
// Gas
|
|
78
|
+
[Opcode.L1GASLEFT]: TemporaryDefaultGasCost,
|
|
79
|
+
[Opcode.L2GASLEFT]: TemporaryDefaultGasCost,
|
|
80
|
+
[Opcode.DAGASLEFT]: TemporaryDefaultGasCost,
|
|
81
|
+
// Control flow
|
|
82
|
+
[Opcode.JUMP]: TemporaryDefaultGasCost,
|
|
83
|
+
[Opcode.JUMPI]: TemporaryDefaultGasCost,
|
|
84
|
+
[Opcode.INTERNALCALL]: TemporaryDefaultGasCost,
|
|
85
|
+
[Opcode.INTERNALRETURN]: TemporaryDefaultGasCost,
|
|
86
|
+
// Memory
|
|
87
|
+
[Opcode.SET]: TemporaryDefaultGasCost,
|
|
88
|
+
[Opcode.MOV]: TemporaryDefaultGasCost,
|
|
89
|
+
[Opcode.CMOV]: TemporaryDefaultGasCost,
|
|
90
|
+
// World state
|
|
91
|
+
[Opcode.SLOAD]: TemporaryDefaultGasCost,
|
|
92
|
+
[Opcode.SSTORE]: TemporaryDefaultGasCost,
|
|
93
|
+
[Opcode.NOTEHASHEXISTS]: TemporaryDefaultGasCost,
|
|
94
|
+
[Opcode.EMITNOTEHASH]: TemporaryDefaultGasCost,
|
|
95
|
+
[Opcode.NULLIFIEREXISTS]: TemporaryDefaultGasCost,
|
|
96
|
+
[Opcode.EMITNULLIFIER]: TemporaryDefaultGasCost,
|
|
97
|
+
[Opcode.L1TOL2MSGEXISTS]: TemporaryDefaultGasCost,
|
|
98
|
+
[Opcode.HEADERMEMBER]: TemporaryDefaultGasCost,
|
|
99
|
+
[Opcode.EMITUNENCRYPTEDLOG]: TemporaryDefaultGasCost,
|
|
100
|
+
[Opcode.SENDL2TOL1MSG]: TemporaryDefaultGasCost,
|
|
101
|
+
[Opcode.GETCONTRACTINSTANCE]: TemporaryDefaultGasCost,
|
|
102
|
+
// External calls
|
|
103
|
+
[Opcode.CALL]: TemporaryDefaultGasCost,
|
|
104
|
+
[Opcode.STATICCALL]: TemporaryDefaultGasCost,
|
|
105
|
+
[Opcode.DELEGATECALL]: TemporaryDefaultGasCost,
|
|
106
|
+
[Opcode.RETURN]: TemporaryDefaultGasCost,
|
|
107
|
+
[Opcode.REVERT]: TemporaryDefaultGasCost,
|
|
108
|
+
// Gadgets
|
|
109
|
+
[Opcode.KECCAK]: TemporaryDefaultGasCost,
|
|
110
|
+
[Opcode.POSEIDON]: TemporaryDefaultGasCost,
|
|
111
|
+
[Opcode.SHA256]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,
|
|
112
|
+
[Opcode.PEDERSEN]: TemporaryDefaultGasCost, // temp - may be removed, but alot of contracts rely on i: TemporaryDefaultGasCost,t
|
|
113
|
+
};
|
|
114
|
+
/** Returns the fixed base gas cost for a given opcode, or throws if set to dynamic. */
|
|
115
|
+
export function getBaseGasCost(opcode) {
|
|
116
|
+
const cost = GasCosts[opcode];
|
|
117
|
+
if (cost === DynamicGasCost) {
|
|
118
|
+
throw new Error(`Opcode ${Opcode[opcode]} has dynamic gas cost`);
|
|
119
|
+
}
|
|
120
|
+
return cost;
|
|
121
|
+
}
|
|
122
|
+
/** Returns the gas cost associated with the memory operations performed. */
|
|
123
|
+
export function getMemoryGasCost(args) {
|
|
124
|
+
const { reads, writes, indirect } = args;
|
|
125
|
+
const indirectCount = Addressing.fromWire(indirect ?? 0).count(AddressingMode.INDIRECT);
|
|
126
|
+
const l2MemoryGasCost = (reads ?? 0) * GasCostConstants.MEMORY_READ +
|
|
127
|
+
(writes ?? 0) * GasCostConstants.MEMORY_WRITE +
|
|
128
|
+
indirectCount * GasCostConstants.MEMORY_INDIRECT_READ_PENALTY;
|
|
129
|
+
return makeGas({ l2Gas: l2MemoryGasCost });
|
|
130
|
+
}
|
|
131
|
+
/** Constants used in base cost calculations. */
|
|
132
|
+
export const GasCostConstants = {
|
|
133
|
+
MEMORY_READ: 10,
|
|
134
|
+
MEMORY_INDIRECT_READ_PENALTY: 10,
|
|
135
|
+
MEMORY_WRITE: 100,
|
|
136
|
+
};
|
|
137
|
+
/** Returns gas cost for an operation on a given type tag based on the base cost per byte. */
|
|
138
|
+
export function getGasCostForTypeTag(tag, baseCost) {
|
|
139
|
+
return mulGas(baseCost, getGasCostMultiplierFromTypeTag(tag));
|
|
140
|
+
}
|
|
141
|
+
/** Returns a multiplier based on the size of the type represented by the tag. Throws on uninitialized or invalid. */
|
|
142
|
+
function getGasCostMultiplierFromTypeTag(tag) {
|
|
143
|
+
switch (tag) {
|
|
144
|
+
case TypeTag.UINT8:
|
|
145
|
+
return 1;
|
|
146
|
+
case TypeTag.UINT16:
|
|
147
|
+
return 2;
|
|
148
|
+
case TypeTag.UINT32:
|
|
149
|
+
return 4;
|
|
150
|
+
case TypeTag.UINT64:
|
|
151
|
+
return 8;
|
|
152
|
+
case TypeTag.UINT128:
|
|
153
|
+
return 16;
|
|
154
|
+
case TypeTag.FIELD:
|
|
155
|
+
return 32;
|
|
156
|
+
case TypeTag.INVALID:
|
|
157
|
+
case TypeTag.UNINITIALIZED:
|
|
158
|
+
throw new InstructionExecutionError(`Invalid tag type for gas cost multiplier: ${TypeTag[tag]}`);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"avm_gas.js","sourceRoot":"","sources":["../../src/avm/avm_gas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type Fr } from '@aztec/circuits.js';
|
|
2
|
-
import { type
|
|
2
|
+
import { type Gas } from './avm_gas.js';
|
|
3
3
|
import { TaggedMemory } from './avm_memory_types.js';
|
|
4
4
|
import { AvmContractCallResults } from './avm_message_call_result.js';
|
|
5
5
|
/**
|
|
@@ -43,7 +43,9 @@ export declare class AvmMachineState {
|
|
|
43
43
|
* Should any of the gas dimensions get depleted, it sets all gas left to zero and triggers
|
|
44
44
|
* an exceptional halt by throwing an OutOfGasError.
|
|
45
45
|
*/
|
|
46
|
-
consumeGas(gasCost: Partial<
|
|
46
|
+
consumeGas(gasCost: Partial<Gas>): void;
|
|
47
|
+
/** Increases the gas left by the amounts specified. */
|
|
48
|
+
refundGas(gasRefund: Partial<Gas>): void;
|
|
47
49
|
/**
|
|
48
50
|
* Most instructions just increment PC before they complete
|
|
49
51
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../src/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"avm_machine_state.d.ts","sourceRoot":"","sources":["../../src/avm/avm_machine_state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,KAAK,GAAG,EAAiB,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAGtE;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAe;IACnB,SAAS,EAAE,MAAM,CAAC;IACzB,6DAA6D;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IACzB,sBAAsB;IACf,EAAE,EAAE,MAAM,CAAK;IAEtB;;;OAGG;IACI,iBAAiB,EAAE,MAAM,EAAE,CAAM;IAExC,qCAAqC;IACrC,SAAgB,MAAM,EAAE,YAAY,CAAsB;IAE1D;;;OAGG;IACI,MAAM,EAAE,OAAO,CAAS;IAC/B,2FAA2F;IAC3F,OAAO,CAAC,QAAQ,CAAkB;IAClC,sDAAsD;IACtD,OAAO,CAAC,MAAM,CAAY;gBAEd,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;WAMrD,SAAS,CAAC,KAAK,EAAE,sBAAsB,GAAG,eAAe;IAIvE;;;;OAIG;IACI,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAiBvC,uDAAuD;IAChD,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC;IAMxC;;OAEG;IACI,WAAW;IAIlB;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAK1B;;;;OAIG;IACI,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE;IAM1B;;OAEG;IACH,SAAS,CAAC,eAAe;IAMzB;;;OAGG;IACI,UAAU,IAAI,sBAAsB;CAM5C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GasDimensions } from './
|
|
1
|
+
import { GasDimensions } from './avm_gas.js';
|
|
2
2
|
import { TaggedMemory } from './avm_memory_types.js';
|
|
3
3
|
import { AvmContractCallResults } from './avm_message_call_result.js';
|
|
4
4
|
import { OutOfGasError } from './errors.js';
|
|
@@ -51,6 +51,12 @@ export class AvmMachineState {
|
|
|
51
51
|
this[`${dimension}Left`] -= gasCost[dimension] ?? 0;
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
/** Increases the gas left by the amounts specified. */
|
|
55
|
+
refundGas(gasRefund) {
|
|
56
|
+
for (const dimension of GasDimensions) {
|
|
57
|
+
this[`${dimension}Left`] += gasRefund[dimension] ?? 0;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
54
60
|
/**
|
|
55
61
|
* Most instructions just increment PC before they complete
|
|
56
62
|
*/
|
|
@@ -95,4 +101,4 @@ export class AvmMachineState {
|
|
|
95
101
|
return new AvmContractCallResults(this.reverted, this.output);
|
|
96
102
|
}
|
|
97
103
|
}
|
|
98
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
104
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX21hY2hpbmVfc3RhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXZtL2F2bV9tYWNoaW5lX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBWSxhQUFhLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFDdkQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ3RFLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxhQUFhLENBQUM7QUFXNUM7O0dBRUc7QUFDSCxNQUFNLE9BQU8sZUFBZTtJQTJCMUIsWUFBWSxTQUFpQixFQUFFLFNBQWlCLEVBQUUsU0FBaUI7UUF0Qm5FLHNCQUFzQjtRQUNmLE9BQUUsR0FBVyxDQUFDLENBQUM7UUFFdEI7OztXQUdHO1FBQ0ksc0JBQWlCLEdBQWEsRUFBRSxDQUFDO1FBRXhDLHFDQUFxQztRQUNyQixXQUFNLEdBQWlCLElBQUksWUFBWSxFQUFFLENBQUM7UUFFMUQ7OztXQUdHO1FBQ0ksV0FBTSxHQUFZLEtBQUssQ0FBQztRQUMvQiwyRkFBMkY7UUFDbkYsYUFBUSxHQUFZLEtBQUssQ0FBQztRQUNsQyxzREFBc0Q7UUFDOUMsV0FBTSxHQUFTLEVBQUUsQ0FBQztRQUd4QixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztRQUMzQixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztRQUMzQixJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVMsQ0FBQztJQUM3QixDQUFDO0lBRU0sTUFBTSxDQUFDLFNBQVMsQ0FBQyxLQUE2QjtRQUNuRCxPQUFPLElBQUksZUFBZSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUyxDQUFDLENBQUM7SUFDaEYsQ0FBQztJQUVEOzs7O09BSUc7SUFDSSxVQUFVLENBQUMsT0FBcUI7UUFDckMsaURBQWlEO1FBQ2pELE1BQU0sa0JBQWtCLEdBQUcsYUFBYSxDQUFDLE1BQU0sQ0FDN0MsU0FBUyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsR0FBRyxTQUFTLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FDdEUsQ0FBQztRQUNGLHVDQUF1QztRQUN2QyxvRkFBb0Y7UUFDcEYsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDbEMsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO1lBQ3ZCLE1BQU0sSUFBSSxhQUFhLENBQUMsa0JBQWtCLENBQUMsQ0FBQztRQUM5QyxDQUFDO1FBQ0QsMENBQTBDO1FBQzFDLEtBQUssTUFBTSxTQUFTLElBQUksYUFBYSxFQUFFLENBQUM7WUFDdEMsSUFBSSxDQUFDLEdBQUcsU0FBUyxNQUFNLENBQUMsSUFBSSxPQUFPLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELENBQUM7SUFDSCxDQUFDO0lBRUQsdURBQXVEO0lBQ2hELFNBQVMsQ0FBQyxTQUF1QjtRQUN0QyxLQUFLLE1BQU0sU0FBUyxJQUFJLGFBQWEsRUFBRSxDQUFDO1lBQ3RDLElBQUksQ0FBQyxHQUFHLFNBQVMsTUFBTSxDQUFDLElBQUksU0FBUyxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4RCxDQUFDO0lBQ0gsQ0FBQztJQUVEOztPQUVHO0lBQ0ksV0FBVztRQUNoQixJQUFJLENBQUMsRUFBRSxFQUFFLENBQUM7SUFDWixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNJLE1BQU0sQ0FBQyxNQUFZO1FBQ3hCLElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxDQUFDO1FBQ25CLElBQUksQ0FBQyxNQUFNLEdBQUcsTUFBTSxDQUFDO0lBQ3ZCLENBQUM7SUFFRDs7OztPQUlHO0lBQ0ksTUFBTSxDQUFDLE1BQVk7UUFDeEIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7UUFDbkIsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxNQUFNLENBQUM7SUFDdkIsQ0FBQztJQUVEOztPQUVHO0lBQ08sZUFBZTtRQUN2QixhQUFhLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxTQUFTLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbkUsSUFBSSxDQUFDLFFBQVEsR0FBRyxJQUFJLENBQUM7UUFDckIsSUFBSSxDQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVEOzs7T0FHRztJQUNJLFVBQVU7UUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsd0RBQXdELENBQUMsQ0FBQztRQUM1RSxDQUFDO1FBQ0QsT0FBTyxJQUFJLHNCQUFzQixDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0lBQ2hFLENBQUM7Q0FDRiJ9
|
|
@@ -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
|
|
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":";AACA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,uBAAuB,CAAC;
|
|
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);
|
|
@@ -158,14 +167,18 @@ export class TaggedMemory {
|
|
|
158
167
|
getAs(offset) {
|
|
159
168
|
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
160
169
|
const word = this._mem[offset];
|
|
161
|
-
TaggedMemory.log(`get(${offset}) = ${word}`);
|
|
170
|
+
TaggedMemory.log.debug(`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) {
|
|
165
177
|
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
166
178
|
assert(offset + size < TaggedMemory.MAX_MEMORY_SIZE);
|
|
167
179
|
const value = this._mem.slice(offset, offset + size);
|
|
168
|
-
TaggedMemory.log(`getSlice(${offset}, ${size}) = ${value}`);
|
|
180
|
+
TaggedMemory.log.debug(`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
|
}
|
|
@@ -182,7 +195,7 @@ export class TaggedMemory {
|
|
|
182
195
|
set(offset, v) {
|
|
183
196
|
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
184
197
|
this._mem[offset] = v;
|
|
185
|
-
TaggedMemory.log(`set(${offset}, ${v})`);
|
|
198
|
+
TaggedMemory.log.debug(`set(${offset}, ${v})`);
|
|
186
199
|
}
|
|
187
200
|
setSlice(offset, vs) {
|
|
188
201
|
assert(offset < TaggedMemory.MAX_MEMORY_SIZE);
|
|
@@ -192,7 +205,7 @@ export class TaggedMemory {
|
|
|
192
205
|
this._mem.length = offset + vs.length;
|
|
193
206
|
}
|
|
194
207
|
this._mem.splice(offset, vs.length, ...vs);
|
|
195
|
-
TaggedMemory.log(`setSlice(${offset}, ${vs})`);
|
|
208
|
+
TaggedMemory.log.debug(`setSlice(${offset}, ${vs})`);
|
|
196
209
|
}
|
|
197
210
|
getTag(offset) {
|
|
198
211
|
return TaggedMemory.getTag(this._mem[offset]);
|
|
@@ -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;
|
|
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"}
|