@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.
- package/README.md +5 -3
- 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.map +1 -1
- package/dest/acvm/oracle/oracle.js +2 -3
- 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_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 +95 -2
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +10 -8
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +44 -16
- 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 +50 -68
- 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/avm/temporary_executor_migration.d.ts +2 -0
- package/dest/avm/temporary_executor_migration.d.ts.map +1 -1
- package/dest/avm/temporary_executor_migration.js +14 -3
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +6 -2
- package/dest/public/executor.d.ts +10 -2
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +59 -20
- package/dest/public/index.d.ts +1 -1
- package/dest/public/index.d.ts.map +1 -1
- package/package.json +15 -9
- package/src/acvm/oracle/index.ts +0 -1
- package/src/acvm/oracle/oracle.ts +1 -2
- package/src/avm/avm_context.ts +11 -33
- 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 +130 -2
- package/src/avm/avm_simulator.ts +9 -7
- package/src/avm/opcodes/accrued_substate.ts +57 -22
- 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 +65 -84
- 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/avm/temporary_executor_migration.ts +16 -2
- package/src/client/private_execution.ts +8 -2
- package/src/public/executor.ts +75 -22
- package/src/public/index.ts +2 -2
- 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/src/acvm/oracle/debug.ts +0 -109
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { FunctionSelector } from '@aztec/circuits.js';
|
|
2
|
+
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
3
|
+
import { gasLeftToGas, sumGas } from '../avm_gas.js';
|
|
2
4
|
import { Field, Uint8 } from '../avm_memory_types.js';
|
|
3
5
|
import { AvmSimulator } from '../avm_simulator.js';
|
|
4
6
|
import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
|
|
5
7
|
import { Addressing } from './addressing_mode.js';
|
|
6
8
|
import { Instruction } from './instruction.js';
|
|
7
|
-
|
|
8
|
-
constructor(indirect,
|
|
9
|
+
class ExternalCall extends Instruction {
|
|
10
|
+
constructor(indirect, gasOffset /* Unused due to no formal gas implementation at this moment */, addrOffset, argsOffset, argsSize, retOffset, retSize, successOffset,
|
|
9
11
|
// Function selector is temporary since eventually public contract bytecode will be one blob
|
|
10
12
|
// containing all functions, and function selector will become an application-level mechanism
|
|
11
13
|
// (e.g. first few bytes of calldata + compiler-generated jump table)
|
|
12
14
|
temporaryFunctionSelectorOffset) {
|
|
13
15
|
super();
|
|
14
16
|
this.indirect = indirect;
|
|
15
|
-
this.
|
|
17
|
+
this.gasOffset = gasOffset;
|
|
16
18
|
this.addrOffset = addrOffset;
|
|
17
19
|
this.argsOffset = argsOffset;
|
|
18
20
|
this.argsSize = argsSize;
|
|
@@ -21,34 +23,44 @@ export class Call extends Instruction {
|
|
|
21
23
|
this.successOffset = successOffset;
|
|
22
24
|
this.temporaryFunctionSelectorOffset = temporaryFunctionSelectorOffset;
|
|
23
25
|
}
|
|
24
|
-
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/3992): there is no concept of remaining / available gas at this moment
|
|
25
26
|
async execute(context) {
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const
|
|
27
|
+
const memory = context.machineState.memory.track(this.type);
|
|
28
|
+
const [gasOffset, addrOffset, argsOffset, retOffset, successOffset] = Addressing.fromWire(this.indirect).resolve([this.gasOffset, this.addrOffset, this.argsOffset, this.retOffset, this.successOffset], memory);
|
|
29
|
+
const callAddress = memory.getAs(addrOffset);
|
|
30
|
+
const calldata = memory.getSlice(argsOffset, this.argsSize).map(f => f.toFr());
|
|
31
|
+
const l1Gas = memory.get(gasOffset).toNumber();
|
|
32
|
+
const l2Gas = memory.getAs(gasOffset + 1).toNumber();
|
|
33
|
+
const daGas = memory.getAs(gasOffset + 2).toNumber();
|
|
34
|
+
const functionSelector = memory.getAs(this.temporaryFunctionSelectorOffset).toFr();
|
|
35
|
+
const allocatedGas = { l1Gas, l2Gas, daGas };
|
|
36
|
+
const memoryOperations = { reads: this.argsSize + 5, writes: 1 + this.retSize, indirect: this.indirect };
|
|
37
|
+
const totalGas = sumGas(this.gasCost(memoryOperations), allocatedGas);
|
|
38
|
+
context.machineState.consumeGas(totalGas);
|
|
39
|
+
const nestedContext = context.createNestedContractCallContext(callAddress.toFr(), calldata, allocatedGas, this.type, FunctionSelector.fromField(functionSelector));
|
|
31
40
|
const nestedCallResults = await new AvmSimulator(nestedContext).execute();
|
|
32
41
|
const success = !nestedCallResults.reverted;
|
|
33
|
-
// We only take as much data as was specified in the return size
|
|
42
|
+
// We only take as much data as was specified in the return size and pad with zeroes if the return data is smaller
|
|
43
|
+
// than the specified size in order to prevent that memory to be left with garbage
|
|
34
44
|
const returnData = nestedCallResults.output.slice(0, this.retSize);
|
|
35
|
-
const convertedReturnData = returnData.map(f => new Field(f));
|
|
45
|
+
const convertedReturnData = padArrayEnd(returnData.map(f => new Field(f)), new Field(0), this.retSize);
|
|
36
46
|
// Write our return data into memory
|
|
37
|
-
|
|
38
|
-
|
|
47
|
+
memory.set(successOffset, new Uint8(success ? 1 : 0));
|
|
48
|
+
memory.setSlice(retOffset, convertedReturnData);
|
|
49
|
+
// Refund unused gas
|
|
50
|
+
context.machineState.refundGas(gasLeftToGas(nestedContext.machineState));
|
|
51
|
+
// TODO: Should we merge the changes from a nested call in the case of a STATIC call?
|
|
39
52
|
if (success) {
|
|
40
53
|
context.persistableState.acceptNestedCallState(nestedContext.persistableState);
|
|
41
54
|
}
|
|
42
55
|
else {
|
|
43
56
|
context.persistableState.rejectNestedCallState(nestedContext.persistableState);
|
|
44
57
|
}
|
|
58
|
+
memory.assert(memoryOperations);
|
|
45
59
|
context.machineState.incrementPc();
|
|
46
60
|
}
|
|
47
61
|
}
|
|
48
|
-
Call.type = 'CALL';
|
|
49
|
-
Call.opcode = Opcode.CALL;
|
|
50
62
|
// Informs (de)serialization. See Instruction.deserialize.
|
|
51
|
-
|
|
63
|
+
ExternalCall.wireFormat = [
|
|
52
64
|
OperandType.UINT8,
|
|
53
65
|
OperandType.UINT8,
|
|
54
66
|
OperandType.UINT32,
|
|
@@ -61,58 +73,20 @@ Call.wireFormat = [
|
|
|
61
73
|
/* temporary function selector */
|
|
62
74
|
OperandType.UINT32,
|
|
63
75
|
];
|
|
64
|
-
export class
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
this.indirect = indirect;
|
|
68
|
-
this._gasOffset = _gasOffset;
|
|
69
|
-
this.addrOffset = addrOffset;
|
|
70
|
-
this.argsOffset = argsOffset;
|
|
71
|
-
this.argsSize = argsSize;
|
|
72
|
-
this.retOffset = retOffset;
|
|
73
|
-
this.retSize = retSize;
|
|
74
|
-
this.successOffset = successOffset;
|
|
75
|
-
this.temporaryFunctionSelectorOffset = temporaryFunctionSelectorOffset;
|
|
76
|
+
export class Call extends ExternalCall {
|
|
77
|
+
get type() {
|
|
78
|
+
return Call.type;
|
|
76
79
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
const nestedCallResults = await new AvmSimulator(nestedContext).execute();
|
|
84
|
-
const success = !nestedCallResults.reverted;
|
|
85
|
-
// We only take as much data as was specified in the return size -> TODO: should we be reverting here
|
|
86
|
-
const returnData = nestedCallResults.output.slice(0, this.retSize);
|
|
87
|
-
const convertedReturnData = returnData.map(f => new Field(f));
|
|
88
|
-
// Write our return data into memory
|
|
89
|
-
context.machineState.memory.set(successOffset, new Uint8(success ? 1 : 0));
|
|
90
|
-
context.machineState.memory.setSlice(retOffset, convertedReturnData);
|
|
91
|
-
if (success) {
|
|
92
|
-
context.persistableState.acceptNestedCallState(nestedContext.persistableState);
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
context.persistableState.rejectNestedCallState(nestedContext.persistableState);
|
|
96
|
-
}
|
|
97
|
-
context.machineState.incrementPc();
|
|
80
|
+
}
|
|
81
|
+
Call.type = 'CALL';
|
|
82
|
+
Call.opcode = Opcode.CALL;
|
|
83
|
+
export class StaticCall extends ExternalCall {
|
|
84
|
+
get type() {
|
|
85
|
+
return StaticCall.type;
|
|
98
86
|
}
|
|
99
87
|
}
|
|
100
88
|
StaticCall.type = 'STATICCALL';
|
|
101
89
|
StaticCall.opcode = Opcode.STATICCALL;
|
|
102
|
-
// Informs (de)serialization. See Instruction.deserialize.
|
|
103
|
-
StaticCall.wireFormat = [
|
|
104
|
-
OperandType.UINT8,
|
|
105
|
-
OperandType.UINT8,
|
|
106
|
-
OperandType.UINT32,
|
|
107
|
-
OperandType.UINT32,
|
|
108
|
-
OperandType.UINT32,
|
|
109
|
-
OperandType.UINT32,
|
|
110
|
-
OperandType.UINT32,
|
|
111
|
-
OperandType.UINT32,
|
|
112
|
-
OperandType.UINT32,
|
|
113
|
-
/* temporary function selector */
|
|
114
|
-
OperandType.UINT32,
|
|
115
|
-
];
|
|
116
90
|
export class Return extends Instruction {
|
|
117
91
|
constructor(indirect, returnOffset, copySize) {
|
|
118
92
|
super();
|
|
@@ -121,9 +95,13 @@ export class Return extends Instruction {
|
|
|
121
95
|
this.copySize = copySize;
|
|
122
96
|
}
|
|
123
97
|
async execute(context) {
|
|
124
|
-
const
|
|
125
|
-
const
|
|
98
|
+
const memoryOperations = { reads: this.copySize, indirect: this.indirect };
|
|
99
|
+
const memory = context.machineState.memory.track(this.type);
|
|
100
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
101
|
+
const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], memory);
|
|
102
|
+
const output = memory.getSlice(returnOffset, this.copySize).map(word => word.toFr());
|
|
126
103
|
context.machineState.return(output);
|
|
104
|
+
memory.assert(memoryOperations);
|
|
127
105
|
}
|
|
128
106
|
}
|
|
129
107
|
Return.type = 'RETURN';
|
|
@@ -143,9 +121,13 @@ export class Revert extends Instruction {
|
|
|
143
121
|
this.retSize = retSize;
|
|
144
122
|
}
|
|
145
123
|
async execute(context) {
|
|
146
|
-
const
|
|
147
|
-
const
|
|
124
|
+
const memoryOperations = { reads: this.retSize, indirect: this.indirect };
|
|
125
|
+
const memory = context.machineState.memory.track(this.type);
|
|
126
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
127
|
+
const [returnOffset] = Addressing.fromWire(this.indirect).resolve([this.returnOffset], memory);
|
|
128
|
+
const output = memory.getSlice(returnOffset, this.retSize).map(word => word.toFr());
|
|
148
129
|
context.machineState.revert(output);
|
|
130
|
+
memory.assert(memoryOperations);
|
|
149
131
|
}
|
|
150
132
|
}
|
|
151
133
|
Revert.type = 'REVERT';
|
|
@@ -157,4 +139,4 @@ Revert.wireFormat = [
|
|
|
157
139
|
OperandType.UINT32,
|
|
158
140
|
OperandType.UINT32,
|
|
159
141
|
];
|
|
160
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
142
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZXJuYWxfY2FsbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL29wY29kZXMvZXh0ZXJuYWxfY2FsbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDdEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBRzNELE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3JELE9BQU8sRUFBRSxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsV0FBVyxFQUFFLE1BQU0sK0NBQStDLENBQUM7QUFDcEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ2xELE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQztBQUUvQyxNQUFlLFlBQWEsU0FBUSxXQUFXO0lBZ0I3QyxZQUNVLFFBQWdCLEVBQ2hCLFNBQWlCLENBQUMsK0RBQStELEVBQ2pGLFVBQWtCLEVBQ2xCLFVBQWtCLEVBQ2xCLFFBQWdCLEVBQ2hCLFNBQWlCLEVBQ2pCLE9BQWUsRUFDZixhQUFxQjtJQUM3Qiw0RkFBNEY7SUFDNUYsNkZBQTZGO0lBQzdGLHFFQUFxRTtJQUM3RCwrQkFBdUM7UUFFL0MsS0FBSyxFQUFFLENBQUM7UUFiQSxhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQ2hCLGNBQVMsR0FBVCxTQUFTLENBQVE7UUFDakIsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUNsQixlQUFVLEdBQVYsVUFBVSxDQUFRO1FBQ2xCLGFBQVEsR0FBUixRQUFRLENBQVE7UUFDaEIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixZQUFPLEdBQVAsT0FBTyxDQUFR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
|
|
@@ -36,13 +36,14 @@ export declare class Sha256 extends Instruction {
|
|
|
36
36
|
}
|
|
37
37
|
export declare class Pedersen extends Instruction {
|
|
38
38
|
private indirect;
|
|
39
|
+
private genIndexOffset;
|
|
39
40
|
private dstOffset;
|
|
40
41
|
private messageOffset;
|
|
41
42
|
private messageSizeOffset;
|
|
42
43
|
static type: string;
|
|
43
44
|
static readonly opcode: Opcode;
|
|
44
45
|
static readonly wireFormat: OperandType[];
|
|
45
|
-
constructor(indirect: number, dstOffset: number, messageOffset: number, messageSizeOffset: number);
|
|
46
|
+
constructor(indirect: number, genIndexOffset: number, dstOffset: number, messageOffset: number, messageSizeOffset: number);
|
|
46
47
|
execute(context: AvmContext): Promise<void>;
|
|
47
48
|
}
|
|
48
49
|
//# sourceMappingURL=hashing.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/hashing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IActC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"hashing.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/hashing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,SAAU,SAAQ,WAAW;IActC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAe;IAClC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAKhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAoBzD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBzD;AAED,qBAAa,MAAO,SAAQ,WAAW;IAcnC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,WAAW;IAhBrB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAiB;IAG/C,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAMvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,WAAW,EAAE,MAAM;IAMhB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBzD;AAED,qBAAa,QAAS,SAAQ,WAAW;IAerC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,iBAAiB;IAlB3B,MAAM,CAAC,IAAI,EAAE,MAAM,CAAc;IACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmB;IAGjD,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,iBAAiB,EAAE,MAAM;IAKtB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAsBzD"}
|
|
@@ -13,12 +13,16 @@ export class Poseidon2 extends Instruction {
|
|
|
13
13
|
this.messageSize = messageSize;
|
|
14
14
|
}
|
|
15
15
|
async execute(context) {
|
|
16
|
+
const memoryOperations = { reads: this.messageSize, writes: 1, indirect: this.indirect };
|
|
17
|
+
const memory = context.machineState.memory.track(this.type);
|
|
18
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
16
19
|
// We hash a set of field elements
|
|
17
|
-
const [dstOffset, messageOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset, this.messageOffset],
|
|
20
|
+
const [dstOffset, messageOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset, this.messageOffset], memory);
|
|
18
21
|
// Memory pointer will be indirect
|
|
19
|
-
const hashData =
|
|
22
|
+
const hashData = memory.getSlice(messageOffset, this.messageSize).map(word => word.toBuffer());
|
|
20
23
|
const hash = poseidonHash(hashData);
|
|
21
|
-
|
|
24
|
+
memory.set(dstOffset, new Field(hash));
|
|
25
|
+
memory.assert(memoryOperations);
|
|
22
26
|
context.machineState.incrementPc();
|
|
23
27
|
}
|
|
24
28
|
}
|
|
@@ -42,15 +46,19 @@ export class Keccak extends Instruction {
|
|
|
42
46
|
}
|
|
43
47
|
// Note hash output is 32 bytes, so takes up two fields
|
|
44
48
|
async execute(context) {
|
|
49
|
+
const memoryOperations = { reads: this.messageSize, writes: 2, indirect: this.indirect };
|
|
50
|
+
const memory = context.machineState.memory.track(this.type);
|
|
51
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
45
52
|
// We hash a set of field elements
|
|
46
|
-
const [dstOffset, messageOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset, this.messageOffset],
|
|
47
|
-
const hashData =
|
|
53
|
+
const [dstOffset, messageOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset, this.messageOffset], memory);
|
|
54
|
+
const hashData = memory.getSlice(messageOffset, this.messageSize).map(word => word.toBuffer());
|
|
48
55
|
const hash = keccak(Buffer.concat(hashData));
|
|
49
56
|
// Split output into two fields
|
|
50
57
|
const high = new Field(toBigIntBE(hash.subarray(0, 16)));
|
|
51
58
|
const low = new Field(toBigIntBE(hash.subarray(16, 32)));
|
|
52
|
-
|
|
53
|
-
|
|
59
|
+
memory.set(dstOffset, high);
|
|
60
|
+
memory.set(dstOffset + 1, low);
|
|
61
|
+
memory.assert(memoryOperations);
|
|
54
62
|
context.machineState.incrementPc();
|
|
55
63
|
}
|
|
56
64
|
}
|
|
@@ -74,15 +82,19 @@ export class Sha256 extends Instruction {
|
|
|
74
82
|
}
|
|
75
83
|
// Note hash output is 32 bytes, so takes up two fields
|
|
76
84
|
async execute(context) {
|
|
77
|
-
const
|
|
85
|
+
const memoryOperations = { reads: this.messageSize, writes: 2, indirect: this.indirect };
|
|
86
|
+
const memory = context.machineState.memory.track(this.type);
|
|
87
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
88
|
+
const [dstOffset, messageOffset] = Addressing.fromWire(this.indirect).resolve([this.dstOffset, this.messageOffset], memory);
|
|
78
89
|
// We hash a set of field elements
|
|
79
|
-
const hashData =
|
|
90
|
+
const hashData = memory.getSlice(messageOffset, this.messageSize).map(word => word.toBuffer());
|
|
80
91
|
const hash = sha256(Buffer.concat(hashData));
|
|
81
92
|
// Split output into two fields
|
|
82
93
|
const high = new Field(toBigIntBE(hash.subarray(0, 16)));
|
|
83
94
|
const low = new Field(toBigIntBE(hash.subarray(16, 32)));
|
|
84
|
-
|
|
85
|
-
|
|
95
|
+
memory.set(dstOffset, high);
|
|
96
|
+
memory.set(dstOffset + 1, low);
|
|
97
|
+
memory.assert(memoryOperations);
|
|
86
98
|
context.machineState.incrementPc();
|
|
87
99
|
}
|
|
88
100
|
}
|
|
@@ -97,21 +109,27 @@ Sha256.wireFormat = [
|
|
|
97
109
|
OperandType.UINT32,
|
|
98
110
|
];
|
|
99
111
|
export class Pedersen extends Instruction {
|
|
100
|
-
constructor(indirect, dstOffset, messageOffset, messageSizeOffset) {
|
|
112
|
+
constructor(indirect, genIndexOffset, dstOffset, messageOffset, messageSizeOffset) {
|
|
101
113
|
super();
|
|
102
114
|
this.indirect = indirect;
|
|
115
|
+
this.genIndexOffset = genIndexOffset;
|
|
103
116
|
this.dstOffset = dstOffset;
|
|
104
117
|
this.messageOffset = messageOffset;
|
|
105
118
|
this.messageSizeOffset = messageSizeOffset;
|
|
106
119
|
}
|
|
107
120
|
async execute(context) {
|
|
108
|
-
const
|
|
121
|
+
const memory = context.machineState.memory.track(this.type);
|
|
122
|
+
const [genIndexOffset, dstOffset, messageOffset, messageSizeOffset] = Addressing.fromWire(this.indirect).resolve([this.genIndexOffset, this.dstOffset, this.messageOffset, this.messageSizeOffset], memory);
|
|
109
123
|
// We hash a set of field elements
|
|
110
|
-
const
|
|
111
|
-
const
|
|
124
|
+
const genIndex = Number(memory.get(genIndexOffset).toBigInt());
|
|
125
|
+
const messageSize = Number(memory.get(messageSizeOffset).toBigInt());
|
|
126
|
+
const hashData = memory.getSlice(messageOffset, messageSize);
|
|
127
|
+
const memoryOperations = { reads: messageSize + 2, writes: 1, indirect: this.indirect };
|
|
128
|
+
context.machineState.consumeGas(this.gasCost(memoryOperations));
|
|
112
129
|
// No domain sep for now
|
|
113
|
-
const hash = pedersenHash(hashData);
|
|
114
|
-
|
|
130
|
+
const hash = pedersenHash(hashData, genIndex);
|
|
131
|
+
memory.set(dstOffset, new Field(hash));
|
|
132
|
+
memory.assert(memoryOperations);
|
|
115
133
|
context.machineState.incrementPc();
|
|
116
134
|
}
|
|
117
135
|
}
|
|
@@ -124,5 +142,6 @@ Pedersen.wireFormat = [
|
|
|
124
142
|
OperandType.UINT32,
|
|
125
143
|
OperandType.UINT32,
|
|
126
144
|
OperandType.UINT32,
|
|
145
|
+
OperandType.UINT32,
|
|
127
146
|
];
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
147
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hashing.js","sourceRoot":"","sources":["../../../src/avm/opcodes/hashing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC;AACpC,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from './arithmetic.js';
|
|
2
2
|
export * from './bitwise.js';
|
|
3
3
|
export * from './control_flow.js';
|
|
4
|
+
export * from './contract.js';
|
|
4
5
|
export * from './instruction.js';
|
|
5
6
|
export * from './comparators.js';
|
|
6
7
|
export * from './memory.js';
|
|
@@ -8,4 +9,4 @@ export * from './storage.js';
|
|
|
8
9
|
export * from './external_calls.js';
|
|
9
10
|
export * from './environment_getters.js';
|
|
10
11
|
export * from './accrued_substate.js';
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL29wY29kZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxpQkFBaUIsQ0FBQztBQUNoQyxjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLG1CQUFtQixDQUFDO0FBQ2xDLGNBQWMsZUFBZSxDQUFDO0FBQzlCLGNBQWMsa0JBQWtCLENBQUM7QUFDakMsY0FBYyxrQkFBa0IsQ0FBQztBQUNqQyxjQUFjLGFBQWEsQ0FBQztBQUM1QixjQUFjLGNBQWMsQ0FBQztBQUM3QixjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsMEJBQTBCLENBQUM7QUFDekMsY0FBYyx1QkFBdUIsQ0FBQyJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import type { AvmContext } from '../avm_context.js';
|
|
3
|
-
import { type
|
|
3
|
+
import { type MemoryOperations } from '../avm_memory_types.js';
|
|
4
4
|
import { type BufferCursor } from '../serialization/buffer_cursor.js';
|
|
5
5
|
import { Opcode, type OperandType } from '../serialization/instruction_serialization.js';
|
|
6
6
|
type InstructionConstructor = {
|
|
@@ -17,20 +17,7 @@ export declare abstract class Instruction {
|
|
|
17
17
|
* This is the main entry point for the instruction.
|
|
18
18
|
* @param context - The AvmContext in which the instruction executes.
|
|
19
19
|
*/
|
|
20
|
-
|
|
21
|
-
/**
|
|
22
|
-
* Loads default gas cost for the instruction from the GasCosts table.
|
|
23
|
-
* Instruction sub-classes can override this if their gas cost is not fixed.
|
|
24
|
-
*/
|
|
25
|
-
protected gasCost(): GasCost;
|
|
26
|
-
/**
|
|
27
|
-
* Execute the instruction.
|
|
28
|
-
* Instruction sub-classes must implement this.
|
|
29
|
-
* As an AvmContext executes its contract code, it calls this function for
|
|
30
|
-
* each instruction until the machine state signals "halted".
|
|
31
|
-
* @param context - The AvmContext in which the instruction executes.
|
|
32
|
-
*/
|
|
33
|
-
protected abstract execute(context: AvmContext): Promise<void>;
|
|
20
|
+
abstract execute(context: AvmContext): Promise<void>;
|
|
34
21
|
/**
|
|
35
22
|
* Generate a string representation of the instruction including
|
|
36
23
|
* the instruction sub-class name all of its flags and operands.
|
|
@@ -52,6 +39,14 @@ export declare abstract class Instruction {
|
|
|
52
39
|
* @returns Constructed instance of Class.
|
|
53
40
|
*/
|
|
54
41
|
static deserialize(this: InstructionConstructor, buf: BufferCursor | Buffer): Instruction;
|
|
42
|
+
/**
|
|
43
|
+
* Computes gas cost for the instruction based on its base cost and memory operations.
|
|
44
|
+
* @param memoryOps Memory operations performed by the instruction.
|
|
45
|
+
* @returns Gas cost.
|
|
46
|
+
*/
|
|
47
|
+
protected gasCost(memoryOps?: Partial<MemoryOperations & {
|
|
48
|
+
indirect: number;
|
|
49
|
+
}>): import("../avm_gas.js").Gas;
|
|
55
50
|
/**
|
|
56
51
|
* Returns the stringified type of the instruction.
|
|
57
52
|
* Instruction sub-classes should have a static `type` property.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"instruction.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,KAAK,WAAW,EAA0B,MAAM,+CAA+C,CAAC;AAEjH,KAAK,sBAAsB,GAAG;IAC5B,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,WAAW,CAAC;IAClC,UAAU,CAAC,EAAE,WAAW,EAAE,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,8BAAsB,WAAW;IAC/B;;;;OAIG;aACa,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;OAIG;IACI,QAAQ,IAAI,MAAM;IASzB;;;;;OAKG;IACI,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM;IAKnC;;;;;;OAMG;WACW,WAAW,CAAC,IAAI,EAAE,sBAAsB,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,WAAW;IAOhG;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,SAAS,GAAE,OAAO,CAAC,gBAAgB,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAM;IAMlF;;;OAGG;IACH,IAAW,IAAI,IAAI,MAAM,CAMxB;IAED;;;OAGG;IACH,IAAW,MAAM,IAAI,MAAM,CAM1B;CACF"}
|
|
@@ -1,31 +1,11 @@
|
|
|
1
1
|
import { strict as assert } from 'assert';
|
|
2
|
-
import {
|
|
2
|
+
import { getBaseGasCost, getMemoryGasCost, sumGas } from '../avm_gas.js';
|
|
3
3
|
import { Opcode, deserialize, serialize } from '../serialization/instruction_serialization.js';
|
|
4
4
|
/**
|
|
5
5
|
* Parent class for all AVM instructions.
|
|
6
6
|
* It's most important aspects are execute and (de)serialize.
|
|
7
7
|
*/
|
|
8
8
|
export class Instruction {
|
|
9
|
-
/**
|
|
10
|
-
* Consumes gas and executes the instruction.
|
|
11
|
-
* This is the main entry point for the instruction.
|
|
12
|
-
* @param context - The AvmContext in which the instruction executes.
|
|
13
|
-
*/
|
|
14
|
-
run(context) {
|
|
15
|
-
context.machineState.consumeGas(this.gasCost());
|
|
16
|
-
return this.execute(context);
|
|
17
|
-
}
|
|
18
|
-
/**
|
|
19
|
-
* Loads default gas cost for the instruction from the GasCosts table.
|
|
20
|
-
* Instruction sub-classes can override this if their gas cost is not fixed.
|
|
21
|
-
*/
|
|
22
|
-
gasCost() {
|
|
23
|
-
const gasCost = GasCosts[this.opcode];
|
|
24
|
-
if (gasCost === DynamicGasCost) {
|
|
25
|
-
throw new Error(`Instruction ${this.type} must define its own gas cost`);
|
|
26
|
-
}
|
|
27
|
-
return gasCost;
|
|
28
|
-
}
|
|
29
9
|
/**
|
|
30
10
|
* Generate a string representation of the instruction including
|
|
31
11
|
* the instruction sub-class name all of its flags and operands.
|
|
@@ -62,6 +42,16 @@ export class Instruction {
|
|
|
62
42
|
const args = res.slice(1); // Remove opcode.
|
|
63
43
|
return new this(...args);
|
|
64
44
|
}
|
|
45
|
+
/**
|
|
46
|
+
* Computes gas cost for the instruction based on its base cost and memory operations.
|
|
47
|
+
* @param memoryOps Memory operations performed by the instruction.
|
|
48
|
+
* @returns Gas cost.
|
|
49
|
+
*/
|
|
50
|
+
gasCost(memoryOps = {}) {
|
|
51
|
+
const baseGasCost = getBaseGasCost(this.opcode);
|
|
52
|
+
const memoryGasCost = getMemoryGasCost(memoryOps);
|
|
53
|
+
return sumGas(baseGasCost, memoryGasCost);
|
|
54
|
+
}
|
|
65
55
|
/**
|
|
66
56
|
* Returns the stringified type of the instruction.
|
|
67
57
|
* Instruction sub-classes should have a static `type` property.
|
|
@@ -85,4 +75,4 @@ export class Instruction {
|
|
|
85
75
|
return opcode;
|
|
86
76
|
}
|
|
87
77
|
}
|
|
88
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5zdHJ1Y3Rpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvYXZtL29wY29kZXMvaW5zdHJ1Y3Rpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFHMUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFHekUsT0FBTyxFQUFFLE1BQU0sRUFBb0IsV0FBVyxFQUFFLFNBQVMsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBT2pIOzs7R0FHRztBQUNILE1BQU0sT0FBZ0IsV0FBVztJQVEvQjs7OztPQUlHO0lBQ0ksUUFBUTtRQUNiLElBQUksY0FBYyxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztRQUNsRCxvREFBb0Q7UUFDcEQsS0FBSyxNQUFNLElBQUksSUFBSSxNQUFNLENBQUMsbUJBQW1CLENBQUMsSUFBSSxDQUEwQixFQUFFLENBQUM7WUFDN0UsY0FBYyxJQUFJLEdBQUcsSUFBSSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDO1FBQ3pELENBQUM7UUFDRCxPQUFPLGNBQWMsQ0FBQztJQUN4QixDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxTQUFTO1FBQ2QsTUFBTSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLFVBQVUsRUFBRSx5Q0FBeUMsQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sU0FBUyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3RELENBQUM7SUFFRDs7Ozs7O09BTUc7SUFDSSxNQUFNLENBQUMsV0FBVyxDQUErQixHQUEwQjtRQUNoRixNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxVQUFVLEVBQUUscURBQXFELENBQUMsQ0FBQztRQUNqRixNQUFNLEdBQUcsR0FBRyxXQUFXLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQztRQUM5QyxNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsaUJBQWlCO1FBQzVDLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQ7Ozs7T0FJRztJQUNPLE9BQU8sQ0FBQyxZQUE4RCxFQUFFO1FBQ2hGLE1BQU0sV0FBVyxHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDaEQsTUFBTSxhQUFhLEdBQUcsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDbEQsT0FBTyxNQUFNLENBQUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxDQUFDO0lBQzVDLENBQUM7SUFFRDs7O09BR0c7SUFDSCxJQUFXLElBQUk7UUFDYixNQUFNLElBQUksR0FBRyxNQUFNLElBQUksSUFBSSxDQUFDLFdBQVcsSUFBSyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQWUsQ0FBQztRQUM3RSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDVixNQUFNLElBQUksS0FBSyxDQUFDLHFCQUFxQixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksa0RBQWtELENBQUMsQ0FBQztRQUNoSCxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsSUFBVyxNQUFNO1FBQ2YsTUFBTSxNQUFNLEdBQUcsUUFBUSxJQUFJLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFFLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBaUIsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDO1FBQzlGLElBQUksTUFBTSxLQUFLLFNBQVMsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssU0FBUyxFQUFFLENBQUM7WUFDekQsTUFBTSxJQUFJLEtBQUssQ0FBQyxxQkFBcUIsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLG9EQUFvRCxDQUFDLENBQUM7UUFDbEgsQ0FBQztRQUNELE9BQU8sTUFBTSxDQUFDO0lBQ2hCLENBQUM7Q0FDRiJ9
|
|
@@ -1,5 +1,11 @@
|
|
|
1
|
+
import { type AvmContext } from '../avm_context.js';
|
|
2
|
+
import { type MemoryValue } from '../avm_memory_types.js';
|
|
1
3
|
import { OperandType } from '../serialization/instruction_serialization.js';
|
|
2
4
|
import { Instruction } from './instruction.js';
|
|
5
|
+
/** Wire format that informs deserialization for instructions with two operands. */
|
|
6
|
+
export declare const TwoOperandWireFormat: OperandType[];
|
|
7
|
+
/** Wire format that informs deserialization for instructions with three operands. */
|
|
8
|
+
export declare const ThreeOperandWireFormat: OperandType[];
|
|
3
9
|
/**
|
|
4
10
|
* Covers (de)serialization for an instruction with:
|
|
5
11
|
* indirect, inTag, and two UINT32s.
|
|
@@ -25,4 +31,12 @@ export declare abstract class ThreeOperandInstruction extends Instruction {
|
|
|
25
31
|
static readonly wireFormat: OperandType[];
|
|
26
32
|
constructor(indirect: number, inTag: number, aOffset: number, bOffset: number, dstOffset: number);
|
|
27
33
|
}
|
|
34
|
+
export declare abstract class GetterInstruction extends Instruction {
|
|
35
|
+
protected indirect: number;
|
|
36
|
+
protected dstOffset: number;
|
|
37
|
+
static readonly wireFormat: OperandType[];
|
|
38
|
+
constructor(indirect: number, dstOffset: number);
|
|
39
|
+
execute(context: AvmContext): Promise<void>;
|
|
40
|
+
protected abstract getValue(env: AvmContext): MemoryValue;
|
|
41
|
+
}
|
|
28
42
|
//# sourceMappingURL=instruction_impl.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction_impl.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction_impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C;;;GAGG;AACH,8BAAsB,qBAAsB,SAAQ,WAAW;
|
|
1
|
+
{"version":3,"file":"instruction_impl.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/instruction_impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,mFAAmF;AACnF,eAAO,MAAM,oBAAoB,eAMhC,CAAC;AAEF,qFAAqF;AACrF,eAAO,MAAM,sBAAsB,eAOlC,CAAC;AAEF;;;GAGG;AACH,8BAAsB,qBAAsB,SAAQ,WAAW;IAK3D,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,OAAO,EAAE,MAAM;IACzB,SAAS,CAAC,SAAS,EAAE,MAAM;IAN7B,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAAwB;gBAGrD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM;CAI9B;AAED;;;GAGG;AACH,8BAAsB,uBAAwB,SAAQ,WAAW;IAK7D,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,KAAK,EAAE,MAAM;IACvB,SAAS,CAAC,OAAO,EAAE,MAAM;IACzB,SAAS,CAAC,OAAO,EAAE,MAAM;IACzB,SAAS,CAAC,SAAS,EAAE,MAAM;IAP7B,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA0B;gBAGvD,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM;CAI9B;AAED,8BAAsB,iBAAkB,SAAQ,WAAW;IAI7C,SAAS,CAAC,QAAQ,EAAE,MAAM;IAAE,SAAS,CAAC,SAAS,EAAE,MAAM;IAFnE,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAA8D;gBAEjF,QAAQ,EAAE,MAAM,EAAY,SAAS,EAAE,MAAM;IAItD,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxD,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,WAAW;CAC1D"}
|