@aztec/simulator 0.56.0 → 0.58.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/dest/acvm/oracle/oracle.d.ts +2 -5
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +7 -38
- package/dest/acvm/oracle/typed_oracle.d.ts +4 -8
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +1 -10
- package/dest/avm/avm_execution_environment.d.ts +2 -3
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +3 -4
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +2 -3
- package/dest/avm/avm_memory_types.d.ts +10 -5
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +31 -16
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +5 -2
- package/dest/avm/errors.d.ts +1 -1
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +12 -3
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +4 -4
- package/dest/avm/journal/journal.d.ts +2 -1
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +8 -8
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +54 -47
- package/dest/avm/opcodes/addressing_mode.d.ts +3 -2
- package/dest/avm/opcodes/addressing_mode.d.ts.map +1 -1
- package/dest/avm/opcodes/addressing_mode.js +25 -21
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +7 -6
- package/dest/avm/opcodes/bitwise.d.ts +3 -3
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +19 -16
- package/dest/avm/opcodes/commitment.d.ts.map +1 -1
- package/dest/avm/opcodes/commitment.js +6 -5
- package/dest/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/avm/opcodes/comparators.js +7 -6
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +8 -6
- package/dest/avm/opcodes/control_flow.js +7 -7
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +11 -10
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +25 -15
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +6 -5
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +37 -26
- package/dest/avm/opcodes/hashing.d.ts +1 -3
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +39 -48
- package/dest/avm/opcodes/instruction.d.ts +2 -6
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +3 -9
- package/dest/avm/opcodes/instruction_impl.d.ts +1 -2
- package/dest/avm/opcodes/instruction_impl.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction_impl.js +2 -5
- package/dest/avm/opcodes/memory.d.ts +0 -12
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +24 -54
- package/dest/avm/opcodes/misc.d.ts.map +1 -1
- package/dest/avm/opcodes/misc.js +10 -9
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +35 -20
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +13 -11
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +2 -3
- package/dest/avm/serialization/instruction_serialization.d.ts +32 -34
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +34 -37
- package/dest/avm/test_utils.d.ts +1 -2
- package/dest/avm/test_utils.d.ts.map +1 -1
- package/dest/avm/test_utils.js +1 -1
- package/dest/client/client_execution_context.d.ts +6 -30
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +36 -54
- package/dest/client/db_oracle.d.ts +1 -2
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/index.d.ts +1 -1
- package/dest/client/index.d.ts.map +1 -1
- package/dest/client/index.js +2 -2
- package/dest/client/private_execution.d.ts +12 -3
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +29 -23
- package/dest/client/simulator.d.ts +2 -3
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +1 -1
- package/dest/client/view_data_oracle.d.ts +1 -2
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +1 -1
- package/dest/common/debug_fn_name.d.ts +4 -0
- package/dest/common/debug_fn_name.d.ts.map +1 -0
- package/dest/common/debug_fn_name.js +15 -0
- package/dest/common/index.d.ts +0 -1
- package/dest/common/index.d.ts.map +1 -1
- package/dest/common/index.js +1 -2
- package/dest/public/db_interfaces.d.ts +1 -2
- package/dest/public/db_interfaces.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.d.ts +76 -0
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -0
- package/dest/public/dual_side_effect_trace.js +109 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts +114 -0
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -0
- package/dest/public/enqueued_call_side_effect_trace.js +314 -0
- package/dest/public/enqueued_call_simulator.d.ts +2 -2
- package/dest/public/enqueued_call_simulator.d.ts.map +1 -1
- package/dest/public/enqueued_call_simulator.js +20 -10
- package/dest/public/enqueued_calls_processor.d.ts +2 -2
- package/dest/public/enqueued_calls_processor.d.ts.map +1 -1
- package/dest/public/enqueued_calls_processor.js +3 -5
- package/dest/public/execution.d.ts +11 -5
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +13 -1
- package/dest/public/executor.d.ts +7 -6
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +24 -15
- package/dest/public/fee_payment.d.ts +1 -1
- package/dest/public/fee_payment.d.ts.map +1 -1
- package/dest/public/fee_payment.js +4 -7
- package/dest/public/hints_builder.d.ts +2 -2
- package/dest/public/hints_builder.d.ts.map +1 -1
- package/dest/public/hints_builder.js +2 -2
- package/dest/public/public_db_sources.d.ts +4 -5
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +15 -11
- package/dest/public/public_kernel_tail_simulator.d.ts +3 -3
- package/dest/public/public_kernel_tail_simulator.d.ts.map +1 -1
- package/dest/public/public_kernel_tail_simulator.js +1 -1
- package/dest/public/public_processor.d.ts +7 -10
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +9 -10
- package/dest/public/side_effect_errors.d.ts +4 -0
- package/dest/public/side_effect_errors.d.ts.map +1 -0
- package/dest/public/side_effect_errors.js +7 -0
- package/dest/public/side_effect_trace.d.ts +3 -4
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +54 -29
- package/dest/public/side_effect_trace_interface.d.ts +1 -1
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/package.json +12 -9
- package/src/acvm/oracle/oracle.ts +8 -86
- package/src/acvm/oracle/typed_oracle.ts +8 -33
- package/src/avm/avm_execution_environment.ts +1 -3
- package/src/avm/avm_gas.ts +1 -2
- package/src/avm/avm_memory_types.ts +38 -16
- package/src/avm/avm_simulator.ts +7 -1
- package/src/avm/errors.ts +11 -3
- package/src/avm/fixtures/index.ts +2 -3
- package/src/avm/journal/journal.ts +14 -10
- package/src/avm/opcodes/accrued_substate.ts +53 -61
- package/src/avm/opcodes/addressing_mode.ts +27 -24
- package/src/avm/opcodes/arithmetic.ts +6 -8
- package/src/avm/opcodes/bitwise.ts +18 -18
- package/src/avm/opcodes/commitment.ts +6 -7
- package/src/avm/opcodes/comparators.ts +6 -8
- package/src/avm/opcodes/contract.ts +7 -8
- package/src/avm/opcodes/control_flow.ts +6 -6
- package/src/avm/opcodes/conversion.ts +10 -12
- package/src/avm/opcodes/ec_add.ts +29 -24
- package/src/avm/opcodes/environment_getters.ts +5 -4
- package/src/avm/opcodes/external_calls.ts +37 -30
- package/src/avm/opcodes/hashing.ts +38 -63
- package/src/avm/opcodes/instruction.ts +3 -10
- package/src/avm/opcodes/instruction_impl.ts +0 -3
- package/src/avm/opcodes/memory.ts +23 -67
- package/src/avm/opcodes/misc.ts +9 -11
- package/src/avm/opcodes/multi_scalar_mul.ts +31 -26
- package/src/avm/opcodes/storage.ts +12 -10
- package/src/avm/serialization/bytecode_serialization.ts +0 -2
- package/src/avm/serialization/instruction_serialization.ts +1 -4
- package/src/avm/test_utils.ts +1 -2
- package/src/client/client_execution_context.ts +46 -97
- package/src/client/db_oracle.ts +6 -2
- package/src/client/index.ts +1 -1
- package/src/client/private_execution.ts +45 -15
- package/src/client/simulator.ts +2 -3
- package/src/client/view_data_oracle.ts +1 -2
- package/src/common/debug_fn_name.ts +22 -0
- package/src/common/index.ts +0 -1
- package/src/public/db_interfaces.ts +5 -2
- package/src/public/dual_side_effect_trace.ts +173 -0
- package/src/public/enqueued_call_side_effect_trace.ts +552 -0
- package/src/public/enqueued_call_simulator.ts +35 -14
- package/src/public/enqueued_calls_processor.ts +4 -6
- package/src/public/execution.ts +15 -6
- package/src/public/executor.ts +42 -19
- package/src/public/fee_payment.ts +4 -6
- package/src/public/hints_builder.ts +9 -11
- package/src/public/public_db_sources.ts +31 -22
- package/src/public/public_kernel_tail_simulator.ts +3 -3
- package/src/public/public_processor.ts +17 -13
- package/src/public/side_effect_errors.ts +6 -0
- package/src/public/side_effect_trace.ts +74 -29
- package/src/public/side_effect_trace_interface.ts +2 -2
- package/dest/client/execution_result.d.ts +0 -104
- package/dest/client/execution_result.d.ts.map +0 -1
- package/dest/client/execution_result.js +0 -136
- package/dest/common/return_values.d.ts +0 -11
- package/dest/common/return_values.d.ts.map +0 -1
- package/dest/common/return_values.js +0 -13
- package/src/client/execution_result.ts +0 -228
- package/src/common/return_values.ts +0 -18
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TypeTag,
|
|
1
|
+
import { TypeTag, Uint1 } from '../avm_memory_types.js';
|
|
2
2
|
import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
|
|
3
3
|
import { NullifierCollisionError } from '../journal/nullifiers.js';
|
|
4
4
|
import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
|
|
@@ -13,17 +13,18 @@ export class NoteHashExists extends Instruction {
|
|
|
13
13
|
this.existsOffset = existsOffset;
|
|
14
14
|
}
|
|
15
15
|
async execute(context) {
|
|
16
|
-
const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
|
|
17
16
|
const memory = context.machineState.memory.track(this.type);
|
|
18
|
-
context.machineState.consumeGas(this.gasCost(
|
|
19
|
-
const
|
|
17
|
+
context.machineState.consumeGas(this.gasCost());
|
|
18
|
+
const operands = [this.noteHashOffset, this.leafIndexOffset, this.existsOffset];
|
|
19
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
20
|
+
const [noteHashOffset, leafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
|
|
20
21
|
memory.checkTags(TypeTag.FIELD, noteHashOffset, leafIndexOffset);
|
|
21
22
|
// Note that this instruction accepts any type in memory, and converts to Field.
|
|
22
23
|
const noteHash = memory.get(noteHashOffset).toFr();
|
|
23
24
|
const leafIndex = memory.get(leafIndexOffset).toFr();
|
|
24
25
|
const exists = await context.persistableState.checkNoteHashExists(context.environment.storageAddress, noteHash, leafIndex);
|
|
25
|
-
memory.set(existsOffset, exists ? new
|
|
26
|
-
memory.assert(
|
|
26
|
+
memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
|
|
27
|
+
memory.assert({ reads: 2, writes: 1, addressing });
|
|
27
28
|
context.machineState.incrementPc();
|
|
28
29
|
}
|
|
29
30
|
}
|
|
@@ -33,9 +34,9 @@ NoteHashExists.opcode = Opcode.NOTEHASHEXISTS;
|
|
|
33
34
|
NoteHashExists.wireFormat = [
|
|
34
35
|
OperandType.UINT8,
|
|
35
36
|
OperandType.UINT8,
|
|
36
|
-
OperandType.
|
|
37
|
-
OperandType.
|
|
38
|
-
OperandType.
|
|
37
|
+
OperandType.UINT16,
|
|
38
|
+
OperandType.UINT16,
|
|
39
|
+
OperandType.UINT16,
|
|
39
40
|
];
|
|
40
41
|
export class EmitNoteHash extends Instruction {
|
|
41
42
|
constructor(indirect, noteHashOffset) {
|
|
@@ -44,24 +45,25 @@ export class EmitNoteHash extends Instruction {
|
|
|
44
45
|
this.noteHashOffset = noteHashOffset;
|
|
45
46
|
}
|
|
46
47
|
async execute(context) {
|
|
47
|
-
const memoryOperations = { reads: 1, indirect: this.indirect };
|
|
48
48
|
const memory = context.machineState.memory.track(this.type);
|
|
49
|
-
context.machineState.consumeGas(this.gasCost(
|
|
50
|
-
const
|
|
49
|
+
context.machineState.consumeGas(this.gasCost());
|
|
50
|
+
const operands = [this.noteHashOffset];
|
|
51
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
52
|
+
const [noteHashOffset] = addressing.resolve(operands, memory);
|
|
51
53
|
memory.checkTag(TypeTag.FIELD, noteHashOffset);
|
|
52
54
|
if (context.environment.isStaticCall) {
|
|
53
55
|
throw new StaticCallAlterationError();
|
|
54
56
|
}
|
|
55
57
|
const noteHash = memory.get(noteHashOffset).toFr();
|
|
56
58
|
context.persistableState.writeNoteHash(context.environment.storageAddress, noteHash);
|
|
57
|
-
memory.assert(
|
|
59
|
+
memory.assert({ reads: 1, addressing });
|
|
58
60
|
context.machineState.incrementPc();
|
|
59
61
|
}
|
|
60
62
|
}
|
|
61
63
|
EmitNoteHash.type = 'EMITNOTEHASH';
|
|
62
64
|
EmitNoteHash.opcode = Opcode.EMITNOTEHASH;
|
|
63
65
|
// Informs (de)serialization. See Instruction.deserialize.
|
|
64
|
-
EmitNoteHash.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.
|
|
66
|
+
EmitNoteHash.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
|
|
65
67
|
export class NullifierExists extends Instruction {
|
|
66
68
|
constructor(indirect, nullifierOffset, addressOffset, existsOffset) {
|
|
67
69
|
super();
|
|
@@ -71,16 +73,17 @@ export class NullifierExists extends Instruction {
|
|
|
71
73
|
this.existsOffset = existsOffset;
|
|
72
74
|
}
|
|
73
75
|
async execute(context) {
|
|
74
|
-
const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
|
|
75
76
|
const memory = context.machineState.memory.track(this.type);
|
|
76
|
-
context.machineState.consumeGas(this.gasCost(
|
|
77
|
-
const
|
|
77
|
+
context.machineState.consumeGas(this.gasCost());
|
|
78
|
+
const operands = [this.nullifierOffset, this.addressOffset, this.existsOffset];
|
|
79
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
80
|
+
const [nullifierOffset, addressOffset, existsOffset] = addressing.resolve(operands, memory);
|
|
78
81
|
memory.checkTags(TypeTag.FIELD, nullifierOffset, addressOffset);
|
|
79
82
|
const nullifier = memory.get(nullifierOffset).toFr();
|
|
80
83
|
const address = memory.get(addressOffset).toFr();
|
|
81
84
|
const exists = await context.persistableState.checkNullifierExists(address, nullifier);
|
|
82
|
-
memory.set(existsOffset, exists ? new
|
|
83
|
-
memory.assert(
|
|
85
|
+
memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
|
|
86
|
+
memory.assert({ reads: 2, writes: 1, addressing });
|
|
84
87
|
context.machineState.incrementPc();
|
|
85
88
|
}
|
|
86
89
|
}
|
|
@@ -90,9 +93,9 @@ NullifierExists.opcode = Opcode.NULLIFIEREXISTS;
|
|
|
90
93
|
NullifierExists.wireFormat = [
|
|
91
94
|
OperandType.UINT8,
|
|
92
95
|
OperandType.UINT8,
|
|
93
|
-
OperandType.
|
|
94
|
-
OperandType.
|
|
95
|
-
OperandType.
|
|
96
|
+
OperandType.UINT16,
|
|
97
|
+
OperandType.UINT16,
|
|
98
|
+
OperandType.UINT16,
|
|
96
99
|
];
|
|
97
100
|
export class EmitNullifier extends Instruction {
|
|
98
101
|
constructor(indirect, nullifierOffset) {
|
|
@@ -104,10 +107,11 @@ export class EmitNullifier extends Instruction {
|
|
|
104
107
|
if (context.environment.isStaticCall) {
|
|
105
108
|
throw new StaticCallAlterationError();
|
|
106
109
|
}
|
|
107
|
-
const memoryOperations = { reads: 1, indirect: this.indirect };
|
|
108
110
|
const memory = context.machineState.memory.track(this.type);
|
|
109
|
-
context.machineState.consumeGas(this.gasCost(
|
|
110
|
-
const
|
|
111
|
+
context.machineState.consumeGas(this.gasCost());
|
|
112
|
+
const operands = [this.nullifierOffset];
|
|
113
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
114
|
+
const [nullifierOffset] = addressing.resolve(operands, memory);
|
|
111
115
|
memory.checkTag(TypeTag.FIELD, nullifierOffset);
|
|
112
116
|
const nullifier = memory.get(nullifierOffset).toFr();
|
|
113
117
|
try {
|
|
@@ -122,14 +126,14 @@ export class EmitNullifier extends Instruction {
|
|
|
122
126
|
throw e;
|
|
123
127
|
}
|
|
124
128
|
}
|
|
125
|
-
memory.assert(
|
|
129
|
+
memory.assert({ reads: 1, addressing });
|
|
126
130
|
context.machineState.incrementPc();
|
|
127
131
|
}
|
|
128
132
|
}
|
|
129
133
|
EmitNullifier.type = 'EMITNULLIFIER';
|
|
130
134
|
EmitNullifier.opcode = Opcode.EMITNULLIFIER;
|
|
131
135
|
// Informs (de)serialization. See Instruction.deserialize.
|
|
132
|
-
EmitNullifier.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.
|
|
136
|
+
EmitNullifier.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
|
|
133
137
|
export class L1ToL2MessageExists extends Instruction {
|
|
134
138
|
constructor(indirect, msgHashOffset, msgLeafIndexOffset, existsOffset) {
|
|
135
139
|
super();
|
|
@@ -139,16 +143,17 @@ export class L1ToL2MessageExists extends Instruction {
|
|
|
139
143
|
this.existsOffset = existsOffset;
|
|
140
144
|
}
|
|
141
145
|
async execute(context) {
|
|
142
|
-
const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
|
|
143
146
|
const memory = context.machineState.memory.track(this.type);
|
|
144
|
-
context.machineState.consumeGas(this.gasCost(
|
|
145
|
-
const
|
|
147
|
+
context.machineState.consumeGas(this.gasCost());
|
|
148
|
+
const operands = [this.msgHashOffset, this.msgLeafIndexOffset, this.existsOffset];
|
|
149
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
150
|
+
const [msgHashOffset, msgLeafIndexOffset, existsOffset] = addressing.resolve(operands, memory);
|
|
146
151
|
memory.checkTags(TypeTag.FIELD, msgHashOffset, msgLeafIndexOffset);
|
|
147
152
|
const msgHash = memory.get(msgHashOffset).toFr();
|
|
148
153
|
const msgLeafIndex = memory.get(msgLeafIndexOffset).toFr();
|
|
149
154
|
const exists = await context.persistableState.checkL1ToL2MessageExists(context.environment.address, msgHash, msgLeafIndex);
|
|
150
|
-
memory.set(existsOffset, exists ? new
|
|
151
|
-
memory.assert(
|
|
155
|
+
memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
|
|
156
|
+
memory.assert({ reads: 2, writes: 1, addressing });
|
|
152
157
|
context.machineState.incrementPc();
|
|
153
158
|
}
|
|
154
159
|
}
|
|
@@ -158,9 +163,9 @@ L1ToL2MessageExists.opcode = Opcode.L1TOL2MSGEXISTS;
|
|
|
158
163
|
L1ToL2MessageExists.wireFormat = [
|
|
159
164
|
OperandType.UINT8,
|
|
160
165
|
OperandType.UINT8,
|
|
161
|
-
OperandType.
|
|
162
|
-
OperandType.
|
|
163
|
-
OperandType.
|
|
166
|
+
OperandType.UINT16,
|
|
167
|
+
OperandType.UINT16,
|
|
168
|
+
OperandType.UINT16,
|
|
164
169
|
];
|
|
165
170
|
export class EmitUnencryptedLog extends Instruction {
|
|
166
171
|
constructor(indirect, logOffset, logSizeOffset) {
|
|
@@ -174,23 +179,24 @@ export class EmitUnencryptedLog extends Instruction {
|
|
|
174
179
|
throw new StaticCallAlterationError();
|
|
175
180
|
}
|
|
176
181
|
const memory = context.machineState.memory.track(this.type);
|
|
177
|
-
const
|
|
182
|
+
const operands = [this.logOffset, this.logSizeOffset];
|
|
183
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
184
|
+
const [logOffset, logSizeOffset] = addressing.resolve(operands, memory);
|
|
178
185
|
memory.checkTag(TypeTag.UINT32, logSizeOffset);
|
|
179
186
|
const logSize = memory.get(logSizeOffset).toNumber();
|
|
180
187
|
memory.checkTagsRange(TypeTag.FIELD, logOffset, logSize);
|
|
181
188
|
const contractAddress = context.environment.address;
|
|
182
|
-
|
|
183
|
-
context.machineState.consumeGas(this.gasCost({ ...memoryOperations, dynMultiplier: logSize }));
|
|
189
|
+
context.machineState.consumeGas(this.gasCost(logSize));
|
|
184
190
|
const log = memory.getSlice(logOffset, logSize).map(f => f.toFr());
|
|
185
191
|
context.persistableState.writeUnencryptedLog(contractAddress, log);
|
|
186
|
-
memory.assert(
|
|
192
|
+
memory.assert({ reads: 1 + logSize, addressing });
|
|
187
193
|
context.machineState.incrementPc();
|
|
188
194
|
}
|
|
189
195
|
}
|
|
190
196
|
EmitUnencryptedLog.type = 'EMITUNENCRYPTEDLOG';
|
|
191
197
|
EmitUnencryptedLog.opcode = Opcode.EMITUNENCRYPTEDLOG;
|
|
192
198
|
// Informs (de)serialization. See Instruction.deserialize.
|
|
193
|
-
EmitUnencryptedLog.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.
|
|
199
|
+
EmitUnencryptedLog.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
|
|
194
200
|
export class SendL2ToL1Message extends Instruction {
|
|
195
201
|
constructor(indirect, recipientOffset, contentOffset) {
|
|
196
202
|
super();
|
|
@@ -202,19 +208,20 @@ export class SendL2ToL1Message extends Instruction {
|
|
|
202
208
|
if (context.environment.isStaticCall) {
|
|
203
209
|
throw new StaticCallAlterationError();
|
|
204
210
|
}
|
|
205
|
-
const memoryOperations = { reads: 2, indirect: this.indirect };
|
|
206
211
|
const memory = context.machineState.memory.track(this.type);
|
|
207
|
-
context.machineState.consumeGas(this.gasCost(
|
|
208
|
-
const
|
|
212
|
+
context.machineState.consumeGas(this.gasCost());
|
|
213
|
+
const operands = [this.recipientOffset, this.contentOffset];
|
|
214
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
215
|
+
const [recipientOffset, contentOffset] = addressing.resolve(operands, memory);
|
|
209
216
|
const recipient = memory.get(recipientOffset).toFr();
|
|
210
217
|
const content = memory.get(contentOffset).toFr();
|
|
211
|
-
context.persistableState.writeL2ToL1Message(recipient, content);
|
|
212
|
-
memory.assert(
|
|
218
|
+
context.persistableState.writeL2ToL1Message(context.environment.address, recipient, content);
|
|
219
|
+
memory.assert({ reads: 2, addressing });
|
|
213
220
|
context.machineState.incrementPc();
|
|
214
221
|
}
|
|
215
222
|
}
|
|
216
223
|
SendL2ToL1Message.type = 'SENDL2TOL1MSG';
|
|
217
224
|
SendL2ToL1Message.opcode = Opcode.SENDL2TOL1MSG;
|
|
218
225
|
// Informs (de)serialization. See Instruction.deserialize.
|
|
219
|
-
SendL2ToL1Message.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.
|
|
220
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accrued_substate.js","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
|
|
226
|
+
SendL2ToL1Message.wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
|
|
227
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accrued_substate.js","sourceRoot":"","sources":["../../../src/avm/opcodes/accrued_substate.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@ import { type TaggedMemoryInterface } from '../avm_memory_types.js';
|
|
|
2
2
|
export declare enum AddressingMode {
|
|
3
3
|
DIRECT = 0,
|
|
4
4
|
INDIRECT = 1,
|
|
5
|
-
|
|
5
|
+
RELATIVE = 2,
|
|
6
|
+
INDIRECT_RELATIVE = 3
|
|
6
7
|
}
|
|
7
8
|
/** A class to represent the addressing mode of an instruction. */
|
|
8
9
|
export declare class Addressing {
|
|
@@ -11,7 +12,7 @@ export declare class Addressing {
|
|
|
11
12
|
constructor(
|
|
12
13
|
/** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
|
|
13
14
|
modePerOperand: AddressingMode[]);
|
|
14
|
-
static fromWire(wireModes: number): Addressing;
|
|
15
|
+
static fromWire(wireModes: number, numOperands?: number): Addressing;
|
|
15
16
|
toWire(): number;
|
|
16
17
|
/** Returns how many operands use the given addressing mode. */
|
|
17
18
|
count(mode: AddressingMode): number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,oBAAY,cAAc;IACxB,MAAM,
|
|
1
|
+
{"version":3,"file":"addressing_mode.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/addressing_mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAEpE,oBAAY,cAAc;IACxB,MAAM,IAAI;IACV,QAAQ,IAAI;IACZ,QAAQ,IAAI;IACZ,iBAAiB,IAAI;CACtB;AAED,kEAAkE;AAClE,qBAAa,UAAU;IAEnB,mHAAmH;IACnH,OAAO,CAAC,QAAQ,CAAC,cAAc;;IAD/B,mHAAmH;IAClG,cAAc,EAAE,cAAc,EAAE;WAIrC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU,GAAG,UAAU;IAYvE,MAAM,IAAI,MAAM;IAevB,+DAA+D;IACxD,KAAK,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM;IAI1C;;;;;OAKG;IACI,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,qBAAqB,GAAG,MAAM,EAAE;CAiBxE"}
|
|
@@ -3,7 +3,8 @@ export var AddressingMode;
|
|
|
3
3
|
(function (AddressingMode) {
|
|
4
4
|
AddressingMode[AddressingMode["DIRECT"] = 0] = "DIRECT";
|
|
5
5
|
AddressingMode[AddressingMode["INDIRECT"] = 1] = "INDIRECT";
|
|
6
|
-
AddressingMode[AddressingMode["
|
|
6
|
+
AddressingMode[AddressingMode["RELATIVE"] = 2] = "RELATIVE";
|
|
7
|
+
AddressingMode[AddressingMode["INDIRECT_RELATIVE"] = 3] = "INDIRECT_RELATIVE";
|
|
7
8
|
})(AddressingMode || (AddressingMode = {}));
|
|
8
9
|
/** A class to represent the addressing mode of an instruction. */
|
|
9
10
|
export class Addressing {
|
|
@@ -11,14 +12,16 @@ export class Addressing {
|
|
|
11
12
|
/** The addressing mode for each operand. The length of this array is the number of operands of the instruction. */
|
|
12
13
|
modePerOperand) {
|
|
13
14
|
this.modePerOperand = modePerOperand;
|
|
14
|
-
assert(modePerOperand.length <= 8, 'At most 8 operands are supported');
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
// TODO(facundo): 8 for backwards compatibility.
|
|
17
|
+
static fromWire(wireModes, numOperands = 8) {
|
|
17
18
|
// The modes are stored in the wire format as a byte, with each bit representing the mode for an operand.
|
|
18
19
|
// The least significant bit represents the zeroth operand, and the most significant bit represents the last operand.
|
|
19
|
-
const modes = new Array(
|
|
20
|
-
for (let i = 0; i <
|
|
21
|
-
modes[i] =
|
|
20
|
+
const modes = new Array(numOperands);
|
|
21
|
+
for (let i = 0; i < numOperands; i++) {
|
|
22
|
+
modes[i] =
|
|
23
|
+
(((wireModes >> i) & 1) * AddressingMode.INDIRECT) |
|
|
24
|
+
(((wireModes >> (i + numOperands)) & 1) * AddressingMode.RELATIVE);
|
|
22
25
|
}
|
|
23
26
|
return new Addressing(modes);
|
|
24
27
|
}
|
|
@@ -26,16 +29,19 @@ export class Addressing {
|
|
|
26
29
|
// The modes are stored in the wire format as a byte, with each bit representing the mode for an operand.
|
|
27
30
|
// The least significant bit represents the zeroth operand, and the least significant bit represents the last operand.
|
|
28
31
|
let wire = 0;
|
|
29
|
-
for (let i = 0; i <
|
|
30
|
-
if (this.modePerOperand[i]
|
|
32
|
+
for (let i = 0; i < this.modePerOperand.length; i++) {
|
|
33
|
+
if (this.modePerOperand[i] & AddressingMode.INDIRECT) {
|
|
31
34
|
wire |= 1 << i;
|
|
32
35
|
}
|
|
36
|
+
if (this.modePerOperand[i] & AddressingMode.RELATIVE) {
|
|
37
|
+
wire |= 1 << (this.modePerOperand.length + i);
|
|
38
|
+
}
|
|
33
39
|
}
|
|
34
40
|
return wire;
|
|
35
41
|
}
|
|
36
42
|
/** Returns how many operands use the given addressing mode. */
|
|
37
43
|
count(mode) {
|
|
38
|
-
return this.modePerOperand.filter(m => m
|
|
44
|
+
return this.modePerOperand.filter(m => (m & mode) !== 0).length;
|
|
39
45
|
}
|
|
40
46
|
/**
|
|
41
47
|
* Resolves the offsets using the addressing mode.
|
|
@@ -47,20 +53,18 @@ export class Addressing {
|
|
|
47
53
|
assert(offsets.length <= this.modePerOperand.length);
|
|
48
54
|
const resolved = new Array(offsets.length);
|
|
49
55
|
for (const [i, offset] of offsets.entries()) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
default:
|
|
60
|
-
throw new Error(`Unimplemented addressing mode: ${AddressingMode[this.modePerOperand[i]]}`);
|
|
56
|
+
const mode = this.modePerOperand[i];
|
|
57
|
+
resolved[i] = offset;
|
|
58
|
+
if (mode & AddressingMode.RELATIVE) {
|
|
59
|
+
mem.checkIsValidMemoryOffsetTag(0);
|
|
60
|
+
resolved[i] += Number(mem.get(0).toBigInt());
|
|
61
|
+
}
|
|
62
|
+
if (mode & AddressingMode.INDIRECT) {
|
|
63
|
+
mem.checkIsValidMemoryOffsetTag(resolved[i]);
|
|
64
|
+
resolved[i] = Number(mem.get(resolved[i]).toBigInt());
|
|
61
65
|
}
|
|
62
66
|
}
|
|
63
67
|
return resolved;
|
|
64
68
|
}
|
|
65
69
|
}
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRkcmVzc2luZ19tb2RlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2F2bS9vcGNvZGVzL2FkZHJlc3NpbmdfbW9kZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxJQUFJLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQztBQUkxQyxNQUFNLENBQU4sSUFBWSxjQUtYO0FBTEQsV0FBWSxjQUFjO0lBQ3hCLHVEQUFVLENBQUE7SUFDViwyREFBWSxDQUFBO0lBQ1osMkRBQVksQ0FBQTtJQUNaLDZFQUFxQixDQUFBO0FBQ3ZCLENBQUMsRUFMVyxjQUFjLEtBQWQsY0FBYyxRQUt6QjtBQUVELGtFQUFrRTtBQUNsRSxNQUFNLE9BQU8sVUFBVTtJQUNyQjtJQUNFLG1IQUFtSDtJQUNsRyxjQUFnQztRQUFoQyxtQkFBYyxHQUFkLGNBQWMsQ0FBa0I7SUFDaEQsQ0FBQztJQUVKLGdEQUFnRDtJQUN6QyxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQWlCLEVBQUUsY0FBc0IsQ0FBQztRQUMvRCx5R0FBeUc7UUFDekcscUhBQXFIO1FBQ3JILE1BQU0sS0FBSyxHQUFHLElBQUksS0FBSyxDQUFpQixXQUFXLENBQUMsQ0FBQztRQUNyRCxLQUFLLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLEdBQUcsV0FBVyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDckMsS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDTixDQUFDLENBQUMsQ0FBQyxTQUFTLElBQUksQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsY0FBYyxDQUFDLFFBQVEsQ0FBQztvQkFDbEQsQ0FBQyxDQUFDLENBQUMsU0FBUyxJQUFJLENBQUMsQ0FBQyxHQUFHLFdBQVcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQ3ZFLENBQUM7UUFDRCxPQUFPLElBQUksVUFBVSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQy9CLENBQUM7SUFFTSxNQUFNO1FBQ1gseUdBQXlHO1FBQ3pHLHNIQUFzSDtRQUN0SCxJQUFJLElBQUksR0FBVyxDQUFDLENBQUM7UUFDckIsS0FBSyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsTUFBTSxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUM7WUFDcEQsSUFBSSxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDckQsSUFBSSxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDakIsQ0FBQztZQUNELElBQUksSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsR0FBRyxjQUFjLENBQUMsUUFBUSxFQUFFLENBQUM7Z0JBQ3JELElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQztZQUNoRCxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELCtEQUErRDtJQUN4RCxLQUFLLENBQUMsSUFBb0I7UUFDL0IsT0FBTyxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztJQUNsRSxDQUFDO0lBRUQ7Ozs7O09BS0c7SUFDSSxPQUFPLENBQUMsT0FBaUIsRUFBRSxHQUEwQjtRQUMxRCxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sSUFBSSxJQUFJLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3JELE1BQU0sUUFBUSxHQUFHLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMzQyxLQUFLLE1BQU0sQ0FBQyxDQUFDLEVBQUUsTUFBTSxDQUFDLElBQUksT0FBTyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7WUFDNUMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNwQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEdBQUcsTUFBTSxDQUFDO1lBQ3JCLElBQUksSUFBSSxHQUFHLGNBQWMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztnQkFDbkMsR0FBRyxDQUFDLDJCQUEyQixDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUNuQyxRQUFRLENBQUMsQ0FBQyxDQUFDLElBQUksTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQztZQUMvQyxDQUFDO1lBQ0QsSUFBSSxJQUFJLEdBQUcsY0FBYyxDQUFDLFFBQVEsRUFBRSxDQUFDO2dCQUNuQyxHQUFHLENBQUMsMkJBQTJCLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQzdDLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ3hELENBQUM7UUFDSCxDQUFDO1FBQ0QsT0FBTyxRQUFRLENBQUM7SUFDbEIsQ0FBQztDQUNGIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,8BAAsB,iCAAkC,SAAQ,uBAAuB;IACxE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"arithmetic.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/arithmetic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,MAAM,EAAE,MAAM,+CAA+C,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,8BAAsB,iCAAkC,SAAQ,uBAAuB;IACxE,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CACxE;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAED,qBAAa,GAAI,SAAQ,iCAAiC;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,CAAS;IAC5B,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,GAAG,WAAW;CAG/D;AAGD,qBAAa,QAAS,SAAQ,iCAAiC;IAC7D,MAAM,CAAC,IAAI,EAAE,MAAM,CAAU;IAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,iBAAiB;IAEvC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,KAAK;CAI7C"}
|
|
@@ -3,16 +3,17 @@ import { Addressing } from './addressing_mode.js';
|
|
|
3
3
|
import { ThreeOperandInstruction } from './instruction_impl.js';
|
|
4
4
|
export class ThreeOperandArithmeticInstruction extends ThreeOperandInstruction {
|
|
5
5
|
async execute(context) {
|
|
6
|
-
const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
|
|
7
6
|
const memory = context.machineState.memory.track(this.type);
|
|
8
|
-
context.machineState.consumeGas(this.gasCost(
|
|
9
|
-
const
|
|
10
|
-
|
|
7
|
+
context.machineState.consumeGas(this.gasCost());
|
|
8
|
+
const operands = [this.aOffset, this.bOffset, this.dstOffset];
|
|
9
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
10
|
+
const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
|
|
11
|
+
memory.checkTagsAreSame(aOffset, bOffset);
|
|
11
12
|
const a = memory.get(aOffset);
|
|
12
13
|
const b = memory.get(bOffset);
|
|
13
14
|
const dest = this.compute(a, b);
|
|
14
15
|
memory.set(dstOffset, dest);
|
|
15
|
-
memory.assert(
|
|
16
|
+
memory.assert({ reads: 2, writes: 1, addressing });
|
|
16
17
|
context.machineState.incrementPc();
|
|
17
18
|
}
|
|
18
19
|
}
|
|
@@ -53,4 +54,4 @@ export class FieldDiv extends ThreeOperandArithmeticInstruction {
|
|
|
53
54
|
}
|
|
54
55
|
FieldDiv.type = 'FDIV';
|
|
55
56
|
FieldDiv.opcode = Opcode.FDIV_8; // FIXME: needed for gas.
|
|
56
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJpdGhtZXRpYy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9hcml0aG1ldGljLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSwrQ0FBK0MsQ0FBQztBQUN2RSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDbEQsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFaEUsTUFBTSxPQUFnQixpQ0FBa0MsU0FBUSx1QkFBdUI7SUFDOUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFtQjtRQUN0QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVELE9BQU8sQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBRWhELE1BQU0sUUFBUSxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUM5RCxNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQzNFLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7UUFFMUMsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM5QixNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRTlCLE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLE1BQU0sQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFDO1FBRTVCLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsVUFBVSxFQUFFLENBQUMsQ0FBQztRQUNuRCxPQUFPLENBQUMsWUFBWSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3JDLENBQUM7Q0FHRjtBQUVELE1BQU0sT0FBTyxHQUFJLFNBQVEsaUNBQWlDO0lBSTlDLE9BQU8sQ0FBQyxDQUFjLEVBQUUsQ0FBYztRQUM5QyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQzs7QUFMZSxRQUFJLEdBQVcsS0FBSyxDQUFDO0FBQ3JCLFVBQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMseUJBQXlCO0FBT2xFLE1BQU0sT0FBTyxHQUFJLFNBQVEsaUNBQWlDO0lBSTlDLE9BQU8sQ0FBQyxDQUFjLEVBQUUsQ0FBYztRQUM5QyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQzs7QUFMZSxRQUFJLEdBQVcsS0FBSyxDQUFDO0FBQ3JCLFVBQU0sR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMseUJBQXlCO0FBT2xFLE1BQU0sT0FBTyxHQUFJLFNBQVEsaUNBQWlDO0lBSTlDLE9BQU8sQ0FBQyxDQUFjLEVBQUUsQ0FBYztRQUM5QyxPQUFPLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEIsQ0FBQzs7QUFMTSxRQUFJLEdBQVcsS0FBSyxDQUFDO0FBQ1osVUFBTSxHQUFHLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyx5QkFBeUI7QUFPbEUsTUFBTSxPQUFPLEdBQUksU0FBUSxpQ0FBaUM7SUFJOUMsT0FBTyxDQUFDLENBQWMsRUFBRSxDQUFjO1FBQzlDLE9BQU8sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQixDQUFDOztBQUxNLFFBQUksR0FBVyxLQUFLLENBQUM7QUFDWixVQUFNLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLHlCQUF5QjtBQU9sRSwwRUFBMEU7QUFDMUUsTUFBTSxPQUFPLFFBQVMsU0FBUSxpQ0FBaUM7SUFJbkQsT0FBTyxDQUFDLENBQVEsRUFBRSxDQUFRO1FBQ2xDLHdDQUF3QztRQUN4QyxPQUFPLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbkIsQ0FBQzs7QUFOTSxhQUFJLEdBQVcsTUFBTSxDQUFDO0FBQ2IsZUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQyx5QkFBeUIifQ==
|
|
@@ -6,7 +6,7 @@ import { ThreeOperandInstruction } from './instruction_impl.js';
|
|
|
6
6
|
declare abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
|
|
7
7
|
execute(context: AvmContext): Promise<void>;
|
|
8
8
|
protected abstract compute(a: IntegralValue, b: IntegralValue): IntegralValue;
|
|
9
|
-
protected checkTags(memory: TaggedMemoryInterface,
|
|
9
|
+
protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
|
|
10
10
|
}
|
|
11
11
|
export declare class And extends ThreeOperandBitwiseInstruction {
|
|
12
12
|
static readonly type: string;
|
|
@@ -27,13 +27,13 @@ export declare class Shl extends ThreeOperandBitwiseInstruction {
|
|
|
27
27
|
static readonly type: string;
|
|
28
28
|
static readonly opcode = Opcode.SHL_8;
|
|
29
29
|
protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
|
|
30
|
-
protected checkTags(memory: TaggedMemoryInterface,
|
|
30
|
+
protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
|
|
31
31
|
}
|
|
32
32
|
export declare class Shr extends ThreeOperandBitwiseInstruction {
|
|
33
33
|
static readonly type: string;
|
|
34
34
|
static readonly opcode = Opcode.SHR_8;
|
|
35
35
|
protected compute(a: IntegralValue, b: IntegralValue): IntegralValue;
|
|
36
|
-
protected checkTags(memory: TaggedMemoryInterface,
|
|
36
|
+
protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number): void;
|
|
37
37
|
}
|
|
38
38
|
export declare class Not extends Instruction {
|
|
39
39
|
private indirect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAW,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"bitwise.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/bitwise.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAgB,KAAK,qBAAqB,EAAW,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,+CAA+C,CAAC;AAEpF,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,uBAAe,8BAA+B,SAAQ,uBAAuB;IAC9D,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxD,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;IAC7E,SAAS,CAAC,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAIpF;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,EAAG,SAAQ,8BAA8B;IACpD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAQ;IACpC,MAAM,CAAC,QAAQ,CAAC,MAAM,eAAe;cAElB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;CAG9E;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;cAG1D,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F;AAED,qBAAa,GAAI,SAAQ,8BAA8B;IACrD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;cAEnB,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,aAAa;cAG1D,SAAS,CAAC,MAAM,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;CAI7F;AAED,qBAAa,GAAI,SAAQ,WAAW;IAOtB,OAAO,CAAC,QAAQ;IAAU,OAAO,CAAC,SAAS;IAAU,OAAO,CAAC,SAAS;IANlF,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAS;IACrC,MAAM,CAAC,QAAQ,CAAC,MAAM,gBAAgB;IAEtC,MAAM,CAAC,QAAQ,CAAC,WAAW,gBAAgF;IAC3G,MAAM,CAAC,QAAQ,CAAC,YAAY,gBAAkF;gBAE1F,QAAQ,EAAE,MAAM,EAAU,SAAS,EAAE,MAAM,EAAU,SAAS,EAAE,MAAM;IAI7E,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAgBzD"}
|
|
@@ -5,20 +5,22 @@ import { Instruction } from './instruction.js';
|
|
|
5
5
|
import { ThreeOperandInstruction } from './instruction_impl.js';
|
|
6
6
|
class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
|
|
7
7
|
async execute(context) {
|
|
8
|
-
const memoryOperations = { reads: 2, writes: 1, indirect: this.indirect };
|
|
9
8
|
const memory = context.machineState.memory.track(this.type);
|
|
10
|
-
context.machineState.consumeGas(this.gasCost(
|
|
11
|
-
const
|
|
12
|
-
|
|
9
|
+
context.machineState.consumeGas(this.gasCost());
|
|
10
|
+
const operands = [this.aOffset, this.bOffset, this.dstOffset];
|
|
11
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
12
|
+
const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
|
|
13
|
+
this.checkTags(memory, aOffset, bOffset);
|
|
13
14
|
const a = memory.getAs(aOffset);
|
|
14
15
|
const b = memory.getAs(bOffset);
|
|
15
16
|
const res = this.compute(a, b);
|
|
16
17
|
memory.set(dstOffset, res);
|
|
17
|
-
memory.assert(
|
|
18
|
+
memory.assert({ reads: 2, writes: 1, addressing });
|
|
18
19
|
context.machineState.incrementPc();
|
|
19
20
|
}
|
|
20
|
-
checkTags(memory,
|
|
21
|
-
memory.
|
|
21
|
+
checkTags(memory, aOffset, bOffset) {
|
|
22
|
+
TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
|
|
23
|
+
memory.checkTagsAreSame(aOffset, bOffset);
|
|
22
24
|
}
|
|
23
25
|
}
|
|
24
26
|
export class And extends ThreeOperandBitwiseInstruction {
|
|
@@ -46,8 +48,8 @@ export class Shl extends ThreeOperandBitwiseInstruction {
|
|
|
46
48
|
compute(a, b) {
|
|
47
49
|
return a.shl(b);
|
|
48
50
|
}
|
|
49
|
-
checkTags(memory,
|
|
50
|
-
memory.
|
|
51
|
+
checkTags(memory, aOffset, bOffset) {
|
|
52
|
+
TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
|
|
51
53
|
memory.checkTag(TypeTag.UINT8, bOffset);
|
|
52
54
|
}
|
|
53
55
|
}
|
|
@@ -57,8 +59,8 @@ export class Shr extends ThreeOperandBitwiseInstruction {
|
|
|
57
59
|
compute(a, b) {
|
|
58
60
|
return a.shr(b);
|
|
59
61
|
}
|
|
60
|
-
checkTags(memory,
|
|
61
|
-
memory.
|
|
62
|
+
checkTags(memory, aOffset, bOffset) {
|
|
63
|
+
TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
|
|
62
64
|
memory.checkTag(TypeTag.UINT8, bOffset);
|
|
63
65
|
}
|
|
64
66
|
}
|
|
@@ -72,15 +74,16 @@ export class Not extends Instruction {
|
|
|
72
74
|
this.dstOffset = dstOffset;
|
|
73
75
|
}
|
|
74
76
|
async execute(context) {
|
|
75
|
-
const memoryOperations = { reads: 1, writes: 1, indirect: this.indirect };
|
|
76
77
|
const memory = context.machineState.memory.track(this.type);
|
|
77
|
-
context.machineState.consumeGas(this.gasCost(
|
|
78
|
-
const
|
|
78
|
+
context.machineState.consumeGas(this.gasCost());
|
|
79
|
+
const operands = [this.srcOffset, this.dstOffset];
|
|
80
|
+
const addressing = Addressing.fromWire(this.indirect, operands.length);
|
|
81
|
+
const [srcOffset, dstOffset] = addressing.resolve(operands, memory);
|
|
79
82
|
TaggedMemory.checkIsIntegralTag(memory.getTag(srcOffset));
|
|
80
83
|
const value = memory.getAs(srcOffset);
|
|
81
84
|
const res = value.not();
|
|
82
85
|
memory.set(dstOffset, res);
|
|
83
|
-
memory.assert(
|
|
86
|
+
memory.assert({ reads: 1, writes: 1, addressing });
|
|
84
87
|
context.machineState.incrementPc();
|
|
85
88
|
}
|
|
86
89
|
}
|
|
@@ -88,4 +91,4 @@ Not.type = 'NOT';
|
|
|
88
91
|
Not.opcode = Opcode.NOT_8;
|
|
89
92
|
Not.wireFormat8 = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT8, OperandType.UINT8];
|
|
90
93
|
Not.wireFormat16 = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
|
|
91
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYml0d2lzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9hdm0vb3Bjb2Rlcy9iaXR3aXNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBc0IsWUFBWSxFQUE4QixPQUFPLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUMvRyxPQUFPLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxNQUFNLCtDQUErQyxDQUFDO0FBQ3BGLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUNsRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFDL0MsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFaEUsTUFBZSw4QkFBK0IsU0FBUSx1QkFBdUI7SUFDcEUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFtQjtRQUN0QyxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzVELE9BQU8sQ0FBQyxZQUFZLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsQ0FBQyxDQUFDO1FBRWhELE1BQU0sUUFBUSxHQUFHLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUM5RCxNQUFNLFVBQVUsR0FBRyxVQUFVLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3ZFLE1BQU0sQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLFNBQVMsQ0FBQyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLE9BQU8sRUFBRSxPQUFPLENB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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commitment.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/commitment.ts"],"names":[],"mappings":"AAEA,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,kBAAmB,SAAQ,WAAW;IAe/C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IAlBxB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAwB;IAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;IAG3D,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM;IAKnB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"commitment.d.ts","sourceRoot":"","sources":["../../../src/avm/opcodes/commitment.ts"],"names":[],"mappings":"AAEA,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,kBAAmB,SAAQ,WAAW;IAe/C,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,cAAc;IAlBxB,MAAM,CAAC,IAAI,EAAE,MAAM,CAAwB;IAC3C,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAA6B;IAG3D,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,WAAW,EAAE,CAOvC;gBAGQ,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,cAAc,EAAE,MAAM;IAKnB,OAAO,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;CAgCzD"}
|