@aztec/simulator 0.41.0 → 0.42.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 -2
- package/dest/acvm/acvm.d.ts.map +1 -1
- package/dest/acvm/acvm.js +3 -3
- package/dest/acvm/oracle/oracle.d.ts +6 -4
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +20 -11
- package/dest/acvm/oracle/typed_oracle.d.ts +5 -3
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +10 -4
- package/dest/acvm/serialize.js +2 -2
- package/dest/avm/avm_gas.d.ts +1 -5
- package/dest/avm/avm_gas.d.ts.map +1 -1
- package/dest/avm/avm_gas.js +67 -73
- package/dest/avm/avm_simulator.d.ts +5 -0
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +8 -1
- package/dest/avm/fixtures/index.d.ts +3 -0
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +13 -1
- package/dest/avm/index.d.ts +2 -0
- package/dest/avm/index.d.ts.map +1 -0
- package/dest/avm/index.js +2 -0
- package/dest/avm/journal/host_storage.d.ts +1 -1
- package/dest/avm/journal/host_storage.d.ts.map +1 -1
- package/dest/avm/journal/journal.d.ts +2 -0
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +6 -2
- package/dest/avm/journal/trace.d.ts +2 -0
- package/dest/avm/journal/trace.d.ts.map +1 -1
- package/dest/avm/journal/trace.js +7 -1
- package/dest/avm/journal/trace_types.d.ts +1 -0
- package/dest/avm/journal/trace_types.d.ts.map +1 -1
- package/dest/avm/journal/trace_types.js +1 -1
- package/dest/avm/opcodes/arithmetic.d.ts +1 -7
- package/dest/avm/opcodes/arithmetic.d.ts.map +1 -1
- package/dest/avm/opcodes/arithmetic.js +1 -12
- package/dest/avm/opcodes/conversion.js +2 -2
- package/dest/avm/opcodes/external_calls.d.ts.map +1 -1
- package/dest/avm/opcodes/external_calls.js +4 -3
- package/dest/avm/opcodes/instruction.d.ts +1 -1
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +6 -4
- package/dest/avm/opcodes/memory.d.ts +0 -4
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +1 -7
- package/dest/avm/opcodes/storage.d.ts +0 -5
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +1 -7
- package/dest/avm/serialization/bytecode_serialization.js +2 -2
- package/dest/client/client_execution_context.d.ts +11 -19
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +26 -43
- package/dest/client/db_oracle.d.ts +7 -1
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/execution_note_cache.d.ts +0 -17
- package/dest/client/execution_note_cache.d.ts.map +1 -1
- package/dest/client/execution_note_cache.js +1 -24
- package/dest/client/execution_result.d.ts +8 -4
- package/dest/client/execution_result.d.ts.map +1 -1
- package/dest/client/execution_result.js +16 -6
- package/dest/client/private_execution.d.ts +2 -3
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +20 -9
- package/dest/client/simulator.d.ts +0 -16
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +8 -25
- package/dest/client/unconstrained_execution.d.ts +2 -3
- package/dest/client/unconstrained_execution.d.ts.map +1 -1
- package/dest/client/unconstrained_execution.js +5 -7
- package/dest/client/view_data_oracle.d.ts +2 -0
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +7 -1
- package/dest/index.d.ts +3 -1
- package/dest/index.d.ts.map +1 -1
- package/dest/index.js +4 -2
- package/dest/mocks/fixtures.d.ts +14 -10
- package/dest/mocks/fixtures.d.ts.map +1 -1
- package/dest/mocks/fixtures.js +22 -16
- package/dest/{simulator → providers}/acvm_native.d.ts.map +1 -1
- package/dest/{simulator → providers}/acvm_native.js +13 -14
- package/dest/providers/acvm_wasm.d.ts.map +1 -0
- package/dest/providers/acvm_wasm.js +15 -0
- package/dest/providers/index.d.ts.map +1 -0
- package/dest/{simulator → providers}/index.js +1 -1
- package/dest/{simulator → providers}/simulation_provider.d.ts.map +1 -1
- package/dest/{simulator → providers}/simulation_provider.js +1 -1
- package/dest/public/abstract_phase_manager.d.ts +43 -42
- package/dest/public/abstract_phase_manager.d.ts.map +1 -1
- package/dest/public/abstract_phase_manager.js +77 -106
- package/dest/public/app_logic_phase_manager.d.ts +6 -7
- package/dest/public/app_logic_phase_manager.d.ts.map +1 -1
- package/dest/public/app_logic_phase_manager.js +14 -14
- package/dest/public/{db.d.ts → db_interfaces.d.ts} +3 -3
- package/dest/public/db_interfaces.d.ts.map +1 -0
- package/dest/public/db_interfaces.js +2 -0
- package/dest/public/execution.d.ts +16 -9
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +1 -1
- package/dest/public/executor.d.ts +3 -30
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +32 -282
- package/dest/public/fee_payment.d.ts +11 -0
- package/dest/public/fee_payment.d.ts.map +1 -0
- package/dest/public/fee_payment.js +24 -0
- package/dest/public/hints_builder.d.ts +1 -0
- package/dest/public/hints_builder.d.ts.map +1 -1
- package/dest/public/hints_builder.js +6 -2
- package/dest/public/index.d.ts +4 -2
- package/dest/public/index.d.ts.map +1 -1
- package/dest/public/index.js +5 -3
- package/dest/public/phase_manager_factory.d.ts +1 -1
- package/dest/public/phase_manager_factory.d.ts.map +1 -1
- package/dest/public/{public_executor.d.ts → public_db_sources.d.ts} +3 -2
- package/dest/public/public_db_sources.d.ts.map +1 -0
- package/dest/public/public_db_sources.js +198 -0
- package/dest/public/public_kernel.js +14 -14
- package/dest/public/public_processor.d.ts +6 -4
- package/dest/public/public_processor.d.ts.map +1 -1
- package/dest/public/public_processor.js +46 -27
- package/dest/public/setup_phase_manager.d.ts +6 -8
- package/dest/public/setup_phase_manager.d.ts.map +1 -1
- package/dest/public/setup_phase_manager.js +11 -20
- package/dest/public/tail_phase_manager.d.ts +4 -10
- package/dest/public/tail_phase_manager.d.ts.map +1 -1
- package/dest/public/tail_phase_manager.js +15 -35
- package/dest/public/teardown_phase_manager.d.ts +6 -8
- package/dest/public/teardown_phase_manager.d.ts.map +1 -1
- package/dest/public/teardown_phase_manager.js +15 -21
- package/dest/public/transitional_adaptors.d.ts +1 -1
- package/dest/public/transitional_adaptors.d.ts.map +1 -1
- package/dest/public/transitional_adaptors.js +8 -6
- package/dest/public/utils.d.ts +2 -2
- package/dest/public/utils.d.ts.map +1 -1
- package/dest/public/utils.js +21 -14
- package/package.json +12 -9
- package/src/acvm/acvm.ts +0 -3
- package/src/acvm/oracle/oracle.ts +36 -13
- package/src/acvm/oracle/typed_oracle.ts +12 -3
- package/src/acvm/serialize.ts +1 -1
- package/src/avm/avm_gas.ts +66 -73
- package/src/avm/avm_simulator.ts +9 -0
- package/src/avm/fixtures/index.ts +20 -0
- package/src/avm/index.ts +1 -0
- package/src/avm/journal/host_storage.ts +1 -1
- package/src/avm/journal/journal.ts +6 -1
- package/src/avm/journal/trace.ts +12 -0
- package/src/avm/journal/trace_types.ts +1 -0
- package/src/avm/opcodes/arithmetic.ts +1 -14
- package/src/avm/opcodes/conversion.ts +1 -1
- package/src/avm/opcodes/external_calls.ts +3 -1
- package/src/avm/opcodes/instruction.ts +5 -3
- package/src/avm/opcodes/memory.ts +1 -8
- package/src/avm/opcodes/storage.ts +1 -8
- package/src/avm/serialization/bytecode_serialization.ts +1 -1
- package/src/client/client_execution_context.ts +33 -45
- package/src/client/db_oracle.ts +8 -1
- package/src/client/execution_note_cache.ts +0 -28
- package/src/client/execution_result.ts +21 -7
- package/src/client/private_execution.ts +36 -21
- package/src/client/simulator.ts +7 -27
- package/src/client/unconstrained_execution.ts +9 -12
- package/src/client/view_data_oracle.ts +8 -0
- package/src/index.ts +3 -1
- package/src/mocks/fixtures.ts +30 -32
- package/src/{simulator → providers}/acvm_native.ts +21 -19
- package/src/{simulator → providers}/acvm_wasm.ts +2 -16
- package/src/public/abstract_phase_manager.ts +138 -205
- package/src/public/app_logic_phase_manager.ts +23 -39
- package/src/public/{db.ts → db_interfaces.ts} +2 -2
- package/src/public/execution.ts +15 -8
- package/src/public/executor.ts +51 -398
- package/src/public/fee_payment.ts +26 -0
- package/src/public/hints_builder.ts +6 -0
- package/src/public/index.ts +4 -2
- package/src/public/phase_manager_factory.ts +1 -1
- package/src/public/{public_executor.ts → public_db_sources.ts} +3 -2
- package/src/public/public_kernel.ts +24 -24
- package/src/public/public_processor.ts +77 -33
- package/src/public/setup_phase_manager.ts +20 -45
- package/src/public/tail_phase_manager.ts +17 -65
- package/src/public/teardown_phase_manager.ts +22 -41
- package/src/public/transitional_adaptors.ts +7 -11
- package/src/public/utils.ts +20 -14
- package/dest/public/db.d.ts.map +0 -1
- package/dest/public/db.js +0 -2
- package/dest/public/public_execution_context.d.ts +0 -121
- package/dest/public/public_execution_context.d.ts.map +0 -1
- package/dest/public/public_execution_context.js +0 -214
- package/dest/public/public_executor.d.ts.map +0 -1
- package/dest/public/public_executor.js +0 -197
- package/dest/public/state_actions.d.ts +0 -39
- package/dest/public/state_actions.d.ts.map +0 -1
- package/dest/public/state_actions.js +0 -80
- package/dest/simulator/acvm_wasm.d.ts.map +0 -1
- package/dest/simulator/acvm_wasm.js +0 -22
- package/dest/simulator/index.d.ts.map +0 -1
- package/src/public/public_execution_context.ts +0 -289
- package/src/public/state_actions.ts +0 -102
- /package/dest/{simulator → providers}/acvm_native.d.ts +0 -0
- /package/dest/{simulator → providers}/acvm_wasm.d.ts +0 -0
- /package/dest/{simulator → providers}/index.d.ts +0 -0
- /package/dest/{simulator → providers}/simulation_provider.d.ts +0 -0
- /package/src/{simulator → providers}/index.ts +0 -0
- /package/src/{simulator → providers}/simulation_provider.ts +0 -0
|
@@ -21,9 +21,9 @@ export interface PublicStateDB {
|
|
|
21
21
|
* @param contract - Owner of the storage.
|
|
22
22
|
* @param slot - Slot to read in the contract storage.
|
|
23
23
|
* @param newValue - The new value to store.
|
|
24
|
-
* @returns
|
|
24
|
+
* @returns The slot of the written leaf in the public data tree.
|
|
25
25
|
*/
|
|
26
|
-
storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<
|
|
26
|
+
storageWrite(contract: AztecAddress, slot: Fr, newValue: Fr): Promise<bigint>;
|
|
27
27
|
/**
|
|
28
28
|
* Mark the uncommitted changes in this TX as a checkpoint.
|
|
29
29
|
*/
|
|
@@ -95,4 +95,4 @@ export interface CommitmentsDB {
|
|
|
95
95
|
*/
|
|
96
96
|
getNullifierMembershipWitnessAtLatestBlock(nullifier: Fr): Promise<NullifierMembershipWitness | undefined>;
|
|
97
97
|
}
|
|
98
|
-
//# sourceMappingURL=
|
|
98
|
+
//# sourceMappingURL=db_interfaces.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db_interfaces.d.ts","sourceRoot":"","sources":["../../src/public/db_interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,KAAK,gBAAgB,EAAE,KAAK,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,KAAK,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE1E,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;IAE3D;;;;;;OAMG;IACH,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAE9E;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;OAEG;IACH,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtC;;;OAGG;IACH,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAExB;;OAEG;IACH,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,WAAW,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE5F;;;;OAIG;IACH,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,2BAA2B,GAAG,SAAS,CAAC,CAAC;CAC9F;AAED,6GAA6G;AAC7G,MAAM,WAAW,aAAa;IAC5B;;;;;;;OAOG;IACH,0BAA0B,CACxB,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,uBAAuB,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;IAErE;;;OAGG;IACH,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,EAAE,GAAG,SAAS,CAAC,CAAC;IAE/D;;;;OAIG;IACH,kBAAkB,CAAC,UAAU,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAEhE;;;;OAIG;IACH,iBAAiB,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAE9D;;;;OAIG;IACH,0CAA0C,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAAC;CAC5G"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
+
/// <reference types="node" resolution-mode="require"/>
|
|
1
2
|
import { type SimulationError, type UnencryptedFunctionL2Logs } from '@aztec/circuit-types';
|
|
2
|
-
import { type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, type L2ToL1Message, type LogHash, type NoteHash, type Nullifier, type PublicCallRequest, PublicDataRead, PublicDataUpdateRequest, type ReadRequest } from '@aztec/circuits.js';
|
|
3
|
+
import { type AvmExecutionHints, type ContractStorageRead, type ContractStorageUpdateRequest, type Fr, type L2ToL1Message, type LogHash, type NoteHash, type Nullifier, type PublicCallRequest, PublicDataRead, PublicDataUpdateRequest, type ReadRequest } from '@aztec/circuits.js';
|
|
3
4
|
import { type Gas } from '../avm/avm_gas.js';
|
|
4
5
|
/**
|
|
5
6
|
* The public function execution result.
|
|
@@ -19,10 +20,14 @@ export interface PublicExecutionResult {
|
|
|
19
20
|
endSideEffectCounter: Fr;
|
|
20
21
|
/** The new nullifiers to be inserted into the nullifier tree. */
|
|
21
22
|
newNullifiers: Nullifier[];
|
|
23
|
+
/** The note hash read requests emitted in this call. */
|
|
24
|
+
noteHashReadRequests: ReadRequest[];
|
|
22
25
|
/** The nullifier read requests emitted in this call. */
|
|
23
26
|
nullifierReadRequests: ReadRequest[];
|
|
24
27
|
/** The nullifier non existent read requests emitted in this call. */
|
|
25
28
|
nullifierNonExistentReadRequests: ReadRequest[];
|
|
29
|
+
/** L1 to L2 message read requests emitted in this call. */
|
|
30
|
+
l1ToL2MsgReadRequests: ReadRequest[];
|
|
26
31
|
/** The contract storage reads performed by the function. */
|
|
27
32
|
contractStorageReads: ContractStorageRead[];
|
|
28
33
|
/** The contract storage update requests performed by the function. */
|
|
@@ -44,25 +49,27 @@ export interface PublicExecutionResult {
|
|
|
44
49
|
* Useful for maintaining correct ordering in ts.
|
|
45
50
|
*/
|
|
46
51
|
allUnencryptedLogs: UnencryptedFunctionL2Logs;
|
|
47
|
-
/**
|
|
48
|
-
* Whether the execution reverted.
|
|
49
|
-
*/
|
|
52
|
+
/** Whether the execution reverted. */
|
|
50
53
|
reverted: boolean;
|
|
51
|
-
/**
|
|
52
|
-
|
|
53
|
-
*/
|
|
54
|
-
revertReason: SimulationError | undefined;
|
|
54
|
+
/** The revert reason if the execution reverted. */
|
|
55
|
+
revertReason?: SimulationError;
|
|
55
56
|
/** How much gas was available for this public execution. */
|
|
56
57
|
startGasLeft: Gas;
|
|
57
58
|
/** How much gas was left after this public execution. */
|
|
58
59
|
endGasLeft: Gas;
|
|
59
60
|
/** Transaction fee set for this tx. */
|
|
60
61
|
transactionFee: Fr;
|
|
62
|
+
/** Bytecode used for this execution. */
|
|
63
|
+
bytecode?: Buffer;
|
|
64
|
+
/** Calldata used for this execution. */
|
|
65
|
+
calldata: Fr[];
|
|
66
|
+
/** Hints for proving AVM execution. */
|
|
67
|
+
avmHints: AvmExecutionHints;
|
|
61
68
|
}
|
|
62
69
|
/**
|
|
63
70
|
* The execution of a public function.
|
|
64
71
|
*/
|
|
65
|
-
export type PublicExecution = Pick<PublicCallRequest, 'contractAddress' | '
|
|
72
|
+
export type PublicExecution = Pick<PublicCallRequest, 'contractAddress' | 'functionSelector' | 'callContext' | 'args'>;
|
|
66
73
|
/**
|
|
67
74
|
* Returns if the input is a public execution result and not just a public execution.
|
|
68
75
|
* @param input - Public execution or public execution result.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,cAAc,EACd,uBAAuB,EACvB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,SAAS,EAAE,eAAe,CAAC;IAC3B,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,oEAAoE;IACpE,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,iEAAiE;IACjE,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACzB;;;OAGG;IACH,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;;OAGG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAC9C
|
|
1
|
+
{"version":3,"file":"execution.d.ts","sourceRoot":"","sources":["../../src/public/execution.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC5F,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,4BAA4B,EACjC,KAAK,EAAE,EACP,KAAK,aAAa,EAClB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,cAAc,EACd,uBAAuB,EACvB,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gDAAgD;IAChD,SAAS,EAAE,eAAe,CAAC;IAC3B,yCAAyC;IACzC,YAAY,EAAE,EAAE,EAAE,CAAC;IACnB,oEAAoE;IACpE,aAAa,EAAE,QAAQ,EAAE,CAAC;IAC1B,wDAAwD;IACxD,iBAAiB,EAAE,aAAa,EAAE,CAAC;IACnC,iEAAiE;IACjE,sBAAsB,EAAE,EAAE,CAAC;IAC3B,iEAAiE;IACjE,oBAAoB,EAAE,EAAE,CAAC;IACzB,iEAAiE;IACjE,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,wDAAwD;IACxD,oBAAoB,EAAE,WAAW,EAAE,CAAC;IACpC,wDAAwD;IACxD,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,qEAAqE;IACrE,gCAAgC,EAAE,WAAW,EAAE,CAAC;IAChD,2DAA2D;IAC3D,qBAAqB,EAAE,WAAW,EAAE,CAAC;IACrC,4DAA4D;IAC5D,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IAC5C,sEAAsE;IACtE,6BAA6B,EAAE,4BAA4B,EAAE,CAAC;IAC9D,mCAAmC;IACnC,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACzB;;;OAGG;IACH,qBAAqB,EAAE,OAAO,EAAE,CAAC;IACjC;;;OAGG;IACH,eAAe,EAAE,yBAAyB,CAAC;IAC3C;;;OAGG;IACH,kBAAkB,EAAE,yBAAyB,CAAC;IAC9C,sCAAsC;IACtC,QAAQ,EAAE,OAAO,CAAC;IAClB,mDAAmD;IACnD,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,4DAA4D;IAC5D,YAAY,EAAE,GAAG,CAAC;IAClB,yDAAyD;IACzD,UAAU,EAAE,GAAG,CAAC;IAChB,uCAAuC;IACvC,cAAc,EAAE,EAAE,CAAC;IACnB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,QAAQ,EAAE,EAAE,EAAE,CAAC;IACf,uCAAuC;IACvC,QAAQ,EAAE,iBAAiB,CAAC;CAC7B;AAED;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,kBAAkB,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;AAEvH;;;;GAIG;AACH,wBAAgB,uBAAuB,CACrC,KAAK,EAAE,eAAe,GAAG,qBAAqB,GAC7C,KAAK,IAAI,qBAAqB,CAEhC;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,qBAAqB,GAAG,cAAc,EAAE,CAU1F;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,qBAAqB,GAAG,uBAAuB,EAAE,CAU5G;AAgCD;;;GAGG;AAEH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,QAAQ,EAAE,EACzB,aAAa,EAAE,SAAS,EAAE,EAC1B,6BAA6B,EAAE,4BAA4B,EAAE,EAC7D,iBAAiB,EAAE,aAAa,EAAE,EAClC,eAAe,EAAE,yBAAyB,QAW3C"}
|
package/dest/public/execution.js
CHANGED
|
@@ -69,4 +69,4 @@ export function checkValidStaticCall(newNoteHashes, newNullifiers, contractStora
|
|
|
69
69
|
throw new Error('Static call cannot update the state, emit L2->L1 messages or generate logs');
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
72
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3B1YmxpYy9leGVjdXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQVVMLGNBQWMsRUFDZCx1QkFBdUIsR0FFeEIsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsNkJBQTZCLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQTBFcEc7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSx1QkFBdUIsQ0FDckMsS0FBOEM7SUFFOUMsT0FBTyxXQUFXLElBQUksS0FBSyxJQUFJLEtBQUssQ0FBQyxTQUFTLEtBQUssU0FBUyxDQUFDO0FBQy9ELENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUFpQztJQUN0RSxpSEFBaUg7SUFDakgsTUFBTSx1QkFBdUIsR0FBRyxVQUFVLENBQUMsb0JBQW9CLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQ3pFLG1DQUFtQyxDQUFDLElBQUksQ0FBQyxDQUMxQyxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLHVCQUF1QjtRQUMxQixHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUN0RixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwrQkFBK0IsQ0FBQyxVQUFpQztJQUMvRSxpSEFBaUg7SUFDakgsTUFBTSxnQ0FBZ0MsR0FBRyxVQUFVLENBQUMsNkJBQTZCLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQzdGLHFEQUFxRCxDQUFDLE1BQU0sQ0FBQyxDQUM5RCxDQUFDO0lBQ0YsTUFBTSxRQUFRLEdBQUc7UUFDZixHQUFHLGdDQUFnQztRQUNuQyxHQUFHLENBQUMsR0FBRyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsQ0FBQztLQUMvRixDQUFDO0lBQ0YsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGlCQUFrQixHQUFHLENBQUMsQ0FBQyxpQkFBa0IsQ0FBQyxDQUFDO0FBQzlFLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMsbUNBQW1DLENBQUMsSUFBeUI7SUFDcEUsT0FBTyxJQUFJLGNBQWMsQ0FDdkIsNkJBQTZCLENBQUMsSUFBSSxDQUFDLGVBQWdCLEVBQUUsSUFBSSxDQUFDLFdBQVcsQ0FBQyxFQUN0RSwwQkFBMEIsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLEVBQzdDLElBQUksQ0FBQyxpQkFBa0IsQ0FDeEIsQ0FBQztBQUNKLENBQUM7QUFFRDs7Ozs7R0FLRztBQUNILFNBQVMscURBQXFELENBQzVELE1BQW9DO0lBRXBDLE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsNkJBQTZCLENBQUMsTUFBTSxDQUFDLGVBQWdCLEVBQUUsTUFBTSxDQUFDLFdBQVcsQ0FBQyxFQUMxRSwwQkFBMEIsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQzNDLE1BQU0sQ0FBQyxpQkFBa0IsQ0FDMUIsQ0FBQztBQUNKLENBQUM7QUFFRDs7O0dBR0c7QUFFSCxNQUFNLFVBQVUsb0JBQW9CLENBQ2xDLGFBQXlCLEVBQ3pCLGFBQTBCLEVBQzFCLDZCQUE2RCxFQUM3RCxpQkFBa0MsRUFDbEMsZUFBMEM7SUFFMUMsSUFDRSw2QkFBNkIsQ0FBQyxNQUFNLEdBQUcsQ0FBQztRQUN4QyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUM7UUFDeEIsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQ3hCLGlCQUFpQixDQUFDLE1BQU0sR0FBRyxDQUFDO1FBQzVCLGVBQWUsQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsRUFDL0IsQ0FBQztRQUNELE1BQU0sSUFBSSxLQUFLLENBQUMsNEVBQTRFLENBQUMsQ0FBQztJQUNoRyxDQUFDO0FBQ0gsQ0FBQyJ9
|
|
@@ -1,12 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db.js';
|
|
1
|
+
import { Fr, type Gas, type GlobalVariables, type Header, type Nullifier, type TxContext } from '@aztec/circuits.js';
|
|
2
|
+
import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from './db_interfaces.js';
|
|
4
3
|
import { type PublicExecution, type PublicExecutionResult } from './execution.js';
|
|
5
|
-
import { PublicExecutionContext } from './public_execution_context.js';
|
|
6
|
-
/**
|
|
7
|
-
* Execute a public function and return the execution result.
|
|
8
|
-
*/
|
|
9
|
-
export declare function executePublicFunction(context: PublicExecutionContext, nested: boolean): Promise<PublicExecutionResult>;
|
|
10
4
|
/**
|
|
11
5
|
* Handles execution of public functions.
|
|
12
6
|
*/
|
|
@@ -16,7 +10,7 @@ export declare class PublicExecutor {
|
|
|
16
10
|
private readonly commitmentsDb;
|
|
17
11
|
private readonly header;
|
|
18
12
|
constructor(stateDb: PublicStateDB, contractsDb: PublicContractsDB, commitmentsDb: CommitmentsDB, header: Header);
|
|
19
|
-
|
|
13
|
+
static readonly log: import("@aztec/foundation/log").Logger;
|
|
20
14
|
/**
|
|
21
15
|
* Executes a public execution request.
|
|
22
16
|
* @param execution - The execution to run.
|
|
@@ -24,26 +18,5 @@ export declare class PublicExecutor {
|
|
|
24
18
|
* @returns The result of the run plus all nested runs.
|
|
25
19
|
*/
|
|
26
20
|
simulate(execution: PublicExecution, globalVariables: GlobalVariables, availableGas: Gas, txContext: TxContext, pendingNullifiers: Nullifier[], transactionFee?: Fr, sideEffectCounter?: number): Promise<PublicExecutionResult>;
|
|
27
|
-
/**
|
|
28
|
-
* These functions are currently housed in the temporary executor as it relies on access to
|
|
29
|
-
* oracles like the contractsDB and this is the least intrusive way to achieve this.
|
|
30
|
-
* When we remove this executor(tracking issue #4792) and have an interface that is compatible with the kernel circuits,
|
|
31
|
-
* this will be moved to sequencer-client/prover.
|
|
32
|
-
*/
|
|
33
|
-
/**
|
|
34
|
-
* Generates a proof for an associated avm execution. This is currently only used for testing purposes,
|
|
35
|
-
* as proof generation is not fully complete in the AVM yet.
|
|
36
|
-
* @param execution - The execution to run.
|
|
37
|
-
* @returns An AVM proof and the verification key.
|
|
38
|
-
*/
|
|
39
|
-
getAvmProof(avmExecution: PublicExecution): Promise<Buffer[]>;
|
|
40
|
-
/**
|
|
41
|
-
* Verifies an AVM proof. This function is currently only used for testing purposes, as verification
|
|
42
|
-
* is not fully complete in the AVM yet.
|
|
43
|
-
* @param vk - The verification key to use.
|
|
44
|
-
* @param proof - The proof to verify.
|
|
45
|
-
* @returns True if the proof is valid, false otherwise.
|
|
46
|
-
*/
|
|
47
|
-
verifyAvmProof(vk: Buffer, proof: Buffer): Promise<boolean>;
|
|
48
21
|
}
|
|
49
22
|
//# sourceMappingURL=executor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,KAAK,GAAG,EAAE,KAAK,eAAe,EAAE,KAAK,MAAM,EAAE,KAAK,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAQrH,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAwB,MAAM,gBAAgB,CAAC;AAGxG;;GAEG;AACH,qBAAa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,OAAO,EAAE,aAAa,EACtB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,aAAa,EAC5B,MAAM,EAAE,MAAM;IAGjC,MAAM,CAAC,QAAQ,CAAC,GAAG,yCAAwD;IAE3E;;;;;OAKG;IACU,QAAQ,CACnB,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,GAAG,EACjB,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,SAAS,EAAE,EAC9B,cAAc,GAAE,EAAY,EAC5B,iBAAiB,GAAE,MAAU,GAC5B,OAAO,CAAC,qBAAqB,CAAC;CAkElC"}
|
package/dest/public/executor.js
CHANGED
|
@@ -1,183 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Fr, Gas, PublicCircuitPublicInputs, } from '@aztec/circuits.js';
|
|
1
|
+
import { Fr } from '@aztec/circuits.js';
|
|
3
2
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
4
|
-
import { spawn } from 'child_process';
|
|
5
|
-
import { assert } from 'console';
|
|
6
|
-
import fs from 'fs/promises';
|
|
7
|
-
import path from 'path';
|
|
8
|
-
import { Oracle, acvm, extractCallStack, witnessMapToFields } from '../acvm/index.js';
|
|
9
3
|
import { AvmContext } from '../avm/avm_context.js';
|
|
10
4
|
import { AvmMachineState } from '../avm/avm_machine_state.js';
|
|
11
5
|
import { AvmSimulator } from '../avm/avm_simulator.js';
|
|
12
6
|
import { HostStorage } from '../avm/journal/host_storage.js';
|
|
13
7
|
import { AvmPersistableStateManager } from '../avm/journal/index.js';
|
|
14
|
-
import { AcirSimulator } from '../client/simulator.js';
|
|
15
|
-
import { ExecutionError, createSimulationError } from '../common/errors.js';
|
|
16
|
-
import { SideEffectCounter } from '../common/index.js';
|
|
17
|
-
import { PackedValuesCache } from '../common/packed_values_cache.js';
|
|
18
8
|
import { checkValidStaticCall } from './execution.js';
|
|
19
|
-
import {
|
|
20
|
-
import { convertAvmResultsToPxResult, createAvmExecutionEnvironment, decompressBytecodeIfCompressed, isAvmBytecode, } from './transitional_adaptors.js';
|
|
21
|
-
/**
|
|
22
|
-
* Execute a public function and return the execution result.
|
|
23
|
-
*/
|
|
24
|
-
export async function executePublicFunction(context, nested) {
|
|
25
|
-
const bytecode = await context.contractsDb.getBytecode(context.execution.contractAddress, context.execution.functionData.selector);
|
|
26
|
-
if (!bytecode) {
|
|
27
|
-
throw new Error(`Bytecode not found for ${context.execution.contractAddress}:${context.execution.functionData.selector}`);
|
|
28
|
-
}
|
|
29
|
-
if (await isAvmBytecode(bytecode)) {
|
|
30
|
-
return await executeTopLevelPublicFunctionAvm(context, bytecode);
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
return await executePublicFunctionAcvm(context, bytecode, nested);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
/**
|
|
37
|
-
* Execute a top-level public function call (the first call in an enqueued-call/execution-request) in the AVM.
|
|
38
|
-
* Translate the results back to the PublicExecutionResult format.
|
|
39
|
-
*/
|
|
40
|
-
async function executeTopLevelPublicFunctionAvm(executionContext, bytecode) {
|
|
41
|
-
const address = executionContext.execution.contractAddress;
|
|
42
|
-
const selector = executionContext.execution.functionData.selector;
|
|
43
|
-
const startGas = executionContext.availableGas;
|
|
44
|
-
const log = createDebugLogger('aztec:simulator:public_execution');
|
|
45
|
-
log.verbose(`[AVM] Executing public external function ${address.toString()}:${selector}.`);
|
|
46
|
-
// Temporary code to construct the AVM context
|
|
47
|
-
// These data structures will permeate across the simulator when the public executor is phased out
|
|
48
|
-
const hostStorage = new HostStorage(executionContext.stateDb, executionContext.contractsDb, executionContext.commitmentsDb);
|
|
49
|
-
// TODO(6207): add sideEffectCounter to persistableState construction
|
|
50
|
-
// or modify the PersistableStateManager to manage rollbacks across enqueued-calls and transactions.
|
|
51
|
-
const worldStateJournal = new AvmPersistableStateManager(hostStorage);
|
|
52
|
-
const startSideEffectCounter = executionContext.execution.callContext.sideEffectCounter;
|
|
53
|
-
for (const nullifier of executionContext.pendingNullifiers) {
|
|
54
|
-
worldStateJournal.nullifiers.cache.appendSiloed(nullifier.value);
|
|
55
|
-
}
|
|
56
|
-
// All the subsequent side effects will have a counter larger than the call's start counter.
|
|
57
|
-
worldStateJournal.trace.accessCounter = startSideEffectCounter + 1;
|
|
58
|
-
const executionEnv = createAvmExecutionEnvironment(executionContext.execution, executionContext.header, executionContext.globalVariables, executionContext.gasSettings, executionContext.transactionFee);
|
|
59
|
-
const machineState = new AvmMachineState(startGas);
|
|
60
|
-
const avmContext = new AvmContext(worldStateJournal, executionEnv, machineState);
|
|
61
|
-
const simulator = new AvmSimulator(avmContext);
|
|
62
|
-
const avmResult = await simulator.executeBytecode(bytecode);
|
|
63
|
-
// Commit the journals state to the DBs since this is a top-level execution.
|
|
64
|
-
// Observe that this will write all the state changes to the DBs, not only the latest for each slot.
|
|
65
|
-
// However, the underlying DB keep a cache and will only write the latest state to disk.
|
|
66
|
-
await avmContext.persistableState.publicStorage.commitToDB();
|
|
67
|
-
log.verbose(`[AVM] ${address.toString()}:${selector} returned, reverted: ${avmResult.reverted}, reason: ${avmResult.revertReason}.`);
|
|
68
|
-
return convertAvmResultsToPxResult(avmResult, startSideEffectCounter, executionContext.execution, startGas, avmContext);
|
|
69
|
-
}
|
|
70
|
-
async function executePublicFunctionAcvm(context, acir, nested) {
|
|
71
|
-
const execution = context.execution;
|
|
72
|
-
const { contractAddress, functionData } = execution;
|
|
73
|
-
const selector = functionData.selector;
|
|
74
|
-
const log = createDebugLogger('aztec:simulator:public_execution');
|
|
75
|
-
log.verbose(`[ACVM] Executing public external function ${contractAddress.toString()}:${selector}.`);
|
|
76
|
-
const initialWitness = context.getInitialWitness();
|
|
77
|
-
const acvmCallback = new Oracle(context);
|
|
78
|
-
const { partialWitness, returnWitnessMap, reverted, revertReason } = await (async () => {
|
|
79
|
-
try {
|
|
80
|
-
const result = await acvm(await AcirSimulator.getSolver(), acir, initialWitness, acvmCallback);
|
|
81
|
-
return {
|
|
82
|
-
partialWitness: result.partialWitness,
|
|
83
|
-
returnWitnessMap: result.returnWitness,
|
|
84
|
-
reverted: false,
|
|
85
|
-
revertReason: undefined,
|
|
86
|
-
};
|
|
87
|
-
}
|
|
88
|
-
catch (err_) {
|
|
89
|
-
const err = err_;
|
|
90
|
-
const ee = new ExecutionError(err.message, {
|
|
91
|
-
contractAddress,
|
|
92
|
-
functionSelector: selector,
|
|
93
|
-
}, extractCallStack(err), { cause: err });
|
|
94
|
-
if (nested) {
|
|
95
|
-
// If we're nested, throw the error so the parent can handle it
|
|
96
|
-
throw ee;
|
|
97
|
-
}
|
|
98
|
-
else {
|
|
99
|
-
return {
|
|
100
|
-
partialWitness: undefined,
|
|
101
|
-
returnWitnessMap: undefined,
|
|
102
|
-
reverted: true,
|
|
103
|
-
revertReason: createSimulationError(ee),
|
|
104
|
-
};
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
})();
|
|
108
|
-
if (reverted) {
|
|
109
|
-
return {
|
|
110
|
-
execution,
|
|
111
|
-
returnValues: [],
|
|
112
|
-
newNoteHashes: [],
|
|
113
|
-
newL2ToL1Messages: [],
|
|
114
|
-
// TODO (side effects) get these values in the revert case from the vm
|
|
115
|
-
startSideEffectCounter: Fr.ZERO,
|
|
116
|
-
endSideEffectCounter: Fr.ZERO,
|
|
117
|
-
newNullifiers: [],
|
|
118
|
-
nullifierReadRequests: [],
|
|
119
|
-
nullifierNonExistentReadRequests: [],
|
|
120
|
-
contractStorageReads: [],
|
|
121
|
-
contractStorageUpdateRequests: [],
|
|
122
|
-
nestedExecutions: [],
|
|
123
|
-
unencryptedLogsHashes: [],
|
|
124
|
-
unencryptedLogs: UnencryptedFunctionL2Logs.empty(),
|
|
125
|
-
allUnencryptedLogs: UnencryptedFunctionL2Logs.empty(),
|
|
126
|
-
reverted,
|
|
127
|
-
revertReason,
|
|
128
|
-
startGasLeft: context.availableGas,
|
|
129
|
-
endGasLeft: Gas.empty(),
|
|
130
|
-
transactionFee: context.transactionFee,
|
|
131
|
-
};
|
|
132
|
-
}
|
|
133
|
-
if (!partialWitness) {
|
|
134
|
-
throw new Error('No partial witness returned from ACVM');
|
|
135
|
-
}
|
|
136
|
-
const returnWitness = witnessMapToFields(returnWitnessMap);
|
|
137
|
-
const { returnsHash, nullifierReadRequests: nullifierReadRequestsPadded, nullifierNonExistentReadRequests: nullifierNonExistentReadRequestsPadded, newL2ToL1Msgs, newNoteHashes: newNoteHashesPadded, newNullifiers: newNullifiersPadded, startSideEffectCounter, endSideEffectCounter, unencryptedLogsHashes: unencryptedLogsHashesPadded, } = PublicCircuitPublicInputs.fromFields(returnWitness);
|
|
138
|
-
const returnValues = await context.unpackReturns(returnsHash);
|
|
139
|
-
const nullifierReadRequests = nullifierReadRequestsPadded.filter(v => !v.isEmpty());
|
|
140
|
-
const nullifierNonExistentReadRequests = nullifierNonExistentReadRequestsPadded.filter(v => !v.isEmpty());
|
|
141
|
-
const newL2ToL1Messages = newL2ToL1Msgs.filter(v => !v.isEmpty());
|
|
142
|
-
const newNoteHashes = newNoteHashesPadded.filter(v => !v.isEmpty());
|
|
143
|
-
const newNullifiers = newNullifiersPadded.filter(v => !v.isEmpty());
|
|
144
|
-
const unencryptedLogsHashes = unencryptedLogsHashesPadded.filter(v => !v.isEmpty());
|
|
145
|
-
const { contractStorageReads, contractStorageUpdateRequests } = context.getStorageActionData();
|
|
146
|
-
log.debug(`Contract storage reads: ${contractStorageReads
|
|
147
|
-
.map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
|
|
148
|
-
.join(', ')}`);
|
|
149
|
-
log.debug(`Contract storage update requests: ${contractStorageUpdateRequests
|
|
150
|
-
.map(r => r.toFriendlyJSON() + ` - sec: ${r.sideEffectCounter}`)
|
|
151
|
-
.join(', ')}`);
|
|
152
|
-
const nestedExecutions = context.getNestedExecutions();
|
|
153
|
-
const unencryptedLogs = context.getUnencryptedLogs();
|
|
154
|
-
const allUnencryptedLogs = context.getAllUnencryptedLogs();
|
|
155
|
-
// TODO(palla/gas): We should be loading these values from the returned PublicCircuitPublicInputs
|
|
156
|
-
const startGasLeft = context.availableGas;
|
|
157
|
-
const endGasLeft = context.availableGas; // No gas consumption in non-AVM
|
|
158
|
-
return {
|
|
159
|
-
execution,
|
|
160
|
-
newNoteHashes,
|
|
161
|
-
newL2ToL1Messages,
|
|
162
|
-
newNullifiers,
|
|
163
|
-
startSideEffectCounter,
|
|
164
|
-
endSideEffectCounter,
|
|
165
|
-
nullifierReadRequests,
|
|
166
|
-
nullifierNonExistentReadRequests,
|
|
167
|
-
contractStorageReads,
|
|
168
|
-
contractStorageUpdateRequests,
|
|
169
|
-
returnValues,
|
|
170
|
-
nestedExecutions,
|
|
171
|
-
unencryptedLogsHashes,
|
|
172
|
-
unencryptedLogs,
|
|
173
|
-
allUnencryptedLogs,
|
|
174
|
-
reverted: false,
|
|
175
|
-
revertReason: undefined,
|
|
176
|
-
startGasLeft,
|
|
177
|
-
endGasLeft,
|
|
178
|
-
transactionFee: context.transactionFee,
|
|
179
|
-
};
|
|
180
|
-
}
|
|
9
|
+
import { convertAvmResultsToPxResult, createAvmExecutionEnvironment } from './transitional_adaptors.js';
|
|
181
10
|
/**
|
|
182
11
|
* Handles execution of public functions.
|
|
183
12
|
*/
|
|
@@ -187,7 +16,6 @@ export class PublicExecutor {
|
|
|
187
16
|
this.contractsDb = contractsDb;
|
|
188
17
|
this.commitmentsDb = commitmentsDb;
|
|
189
18
|
this.header = header;
|
|
190
|
-
this.log = createDebugLogger('aztec:simulator:public_executor');
|
|
191
19
|
}
|
|
192
20
|
/**
|
|
193
21
|
* Executes a public execution request.
|
|
@@ -196,116 +24,38 @@ export class PublicExecutor {
|
|
|
196
24
|
* @returns The result of the run plus all nested runs.
|
|
197
25
|
*/
|
|
198
26
|
async simulate(execution, globalVariables, availableGas, txContext, pendingNullifiers, transactionFee = Fr.ZERO, sideEffectCounter = 0) {
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
const
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
27
|
+
const address = execution.contractAddress;
|
|
28
|
+
const selector = execution.functionSelector;
|
|
29
|
+
const startGas = availableGas;
|
|
30
|
+
PublicExecutor.log.verbose(`[AVM] Executing public external function ${address.toString()}:${selector}.`);
|
|
31
|
+
// Temporary code to construct the AVM context
|
|
32
|
+
// These data structures will permeate across the simulator when the public executor is phased out
|
|
33
|
+
const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
|
|
34
|
+
const startSideEffectCounter = sideEffectCounter;
|
|
35
|
+
const worldStateJournal = new AvmPersistableStateManager(hostStorage);
|
|
36
|
+
for (const nullifier of pendingNullifiers) {
|
|
37
|
+
worldStateJournal.nullifiers.cache.appendSiloed(nullifier.value);
|
|
38
|
+
}
|
|
39
|
+
// All the subsequent side effects will have a counter larger than the call's start counter.
|
|
40
|
+
worldStateJournal.trace.accessCounter = startSideEffectCounter + 1;
|
|
41
|
+
const executionEnv = createAvmExecutionEnvironment(execution, this.header, globalVariables, txContext.gasSettings, transactionFee);
|
|
42
|
+
const machineState = new AvmMachineState(startGas);
|
|
43
|
+
const avmContext = new AvmContext(worldStateJournal, executionEnv, machineState);
|
|
44
|
+
const simulator = new AvmSimulator(avmContext);
|
|
45
|
+
const avmResult = await simulator.execute();
|
|
46
|
+
// Commit the journals state to the DBs since this is a top-level execution.
|
|
47
|
+
// Observe that this will write all the state changes to the DBs, not only the latest for each slot.
|
|
48
|
+
// However, the underlying DB keep a cache and will only write the latest state to disk.
|
|
49
|
+
await avmContext.persistableState.publicStorage.commitToDB();
|
|
50
|
+
PublicExecutor.log.verbose(`[AVM] ${address.toString()}:${selector} returned, reverted: ${avmResult.reverted}, reason: ${avmResult.revertReason}.`);
|
|
51
|
+
const executionResult = convertAvmResultsToPxResult(avmResult, startSideEffectCounter, execution, startGas, avmContext, simulator.getBytecode());
|
|
52
|
+
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/5818): is this really needed?
|
|
53
|
+
// should already be handled in simulation.
|
|
54
|
+
if (execution.callContext.isStaticCall) {
|
|
205
55
|
checkValidStaticCall(executionResult.newNoteHashes, executionResult.newNullifiers, executionResult.contractStorageUpdateRequests, executionResult.newL2ToL1Messages, executionResult.unencryptedLogs);
|
|
206
56
|
}
|
|
207
57
|
return executionResult;
|
|
208
58
|
}
|
|
209
|
-
/**
|
|
210
|
-
* These functions are currently housed in the temporary executor as it relies on access to
|
|
211
|
-
* oracles like the contractsDB and this is the least intrusive way to achieve this.
|
|
212
|
-
* When we remove this executor(tracking issue #4792) and have an interface that is compatible with the kernel circuits,
|
|
213
|
-
* this will be moved to sequencer-client/prover.
|
|
214
|
-
*/
|
|
215
|
-
/**
|
|
216
|
-
* Generates a proof for an associated avm execution. This is currently only used for testing purposes,
|
|
217
|
-
* as proof generation is not fully complete in the AVM yet.
|
|
218
|
-
* @param execution - The execution to run.
|
|
219
|
-
* @returns An AVM proof and the verification key.
|
|
220
|
-
*/
|
|
221
|
-
async getAvmProof(avmExecution) {
|
|
222
|
-
// The paths for the barretenberg binary and the write path are hardcoded for now.
|
|
223
|
-
const bbPath = path.resolve('../../barretenberg/cpp');
|
|
224
|
-
const artifactsPath = path.resolve('target');
|
|
225
|
-
// Create the directory if it does not exist
|
|
226
|
-
await fs.rm(artifactsPath, { recursive: true, force: true });
|
|
227
|
-
await fs.mkdir(artifactsPath, { recursive: true });
|
|
228
|
-
const calldataPath = path.join(artifactsPath, 'calldata.bin');
|
|
229
|
-
const bytecodePath = path.join(artifactsPath, 'avm_bytecode.bin');
|
|
230
|
-
const proofPath = path.join(artifactsPath, 'proof');
|
|
231
|
-
const { args, functionData, contractAddress } = avmExecution;
|
|
232
|
-
let bytecode = await this.contractsDb.getBytecode(contractAddress, functionData.selector);
|
|
233
|
-
assert(!!bytecode, `Bytecode not found for ${contractAddress}:${functionData.selector}`);
|
|
234
|
-
// This should be removed once we do bytecode validation.
|
|
235
|
-
bytecode = await decompressBytecodeIfCompressed(bytecode);
|
|
236
|
-
// Write call data and bytecode to files.
|
|
237
|
-
await fs.writeFile(calldataPath, args.map(c => c.toBuffer()));
|
|
238
|
-
await fs.writeFile(bytecodePath, bytecode);
|
|
239
|
-
const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
|
|
240
|
-
const bbArgs = ['avm_prove', '-b', bytecodePath, '-d', calldataPath, '-o', proofPath];
|
|
241
|
-
this.log.debug(`calling '${bbExec} ${bbArgs.join(' ')}'`);
|
|
242
|
-
const bbBinary = spawn(bbExec, bbArgs);
|
|
243
|
-
// The binary writes the proof and the verification key to the write path.
|
|
244
|
-
return new Promise((resolve, reject) => {
|
|
245
|
-
let stdout = '';
|
|
246
|
-
let stderr = '';
|
|
247
|
-
bbBinary.on('close', () => {
|
|
248
|
-
this.log.verbose(`Proof generation complete. Reading proof and vk from ${proofPath}.`);
|
|
249
|
-
return resolve(Promise.all([fs.readFile(proofPath), fs.readFile(path.join(artifactsPath, 'vk'))]));
|
|
250
|
-
});
|
|
251
|
-
// Catch stdout.
|
|
252
|
-
bbBinary.stdout.on('data', (data) => {
|
|
253
|
-
stdout += data.toString();
|
|
254
|
-
});
|
|
255
|
-
bbBinary.stdout.on('end', () => {
|
|
256
|
-
if (stdout.length > 0) {
|
|
257
|
-
this.log.debug(`stdout: ${stdout}`);
|
|
258
|
-
}
|
|
259
|
-
});
|
|
260
|
-
// Catch stderr.
|
|
261
|
-
bbBinary.stderr.on('data', (data) => {
|
|
262
|
-
stderr += data.toString();
|
|
263
|
-
});
|
|
264
|
-
bbBinary.stderr.on('end', () => {
|
|
265
|
-
if (stderr.length > 0) {
|
|
266
|
-
this.log.warn(`stderr: ${stderr}`);
|
|
267
|
-
}
|
|
268
|
-
});
|
|
269
|
-
// Catch and propagate errors from spawning
|
|
270
|
-
bbBinary.on('error', err => {
|
|
271
|
-
reject(err);
|
|
272
|
-
});
|
|
273
|
-
});
|
|
274
|
-
}
|
|
275
|
-
/**
|
|
276
|
-
* Verifies an AVM proof. This function is currently only used for testing purposes, as verification
|
|
277
|
-
* is not fully complete in the AVM yet.
|
|
278
|
-
* @param vk - The verification key to use.
|
|
279
|
-
* @param proof - The proof to verify.
|
|
280
|
-
* @returns True if the proof is valid, false otherwise.
|
|
281
|
-
*/
|
|
282
|
-
async verifyAvmProof(vk, proof) {
|
|
283
|
-
// The relative paths for the barretenberg binary and the write path are hardcoded for now.
|
|
284
|
-
const bbPath = path.resolve('../../barretenberg/cpp');
|
|
285
|
-
const artifactsPath = path.resolve('./target');
|
|
286
|
-
const vkPath = path.join(artifactsPath, 'vk');
|
|
287
|
-
const proofPath = path.join(artifactsPath, 'proof');
|
|
288
|
-
// Write the verification key and the proof to files.
|
|
289
|
-
await fs.writeFile(vkPath, vk);
|
|
290
|
-
await fs.writeFile(proofPath, proof);
|
|
291
|
-
const bbExec = path.join(bbPath, 'build', 'bin', 'bb');
|
|
292
|
-
const bbArgs = ['avm_verify', '-p', proofPath];
|
|
293
|
-
this.log.debug(`calling '${bbPath} ${bbArgs.join(' ')}'`);
|
|
294
|
-
const bbBinary = spawn(bbExec, bbArgs);
|
|
295
|
-
// The binary prints to stdout 1 if the proof is valid and 0 if it is not.
|
|
296
|
-
return new Promise((resolve, reject) => {
|
|
297
|
-
let result = Buffer.alloc(0);
|
|
298
|
-
bbBinary.stdout.on('data', data => {
|
|
299
|
-
result += data;
|
|
300
|
-
});
|
|
301
|
-
bbBinary.on('close', () => {
|
|
302
|
-
resolve(result.toString() === '1');
|
|
303
|
-
});
|
|
304
|
-
// Catch and propagate errors from spawning
|
|
305
|
-
bbBinary.on('error', err => {
|
|
306
|
-
reject(err);
|
|
307
|
-
});
|
|
308
|
-
});
|
|
309
|
-
}
|
|
310
59
|
}
|
|
311
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/public/executor.ts"],"names":[],"mappings":"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"}
|
|
60
|
+
PublicExecutor.log = createDebugLogger('aztec:simulator:public_executor');
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2V4ZWN1dG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQStFLE1BQU0sb0JBQW9CLENBQUM7QUFDckgsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFMUQsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQ25ELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUM5RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDdkQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBQzdELE9BQU8sRUFBRSwwQkFBMEIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRXJFLE9BQU8sRUFBb0Qsb0JBQW9CLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUN4RyxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsNkJBQTZCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUV4Rzs7R0FFRztBQUNILE1BQU0sT0FBTyxjQUFjO0lBQ3pCLFlBQ21CLE9BQXNCLEVBQ3RCLFdBQThCLEVBQzlCLGFBQTRCLEVBQzVCLE1BQWM7UUFIZCxZQUFPLEdBQVAsT0FBTyxDQUFlO1FBQ3RCLGdCQUFXLEdBQVgsV0FBVyxDQUFtQjtRQUM5QixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtRQUM1QixXQUFNLEdBQU4sTUFBTSxDQUFRO0lBQzlCLENBQUM7SUFJSjs7Ozs7T0FLRztJQUNJLEtBQUssQ0FBQyxRQUFRLENBQ25CLFNBQTBCLEVBQzFCLGVBQWdDLEVBQ2hDLFlBQWlCLEVBQ2pCLFNBQW9CLEVBQ3BCLGlCQUE4QixFQUM5QixpQkFBcUIsRUFBRSxDQUFDLElBQUksRUFDNUIsb0JBQTRCLENBQUM7UUFFN0IsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLGVB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
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
2
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
3
|
+
/**
|
|
4
|
+
* Computes the storage slot within the gas token contract for the balance of the fee payer.
|
|
5
|
+
*/
|
|
6
|
+
export declare function computeFeePayerBalanceStorageSlot(feePayer: AztecAddress): Fr;
|
|
7
|
+
/**
|
|
8
|
+
* Computes the leaf slot in the public data tree for the balance of the fee payer in the gas token.
|
|
9
|
+
*/
|
|
10
|
+
export declare function computeFeePayerBalanceLeafSlot(feePayer: AztecAddress): Fr;
|
|
11
|
+
//# sourceMappingURL=fee_payment.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fee_payment.d.ts","sourceRoot":"","sources":["../../src/public/fee_payment.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAK9C;;GAEG;AACH,wBAAgB,iCAAiC,CAAC,QAAQ,EAAE,YAAY,MAEvE;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAOzE"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { GAS_TOKEN_ADDRESS } from '@aztec/circuits.js';
|
|
2
|
+
import { computePublicDataTreeLeafSlot } from '@aztec/circuits.js/hash';
|
|
3
|
+
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
4
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import { GasTokenArtifact } from '@aztec/protocol-contracts/gas-token';
|
|
6
|
+
import { computeSlotForMapping } from '../utils.js';
|
|
7
|
+
/**
|
|
8
|
+
* Computes the storage slot within the gas token contract for the balance of the fee payer.
|
|
9
|
+
*/
|
|
10
|
+
export function computeFeePayerBalanceStorageSlot(feePayer) {
|
|
11
|
+
return computeSlotForMapping(GasTokenArtifact.storageLayout.balances.slot, feePayer);
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Computes the leaf slot in the public data tree for the balance of the fee payer in the gas token.
|
|
15
|
+
*/
|
|
16
|
+
export function computeFeePayerBalanceLeafSlot(feePayer) {
|
|
17
|
+
if (feePayer.isZero()) {
|
|
18
|
+
return Fr.ZERO;
|
|
19
|
+
}
|
|
20
|
+
const gasToken = AztecAddress.fromBigInt(GAS_TOKEN_ADDRESS);
|
|
21
|
+
const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
|
|
22
|
+
return computePublicDataTreeLeafSlot(gasToken, balanceSlot);
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlX3BheW1lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHVibGljL2ZlZV9wYXltZW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQ3ZELE9BQU8sRUFBRSw2QkFBNkIsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBQ3hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQztBQUMvRCxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFDOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFdkUsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBRXBEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLGlDQUFpQyxDQUFDLFFBQXNCO0lBQ3RFLE9BQU8scUJBQXFCLENBQUMsZ0JBQWdCLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsUUFBUSxDQUFDLENBQUM7QUFDdkYsQ0FBQztBQUVEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLDhCQUE4QixDQUFDLFFBQXNCO0lBQ25FLElBQUksUUFBUSxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUM7UUFDdEIsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDO0lBQ2pCLENBQUM7SUFDRCxNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsVUFBVSxDQUFDLGlCQUFpQixDQUFDLENBQUM7SUFDNUQsTUFBTSxXQUFXLEdBQUcsaUNBQWlDLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEUsT0FBTyw2QkFBNkIsQ0FBQyxRQUFRLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDOUQsQ0FBQyJ9
|
|
@@ -7,6 +7,7 @@ export declare class HintsBuilder {
|
|
|
7
7
|
getNullifierReadRequestHints(nullifierReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierReadRequestHints<128, 128>>;
|
|
8
8
|
getNullifierNonExistentReadRequestHints(nullifierNonExistentReadRequests: Tuple<ScopedReadRequest, typeof MAX_NULLIFIER_NON_EXISTENT_READ_REQUESTS_PER_TX>, pendingNullifiers: Tuple<Nullifier, typeof MAX_NEW_NULLIFIERS_PER_TX>): Promise<import("@aztec/circuits.js").NullifierNonExistentReadRequestHints>;
|
|
9
9
|
getPublicDataHints(publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>, publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>): Promise<[PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint, PublicDataHint]>;
|
|
10
|
+
getPublicDataHint(dataAction: PublicDataRead | PublicDataUpdateRequest | bigint): Promise<PublicDataHint>;
|
|
10
11
|
getPublicDataReadRequestHints(publicDataReads: Tuple<PublicDataRead, typeof MAX_PUBLIC_DATA_READS_PER_TX>, publicDataUpdateRequests: Tuple<PublicDataUpdateRequest, typeof MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX>, publicDataHints: Tuple<PublicDataHint, typeof MAX_PUBLIC_DATA_HINTS>): import("@aztec/circuits.js").PublicDataReadRequestHints;
|
|
11
12
|
getNullifierMembershipWitness(nullifier: Fr): Promise<{
|
|
12
13
|
membershipWitness: MembershipWitness<20>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/public/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAAE,EACP,KAAK,yBAAyB,EAC9B,KAAK,+CAA+C,EACpD,kCAAkC,EAClC,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,sCAAsC,EAC3C,iBAAiB,EAEjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,
|
|
1
|
+
{"version":3,"file":"hints_builder.d.ts","sourceRoot":"","sources":["../../src/public/hints_builder.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,EAAE,EACP,KAAK,yBAAyB,EAC9B,KAAK,+CAA+C,EACpD,kCAAkC,EAClC,KAAK,qBAAqB,EAC1B,KAAK,4BAA4B,EACjC,KAAK,sCAAsC,EAC3C,iBAAiB,EAEjB,KAAK,SAAS,EAEd,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,0BAA0B,EAC/B,KAAK,uBAAuB,EAC5B,KAAK,iBAAiB,EAMvB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAsB,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAEnF,qBAAa,YAAY;IACX,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,oBAAoB;IAEtC,4BAA4B,CAChC,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,kCAAkC,CAAC,EAC1F,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAavE,uCAAuC,CACrC,gCAAgC,EAAE,KAAK,CAAC,iBAAiB,EAAE,OAAO,+CAA+C,CAAC,EAClH,iBAAiB,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,yBAAyB,CAAC;IAKvE,kBAAkB,CAChB,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC;IAKzG,iBAAiB,CAAC,UAAU,EAAE,cAAc,GAAG,uBAAuB,GAAG,MAAM;IAK/E,6BAA6B,CAC3B,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,4BAA4B,CAAC,EAC3E,wBAAwB,EAAE,KAAK,CAAC,uBAAuB,EAAE,OAAO,sCAAsC,CAAC,EACvG,eAAe,EAAE,KAAK,CAAC,cAAc,EAAE,OAAO,qBAAqB,CAAC;IAKhE,6BAA6B,CAAC,SAAS,EAAE,EAAE;;;;IAa3C,gCAAgC,CAAC,SAAS,EAAE,EAAE;;;;IAkB9C,wCAAwC,CAAC,QAAQ,EAAE,MAAM;;;;YAcjD,gCAAgC;CAe/C"}
|