@aztec/pxe 0.73.0 → 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2
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/index.js +3 -5
- package/dest/config/index.js +18 -21
- package/dest/config/package_info.js +4 -2
- package/dest/contract_data_oracle/index.js +69 -79
- package/dest/contract_data_oracle/private_functions_tree.js +44 -50
- package/dest/database/contracts/contract_artifact_db.js +3 -2
- package/dest/database/contracts/contract_instance_db.js +3 -2
- package/dest/database/index.js +0 -1
- package/dest/database/kv_pxe_database.js +243 -259
- package/dest/database/note_dao.js +28 -43
- package/dest/database/outgoing_note_dao.js +20 -34
- package/dest/database/pxe_database.js +4 -2
- package/dest/database/pxe_database_test_suite.js +296 -151
- package/dest/index.js +0 -1
- package/dest/kernel_oracle/index.js +9 -6
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +68 -66
- package/dest/kernel_prover/hints/index.js +0 -1
- package/dest/kernel_prover/index.js +0 -1
- package/dest/kernel_prover/kernel_prover.js +60 -65
- package/dest/kernel_prover/proving_data_oracle.js +4 -2
- package/dest/note_decryption_utils/add_public_values_to_payload.js +8 -9
- package/dest/pxe_http/index.js +0 -1
- package/dest/pxe_http/pxe_http_server.js +8 -6
- package/dest/pxe_service/error_enriching.js +10 -13
- package/dest/pxe_service/index.js +0 -1
- package/dest/pxe_service/pxe_service.js +283 -288
- package/dest/pxe_service/test/pxe_test_suite.js +40 -27
- package/dest/simulator/index.js +1 -3
- package/dest/simulator_oracle/index.js +266 -231
- package/dest/simulator_oracle/tagging_utils.js +4 -6
- package/dest/synchronizer/index.js +0 -1
- package/dest/synchronizer/synchronizer.js +42 -39
- package/dest/utils/create_pxe_service.js +9 -9
- package/package.json +15 -15
- package/src/pxe_service/pxe_service.ts +12 -14
- package/src/synchronizer/synchronizer.ts +5 -2
- package/dest/bin/index.d.ts +0 -3
- package/dest/bin/index.d.ts.map +0 -1
- package/dest/config/index.d.ts +0 -46
- package/dest/config/index.d.ts.map +0 -1
- package/dest/config/package_info.d.ts +0 -5
- package/dest/config/package_info.d.ts.map +0 -1
- package/dest/contract_data_oracle/index.d.ts +0 -104
- package/dest/contract_data_oracle/index.d.ts.map +0 -1
- package/dest/contract_data_oracle/private_functions_tree.d.ts +0 -65
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +0 -1
- package/dest/database/contracts/contract_artifact_db.d.ts +0 -20
- package/dest/database/contracts/contract_artifact_db.d.ts.map +0 -1
- package/dest/database/contracts/contract_instance_db.d.ts +0 -19
- package/dest/database/contracts/contract_instance_db.d.ts.map +0 -1
- package/dest/database/index.d.ts +0 -3
- package/dest/database/index.d.ts.map +0 -1
- package/dest/database/kv_pxe_database.d.ts +0 -55
- package/dest/database/kv_pxe_database.d.ts.map +0 -1
- package/dest/database/note_dao.d.ts +0 -103
- package/dest/database/note_dao.d.ts.map +0 -1
- package/dest/database/outgoing_note_dao.d.ts +0 -73
- package/dest/database/outgoing_note_dao.d.ts.map +0 -1
- package/dest/database/pxe_database.d.ts +0 -216
- package/dest/database/pxe_database.d.ts.map +0 -1
- package/dest/database/pxe_database_test_suite.d.ts +0 -7
- package/dest/database/pxe_database_test_suite.d.ts.map +0 -1
- package/dest/index.d.ts +0 -15
- package/dest/index.d.ts.map +0 -1
- package/dest/kernel_oracle/index.d.ts +0 -34
- package/dest/kernel_oracle/index.d.ts.map +0 -1
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts +0 -28
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts.map +0 -1
- package/dest/kernel_prover/hints/index.d.ts +0 -2
- package/dest/kernel_prover/hints/index.d.ts.map +0 -1
- package/dest/kernel_prover/index.d.ts +0 -3
- package/dest/kernel_prover/index.d.ts.map +0 -1
- package/dest/kernel_prover/kernel_prover.d.ts +0 -38
- package/dest/kernel_prover/kernel_prover.d.ts.map +0 -1
- package/dest/kernel_prover/proving_data_oracle.d.ts +0 -65
- package/dest/kernel_prover/proving_data_oracle.d.ts.map +0 -1
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts +0 -10
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts.map +0 -1
- package/dest/pxe_http/index.d.ts +0 -2
- package/dest/pxe_http/index.d.ts.map +0 -1
- package/dest/pxe_http/pxe_http_server.d.ts +0 -16
- package/dest/pxe_http/pxe_http_server.d.ts.map +0 -1
- package/dest/pxe_service/error_enriching.d.ts +0 -11
- package/dest/pxe_service/error_enriching.d.ts.map +0 -1
- package/dest/pxe_service/index.d.ts +0 -4
- package/dest/pxe_service/index.d.ts.map +0 -1
- package/dest/pxe_service/pxe_service.d.ts +0 -97
- package/dest/pxe_service/pxe_service.d.ts.map +0 -1
- package/dest/pxe_service/test/pxe_test_suite.d.ts +0 -3
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +0 -1
- package/dest/simulator/index.d.ts +0 -10
- package/dest/simulator/index.d.ts.map +0 -1
- package/dest/simulator_oracle/index.d.ts +0 -129
- package/dest/simulator_oracle/index.d.ts.map +0 -1
- package/dest/simulator_oracle/tagging_utils.d.ts +0 -16
- package/dest/simulator_oracle/tagging_utils.d.ts.map +0 -1
- package/dest/synchronizer/index.d.ts +0 -2
- package/dest/synchronizer/index.d.ts.map +0 -1
- package/dest/synchronizer/synchronizer.d.ts +0 -29
- package/dest/synchronizer/synchronizer.d.ts.map +0 -1
- package/dest/utils/create_pxe_service.d.ts +0 -16
- package/dest/utils/create_pxe_service.d.ts.map +0 -1
|
@@ -1,10 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import { EventMetadata, L1EventPayload, MerkleTreeId, PrivateSimulationResult, SimulationError, TxProvingResult, TxSimulationResult, UniqueNote, getNonNullifiedL1ToL2MessageWitness, } from '@aztec/circuit-types';
|
|
4
|
-
import { computeContractAddressFromInstance, computeContractClassId, getContractClassFromArtifact, } from '@aztec/circuits.js/contract';
|
|
1
|
+
import { EventMetadata, L1EventPayload, MerkleTreeId, PrivateSimulationResult, SimulationError, TxProvingResult, TxSimulationResult, UniqueNote, getNonNullifiedL1ToL2MessageWitness } from '@aztec/circuit-types';
|
|
2
|
+
import { computeContractAddressFromInstance, getContractClassFromArtifact } from '@aztec/circuits.js/contract';
|
|
5
3
|
import { computeNoteHashNonce, siloNullifier } from '@aztec/circuits.js/hash';
|
|
6
4
|
import { computeAddressSecret } from '@aztec/circuits.js/keys';
|
|
7
|
-
import { EventSelector, FunctionSelector, FunctionType, decodeFunctionSignature, encodeArguments
|
|
5
|
+
import { EventSelector, FunctionSelector, FunctionType, decodeFunctionSignature, encodeArguments } from '@aztec/foundation/abi';
|
|
8
6
|
import { Fr } from '@aztec/foundation/fields';
|
|
9
7
|
import { createLogger } from '@aztec/foundation/log';
|
|
10
8
|
import { Timer } from '@aztec/foundation/timer';
|
|
@@ -21,37 +19,44 @@ import { Synchronizer } from '../synchronizer/index.js';
|
|
|
21
19
|
import { enrichPublicSimulationError, enrichSimulationError } from './error_enriching.js';
|
|
22
20
|
/**
|
|
23
21
|
* A Private eXecution Environment (PXE) implementation.
|
|
24
|
-
*/
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
*/ export class PXEService {
|
|
23
|
+
keyStore;
|
|
24
|
+
node;
|
|
25
|
+
db;
|
|
26
|
+
proofCreator;
|
|
27
|
+
simulationProvider;
|
|
28
|
+
synchronizer;
|
|
29
|
+
contractDataOracle;
|
|
30
|
+
simulator;
|
|
31
|
+
log;
|
|
32
|
+
packageVersion;
|
|
33
|
+
proverEnabled;
|
|
34
|
+
constructor(keyStore, node, db, tipsStore, proofCreator, simulationProvider, config, loggerOrSuffix){
|
|
28
35
|
this.keyStore = keyStore;
|
|
29
36
|
this.node = node;
|
|
30
37
|
this.db = db;
|
|
31
38
|
this.proofCreator = proofCreator;
|
|
32
39
|
this.simulationProvider = simulationProvider;
|
|
33
|
-
this.log = createLogger(
|
|
34
|
-
this.synchronizer = new Synchronizer(node, db, tipsStore, config,
|
|
40
|
+
this.log = !loggerOrSuffix || typeof loggerOrSuffix === 'string' ? createLogger(loggerOrSuffix ? `pxe:service:${loggerOrSuffix}` : `pxe:service`) : loggerOrSuffix;
|
|
41
|
+
this.synchronizer = new Synchronizer(node, db, tipsStore, config, loggerOrSuffix);
|
|
35
42
|
this.contractDataOracle = new ContractDataOracle(db);
|
|
36
43
|
this.simulator = getAcirSimulator(db, node, keyStore, this.simulationProvider, this.contractDataOracle);
|
|
37
44
|
this.packageVersion = getPackageInfo().version;
|
|
38
45
|
this.proverEnabled = !!config.proverEnabled;
|
|
39
46
|
}
|
|
40
47
|
/**
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
await __classPrivateFieldGet(this, _PXEService_instances, "m", _PXEService_registerProtocolContracts).call(this);
|
|
48
|
+
* Starts the PXE Service by beginning the synchronization process between the Aztec node and the database.
|
|
49
|
+
*
|
|
50
|
+
* @returns A promise that resolves when the server has started successfully.
|
|
51
|
+
*/ async init() {
|
|
52
|
+
await this.#registerProtocolContracts();
|
|
47
53
|
const info = await this.getNodeInfo();
|
|
48
54
|
this.log.info(`Started PXE connected to chain ${info.l1ChainId} version ${info.protocolVersion}`);
|
|
49
55
|
}
|
|
50
56
|
isL1ToL2MessageSynced(l1ToL2Message) {
|
|
51
57
|
return this.node.isL1ToL2MessageSynced(l1ToL2Message);
|
|
52
58
|
}
|
|
53
|
-
/** Returns an estimate of the db size in bytes. */
|
|
54
|
-
estimateDbSize() {
|
|
59
|
+
/** Returns an estimate of the db size in bytes. */ estimateDbSize() {
|
|
55
60
|
return this.db.estimateSize();
|
|
56
61
|
}
|
|
57
62
|
addAuthWitness(witness) {
|
|
@@ -69,16 +74,16 @@ export class PXEService {
|
|
|
69
74
|
async getContractClassMetadata(id, includeArtifact = false) {
|
|
70
75
|
const artifact = await this.db.getContractArtifact(id);
|
|
71
76
|
return {
|
|
72
|
-
contractClass: artifact &&
|
|
73
|
-
isContractClassPubliclyRegistered: await
|
|
74
|
-
artifact: includeArtifact ? artifact : undefined
|
|
77
|
+
contractClass: artifact && await getContractClassFromArtifact(artifact),
|
|
78
|
+
isContractClassPubliclyRegistered: await this.#isContractClassPubliclyRegistered(id),
|
|
79
|
+
artifact: includeArtifact ? artifact : undefined
|
|
75
80
|
};
|
|
76
81
|
}
|
|
77
82
|
async getContractMetadata(address) {
|
|
78
83
|
return {
|
|
79
84
|
contractInstance: await this.db.getContractInstance(address),
|
|
80
|
-
isContractInitialized: await
|
|
81
|
-
isContractPubliclyDeployed: await
|
|
85
|
+
isContractInitialized: await this.#isContractInitialized(address),
|
|
86
|
+
isContractPubliclyDeployed: await this.#isContractPubliclyDeployed(address)
|
|
82
87
|
};
|
|
83
88
|
}
|
|
84
89
|
async registerAccount(secretKey, partialAddress) {
|
|
@@ -87,8 +92,7 @@ export class PXEService {
|
|
|
87
92
|
if (accounts.includes(accountCompleteAddress.address)) {
|
|
88
93
|
this.log.info(`Account:\n "${accountCompleteAddress.address.toString()}"\n already registered.`);
|
|
89
94
|
return accountCompleteAddress;
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
95
|
+
} else {
|
|
92
96
|
this.log.info(`Registered account ${accountCompleteAddress.address.toString()}`);
|
|
93
97
|
this.log.debug(`Registered account\n ${accountCompleteAddress.toReadableString()}`);
|
|
94
98
|
}
|
|
@@ -104,8 +108,7 @@ export class PXEService {
|
|
|
104
108
|
const wasAdded = await this.db.addSenderAddress(address);
|
|
105
109
|
if (wasAdded) {
|
|
106
110
|
this.log.info(`Added sender:\n ${address.toString()}`);
|
|
107
|
-
}
|
|
108
|
-
else {
|
|
111
|
+
} else {
|
|
109
112
|
this.log.info(`Sender:\n "${address.toString()}"\n already registered.`);
|
|
110
113
|
}
|
|
111
114
|
return address;
|
|
@@ -118,8 +121,7 @@ export class PXEService {
|
|
|
118
121
|
const wasRemoved = await this.db.removeSenderAddress(address);
|
|
119
122
|
if (wasRemoved) {
|
|
120
123
|
this.log.info(`Removed sender:\n ${address.toString()}`);
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
124
|
+
} else {
|
|
123
125
|
this.log.info(`Sender:\n "${address.toString()}"\n not in address book.`);
|
|
124
126
|
}
|
|
125
127
|
return Promise.resolve();
|
|
@@ -129,10 +131,10 @@ export class PXEService {
|
|
|
129
131
|
const completeAddresses = await this.db.getCompleteAddresses();
|
|
130
132
|
// Filter out the addresses not corresponding to accounts
|
|
131
133
|
const accounts = await this.keyStore.getAccounts();
|
|
132
|
-
return completeAddresses.filter(completeAddress
|
|
134
|
+
return completeAddresses.filter((completeAddress)=>accounts.find((address)=>address.equals(completeAddress.address)));
|
|
133
135
|
}
|
|
134
136
|
async registerContractClass(artifact) {
|
|
135
|
-
const contractClassId = await
|
|
137
|
+
const { id: contractClassId } = await getContractClassFromArtifact(artifact);
|
|
136
138
|
await this.db.addContractArtifact(contractClassId, artifact);
|
|
137
139
|
this.log.info(`Added contract class ${artifact.name} with id ${contractClassId}`);
|
|
138
140
|
}
|
|
@@ -142,23 +144,23 @@ export class PXEService {
|
|
|
142
144
|
if (artifact) {
|
|
143
145
|
// If the user provides an artifact, validate it against the expected class id and register it
|
|
144
146
|
const contractClass = await getContractClassFromArtifact(artifact);
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
throw new Error(`Artifact does not match expected class id (computed ${contractClassId} but instance refers to ${instance.contractClassId})`);
|
|
147
|
+
if (!contractClass.id.equals(instance.contractClassId)) {
|
|
148
|
+
throw new Error(`Artifact does not match expected class id (computed ${contractClass.id} but instance refers to ${instance.contractClassId})`);
|
|
148
149
|
}
|
|
149
150
|
const computedAddress = await computeContractAddressFromInstance(instance);
|
|
150
151
|
if (!computedAddress.equals(instance.address)) {
|
|
151
152
|
throw new Error('Added a contract in which the address does not match the contract instance.');
|
|
152
153
|
}
|
|
153
|
-
await this.db.addContractArtifact(
|
|
154
|
-
const publicFunctionSignatures = artifact.functions
|
|
155
|
-
.filter(fn => fn.functionType === FunctionType.PUBLIC)
|
|
156
|
-
.map(fn => decodeFunctionSignature(fn.name, fn.parameters));
|
|
154
|
+
await this.db.addContractArtifact(contractClass.id, artifact);
|
|
155
|
+
const publicFunctionSignatures = artifact.functions.filter((fn)=>fn.functionType === FunctionType.PUBLIC).map((fn)=>decodeFunctionSignature(fn.name, fn.parameters));
|
|
157
156
|
await this.node.registerContractFunctionSignatures(instance.address, publicFunctionSignatures);
|
|
158
157
|
// TODO(#10007): Node should get public contract class from the registration event, not from PXE registration
|
|
159
|
-
await this.node.addContractClass({
|
|
160
|
-
|
|
161
|
-
|
|
158
|
+
await this.node.addContractClass({
|
|
159
|
+
...contractClass,
|
|
160
|
+
privateFunctions: [],
|
|
161
|
+
unconstrainedFunctions: []
|
|
162
|
+
});
|
|
163
|
+
} else {
|
|
162
164
|
// Otherwise, make sure there is an artifact already registered for that class id
|
|
163
165
|
artifact = await this.db.getContractArtifact(instance.contractClassId);
|
|
164
166
|
if (!artifact) {
|
|
@@ -172,18 +174,18 @@ export class PXEService {
|
|
|
172
174
|
return this.db.getContractsAddresses();
|
|
173
175
|
}
|
|
174
176
|
async getPublicStorageAt(contract, slot) {
|
|
175
|
-
if (!
|
|
177
|
+
if (!await this.getContractInstance(contract)) {
|
|
176
178
|
throw new Error(`Contract ${contract.toString()} is not deployed`);
|
|
177
179
|
}
|
|
178
180
|
return await this.node.getPublicStorageAt(contract, slot, 'latest');
|
|
179
181
|
}
|
|
180
182
|
async getNotes(filter) {
|
|
181
183
|
const noteDaos = await this.db.getNotes(filter);
|
|
182
|
-
const extendedNotes = noteDaos.map(async (dao)
|
|
184
|
+
const extendedNotes = noteDaos.map(async (dao)=>{
|
|
183
185
|
let owner = filter.owner;
|
|
184
186
|
if (owner === undefined) {
|
|
185
187
|
const completeAddresses = await this.db.getCompleteAddresses();
|
|
186
|
-
const completeAddressIndex = (await Promise.all(completeAddresses.map(completeAddresses
|
|
188
|
+
const completeAddressIndex = (await Promise.all(completeAddresses.map((completeAddresses)=>completeAddresses.address.toAddressPoint()))).findIndex((addressPoint)=>addressPoint.equals(dao.addressPoint));
|
|
187
189
|
const completeAddress = completeAddresses[completeAddressIndex];
|
|
188
190
|
if (completeAddress === undefined) {
|
|
189
191
|
throw new Error(`Cannot find complete address for addressPoint ${dao.addressPoint.toString()}`);
|
|
@@ -205,19 +207,21 @@ export class PXEService {
|
|
|
205
207
|
if (!owner) {
|
|
206
208
|
throw new Error(`Unknown account: ${note.owner.toString()}`);
|
|
207
209
|
}
|
|
208
|
-
const { data: nonces, l2BlockNumber, l2BlockHash } = await
|
|
210
|
+
const { data: nonces, l2BlockNumber, l2BlockHash } = await this.#getNoteNonces(note);
|
|
209
211
|
if (nonces.length === 0) {
|
|
210
212
|
throw new Error(`Cannot find the note in tx: ${note.txHash}.`);
|
|
211
213
|
}
|
|
212
|
-
for (const nonce of nonces)
|
|
214
|
+
for (const nonce of nonces){
|
|
213
215
|
const { noteHash, uniqueNoteHash, innerNullifier } = await this.simulator.computeNoteHashAndOptionallyANullifier(note.contractAddress, nonce, note.storageSlot, note.noteTypeId, true, note.note);
|
|
214
|
-
const [index] = await this.node.findLeavesIndexes('latest', MerkleTreeId.NOTE_HASH_TREE, [
|
|
216
|
+
const [index] = await this.node.findLeavesIndexes('latest', MerkleTreeId.NOTE_HASH_TREE, [
|
|
217
|
+
uniqueNoteHash
|
|
218
|
+
]);
|
|
215
219
|
if (index === undefined) {
|
|
216
220
|
throw new Error('Note does not exist.');
|
|
217
221
|
}
|
|
218
222
|
const siloedNullifier = await siloNullifier(note.contractAddress, innerNullifier);
|
|
219
223
|
const [nullifierIndex] = await this.node.findLeavesIndexes('latest', MerkleTreeId.NULLIFIER_TREE, [
|
|
220
|
-
siloedNullifier
|
|
224
|
+
siloedNullifier
|
|
221
225
|
]);
|
|
222
226
|
if (nullifierIndex !== undefined) {
|
|
223
227
|
throw new Error('The note has been destroyed.');
|
|
@@ -226,23 +230,54 @@ export class PXEService {
|
|
|
226
230
|
}
|
|
227
231
|
}
|
|
228
232
|
async addNullifiedNote(note) {
|
|
229
|
-
const { data: nonces, l2BlockHash, l2BlockNumber } = await
|
|
233
|
+
const { data: nonces, l2BlockHash, l2BlockNumber } = await this.#getNoteNonces(note);
|
|
230
234
|
if (nonces.length === 0) {
|
|
231
235
|
throw new Error(`Cannot find the note in tx: ${note.txHash}.`);
|
|
232
236
|
}
|
|
233
|
-
for (const nonce of nonces)
|
|
237
|
+
for (const nonce of nonces){
|
|
234
238
|
const { noteHash, uniqueNoteHash, innerNullifier } = await this.simulator.computeNoteHashAndOptionallyANullifier(note.contractAddress, nonce, note.storageSlot, note.noteTypeId, false, note.note);
|
|
235
239
|
if (!innerNullifier.equals(Fr.ZERO)) {
|
|
236
240
|
throw new Error('Unexpectedly received non-zero nullifier.');
|
|
237
241
|
}
|
|
238
|
-
const [index] = await this.node.findLeavesIndexes('latest', MerkleTreeId.NOTE_HASH_TREE, [
|
|
242
|
+
const [index] = await this.node.findLeavesIndexes('latest', MerkleTreeId.NOTE_HASH_TREE, [
|
|
243
|
+
uniqueNoteHash
|
|
244
|
+
]);
|
|
239
245
|
if (index === undefined) {
|
|
240
246
|
throw new Error('Note does not exist.');
|
|
241
247
|
}
|
|
242
|
-
await this.db.addNullifiedNote(new NoteDao(note.note, note.contractAddress, note.storageSlot, nonce, noteHash, Fr.ZERO,
|
|
243
|
-
note.txHash, l2BlockNumber, l2BlockHash, index, await note.owner.toAddressPoint(), note.noteTypeId));
|
|
248
|
+
await this.db.addNullifiedNote(new NoteDao(note.note, note.contractAddress, note.storageSlot, nonce, noteHash, Fr.ZERO, note.txHash, l2BlockNumber, l2BlockHash, index, await note.owner.toAddressPoint(), note.noteTypeId));
|
|
244
249
|
}
|
|
245
250
|
}
|
|
251
|
+
/**
|
|
252
|
+
* Finds the nonce(s) for a given note.
|
|
253
|
+
* @param note - The note to find the nonces for.
|
|
254
|
+
* @returns The nonces of the note.
|
|
255
|
+
* @remarks More than a single nonce may be returned since there might be more than one nonce for a given note.
|
|
256
|
+
*/ async #getNoteNonces(note) {
|
|
257
|
+
const tx = await this.node.getTxEffect(note.txHash);
|
|
258
|
+
if (!tx) {
|
|
259
|
+
throw new Error(`Unknown tx: ${note.txHash}`);
|
|
260
|
+
}
|
|
261
|
+
const nonces = [];
|
|
262
|
+
const firstNullifier = tx.data.nullifiers[0];
|
|
263
|
+
const hashes = tx.data.noteHashes;
|
|
264
|
+
for(let i = 0; i < hashes.length; ++i){
|
|
265
|
+
const hash = hashes[i];
|
|
266
|
+
if (hash.equals(Fr.ZERO)) {
|
|
267
|
+
break;
|
|
268
|
+
}
|
|
269
|
+
const nonce = await computeNoteHashNonce(firstNullifier, i);
|
|
270
|
+
const { uniqueNoteHash } = await this.simulator.computeNoteHashAndOptionallyANullifier(note.contractAddress, nonce, note.storageSlot, note.noteTypeId, false, note.note);
|
|
271
|
+
if (hash.equals(uniqueNoteHash)) {
|
|
272
|
+
nonces.push(nonce);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
return {
|
|
276
|
+
l2BlockHash: tx.l2BlockHash,
|
|
277
|
+
l2BlockNumber: tx.l2BlockNumber,
|
|
278
|
+
data: nonces
|
|
279
|
+
};
|
|
280
|
+
}
|
|
246
281
|
async getBlock(blockNumber) {
|
|
247
282
|
// If a negative block number is provided the current block number is fetched.
|
|
248
283
|
if (blockNumber < 0) {
|
|
@@ -255,14 +290,13 @@ export class PXEService {
|
|
|
255
290
|
}
|
|
256
291
|
async proveTx(txRequest, privateExecutionResult) {
|
|
257
292
|
try {
|
|
258
|
-
const { publicInputs, clientIvcProof } = await
|
|
293
|
+
const { publicInputs, clientIvcProof } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
|
|
259
294
|
simulate: false,
|
|
260
295
|
profile: false,
|
|
261
|
-
dryRun: false
|
|
296
|
+
dryRun: false
|
|
262
297
|
});
|
|
263
298
|
return new TxProvingResult(privateExecutionResult, publicInputs, clientIvcProof);
|
|
264
|
-
}
|
|
265
|
-
catch (err) {
|
|
299
|
+
} catch (err) {
|
|
266
300
|
throw this.contextualizeError(err, inspect(txRequest), inspect(privateExecutionResult));
|
|
267
301
|
}
|
|
268
302
|
}
|
|
@@ -276,25 +310,25 @@ export class PXEService {
|
|
|
276
310
|
msgSender,
|
|
277
311
|
chainId: txRequest.txContext.chainId,
|
|
278
312
|
version: txRequest.txContext.version,
|
|
279
|
-
authWitnesses: txRequest.authWitnesses.map(w
|
|
313
|
+
authWitnesses: txRequest.authWitnesses.map((w)=>w.requestHash)
|
|
280
314
|
};
|
|
281
315
|
this.log.info(`Simulating transaction execution request to ${txRequest.functionSelector} at ${txRequest.origin}`, txInfo);
|
|
282
316
|
const timer = new Timer();
|
|
283
317
|
await this.synchronizer.sync();
|
|
284
|
-
const privateExecutionResult = await
|
|
285
|
-
const { publicInputs, profileResult } = await
|
|
318
|
+
const privateExecutionResult = await this.#executePrivate(txRequest, msgSender, scopes);
|
|
319
|
+
const { publicInputs, profileResult } = await this.#prove(txRequest, this.proofCreator, privateExecutionResult, {
|
|
286
320
|
simulate: !profile,
|
|
287
321
|
profile,
|
|
288
|
-
dryRun: true
|
|
322
|
+
dryRun: true
|
|
289
323
|
});
|
|
290
324
|
const privateSimulationResult = new PrivateSimulationResult(privateExecutionResult, publicInputs);
|
|
291
325
|
const simulatedTx = privateSimulationResult.toSimulatedTx();
|
|
292
326
|
let publicOutput;
|
|
293
327
|
if (simulatePublic) {
|
|
294
|
-
publicOutput = await
|
|
328
|
+
publicOutput = await this.#simulatePublicCalls(simulatedTx, enforceFeePayment);
|
|
295
329
|
}
|
|
296
330
|
if (!skipTxValidation) {
|
|
297
|
-
if (!
|
|
331
|
+
if (!await this.node.isValidTx(simulatedTx, true)) {
|
|
298
332
|
throw new Error('The simulated transaction is unable to be added to state and is invalid.');
|
|
299
333
|
}
|
|
300
334
|
}
|
|
@@ -302,19 +336,18 @@ export class PXEService {
|
|
|
302
336
|
this.log.info(`Simulation completed for ${txHash.toString()} in ${timer.ms()}ms`, {
|
|
303
337
|
txHash,
|
|
304
338
|
...txInfo,
|
|
305
|
-
...
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
339
|
+
...profileResult ? {
|
|
340
|
+
gateCounts: profileResult.gateCounts
|
|
341
|
+
} : {},
|
|
342
|
+
...publicOutput ? {
|
|
343
|
+
gasUsed: publicOutput.gasUsed,
|
|
344
|
+
revertCode: publicOutput.txEffect.revertCode.getCode(),
|
|
345
|
+
revertReason: publicOutput.revertReason
|
|
346
|
+
} : {}
|
|
313
347
|
});
|
|
314
348
|
return TxSimulationResult.fromPrivateSimulationResultAndPublicOutput(privateSimulationResult, publicOutput, profileResult);
|
|
315
|
-
}
|
|
316
|
-
|
|
317
|
-
throw this.contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `profile=${profile}`, `scopes=${scopes?.map(s => s.toString()).join(', ') ?? 'undefined'}`);
|
|
349
|
+
} catch (err) {
|
|
350
|
+
throw this.contextualizeError(err, inspect(txRequest), `simulatePublic=${simulatePublic}`, `msgSender=${msgSender?.toString() ?? 'undefined'}`, `skipTxValidation=${skipTxValidation}`, `profile=${profile}`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
|
|
318
351
|
}
|
|
319
352
|
}
|
|
320
353
|
async sendTx(tx) {
|
|
@@ -323,7 +356,7 @@ export class PXEService {
|
|
|
323
356
|
throw new Error(`A settled tx with equal hash ${txHash.toString()} exists.`);
|
|
324
357
|
}
|
|
325
358
|
this.log.debug(`Sending transaction ${txHash}`);
|
|
326
|
-
await this.node.sendTx(tx).catch(err
|
|
359
|
+
await this.node.sendTx(tx).catch((err)=>{
|
|
327
360
|
throw this.contextualizeError(err, inspect(tx));
|
|
328
361
|
});
|
|
329
362
|
this.log.info(`Sent transaction ${txHash}`);
|
|
@@ -333,14 +366,13 @@ export class PXEService {
|
|
|
333
366
|
try {
|
|
334
367
|
await this.synchronizer.sync();
|
|
335
368
|
// TODO - Should check if `from` has the permission to call the view function.
|
|
336
|
-
const functionCall = await
|
|
337
|
-
const executionResult = await
|
|
369
|
+
const functionCall = await this.#getFunctionCall(functionName, args, to);
|
|
370
|
+
const executionResult = await this.#simulateUnconstrained(functionCall, scopes);
|
|
338
371
|
// TODO - Return typed result based on the function artifact.
|
|
339
372
|
return executionResult;
|
|
340
|
-
}
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
throw this.contextualizeError(err, `simulateUnconstrained ${to}:${functionName}(${stringifiedArgs})`, `scopes=${scopes?.map(s => s.toString()).join(', ') ?? 'undefined'}`);
|
|
373
|
+
} catch (err) {
|
|
374
|
+
const stringifiedArgs = args.map((arg)=>arg.toString()).join(', ');
|
|
375
|
+
throw this.contextualizeError(err, `simulateUnconstrained ${to}:${functionName}(${stringifiedArgs})`, `scopes=${scopes?.map((s)=>s.toString()).join(', ') ?? 'undefined'}`);
|
|
344
376
|
}
|
|
345
377
|
}
|
|
346
378
|
getTxReceipt(txHash) {
|
|
@@ -356,21 +388,38 @@ export class PXEService {
|
|
|
356
388
|
return await this.node.getProvenBlockNumber();
|
|
357
389
|
}
|
|
358
390
|
/**
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
getPublicLogs(filter) {
|
|
391
|
+
* Gets public logs based on the provided filter.
|
|
392
|
+
* @param filter - The filter to apply to the logs.
|
|
393
|
+
* @returns The requested logs.
|
|
394
|
+
*/ getPublicLogs(filter) {
|
|
364
395
|
return this.node.getPublicLogs(filter);
|
|
365
396
|
}
|
|
366
397
|
/**
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
getContractClassLogs(filter) {
|
|
398
|
+
* Gets contract class logs based on the provided filter.
|
|
399
|
+
* @param filter - The filter to apply to the logs.
|
|
400
|
+
* @returns The requested logs.
|
|
401
|
+
*/ getContractClassLogs(filter) {
|
|
372
402
|
return this.node.getContractClassLogs(filter);
|
|
373
403
|
}
|
|
404
|
+
async #getFunctionCall(functionName, args, to) {
|
|
405
|
+
const contract = await this.db.getContract(to);
|
|
406
|
+
if (!contract) {
|
|
407
|
+
throw new Error(`Unknown contract ${to}: add it to PXE Service by calling server.addContracts(...).\nSee docs for context: https://docs.aztec.network/developers/reference/debugging/aztecnr-errors#unknown-contract-0x0-add-it-to-pxe-by-calling-serveraddcontracts`);
|
|
408
|
+
}
|
|
409
|
+
const functionDao = contract.functions.find((f)=>f.name === functionName);
|
|
410
|
+
if (!functionDao) {
|
|
411
|
+
throw new Error(`Unknown function ${functionName} in contract ${contract.name}.`);
|
|
412
|
+
}
|
|
413
|
+
return {
|
|
414
|
+
name: functionDao.name,
|
|
415
|
+
args: encodeArguments(functionDao, args),
|
|
416
|
+
selector: await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters),
|
|
417
|
+
type: functionDao.functionType,
|
|
418
|
+
to,
|
|
419
|
+
isStatic: functionDao.isStatic,
|
|
420
|
+
returnTypes: functionDao.returnTypes
|
|
421
|
+
};
|
|
422
|
+
}
|
|
374
423
|
async getNodeInfo() {
|
|
375
424
|
const [nodeVersion, protocolVersion, chainId, enr, contractAddresses, protocolContractAddresses] = await Promise.all([
|
|
376
425
|
this.node.getNodeVersion(),
|
|
@@ -378,7 +427,7 @@ export class PXEService {
|
|
|
378
427
|
this.node.getChainId(),
|
|
379
428
|
this.node.getEncodedEnr(),
|
|
380
429
|
this.node.getL1ContractAddresses(),
|
|
381
|
-
this.node.getProtocolContractAddresses()
|
|
430
|
+
this.node.getProtocolContractAddresses()
|
|
382
431
|
]);
|
|
383
432
|
const nodeInfo = {
|
|
384
433
|
nodeVersion,
|
|
@@ -386,7 +435,7 @@ export class PXEService {
|
|
|
386
435
|
protocolVersion,
|
|
387
436
|
enr,
|
|
388
437
|
l1ContractAddresses: contractAddresses,
|
|
389
|
-
protocolContractAddresses: protocolContractAddresses
|
|
438
|
+
protocolContractAddresses: protocolContractAddresses
|
|
390
439
|
};
|
|
391
440
|
return nodeInfo;
|
|
392
441
|
}
|
|
@@ -397,25 +446,145 @@ export class PXEService {
|
|
|
397
446
|
classRegisterer: ProtocolContractAddress.ContractClassRegisterer,
|
|
398
447
|
feeJuice: ProtocolContractAddress.FeeJuice,
|
|
399
448
|
instanceDeployer: ProtocolContractAddress.ContractInstanceDeployer,
|
|
400
|
-
multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint
|
|
401
|
-
}
|
|
449
|
+
multiCallEntrypoint: ProtocolContractAddress.MultiCallEntrypoint
|
|
450
|
+
}
|
|
451
|
+
});
|
|
452
|
+
}
|
|
453
|
+
async #registerProtocolContracts() {
|
|
454
|
+
const registered = {};
|
|
455
|
+
for (const name of protocolContractNames){
|
|
456
|
+
const { address, contractClass, instance, artifact } = await getCanonicalProtocolContract(name);
|
|
457
|
+
await this.db.addContractArtifact(contractClass.id, artifact);
|
|
458
|
+
await this.db.addContractInstance(instance);
|
|
459
|
+
registered[name] = address.toString();
|
|
460
|
+
}
|
|
461
|
+
this.log.verbose(`Registered protocol contracts in pxe`, registered);
|
|
462
|
+
}
|
|
463
|
+
/**
|
|
464
|
+
* Retrieves the simulation parameters required to run an ACIR simulation.
|
|
465
|
+
* This includes the contract address, function artifact, and historical tree roots.
|
|
466
|
+
*
|
|
467
|
+
* @param execRequest - The transaction request object containing details of the contract call.
|
|
468
|
+
* @returns An object containing the contract address, function artifact, and historical tree roots.
|
|
469
|
+
*/ async #getSimulationParameters(execRequest) {
|
|
470
|
+
const contractAddress = execRequest.to ?? execRequest.origin;
|
|
471
|
+
const functionSelector = execRequest.selector ?? execRequest.functionSelector;
|
|
472
|
+
const functionArtifact = await this.contractDataOracle.getFunctionArtifact(contractAddress, functionSelector);
|
|
473
|
+
const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, functionSelector);
|
|
474
|
+
return {
|
|
475
|
+
contractAddress,
|
|
476
|
+
functionArtifact: {
|
|
477
|
+
...functionArtifact,
|
|
478
|
+
debug
|
|
479
|
+
}
|
|
480
|
+
};
|
|
481
|
+
}
|
|
482
|
+
async #executePrivate(txRequest, msgSender, scopes) {
|
|
483
|
+
// TODO - Pause syncing while simulating.
|
|
484
|
+
const { contractAddress, functionArtifact } = await this.#getSimulationParameters(txRequest);
|
|
485
|
+
try {
|
|
486
|
+
const result = await this.simulator.run(txRequest, functionArtifact, contractAddress, msgSender, scopes);
|
|
487
|
+
this.log.debug(`Private simulation completed for ${contractAddress.toString()}:${functionArtifact.name}`);
|
|
488
|
+
return result;
|
|
489
|
+
} catch (err) {
|
|
490
|
+
if (err instanceof SimulationError) {
|
|
491
|
+
await enrichSimulationError(err, this.db, this.log);
|
|
492
|
+
}
|
|
493
|
+
throw err;
|
|
494
|
+
}
|
|
495
|
+
}
|
|
496
|
+
/**
|
|
497
|
+
* Simulate an unconstrained transaction on the given contract, without considering constraints set by ACIR.
|
|
498
|
+
* The simulation parameters are fetched using ContractDataOracle and executed using AcirSimulator.
|
|
499
|
+
* Returns the simulation result containing the outputs of the unconstrained function.
|
|
500
|
+
*
|
|
501
|
+
* @param execRequest - The transaction request object containing the target contract and function data.
|
|
502
|
+
* @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
|
|
503
|
+
* @returns The simulation result containing the outputs of the unconstrained function.
|
|
504
|
+
*/ async #simulateUnconstrained(execRequest, scopes) {
|
|
505
|
+
const { contractAddress, functionArtifact } = await this.#getSimulationParameters(execRequest);
|
|
506
|
+
this.log.debug('Executing unconstrained simulator...');
|
|
507
|
+
try {
|
|
508
|
+
const result = await this.simulator.runUnconstrained(execRequest, functionArtifact, contractAddress, scopes);
|
|
509
|
+
this.log.verbose(`Unconstrained simulation for ${contractAddress}.${functionArtifact.name} completed`);
|
|
510
|
+
return result;
|
|
511
|
+
} catch (err) {
|
|
512
|
+
if (err instanceof SimulationError) {
|
|
513
|
+
await enrichSimulationError(err, this.db, this.log);
|
|
514
|
+
}
|
|
515
|
+
throw err;
|
|
516
|
+
}
|
|
517
|
+
}
|
|
518
|
+
/**
|
|
519
|
+
* Simulate the public part of a transaction.
|
|
520
|
+
* This allows to catch public execution errors before submitting the transaction.
|
|
521
|
+
* It can also be used for estimating gas in the future.
|
|
522
|
+
* @param tx - The transaction to be simulated.
|
|
523
|
+
*/ async #simulatePublicCalls(tx, enforceFeePayment) {
|
|
524
|
+
// Simulating public calls can throw if the TX fails in a phase that doesn't allow reverts (setup)
|
|
525
|
+
// Or return as reverted if it fails in a phase that allows reverts (app logic, teardown)
|
|
526
|
+
try {
|
|
527
|
+
const result = await this.node.simulatePublicCalls(tx, enforceFeePayment);
|
|
528
|
+
if (result.revertReason) {
|
|
529
|
+
throw result.revertReason;
|
|
530
|
+
}
|
|
531
|
+
return result;
|
|
532
|
+
} catch (err) {
|
|
533
|
+
if (err instanceof SimulationError) {
|
|
534
|
+
try {
|
|
535
|
+
await enrichPublicSimulationError(err, this.contractDataOracle, this.db, this.log);
|
|
536
|
+
} catch (enrichErr) {
|
|
537
|
+
this.log.error(`Failed to enrich public simulation error: ${enrichErr}`);
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
throw err;
|
|
541
|
+
}
|
|
542
|
+
}
|
|
543
|
+
/**
|
|
544
|
+
* Generate a kernel proof, and create a private kernel output.
|
|
545
|
+
* The function takes in a transaction execution request, and the result of private execution
|
|
546
|
+
* and then generates a kernel proof.
|
|
547
|
+
*
|
|
548
|
+
* @param txExecutionRequest - The transaction request to be simulated and proved.
|
|
549
|
+
* @param proofCreator - The proof creator to use for proving the execution.
|
|
550
|
+
* @param privateExecutionResult - The result of the private execution
|
|
551
|
+
* @returns An object that contains the output of the kernel execution, including the ClientIvcProof if proving is enabled.
|
|
552
|
+
*/ async #prove(txExecutionRequest, proofCreator, privateExecutionResult, { simulate, profile, dryRun }) {
|
|
553
|
+
// use the block the tx was simulated against
|
|
554
|
+
const block = privateExecutionResult.entrypoint.publicInputs.historicalHeader.globalVariables.blockNumber.toNumber();
|
|
555
|
+
const kernelOracle = new KernelOracle(this.contractDataOracle, this.keyStore, this.node, block);
|
|
556
|
+
const kernelProver = new KernelProver(kernelOracle, proofCreator, !this.proverEnabled);
|
|
557
|
+
this.log.debug(`Executing kernel prover (simulate: ${simulate}, profile: ${profile}, dryRun: ${dryRun})...`);
|
|
558
|
+
return await kernelProver.prove(txExecutionRequest.toTxRequest(), privateExecutionResult, {
|
|
559
|
+
simulate,
|
|
560
|
+
profile,
|
|
561
|
+
dryRun
|
|
402
562
|
});
|
|
403
563
|
}
|
|
404
|
-
async
|
|
405
|
-
|
|
564
|
+
async #isContractClassPubliclyRegistered(id) {
|
|
565
|
+
return !!await this.node.getContractClass(id);
|
|
566
|
+
}
|
|
567
|
+
async #isContractPubliclyDeployed(address) {
|
|
568
|
+
return !!await this.node.getContract(address);
|
|
569
|
+
}
|
|
570
|
+
async #isContractInitialized(address) {
|
|
571
|
+
const initNullifier = await siloNullifier(address, address.toField());
|
|
572
|
+
return !!await this.node.getNullifierMembershipWitness('latest', initNullifier);
|
|
573
|
+
}
|
|
574
|
+
async getPrivateEvents(eventMetadataDef, from, limit, // TODO (#9272): Make this better, we should be able to only pass an address now
|
|
406
575
|
vpks) {
|
|
407
576
|
const eventMetadata = new EventMetadata(eventMetadataDef);
|
|
408
577
|
if (vpks.length === 0) {
|
|
409
578
|
throw new Error('Tried to get encrypted events without supplying any viewing public keys');
|
|
410
579
|
}
|
|
411
580
|
const blocks = await this.node.getBlocks(from, limit);
|
|
412
|
-
const txEffects = blocks.flatMap(block
|
|
413
|
-
const privateLogs = txEffects.flatMap(txEffect
|
|
414
|
-
const vsks = await Promise.all(vpks.map(async (vpk)
|
|
581
|
+
const txEffects = blocks.flatMap((block)=>block.body.txEffects);
|
|
582
|
+
const privateLogs = txEffects.flatMap((txEffect)=>txEffect.privateLogs);
|
|
583
|
+
const vsks = await Promise.all(vpks.map(async (vpk)=>{
|
|
415
584
|
const [keyPrefix, account] = await this.keyStore.getKeyPrefixAndAccount(vpk);
|
|
416
585
|
let secretKey = await this.keyStore.getMasterSecretKey(vpk);
|
|
417
586
|
if (keyPrefix === 'iv') {
|
|
418
|
-
const registeredAccount = (await this.getRegisteredAccounts()).find(completeAddress
|
|
587
|
+
const registeredAccount = (await this.getRegisteredAccounts()).find((completeAddress)=>completeAddress.address.equals(account));
|
|
419
588
|
if (!registeredAccount) {
|
|
420
589
|
throw new Error('No registered account');
|
|
421
590
|
}
|
|
@@ -424,19 +593,20 @@ export class PXEService {
|
|
|
424
593
|
}
|
|
425
594
|
return secretKey;
|
|
426
595
|
}));
|
|
427
|
-
const visibleEvents = (await Promise.all(privateLogs.map(async (log)
|
|
428
|
-
for (const sk of vsks)
|
|
596
|
+
const visibleEvents = (await Promise.all(privateLogs.map(async (log)=>{
|
|
597
|
+
for (const sk of vsks){
|
|
429
598
|
// TODO: Verify that the first field of the log is the tag siloed with contract address.
|
|
430
599
|
// Or use tags to query logs, like we do with notes.
|
|
431
600
|
const decryptedEvent = await L1EventPayload.decryptAsIncoming(log, sk);
|
|
432
601
|
if (decryptedEvent !== undefined) {
|
|
433
|
-
return [
|
|
602
|
+
return [
|
|
603
|
+
decryptedEvent
|
|
604
|
+
];
|
|
434
605
|
}
|
|
435
606
|
}
|
|
436
607
|
return [];
|
|
437
608
|
}))).flat();
|
|
438
|
-
const decodedEvents = visibleEvents
|
|
439
|
-
.map(visibleEvent => {
|
|
609
|
+
const decodedEvents = visibleEvents.map((visibleEvent)=>{
|
|
440
610
|
if (visibleEvent === undefined) {
|
|
441
611
|
return undefined;
|
|
442
612
|
}
|
|
@@ -444,18 +614,16 @@ export class PXEService {
|
|
|
444
614
|
return undefined;
|
|
445
615
|
}
|
|
446
616
|
return eventMetadata.decode(visibleEvent);
|
|
447
|
-
})
|
|
448
|
-
.filter(visibleEvent => visibleEvent !== undefined);
|
|
617
|
+
}).filter((visibleEvent)=>visibleEvent !== undefined);
|
|
449
618
|
return decodedEvents;
|
|
450
619
|
}
|
|
451
620
|
async getPublicEvents(eventMetadataDef, from, limit) {
|
|
452
621
|
const eventMetadata = new EventMetadata(eventMetadataDef);
|
|
453
622
|
const { logs } = await this.node.getPublicLogs({
|
|
454
623
|
fromBlock: from,
|
|
455
|
-
toBlock: from + limit
|
|
624
|
+
toBlock: from + limit
|
|
456
625
|
});
|
|
457
|
-
const decodedEvents = logs
|
|
458
|
-
.map(log => {
|
|
626
|
+
const decodedEvents = logs.map((log)=>{
|
|
459
627
|
// +1 for the event selector
|
|
460
628
|
const expectedLength = eventMetadata.fieldNames.length + 1;
|
|
461
629
|
const logFields = log.log.log.slice(0, expectedLength);
|
|
@@ -464,12 +632,11 @@ export class PXEService {
|
|
|
464
632
|
return undefined;
|
|
465
633
|
}
|
|
466
634
|
// If any of the remaining fields, are non-zero, the payload does match expected:
|
|
467
|
-
if (log.log.log.slice(expectedLength + 1).find(f
|
|
635
|
+
if (log.log.log.slice(expectedLength + 1).find((f)=>!f.isZero())) {
|
|
468
636
|
throw new Error('Something is weird here, we have matching EventSelectors, but the actual payload has mismatched length');
|
|
469
637
|
}
|
|
470
638
|
return eventMetadata.decode(log.log);
|
|
471
|
-
})
|
|
472
|
-
.filter(log => log !== undefined);
|
|
639
|
+
}).filter((log)=>log !== undefined);
|
|
473
640
|
return decodedEvents;
|
|
474
641
|
}
|
|
475
642
|
async resetNoteSyncData() {
|
|
@@ -482,182 +649,10 @@ export class PXEService {
|
|
|
482
649
|
}
|
|
483
650
|
if (err instanceof SimulationError) {
|
|
484
651
|
err.setAztecContext(contextStr);
|
|
485
|
-
}
|
|
486
|
-
else {
|
|
652
|
+
} else {
|
|
487
653
|
this.log.error(err.name, err);
|
|
488
654
|
this.log.debug(contextStr);
|
|
489
655
|
}
|
|
490
656
|
return err;
|
|
491
657
|
}
|
|
492
658
|
}
|
|
493
|
-
_PXEService_instances = new WeakSet(), _PXEService_getNoteNonces =
|
|
494
|
-
/**
|
|
495
|
-
* Finds the nonce(s) for a given note.
|
|
496
|
-
* @param note - The note to find the nonces for.
|
|
497
|
-
* @returns The nonces of the note.
|
|
498
|
-
* @remarks More than a single nonce may be returned since there might be more than one nonce for a given note.
|
|
499
|
-
*/
|
|
500
|
-
async function _PXEService_getNoteNonces(note) {
|
|
501
|
-
const tx = await this.node.getTxEffect(note.txHash);
|
|
502
|
-
if (!tx) {
|
|
503
|
-
throw new Error(`Unknown tx: ${note.txHash}`);
|
|
504
|
-
}
|
|
505
|
-
const nonces = [];
|
|
506
|
-
const firstNullifier = tx.data.nullifiers[0];
|
|
507
|
-
const hashes = tx.data.noteHashes;
|
|
508
|
-
for (let i = 0; i < hashes.length; ++i) {
|
|
509
|
-
const hash = hashes[i];
|
|
510
|
-
if (hash.equals(Fr.ZERO)) {
|
|
511
|
-
break;
|
|
512
|
-
}
|
|
513
|
-
const nonce = await computeNoteHashNonce(firstNullifier, i);
|
|
514
|
-
const { uniqueNoteHash } = await this.simulator.computeNoteHashAndOptionallyANullifier(note.contractAddress, nonce, note.storageSlot, note.noteTypeId, false, note.note);
|
|
515
|
-
if (hash.equals(uniqueNoteHash)) {
|
|
516
|
-
nonces.push(nonce);
|
|
517
|
-
}
|
|
518
|
-
}
|
|
519
|
-
return { l2BlockHash: tx.l2BlockHash, l2BlockNumber: tx.l2BlockNumber, data: nonces };
|
|
520
|
-
}, _PXEService_getFunctionCall = async function _PXEService_getFunctionCall(functionName, args, to) {
|
|
521
|
-
const contract = await this.db.getContract(to);
|
|
522
|
-
if (!contract) {
|
|
523
|
-
throw new Error(`Unknown contract ${to}: add it to PXE Service by calling server.addContracts(...).\nSee docs for context: https://docs.aztec.network/reference/common_errors/aztecnr-errors#unknown-contract-0x0-add-it-to-pxe-by-calling-serveraddcontracts`);
|
|
524
|
-
}
|
|
525
|
-
const functionDao = contract.functions.find(f => f.name === functionName);
|
|
526
|
-
if (!functionDao) {
|
|
527
|
-
throw new Error(`Unknown function ${functionName} in contract ${contract.name}.`);
|
|
528
|
-
}
|
|
529
|
-
return {
|
|
530
|
-
name: functionDao.name,
|
|
531
|
-
args: encodeArguments(functionDao, args),
|
|
532
|
-
selector: await FunctionSelector.fromNameAndParameters(functionDao.name, functionDao.parameters),
|
|
533
|
-
type: functionDao.functionType,
|
|
534
|
-
to,
|
|
535
|
-
isStatic: functionDao.isStatic,
|
|
536
|
-
returnTypes: functionDao.returnTypes,
|
|
537
|
-
};
|
|
538
|
-
}, _PXEService_registerProtocolContracts = async function _PXEService_registerProtocolContracts() {
|
|
539
|
-
const registered = {};
|
|
540
|
-
for (const name of protocolContractNames) {
|
|
541
|
-
const { address, contractClass, instance, artifact } = await getCanonicalProtocolContract(name);
|
|
542
|
-
await this.db.addContractArtifact(contractClass.id, artifact);
|
|
543
|
-
await this.db.addContractInstance(instance);
|
|
544
|
-
registered[name] = address.toString();
|
|
545
|
-
}
|
|
546
|
-
this.log.verbose(`Registered protocol contracts in pxe`, registered);
|
|
547
|
-
}, _PXEService_getSimulationParameters =
|
|
548
|
-
/**
|
|
549
|
-
* Retrieves the simulation parameters required to run an ACIR simulation.
|
|
550
|
-
* This includes the contract address, function artifact, and historical tree roots.
|
|
551
|
-
*
|
|
552
|
-
* @param execRequest - The transaction request object containing details of the contract call.
|
|
553
|
-
* @returns An object containing the contract address, function artifact, and historical tree roots.
|
|
554
|
-
*/
|
|
555
|
-
async function _PXEService_getSimulationParameters(execRequest) {
|
|
556
|
-
const contractAddress = execRequest.to ?? execRequest.origin;
|
|
557
|
-
const functionSelector = execRequest.selector ?? execRequest.functionSelector;
|
|
558
|
-
const functionArtifact = await this.contractDataOracle.getFunctionArtifact(contractAddress, functionSelector);
|
|
559
|
-
const debug = await this.contractDataOracle.getFunctionDebugMetadata(contractAddress, functionSelector);
|
|
560
|
-
return {
|
|
561
|
-
contractAddress,
|
|
562
|
-
functionArtifact: {
|
|
563
|
-
...functionArtifact,
|
|
564
|
-
debug,
|
|
565
|
-
},
|
|
566
|
-
};
|
|
567
|
-
}, _PXEService_executePrivate = async function _PXEService_executePrivate(txRequest, msgSender, scopes) {
|
|
568
|
-
// TODO - Pause syncing while simulating.
|
|
569
|
-
const { contractAddress, functionArtifact } = await __classPrivateFieldGet(this, _PXEService_instances, "m", _PXEService_getSimulationParameters).call(this, txRequest);
|
|
570
|
-
try {
|
|
571
|
-
const result = await this.simulator.run(txRequest, functionArtifact, contractAddress, msgSender, scopes);
|
|
572
|
-
this.log.debug(`Private simulation completed for ${contractAddress.toString()}:${functionArtifact.name}`);
|
|
573
|
-
return result;
|
|
574
|
-
}
|
|
575
|
-
catch (err) {
|
|
576
|
-
if (err instanceof SimulationError) {
|
|
577
|
-
await enrichSimulationError(err, this.db, this.log);
|
|
578
|
-
}
|
|
579
|
-
throw err;
|
|
580
|
-
}
|
|
581
|
-
}, _PXEService_simulateUnconstrained =
|
|
582
|
-
/**
|
|
583
|
-
* Simulate an unconstrained transaction on the given contract, without considering constraints set by ACIR.
|
|
584
|
-
* The simulation parameters are fetched using ContractDataOracle and executed using AcirSimulator.
|
|
585
|
-
* Returns the simulation result containing the outputs of the unconstrained function.
|
|
586
|
-
*
|
|
587
|
-
* @param execRequest - The transaction request object containing the target contract and function data.
|
|
588
|
-
* @param scopes - The accounts whose notes we can access in this call. Currently optional and will default to all.
|
|
589
|
-
* @returns The simulation result containing the outputs of the unconstrained function.
|
|
590
|
-
*/
|
|
591
|
-
async function _PXEService_simulateUnconstrained(execRequest, scopes) {
|
|
592
|
-
const { contractAddress, functionArtifact } = await __classPrivateFieldGet(this, _PXEService_instances, "m", _PXEService_getSimulationParameters).call(this, execRequest);
|
|
593
|
-
this.log.debug('Executing unconstrained simulator...');
|
|
594
|
-
try {
|
|
595
|
-
const result = await this.simulator.runUnconstrained(execRequest, functionArtifact, contractAddress, scopes);
|
|
596
|
-
this.log.verbose(`Unconstrained simulation for ${contractAddress}.${functionArtifact.name} completed`);
|
|
597
|
-
return result;
|
|
598
|
-
}
|
|
599
|
-
catch (err) {
|
|
600
|
-
if (err instanceof SimulationError) {
|
|
601
|
-
await enrichSimulationError(err, this.db, this.log);
|
|
602
|
-
}
|
|
603
|
-
throw err;
|
|
604
|
-
}
|
|
605
|
-
}, _PXEService_simulatePublicCalls =
|
|
606
|
-
/**
|
|
607
|
-
* Simulate the public part of a transaction.
|
|
608
|
-
* This allows to catch public execution errors before submitting the transaction.
|
|
609
|
-
* It can also be used for estimating gas in the future.
|
|
610
|
-
* @param tx - The transaction to be simulated.
|
|
611
|
-
*/
|
|
612
|
-
async function _PXEService_simulatePublicCalls(tx, enforceFeePayment) {
|
|
613
|
-
// Simulating public calls can throw if the TX fails in a phase that doesn't allow reverts (setup)
|
|
614
|
-
// Or return as reverted if it fails in a phase that allows reverts (app logic, teardown)
|
|
615
|
-
try {
|
|
616
|
-
const result = await this.node.simulatePublicCalls(tx, enforceFeePayment);
|
|
617
|
-
if (result.revertReason) {
|
|
618
|
-
throw result.revertReason;
|
|
619
|
-
}
|
|
620
|
-
return result;
|
|
621
|
-
}
|
|
622
|
-
catch (err) {
|
|
623
|
-
if (err instanceof SimulationError) {
|
|
624
|
-
try {
|
|
625
|
-
await enrichPublicSimulationError(err, this.contractDataOracle, this.db, this.log);
|
|
626
|
-
}
|
|
627
|
-
catch (enrichErr) {
|
|
628
|
-
this.log.error(`Failed to enrich public simulation error: ${enrichErr}`);
|
|
629
|
-
}
|
|
630
|
-
}
|
|
631
|
-
throw err;
|
|
632
|
-
}
|
|
633
|
-
}, _PXEService_prove =
|
|
634
|
-
/**
|
|
635
|
-
* Generate a kernel proof, and create a private kernel output.
|
|
636
|
-
* The function takes in a transaction execution request, and the result of private execution
|
|
637
|
-
* and then generates a kernel proof.
|
|
638
|
-
*
|
|
639
|
-
* @param txExecutionRequest - The transaction request to be simulated and proved.
|
|
640
|
-
* @param proofCreator - The proof creator to use for proving the execution.
|
|
641
|
-
* @param privateExecutionResult - The result of the private execution
|
|
642
|
-
* @returns An object that contains the output of the kernel execution, including the ClientIvcProof if proving is enabled.
|
|
643
|
-
*/
|
|
644
|
-
async function _PXEService_prove(txExecutionRequest, proofCreator, privateExecutionResult, { simulate, profile, dryRun }) {
|
|
645
|
-
// use the block the tx was simulated against
|
|
646
|
-
const block = privateExecutionResult.entrypoint.publicInputs.historicalHeader.globalVariables.blockNumber.toNumber();
|
|
647
|
-
const kernelOracle = new KernelOracle(this.contractDataOracle, this.keyStore, this.node, block);
|
|
648
|
-
const kernelProver = new KernelProver(kernelOracle, proofCreator, !this.proverEnabled);
|
|
649
|
-
this.log.debug(`Executing kernel prover (simulate: ${simulate}, profile: ${profile}, dryRun: ${dryRun})...`);
|
|
650
|
-
return await kernelProver.prove(txExecutionRequest.toTxRequest(), privateExecutionResult, {
|
|
651
|
-
simulate,
|
|
652
|
-
profile,
|
|
653
|
-
dryRun,
|
|
654
|
-
});
|
|
655
|
-
}, _PXEService_isContractClassPubliclyRegistered = async function _PXEService_isContractClassPubliclyRegistered(id) {
|
|
656
|
-
return !!(await this.node.getContractClass(id));
|
|
657
|
-
}, _PXEService_isContractPubliclyDeployed = async function _PXEService_isContractPubliclyDeployed(address) {
|
|
658
|
-
return !!(await this.node.getContract(address));
|
|
659
|
-
}, _PXEService_isContractInitialized = async function _PXEService_isContractInitialized(address) {
|
|
660
|
-
const initNullifier = await siloNullifier(address, address.toField());
|
|
661
|
-
return !!(await this.node.getNullifierMembershipWitness('latest', initNullifier));
|
|
662
|
-
};
|
|
663
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_service.js","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}
|