@aztec/simulator 0.61.0 → 0.63.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/acvm.d.ts +2 -16
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/acvm.js +2 -70
- package/dest/acvm/oracle/oracle.d.ts +4 -3
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +11 -9
- package/dest/acvm/oracle/typed_oracle.d.ts +5 -4
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +9 -6
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +4 -3
- package/dest/avm/avm_machine_state.d.ts +27 -8
- package/dest/avm/avm_machine_state.d.ts.map +1 -1
- package/dest/avm/avm_machine_state.js +6 -10
- package/dest/avm/avm_memory_types.d.ts +8 -0
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +5 -1
- package/dest/avm/avm_simulator.d.ts +2 -19
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +12 -14
- package/dest/avm/avm_tree.d.ts +249 -0
- package/dest/avm/avm_tree.d.ts.map +1 -0
- package/dest/avm/avm_tree.js +637 -0
- package/dest/avm/errors.d.ts +4 -17
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +21 -50
- package/dest/avm/fixtures/index.d.ts +7 -2
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +12 -12
- package/dest/avm/index.d.ts +1 -0
- package/dest/avm/index.d.ts.map +1 -1
- package/dest/avm/index.js +2 -1
- package/dest/avm/journal/journal.d.ts +43 -24
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +172 -39
- package/dest/avm/journal/nullifiers.d.ts +5 -4
- package/dest/avm/journal/nullifiers.d.ts.map +1 -1
- package/dest/avm/journal/nullifiers.js +2 -3
- package/dest/avm/journal/public_storage.d.ts +6 -5
- package/dest/avm/journal/public_storage.d.ts.map +1 -1
- package/dest/avm/journal/public_storage.js +1 -1
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +4 -10
- package/dest/avm/opcodes/arithmetic.d.ts +4 -1
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +18 -4
- package/dest/avm/opcodes/bitwise.d.ts.map +1 -1
- package/dest/avm/opcodes/bitwise.js +1 -3
- package/dest/avm/opcodes/comparators.d.ts.map +1 -1
- package/dest/avm/opcodes/comparators.js +1 -2
- package/dest/avm/opcodes/contract.d.ts.map +1 -1
- package/dest/avm/opcodes/contract.js +2 -3
- package/dest/avm/opcodes/control_flow.d.ts +4 -0
- package/dest/avm/opcodes/control_flow.d.ts.map +1 -1
- package/dest/avm/opcodes/control_flow.js +26 -11
- package/dest/avm/opcodes/conversion.d.ts.map +1 -1
- package/dest/avm/opcodes/conversion.js +1 -2
- package/dest/avm/opcodes/ec_add.d.ts.map +1 -1
- package/dest/avm/opcodes/ec_add.js +5 -11
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +1 -2
- package/dest/avm/opcodes/external_calls.d.ts +4 -2
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +38 -22
- package/dest/avm/opcodes/hashing.d.ts.map +1 -1
- package/dest/avm/opcodes/hashing.js +1 -4
- package/dest/avm/opcodes/instruction.d.ts +4 -0
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +7 -1
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +1 -7
- package/dest/avm/opcodes/misc.js +3 -3
- package/dest/avm/opcodes/multi_scalar_mul.d.ts.map +1 -1
- package/dest/avm/opcodes/multi_scalar_mul.js +6 -5
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +2 -4
- package/dest/avm/serialization/bytecode_serialization.d.ts +1 -6
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +24 -20
- package/dest/avm/serialization/instruction_serialization.d.ts +2 -2
- package/dest/avm/serialization/instruction_serialization.js +2 -2
- package/dest/client/client_execution_context.d.ts +7 -10
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +19 -18
- package/dest/client/db_oracle.d.ts +22 -8
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +5 -4
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +3 -2
- package/dest/client/view_data_oracle.d.ts +6 -12
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +10 -12
- package/dest/common/errors.d.ts +15 -2
- package/dest/common/errors.d.ts.map +1 -1
- package/dest/common/errors.js +85 -4
- package/dest/mocks/fixtures.d.ts +9 -28
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +12 -57
- package/dest/public/dual_side_effect_trace.d.ts +34 -26
- package/dest/public/dual_side_effect_trace.d.ts.map +1 -1
- package/dest/public/dual_side_effect_trace.js +48 -36
- package/dest/public/enqueued_call_side_effect_trace.d.ts +96 -33
- package/dest/public/enqueued_call_side_effect_trace.d.ts.map +1 -1
- package/dest/public/enqueued_call_side_effect_trace.js +212 -138
- package/dest/public/execution.d.ts +50 -17
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -29
- package/dest/public/executor.d.ts +28 -11
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +33 -33
- package/dest/public/index.d.ts +4 -5
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +4 -5
- package/dest/public/public_db_sources.d.ts +1 -0
- package/dest/public/public_db_sources.d.ts.map +1 -1
- package/dest/public/public_db_sources.js +21 -19
- package/dest/public/public_processor.d.ts +7 -11
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +60 -42
- package/dest/public/public_processor_metrics.d.ts +3 -3
- package/dest/public/public_processor_metrics.d.ts.map +1 -1
- package/dest/public/public_processor_metrics.js +1 -1
- package/dest/public/public_tx_context.d.ts +130 -0
- package/dest/public/public_tx_context.d.ts.map +1 -0
- package/dest/public/public_tx_context.js +293 -0
- package/dest/public/public_tx_simulator.d.ts +36 -0
- package/dest/public/public_tx_simulator.d.ts.map +1 -0
- package/dest/public/public_tx_simulator.js +148 -0
- package/dest/public/side_effect_trace.d.ts +30 -15
- package/dest/public/side_effect_trace.d.ts.map +1 -1
- package/dest/public/side_effect_trace.js +70 -16
- package/dest/public/side_effect_trace_interface.d.ts +43 -12
- package/dest/public/side_effect_trace_interface.d.ts.map +1 -1
- package/dest/public/transitional_adapters.d.ts +9 -0
- package/dest/public/transitional_adapters.d.ts.map +1 -0
- package/dest/public/transitional_adapters.js +127 -0
- package/dest/public/utils.d.ts +5 -0
- package/dest/public/utils.d.ts.map +1 -0
- package/dest/public/utils.js +30 -0
- package/dest/test/utils.d.ts +2 -2
- package/dest/test/utils.d.ts.map +1 -1
- package/dest/test/utils.js +4 -4
- package/package.json +12 -9
- package/src/acvm/acvm.ts +3 -94
- package/src/acvm/oracle/oracle.ts +14 -12
- package/src/acvm/oracle/typed_oracle.ts +10 -6
- package/src/avm/avm_gas.ts +3 -2
- package/src/avm/avm_machine_state.ts +28 -12
- package/src/avm/avm_memory_types.ts +5 -0
- package/src/avm/avm_simulator.ts +13 -16
- package/src/avm/avm_tree.ts +785 -0
- package/src/avm/errors.ts +25 -48
- package/src/avm/fixtures/index.ts +16 -12
- package/src/avm/index.ts +1 -0
- package/src/avm/journal/journal.ts +291 -52
- package/src/avm/journal/nullifiers.ts +7 -7
- package/src/avm/journal/public_storage.ts +5 -5
- package/src/avm/opcodes/accrued_substate.ts +3 -9
- package/src/avm/opcodes/arithmetic.ts +26 -4
- package/src/avm/opcodes/bitwise.ts +0 -2
- package/src/avm/opcodes/comparators.ts +0 -1
- package/src/avm/opcodes/contract.ts +1 -2
- package/src/avm/opcodes/control_flow.ts +29 -10
- package/src/avm/opcodes/conversion.ts +0 -1
- package/src/avm/opcodes/ec_add.ts +6 -9
- package/src/avm/opcodes/environment_getters.ts +0 -1
- package/src/avm/opcodes/external_calls.ts +39 -21
- package/src/avm/opcodes/hashing.ts +0 -3
- package/src/avm/opcodes/instruction.ts +7 -0
- package/src/avm/opcodes/memory.ts +0 -6
- package/src/avm/opcodes/misc.ts +2 -2
- package/src/avm/opcodes/multi_scalar_mul.ts +5 -4
- package/src/avm/opcodes/storage.ts +1 -3
- package/src/avm/serialization/bytecode_serialization.ts +31 -22
- package/src/avm/serialization/instruction_serialization.ts +2 -2
- package/src/client/client_execution_context.ts +24 -21
- package/src/client/db_oracle.ts +31 -8
- package/src/client/private_execution.ts +5 -4
- package/src/client/unconstrained_execution.ts +2 -1
- package/src/client/view_data_oracle.ts +14 -13
- package/src/common/errors.ts +119 -3
- package/src/mocks/fixtures.ts +15 -106
- package/src/public/dual_side_effect_trace.ts +138 -50
- package/src/public/enqueued_call_side_effect_trace.ts +352 -212
- package/src/public/execution.ts +58 -42
- package/src/public/executor.ts +52 -67
- package/src/public/index.ts +7 -5
- package/src/public/public_db_sources.ts +22 -19
- package/src/public/public_processor.ts +111 -73
- package/src/public/public_processor_metrics.ts +3 -3
- package/src/public/public_tx_context.ts +411 -0
- package/src/public/public_tx_simulator.ts +232 -0
- package/src/public/side_effect_trace.ts +154 -28
- package/src/public/side_effect_trace_interface.ts +92 -14
- package/src/public/transitional_adapters.ts +347 -0
- package/src/public/utils.ts +32 -0
- package/src/test/utils.ts +9 -2
- package/dest/public/enqueued_call_simulator.d.ts +0 -43
- package/dest/public/enqueued_call_simulator.d.ts.map +0 -1
- package/dest/public/enqueued_call_simulator.js +0 -156
- package/dest/public/enqueued_calls_processor.d.ts +0 -43
- package/dest/public/enqueued_calls_processor.d.ts.map +0 -1
- package/dest/public/enqueued_calls_processor.js +0 -209
- package/dest/public/hints_builder.d.ts +0 -29
- package/dest/public/hints_builder.d.ts.map +0 -1
- package/dest/public/hints_builder.js +0 -75
- package/dest/public/public_kernel.d.ts +0 -30
- package/dest/public/public_kernel.d.ts.map +0 -1
- package/dest/public/public_kernel.js +0 -67
- package/dest/public/public_kernel_circuit_simulator.d.ts +0 -25
- package/dest/public/public_kernel_circuit_simulator.d.ts.map +0 -1
- package/dest/public/public_kernel_circuit_simulator.js +0 -2
- package/dest/public/public_kernel_tail_simulator.d.ts +0 -15
- package/dest/public/public_kernel_tail_simulator.d.ts.map +0 -1
- package/dest/public/public_kernel_tail_simulator.js +0 -39
- package/src/public/enqueued_call_simulator.ts +0 -360
- package/src/public/enqueued_calls_processor.ts +0 -372
- package/src/public/hints_builder.ts +0 -168
- package/src/public/public_kernel.ts +0 -100
- package/src/public/public_kernel_circuit_simulator.ts +0 -32
- package/src/public/public_kernel_tail_simulator.ts +0 -97
|
@@ -6,13 +6,15 @@ import { OutOfGasError } from './errors.js';
|
|
|
6
6
|
*/
|
|
7
7
|
export class AvmMachineState {
|
|
8
8
|
constructor(gasLeftOrL2GasLeft, daGasLeft) {
|
|
9
|
-
/** program counter */
|
|
9
|
+
/** program counter, byte based */
|
|
10
10
|
this.pc = 0;
|
|
11
|
+
/** program counter of the next instruction, byte based */
|
|
12
|
+
this.nextPc = 0;
|
|
11
13
|
/** return/revertdata of the last nested call. */
|
|
12
14
|
this.nestedReturndata = [];
|
|
13
15
|
/**
|
|
14
|
-
* On INTERNALCALL, internal call stack is pushed to with the current pc
|
|
15
|
-
* On INTERNALRETURN, value is popped from the internal call stack and assigned to the pc.
|
|
16
|
+
* On INTERNALCALL, internal call stack is pushed to with the current pc and the return pc.
|
|
17
|
+
* On INTERNALRETURN, value is popped from the internal call stack and assigned to the return pc.
|
|
16
18
|
*/
|
|
17
19
|
this.internalCallStack = [];
|
|
18
20
|
/** Memory accessible to user code */
|
|
@@ -65,12 +67,6 @@ export class AvmMachineState {
|
|
|
65
67
|
this[`${dimension}Left`] += gasRefund[dimension] ?? 0;
|
|
66
68
|
}
|
|
67
69
|
}
|
|
68
|
-
/**
|
|
69
|
-
* Most instructions just increment PC before they complete
|
|
70
|
-
*/
|
|
71
|
-
incrementPc() {
|
|
72
|
-
this.pc++;
|
|
73
|
-
}
|
|
74
70
|
/**
|
|
75
71
|
* Halt as successful
|
|
76
72
|
* Output data must NOT be modified once it is set
|
|
@@ -108,4 +104,4 @@ export class AvmMachineState {
|
|
|
108
104
|
this.halted = true;
|
|
109
105
|
}
|
|
110
106
|
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
107
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX21hY2hpbmVfc3RhdGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYXZtL2F2bV9tYWNoaW5lX3N0YXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxjQUFjLEVBQVksTUFBTSxjQUFjLENBQUM7QUFDeEQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ3JELE9BQU8sRUFBd0IsYUFBYSxFQUFFLE1BQU0sYUFBYSxDQUFDO0FBeUJsRTs7R0FFRztBQUNILE1BQU0sT0FBTyxlQUFlO0lBc0MxQixZQUFZLGtCQUFnQyxFQUFFLFNBQWtCO1FBbENoRSxrQ0FBa0M7UUFDM0IsT0FBRSxHQUFXLENBQUMsQ0FBQztRQUN0QiwwREFBMEQ7UUFDbkQsV0FBTSxHQUFXLENBQUMsQ0FBQztRQUMxQixpREFBaUQ7UUFDMUMscUJBQWdCLEdBQVMsRUFBRSxDQUFDO1FBUW5DOzs7V0FHRztRQUNJLHNCQUFpQixHQUFxQixFQUFFLENBQUM7UUFFaEQscUNBQXFDO1FBQ3JCLFdBQU0sR0FBaUIsSUFBSSxZQUFZLEVBQUUsQ0FBQztRQUUxRDs7O1dBR0c7UUFDSyxXQUFNLEdBQVksS0FBSyxDQUFDO1FBQ2hDLDJGQUEyRjtRQUNuRixhQUFRLEdBQVksS0FBSyxDQUFDO1FBQ2xDLHNEQUFzRDtRQUM5QyxXQUFNLEdBQVMsRUFBRSxDQUFDO1FBS3hCLElBQUksT0FBTyxrQkFBa0IsS0FBSyxRQUFRLEVBQUUsQ0FBQztZQUMzQyxDQUFDLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxrQkFBa0IsQ0FBQyxDQUFDO1FBQzFFLENBQUM7YUFBTSxDQUFDO1lBQ04sSUFBSSxDQUFDLFNBQVMsR0FBRyxrQkFBbUIsQ0FBQztZQUNyQyxJQUFJLENBQUMsU0FBUyxHQUFHLFNBQVUsQ0FBQztRQUM5QixDQUFDO0lBQ0gsQ0FB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
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
3
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
5
|
import { type DebugLogger } from '@aztec/foundation/log';
|
|
5
6
|
import { type FunctionsOf } from '@aztec/foundation/types';
|
|
@@ -16,6 +17,7 @@ export declare abstract class MemoryValue {
|
|
|
16
17
|
abstract toBigInt(): bigint;
|
|
17
18
|
abstract toBuffer(): Buffer;
|
|
18
19
|
toFr(): Fr;
|
|
20
|
+
toAztecAddress(): AztecAddress;
|
|
19
21
|
toNumber(): number;
|
|
20
22
|
toString(): string;
|
|
21
23
|
}
|
|
@@ -47,6 +49,7 @@ declare const Uint1_base: {
|
|
|
47
49
|
toBigInt(): bigint;
|
|
48
50
|
toBuffer(): Buffer;
|
|
49
51
|
toFr(): Fr;
|
|
52
|
+
toAztecAddress(): AztecAddress;
|
|
50
53
|
toNumber(): number;
|
|
51
54
|
toString(): string;
|
|
52
55
|
};
|
|
@@ -74,6 +77,7 @@ declare const Uint8_base: {
|
|
|
74
77
|
toBigInt(): bigint;
|
|
75
78
|
toBuffer(): Buffer;
|
|
76
79
|
toFr(): Fr;
|
|
80
|
+
toAztecAddress(): AztecAddress;
|
|
77
81
|
toNumber(): number;
|
|
78
82
|
toString(): string;
|
|
79
83
|
};
|
|
@@ -101,6 +105,7 @@ declare const Uint16_base: {
|
|
|
101
105
|
toBigInt(): bigint;
|
|
102
106
|
toBuffer(): Buffer;
|
|
103
107
|
toFr(): Fr;
|
|
108
|
+
toAztecAddress(): AztecAddress;
|
|
104
109
|
toNumber(): number;
|
|
105
110
|
toString(): string;
|
|
106
111
|
};
|
|
@@ -128,6 +133,7 @@ declare const Uint32_base: {
|
|
|
128
133
|
toBigInt(): bigint;
|
|
129
134
|
toBuffer(): Buffer;
|
|
130
135
|
toFr(): Fr;
|
|
136
|
+
toAztecAddress(): AztecAddress;
|
|
131
137
|
toNumber(): number;
|
|
132
138
|
toString(): string;
|
|
133
139
|
};
|
|
@@ -155,6 +161,7 @@ declare const Uint64_base: {
|
|
|
155
161
|
toBigInt(): bigint;
|
|
156
162
|
toBuffer(): Buffer;
|
|
157
163
|
toFr(): Fr;
|
|
164
|
+
toAztecAddress(): AztecAddress;
|
|
158
165
|
toNumber(): number;
|
|
159
166
|
toString(): string;
|
|
160
167
|
};
|
|
@@ -182,6 +189,7 @@ declare const Uint128_base: {
|
|
|
182
189
|
toBigInt(): bigint;
|
|
183
190
|
toBuffer(): Buffer;
|
|
184
191
|
toFr(): Fr;
|
|
192
|
+
toAztecAddress(): AztecAddress;
|
|
185
193
|
toNumber(): number;
|
|
186
194
|
toString(): string;
|
|
187
195
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"avm_memory_types.d.ts","sourceRoot":"","sources":["../../src/avm/avm_memory_types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MEM_TAG_FF, MEM_TAG_U1, MEM_TAG_U8, MEM_TAG_U16, MEM_TAG_U32, MEM_TAG_U64, MEM_TAG_U128, } from '@aztec/circuits.js';
|
|
2
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
2
3
|
import { toBufferBE } from '@aztec/foundation/bigint-buffer';
|
|
3
4
|
import { Fr } from '@aztec/foundation/fields';
|
|
4
5
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -11,6 +12,9 @@ export class MemoryValue {
|
|
|
11
12
|
toFr() {
|
|
12
13
|
return new Fr(this.toBigInt());
|
|
13
14
|
}
|
|
15
|
+
toAztecAddress() {
|
|
16
|
+
return new AztecAddress(this.toFr());
|
|
17
|
+
}
|
|
14
18
|
// To number. Throws if exceeds max safe int.
|
|
15
19
|
toNumber() {
|
|
16
20
|
return this.toFr().toNumber();
|
|
@@ -421,4 +425,4 @@ export class MeteredTaggedMemory {
|
|
|
421
425
|
this.wrapped.checkTagsRange(tag, startOffset, size);
|
|
422
426
|
}
|
|
423
427
|
}
|
|
424
|
-
//# 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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"}
|
|
428
|
+
//# 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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"}
|
|
@@ -2,23 +2,12 @@
|
|
|
2
2
|
/// <reference types="node" resolution-mode="require"/>
|
|
3
3
|
import type { AvmContext } from './avm_context.js';
|
|
4
4
|
import { AvmContractCallResult } from './avm_contract_call_result.js';
|
|
5
|
-
import { type Gas } from './avm_gas.js';
|
|
6
|
-
import type { Instruction } from './opcodes/index.js';
|
|
7
|
-
type OpcodeTally = {
|
|
8
|
-
count: number;
|
|
9
|
-
gas: Gas;
|
|
10
|
-
};
|
|
11
|
-
type PcTally = {
|
|
12
|
-
opcode: string;
|
|
13
|
-
count: number;
|
|
14
|
-
gas: Gas;
|
|
15
|
-
};
|
|
16
5
|
export declare class AvmSimulator {
|
|
17
6
|
private context;
|
|
18
7
|
private log;
|
|
19
8
|
private bytecode;
|
|
20
|
-
opcodeTallies
|
|
21
|
-
pcTallies
|
|
9
|
+
private opcodeTallies;
|
|
10
|
+
private pcTallies;
|
|
22
11
|
constructor(context: AvmContext);
|
|
23
12
|
/**
|
|
24
13
|
* Fetch the bytecode and execute it in the current context.
|
|
@@ -33,13 +22,7 @@ export declare class AvmSimulator {
|
|
|
33
22
|
* This method is useful for testing and debugging.
|
|
34
23
|
*/
|
|
35
24
|
executeBytecode(bytecode: Buffer): Promise<AvmContractCallResult>;
|
|
36
|
-
/**
|
|
37
|
-
* Executes the provided instructions in the current context.
|
|
38
|
-
* This method is useful for testing and debugging.
|
|
39
|
-
*/
|
|
40
|
-
executeInstructions(instructions: Instruction[]): Promise<AvmContractCallResult>;
|
|
41
25
|
private tallyInstruction;
|
|
42
26
|
private printOpcodeTallies;
|
|
43
27
|
}
|
|
44
|
-
export {};
|
|
45
28
|
//# sourceMappingURL=avm_simulator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../src/avm/avm_simulator.ts"],"names":[],"mappings":";;AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"avm_simulator.d.ts","sourceRoot":"","sources":["../../src/avm/avm_simulator.ts"],"names":[],"mappings":";;AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAsBtE,qBAAa,YAAY;IAMX,OAAO,CAAC,OAAO;IAL3B,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,QAAQ,CAAqB;IACrC,OAAO,CAAC,aAAa,CAAuC;IAC5D,OAAO,CAAC,SAAS,CAAmC;gBAEhC,OAAO,EAAE,UAAU;IAQvC;;OAEG;IACU,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAYtD;;OAEG;IACI,WAAW,IAAI,MAAM,GAAG,SAAS;IAIxC;;;OAGG;IACU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IA4E9E,OAAO,CAAC,gBAAgB;IAcxB,OAAO,CAAC,kBAAkB;CAoB3B"}
|
|
@@ -5,7 +5,7 @@ import { SideEffectLimitReachedError } from '../public/side_effect_errors.js';
|
|
|
5
5
|
import { AvmContractCallResult } from './avm_contract_call_result.js';
|
|
6
6
|
import { isAvmBytecode } from './bytecode_utils.js';
|
|
7
7
|
import { AvmExecutionError, InvalidProgramCounterError, NoBytecodeForContractError, revertReasonFromExceptionalHalt, revertReasonFromExplicitRevert, } from './errors.js';
|
|
8
|
-
import {
|
|
8
|
+
import { decodeInstructionFromBytecode } from './serialization/bytecode_serialization.js';
|
|
9
9
|
export class AvmSimulator {
|
|
10
10
|
constructor(context) {
|
|
11
11
|
this.context = context;
|
|
@@ -38,22 +38,15 @@ export class AvmSimulator {
|
|
|
38
38
|
*/
|
|
39
39
|
async executeBytecode(bytecode) {
|
|
40
40
|
assert(isAvmBytecode(bytecode), "AVM simulator can't execute non-AVM bytecode");
|
|
41
|
+
assert(bytecode.length > 0, "AVM simulator can't execute empty bytecode");
|
|
41
42
|
this.bytecode = bytecode;
|
|
42
|
-
return await this.executeInstructions(decodeFromBytecode(bytecode));
|
|
43
|
-
}
|
|
44
|
-
/**
|
|
45
|
-
* Executes the provided instructions in the current context.
|
|
46
|
-
* This method is useful for testing and debugging.
|
|
47
|
-
*/
|
|
48
|
-
async executeInstructions(instructions) {
|
|
49
|
-
assert(instructions.length > 0);
|
|
50
43
|
const { machineState } = this.context;
|
|
51
44
|
try {
|
|
52
45
|
// Execute instruction pointed to by the current program counter
|
|
53
46
|
// continuing until the machine state signifies a halt
|
|
54
47
|
let instrCounter = 0;
|
|
55
48
|
while (!machineState.getHalted()) {
|
|
56
|
-
const instruction =
|
|
49
|
+
const [instruction, bytesRead] = decodeInstructionFromBytecode(bytecode, machineState.pc);
|
|
57
50
|
assert(!!instruction, 'AVM attempted to execute non-existent instruction. This should never happen (invalid bytecode or AVM simulator bug)!');
|
|
58
51
|
const instrStartGas = machineState.gasLeft; // Save gas before executing instruction (for profiling)
|
|
59
52
|
const instrPc = machineState.pc; // Save PC before executing instruction (for profiling)
|
|
@@ -61,16 +54,21 @@ export class AvmSimulator {
|
|
|
61
54
|
// Execute the instruction.
|
|
62
55
|
// Normal returns and reverts will return normally here.
|
|
63
56
|
// "Exceptional halts" will throw.
|
|
57
|
+
machineState.nextPc = machineState.pc + bytesRead;
|
|
64
58
|
await instruction.execute(this.context);
|
|
59
|
+
if (!instruction.handlesPC()) {
|
|
60
|
+
// Increment PC if the instruction doesn't handle it itself
|
|
61
|
+
machineState.pc += bytesRead;
|
|
62
|
+
}
|
|
65
63
|
// gas used by this instruction - used for profiling/tallying
|
|
66
64
|
const gasUsed = {
|
|
67
65
|
l2Gas: instrStartGas.l2Gas - machineState.l2GasLeft,
|
|
68
66
|
daGas: instrStartGas.daGas - machineState.daGasLeft,
|
|
69
67
|
};
|
|
70
68
|
this.tallyInstruction(instrPc, instruction.constructor.name, gasUsed);
|
|
71
|
-
if (machineState.pc >=
|
|
69
|
+
if (machineState.pc >= bytecode.length) {
|
|
72
70
|
this.log.warn('Passed end of program');
|
|
73
|
-
throw new InvalidProgramCounterError(machineState.pc, /*max=*/
|
|
71
|
+
throw new InvalidProgramCounterError(machineState.pc, /*max=*/ bytecode.length);
|
|
74
72
|
}
|
|
75
73
|
}
|
|
76
74
|
const output = machineState.getOutput();
|
|
@@ -89,7 +87,7 @@ export class AvmSimulator {
|
|
|
89
87
|
throw err;
|
|
90
88
|
}
|
|
91
89
|
const revertReason = revertReasonFromExceptionalHalt(err, this.context);
|
|
92
|
-
// Note: "exceptional halts" cannot return data, hence []
|
|
90
|
+
// Note: "exceptional halts" cannot return data, hence [].
|
|
93
91
|
const results = new AvmContractCallResult(/*reverted=*/ true, /*output=*/ [], revertReason);
|
|
94
92
|
this.log.debug(`Context execution results: ${results.toString()}`);
|
|
95
93
|
this.printOpcodeTallies();
|
|
@@ -127,4 +125,4 @@ export class AvmSimulator {
|
|
|
127
125
|
}
|
|
128
126
|
}
|
|
129
127
|
}
|
|
130
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
128
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXZtX3NpbXVsYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdm0vYXZtX3NpbXVsYXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNsRSxPQUFPLEVBQW9CLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFNUUsT0FBTyxFQUFFLE1BQU0sSUFBSSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUM7QUFFMUMsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFFOUUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sK0JBQStCLENBQUM7QUFFdEUsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHFCQUFxQixDQUFDO0FBQ3BELE9BQU8sRUFDTCxpQkFBaUIsRUFDakIsMEJBQTBCLEVBQzFCLDBCQUEwQixFQUMxQiwrQkFBK0IsRUFDL0IsOEJBQThCLEdBQy9CLE1BQU0sYUFBYSxDQUFDO0FBQ3JCLE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLDJDQUEyQyxDQUFDO0FBWTFGLE1BQU0sT0FBTyxZQUFZO0lBTXZCLFlBQW9CLE9BQW1CO1FBQW5CLFlBQU8sR0FBUCxPQUFPLENBQVk7UUFIL0Isa0JBQWEsR0FBNkIsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNwRCxjQUFTLEdBQXlCLElBQUksR0FBRyxFQUFFLENBQUM7UUFHbEQsTUFBTSxDQUNKLE9BQU8sQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssSUFBSSw0QkFBNEIsRUFDbEUsNkJBQTZCLDRCQUE0QiwrQ0FBK0MsQ0FDekcsQ0FBQztRQUNGLElBQUksQ0FBQyxHQUFHLEdBQUcsaUJBQWlCLENBQUMsOEJBQThCLE9BQU8sQ0FBQyxXQUFXLENBQUMsZ0JBQWdCLENBQUMsUUFBUSxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ2pILENBQUM7SUFFRDs7T0FF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
|
|
@@ -0,0 +1,249 @@
|
|
|
1
|
+
import { type IndexedTreeId, MerkleTreeId, type MerkleTreeReadOperations } from '@aztec/circuit-types';
|
|
2
|
+
import { NullifierLeafPreimage, PublicDataTreeLeafPreimage } from '@aztec/circuits.js';
|
|
3
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
4
|
+
import { type IndexedTreeLeafPreimage, type TreeLeafPreimage } from '@aztec/foundation/trees';
|
|
5
|
+
/****************************************************/
|
|
6
|
+
/****** Structs Used by the AvmEphemeralForest ******/
|
|
7
|
+
/****************************************************/
|
|
8
|
+
/**
|
|
9
|
+
* The preimage and the leaf index of the Low Leaf (Low Nullifier or Low Public Data Leaf)
|
|
10
|
+
*/
|
|
11
|
+
type PreimageWitness<T extends IndexedTreeLeafPreimage> = {
|
|
12
|
+
preimage: T;
|
|
13
|
+
index: bigint;
|
|
14
|
+
update: boolean;
|
|
15
|
+
};
|
|
16
|
+
/**
|
|
17
|
+
* Contains the low sibling path and a boolean if the next index pointed to
|
|
18
|
+
* by the low leaf is an update or an insertion (i.e. exists or not).
|
|
19
|
+
*/
|
|
20
|
+
type LeafWitness<T extends IndexedTreeLeafPreimage> = PreimageWitness<T> & {
|
|
21
|
+
siblingPath: Fr[];
|
|
22
|
+
};
|
|
23
|
+
/**
|
|
24
|
+
* The result of an indexed insertion in an indexed merkle tree.
|
|
25
|
+
* This will be used to hint the circuit
|
|
26
|
+
*/
|
|
27
|
+
export type IndexedInsertionResult<T extends IndexedTreeLeafPreimage> = {
|
|
28
|
+
leafIndex: bigint;
|
|
29
|
+
insertionPath: Fr[];
|
|
30
|
+
newOrElementToUpdate: {
|
|
31
|
+
update: boolean;
|
|
32
|
+
element: T;
|
|
33
|
+
};
|
|
34
|
+
lowWitness: LeafWitness<T>;
|
|
35
|
+
};
|
|
36
|
+
/****************************************************/
|
|
37
|
+
/****** The AvmEphemeralForest Class ****************/
|
|
38
|
+
/****************************************************/
|
|
39
|
+
/**
|
|
40
|
+
* This provides a forkable abstraction over the EphemeralAvmTree class
|
|
41
|
+
* It contains the logic to look up into a read-only MerkleTreeDb to discover
|
|
42
|
+
* the sibling paths and low witnesses that weren't inserted as part of this tx
|
|
43
|
+
*/
|
|
44
|
+
export declare class AvmEphemeralForest {
|
|
45
|
+
treeDb: MerkleTreeReadOperations;
|
|
46
|
+
treeMap: Map<MerkleTreeId, EphemeralAvmTree>;
|
|
47
|
+
indexedTreeMin: Map<IndexedTreeId, [IndexedTreeLeafPreimage, bigint]>;
|
|
48
|
+
indexedUpdates: Map<IndexedTreeId, Map<bigint, IndexedTreeLeafPreimage>>;
|
|
49
|
+
constructor(treeDb: MerkleTreeReadOperations, treeMap: Map<MerkleTreeId, EphemeralAvmTree>, indexedTreeMin: Map<IndexedTreeId, [IndexedTreeLeafPreimage, bigint]>, indexedUpdates: Map<IndexedTreeId, Map<bigint, IndexedTreeLeafPreimage>>);
|
|
50
|
+
static create(treeDb: MerkleTreeReadOperations): Promise<AvmEphemeralForest>;
|
|
51
|
+
fork(): AvmEphemeralForest;
|
|
52
|
+
/**
|
|
53
|
+
* Gets sibling path for a leaf - if the sibling path is not found in the tree, it is fetched from the DB
|
|
54
|
+
* @param treeId - The tree to be queried for a sibling path.
|
|
55
|
+
* @param index - The index of the leaf for which a sibling path should be returned.
|
|
56
|
+
* @returns The sibling path of the leaf.
|
|
57
|
+
*/
|
|
58
|
+
getSiblingPath(treeId: MerkleTreeId, index: bigint): Promise<Fr[]>;
|
|
59
|
+
/**
|
|
60
|
+
* This does the work of appending the new leaf and updating the low witness
|
|
61
|
+
* @param treeId - The tree to be queried for a sibling path.
|
|
62
|
+
* @param lowWitnessIndex - The index of the low leaf in the tree.
|
|
63
|
+
* @param lowWitness - The preimage of the low leaf.
|
|
64
|
+
* @param newLeafPreimage - The preimage of the new leaf to be inserted.
|
|
65
|
+
* @returns The sibling path of the new leaf (i.e. the insertion path)
|
|
66
|
+
*/
|
|
67
|
+
appendIndexedTree<ID extends IndexedTreeId, T extends IndexedTreeLeafPreimage>(treeId: ID, lowLeafIndex: bigint, lowLeafPreimage: T, newLeafPreimage: T): Fr[];
|
|
68
|
+
/**
|
|
69
|
+
* This writes or updates a slot in the public data tree with a value
|
|
70
|
+
* @param slot - The slot to be written to.
|
|
71
|
+
* @param newValue - The value to be written or updated to
|
|
72
|
+
* @returns The insertion result which contains the insertion path, low leaf and the new leaf index
|
|
73
|
+
*/
|
|
74
|
+
writePublicStorage(slot: Fr, newValue: Fr): Promise<IndexedInsertionResult<PublicDataTreeLeafPreimage>>;
|
|
75
|
+
/**
|
|
76
|
+
* This is just a helper to compare the preimages and update the minimum public data leaf
|
|
77
|
+
* @param treeId - The tree to be queried for a sibling path.
|
|
78
|
+
* @param T - The type of the preimage (PublicData or Nullifier)
|
|
79
|
+
* @param preimages - The preimages to be compared
|
|
80
|
+
* @param indices - The indices of the preimages
|
|
81
|
+
*/
|
|
82
|
+
private _updateMinInfo;
|
|
83
|
+
/**
|
|
84
|
+
* This appends a nullifier to the nullifier tree, and throws if the nullifier already exists
|
|
85
|
+
* @param value - The nullifier to be appended
|
|
86
|
+
* @returns The insertion result which contains the insertion path, low leaf and the new leaf index
|
|
87
|
+
*/
|
|
88
|
+
appendNullifier(nullifier: Fr): Promise<IndexedInsertionResult<NullifierLeafPreimage>>;
|
|
89
|
+
/**
|
|
90
|
+
* This appends a note hash to the note hash tree
|
|
91
|
+
* @param value - The note hash to be appended
|
|
92
|
+
* @returns The insertion result which contains the insertion path
|
|
93
|
+
*/
|
|
94
|
+
appendNoteHash(noteHash: Fr): Fr[];
|
|
95
|
+
/**
|
|
96
|
+
* This is wrapper around treeId to get the correct minimum leaf preimage
|
|
97
|
+
*/
|
|
98
|
+
private getMinInfo;
|
|
99
|
+
/**
|
|
100
|
+
* This is wrapper around treeId to set the correct minimum leaf preimage
|
|
101
|
+
*/
|
|
102
|
+
private setMinInfo;
|
|
103
|
+
/**
|
|
104
|
+
* This is wrapper around treeId to set values in the indexedUpdates map
|
|
105
|
+
*/
|
|
106
|
+
private setIndexedUpdates;
|
|
107
|
+
/**
|
|
108
|
+
* This is wrapper around treeId to get values in the indexedUpdates map
|
|
109
|
+
*/
|
|
110
|
+
private getIndexedUpdates;
|
|
111
|
+
/**
|
|
112
|
+
* This is wrapper around treeId to check membership (i.e. has()) of index in the indexedUpdates map
|
|
113
|
+
*/
|
|
114
|
+
private hasLocalUpdates;
|
|
115
|
+
/**
|
|
116
|
+
* This gets the low leaf preimage and the index of the low leaf in the indexed tree given a value (slot or nullifier value)
|
|
117
|
+
* If the value is not found in the tree, it does an external lookup to the merkleDB
|
|
118
|
+
* @param treeId - The tree we are looking up in
|
|
119
|
+
* @param key - The key for which we are look up the low leaf for.
|
|
120
|
+
* @param T - The type of the preimage (PublicData or Nullifier)
|
|
121
|
+
* @returns The low leaf preimage and the index of the low leaf in the indexed tree
|
|
122
|
+
*/
|
|
123
|
+
getLeafOrLowLeafInfo<ID extends IndexedTreeId, T extends IndexedTreeLeafPreimage>(treeId: ID, key: Fr): Promise<PreimageWitness<T>>;
|
|
124
|
+
/**
|
|
125
|
+
* This hashes the preimage to a field element
|
|
126
|
+
*/
|
|
127
|
+
hashPreimage<T extends TreeLeafPreimage>(preimage: T): Fr;
|
|
128
|
+
}
|
|
129
|
+
/****************************************************/
|
|
130
|
+
/****** Some useful Structs and Enums **************/
|
|
131
|
+
/****************************************************/
|
|
132
|
+
declare enum TreeType {
|
|
133
|
+
LEAF = 0,
|
|
134
|
+
NODE = 1
|
|
135
|
+
}
|
|
136
|
+
type Leaf = {
|
|
137
|
+
tag: TreeType.LEAF;
|
|
138
|
+
value: Fr;
|
|
139
|
+
};
|
|
140
|
+
type Node = {
|
|
141
|
+
tag: TreeType.NODE;
|
|
142
|
+
leftTree: Tree;
|
|
143
|
+
rightTree: Tree;
|
|
144
|
+
};
|
|
145
|
+
type Tree = Leaf | Node;
|
|
146
|
+
/****************************************************/
|
|
147
|
+
/****** Some Helpful Constructors for Trees ********/
|
|
148
|
+
/****************************************************/
|
|
149
|
+
declare const Node: (left: Tree, right: Tree) => Node;
|
|
150
|
+
declare const Leaf: (value: Fr) => Leaf;
|
|
151
|
+
/****************************************************/
|
|
152
|
+
/****** The EphemeralAvmTree Class *****************/
|
|
153
|
+
/****************************************************/
|
|
154
|
+
/**
|
|
155
|
+
* This class contains a recursively defined tree that has leaves at different heights
|
|
156
|
+
* It is seeded by an existing merkle treeDb for which it derives a frontier
|
|
157
|
+
* It is intended to be a lightweight tree that contains only the necessary information to suppport appends or updates
|
|
158
|
+
*/
|
|
159
|
+
export declare class EphemeralAvmTree {
|
|
160
|
+
leafCount: bigint;
|
|
161
|
+
depth: number;
|
|
162
|
+
private tree;
|
|
163
|
+
private readonly zeroHashes;
|
|
164
|
+
frontier: Fr[];
|
|
165
|
+
private constructor();
|
|
166
|
+
static create(forkedLeafCount: bigint, depth: number, treeDb: MerkleTreeReadOperations, merkleId: MerkleTreeId): Promise<EphemeralAvmTree>;
|
|
167
|
+
/**
|
|
168
|
+
* This is a recursive function that inserts a leaf into the tree
|
|
169
|
+
* @param value - The value of the leaf to be inserted
|
|
170
|
+
*/
|
|
171
|
+
appendLeaf(value: Fr): void;
|
|
172
|
+
/**
|
|
173
|
+
* This is a recursive function that upserts a leaf into the tree at a index and depth
|
|
174
|
+
* @param value - The value of the leaf to be inserted
|
|
175
|
+
* @param index - The index of the leaf to be inserted
|
|
176
|
+
* @param depth - The depth of the leaf to be inserted (defaults to the bottom of the tree)
|
|
177
|
+
*/
|
|
178
|
+
updateLeaf(value: Fr, index: bigint, depth?: number): void;
|
|
179
|
+
/**
|
|
180
|
+
* Get the sibling path of a leaf in the tree
|
|
181
|
+
* @param index - The index of the leaf for which a sibling path should be returned.
|
|
182
|
+
* @returns The sibling path of the leaf, can fail if the path is not found
|
|
183
|
+
*/
|
|
184
|
+
getSiblingPath(index: bigint): Fr[] | undefined;
|
|
185
|
+
/**
|
|
186
|
+
* This upserts the nodes of the sibling path into the tree
|
|
187
|
+
* @param index - The index of the leaf that the sibling path is derived from
|
|
188
|
+
* @param siblingPath - The sibling path of the index
|
|
189
|
+
*/
|
|
190
|
+
insertSiblingPath(index: bigint, siblingPath: Fr[]): void;
|
|
191
|
+
/**
|
|
192
|
+
* This is a helper function that computes the index of the frontier nodes at each depth
|
|
193
|
+
* @param leafCount - The number of leaves in the tree
|
|
194
|
+
* @returns An array of frontier indices at each depth, sorted from leaf to root
|
|
195
|
+
*/
|
|
196
|
+
static computeFrontierLeafIndices(leafCount: number): number[];
|
|
197
|
+
/**
|
|
198
|
+
* This derives the frontier and inserts them into the tree
|
|
199
|
+
* @param treeDb - The treeDb to be queried for sibling paths
|
|
200
|
+
* @param merkleId - The treeId of the tree to be queried for sibling paths
|
|
201
|
+
*/
|
|
202
|
+
initializeFrontier(treeDb: MerkleTreeReadOperations, merkleId: MerkleTreeId): Promise<void>;
|
|
203
|
+
/**
|
|
204
|
+
* Computes the root of the tree
|
|
205
|
+
*/
|
|
206
|
+
getRoot(): Fr;
|
|
207
|
+
/**
|
|
208
|
+
* Recursively hashes the subtree
|
|
209
|
+
* @param tree - The tree to be hashed
|
|
210
|
+
* @param depth - The depth of the tree
|
|
211
|
+
*/
|
|
212
|
+
hashTree(tree: Tree, depth: number): Fr;
|
|
213
|
+
/**
|
|
214
|
+
* Extracts the subtree from a given index and depth
|
|
215
|
+
* @param index - The index of the node to be extracted
|
|
216
|
+
* @param depth - The depth of the node to be extracted
|
|
217
|
+
* @returns The subtree rooted at the index and depth
|
|
218
|
+
*/
|
|
219
|
+
getNode(index: bigint, depth: number): Tree | undefined;
|
|
220
|
+
/**
|
|
221
|
+
* This is the recursive helper for getNode
|
|
222
|
+
*/
|
|
223
|
+
private _getNode;
|
|
224
|
+
/** Our tree traversal uses an array of 1s and 0s to represent the path to a leaf and expects them to be in LE order
|
|
225
|
+
* This helps with deriving it given an index and (optionally a depth)
|
|
226
|
+
* @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
|
|
227
|
+
* @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
|
|
228
|
+
* @returns The path to the leaf in LE order
|
|
229
|
+
*/
|
|
230
|
+
private _derivePathLE;
|
|
231
|
+
/** Sometimes we want it in BE order, to make truncating easier
|
|
232
|
+
* @param index - The index to derive a path to within the tree, does not have to terminate at a leaf
|
|
233
|
+
* @param depth - The depth to traverse, if not provided it will traverse to the bottom of the tree
|
|
234
|
+
* @returns The path to the leaf in LE order
|
|
235
|
+
*/
|
|
236
|
+
private _derivePathBE;
|
|
237
|
+
/**
|
|
238
|
+
* This is a recursive function that upserts a leaf into the tree given a path
|
|
239
|
+
* @param value - The value of the leaf to be upserted
|
|
240
|
+
* @param insertPath - The path to the leaf, this should be ordered from leaf to root (i.e. LE encoded)
|
|
241
|
+
* @param depth - The depth of the tree
|
|
242
|
+
* @param tree - The current tree
|
|
243
|
+
* @param appendMode - If true we append the relevant zeroHashes to the tree as we traverse
|
|
244
|
+
*/
|
|
245
|
+
private _insertLeaf;
|
|
246
|
+
private _getSiblingPath;
|
|
247
|
+
}
|
|
248
|
+
export {};
|
|
249
|
+
//# sourceMappingURL=avm_tree.d.ts.map
|