@aztec/pxe 0.0.1-commit.ec5f612 → 0.0.1-commit.ec7ac5448
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_synchronizer.d.ts +1 -1
- package/dest/block_synchronizer/block_synchronizer.d.ts.map +1 -1
- package/dest/block_synchronizer/block_synchronizer.js +6 -0
- package/dest/config/index.d.ts +2 -2
- package/dest/config/index.d.ts.map +1 -1
- package/dest/config/index.js +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.d.ts +10 -5
- package/dest/contract_function_simulator/contract_function_simulator.d.ts.map +1 -1
- package/dest/contract_function_simulator/contract_function_simulator.js +31 -8
- 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 +5 -5
- package/dest/contract_function_simulator/execution_tagging_index_cache.d.ts.map +1 -1
- package/dest/contract_function_simulator/execution_tagging_index_cache.js +17 -9
- 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 +61 -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 +75 -44
- package/dest/contract_function_simulator/oracle/oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/oracle.js +281 -96
- package/dest/contract_function_simulator/oracle/private_execution.js +5 -3
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts +23 -49
- package/dest/contract_function_simulator/oracle/private_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/private_execution_oracle.js +40 -63
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts +89 -56
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.d.ts.map +1 -1
- package/dest/contract_function_simulator/oracle/utility_execution_oracle.js +272 -107
- 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 +9 -2
- 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 +44 -37
- 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 +16 -4
- package/dest/logs/log_service.d.ts +5 -8
- package/dest/logs/log_service.d.ts.map +1 -1
- package/dest/logs/log_service.js +24 -37
- 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/pxe.d.ts +11 -8
- package/dest/pxe.d.ts.map +1 -1
- package/dest/pxe.js +45 -26
- 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 +33 -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/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/tagging_store/sender_tagging_store.d.ts +26 -25
- 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 +2 -2
- package/dest/tagging/index.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.d.ts.map +1 -1
- package/dest/tagging/sender_sync/sync_sender_tagging_indexes.js +10 -1
- 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 +2 -1
- 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 +24 -11
- package/package.json +16 -16
- package/src/bin/check_oracle_version.ts +4 -4
- package/src/block_synchronizer/block_synchronizer.ts +6 -0
- package/src/config/index.ts +1 -1
- package/src/contract_function_simulator/contract_function_simulator.ts +44 -12
- package/src/contract_function_simulator/ephemeral_array_service.ts +110 -0
- package/src/contract_function_simulator/execution_tagging_index_cache.ts +16 -11
- 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 +82 -54
- package/src/contract_function_simulator/oracle/legacy_oracle_mappings.ts +104 -0
- package/src/contract_function_simulator/oracle/oracle.ts +363 -139
- package/src/contract_function_simulator/oracle/private_execution.ts +4 -4
- package/src/contract_function_simulator/oracle/private_execution_oracle.ts +45 -84
- package/src/contract_function_simulator/oracle/utility_execution_oracle.ts +444 -143
- package/src/contract_function_simulator/pick_notes.ts +9 -2
- 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 +77 -59
- 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 +17 -4
- package/src/logs/log_service.ts +52 -78
- 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/pxe.ts +68 -31
- package/src/storage/capsule_store/capsule_service.ts +90 -0
- package/src/storage/capsule_store/capsule_store.ts +34 -26
- package/src/storage/capsule_store/index.ts +1 -0
- package/src/storage/metadata.ts +1 -1
- package/src/storage/note_store/note_store.ts +2 -5
- package/src/storage/tagging_store/sender_tagging_store.ts +182 -135
- package/src/tagging/index.ts +1 -1
- package/src/tagging/sender_sync/sync_sender_tagging_indexes.ts +19 -1
- 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 +19 -9
- 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,16 +1,18 @@
|
|
|
1
1
|
import { Aes128 } from '@aztec/foundation/crypto/aes128';
|
|
2
2
|
import { Fr } from '@aztec/foundation/curves/bn254';
|
|
3
3
|
import { LogLevels, createLogger } from '@aztec/foundation/log';
|
|
4
|
+
import { isProtocolContract } from '@aztec/protocol-contracts';
|
|
4
5
|
import { siloNullifier } from '@aztec/stdlib/hash';
|
|
5
6
|
import { computeAddressSecret } from '@aztec/stdlib/keys';
|
|
6
|
-
import {
|
|
7
|
+
import { MessageContext, deriveAppSiloedSharedSecret } from '@aztec/stdlib/logs';
|
|
7
8
|
import { getNonNullifiedL1ToL2MessageWitness } from '@aztec/stdlib/messaging';
|
|
8
9
|
import { MerkleTreeId } from '@aztec/stdlib/trees';
|
|
9
|
-
import { createContractLogger, logContractMessage } from '../../contract_logging.js';
|
|
10
|
+
import { createContractLogger, logContractMessage, stripAztecnrLogPrefix } from '../../contract_logging.js';
|
|
10
11
|
import { EventService } from '../../events/event_service.js';
|
|
11
12
|
import { LogService } from '../../logs/log_service.js';
|
|
12
13
|
import { NoteService } from '../../notes/note_service.js';
|
|
13
|
-
import {
|
|
14
|
+
import { ORACLE_VERSION_MAJOR } from '../../oracle_version.js';
|
|
15
|
+
import { EphemeralArrayService } from '../ephemeral_array_service.js';
|
|
14
16
|
import { EventValidationRequest } from '../noir-structs/event_validation_request.js';
|
|
15
17
|
import { LogRetrievalRequest } from '../noir-structs/log_retrieval_request.js';
|
|
16
18
|
import { LogRetrievalResponse } from '../noir-structs/log_retrieval_response.js';
|
|
@@ -24,6 +26,11 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
24
26
|
isMisc = true;
|
|
25
27
|
isUtility = true;
|
|
26
28
|
contractLogger;
|
|
29
|
+
aztecnrLogger;
|
|
30
|
+
offchainEffects = [];
|
|
31
|
+
ephemeralArrayService = new EphemeralArrayService();
|
|
32
|
+
// We store oracle version to be able to show a nice error message when an oracle handler is missing.
|
|
33
|
+
contractOracleVersion;
|
|
27
34
|
contractAddress;
|
|
28
35
|
authWitnesses;
|
|
29
36
|
capsules;
|
|
@@ -35,10 +42,12 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
35
42
|
aztecNode;
|
|
36
43
|
recipientTaggingStore;
|
|
37
44
|
senderAddressBookStore;
|
|
38
|
-
|
|
45
|
+
capsuleService;
|
|
39
46
|
privateEventStore;
|
|
47
|
+
messageContextService;
|
|
48
|
+
contractSyncService;
|
|
40
49
|
jobId;
|
|
41
|
-
|
|
50
|
+
logger;
|
|
42
51
|
scopes;
|
|
43
52
|
constructor(args){
|
|
44
53
|
this.contractAddress = args.contractAddress;
|
|
@@ -52,21 +61,50 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
52
61
|
this.aztecNode = args.aztecNode;
|
|
53
62
|
this.recipientTaggingStore = args.recipientTaggingStore;
|
|
54
63
|
this.senderAddressBookStore = args.senderAddressBookStore;
|
|
55
|
-
this.
|
|
64
|
+
this.capsuleService = args.capsuleService;
|
|
56
65
|
this.privateEventStore = args.privateEventStore;
|
|
66
|
+
this.messageContextService = args.messageContextService;
|
|
67
|
+
this.contractSyncService = args.contractSyncService;
|
|
57
68
|
this.jobId = args.jobId;
|
|
58
|
-
this.
|
|
69
|
+
this.logger = args.log ?? createLogger('simulator:client_view_context');
|
|
59
70
|
this.scopes = args.scopes;
|
|
60
71
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
72
|
+
assertCompatibleOracleVersion(major, minor) {
|
|
73
|
+
// TODO(F-416): Remove this hack on v5 when protocol contracts are redeployed.
|
|
74
|
+
// Protocol contracts/canonical contracts shipped with committed bytecode that cannot be changed. Assert they use
|
|
75
|
+
// the expected pinned version or the current one. We want to allow for both the pinned and the current versions
|
|
76
|
+
// because we want this code to work with both the pinned and unpinned version since some branches do not have the
|
|
77
|
+
// pinned contracts (like e.g. next)
|
|
78
|
+
const LEGACY_ORACLE_VERSION = 12;
|
|
79
|
+
if (isProtocolContract(this.contractAddress)) {
|
|
80
|
+
if (major !== LEGACY_ORACLE_VERSION && major !== ORACLE_VERSION_MAJOR) {
|
|
81
|
+
const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
|
|
82
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${LEGACY_ORACLE_VERSION} or ${ORACLE_VERSION_MAJOR}, got ${major})`);
|
|
83
|
+
}
|
|
84
|
+
this.contractOracleVersion = {
|
|
85
|
+
major,
|
|
86
|
+
minor
|
|
87
|
+
};
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (major !== ORACLE_VERSION_MAJOR) {
|
|
91
|
+
const hint = major > ORACLE_VERSION_MAJOR ? 'The contract was compiled with a newer version of Aztec.nr than your private environment supports. Upgrade your private environment to a compatible version.' : 'The contract was compiled with an older version of Aztec.nr than your private environment supports. Recompile the contract with a compatible version of Aztec.nr.';
|
|
92
|
+
throw new Error(`Incompatible private environment version: ${hint} See https://docs.aztec.network/errors/8 (expected oracle major version ${ORACLE_VERSION_MAJOR}, got ${major})`);
|
|
64
93
|
}
|
|
94
|
+
// Major matches - store both major and minor for later diagnostics (e.g. when an oracle is not found)
|
|
95
|
+
this.contractOracleVersion = {
|
|
96
|
+
major,
|
|
97
|
+
minor
|
|
98
|
+
};
|
|
65
99
|
}
|
|
66
|
-
|
|
100
|
+
// Prefixed with "nonOracleFunction" as it is not used as an oracle handler.
|
|
101
|
+
nonOracleFunctionGetContractOracleVersion() {
|
|
102
|
+
return this.contractOracleVersion;
|
|
103
|
+
}
|
|
104
|
+
getRandomField() {
|
|
67
105
|
return Fr.random();
|
|
68
106
|
}
|
|
69
|
-
|
|
107
|
+
getUtilityContext() {
|
|
70
108
|
return new UtilityContext(this.anchorBlockHeader, this.contractAddress);
|
|
71
109
|
}
|
|
72
110
|
/**
|
|
@@ -75,29 +113,26 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
75
113
|
* @returns A Promise that resolves to nullifier keys.
|
|
76
114
|
* @throws If the keys are not registered in the key store.
|
|
77
115
|
* @throws If scopes are defined and the account is not in the scopes.
|
|
78
|
-
*/ async
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
84
|
-
hasAccess = true;
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
if (!hasAccess) {
|
|
88
|
-
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
116
|
+
*/ async getKeyValidationRequest(pkMHash) {
|
|
117
|
+
let hasAccess = false;
|
|
118
|
+
for(let i = 0; i < this.scopes.length && !hasAccess; i++){
|
|
119
|
+
if (await this.keyStore.accountHasKey(this.scopes[i], pkMHash)) {
|
|
120
|
+
hasAccess = true;
|
|
89
121
|
}
|
|
90
122
|
}
|
|
123
|
+
if (!hasAccess) {
|
|
124
|
+
throw new Error(`Key validation request denied: no scoped account has a key with hash ${pkMHash.toString()}.`);
|
|
125
|
+
}
|
|
91
126
|
return this.keyStore.getKeyValidationRequest(pkMHash, this.contractAddress);
|
|
92
127
|
}
|
|
93
128
|
/**
|
|
94
129
|
* Fetches the index and sibling path of a leaf at a given block from the note hash tree.
|
|
95
|
-
* @param
|
|
96
|
-
* witness.
|
|
130
|
+
* @param blockHash - The hash of a block that contains the note hash tree root in which to find the
|
|
131
|
+
* membership witness.
|
|
97
132
|
* @param noteHash - The note hash to find in the note hash tree.
|
|
98
133
|
* @returns The membership witness containing the leaf index and sibling path
|
|
99
|
-
*/
|
|
100
|
-
return this.aztecNode.getNoteHashMembershipWitness(
|
|
134
|
+
*/ getNoteHashMembershipWitness(blockHash, noteHash) {
|
|
135
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNoteHashMembershipWitness(blockHash, noteHash));
|
|
101
136
|
}
|
|
102
137
|
/**
|
|
103
138
|
* Fetches the index and sibling path of a block hash in the archive tree.
|
|
@@ -105,20 +140,23 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
105
140
|
* Block hashes are the leaves of the archive tree. Each time a new block is added to the chain,
|
|
106
141
|
* its block hash is appended as a new leaf to the archive tree.
|
|
107
142
|
*
|
|
108
|
-
* @param
|
|
143
|
+
* @param referenceBlockHash - The hash of a block that contains the archive tree root in which to find the membership
|
|
109
144
|
* witness.
|
|
110
145
|
* @param blockHash - The block hash to find in the archive tree.
|
|
111
146
|
* @returns The membership witness containing the leaf index and sibling path
|
|
112
|
-
*/
|
|
113
|
-
|
|
147
|
+
*/ getBlockHashMembershipWitness(referenceBlockHash, blockHash) {
|
|
148
|
+
// Note that we validate that the reference block hash is at or before the anchor block - we don't test the block
|
|
149
|
+
// hash at all. If the block hash did not exist by the reference block hash, then the node will not return the
|
|
150
|
+
// membership witness as there is none.
|
|
151
|
+
return this.#queryWithBlockHashNotAfterAnchor(referenceBlockHash, ()=>this.aztecNode.getBlockHashMembershipWitness(referenceBlockHash, blockHash));
|
|
114
152
|
}
|
|
115
153
|
/**
|
|
116
154
|
* Returns a nullifier membership witness for a given nullifier at a given block.
|
|
117
155
|
* @param blockHash - The block hash at which to get the index.
|
|
118
156
|
* @param nullifier - Nullifier we try to find witness for.
|
|
119
157
|
* @returns The nullifier membership witness (if found).
|
|
120
|
-
*/
|
|
121
|
-
return this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier);
|
|
158
|
+
*/ getNullifierMembershipWitness(blockHash, nullifier) {
|
|
159
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getNullifierMembershipWitness(blockHash, nullifier));
|
|
122
160
|
}
|
|
123
161
|
/**
|
|
124
162
|
* Returns a low nullifier membership witness for a given nullifier at a given block.
|
|
@@ -128,22 +166,22 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
128
166
|
* @remarks Low nullifier witness can be used to perform a nullifier non-inclusion proof by leveraging the "linked
|
|
129
167
|
* list structure" of leaves and proving that a lower nullifier is pointing to a bigger next value than the nullifier
|
|
130
168
|
* we are trying to prove non-inclusion for.
|
|
131
|
-
*/
|
|
132
|
-
return this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier);
|
|
169
|
+
*/ getLowNullifierMembershipWitness(blockHash, nullifier) {
|
|
170
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getLowNullifierMembershipWitness(blockHash, nullifier));
|
|
133
171
|
}
|
|
134
172
|
/**
|
|
135
173
|
* Returns a public data tree witness for a given leaf slot at a given block.
|
|
136
174
|
* @param blockHash - The block hash at which to get the index.
|
|
137
175
|
* @param leafSlot - The slot of the public data tree to get the witness for.
|
|
138
176
|
* @returns - The witness
|
|
139
|
-
*/
|
|
140
|
-
return this.aztecNode.getPublicDataWitness(blockHash, leafSlot);
|
|
177
|
+
*/ getPublicDataWitness(blockHash, leafSlot) {
|
|
178
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, ()=>this.aztecNode.getPublicDataWitness(blockHash, leafSlot));
|
|
141
179
|
}
|
|
142
180
|
/**
|
|
143
181
|
* Fetches a block header of a given block.
|
|
144
182
|
* @param blockNumber - The number of a block of which to get the block header.
|
|
145
183
|
* @returns Block extracted from a block with block number `blockNumber`.
|
|
146
|
-
*/ async
|
|
184
|
+
*/ async getBlockHeader(blockNumber) {
|
|
147
185
|
const anchorBlockNumber = this.anchorBlockHeader.getBlockNumber();
|
|
148
186
|
if (blockNumber > anchorBlockNumber) {
|
|
149
187
|
throw new Error(`Block number ${blockNumber} is higher than current block ${anchorBlockNumber}`);
|
|
@@ -152,11 +190,18 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
152
190
|
return block?.header;
|
|
153
191
|
}
|
|
154
192
|
/**
|
|
155
|
-
* Retrieve the
|
|
193
|
+
* Retrieve the public keys and partial address associated to a given address.
|
|
156
194
|
* @param account - The account address.
|
|
157
|
-
* @returns
|
|
158
|
-
*/
|
|
159
|
-
|
|
195
|
+
* @returns The public keys and partial address, or `undefined` if the account is not registered.
|
|
196
|
+
*/ async getPublicKeysAndPartialAddress(account) {
|
|
197
|
+
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
198
|
+
if (!completeAddress) {
|
|
199
|
+
return undefined;
|
|
200
|
+
}
|
|
201
|
+
return {
|
|
202
|
+
publicKeys: completeAddress.publicKeys,
|
|
203
|
+
partialAddress: completeAddress.partialAddress
|
|
204
|
+
};
|
|
160
205
|
}
|
|
161
206
|
async getCompleteAddressOrFail(account) {
|
|
162
207
|
const completeAddress = await this.addressStore.getCompleteAddress(account);
|
|
@@ -170,10 +215,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
170
215
|
* Returns a contract instance associated with an address or throws if not found.
|
|
171
216
|
* @param address - Address.
|
|
172
217
|
* @returns A contract instance.
|
|
173
|
-
*/
|
|
174
|
-
return this.getContractInstance(address);
|
|
175
|
-
}
|
|
176
|
-
async getContractInstance(address) {
|
|
218
|
+
*/ async getContractInstance(address) {
|
|
177
219
|
const instance = await this.contractStore.getContractInstance(address);
|
|
178
220
|
if (!instance) {
|
|
179
221
|
throw new Error(`No contract instance found for address ${address.toString()}`);
|
|
@@ -185,7 +227,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
185
227
|
* for this transaction first, and falls back to the local database if not found.
|
|
186
228
|
* @param messageHash - Hash of the message to authenticate.
|
|
187
229
|
* @returns Authentication witness for the requested message hash.
|
|
188
|
-
*/
|
|
230
|
+
*/ getAuthWitness(messageHash) {
|
|
189
231
|
return Promise.resolve(this.authWitnesses.find((w)=>w.requestHash.equals(messageHash))?.witness);
|
|
190
232
|
}
|
|
191
233
|
/**
|
|
@@ -209,7 +251,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
209
251
|
* @param offset - The starting index for pagination.
|
|
210
252
|
* @param status - The status of notes to fetch.
|
|
211
253
|
* @returns Array of note data.
|
|
212
|
-
*/ async
|
|
254
|
+
*/ async getNotes(owner, storageSlot, numSelects, selectByIndexes, selectByOffsets, selectByLengths, selectValues, selectComparators, sortByIndexes, sortByOffsets, sortByLengths, sortOrder, limit, offset, status) {
|
|
213
255
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
214
256
|
const dbNotes = await noteService.getNotes(this.contractAddress, owner, storageSlot, status, this.scopes);
|
|
215
257
|
return pickNotes(dbNotes, {
|
|
@@ -238,7 +280,7 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
238
280
|
* Check if a nullifier exists in the nullifier tree.
|
|
239
281
|
* @param innerNullifier - The inner nullifier.
|
|
240
282
|
* @returns A boolean indicating whether the nullifier exists in the tree or not.
|
|
241
|
-
*/ async
|
|
283
|
+
*/ async doesNullifierExist(innerNullifier) {
|
|
242
284
|
const [nullifier, anchorBlockHash] = await Promise.all([
|
|
243
285
|
siloNullifier(this.contractAddress, innerNullifier),
|
|
244
286
|
this.anchorBlockHeader.hash()
|
|
@@ -249,14 +291,14 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
249
291
|
return leafIndex?.data !== undefined;
|
|
250
292
|
}
|
|
251
293
|
/**
|
|
252
|
-
*
|
|
294
|
+
* Returns the membership witness of an un-nullified L1 to L2 message.
|
|
253
295
|
* @param contractAddress - Address of a contract by which the message was emitted.
|
|
254
296
|
* @param messageHash - Hash of the message.
|
|
255
297
|
* @param secret - Secret used to compute a nullifier.
|
|
256
298
|
* @dev Contract address and secret are only used to compute the nullifier to get non-nullified messages
|
|
257
299
|
* @returns The l1 to l2 membership witness (index of message in the tree and sibling path).
|
|
258
|
-
*/ async
|
|
259
|
-
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret);
|
|
300
|
+
*/ async getL1ToL2MembershipWitness(contractAddress, messageHash, secret) {
|
|
301
|
+
const [messageIndex, siblingPath] = await getNonNullifiedL1ToL2MessageWitness(this.aztecNode, contractAddress, messageHash, secret, await this.anchorBlockHeader.hash());
|
|
260
302
|
return new MessageLoadOracleInputs(messageIndex, siblingPath);
|
|
261
303
|
}
|
|
262
304
|
/**
|
|
@@ -265,129 +307,252 @@ import { MessageLoadOracleInputs } from './message_load_oracle_inputs.js';
|
|
|
265
307
|
* @param contractAddress - The address to read storage from.
|
|
266
308
|
* @param startStorageSlot - The starting storage slot.
|
|
267
309
|
* @param numberOfElements - Number of elements to read from the starting storage slot.
|
|
268
|
-
*/
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
310
|
+
*/ getFromPublicStorage(blockHash, contractAddress, startStorageSlot, numberOfElements) {
|
|
311
|
+
return this.#queryWithBlockHashNotAfterAnchor(blockHash, async ()=>{
|
|
312
|
+
const slots = Array(numberOfElements).fill(0).map((_, i)=>new Fr(startStorageSlot.value + BigInt(i)));
|
|
313
|
+
const values = await Promise.all(slots.map((storageSlot)=>this.aztecNode.getPublicStorageAt(blockHash, contractAddress, storageSlot)));
|
|
314
|
+
this.logger.debug(`Oracle storage read: slots=[${slots.map((slot)=>slot.toString()).join(', ')}] address=${contractAddress.toString()} values=[${values.join(', ')}]`);
|
|
315
|
+
return values;
|
|
316
|
+
});
|
|
273
317
|
}
|
|
274
318
|
/**
|
|
275
|
-
* Returns a per-contract logger whose output is prefixed with `
|
|
319
|
+
* Returns a per-contract logger whose output is prefixed with `contract:<name>(<addrAbbrev>)`.
|
|
276
320
|
*/ async #getContractLogger() {
|
|
277
321
|
if (!this.contractLogger) {
|
|
278
322
|
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
279
323
|
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
280
|
-
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), {
|
|
324
|
+
this.contractLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'user', {
|
|
281
325
|
instanceId: this.jobId
|
|
282
326
|
});
|
|
283
327
|
}
|
|
284
328
|
return this.contractLogger;
|
|
285
329
|
}
|
|
286
|
-
|
|
330
|
+
/**
|
|
331
|
+
* Returns a per-contract logger whose output is prefixed with `aztecnr:<name>(<addrAbbrev>)`.
|
|
332
|
+
*/ async #getAztecnrLogger() {
|
|
333
|
+
if (!this.aztecnrLogger) {
|
|
334
|
+
// Purpose of instanceId is to distinguish logs from different instances of the same component. It makes sense
|
|
335
|
+
// to re-use jobId as instanceId here as executions of different PXE jobs are isolated.
|
|
336
|
+
this.aztecnrLogger = await createContractLogger(this.contractAddress, (addr)=>this.contractStore.getDebugContractName(addr), 'aztecnr', {
|
|
337
|
+
instanceId: this.jobId
|
|
338
|
+
});
|
|
339
|
+
}
|
|
340
|
+
return this.aztecnrLogger;
|
|
341
|
+
}
|
|
342
|
+
async log(level, message, fields) {
|
|
287
343
|
if (!LogLevels[level]) {
|
|
288
344
|
throw new Error(`Invalid log level: ${level}`);
|
|
289
345
|
}
|
|
290
|
-
const
|
|
291
|
-
|
|
346
|
+
const { kind, message: strippedMessage } = stripAztecnrLogPrefix(message);
|
|
347
|
+
const logger = kind == 'aztecnr' ? await this.#getAztecnrLogger() : await this.#getContractLogger();
|
|
348
|
+
logContractMessage(logger, LogLevels[level], strippedMessage, fields);
|
|
292
349
|
}
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
350
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
351
|
+
async getPendingTaggedLogs(pendingTaggedLogArrayBaseSlot, scope) {
|
|
352
|
+
const logService = this.#createLogService();
|
|
353
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
354
|
+
await this.capsuleService.appendToCapsuleArray(this.contractAddress, pendingTaggedLogArrayBaseSlot, logs.map((log)=>log.toFields()), this.jobId, scope);
|
|
355
|
+
}
|
|
356
|
+
/** Fetches pending tagged logs into a freshly allocated ephemeral array and returns its base slot. */ async getPendingTaggedLogsV2(scope) {
|
|
357
|
+
const logService = this.#createLogService();
|
|
358
|
+
const logs = await logService.fetchTaggedLogs(this.contractAddress, scope);
|
|
359
|
+
return this.ephemeralArrayService.newArray(logs.map((log)=>log.toFields()));
|
|
360
|
+
}
|
|
361
|
+
#createLogService() {
|
|
362
|
+
return new LogService(this.aztecNode, this.anchorBlockHeader, this.keyStore, this.recipientTaggingStore, this.senderAddressBookStore, this.addressStore, this.jobId, this.logger.getBindings());
|
|
296
363
|
}
|
|
297
364
|
/**
|
|
298
|
-
*
|
|
299
|
-
* `enqueue_event_for_validation`, inserting them into the note database and event store respectively, making them
|
|
300
|
-
* queryable via `get_notes` and `getPrivateEvents`.
|
|
365
|
+
* Legacy: validates note/event requests stored in capsule arrays.
|
|
301
366
|
*
|
|
302
|
-
*
|
|
303
|
-
|
|
304
|
-
* @param noteValidationRequestsArrayBaseSlot - The base slot of capsule array containing note validation requests.
|
|
305
|
-
* @param eventValidationRequestsArrayBaseSlot - The base slot of capsule array containing event validation requests.
|
|
306
|
-
*/ async utilityValidateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot) {
|
|
367
|
+
* Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
368
|
+
*/ async validateAndStoreEnqueuedNotesAndEvents(contractAddress, noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
307
369
|
// TODO(#10727): allow other contracts to store notes
|
|
308
370
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
309
371
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
310
372
|
}
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
373
|
+
const noteValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
374
|
+
const eventValidationRequests = (await this.capsuleService.readCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, this.jobId, scope)).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
375
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
376
|
+
await this.capsuleService.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
377
|
+
await this.capsuleService.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
378
|
+
}
|
|
379
|
+
async validateAndStoreEnqueuedNotesAndEventsV2(noteValidationRequestsArrayBaseSlot, eventValidationRequestsArrayBaseSlot, maxNotePackedLen, maxEventSerializedLen, scope) {
|
|
380
|
+
const noteValidationRequests = this.ephemeralArrayService.readArrayAt(noteValidationRequestsArrayBaseSlot).map((fields)=>NoteValidationRequest.fromFields(fields, maxNotePackedLen));
|
|
381
|
+
const eventValidationRequests = this.ephemeralArrayService.readArrayAt(eventValidationRequestsArrayBaseSlot).map((fields)=>EventValidationRequest.fromFields(fields, maxEventSerializedLen));
|
|
382
|
+
await this.#processValidationRequests(noteValidationRequests, eventValidationRequests, scope);
|
|
383
|
+
}
|
|
384
|
+
/**
|
|
385
|
+
* Dispatches note and event validation requests to the service layer.
|
|
386
|
+
*
|
|
387
|
+
* This function is an auxiliary to support legacy (capsule backed) and new (ephemeral array backed) versions of the
|
|
388
|
+
* `validateAndStoreEnqueuedNotesAndEvents` oracle.
|
|
389
|
+
*/ async #processValidationRequests(noteValidationRequests, eventValidationRequests, scope) {
|
|
315
390
|
const noteService = new NoteService(this.noteStore, this.aztecNode, this.anchorBlockHeader, this.jobId);
|
|
316
|
-
const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash,
|
|
391
|
+
const noteStorePromises = noteValidationRequests.map((request)=>noteService.validateAndStoreNote(request.contractAddress, request.owner, request.storageSlot, request.randomness, request.noteNonce, request.content, request.noteHash, request.nullifier, request.txHash, scope));
|
|
317
392
|
const eventService = new EventService(this.anchorBlockHeader, this.aztecNode, this.privateEventStore, this.jobId);
|
|
318
|
-
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash,
|
|
393
|
+
const eventStorePromises = eventValidationRequests.map((request)=>eventService.validateAndStoreEvent(request.contractAddress, request.eventTypeId, request.randomness, request.serializedEvent, request.eventCommitment, request.txHash, scope));
|
|
319
394
|
await Promise.all([
|
|
320
395
|
...noteStorePromises,
|
|
321
396
|
...eventStorePromises
|
|
322
397
|
]);
|
|
323
|
-
// Requests are cleared once we're done.
|
|
324
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, noteValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
325
|
-
await this.capsuleStore.setCapsuleArray(contractAddress, eventValidationRequestsArrayBaseSlot, [], this.jobId);
|
|
326
398
|
}
|
|
327
|
-
async
|
|
399
|
+
async getLogsByTag(contractAddress, logRetrievalRequestsArrayBaseSlot, logRetrievalResponsesArrayBaseSlot, scope) {
|
|
328
400
|
// TODO(#10727): allow other contracts to process partial notes
|
|
329
401
|
if (!this.contractAddress.equals(contractAddress)) {
|
|
330
402
|
throw new Error(`Got a note validation request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
331
403
|
}
|
|
332
404
|
// We read all log retrieval requests and process them all concurrently. This makes the process much faster as we
|
|
333
405
|
// don't need to wait for the network round-trip.
|
|
334
|
-
const logRetrievalRequests = (await this.
|
|
335
|
-
const logService =
|
|
336
|
-
const maybeLogRetrievalResponses = await logService.
|
|
406
|
+
const logRetrievalRequests = (await this.capsuleService.readCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, this.jobId, scope)).map(LogRetrievalRequest.fromFields);
|
|
407
|
+
const logService = this.#createLogService();
|
|
408
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(contractAddress, logRetrievalRequests);
|
|
337
409
|
// Requests are cleared once we're done.
|
|
338
|
-
await this.
|
|
410
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
339
411
|
// The responses are stored as Option<LogRetrievalResponse> in a second CapsuleArray.
|
|
340
|
-
await this.
|
|
412
|
+
await this.capsuleService.setCapsuleArray(contractAddress, logRetrievalResponsesArrayBaseSlot, maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption), this.jobId, scope);
|
|
413
|
+
}
|
|
414
|
+
async getLogsByTagV2(requestArrayBaseSlot) {
|
|
415
|
+
const logRetrievalRequests = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot).map(LogRetrievalRequest.fromFields);
|
|
416
|
+
const logService = this.#createLogService();
|
|
417
|
+
const maybeLogRetrievalResponses = await logService.fetchLogsByTag(this.contractAddress, logRetrievalRequests);
|
|
418
|
+
return this.ephemeralArrayService.newArray(maybeLogRetrievalResponses.map(LogRetrievalResponse.toSerializedOption));
|
|
419
|
+
}
|
|
420
|
+
// Deprecated, only kept for backwards compatibility until Alpha v5 rolls out.
|
|
421
|
+
async getMessageContextsByTxHash(contractAddress, messageContextRequestsArrayBaseSlot, messageContextResponsesArrayBaseSlot, scope) {
|
|
422
|
+
try {
|
|
423
|
+
if (!this.contractAddress.equals(contractAddress)) {
|
|
424
|
+
throw new Error(`Got a message context request from ${contractAddress}, expected ${this.contractAddress}`);
|
|
425
|
+
}
|
|
426
|
+
// TODO(@mverzilli): this is a prime example of where using an ephemeral array would make much more sense, we don't
|
|
427
|
+
// need scopes here, we just need a bit of shared memory to cross boundaries between Noir and TS.
|
|
428
|
+
// At the same time, we don't want to allow any global scope access other than where backwards compatibility
|
|
429
|
+
// forces us to. Hence we need the scope here to be artificial.
|
|
430
|
+
const requestCapsules = await this.capsuleService.readCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, this.jobId, scope);
|
|
431
|
+
const txHashes = requestCapsules.map((fields, i)=>{
|
|
432
|
+
if (fields.length !== 1) {
|
|
433
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
434
|
+
}
|
|
435
|
+
return fields[0];
|
|
436
|
+
});
|
|
437
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
438
|
+
// Leave response in response capsule array.
|
|
439
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextResponsesArrayBaseSlot, maybeMessageContexts.map(MessageContext.toSerializedOption), this.jobId, scope);
|
|
440
|
+
} finally{
|
|
441
|
+
await this.capsuleService.setCapsuleArray(contractAddress, messageContextRequestsArrayBaseSlot, [], this.jobId, scope);
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
/** Reads tx hash requests from an ephemeral array, resolves their contexts, and returns the response slot. */ async getMessageContextsByTxHashV2(requestArrayBaseSlot) {
|
|
445
|
+
const requestFields = this.ephemeralArrayService.readArrayAt(requestArrayBaseSlot);
|
|
446
|
+
const txHashes = requestFields.map((fields, i)=>{
|
|
447
|
+
if (fields.length !== 1) {
|
|
448
|
+
throw new Error(`Malformed message context request at index ${i}: expected 1 field (tx hash), got ${fields.length}`);
|
|
449
|
+
}
|
|
450
|
+
return fields[0];
|
|
451
|
+
});
|
|
452
|
+
const maybeMessageContexts = await this.messageContextService.getMessageContextsByTxHash(txHashes, this.anchorBlockHeader.getBlockNumber());
|
|
453
|
+
return this.ephemeralArrayService.newArray(maybeMessageContexts.map(MessageContext.toSerializedOption));
|
|
341
454
|
}
|
|
342
|
-
|
|
455
|
+
setCapsule(contractAddress, slot, capsule, scope) {
|
|
343
456
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
344
457
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
345
458
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
346
459
|
}
|
|
347
|
-
this.
|
|
348
|
-
return Promise.resolve();
|
|
460
|
+
this.capsuleService.setCapsule(contractAddress, slot, capsule, this.jobId, scope);
|
|
349
461
|
}
|
|
350
|
-
|
|
462
|
+
getCapsule(contractAddress, slot, scope) {
|
|
351
463
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
352
464
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
353
465
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
354
466
|
}
|
|
355
|
-
return
|
|
356
|
-
this.capsules.find((c)=>c.contractAddress.equals(contractAddress) && c.storageSlot.equals(slot))?.data ?? await this.capsuleStore.loadCapsule(this.contractAddress, slot, this.jobId));
|
|
467
|
+
return this.capsuleService.getCapsule(contractAddress, slot, this.jobId, scope, this.capsules);
|
|
357
468
|
}
|
|
358
|
-
|
|
469
|
+
deleteCapsule(contractAddress, slot, scope) {
|
|
359
470
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
360
471
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
361
472
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
362
473
|
}
|
|
363
|
-
this.
|
|
364
|
-
return Promise.resolve();
|
|
474
|
+
this.capsuleService.deleteCapsule(contractAddress, slot, this.jobId, scope);
|
|
365
475
|
}
|
|
366
|
-
|
|
476
|
+
copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, scope) {
|
|
367
477
|
if (!contractAddress.equals(this.contractAddress)) {
|
|
368
478
|
// TODO(#10727): instead of this check that this.contractAddress is allowed to access the external DB
|
|
369
479
|
throw new Error(`Contract ${contractAddress} is not allowed to access ${this.contractAddress}'s PXE DB`);
|
|
370
480
|
}
|
|
371
|
-
return this.
|
|
481
|
+
return this.capsuleService.copyCapsule(contractAddress, srcSlot, dstSlot, numEntries, this.jobId, scope);
|
|
482
|
+
}
|
|
483
|
+
/**
|
|
484
|
+
* Clears cached sync state for a contract for a set of scopes, forcing re-sync on the next query so that newly
|
|
485
|
+
* stored notes or events are discovered.
|
|
486
|
+
*/ setContractSyncCacheInvalid(contractAddress, scopes) {
|
|
487
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
488
|
+
throw new Error(`Contract ${this.contractAddress} cannot invalidate sync cache of ${contractAddress}`);
|
|
489
|
+
}
|
|
490
|
+
this.contractSyncService.invalidateContractForScopes(contractAddress, scopes);
|
|
372
491
|
}
|
|
373
492
|
// TODO(#11849): consider replacing this oracle with a pure Noir implementation of aes decryption.
|
|
374
|
-
|
|
493
|
+
decryptAes128(ciphertext, iv, symKey) {
|
|
375
494
|
const aes128 = new Aes128();
|
|
376
495
|
return aes128.decryptBufferCBC(ciphertext, iv, symKey);
|
|
377
496
|
}
|
|
378
497
|
/**
|
|
379
|
-
* Retrieves the shared secret for a given address and ephemeral public key.
|
|
498
|
+
* Retrieves the app-siloed shared secret for a given address and ephemeral public key.
|
|
380
499
|
* @param address - The address to get the secret for.
|
|
381
500
|
* @param ephPk - The ephemeral public key to get the secret for.
|
|
382
|
-
* @
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
501
|
+
* @param contractAddress - The contract address for app-siloing (validated against execution context).
|
|
502
|
+
* @returns The app-siloed shared secret as a Field.
|
|
503
|
+
*/ async getSharedSecret(address, ephPk, contractAddress) {
|
|
504
|
+
if (!contractAddress.equals(this.contractAddress)) {
|
|
505
|
+
throw new Error(`getSharedSecret called with contract address ${contractAddress}, expected ${this.contractAddress}`);
|
|
506
|
+
}
|
|
388
507
|
const recipientCompleteAddress = await this.getCompleteAddressOrFail(address);
|
|
389
508
|
const ivskM = await this.keyStore.getMasterSecretKey(recipientCompleteAddress.publicKeys.masterIncomingViewingPublicKey);
|
|
390
509
|
const addressSecret = await computeAddressSecret(await recipientCompleteAddress.getPreaddress(), ivskM);
|
|
391
|
-
return
|
|
510
|
+
return deriveAppSiloedSharedSecret(addressSecret, ephPk, this.contractAddress);
|
|
511
|
+
}
|
|
512
|
+
pushEphemeral(slot, elements) {
|
|
513
|
+
return this.ephemeralArrayService.push(slot, elements);
|
|
514
|
+
}
|
|
515
|
+
popEphemeral(slot) {
|
|
516
|
+
return this.ephemeralArrayService.pop(slot);
|
|
517
|
+
}
|
|
518
|
+
getEphemeral(slot, index) {
|
|
519
|
+
return this.ephemeralArrayService.get(slot, index);
|
|
520
|
+
}
|
|
521
|
+
setEphemeral(slot, index, elements) {
|
|
522
|
+
this.ephemeralArrayService.set(slot, index, elements);
|
|
523
|
+
}
|
|
524
|
+
getEphemeralLen(slot) {
|
|
525
|
+
return this.ephemeralArrayService.len(slot);
|
|
526
|
+
}
|
|
527
|
+
removeEphemeral(slot, index) {
|
|
528
|
+
this.ephemeralArrayService.remove(slot, index);
|
|
529
|
+
}
|
|
530
|
+
clearEphemeral(slot) {
|
|
531
|
+
this.ephemeralArrayService.clear(slot);
|
|
532
|
+
}
|
|
533
|
+
emitOffchainEffect(data) {
|
|
534
|
+
this.offchainEffects.push({
|
|
535
|
+
data,
|
|
536
|
+
contractAddress: this.contractAddress
|
|
537
|
+
});
|
|
538
|
+
return Promise.resolve();
|
|
539
|
+
}
|
|
540
|
+
/** Returns offchain effects collected during execution. */ getOffchainEffects() {
|
|
541
|
+
return this.offchainEffects;
|
|
542
|
+
}
|
|
543
|
+
/** Runs a query concurrently with a validation that the block hash is not ahead of the anchor block. */ async #queryWithBlockHashNotAfterAnchor(blockHash, query) {
|
|
544
|
+
const [response] = await Promise.all([
|
|
545
|
+
query(),
|
|
546
|
+
(async ()=>{
|
|
547
|
+
const header = await this.aztecNode.getBlockHeader(blockHash);
|
|
548
|
+
if (!header) {
|
|
549
|
+
throw new Error(`Could not find block header for block hash ${blockHash}`);
|
|
550
|
+
}
|
|
551
|
+
if (header.getBlockNumber() > this.anchorBlockHeader.getBlockNumber()) {
|
|
552
|
+
throw new Error(`Made a node query with a reference block hash ${blockHash} with block number ${header.getBlockNumber()}, which is ahead of the anchor block number ${this.anchorBlockHeader.getBlockNumber()} (from anchor block hash ${await this.anchorBlockHeader.hash()}).`);
|
|
553
|
+
}
|
|
554
|
+
})()
|
|
555
|
+
]);
|
|
556
|
+
return response;
|
|
392
557
|
}
|
|
393
558
|
}
|
|
@@ -82,4 +82,4 @@ interface ContainsNote {
|
|
|
82
82
|
*/
|
|
83
83
|
export declare function pickNotes<T extends ContainsNote>(noteDatas: T[], { selects, sorts, limit, offset }: GetOptions): T[];
|
|
84
84
|
export {};
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGlja19ub3Rlcy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbnRyYWN0X2Z1bmN0aW9uX3NpbXVsYXRvci9waWNrX25vdGVzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxnQ0FBZ0MsQ0FBQztBQUNwRCxPQUFPLEVBQUUsVUFBVSxFQUFFLEtBQUssSUFBSSxFQUFFLE1BQU0sb0JBQW9CLENBQUM7QUFFM0QsTUFBTSxXQUFXLGdCQUFnQjtJQUMvQixLQUFLLEVBQUUsTUFBTSxDQUFDO0lBQ2QsTUFBTSxFQUFFLE1BQU0sQ0FBQztJQUNmLE1BQU0sRUFBRSxNQUFNLENBQUM7Q0FDaEI7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyxNQUFNO0lBQ3JCOztPQUVHO0lBQ0gsUUFBUSxFQUFFLGdCQUFnQixDQUFDO0lBQzNCOztPQUVHO0lBQ0gsS0FBSyxFQUFFLEVBQUUsQ0FBQztJQUNWOztPQUVHO0lBQ0gsVUFBVSxFQUFFLFVBQVUsQ0FBQztDQUN4QjtBQUVEOztHQUVHO0FBQ0gsb0JBQVksU0FBUztJQUNuQixJQUFJLElBQUk7SUFDUixJQUFJLElBQUk7SUFDUixHQUFHLElBQUk7Q0FDUjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxXQUFXLElBQUk7SUFDbkI7O09BRUc7SUFDSCxRQUFRLEVBQUUsZ0JBQWdCLENBQUM7SUFDM0I7O09BRUc7SUFDSCxLQUFLLEVBQUUsU0FBUyxDQUFDO0NBQ2xCO0FBRUQ7O0dBRUc7QUFDSCxVQUFVLFVBQVU7SUFDbEI7OztPQUdHO0lBQ0gsT0FBTyxDQUFDLEVBQUUsTUFBTSxFQUFFLENBQUM7SUFDbkI7OztPQUdHO0lBQ0gsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7SUFDZjs7O09BR0c7SUFDSCxLQUFLLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDZjs7O09BR0c7SUFDSCxNQUFNLENBQUMsRUFBRSxNQUFNLENBQUM7Q0FDakI7QUFFRDs7R0FFRztBQUNILFVBQVUsWUFBWTtJQUNwQjs7T0FFRztJQUNILElBQUksRUFBRSxJQUFJLENBQUM7Q0FDWjtBQXFERDs7R0FFRztBQUNILHdCQUFnQixTQUFTLENBQUMsQ0FBQyxTQUFTLFlBQVksRUFDOUMsU0FBUyxFQUFFLENBQUMsRUFBRSxFQUNkLEVBQUUsT0FBWSxFQUFFLEtBQVUsRUFBRSxLQUFTLEVBQUUsTUFBVSxFQUFFLEVBQUUsVUFBVSxHQUM5RCxDQUFDLEVBQUUsQ0FJTCJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;
|
|
1
|
+
{"version":3,"file":"pick_notes.d.ts","sourceRoot":"","sources":["../../src/contract_function_simulator/pick_notes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,gCAAgC,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAE3D,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,MAAM;IACrB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,EAAE,CAAC;IACV;;OAEG;IACH,UAAU,EAAE,UAAU,CAAC;CACxB;AAED;;GAEG;AACH,oBAAY,SAAS;IACnB,IAAI,IAAI;IACR,IAAI,IAAI;IACR,GAAG,IAAI;CACR;AAED;;GAEG;AACH,MAAM,WAAW,IAAI;IACnB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,SAAS,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,UAAU;IAClB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;;OAGG;IACH,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;IACf;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;CACZ;AAqDD;;GAEG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,YAAY,EAC9C,SAAS,EAAE,CAAC,EAAE,EACd,EAAE,OAAY,EAAE,KAAU,EAAE,KAAS,EAAE,MAAU,EAAE,EAAE,UAAU,GAC9D,CAAC,EAAE,CAIL"}
|