@aztec/pxe 0.0.1-commit.934299a21 → 0.0.1-commit.949a33fd8
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/bin/check_oracle_version.js +4 -4
- package/dest/block_synchronizer/block_stream_source.d.ts +10 -0
- package/dest/block_synchronizer/block_stream_source.d.ts.map +1 -0
- package/dest/block_synchronizer/block_stream_source.js +37 -0
- package/dest/block_synchronizer/block_synchronizer.d.ts +6 -2
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +30 -10
- package/dest/config/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +8 -15
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +13 -5
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +39 -13
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts +28 -0
- package/dest/contract_function_simulator/ephemeral_array_service.d.ts.map +1 -0
- package/dest/contract_function_simulator/ephemeral_array_service.js +78 -0
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts +7 -7
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +19 -11
- package/dest/contract_function_simulator/index.d.ts +2 -1
- package/dest/contract_function_simulator/index.d.ts.map +1 -1
- package/dest/contract_function_simulator/index.js +1 -0
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts +4 -6
- package/dest/contract_function_simulator/noir-structs/event_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/event_validation_request.js +8 -10
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.d.ts +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_request.js +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts +2 -2
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/log_retrieval_response.js +2 -4
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts +4 -7
- package/dest/contract_function_simulator/noir-structs/note_validation_request.d.ts.map +1 -1
- package/dest/contract_function_simulator/noir-structs/note_validation_request.js +6 -11
- package/dest/contract_function_simulator/oracle/interfaces.d.ts +63 -45
- package/dest/contract_function_simulator/oracle/interfaces.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts +9 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.d.ts.map +1 -0
- package/dest/contract_function_simulator/oracle/legacy_oracle_mappings.js +47 -0
- package/dest/contract_function_simulator/oracle/oracle.d.ts +76 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +288 -96
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +32 -59
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +67 -86
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +100 -60
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +326 -111
- package/dest/contract_function_simulator/pick_notes.d.ts +1 -1
- package/dest/contract_function_simulator/pick_notes.d.ts.map +1 -1
- package/dest/contract_function_simulator/pick_notes.js +20 -3
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.d.ts.map +1 -1
- package/dest/contract_function_simulator/proxied_contract_data_source.js +3 -0
- package/dest/contract_logging.d.ts +9 -4
- package/dest/contract_logging.d.ts.map +1 -1
- package/dest/contract_logging.js +21 -6
- package/dest/contract_sync/contract_sync_service.d.ts +6 -5
- package/dest/contract_sync/contract_sync_service.d.ts.map +1 -1
- package/dest/contract_sync/contract_sync_service.js +62 -43
- package/dest/contract_sync/helpers.d.ts +2 -3
- package/dest/contract_sync/helpers.d.ts.map +1 -1
- package/dest/contract_sync/helpers.js +7 -2
- package/dest/debug/pxe_debug_utils.d.ts +3 -3
- package/dest/debug/pxe_debug_utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.d.ts +1 -2
- package/dest/entrypoints/client/bundle/index.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/index.js +0 -1
- package/dest/entrypoints/client/bundle/utils.d.ts +2 -2
- package/dest/entrypoints/client/bundle/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/bundle/utils.js +2 -2
- package/dest/entrypoints/client/lazy/index.d.ts +1 -2
- package/dest/entrypoints/client/lazy/index.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/index.js +0 -1
- package/dest/entrypoints/client/lazy/utils.d.ts +2 -2
- package/dest/entrypoints/client/lazy/utils.d.ts.map +1 -1
- package/dest/entrypoints/client/lazy/utils.js +2 -2
- package/dest/entrypoints/pxe_creation_options.d.ts +3 -1
- package/dest/entrypoints/pxe_creation_options.d.ts.map +1 -1
- package/dest/entrypoints/pxe_creation_options.js +3 -1
- package/dest/entrypoints/server/index.d.ts +2 -3
- package/dest/entrypoints/server/index.d.ts.map +1 -1
- package/dest/entrypoints/server/index.js +1 -2
- package/dest/entrypoints/server/utils.d.ts +2 -2
- package/dest/entrypoints/server/utils.d.ts.map +1 -1
- package/dest/entrypoints/server/utils.js +2 -2
- package/dest/events/event_service.d.ts +3 -2
- package/dest/events/event_service.d.ts.map +1 -1
- package/dest/events/event_service.js +26 -5
- package/dest/events/private_event_filter_validator.d.ts +3 -2
- package/dest/events/private_event_filter_validator.d.ts.map +1 -1
- package/dest/events/private_event_filter_validator.js +15 -0
- package/dest/logs/log_service.d.ts +7 -8
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +29 -39
- package/dest/messages/message_context_service.d.ts +17 -0
- package/dest/messages/message_context_service.d.ts.map +1 -0
- package/dest/messages/message_context_service.js +36 -0
- package/dest/notes/note_service.d.ts +4 -5
- package/dest/notes/note_service.d.ts.map +1 -1
- package/dest/notes/note_service.js +14 -5
- package/dest/notes_filter.d.ts +2 -3
- package/dest/notes_filter.d.ts.map +1 -1
- package/dest/oracle_version.d.ts +4 -3
- package/dest/oracle_version.d.ts.map +1 -1
- package/dest/oracle_version.js +20 -10
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +4 -7
- package/dest/private_kernel/private_kernel_oracle.d.ts +5 -5
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_oracle.js +12 -15
- package/dest/pxe.d.ts +25 -10
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +91 -42
- package/dest/storage/anchor_block_store/anchor_block_store.js +1 -1
- package/dest/storage/capsule_store/capsule_service.d.ts +21 -0
- package/dest/storage/capsule_store/capsule_service.d.ts.map +1 -0
- package/dest/storage/capsule_store/capsule_service.js +50 -0
- package/dest/storage/capsule_store/capsule_store.d.ts +9 -9
- package/dest/storage/capsule_store/capsule_store.d.ts.map +1 -1
- package/dest/storage/capsule_store/capsule_store.js +36 -28
- package/dest/storage/capsule_store/index.d.ts +2 -1
- package/dest/storage/capsule_store/index.d.ts.map +1 -1
- package/dest/storage/capsule_store/index.js +1 -0
- package/dest/storage/contract_store/contract_store.d.ts +1 -1
- package/dest/storage/contract_store/contract_store.d.ts.map +1 -1
- package/dest/storage/contract_store/contract_store.js +4 -2
- package/dest/storage/metadata.d.ts +1 -1
- package/dest/storage/metadata.js +1 -1
- package/dest/storage/note_store/note_store.d.ts +1 -1
- package/dest/storage/note_store/note_store.d.ts.map +1 -1
- package/dest/storage/note_store/note_store.js +2 -2
- package/dest/storage/private_event_store/private_event_store.d.ts +1 -1
- package/dest/storage/private_event_store/private_event_store.d.ts.map +1 -1
- package/dest/storage/private_event_store/private_event_store.js +3 -0
- package/dest/storage/private_event_store/stored_private_event.js +1 -1
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts +6 -6
- package/dest/storage/tagging_store/recipient_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.d.ts +29 -28
- package/dest/storage/tagging_store/sender_tagging_store.d.ts.map +1 -1
- package/dest/storage/tagging_store/sender_tagging_store.js +141 -115
- package/dest/tagging/index.d.ts +3 -3
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/index.js +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts +4 -5
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.js +4 -18
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts +6 -7
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.d.ts.map +1 -1
- package/dest/tagging/recipient_sync/utils/load_logs_for_range.js +12 -11
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +4 -8
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +13 -7
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts +4 -3
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/get_status_change_of_pending.js +20 -10
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts +5 -7
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.js +36 -24
- package/package.json +16 -16
- package/src/bin/check_oracle_version.ts +4 -4
- package/src/block_synchronizer/block_stream_source.ts +52 -0
- package/src/block_synchronizer/block_synchronizer.ts +33 -11
- package/src/config/index.ts +3 -9
- package/src/contract_function_simulator/contract_function_simulator.ts +52 -16
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +19 -14
- package/src/contract_function_simulator/index.ts +1 -0
- package/src/contract_function_simulator/noir-structs/event_validation_request.ts +9 -9
- package/src/contract_function_simulator/noir-structs/log_retrieval_request.ts +1 -1
- package/src/contract_function_simulator/noir-structs/log_retrieval_response.ts +2 -5
- package/src/contract_function_simulator/noir-structs/note_validation_request.ts +4 -10
- package/src/contract_function_simulator/oracle/interfaces.ts +91 -53
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +377 -139
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +87 -109
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +530 -148
- package/src/contract_function_simulator/pick_notes.ts +22 -3
- package/src/contract_function_simulator/proxied_contract_data_source.ts +8 -1
- package/src/contract_logging.ts +18 -5
- package/src/contract_sync/contract_sync_service.ts +99 -75
- package/src/contract_sync/helpers.ts +4 -4
- package/src/debug/pxe_debug_utils.ts +3 -3
- package/src/entrypoints/client/bundle/index.ts +0 -1
- package/src/entrypoints/client/bundle/utils.ts +2 -3
- package/src/entrypoints/client/lazy/index.ts +0 -1
- package/src/entrypoints/client/lazy/utils.ts +2 -3
- package/src/entrypoints/pxe_creation_options.ts +7 -0
- package/src/entrypoints/server/index.ts +1 -2
- package/src/entrypoints/server/utils.ts +2 -3
- package/src/events/event_service.ts +30 -5
- package/src/events/private_event_filter_validator.ts +21 -1
- package/src/logs/log_service.ts +59 -75
- package/src/messages/message_context_service.ts +44 -0
- package/src/notes/note_service.ts +18 -8
- package/src/notes_filter.ts +1 -3
- package/src/oracle_version.ts +20 -10
- package/src/private_kernel/private_kernel_execution_prover.ts +4 -9
- package/src/private_kernel/private_kernel_oracle.ts +14 -14
- package/src/pxe.ts +153 -53
- package/src/storage/anchor_block_store/anchor_block_store.ts +1 -1
- package/src/storage/capsule_store/capsule_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +44 -26
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/contract_store/contract_store.ts +8 -6
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +2 -5
- package/src/storage/private_event_store/private_event_store.ts +4 -0
- package/src/storage/private_event_store/stored_private_event.ts +1 -1
- package/src/storage/tagging_store/recipient_tagging_store.ts +9 -5
- package/src/storage/tagging_store/sender_tagging_store.ts +185 -138
- package/src/tagging/index.ts +2 -2
- package/src/tagging/recipient_sync/load_private_logs_for_sender_recipient_pair.ts +8 -21
- package/src/tagging/recipient_sync/utils/load_logs_for_range.ts +10 -15
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +23 -10
- package/src/tagging/sender_sync/utils/get_status_change_of_pending.ts +26 -11
- package/src/tagging/sender_sync/utils/load_and_store_new_tagging_indexes.ts +27 -26
- package/dest/access_scopes.d.ts +0 -9
- package/dest/access_scopes.d.ts.map +0 -1
- package/dest/access_scopes.js +0 -6
- package/src/access_scopes.ts +0 -9
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
2
|
-
import { type CircuitSimulator } from '@aztec/simulator/client';
|
|
3
2
|
import { type FunctionAbi, type FunctionCall, FunctionSelector, type NoteSelector } from '@aztec/stdlib/abi';
|
|
4
3
|
import { AztecAddress } from '@aztec/stdlib/aztec-address';
|
|
5
4
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
6
|
-
import { type ContractClassLog, type
|
|
5
|
+
import { type ContractClassLog, type TaggingIndexRange } from '@aztec/stdlib/logs';
|
|
7
6
|
import { Tag } from '@aztec/stdlib/logs';
|
|
8
7
|
import { type NoteStatus } from '@aztec/stdlib/note';
|
|
9
8
|
import { CallContext, CountedContractClassLog, NoteAndSlot, PrivateCallExecutionResult, type TxContext } from '@aztec/stdlib/tx';
|
|
10
|
-
import type { AccessScopes } from '../../access_scopes.js';
|
|
11
|
-
import type { ContractSyncService } from '../../contract_sync/contract_sync_service.js';
|
|
12
9
|
import type { SenderTaggingStore } from '../../storage/tagging_store/sender_tagging_store.js';
|
|
13
10
|
import type { ExecutionNoteCache } from '../execution_note_cache.js';
|
|
14
11
|
import { ExecutionTaggingIndexCache } from '../execution_tagging_index_cache.js';
|
|
@@ -21,16 +18,14 @@ export type PrivateExecutionOracleArgs = Omit<UtilityExecutionOracleArgs, 'contr
|
|
|
21
18
|
txContext: TxContext;
|
|
22
19
|
callContext: CallContext;
|
|
23
20
|
/** Needed to trigger contract synchronization before nested calls */
|
|
24
|
-
utilityExecutor: (call: FunctionCall, scopes:
|
|
21
|
+
utilityExecutor: (call: FunctionCall, scopes: AztecAddress[]) => Promise<void>;
|
|
25
22
|
executionCache: HashedValuesCache;
|
|
26
23
|
noteCache: ExecutionNoteCache;
|
|
27
24
|
taggingIndexCache: ExecutionTaggingIndexCache;
|
|
28
25
|
senderTaggingStore: SenderTaggingStore;
|
|
29
|
-
contractSyncService: ContractSyncService;
|
|
30
26
|
totalPublicCalldataCount?: number;
|
|
31
27
|
sideEffectCounter?: number;
|
|
32
28
|
senderForTags?: AztecAddress;
|
|
33
|
-
simulator?: CircuitSimulator;
|
|
34
29
|
};
|
|
35
30
|
/**
|
|
36
31
|
* The execution oracle for the private part of a transaction.
|
|
@@ -49,7 +44,6 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
49
44
|
private newNotes;
|
|
50
45
|
private noteHashNullifierCounterMap;
|
|
51
46
|
private contractClassLogs;
|
|
52
|
-
private offchainEffects;
|
|
53
47
|
private nestedExecutionResults;
|
|
54
48
|
private readonly argsHash;
|
|
55
49
|
private readonly txContext;
|
|
@@ -59,11 +53,12 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
59
53
|
private readonly noteCache;
|
|
60
54
|
private readonly taggingIndexCache;
|
|
61
55
|
private readonly senderTaggingStore;
|
|
62
|
-
private readonly contractSyncService;
|
|
63
56
|
private totalPublicCalldataCount;
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
private readonly
|
|
57
|
+
private readonly initialSideEffectCounter;
|
|
58
|
+
/** Sender for tags passed in at oracle construction time. Returned by `getSenderForTags` unless overridden. */
|
|
59
|
+
private readonly defaultSenderForTags;
|
|
60
|
+
/** Per-call sender-for-tags override, set by `setSenderForTags`. Takes precedence over `defaultSenderForTags`. */
|
|
61
|
+
private currentSenderForTags;
|
|
67
62
|
constructor(args: PrivateExecutionOracleArgs);
|
|
68
63
|
getPrivateContextInputs(): PrivateContextInputs;
|
|
69
64
|
/**
|
|
@@ -82,15 +77,9 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
82
77
|
*/
|
|
83
78
|
getContractClassLogs(): CountedContractClassLog[];
|
|
84
79
|
/**
|
|
85
|
-
*
|
|
80
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
86
81
|
*/
|
|
87
|
-
|
|
88
|
-
data: Fr[];
|
|
89
|
-
}[];
|
|
90
|
-
/**
|
|
91
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
92
|
-
*/
|
|
93
|
-
getUsedPreTags(): PreTag[];
|
|
82
|
+
getUsedTaggingIndexRanges(): TaggingIndexRange[];
|
|
94
83
|
/**
|
|
95
84
|
* Return the nested execution results during this execution.
|
|
96
85
|
*/
|
|
@@ -102,10 +91,9 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
102
91
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
103
92
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
104
93
|
*
|
|
105
|
-
*
|
|
106
|
-
* 'senderForTags' value (unless it is replaced).
|
|
94
|
+
* Returns `currentSenderForTags` if set (via `setSenderForTags`), otherwise `defaultSenderForTags`.
|
|
107
95
|
*/
|
|
108
|
-
|
|
96
|
+
getSenderForTags(): Promise<AztecAddress | undefined>;
|
|
109
97
|
/**
|
|
110
98
|
* Set the sender for tags.
|
|
111
99
|
*
|
|
@@ -113,31 +101,30 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
113
101
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
114
102
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
115
103
|
*
|
|
116
|
-
*
|
|
117
|
-
*
|
|
118
|
-
* value (unless it is replaced by another call to this setter).
|
|
104
|
+
* Overrides `defaultSenderForTags` for the remainder of this call. Each oracle instance is
|
|
105
|
+
* independent, so this has no effect on any other call in the execution.
|
|
119
106
|
*/
|
|
120
|
-
|
|
107
|
+
setSenderForTags(senderForTags: AztecAddress): Promise<void>;
|
|
121
108
|
/**
|
|
122
109
|
* Returns the next app tag for a given sender and recipient pair.
|
|
123
110
|
* @param sender - The address sending the log
|
|
124
111
|
* @param recipient - The address receiving the log
|
|
125
112
|
* @returns An app tag to be used in a log.
|
|
126
113
|
*/
|
|
127
|
-
|
|
114
|
+
getNextAppTagAsSender(sender: AztecAddress, recipient: AztecAddress): Promise<Tag>;
|
|
128
115
|
/**
|
|
129
116
|
* Store values in the execution cache.
|
|
130
117
|
* @param values - Values to store.
|
|
131
118
|
* @returns The hash of the values.
|
|
132
119
|
*/
|
|
133
|
-
|
|
120
|
+
setHashPreimage(values: Fr[], hash: Fr): void;
|
|
134
121
|
/**
|
|
135
122
|
* Gets values from the execution cache.
|
|
136
123
|
* @param hash - Hash of the values.
|
|
137
124
|
* @returns The values.
|
|
138
125
|
*/
|
|
139
|
-
|
|
140
|
-
|
|
126
|
+
getHashPreimage(hash: Fr): Promise<Fr[]>;
|
|
127
|
+
doesNullifierExist(innerNullifier: Fr): Promise<boolean>;
|
|
141
128
|
/**
|
|
142
129
|
* Gets some notes for a storage slot.
|
|
143
130
|
*
|
|
@@ -159,7 +146,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
159
146
|
* @param status - The status of notes to fetch.
|
|
160
147
|
* @returns Array of note data.
|
|
161
148
|
*/
|
|
162
|
-
|
|
149
|
+
getNotes(owner: AztecAddress | undefined, storageSlot: Fr, numSelects: number, selectByIndexes: number[], selectByOffsets: number[], selectByLengths: number[], selectValues: Fr[], selectComparators: number[], sortByIndexes: number[], sortByOffsets: number[], sortByLengths: number[], sortOrder: number[], limit: number, offset: number, status: NoteStatus): Promise<NoteData[]>;
|
|
163
150
|
/**
|
|
164
151
|
* Keep track of the new note created during execution.
|
|
165
152
|
* It can be used in subsequent calls (or transactions when chaining txs is possible).
|
|
@@ -171,29 +158,29 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
171
158
|
* @param noteHash - A hash of the new note.
|
|
172
159
|
* @returns
|
|
173
160
|
*/
|
|
174
|
-
|
|
161
|
+
notifyCreatedNote(owner: AztecAddress, storageSlot: Fr, randomness: Fr, noteTypeId: NoteSelector, noteItems: Fr[], noteHash: Fr, counter: number): void;
|
|
175
162
|
/**
|
|
176
163
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
177
164
|
* within the current transaction/execution.
|
|
178
165
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
179
166
|
* @param noteHash - A hash of the new note.
|
|
180
167
|
*/
|
|
181
|
-
|
|
168
|
+
notifyNullifiedNote(innerNullifier: Fr, noteHash: Fr, counter: number): Promise<void>;
|
|
182
169
|
/**
|
|
183
170
|
* Adding a siloed nullifier into the current set of all pending nullifiers created
|
|
184
171
|
* within the current transaction/execution.
|
|
185
172
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
186
173
|
* @param noteHash - A hash of the new note.
|
|
187
174
|
*/
|
|
188
|
-
|
|
175
|
+
notifyCreatedNullifier(innerNullifier: Fr): Promise<void>;
|
|
189
176
|
/**
|
|
190
|
-
* Check if a nullifier has been emitted in the same transaction, i.e. if
|
|
177
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
191
178
|
* called for this inner nullifier from the contract with the specified address.
|
|
192
179
|
* @param innerNullifier - The inner nullifier to check.
|
|
193
180
|
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
194
181
|
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
195
182
|
*/
|
|
196
|
-
|
|
183
|
+
isNullifierPending(innerNullifier: Fr, contractAddress: AztecAddress): Promise<boolean>;
|
|
197
184
|
/**
|
|
198
185
|
* Emit a contract class log.
|
|
199
186
|
* This fn exists because we only carry a poseidon hash through the kernels, and need to
|
|
@@ -201,7 +188,7 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
201
188
|
* @param log - The contract class log to be emitted.
|
|
202
189
|
* @param counter - The contract class log's counter.
|
|
203
190
|
*/
|
|
204
|
-
|
|
191
|
+
notifyCreatedContractClassLog(log: ContractClassLog, counter: number): void;
|
|
205
192
|
/**
|
|
206
193
|
* Calls a private function as a nested execution.
|
|
207
194
|
* @param targetContractAddress - The address of the contract to call.
|
|
@@ -211,30 +198,16 @@ export declare class PrivateExecutionOracle extends UtilityExecutionOracle imple
|
|
|
211
198
|
* @param isStaticCall - Whether the call is a static call.
|
|
212
199
|
* @returns The execution result.
|
|
213
200
|
*/
|
|
214
|
-
|
|
201
|
+
callPrivateFunction(targetContractAddress: AztecAddress, functionSelector: FunctionSelector, argsHash: Fr, sideEffectCounter: number, isStaticCall: boolean): Promise<{
|
|
215
202
|
endSideEffectCounter: Fr;
|
|
216
203
|
returnsHash: Fr;
|
|
217
204
|
}>;
|
|
218
|
-
/**
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
224
|
-
*/
|
|
225
|
-
privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
226
|
-
/**
|
|
227
|
-
* Verify relevant information when a public teardown function is set.
|
|
228
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
229
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
230
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
231
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
232
|
-
*/
|
|
233
|
-
privateNotifySetPublicTeardownFunctionCall(_targetContractAddress: AztecAddress, calldataHash: Fr, _sideEffectCounter: number, _isStaticCall: boolean): Promise<void>;
|
|
234
|
-
privateNotifySetMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
235
|
-
privateIsSideEffectCounterRevertible(sideEffectCounter: number): Promise<boolean>;
|
|
205
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */
|
|
206
|
+
assertValidPublicCalldata(calldataHash: Fr): Promise<void>;
|
|
207
|
+
getTotalPublicCalldataCount(): number;
|
|
208
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter: number): Promise<void>;
|
|
209
|
+
isExecutionInRevertiblePhase(sideEffectCounter: number): Promise<boolean>;
|
|
236
210
|
private deriveCallContext;
|
|
237
211
|
getDebugFunctionName(): Promise<string>;
|
|
238
|
-
utilityEmitOffchainEffect(data: Fr[]): Promise<void>;
|
|
239
212
|
}
|
|
240
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
213
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9leGVjdXRpb25fb3JhY2xlLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29udHJhY3RfZnVuY3Rpb25fc2ltdWxhdG9yL29yYWNsZS9wcml2YXRlX2V4ZWN1dGlvbl9vcmFjbGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLGdDQUFnQyxDQUFDO0FBSXBELE9BQU8sRUFDTCxLQUFLLFdBQVcsRUFFaEIsS0FBSyxZQUFZLEVBQ2pCLGdCQUFnQixFQUNoQixLQUFLLFlBQVksRUFFbEIsTUFBTSxtQkFBbUIsQ0FBQztBQUMzQixPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFFM0QsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDNUQsT0FBTyxFQUFFLEtBQUssZ0JBQWdCLEVBQXVDLEtBQUssaUJBQWlCLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUN4SCxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDekMsT0FBTyxFQUFRLEtBQUssVUFBVSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFDM0QsT0FBTyxFQUNMLFdBQVcsRUFDWCx1QkFBdUIsRUFDdkIsV0FBVyxFQUNYLDBCQUEwQixFQUMxQixLQUFLLFNBQVMsRUFDZixNQUFNLGtCQUFrQixDQUFDO0FBRzFCLE9BQU8sS0FBSyxFQUFFLGtCQUFrQixFQUFFLE1BQU0scURBQXFELENBQUM7QUFFOUYsT0FBTyxLQUFLLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUNqRixPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDJCQUEyQixDQUFDO0FBRW5FLE9BQU8sS0FBSyxFQUFFLHVCQUF1QixFQUFFLFFBQVEsRUFBRSxNQUFN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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"private_execution_oracle.d.ts","sourceRoot":"","sources":["../../../src/contract_function_simulator/oracle/private_execution_oracle.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { toACVMWitness } from '@aztec/simulator/client';
|
|
|
6
6
|
import { FunctionSelector, countArgumentsSize } from '@aztec/stdlib/abi';
|
|
7
7
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
8
8
|
import { PrivateContextInputs } from '@aztec/stdlib/kernel';
|
|
9
|
-
import {
|
|
9
|
+
import { ExtendedDirectionalAppTaggingSecret } from '@aztec/stdlib/logs';
|
|
10
10
|
import { Tag } from '@aztec/stdlib/logs';
|
|
11
11
|
import { Note } from '@aztec/stdlib/note';
|
|
12
12
|
import { CallContext, CountedContractClassLog, NoteAndSlot } from '@aztec/stdlib/tx';
|
|
@@ -29,7 +29,6 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
29
29
|
*/ newNotes = [];
|
|
30
30
|
noteHashNullifierCounterMap = new Map();
|
|
31
31
|
contractClassLogs = [];
|
|
32
|
-
offchainEffects = [];
|
|
33
32
|
nestedExecutionResults = [];
|
|
34
33
|
argsHash;
|
|
35
34
|
txContext;
|
|
@@ -39,11 +38,10 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
39
38
|
noteCache;
|
|
40
39
|
taggingIndexCache;
|
|
41
40
|
senderTaggingStore;
|
|
42
|
-
contractSyncService;
|
|
43
41
|
totalPublicCalldataCount;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
42
|
+
initialSideEffectCounter;
|
|
43
|
+
/** Sender for tags passed in at oracle construction time. Returned by `getSenderForTags` unless overridden. */ defaultSenderForTags;
|
|
44
|
+
/** Per-call sender-for-tags override, set by `setSenderForTags`. Takes precedence over `defaultSenderForTags`. */ currentSenderForTags;
|
|
47
45
|
constructor(args){
|
|
48
46
|
super({
|
|
49
47
|
...args,
|
|
@@ -58,14 +56,12 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
58
56
|
this.noteCache = args.noteCache;
|
|
59
57
|
this.taggingIndexCache = args.taggingIndexCache;
|
|
60
58
|
this.senderTaggingStore = args.senderTaggingStore;
|
|
61
|
-
this.contractSyncService = args.contractSyncService;
|
|
62
59
|
this.totalPublicCalldataCount = args.totalPublicCalldataCount ?? 0;
|
|
63
|
-
this.
|
|
64
|
-
this.
|
|
65
|
-
this.simulator = args.simulator;
|
|
60
|
+
this.initialSideEffectCounter = args.sideEffectCounter ?? 0;
|
|
61
|
+
this.defaultSenderForTags = args.senderForTags;
|
|
66
62
|
}
|
|
67
63
|
getPrivateContextInputs() {
|
|
68
|
-
return new PrivateContextInputs(this.callContext, this.anchorBlockHeader, this.txContext, this.
|
|
64
|
+
return new PrivateContextInputs(this.callContext, this.anchorBlockHeader, this.txContext, this.initialSideEffectCounter);
|
|
69
65
|
}
|
|
70
66
|
// We still need this function until we can get user-defined ordering of structs for fn arguments
|
|
71
67
|
// TODO When that is sorted out on noir side, we can use instead the utilities in serialize.ts
|
|
@@ -103,14 +99,9 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
103
99
|
return this.contractClassLogs;
|
|
104
100
|
}
|
|
105
101
|
/**
|
|
106
|
-
*
|
|
107
|
-
*/
|
|
108
|
-
return this.
|
|
109
|
-
}
|
|
110
|
-
/**
|
|
111
|
-
* Returns the pre-tags that were used in this execution (and that need to be stored in the db).
|
|
112
|
-
*/ getUsedPreTags() {
|
|
113
|
-
return this.taggingIndexCache.getUsedPreTags();
|
|
102
|
+
* Returns the tagging index ranges that were used in this execution (and that need to be stored in the db).
|
|
103
|
+
*/ getUsedTaggingIndexRanges() {
|
|
104
|
+
return this.taggingIndexCache.getUsedTaggingIndexRanges();
|
|
114
105
|
}
|
|
115
106
|
/**
|
|
116
107
|
* Return the nested execution results during this execution.
|
|
@@ -124,10 +115,9 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
124
115
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
125
116
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
126
117
|
*
|
|
127
|
-
*
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return Promise.resolve(this.senderForTags);
|
|
118
|
+
* Returns `currentSenderForTags` if set (via `setSenderForTags`), otherwise `defaultSenderForTags`.
|
|
119
|
+
*/ getSenderForTags() {
|
|
120
|
+
return Promise.resolve(this.currentSenderForTags ?? this.defaultSenderForTags);
|
|
131
121
|
}
|
|
132
122
|
/**
|
|
133
123
|
* Set the sender for tags.
|
|
@@ -136,11 +126,11 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
136
126
|
* for a tag in order to emit a log. Constrained tagging should not use this as there is no
|
|
137
127
|
* guarantee that the recipient knows about the sender, and hence about the shared secret.
|
|
138
128
|
*
|
|
139
|
-
*
|
|
140
|
-
*
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
this.
|
|
129
|
+
* Overrides `defaultSenderForTags` for the remainder of this call. Each oracle instance is
|
|
130
|
+
* independent, so this has no effect on any other call in the execution.
|
|
131
|
+
*/ setSenderForTags(senderForTags) {
|
|
132
|
+
this.logger.debug(`Sender for tags switched to ${senderForTags} by contract ${this.contractAddress} (default was ${this.defaultSenderForTags})`);
|
|
133
|
+
this.currentSenderForTags = senderForTags;
|
|
144
134
|
return Promise.resolve();
|
|
145
135
|
}
|
|
146
136
|
/**
|
|
@@ -148,20 +138,29 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
148
138
|
* @param sender - The address sending the log
|
|
149
139
|
* @param recipient - The address receiving the log
|
|
150
140
|
* @returns An app tag to be used in a log.
|
|
151
|
-
*/ async
|
|
152
|
-
const
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
141
|
+
*/ async getNextAppTagAsSender(sender, recipient) {
|
|
142
|
+
const extendedSecret = await this.#calculateExtendedDirectionalAppTaggingSecret(this.contractAddress, sender, recipient);
|
|
143
|
+
if (!extendedSecret) {
|
|
144
|
+
// We'd only fail to compute an extended secret if the recipient is an invalid address. To prevent
|
|
145
|
+
// king-of-the-hill attacks, instead of failing we use a random tag. By including a correct-looking tag in the
|
|
146
|
+
// log, the transaction shape is preserved and no privacy is leaked, even if the tag is bogus.
|
|
147
|
+
this.logger.warn(`Computing a tag for invalid recipient ${recipient} - returning a random tag instead`, {
|
|
148
|
+
contractAddress: this.contractAddress
|
|
149
|
+
});
|
|
150
|
+
return Tag.random();
|
|
151
|
+
}
|
|
152
|
+
const index = await this.#getIndexToUseForSecret(extendedSecret);
|
|
153
|
+
this.logger.debug(`Incrementing tagging index for sender: ${sender}, recipient: ${recipient}, contract: ${this.contractAddress} to ${index}`);
|
|
154
|
+
this.taggingIndexCache.setLastUsedIndex(extendedSecret, index);
|
|
156
155
|
return Tag.compute({
|
|
157
|
-
|
|
156
|
+
extendedSecret,
|
|
158
157
|
index
|
|
159
158
|
});
|
|
160
159
|
}
|
|
161
|
-
async #
|
|
160
|
+
async #calculateExtendedDirectionalAppTaggingSecret(contractAddress, sender, recipient) {
|
|
162
161
|
const senderCompleteAddress = await this.getCompleteAddressOrFail(sender);
|
|
163
162
|
const senderIvsk = await this.keyStore.getMasterIncomingViewingSecretKey(sender);
|
|
164
|
-
return
|
|
163
|
+
return ExtendedDirectionalAppTaggingSecret.compute(senderCompleteAddress, senderIvsk, recipient, contractAddress, recipient);
|
|
165
164
|
}
|
|
166
165
|
async #getIndexToUseForSecret(secret) {
|
|
167
166
|
// If we have the tagging index in the cache, we use it. If not we obtain it from the execution data provider.
|
|
@@ -172,7 +171,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
172
171
|
// This is a tagging secret we've not yet used in this tx, so first sync our store to make sure its indices
|
|
173
172
|
// are up to date. We do this here because this store is not synced as part of the global sync because
|
|
174
173
|
// that'd be wasteful as most tagging secrets are not used in each tx.
|
|
175
|
-
await syncSenderTaggingIndexes(secret, this.
|
|
174
|
+
await syncSenderTaggingIndexes(secret, this.aztecNode, this.senderTaggingStore, await this.anchorBlockHeader.hash(), this.jobId);
|
|
176
175
|
const lastUsedIndex = await this.senderTaggingStore.getLastUsedIndex(secret, this.jobId);
|
|
177
176
|
// If lastUsedIndex is undefined, we've never used this secret, so start from 0
|
|
178
177
|
// Otherwise, the next index to use is one past the last used index
|
|
@@ -183,29 +182,29 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
183
182
|
* Store values in the execution cache.
|
|
184
183
|
* @param values - Values to store.
|
|
185
184
|
* @returns The hash of the values.
|
|
186
|
-
*/
|
|
185
|
+
*/ setHashPreimage(values, hash) {
|
|
187
186
|
return this.executionCache.store(values, hash);
|
|
188
187
|
}
|
|
189
188
|
/**
|
|
190
189
|
* Gets values from the execution cache.
|
|
191
190
|
* @param hash - Hash of the values.
|
|
192
191
|
* @returns The values.
|
|
193
|
-
*/
|
|
192
|
+
*/ getHashPreimage(hash) {
|
|
194
193
|
const preimage = this.executionCache.getPreimage(hash);
|
|
195
194
|
if (!preimage) {
|
|
196
195
|
throw new Error(`Preimage for hash ${hash.toString()} not found in cache`);
|
|
197
196
|
}
|
|
198
197
|
return Promise.resolve(preimage);
|
|
199
198
|
}
|
|
200
|
-
async
|
|
199
|
+
async doesNullifierExist(innerNullifier) {
|
|
201
200
|
// This oracle must be overridden because while utility execution can only meaningfully check if a nullifier exists
|
|
202
201
|
// in the synched block, during private execution there's also the possibility of it being pending, i.e. created
|
|
203
202
|
// in the current transaction.
|
|
204
|
-
this.
|
|
203
|
+
this.logger.debug(`Checking existence of inner nullifier ${innerNullifier}`, {
|
|
205
204
|
contractAddress: this.contractAddress
|
|
206
205
|
});
|
|
207
206
|
const nullifier = (await siloNullifier(this.contractAddress, innerNullifier)).toBigInt();
|
|
208
|
-
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.
|
|
207
|
+
return this.noteCache.getNullifiers(this.contractAddress).has(nullifier) || await super.doesNullifierExist(innerNullifier);
|
|
209
208
|
}
|
|
210
209
|
/**
|
|
211
210
|
* Gets some notes for a storage slot.
|
|
@@ -227,7 +226,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
227
226
|
* @param offset - The starting index for pagination.
|
|
228
227
|
* @param status - The status of notes to fetch.
|
|
229
228
|
* @returns Array of note data.
|
|
230
|
-
*/ async
|
|
229
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
231
230
|
// Nullified pending notes are already removed from the list.
|
|
232
231
|
const pendingNotes = this.noteCache.getNotes(this.callContext.contractAddress, owner, storageSlot);
|
|
233
232
|
const pendingNullifiers = this.noteCache.getNullifiers(this.callContext.contractAddress);
|
|
@@ -258,7 +257,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
258
257
|
limit,
|
|
259
258
|
offset
|
|
260
259
|
});
|
|
261
|
-
this.
|
|
260
|
+
this.logger.debug(`Returning ${notes.length} notes for ${this.callContext.contractAddress} at ${storageSlot}: ${notes.map((n)=>`${n.noteNonce.toString()}:[${n.note.items.map((i)=>i.toString()).join(',')}]`).join(', ')}`);
|
|
262
261
|
return notes;
|
|
263
262
|
}
|
|
264
263
|
/**
|
|
@@ -271,8 +270,8 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
271
270
|
* @param noteItems - The items to be included in a Note.
|
|
272
271
|
* @param noteHash - A hash of the new note.
|
|
273
272
|
* @returns
|
|
274
|
-
*/
|
|
275
|
-
this.
|
|
273
|
+
*/ notifyCreatedNote(owner, storageSlot, randomness, noteTypeId, noteItems, noteHash, counter) {
|
|
274
|
+
this.logger.debug(`Notified of new note with inner hash ${noteHash}`, {
|
|
276
275
|
contractAddress: this.callContext.contractAddress,
|
|
277
276
|
storageSlot,
|
|
278
277
|
randomness,
|
|
@@ -303,7 +302,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
303
302
|
* within the current transaction/execution.
|
|
304
303
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
305
304
|
* @param noteHash - A hash of the new note.
|
|
306
|
-
*/ async
|
|
305
|
+
*/ async notifyNullifiedNote(innerNullifier, noteHash, counter) {
|
|
307
306
|
const nullifiedNoteHashCounter = await this.noteCache.nullifyNote(this.callContext.contractAddress, innerNullifier, noteHash);
|
|
308
307
|
if (nullifiedNoteHashCounter !== undefined) {
|
|
309
308
|
this.noteHashNullifierCounterMap.set(nullifiedNoteHashCounter, counter);
|
|
@@ -314,19 +313,19 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
314
313
|
* within the current transaction/execution.
|
|
315
314
|
* @param innerNullifier - The pending nullifier to add in the list (not yet siloed by contract address).
|
|
316
315
|
* @param noteHash - A hash of the new note.
|
|
317
|
-
*/
|
|
318
|
-
this.
|
|
316
|
+
*/ notifyCreatedNullifier(innerNullifier) {
|
|
317
|
+
this.logger.debug(`Notified of new inner nullifier ${innerNullifier}`, {
|
|
319
318
|
contractAddress: this.contractAddress
|
|
320
319
|
});
|
|
321
320
|
return this.noteCache.nullifierCreated(this.callContext.contractAddress, innerNullifier);
|
|
322
321
|
}
|
|
323
322
|
/**
|
|
324
|
-
* Check if a nullifier has been emitted in the same transaction, i.e. if
|
|
323
|
+
* Check if a nullifier has been emitted in the same transaction, i.e. if notifyCreatedNullifier has been
|
|
325
324
|
* called for this inner nullifier from the contract with the specified address.
|
|
326
325
|
* @param innerNullifier - The inner nullifier to check.
|
|
327
326
|
* @param contractAddress - Address of the contract that emitted the nullifier.
|
|
328
327
|
* @returns A boolean indicating whether the nullifier is pending or not.
|
|
329
|
-
*/ async
|
|
328
|
+
*/ async isNullifierPending(innerNullifier, contractAddress) {
|
|
330
329
|
const siloedNullifier = await siloNullifier(contractAddress, innerNullifier);
|
|
331
330
|
const isNullifierPending = this.noteCache.getNullifiers(contractAddress).has(siloedNullifier.toBigInt());
|
|
332
331
|
return Promise.resolve(isNullifierPending);
|
|
@@ -337,10 +336,10 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
337
336
|
* keep the preimage in ts for later.
|
|
338
337
|
* @param log - The contract class log to be emitted.
|
|
339
338
|
* @param counter - The contract class log's counter.
|
|
340
|
-
*/
|
|
339
|
+
*/ notifyCreatedContractClassLog(log, counter) {
|
|
341
340
|
this.contractClassLogs.push(new CountedContractClassLog(log, counter));
|
|
342
341
|
const text = log.toBuffer().toString('hex');
|
|
343
|
-
this.
|
|
342
|
+
this.logger.verbose(`Emitted log from ContractClassRegistry: "${text.length > 100 ? text.slice(0, 100) + '...' : text}"`);
|
|
344
343
|
}
|
|
345
344
|
#checkValidStaticCall(childExecutionResult) {
|
|
346
345
|
if (childExecutionResult.publicInputs.noteHashes.claimedLength > 0 || childExecutionResult.publicInputs.nullifiers.claimedLength > 0 || childExecutionResult.publicInputs.l2ToL1Msgs.claimedLength > 0 || childExecutionResult.publicInputs.privateLogs.claimedLength > 0 || childExecutionResult.publicInputs.contractClassLogsHashes.claimedLength > 0) {
|
|
@@ -355,14 +354,14 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
355
354
|
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
356
355
|
* @param isStaticCall - Whether the call is a static call.
|
|
357
356
|
* @returns The execution result.
|
|
358
|
-
*/ async
|
|
357
|
+
*/ async callPrivateFunction(targetContractAddress, functionSelector, argsHash, sideEffectCounter, isStaticCall) {
|
|
359
358
|
if (!this.simulator) {
|
|
360
359
|
// In practice it is only when creating inline private contexts in a Noir test using TXE that we create an
|
|
361
360
|
// instance of this class without a simulator.
|
|
362
361
|
throw new Error('No simulator provided, cannot perform a nested private call');
|
|
363
362
|
}
|
|
364
363
|
const simulatorSetupTimer = new Timer();
|
|
365
|
-
this.
|
|
364
|
+
this.logger.debug(`Calling private function ${targetContractAddress}:${functionSelector} from ${this.callContext.contractAddress}`);
|
|
366
365
|
isStaticCall = isStaticCall || this.callContext.isStaticCall;
|
|
367
366
|
await this.contractSyncService.ensureContractSynced(targetContractAddress, functionSelector, this.utilityExecutor, this.anchorBlockHeader, this.jobId, this.scopes);
|
|
368
367
|
const targetArtifact = await this.contractStore.getFunctionArtifactWithDebugMetadata(targetContractAddress, functionSelector);
|
|
@@ -387,19 +386,23 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
387
386
|
senderTaggingStore: this.senderTaggingStore,
|
|
388
387
|
recipientTaggingStore: this.recipientTaggingStore,
|
|
389
388
|
senderAddressBookStore: this.senderAddressBookStore,
|
|
390
|
-
|
|
389
|
+
capsuleService: this.capsuleService,
|
|
391
390
|
privateEventStore: this.privateEventStore,
|
|
391
|
+
messageContextService: this.messageContextService,
|
|
392
392
|
contractSyncService: this.contractSyncService,
|
|
393
393
|
jobId: this.jobId,
|
|
394
394
|
totalPublicCalldataCount: this.totalPublicCalldataCount,
|
|
395
395
|
sideEffectCounter,
|
|
396
|
-
log: this.
|
|
396
|
+
log: this.logger,
|
|
397
397
|
scopes: this.scopes,
|
|
398
|
-
senderForTags: this.
|
|
399
|
-
simulator: this.simulator
|
|
398
|
+
senderForTags: this.defaultSenderForTags,
|
|
399
|
+
simulator: this.simulator,
|
|
400
|
+
l2TipsStore: this.l2TipsStore
|
|
400
401
|
});
|
|
401
402
|
const setupTime = simulatorSetupTimer.ms();
|
|
402
403
|
const childExecutionResult = await executePrivateFunction(this.simulator, privateExecutionOracle, targetArtifact, targetContractAddress, functionSelector);
|
|
404
|
+
// Propagate the nested call's calldata count so the parent sees its increments on subsequent enqueues.
|
|
405
|
+
this.totalPublicCalldataCount = privateExecutionOracle.getTotalPublicCalldataCount();
|
|
403
406
|
if (isStaticCall) {
|
|
404
407
|
this.#checkValidStaticCall(childExecutionResult);
|
|
405
408
|
}
|
|
@@ -414,7 +417,7 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
414
417
|
returnsHash: publicInputs.returnsHash
|
|
415
418
|
};
|
|
416
419
|
}
|
|
417
|
-
|
|
420
|
+
/** Validates the calldata preimage exists in the cache and checks cumulative calldata size is within limits. */ assertValidPublicCalldata(calldataHash) {
|
|
418
421
|
const calldata = this.executionCache.getPreimage(calldataHash);
|
|
419
422
|
if (!calldata) {
|
|
420
423
|
throw new Error('Calldata for public call not found in cache');
|
|
@@ -423,31 +426,15 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
423
426
|
if (this.totalPublicCalldataCount > MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS) {
|
|
424
427
|
throw new Error(`Too many total args to all enqueued public calls! (> ${MAX_FR_CALLDATA_TO_ALL_ENQUEUED_CALLS})`);
|
|
425
428
|
}
|
|
426
|
-
}
|
|
427
|
-
/**
|
|
428
|
-
* Verify relevant information when a public function is enqueued.
|
|
429
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
430
|
-
* @param calldataHash - The hash of the function selector and arguments.
|
|
431
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
432
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
433
|
-
*/ privateNotifyEnqueuedPublicFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
434
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
435
429
|
return Promise.resolve();
|
|
436
430
|
}
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
* @param targetContractAddress - The address of the contract to call.
|
|
440
|
-
* @param argsHash - The arguments hash to pass to the function.
|
|
441
|
-
* @param sideEffectCounter - The side effect counter at the start of the call.
|
|
442
|
-
* @param isStaticCall - Whether the call is a static call.
|
|
443
|
-
*/ privateNotifySetPublicTeardownFunctionCall(_targetContractAddress, calldataHash, _sideEffectCounter, _isStaticCall) {
|
|
444
|
-
this.#onNewPublicFunctionCall(calldataHash);
|
|
445
|
-
return Promise.resolve();
|
|
431
|
+
getTotalPublicCalldataCount() {
|
|
432
|
+
return this.totalPublicCalldataCount;
|
|
446
433
|
}
|
|
447
|
-
|
|
434
|
+
notifyRevertiblePhaseStart(minRevertibleSideEffectCounter) {
|
|
448
435
|
return this.noteCache.setMinRevertibleSideEffectCounter(minRevertibleSideEffectCounter);
|
|
449
436
|
}
|
|
450
|
-
|
|
437
|
+
isExecutionInRevertiblePhase(sideEffectCounter) {
|
|
451
438
|
return Promise.resolve(this.noteCache.isSideEffectCounterRevertible(sideEffectCounter));
|
|
452
439
|
}
|
|
453
440
|
/**
|
|
@@ -462,10 +449,4 @@ import { UtilityExecutionOracle } from './utility_execution_oracle.js';
|
|
|
462
449
|
getDebugFunctionName() {
|
|
463
450
|
return this.contractStore.getDebugFunctionName(this.contractAddress, this.callContext.functionSelector);
|
|
464
451
|
}
|
|
465
|
-
utilityEmitOffchainEffect(data) {
|
|
466
|
-
this.offchainEffects.push({
|
|
467
|
-
data
|
|
468
|
-
});
|
|
469
|
-
return Promise.resolve();
|
|
470
|
-
}
|
|
471
452
|
}
|