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