@aztec/simulator 0.23.0 → 0.26.1
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/deserialize.d.ts +5 -0
- package/dest/acvm/deserialize.d.ts.map +1 -1
- package/dest/acvm/deserialize.js +8 -1
- package/dest/acvm/oracle/oracle.d.ts +7 -6
- package/dest/acvm/oracle/oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/oracle.js +28 -15
- package/dest/acvm/oracle/typed_oracle.d.ts +9 -11
- package/dest/acvm/oracle/typed_oracle.d.ts.map +1 -1
- package/dest/acvm/oracle/typed_oracle.js +11 -11
- package/dest/avm/avm_context.d.ts +4 -4
- package/dest/avm/avm_context.d.ts.map +1 -1
- package/dest/avm/avm_context.js +6 -6
- package/dest/avm/avm_execution_environment.d.ts +3 -2
- package/dest/avm/avm_execution_environment.d.ts.map +1 -1
- package/dest/avm/avm_execution_environment.js +6 -5
- package/dest/avm/avm_memory_types.d.ts +127 -37
- package/dest/avm/avm_memory_types.d.ts.map +1 -1
- package/dest/avm/avm_memory_types.js +98 -106
- package/dest/avm/avm_simulator.d.ts +6 -4
- package/dest/avm/avm_simulator.d.ts.map +1 -1
- package/dest/avm/avm_simulator.js +17 -19
- package/dest/avm/errors.d.ts +3 -1
- package/dest/avm/errors.d.ts.map +1 -1
- package/dest/avm/errors.js +9 -3
- package/dest/avm/fixtures/index.d.ts +21 -5
- package/dest/avm/fixtures/index.d.ts.map +1 -1
- package/dest/avm/fixtures/index.js +28 -9
- 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/host_storage.js +1 -1
- package/dest/avm/journal/journal.d.ts +78 -50
- package/dest/avm/journal/journal.d.ts.map +1 -1
- package/dest/avm/journal/journal.js +125 -169
- package/dest/avm/journal/nullifiers.d.ts +85 -0
- package/dest/avm/journal/nullifiers.d.ts.map +1 -0
- package/dest/avm/journal/nullifiers.js +147 -0
- package/dest/avm/journal/public_storage.d.ts +88 -0
- package/dest/avm/journal/public_storage.d.ts.map +1 -0
- package/dest/avm/journal/public_storage.js +135 -0
- package/dest/avm/journal/trace.d.ts +43 -0
- package/dest/avm/journal/trace.d.ts.map +1 -0
- package/dest/avm/journal/trace.js +204 -0
- package/dest/avm/journal/trace_types.d.ts +26 -0
- package/dest/avm/journal/trace_types.d.ts.map +1 -0
- package/dest/avm/journal/trace_types.js +6 -0
- package/dest/avm/opcodes/accrued_substate.d.ts +37 -4
- package/dest/avm/opcodes/accrued_substate.d.ts.map +1 -1
- package/dest/avm/opcodes/accrued_substate.js +109 -12
- package/dest/avm/opcodes/addressing_mode.d.ts +24 -0
- package/dest/avm/opcodes/addressing_mode.d.ts.map +1 -0
- package/dest/avm/opcodes/addressing_mode.js +62 -0
- package/dest/avm/opcodes/environment_getters.d.ts +14 -13
- package/dest/avm/opcodes/environment_getters.d.ts.map +1 -1
- package/dest/avm/opcodes/environment_getters.js +1 -1
- package/dest/avm/opcodes/external_calls.js +5 -5
- package/dest/avm/opcodes/hashing.d.ts +48 -0
- package/dest/avm/opcodes/hashing.d.ts.map +1 -0
- package/dest/avm/opcodes/hashing.js +127 -0
- package/dest/avm/opcodes/instruction.d.ts +4 -4
- package/dest/avm/opcodes/instruction.d.ts.map +1 -1
- package/dest/avm/opcodes/instruction.js +1 -1
- package/dest/avm/opcodes/memory.d.ts.map +1 -1
- package/dest/avm/opcodes/memory.js +5 -3
- package/dest/avm/opcodes/storage.d.ts.map +1 -1
- package/dest/avm/opcodes/storage.js +3 -3
- package/dest/avm/serialization/bytecode_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/bytecode_serialization.js +28 -22
- package/dest/avm/serialization/instruction_serialization.d.ts +21 -16
- package/dest/avm/serialization/instruction_serialization.d.ts.map +1 -1
- package/dest/avm/serialization/instruction_serialization.js +23 -18
- package/dest/avm/temporary_executor_migration.d.ts +25 -0
- package/dest/avm/temporary_executor_migration.d.ts.map +1 -0
- package/dest/avm/temporary_executor_migration.js +71 -0
- package/dest/client/client_execution_context.d.ts +13 -7
- package/dest/client/client_execution_context.d.ts.map +1 -1
- package/dest/client/client_execution_context.js +52 -27
- package/dest/client/db_oracle.d.ts +7 -0
- package/dest/client/db_oracle.d.ts.map +1 -1
- package/dest/client/db_oracle.js +1 -1
- package/dest/client/execution_note_cache.js +1 -1
- package/dest/client/execution_result.d.ts +4 -2
- package/dest/client/execution_result.d.ts.map +1 -1
- package/dest/client/execution_result.js +1 -1
- package/dest/client/private_execution.d.ts.map +1 -1
- package/dest/client/private_execution.js +4 -4
- package/dest/client/simulator.d.ts +11 -6
- package/dest/client/simulator.d.ts.map +1 -1
- package/dest/client/simulator.js +21 -12
- package/dest/client/unconstrained_execution.js +2 -2
- package/dest/client/view_data_oracle.d.ts +9 -2
- package/dest/client/view_data_oracle.d.ts.map +1 -1
- package/dest/client/view_data_oracle.js +13 -5
- package/dest/public/db.d.ts +17 -4
- package/dest/public/db.d.ts.map +1 -1
- package/dest/public/execution.d.ts +9 -4
- package/dest/public/execution.d.ts.map +1 -1
- package/dest/public/execution.js +18 -5
- package/dest/public/executor.d.ts +7 -0
- package/dest/public/executor.d.ts.map +1 -1
- package/dest/public/executor.js +40 -6
- package/dest/public/public_execution_context.d.ts +5 -4
- package/dest/public/public_execution_context.d.ts.map +1 -1
- package/dest/public/public_execution_context.js +24 -13
- package/dest/public/state_actions.d.ts +1 -1
- package/dest/public/state_actions.d.ts.map +1 -1
- package/dest/public/state_actions.js +6 -7
- package/dest/test/utils.js +4 -4
- package/dest/utils.d.ts +5 -20
- package/dest/utils.d.ts.map +1 -1
- package/dest/utils.js +4 -21
- package/package.json +9 -6
- package/src/acvm/acvm.ts +156 -0
- package/src/acvm/acvm_types.ts +11 -0
- package/src/acvm/deserialize.ts +44 -0
- package/src/acvm/index.ts +5 -0
- package/src/acvm/oracle/debug.ts +109 -0
- package/src/acvm/oracle/index.ts +17 -0
- package/src/acvm/oracle/oracle.ts +356 -0
- package/src/acvm/oracle/typed_oracle.ts +225 -0
- package/src/acvm/serialize.ts +75 -0
- package/src/avm/avm_context.ts +63 -0
- package/src/avm/avm_execution_environment.ts +98 -0
- package/src/avm/avm_machine_state.ts +93 -0
- package/src/avm/avm_memory_types.ts +324 -0
- package/src/avm/avm_message_call_result.ts +29 -0
- package/src/avm/avm_simulator.ts +87 -0
- package/src/avm/errors.ts +57 -0
- package/src/avm/fixtures/index.ts +115 -0
- package/src/avm/journal/host_storage.ts +14 -0
- package/src/avm/journal/index.ts +2 -0
- package/src/avm/journal/journal.ts +231 -0
- package/src/avm/journal/nullifiers.ts +170 -0
- package/src/avm/journal/public_storage.ts +149 -0
- package/src/avm/journal/trace.ts +223 -0
- package/src/avm/journal/trace_types.ts +79 -0
- package/src/avm/opcodes/.eslintrc.cjs +8 -0
- package/src/avm/opcodes/accrued_substate.ts +214 -0
- package/src/avm/opcodes/addressing_mode.ts +66 -0
- package/src/avm/opcodes/arithmetic.ts +79 -0
- package/src/avm/opcodes/bitwise.ts +129 -0
- package/src/avm/opcodes/comparators.ts +69 -0
- package/src/avm/opcodes/control_flow.ts +129 -0
- package/src/avm/opcodes/environment_getters.ts +201 -0
- package/src/avm/opcodes/external_calls.ts +122 -0
- package/src/avm/opcodes/hashing.ts +170 -0
- package/src/avm/opcodes/index.ts +10 -0
- package/src/avm/opcodes/instruction.ts +64 -0
- package/src/avm/opcodes/instruction_impl.ts +52 -0
- package/src/avm/opcodes/memory.ts +194 -0
- package/src/avm/opcodes/storage.ts +79 -0
- package/src/avm/serialization/buffer_cursor.ts +109 -0
- package/src/avm/serialization/bytecode_serialization.ts +179 -0
- package/src/avm/serialization/instruction_serialization.ts +170 -0
- package/src/avm/temporary_executor_migration.ts +109 -0
- package/src/client/client_execution_context.ts +502 -0
- package/src/client/db_oracle.ts +192 -0
- package/src/client/execution_note_cache.ts +90 -0
- package/src/client/execution_result.ts +89 -0
- package/src/client/index.ts +3 -0
- package/src/client/pick_notes.ts +125 -0
- package/src/client/private_execution.ts +79 -0
- package/src/client/simulator.ts +317 -0
- package/src/client/unconstrained_execution.ts +49 -0
- package/src/client/view_data_oracle.ts +253 -0
- package/src/common/errors.ts +61 -0
- package/src/common/index.ts +3 -0
- package/src/common/packed_args_cache.ts +55 -0
- package/src/common/side_effect_counter.ts +12 -0
- package/src/index.ts +3 -0
- package/src/public/db.ts +100 -0
- package/src/public/execution.ts +161 -0
- package/src/public/executor.ts +178 -0
- package/src/public/index.ts +9 -0
- package/src/public/public_execution_context.ts +241 -0
- package/src/public/state_actions.ts +100 -0
- package/src/test/utils.ts +38 -0
- package/src/utils.ts +18 -0
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
// All code in this file needs to die once the public executor is phased out.
|
|
2
|
+
import { FunctionL2Logs } from '@aztec/circuit-types';
|
|
3
|
+
import { ContractStorageRead, ContractStorageUpdateRequest, L2ToL1Message, SideEffect, } from '@aztec/circuits.js';
|
|
4
|
+
import { Fr } from '@aztec/foundation/fields';
|
|
5
|
+
import { AvmExecutionEnvironment } from './avm_execution_environment.js';
|
|
6
|
+
/** Temporary Method
|
|
7
|
+
*
|
|
8
|
+
* Convert a PublicExecution(Environment) object to an AvmExecutionEnvironment
|
|
9
|
+
*
|
|
10
|
+
* @param current
|
|
11
|
+
* @param globalVariables
|
|
12
|
+
* @returns
|
|
13
|
+
*/
|
|
14
|
+
export function temporaryCreateAvmExecutionEnvironment(current, globalVariables) {
|
|
15
|
+
// Function selector is included temporarily until noir codegens public contract bytecode in a single blob
|
|
16
|
+
return new AvmExecutionEnvironment(current.contractAddress, current.callContext.storageContractAddress, current.callContext.msgSender, // TODO: origin is not available
|
|
17
|
+
current.callContext.msgSender, current.callContext.portalContractAddress,
|
|
18
|
+
/*feePerL1Gas=*/ Fr.zero(),
|
|
19
|
+
/*feePerL2Gas=*/ Fr.zero(),
|
|
20
|
+
/*feePerDaGas=*/ Fr.zero(),
|
|
21
|
+
/*contractCallDepth=*/ Fr.zero(), globalVariables, current.callContext.isStaticCall, current.callContext.isDelegateCall, current.args, current.functionData.selector);
|
|
22
|
+
}
|
|
23
|
+
/** Temporary Method
|
|
24
|
+
*
|
|
25
|
+
* Convert the result of an AVM contract call to a PublicExecutionResult for the public kernel
|
|
26
|
+
*
|
|
27
|
+
* @param execution
|
|
28
|
+
* @param newWorldState
|
|
29
|
+
* @param result
|
|
30
|
+
* @returns
|
|
31
|
+
*/
|
|
32
|
+
export function temporaryConvertAvmResults(execution, newWorldState, result) {
|
|
33
|
+
const newNoteHashes = newWorldState.newNoteHashes.map(noteHash => new SideEffect(noteHash, Fr.zero()));
|
|
34
|
+
const contractStorageReads = [];
|
|
35
|
+
const reduceStorageReadRequests = (contractAddress, storageReads) => {
|
|
36
|
+
return storageReads.forEach((innerArray, key) => {
|
|
37
|
+
innerArray.forEach(value => {
|
|
38
|
+
contractStorageReads.push(new ContractStorageRead(new Fr(key), new Fr(value), 0));
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
};
|
|
42
|
+
newWorldState.storageReads.forEach((storageMap, address) => reduceStorageReadRequests(address, storageMap));
|
|
43
|
+
const contractStorageUpdateRequests = [];
|
|
44
|
+
const reduceStorageUpdateRequests = (contractAddress, storageUpdateRequests) => {
|
|
45
|
+
return storageUpdateRequests.forEach((innerArray, key) => {
|
|
46
|
+
innerArray.forEach(value => {
|
|
47
|
+
contractStorageUpdateRequests.push(new ContractStorageUpdateRequest(new Fr(key), new Fr(value), 0));
|
|
48
|
+
});
|
|
49
|
+
});
|
|
50
|
+
};
|
|
51
|
+
newWorldState.storageWrites.forEach((storageMap, address) => reduceStorageUpdateRequests(address, storageMap));
|
|
52
|
+
const returnValues = result.output;
|
|
53
|
+
// TODO(follow up in pr tree): NOT SUPPORTED YET, make sure hashing and log resolution is done correctly
|
|
54
|
+
// Disabled.
|
|
55
|
+
const nestedExecutions = [];
|
|
56
|
+
const newNullifiers = [];
|
|
57
|
+
const unencryptedLogs = FunctionL2Logs.empty();
|
|
58
|
+
const newL2ToL1Messages = newWorldState.newL1Messages.map(() => L2ToL1Message.empty());
|
|
59
|
+
return {
|
|
60
|
+
execution,
|
|
61
|
+
newNoteHashes,
|
|
62
|
+
newL2ToL1Messages,
|
|
63
|
+
newNullifiers,
|
|
64
|
+
contractStorageReads,
|
|
65
|
+
contractStorageUpdateRequests,
|
|
66
|
+
returnValues,
|
|
67
|
+
nestedExecutions,
|
|
68
|
+
unencryptedLogs,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVtcG9yYXJ5X2V4ZWN1dG9yX21pZ3JhdGlvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hdm0vdGVtcG9yYXJ5X2V4ZWN1dG9yX21pZ3JhdGlvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw2RUFBNkU7QUFDN0UsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3RELE9BQU8sRUFDTCxtQkFBbUIsRUFDbkIsNEJBQTRCLEVBRTVCLGFBQWEsRUFDYixVQUFVLEdBRVgsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFHOUMsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sZ0NBQWdDLENBQUM7QUFJekU7Ozs7Ozs7R0FPRztBQUNILE1BQU0sVUFBVSxzQ0FBc0MsQ0FDcEQsT0FBd0IsRUFDeEIsZUFBZ0M7SUFFaEMsMEdBQTBHO0lBQzFHLE9BQU8sSUFBSSx1QkFBdUIsQ0FDaEMsT0FBTyxDQUFDLGVBQWUsRUFDdkIsT0FBTyxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsRUFDMUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxTQUFTLEVBQUUsZ0NBQWdDO0lBQy9ELE9BQU8sQ0FBQyxXQUFXLENBQUMsU0FBUyxFQUM3QixPQUFPLENBQUMsV0FBVyxDQUFDLHFCQUFxQjtJQUN6QyxnQkFBZ0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFO0lBQzFCLGdCQUFnQixDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUU7SUFDMUIsZ0JBQWdCLENBQUMsRUFBRSxDQUFDLElBQUksRUFBRTtJQUMxQixzQkFBc0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQ2hDLGVBQWUsRUFDZixPQUFPLENBQUMsV0FBVyxDQUFDLFlBQVksRUFDaEMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxjQUFjLEVBQ2xDLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLFlBQVks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
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AuthWitness, AztecNode, FunctionL2Logs, NoteStatus, UnencryptedL2Log } from '@aztec/circuit-types';
|
|
2
|
-
import { CallContext, FunctionSelector, Header,
|
|
2
|
+
import { CallContext, FunctionSelector, Header, NoteHashReadRequestMembershipWitness, PublicCallRequest, SideEffect, TxContext } from '@aztec/circuits.js';
|
|
3
3
|
import { Grumpkin } from '@aztec/circuits.js/barretenberg';
|
|
4
4
|
import { FunctionAbi } from '@aztec/foundation/abi';
|
|
5
5
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
@@ -14,6 +14,7 @@ import { ViewDataOracle } from './view_data_oracle.js';
|
|
|
14
14
|
* The execution context for a client tx simulation.
|
|
15
15
|
*/
|
|
16
16
|
export declare class ClientExecutionContext extends ViewDataOracle {
|
|
17
|
+
#private;
|
|
17
18
|
protected readonly contractAddress: AztecAddress;
|
|
18
19
|
private readonly argsHash;
|
|
19
20
|
private readonly txContext;
|
|
@@ -67,10 +68,10 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
67
68
|
* or to flag non-transient reads with their leafIndex.
|
|
68
69
|
* The KernelProver will use this to fully populate witnesses and provide hints to
|
|
69
70
|
* the kernel regarding which commitments each transient read request corresponds to.
|
|
70
|
-
* @param
|
|
71
|
+
* @param noteHashReadRequests - SideEffect containing Note hashed of the notes being read and counter.
|
|
71
72
|
* @returns An array of partially filled in read request membership witnesses.
|
|
72
73
|
*/
|
|
73
|
-
|
|
74
|
+
getNoteHashReadRequestPartialWitnesses(noteHashReadRequests: SideEffect[]): NoteHashReadRequestMembershipWitness[];
|
|
74
75
|
/**
|
|
75
76
|
* Get the data for the newly created notes.
|
|
76
77
|
* @param innerNoteHashes - Inner note hashes for the notes.
|
|
@@ -123,11 +124,12 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
123
124
|
* It can be used in subsequent calls (or transactions when chaining txs is possible).
|
|
124
125
|
* @param contractAddress - The contract address.
|
|
125
126
|
* @param storageSlot - The storage slot.
|
|
127
|
+
* @param noteTypeId - The type ID of the note.
|
|
126
128
|
* @param noteItems - The items to be included in a Note.
|
|
127
129
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
128
130
|
* @returns
|
|
129
131
|
*/
|
|
130
|
-
notifyCreatedNote(storageSlot: Fr, noteItems: Fr[], innerNoteHash: Fr): void;
|
|
132
|
+
notifyCreatedNote(storageSlot: Fr, noteTypeId: Fr, noteItems: Fr[], innerNoteHash: Fr): void;
|
|
131
133
|
/**
|
|
132
134
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
133
135
|
* within the current transaction/execution.
|
|
@@ -139,10 +141,11 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
139
141
|
* Encrypt a note and emit it as a log.
|
|
140
142
|
* @param contractAddress - The contract address of the note.
|
|
141
143
|
* @param storageSlot - The storage slot the note is at.
|
|
144
|
+
* @param noteTypeId - The type ID of the note.
|
|
142
145
|
* @param publicKey - The public key of the account that can decrypt the log.
|
|
143
146
|
* @param log - The log contents.
|
|
144
147
|
*/
|
|
145
|
-
emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, publicKey: Point, log: Fr[]): void;
|
|
148
|
+
emitEncryptedLog(contractAddress: AztecAddress, storageSlot: Fr, noteTypeId: Fr, publicKey: Point, log: Fr[]): void;
|
|
146
149
|
/**
|
|
147
150
|
* Emit an unencrypted log.
|
|
148
151
|
* @param log - The unencrypted log to be emitted.
|
|
@@ -154,9 +157,11 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
154
157
|
* @param functionSelector - The function selector of the function to call.
|
|
155
158
|
* @param argsHash - The packed arguments to pass to the function.
|
|
156
159
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
160
|
+
* @param isStaticCall - Whether the call is a static call.
|
|
161
|
+
* @param isStaticCall - Whether the call is a delegate call.
|
|
157
162
|
* @returns The execution result.
|
|
158
163
|
*/
|
|
159
|
-
callPrivateFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number): Promise<import("@aztec/circuits.js").PrivateCallStackItem>;
|
|
164
|
+
callPrivateFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number, isStaticCall: boolean, isDelegateCall: boolean): Promise<import("@aztec/circuits.js").PrivateCallStackItem>;
|
|
160
165
|
/**
|
|
161
166
|
* Creates a PublicCallStackItem object representing the request to call a public function. No function
|
|
162
167
|
* is actually called, since that must happen on the sequencer side. All the fields related to the result
|
|
@@ -165,9 +170,10 @@ export declare class ClientExecutionContext extends ViewDataOracle {
|
|
|
165
170
|
* @param functionSelector - The function selector of the function to call.
|
|
166
171
|
* @param argsHash - The packed arguments to pass to the function.
|
|
167
172
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
173
|
+
* @param isStaticCall - Whether the call is a static call.
|
|
168
174
|
* @returns The public call stack item with the request information.
|
|
169
175
|
*/
|
|
170
|
-
enqueuePublicFunctionCall(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number): Promise<PublicCallRequest>;
|
|
176
|
+
enqueuePublicFunctionCall(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number, isStaticCall: boolean, isDelegateCall: boolean): Promise<PublicCallRequest>;
|
|
171
177
|
/**
|
|
172
178
|
* Derives the call context for a nested execution.
|
|
173
179
|
* @param targetContractAddress - The address of the contract being called.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,SAAS,EACT,cAAc,EAGd,UAAU,
|
|
1
|
+
{"version":3,"file":"client_execution_context.d.ts","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
var _ClientExecutionContext_instances, _ClientExecutionContext_checkValidStaticCall;
|
|
2
|
+
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
+
import { FunctionL2Logs, L1NotePayload, Note, TaggedNote, } from '@aztec/circuit-types';
|
|
4
|
+
import { CallContext, ContractDeploymentData, FunctionData, FunctionSelector, NoteHashReadRequestMembershipWitness, PublicCallRequest, TxContext, } from '@aztec/circuits.js';
|
|
5
|
+
import { computePublicDataTreeLeafSlot, computeUniqueCommitment, siloNoteHash } from '@aztec/circuits.js/hash';
|
|
4
6
|
import { countArgumentsSize } from '@aztec/foundation/abi';
|
|
5
7
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
8
|
import { createDebugLogger } from '@aztec/foundation/log';
|
|
@@ -18,6 +20,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
18
20
|
/** List of transient auth witnesses to be used during this simulation */
|
|
19
21
|
authWitnesses, packedArgsCache, noteCache, db, curve, node, log = createDebugLogger('aztec:simulator:client_execution_context')) {
|
|
20
22
|
super(contractAddress, authWitnesses, db, node, log);
|
|
23
|
+
_ClientExecutionContext_instances.add(this);
|
|
21
24
|
this.contractAddress = contractAddress;
|
|
22
25
|
this.argsHash = argsHash;
|
|
23
26
|
this.txContext = txContext;
|
|
@@ -83,17 +86,17 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
83
86
|
* or to flag non-transient reads with their leafIndex.
|
|
84
87
|
* The KernelProver will use this to fully populate witnesses and provide hints to
|
|
85
88
|
* the kernel regarding which commitments each transient read request corresponds to.
|
|
86
|
-
* @param
|
|
89
|
+
* @param noteHashReadRequests - SideEffect containing Note hashed of the notes being read and counter.
|
|
87
90
|
* @returns An array of partially filled in read request membership witnesses.
|
|
88
91
|
*/
|
|
89
|
-
|
|
90
|
-
return
|
|
92
|
+
getNoteHashReadRequestPartialWitnesses(noteHashReadRequests) {
|
|
93
|
+
return noteHashReadRequests
|
|
91
94
|
.filter(r => !r.isEmpty())
|
|
92
95
|
.map(r => {
|
|
93
96
|
const index = this.gotNotes.get(r.value.toBigInt());
|
|
94
97
|
return index !== undefined
|
|
95
|
-
?
|
|
96
|
-
:
|
|
98
|
+
? NoteHashReadRequestMembershipWitness.empty(index)
|
|
99
|
+
: NoteHashReadRequestMembershipWitness.emptyTransient();
|
|
97
100
|
});
|
|
98
101
|
}
|
|
99
102
|
/**
|
|
@@ -156,9 +159,9 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
156
159
|
*/
|
|
157
160
|
async getNotes(storageSlot, numSelects, selectBy, selectValues, selectComparators, sortBy, sortOrder, limit, offset, status) {
|
|
158
161
|
// Nullified pending notes are already removed from the list.
|
|
159
|
-
const pendingNotes = this.noteCache.getNotes(this.
|
|
160
|
-
const pendingNullifiers = this.noteCache.getNullifiers(this.
|
|
161
|
-
const dbNotes = await this.db.getNotes(this.
|
|
162
|
+
const pendingNotes = this.noteCache.getNotes(this.callContext.storageContractAddress, storageSlot);
|
|
163
|
+
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.storageContractAddress);
|
|
164
|
+
const dbNotes = await this.db.getNotes(this.callContext.storageContractAddress, storageSlot, status);
|
|
162
165
|
const dbNotesFiltered = dbNotes.filter(n => !pendingNullifiers.has(n.siloedNullifier.value));
|
|
163
166
|
const notes = pickNotes([...dbNotesFiltered, ...pendingNotes], {
|
|
164
167
|
selects: selectBy
|
|
@@ -168,12 +171,12 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
168
171
|
limit,
|
|
169
172
|
offset,
|
|
170
173
|
});
|
|
171
|
-
this.log(`Returning ${notes.length} notes for ${this.
|
|
174
|
+
this.log(`Returning ${notes.length} notes for ${this.callContext.storageContractAddress} at ${storageSlot}: ${notes
|
|
172
175
|
.map(n => `${n.nonce.toString()}:[${n.note.items.map(i => i.toString()).join(',')}]`)
|
|
173
176
|
.join(', ')}`);
|
|
174
177
|
notes.forEach(n => {
|
|
175
178
|
if (n.index !== undefined) {
|
|
176
|
-
const siloedNoteHash =
|
|
179
|
+
const siloedNoteHash = siloNoteHash(n.contractAddress, n.innerNoteHash);
|
|
177
180
|
const uniqueSiloedNoteHash = computeUniqueCommitment(n.nonce, siloedNoteHash);
|
|
178
181
|
// TODO(https://github.com/AztecProtocol/aztec-packages/issues/1386)
|
|
179
182
|
// Should always be uniqueSiloedNoteHash when publicly created notes include nonces.
|
|
@@ -188,14 +191,15 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
188
191
|
* It can be used in subsequent calls (or transactions when chaining txs is possible).
|
|
189
192
|
* @param contractAddress - The contract address.
|
|
190
193
|
* @param storageSlot - The storage slot.
|
|
194
|
+
* @param noteTypeId - The type ID of the note.
|
|
191
195
|
* @param noteItems - The items to be included in a Note.
|
|
192
196
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
193
197
|
* @returns
|
|
194
198
|
*/
|
|
195
|
-
notifyCreatedNote(storageSlot, noteItems, innerNoteHash) {
|
|
199
|
+
notifyCreatedNote(storageSlot, noteTypeId, noteItems, innerNoteHash) {
|
|
196
200
|
const note = new Note(noteItems);
|
|
197
201
|
this.noteCache.addNewNote({
|
|
198
|
-
contractAddress: this.
|
|
202
|
+
contractAddress: this.callContext.storageContractAddress,
|
|
199
203
|
storageSlot,
|
|
200
204
|
nonce: Fr.ZERO, // Nonce cannot be known during private execution.
|
|
201
205
|
note,
|
|
@@ -204,6 +208,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
204
208
|
});
|
|
205
209
|
this.newNotes.push({
|
|
206
210
|
storageSlot,
|
|
211
|
+
noteTypeId,
|
|
207
212
|
note,
|
|
208
213
|
});
|
|
209
214
|
}
|
|
@@ -214,20 +219,22 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
214
219
|
* @param innerNoteHash - The inner note hash of the new note.
|
|
215
220
|
*/
|
|
216
221
|
notifyNullifiedNote(innerNullifier, innerNoteHash) {
|
|
217
|
-
this.noteCache.nullifyNote(this.
|
|
222
|
+
this.noteCache.nullifyNote(this.callContext.storageContractAddress, innerNullifier, innerNoteHash);
|
|
218
223
|
return Promise.resolve();
|
|
219
224
|
}
|
|
220
225
|
/**
|
|
221
226
|
* Encrypt a note and emit it as a log.
|
|
222
227
|
* @param contractAddress - The contract address of the note.
|
|
223
228
|
* @param storageSlot - The storage slot the note is at.
|
|
229
|
+
* @param noteTypeId - The type ID of the note.
|
|
224
230
|
* @param publicKey - The public key of the account that can decrypt the log.
|
|
225
231
|
* @param log - The log contents.
|
|
226
232
|
*/
|
|
227
|
-
emitEncryptedLog(contractAddress, storageSlot, publicKey, log) {
|
|
233
|
+
emitEncryptedLog(contractAddress, storageSlot, noteTypeId, publicKey, log) {
|
|
228
234
|
const note = new Note(log);
|
|
229
|
-
const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot);
|
|
230
|
-
const
|
|
235
|
+
const l1NotePayload = new L1NotePayload(note, contractAddress, storageSlot, noteTypeId);
|
|
236
|
+
const taggedNote = new TaggedNote(l1NotePayload);
|
|
237
|
+
const encryptedNote = taggedNote.toEncryptedBuffer(publicKey, this.curve);
|
|
231
238
|
this.encryptedLogs.push(encryptedNote);
|
|
232
239
|
}
|
|
233
240
|
/**
|
|
@@ -245,16 +252,22 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
245
252
|
* @param functionSelector - The function selector of the function to call.
|
|
246
253
|
* @param argsHash - The packed arguments to pass to the function.
|
|
247
254
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
255
|
+
* @param isStaticCall - Whether the call is a static call.
|
|
256
|
+
* @param isStaticCall - Whether the call is a delegate call.
|
|
248
257
|
* @returns The execution result.
|
|
249
258
|
*/
|
|
250
|
-
async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter) {
|
|
259
|
+
async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
|
|
251
260
|
this.log(`Calling private function ${this.contractAddress}:${functionSelector} from ${this.callContext.storageContractAddress}`);
|
|
261
|
+
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
252
262
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
253
263
|
const targetFunctionData = FunctionData.fromAbi(targetArtifact);
|
|
254
264
|
const derivedTxContext = new TxContext(false, false, false, ContractDeploymentData.empty(), this.txContext.chainId, this.txContext.version);
|
|
255
|
-
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter,
|
|
265
|
+
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter, isDelegateCall, isStaticCall);
|
|
256
266
|
const context = new ClientExecutionContext(targetContractAddress, argsHash, derivedTxContext, derivedCallContext, this.historicalHeader, this.authWitnesses, this.packedArgsCache, this.noteCache, this.db, this.curve, this.node);
|
|
257
267
|
const childExecutionResult = await executePrivateFunction(context, targetArtifact, targetContractAddress, targetFunctionData);
|
|
268
|
+
if (isStaticCall) {
|
|
269
|
+
__classPrivateFieldGet(this, _ClientExecutionContext_instances, "m", _ClientExecutionContext_checkValidStaticCall).call(this, childExecutionResult);
|
|
270
|
+
}
|
|
258
271
|
this.nestedExecutions.push(childExecutionResult);
|
|
259
272
|
return childExecutionResult.callStackItem;
|
|
260
273
|
}
|
|
@@ -266,15 +279,18 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
266
279
|
* @param functionSelector - The function selector of the function to call.
|
|
267
280
|
* @param argsHash - The packed arguments to pass to the function.
|
|
268
281
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
282
|
+
* @param isStaticCall - Whether the call is a static call.
|
|
269
283
|
* @returns The public call stack item with the request information.
|
|
270
284
|
*/
|
|
271
|
-
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter) {
|
|
285
|
+
async enqueuePublicFunctionCall(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall, isDelegateCall) {
|
|
286
|
+
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
272
287
|
const targetArtifact = await this.db.getFunctionArtifact(targetContractAddress, functionSelector);
|
|
273
|
-
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter,
|
|
288
|
+
const derivedCallContext = await this.deriveCallContext(targetContractAddress, targetArtifact, sideEffectCounter, isDelegateCall, isStaticCall);
|
|
274
289
|
const args = this.packedArgsCache.unpack(argsHash);
|
|
275
290
|
const enqueuedRequest = PublicCallRequest.from({
|
|
276
291
|
args,
|
|
277
292
|
callContext: derivedCallContext,
|
|
293
|
+
parentCallContext: this.callContext,
|
|
278
294
|
functionData: FunctionData.fromAbi(targetArtifact),
|
|
279
295
|
contractAddress: targetContractAddress,
|
|
280
296
|
});
|
|
@@ -282,7 +298,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
282
298
|
// side-effect counter, that will leak info about how many other private
|
|
283
299
|
// side-effects occurred in the TX. Ultimately the private kernel should
|
|
284
300
|
// just output everything in the proper order without any counters.
|
|
285
|
-
this.log(`Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}`);
|
|
301
|
+
this.log(`Enqueued call to public function (with side-effect counter #${sideEffectCounter}) ${targetContractAddress}:${functionSelector}(${targetArtifact.name})`);
|
|
286
302
|
this.enqueuedPublicFunctionCalls.push(enqueuedRequest);
|
|
287
303
|
return enqueuedRequest;
|
|
288
304
|
}
|
|
@@ -297,7 +313,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
297
313
|
*/
|
|
298
314
|
async deriveCallContext(targetContractAddress, targetArtifact, startSideEffectCounter, isDelegateCall = false, isStaticCall = false) {
|
|
299
315
|
const portalContractAddress = await this.db.getPortalContractAddress(targetContractAddress);
|
|
300
|
-
return new CallContext(this.contractAddress, targetContractAddress, portalContractAddress, FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters), isDelegateCall, isStaticCall, false, startSideEffectCounter);
|
|
316
|
+
return new CallContext(isDelegateCall ? this.callContext.msgSender : this.contractAddress, isDelegateCall ? this.contractAddress : targetContractAddress, portalContractAddress, FunctionSelector.fromNameAndParameters(targetArtifact.name, targetArtifact.parameters), isDelegateCall, isStaticCall, false, startSideEffectCounter);
|
|
301
317
|
}
|
|
302
318
|
/**
|
|
303
319
|
* Read the public storage data.
|
|
@@ -311,7 +327,7 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
311
327
|
const values = [];
|
|
312
328
|
for (let i = 0n; i < numberOfElements; i++) {
|
|
313
329
|
const storageSlot = new Fr(startStorageSlot.value + i);
|
|
314
|
-
const leafSlot = computePublicDataTreeLeafSlot(this.
|
|
330
|
+
const leafSlot = computePublicDataTreeLeafSlot(this.callContext.storageContractAddress, storageSlot);
|
|
315
331
|
const witness = await this.db.getPublicDataTreeWitness(bn, leafSlot);
|
|
316
332
|
if (!witness) {
|
|
317
333
|
throw new Error(`No witness for slot ${storageSlot.toString()}`);
|
|
@@ -323,4 +339,13 @@ export class ClientExecutionContext extends ViewDataOracle {
|
|
|
323
339
|
return values;
|
|
324
340
|
}
|
|
325
341
|
}
|
|
326
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
342
|
+
_ClientExecutionContext_instances = new WeakSet(), _ClientExecutionContext_checkValidStaticCall = function _ClientExecutionContext_checkValidStaticCall(childExecutionResult) {
|
|
343
|
+
if (childExecutionResult.callStackItem.publicInputs.newNoteHashes.some(item => !item.isEmpty()) ||
|
|
344
|
+
childExecutionResult.callStackItem.publicInputs.newNullifiers.some(item => !item.isEmpty()) ||
|
|
345
|
+
childExecutionResult.callStackItem.publicInputs.newL2ToL1Msgs.some(item => !item.isEmpty()) ||
|
|
346
|
+
!childExecutionResult.callStackItem.publicInputs.encryptedLogPreimagesLength.equals(new Fr(4)) ||
|
|
347
|
+
!childExecutionResult.callStackItem.publicInputs.unencryptedLogPreimagesLength.equals(new Fr(4))) {
|
|
348
|
+
throw new Error(`Static call cannot create new notes, emit L2->L1 messages or generate logs`);
|
|
349
|
+
}
|
|
350
|
+
};
|
|
351
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"client_execution_context.js","sourceRoot":"","sources":["../../src/client/client_execution_context.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { FunctionArtifactWithDebugMetadata, FunctionSelector } from '@aztec/foun
|
|
|
4
4
|
import { AztecAddress } from '@aztec/foundation/aztec-address';
|
|
5
5
|
import { EthAddress } from '@aztec/foundation/eth-address';
|
|
6
6
|
import { Fr } from '@aztec/foundation/fields';
|
|
7
|
+
import { ContractInstance } from '@aztec/types/contracts';
|
|
7
8
|
import { KeyPair, NoteData } from '../acvm/index.js';
|
|
8
9
|
import { CommitmentsDB } from '../public/db.js';
|
|
9
10
|
/**
|
|
@@ -22,6 +23,12 @@ export declare class ContractClassNotFoundError extends Error {
|
|
|
22
23
|
* The database oracle interface.
|
|
23
24
|
*/
|
|
24
25
|
export interface DBOracle extends CommitmentsDB {
|
|
26
|
+
/**
|
|
27
|
+
* Returns a contract instance associated with an address, if available.
|
|
28
|
+
* @param address - Address.
|
|
29
|
+
* @returns A contract instance.
|
|
30
|
+
*/
|
|
31
|
+
getContractInstance(address: AztecAddress): Promise<ContractInstance>;
|
|
25
32
|
/**
|
|
26
33
|
* Retrieve the complete address associated to a given address.
|
|
27
34
|
* @param address - Address to fetch the pubkey for.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db_oracle.d.ts","sourceRoot":"","sources":["../../src/client/db_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,0BAA0B,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACxH,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,iCAAiC,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"db_oracle.d.ts","sourceRoot":"","sources":["../../src/client/db_oracle.ts"],"names":[],"mappings":"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"}
|
package/dest/client/db_oracle.js
CHANGED
|
@@ -14,4 +14,4 @@ export class ContractClassNotFoundError extends Error {
|
|
|
14
14
|
super(`DB has no contract class with id ${contractClassId}`);
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
17
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGJfb3JhY2xlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaWVudC9kYl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBV0E7O0dBRUc7QUFDSCxNQUFNLE9BQU8scUJBQXNCLFNBQVEsS0FBSztJQUM5QyxZQUFZLGVBQXVCO1FBQ2pDLEtBQUssQ0FBQyxtQ0FBbUMsZUFBZSxFQUFFLENBQUMsQ0FBQztJQUM5RCxDQUFDO0NBQ0Y7QUFFRDs7R0FFRztBQUNILE1BQU0sT0FBTywwQkFBMkIsU0FBUSxLQUFLO0lBQ25ELFlBQVksZUFBdUI7UUFDakMsS0FBSyxDQUFDLG9DQUFvQyxlQUFlLEVBQUUsQ0FBQyxDQUFDO0lBQy9ELENBQUM7Q0FDRiJ9
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import { FunctionL2Logs, Note } from '@aztec/circuit-types';
|
|
3
|
-
import { PrivateCallStackItem, PublicCallRequest
|
|
3
|
+
import { NoteHashReadRequestMembershipWitness, PrivateCallStackItem, PublicCallRequest } from '@aztec/circuits.js';
|
|
4
4
|
import { DecodedReturn } from '@aztec/foundation/abi';
|
|
5
5
|
import { Fr } from '@aztec/foundation/fields';
|
|
6
6
|
import { ACVMField } from '../acvm/index.js';
|
|
@@ -12,6 +12,8 @@ export interface NoteAndSlot {
|
|
|
12
12
|
note: Note;
|
|
13
13
|
/** The storage slot of the note. */
|
|
14
14
|
storageSlot: Fr;
|
|
15
|
+
/** The note type identifier. */
|
|
16
|
+
noteTypeId: Fr;
|
|
15
17
|
}
|
|
16
18
|
/**
|
|
17
19
|
* The result of executing a private function.
|
|
@@ -26,7 +28,7 @@ export interface ExecutionResult {
|
|
|
26
28
|
/** The call stack item. */
|
|
27
29
|
callStackItem: PrivateCallStackItem;
|
|
28
30
|
/** The partially filled-in read request membership witnesses for commitments being read. */
|
|
29
|
-
|
|
31
|
+
noteHashReadRequestPartialWitnesses: NoteHashReadRequestMembershipWitness[];
|
|
30
32
|
/** The notes created in the executed function. */
|
|
31
33
|
newNotes: NoteAndSlot[];
|
|
32
34
|
/** The decoded return values of the executed function. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution_result.d.ts","sourceRoot":"","sources":["../../src/client/execution_result.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"execution_result.d.ts","sourceRoot":"","sources":["../../src/client/execution_result.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,oCAAoC,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACnH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,gBAAgB;IAChB,IAAI,EAAE,IAAI,CAAC;IACX,oCAAoC;IACpC,WAAW,EAAE,EAAE,CAAC;IAChB,gCAAgC;IAChC,UAAU,EAAE,EAAE,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE9B,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,2BAA2B;IAC3B,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAEvC,2BAA2B;IAC3B,aAAa,EAAE,oBAAoB,CAAC;IACpC,4FAA4F;IAC5F,mCAAmC,EAAE,oCAAoC,EAAE,CAAC;IAE5E,kDAAkD;IAClD,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,0DAA0D;IAC1D,YAAY,EAAE,aAAa,CAAC;IAC5B,6BAA6B;IAC7B,gBAAgB,EAAE,IAAI,EAAE,CAAC;IACzB,oFAAoF;IACpF,2BAA2B,EAAE,iBAAiB,EAAE,CAAC;IACjD;;;OAGG;IACH,aAAa,EAAE,cAAc,CAAC;IAC9B;;;OAGG;IACH,eAAe,EAAE,cAAc,CAAC;CACjC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,eAAe,GAAG,cAAc,EAAE,CAGlF;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,eAAe,GAAG,cAAc,EAAE,CAGpF;AAED;;;;GAIG;AACH,wBAAgB,kCAAkC,CAAC,UAAU,EAAE,eAAe,GAAG,iBAAiB,EAAE,CAOnG"}
|
|
@@ -29,4 +29,4 @@ export function collectEnqueuedPublicFunctionCalls(execResult) {
|
|
|
29
29
|
...[...execResult.nestedExecutions].flatMap(collectEnqueuedPublicFunctionCalls),
|
|
30
30
|
].sort((a, b) => b.callContext.startSideEffectCounter - a.callContext.startSideEffectCounter);
|
|
31
31
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhlY3V0aW9uX3Jlc3VsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9jbGllbnQvZXhlY3V0aW9uX3Jlc3VsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUF3REE7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxVQUEyQjtJQUM5RCwySEFBMkg7SUFDM0gsT0FBTyxDQUFDLFVBQVUsQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDLG9CQUFvQixDQUFDLENBQUMsQ0FBQztBQUNqSCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxzQkFBc0IsQ0FBQyxVQUEyQjtJQUNoRSwySEFBMkg7SUFDM0gsT0FBTyxDQUFDLFVBQVUsQ0FBQyxlQUFlLEVBQUUsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUMsT0FBTyxFQUFFLENBQUMsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBQUMsQ0FBQztBQUNySCxDQUFDO0FBRUQ7Ozs7R0FJRztBQUNILE1BQU0sVUFBVSxrQ0FBa0MsQ0FBQyxVQUEyQjtJQUM1RSxvRkFBb0Y7SUFDcEYsd0ZBQXdGO0lBQ3hGLE9BQU87UUFDTCxHQUFHLFVBQVUsQ0FBQywyQkFBMkI7UUFDekMsR0FBRyxDQUFDLEdBQUcsVUFBVSxDQUFDLGdCQUFnQixDQUFDLENBQUMsT0FBTyxDQUFDLGtDQUFrQyxDQUFDO0tBQ2hGLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsR0FBRyxDQUFDLENBQUMsV0FBVyxDQUFDLHNCQUFzQixDQUFDLENBQUM7QUFDaEcsQ0FBQyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_execution.d.ts","sourceRoot":"","sources":["../../src/client/private_execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoD,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAQ/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,iCAAiC,EAC3C,eAAe,EAAE,YAAY,EAC7B,YAAY,EAAE,YAAY,EAC1B,GAAG,8CAAwD,GAC1D,OAAO,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"private_execution.d.ts","sourceRoot":"","sources":["../../src/client/private_execution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoD,MAAM,oBAAoB,CAAC;AACpG,OAAO,EAAE,iCAAiC,EAAsB,MAAM,uBAAuB,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAQ/D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,iCAAiC,EAC3C,eAAe,EAAE,YAAY,EAC7B,YAAY,EAAE,YAAY,EAC1B,GAAG,8CAAwD,GAC1D,OAAO,CAAC,eAAe,CAAC,CAuD1B"}
|
|
@@ -12,7 +12,7 @@ import { AcirSimulator } from './simulator.js';
|
|
|
12
12
|
*/
|
|
13
13
|
export async function executePrivateFunction(context, artifact, contractAddress, functionData, log = createDebugLogger('aztec:simulator:secret_execution')) {
|
|
14
14
|
const functionSelector = functionData.selector;
|
|
15
|
-
log(`Executing external function ${contractAddress}:${functionSelector}`);
|
|
15
|
+
log(`Executing external function ${contractAddress}:${functionSelector}(${artifact.name})`);
|
|
16
16
|
const acir = Buffer.from(artifact.bytecode, 'base64');
|
|
17
17
|
const initialWitness = context.getInitialWitness(artifact);
|
|
18
18
|
const acvmCallback = new Oracle(context);
|
|
@@ -33,7 +33,7 @@ export async function executePrivateFunction(context, artifact, contractAddress,
|
|
|
33
33
|
publicInputs.unencryptedLogPreimagesLength = new Fr(unencryptedLogs.getSerializedLength());
|
|
34
34
|
const callStackItem = new PrivateCallStackItem(contractAddress, functionData, publicInputs);
|
|
35
35
|
const returnValues = decodeReturnValues(artifact, publicInputs.returnValues);
|
|
36
|
-
const
|
|
36
|
+
const noteHashReadRequestPartialWitnesses = context.getNoteHashReadRequestPartialWitnesses(publicInputs.noteHashReadRequests);
|
|
37
37
|
const newNotes = context.getNewNotes();
|
|
38
38
|
const nestedExecutions = context.getNestedExecutions();
|
|
39
39
|
const enqueuedPublicFunctionCalls = context.getEnqueuedPublicFunctionCalls();
|
|
@@ -43,7 +43,7 @@ export async function executePrivateFunction(context, artifact, contractAddress,
|
|
|
43
43
|
partialWitness,
|
|
44
44
|
callStackItem,
|
|
45
45
|
returnValues,
|
|
46
|
-
|
|
46
|
+
noteHashReadRequestPartialWitnesses,
|
|
47
47
|
newNotes,
|
|
48
48
|
vk: Buffer.from(artifact.verificationKey, 'hex'),
|
|
49
49
|
nestedExecutions,
|
|
@@ -52,4 +52,4 @@ export async function executePrivateFunction(context, artifact, contractAddress,
|
|
|
52
52
|
unencryptedLogs,
|
|
53
53
|
};
|
|
54
54
|
}
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY2xpZW50L3ByaXZhdGVfZXhlY3V0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBZ0Isb0JBQW9CLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUNwRyxPQUFPLEVBQXFDLGtCQUFrQixFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFOUYsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBQzlDLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBQzFELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUV4RCxPQUFPLEVBQUUsb0JBQW9CLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM5RCxPQUFPLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBQ2xFLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUdyRCxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFL0M7O0dBRUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLHNCQUFzQixDQUMxQyxPQUErQixFQUMvQixRQUEyQyxFQUMzQyxlQUE2QixFQUM3QixZQUEwQixFQUMxQixHQUFHLEdBQUcsaUJBQWlCLENBQUMsa0NBQWtDLENBQUM7SUFFM0QsTUFBTSxnQkFBZ0IsR0FBRyxZQUFZLENBQUMsUUFBUSxDQUFDO0lBQy9DLEdBQUcsQ0FBQywrQkFBK0IsZUFBZSxJQUFJLGdCQUFnQixJQUFJLFFBQVEsQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDO0lBQzVGLE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsRUFBRSxRQUFRLENBQUMsQ0FBQztJQUN0RCxNQUFN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
|