@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
package/dest/index.js
CHANGED
|
@@ -12,4 +12,3 @@ export * from './database/index.js';
|
|
|
12
12
|
export { ContractDataOracle } from './contract_data_oracle/index.js';
|
|
13
13
|
export { PrivateFunctionsTree } from './contract_data_oracle/private_functions_tree.js';
|
|
14
14
|
export { SimulatorOracle } from './simulator_oracle/index.js';
|
|
15
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFDbEMsY0FBYywrQkFBK0IsQ0FBQztBQUU5QyxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0sRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBRWxELE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQztBQUMvQyxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGtCQUFrQixDQUFDO0FBQ2pDLGNBQWMscUJBQXFCLENBQUM7QUFDcEMsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sa0RBQWtELENBQUM7QUFDeEYsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDZCQUE2QixDQUFDIn0=
|
|
@@ -1,13 +1,17 @@
|
|
|
1
|
-
import { MembershipWitness, VK_TREE_HEIGHT, computeContractClassIdPreimage, computeSaltedInitializationHash
|
|
1
|
+
import { MembershipWitness, VK_TREE_HEIGHT, computeContractClassIdPreimage, computeSaltedInitializationHash } from '@aztec/circuits.js';
|
|
2
2
|
import { createLogger } from '@aztec/foundation/log';
|
|
3
3
|
import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-types/vks';
|
|
4
4
|
// TODO: Block number should not be "latest".
|
|
5
5
|
// It should be fixed at the time the proof is being simulated. I.e., it should be the same as the value defined in the constant data.
|
|
6
6
|
/**
|
|
7
7
|
* A data oracle that provides information needed for simulating a transaction.
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
*/ export class KernelOracle {
|
|
9
|
+
contractDataOracle;
|
|
10
|
+
keyStore;
|
|
11
|
+
node;
|
|
12
|
+
blockNumber;
|
|
13
|
+
log;
|
|
14
|
+
constructor(contractDataOracle, keyStore, node, blockNumber = 'latest', log = createLogger('pxe:kernel_oracle')){
|
|
11
15
|
this.contractDataOracle = contractDataOracle;
|
|
12
16
|
this.keyStore = keyStore;
|
|
13
17
|
this.node = node;
|
|
@@ -18,7 +22,7 @@ export class KernelOracle {
|
|
|
18
22
|
const instance = await this.contractDataOracle.getContractInstance(address);
|
|
19
23
|
return {
|
|
20
24
|
saltedInitializationHash: await computeSaltedInitializationHash(instance),
|
|
21
|
-
...instance
|
|
25
|
+
...instance
|
|
22
26
|
};
|
|
23
27
|
}
|
|
24
28
|
async getContractClassIdPreimage(contractClassId) {
|
|
@@ -50,4 +54,3 @@ export class KernelOracle {
|
|
|
50
54
|
return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
|
|
51
55
|
}
|
|
52
56
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsX29yYWNsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBS0wsaUJBQWlCLEVBR2pCLGNBQWMsRUFFZCw4QkFBOEIsRUFDOUIsK0JBQStCLEdBQ2hDLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3JELE9BQU8sRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUt2Riw2Q0FBNkM7QUFDN0Msc0lBQXNJO0FBQ3RJOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFDdkIsWUFDVSxrQkFBc0MsRUFDdEMsUUFBa0IsRUFDbEIsSUFBZSxFQUNmLGNBQTZCLFFBQVEsRUFDckMsTUFBTSxZQUFZLENBQUMsbUJBQW1CLENBQUM7UUFKdkMsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ2xCLFNBQUksR0FBSixJQUFJLENBQVc7UUFDZixnQkFBVyxHQUFYLFdBQVcsQ0FBMEI7UUFDckMsUUFBRyxHQUFILEdBQUcsQ0FBb0M7SUFDOUMsQ0FBQztJQUVHLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxPQUFxQjtRQUMzRCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1RSxPQUFPO1lBQ0wsd0JBQXdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQyxRQUFRLENBQUM7WUFDekUsR0FBRyxRQUFRO1NBQ1osQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsMEJBQTBCLENBQUMsZUFBbUI7UUFDekQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEYsT0FBTyw4QkFBOEIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRU0sS0FBSyxDQUFDLDRCQUE0QixDQUFDLGVBQTZCLEVBQUUsUUFBMEI7UUFDakcsT0FBTyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDL0YsQ0FBQztJQUVNLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxFQUEyQjtRQUM3RCxNQUFNLFNBQVMsR0FBRyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksaUJBQWlCLENBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxNQUFNLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDckcsQ0FBQztJQUVELEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxTQUFpQjtRQUNsRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNqRixPQUFPLElBQUksaUJBQWlCLENBQzFCLElBQUksQ0FBQyxRQUFRLEVBQ2IsU0FBUyxFQUNULElBQUksQ0FBQyxRQUFRLEVBQTZDLENBQzNELENBQUM7SUFDSixDQUFDO0lBRUQsNkJBQTZCLENBQUMsU0FBYTtRQUN6QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQjtRQUN2QixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNoRSxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUM7SUFDaEQsQ0FBQztJQUVNLGtCQUFrQixDQUFDLGVBQXNCO1FBQzlDLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRU0sb0JBQW9CLENBQUMsZUFBNkIsRUFBRSxRQUEwQjtRQUNuRixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDakYsQ0FBQztDQUNGIn0=
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { collectNested } from '@aztec/circuit-types';
|
|
2
|
-
import { KeyValidationHint, MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, PrivateKernelData, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, PrivateKernelResetHints, ReadRequestResetStates, ReadRequestState, ScopedNoteHash, ScopedNullifier, ScopedReadRequest, TransientDataIndexHint, VK_TREE_HEIGHT, buildNoteHashReadRequestHintsFromResetStates, buildNullifierReadRequestHintsFromResetStates, buildTransientDataHints, countAccumulatedItems, findPrivateKernelResetDimensions, getNonEmptyItems, getNoteHashReadRequestResetStates, getNullifierReadRequestResetStates, privateKernelResetDimensionNames
|
|
2
|
+
import { KeyValidationHint, MAX_KEY_VALIDATION_REQUESTS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NOTE_HASH_READ_REQUESTS_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_NULLIFIER_READ_REQUESTS_PER_TX, MembershipWitness, NULLIFIER_TREE_HEIGHT, PrivateKernelData, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, PrivateKernelResetHints, ReadRequestResetStates, ReadRequestState, ScopedNoteHash, ScopedNullifier, ScopedReadRequest, TransientDataIndexHint, VK_TREE_HEIGHT, buildNoteHashReadRequestHintsFromResetStates, buildNullifierReadRequestHintsFromResetStates, buildTransientDataHints, countAccumulatedItems, findPrivateKernelResetDimensions, getNonEmptyItems, getNoteHashReadRequestResetStates, getNullifierReadRequestResetStates, privateKernelResetDimensionNames } from '@aztec/circuits.js';
|
|
3
3
|
import { makeTuple } from '@aztec/foundation/array';
|
|
4
4
|
import { padArrayEnd } from '@aztec/foundation/collection';
|
|
5
5
|
import { assertLength } from '@aztec/foundation/serialize';
|
|
6
6
|
import { privateKernelResetDimensionsConfig } from '@aztec/noir-protocol-circuits-types/client';
|
|
7
7
|
function collectNestedReadRequests(executionStack, extractReadRequests) {
|
|
8
|
-
return collectNested(executionStack, executionResult
|
|
8
|
+
return collectNested(executionStack, (executionResult)=>{
|
|
9
9
|
const nonEmptyReadRequests = getNonEmptyItems(extractReadRequests(executionResult));
|
|
10
|
-
return nonEmptyReadRequests.map(readRequest
|
|
10
|
+
return nonEmptyReadRequests.map((readRequest)=>new ScopedReadRequest(readRequest, executionResult.publicInputs.callContext.contractAddress));
|
|
11
11
|
});
|
|
12
12
|
}
|
|
13
13
|
function getNullifierMembershipWitnessResolver(oracle) {
|
|
14
|
-
return async (nullifier)
|
|
14
|
+
return async (nullifier)=>{
|
|
15
15
|
const res = await oracle.getNullifierMembershipWitness(nullifier);
|
|
16
16
|
if (!res) {
|
|
17
17
|
throw new Error(`Cannot find the leaf for nullifier ${nullifier}.`);
|
|
@@ -19,13 +19,13 @@ function getNullifierMembershipWitnessResolver(oracle) {
|
|
|
19
19
|
const { index, siblingPath, leafPreimage } = res;
|
|
20
20
|
return {
|
|
21
21
|
membershipWitness: new MembershipWitness(NULLIFIER_TREE_HEIGHT, index, siblingPath.toTuple()),
|
|
22
|
-
leafPreimage
|
|
22
|
+
leafPreimage
|
|
23
23
|
};
|
|
24
24
|
};
|
|
25
25
|
}
|
|
26
26
|
async function getMasterSecretKeysAndAppKeyGenerators(keyValidationRequests, oracle) {
|
|
27
27
|
const keysHints = [];
|
|
28
|
-
for
|
|
28
|
+
for(let i = 0; i < keyValidationRequests.length; ++i){
|
|
29
29
|
const request = keyValidationRequests[i].request;
|
|
30
30
|
if (request.isEmpty()) {
|
|
31
31
|
break;
|
|
@@ -36,7 +36,19 @@ async function getMasterSecretKeysAndAppKeyGenerators(keyValidationRequests, ora
|
|
|
36
36
|
return padArrayEnd(keysHints, KeyValidationHint.nada(MAX_KEY_VALIDATION_REQUESTS_PER_TX), MAX_KEY_VALIDATION_REQUESTS_PER_TX);
|
|
37
37
|
}
|
|
38
38
|
export class PrivateKernelResetPrivateInputsBuilder {
|
|
39
|
-
|
|
39
|
+
previousKernelOutput;
|
|
40
|
+
executionStack;
|
|
41
|
+
noteHashNullifierCounterMap;
|
|
42
|
+
validationRequestsSplitCounter;
|
|
43
|
+
previousKernel;
|
|
44
|
+
// If there's no next iteration, it's the final reset.
|
|
45
|
+
nextIteration;
|
|
46
|
+
noteHashResetStates;
|
|
47
|
+
nullifierResetStates;
|
|
48
|
+
numTransientData;
|
|
49
|
+
transientDataIndexHints;
|
|
50
|
+
requestedDimensions;
|
|
51
|
+
constructor(previousKernelOutput, executionStack, noteHashNullifierCounterMap, validationRequestsSplitCounter){
|
|
40
52
|
this.previousKernelOutput = previousKernelOutput;
|
|
41
53
|
this.executionStack = executionStack;
|
|
42
54
|
this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
|
|
@@ -45,32 +57,35 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
45
57
|
this.requestedDimensions = PrivateKernelResetDimensions.empty();
|
|
46
58
|
this.noteHashResetStates = ReadRequestResetStates.empty(MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
47
59
|
this.nullifierResetStates = ReadRequestResetStates.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
48
|
-
this.transientDataIndexHints = makeTuple(MAX_NULLIFIERS_PER_TX, ()
|
|
60
|
+
this.transientDataIndexHints = makeTuple(MAX_NULLIFIERS_PER_TX, ()=>new TransientDataIndexHint(MAX_NULLIFIERS_PER_TX, MAX_NOTE_HASHES_PER_TX));
|
|
49
61
|
this.nextIteration = executionStack[this.executionStack.length - 1]?.publicInputs;
|
|
50
62
|
}
|
|
51
63
|
needsReset() {
|
|
52
64
|
const fns = [
|
|
53
|
-
()
|
|
54
|
-
()
|
|
55
|
-
()
|
|
56
|
-
()
|
|
65
|
+
()=>this.needsResetNoteHashReadRequests(),
|
|
66
|
+
()=>this.needsResetNullifierReadRequests(),
|
|
67
|
+
()=>this.needsResetNullifierKeys(),
|
|
68
|
+
()=>this.needsResetTransientData()
|
|
57
69
|
];
|
|
58
70
|
if (this.nextIteration) {
|
|
59
71
|
// If there's a next iteration, reset is needed only when data of a dimension is about to overflow.
|
|
60
72
|
// fns are executed until a dimension that needs reset is found.
|
|
61
|
-
return fns.some(fn
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
73
|
+
return fns.some((fn)=>fn());
|
|
74
|
+
} else {
|
|
64
75
|
// Siloing is only needed after processing all iterations.
|
|
65
|
-
fns.push(...[
|
|
76
|
+
fns.push(...[
|
|
77
|
+
()=>this.needsSiloNoteHashes(),
|
|
78
|
+
()=>this.needsSiloNullifiers(),
|
|
79
|
+
()=>this.needsSiloPrivateLogs()
|
|
80
|
+
]);
|
|
66
81
|
// If there's no next iteration, reset is needed when any of the dimension has non empty data.
|
|
67
82
|
// All the fns should to be executed so that data in all dimensions will be reset.
|
|
68
|
-
const result = fns.map(fn
|
|
69
|
-
return result.some(r
|
|
83
|
+
const result = fns.map((fn)=>fn());
|
|
84
|
+
return result.some((r)=>r);
|
|
70
85
|
}
|
|
71
86
|
}
|
|
72
87
|
async build(oracle, noteHashLeafIndexMap) {
|
|
73
|
-
if (privateKernelResetDimensionNames.every(name
|
|
88
|
+
if (privateKernelResetDimensionNames.every((name)=>!this.requestedDimensions[name])) {
|
|
74
89
|
throw new Error('Reset is not required.');
|
|
75
90
|
}
|
|
76
91
|
const isInner = !!this.nextIteration;
|
|
@@ -83,26 +98,25 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
83
98
|
const previousKernelData = new PrivateKernelData(this.previousKernelOutput.publicInputs, this.previousKernelOutput.verificationKey, Number(previousVkMembershipWitness.leafIndex), assertLength(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT));
|
|
84
99
|
this.reduceReadRequestStates(this.noteHashResetStates, dimensions.NOTE_HASH_PENDING_AMOUNT, dimensions.NOTE_HASH_SETTLED_AMOUNT);
|
|
85
100
|
this.reduceReadRequestStates(this.nullifierResetStates, dimensions.NULLIFIER_PENDING_AMOUNT, dimensions.NULLIFIER_SETTLED_AMOUNT);
|
|
86
|
-
return new PrivateKernelResetCircuitPrivateInputs(previousKernelData, new PrivateKernelResetHints(await buildNoteHashReadRequestHintsFromResetStates(oracle, this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, this.noteHashResetStates, noteHashLeafIndexMap), await buildNullifierReadRequestHintsFromResetStates({
|
|
101
|
+
return new PrivateKernelResetCircuitPrivateInputs(previousKernelData, new PrivateKernelResetHints(await buildNoteHashReadRequestHintsFromResetStates(oracle, this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, this.noteHashResetStates, noteHashLeafIndexMap), await buildNullifierReadRequestHintsFromResetStates({
|
|
102
|
+
getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(oracle)
|
|
103
|
+
}, this.previousKernel.validationRequests.nullifierReadRequests, this.nullifierResetStates), await getMasterSecretKeysAndAppKeyGenerators(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndGenerators, oracle), this.transientDataIndexHints, this.validationRequestsSplitCounter), dimensions);
|
|
87
104
|
}
|
|
88
105
|
reduceReadRequestStates(resetStates, maxPending, maxSettled) {
|
|
89
106
|
let numPending = 0;
|
|
90
107
|
let numSettled = 0;
|
|
91
|
-
for
|
|
108
|
+
for(let i = 0; i < resetStates.states.length; i++){
|
|
92
109
|
const state = resetStates.states[i];
|
|
93
110
|
if (state === ReadRequestState.PENDING) {
|
|
94
111
|
if (numPending < maxPending) {
|
|
95
112
|
numPending++;
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
113
|
+
} else {
|
|
98
114
|
resetStates.states[i] = ReadRequestState.NADA;
|
|
99
115
|
}
|
|
100
|
-
}
|
|
101
|
-
else if (state === ReadRequestState.SETTLED) {
|
|
116
|
+
} else if (state === ReadRequestState.SETTLED) {
|
|
102
117
|
if (numSettled < maxSettled) {
|
|
103
118
|
numSettled++;
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
119
|
+
} else {
|
|
106
120
|
resetStates.states[i] = ReadRequestState.NADA;
|
|
107
121
|
}
|
|
108
122
|
}
|
|
@@ -116,28 +130,26 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
116
130
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
117
131
|
return false;
|
|
118
132
|
}
|
|
119
|
-
const futureNoteHashes = collectNested(this.executionStack, executionResult
|
|
133
|
+
const futureNoteHashes = collectNested(this.executionStack, (executionResult)=>{
|
|
120
134
|
const nonEmptyNoteHashes = getNonEmptyItems(executionResult.publicInputs.noteHashes);
|
|
121
|
-
return nonEmptyNoteHashes.map(noteHash
|
|
135
|
+
return nonEmptyNoteHashes.map((noteHash)=>new ScopedNoteHash(noteHash, executionResult.publicInputs.callContext.contractAddress));
|
|
122
136
|
});
|
|
123
137
|
const resetStates = getNoteHashReadRequestResetStates(this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, futureNoteHashes);
|
|
124
138
|
const numPendingReads = resetStates.pendingReadHints.length;
|
|
125
|
-
const numSettledReads = resetStates.states.reduce((accum, state)
|
|
139
|
+
const numSettledReads = resetStates.states.reduce((accum, state)=>accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
126
140
|
if (!this.nextIteration) {
|
|
127
141
|
this.noteHashResetStates = resetStates;
|
|
128
142
|
this.requestedDimensions.NOTE_HASH_PENDING_AMOUNT = numPendingReads;
|
|
129
143
|
this.requestedDimensions.NOTE_HASH_SETTLED_AMOUNT = numSettledReads;
|
|
130
|
-
}
|
|
131
|
-
else {
|
|
144
|
+
} else {
|
|
132
145
|
// Pick only one dimension to reset if next iteration is not empty.
|
|
133
146
|
if (numPendingReads > numSettledReads) {
|
|
134
147
|
this.requestedDimensions.NOTE_HASH_PENDING_AMOUNT = numPendingReads;
|
|
135
|
-
this.noteHashResetStates.states = assertLength(resetStates.states.map(state
|
|
148
|
+
this.noteHashResetStates.states = assertLength(resetStates.states.map((state)=>state === ReadRequestState.PENDING ? state : ReadRequestState.NADA), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
136
149
|
this.noteHashResetStates.pendingReadHints = resetStates.pendingReadHints;
|
|
137
|
-
}
|
|
138
|
-
else {
|
|
150
|
+
} else {
|
|
139
151
|
this.requestedDimensions.NOTE_HASH_SETTLED_AMOUNT = numSettledReads;
|
|
140
|
-
this.noteHashResetStates.states = assertLength(resetStates.states.map(state
|
|
152
|
+
this.noteHashResetStates.states = assertLength(resetStates.states.map((state)=>state === ReadRequestState.SETTLED ? state : ReadRequestState.NADA), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
141
153
|
}
|
|
142
154
|
}
|
|
143
155
|
return true;
|
|
@@ -149,37 +161,33 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
149
161
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
150
162
|
return false;
|
|
151
163
|
}
|
|
152
|
-
const futureNullifiers = collectNested(this.executionStack, executionResult
|
|
164
|
+
const futureNullifiers = collectNested(this.executionStack, (executionResult)=>{
|
|
153
165
|
const nonEmptyNullifiers = getNonEmptyItems(executionResult.publicInputs.nullifiers);
|
|
154
|
-
return nonEmptyNullifiers.map(nullifier
|
|
166
|
+
return nonEmptyNullifiers.map((nullifier)=>new ScopedNullifier(nullifier, executionResult.publicInputs.callContext.contractAddress));
|
|
155
167
|
});
|
|
156
168
|
const resetStates = getNullifierReadRequestResetStates(this.previousKernel.validationRequests.nullifierReadRequests, this.previousKernel.end.nullifiers, futureNullifiers);
|
|
157
169
|
const numPendingReads = resetStates.pendingReadHints.length;
|
|
158
|
-
const numSettledReads = resetStates.states.reduce((accum, state)
|
|
170
|
+
const numSettledReads = resetStates.states.reduce((accum, state)=>accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
159
171
|
if (!this.nextIteration) {
|
|
160
172
|
this.nullifierResetStates = resetStates;
|
|
161
173
|
this.requestedDimensions.NULLIFIER_PENDING_AMOUNT = numPendingReads;
|
|
162
174
|
this.requestedDimensions.NULLIFIER_SETTLED_AMOUNT = numSettledReads;
|
|
163
|
-
}
|
|
164
|
-
else {
|
|
175
|
+
} else {
|
|
165
176
|
// Pick only one dimension to reset if next iteration is not empty.
|
|
166
177
|
if (numPendingReads > numSettledReads) {
|
|
167
178
|
this.requestedDimensions.NULLIFIER_PENDING_AMOUNT = numPendingReads;
|
|
168
|
-
this.nullifierResetStates.states = assertLength(resetStates.states.map(state
|
|
179
|
+
this.nullifierResetStates.states = assertLength(resetStates.states.map((state)=>state === ReadRequestState.PENDING ? state : ReadRequestState.NADA), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
169
180
|
this.nullifierResetStates.pendingReadHints = resetStates.pendingReadHints;
|
|
170
|
-
}
|
|
171
|
-
else {
|
|
181
|
+
} else {
|
|
172
182
|
this.requestedDimensions.NULLIFIER_SETTLED_AMOUNT = numSettledReads;
|
|
173
|
-
this.nullifierResetStates.states = assertLength(resetStates.states.map(state
|
|
183
|
+
this.nullifierResetStates.states = assertLength(resetStates.states.map((state)=>state === ReadRequestState.SETTLED ? state : ReadRequestState.NADA), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
174
184
|
}
|
|
175
185
|
}
|
|
176
186
|
return true;
|
|
177
187
|
}
|
|
178
188
|
needsResetNullifierKeys() {
|
|
179
189
|
const numCurr = countAccumulatedItems(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndGenerators);
|
|
180
|
-
const numNext = this.nextIteration
|
|
181
|
-
? countAccumulatedItems(this.nextIteration.keyValidationRequestsAndGenerators)
|
|
182
|
-
: 0;
|
|
190
|
+
const numNext = this.nextIteration ? countAccumulatedItems(this.nextIteration.keyValidationRequestsAndGenerators) : 0;
|
|
183
191
|
const maxAmountToKeep = !this.nextIteration ? 0 : MAX_KEY_VALIDATION_REQUESTS_PER_TX;
|
|
184
192
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
185
193
|
return false;
|
|
@@ -190,28 +198,25 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
190
198
|
needsResetTransientData() {
|
|
191
199
|
// Initialize this to 0 so that needsSilo can be run.
|
|
192
200
|
this.numTransientData = 0;
|
|
193
|
-
const nextAccumNoteHashes = countAccumulatedItems(this.previousKernel.end.noteHashes) +
|
|
194
|
-
countAccumulatedItems(this.nextIteration?.noteHashes ?? []);
|
|
201
|
+
const nextAccumNoteHashes = countAccumulatedItems(this.previousKernel.end.noteHashes) + countAccumulatedItems(this.nextIteration?.noteHashes ?? []);
|
|
195
202
|
const noteHashWillOverflow = nextAccumNoteHashes > MAX_NOTE_HASHES_PER_TX;
|
|
196
|
-
const nextAccumNullifiers = countAccumulatedItems(this.previousKernel.end.nullifiers) +
|
|
197
|
-
countAccumulatedItems(this.nextIteration?.nullifiers ?? []);
|
|
203
|
+
const nextAccumNullifiers = countAccumulatedItems(this.previousKernel.end.nullifiers) + countAccumulatedItems(this.nextIteration?.nullifiers ?? []);
|
|
198
204
|
const nullifierWillOverflow = nextAccumNullifiers > MAX_NULLIFIERS_PER_TX;
|
|
199
205
|
if (this.nextIteration && !noteHashWillOverflow && !nullifierWillOverflow) {
|
|
200
206
|
return false;
|
|
201
207
|
}
|
|
202
|
-
const futureNoteHashReads = collectNestedReadRequests(this.executionStack, executionResult
|
|
203
|
-
const futureNullifierReads = collectNestedReadRequests(this.executionStack, executionResult
|
|
208
|
+
const futureNoteHashReads = collectNestedReadRequests(this.executionStack, (executionResult)=>executionResult.publicInputs.noteHashReadRequests);
|
|
209
|
+
const futureNullifierReads = collectNestedReadRequests(this.executionStack, (executionResult)=>executionResult.publicInputs.nullifierReadRequests);
|
|
204
210
|
if (this.nextIteration) {
|
|
205
211
|
// If it's not the final reset, only one dimension will be reset at a time.
|
|
206
212
|
// The note hashes and nullifiers for the remaining read requests can't be squashed.
|
|
207
|
-
futureNoteHashReads.push(...this.previousKernel.validationRequests.noteHashReadRequests.filter(r
|
|
208
|
-
futureNullifierReads.push(...this.previousKernel.validationRequests.nullifierReadRequests.filter(r
|
|
213
|
+
futureNoteHashReads.push(...this.previousKernel.validationRequests.noteHashReadRequests.filter((r)=>!r.isEmpty()));
|
|
214
|
+
futureNullifierReads.push(...this.previousKernel.validationRequests.nullifierReadRequests.filter((r)=>!r.isEmpty()));
|
|
209
215
|
}
|
|
210
216
|
const { numTransientData, hints: transientDataIndexHints } = buildTransientDataHints(this.previousKernel.end.noteHashes, this.previousKernel.end.nullifiers, futureNoteHashReads, futureNullifierReads, this.noteHashNullifierCounterMap, this.validationRequestsSplitCounter, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX);
|
|
211
217
|
if (this.nextIteration && !numTransientData) {
|
|
212
218
|
const forceResetAll = true;
|
|
213
|
-
const canClearReadRequests =
|
|
214
|
-
(nullifierWillOverflow && this.needsResetNullifierReadRequests(forceResetAll));
|
|
219
|
+
const canClearReadRequests = noteHashWillOverflow && this.needsResetNoteHashReadRequests(forceResetAll) || nullifierWillOverflow && this.needsResetNullifierReadRequests(forceResetAll);
|
|
215
220
|
if (!canClearReadRequests) {
|
|
216
221
|
const overflownData = noteHashWillOverflow ? 'note hashes' : 'nullifiers';
|
|
217
222
|
throw new Error(`Number of ${overflownData} exceeds the limit.`);
|
|
@@ -229,7 +234,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
229
234
|
if (this.numTransientData === undefined) {
|
|
230
235
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNoteHashes`.');
|
|
231
236
|
}
|
|
232
|
-
const numNoteHashes = this.previousKernel.end.noteHashes.filter(n
|
|
237
|
+
const numNoteHashes = this.previousKernel.end.noteHashes.filter((n)=>!n.contractAddress.isZero()).length;
|
|
233
238
|
const numToSilo = Math.max(0, numNoteHashes - this.numTransientData);
|
|
234
239
|
this.requestedDimensions.NOTE_HASH_SILOING_AMOUNT = numToSilo;
|
|
235
240
|
return numToSilo > 0;
|
|
@@ -238,7 +243,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
238
243
|
if (this.numTransientData === undefined) {
|
|
239
244
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNullifiers`.');
|
|
240
245
|
}
|
|
241
|
-
const numNullifiers = this.previousKernel.end.nullifiers.filter(n
|
|
246
|
+
const numNullifiers = this.previousKernel.end.nullifiers.filter((n)=>!n.contractAddress.isZero()).length;
|
|
242
247
|
const numToSilo = Math.max(0, numNullifiers - this.numTransientData);
|
|
243
248
|
// Include the first nullifier if there's something to silo.
|
|
244
249
|
// The reset circuit checks that capped_size must be greater than or equal to all non-empty nullifiers.
|
|
@@ -252,15 +257,12 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
252
257
|
throw new Error('`needsResetTransientData` must be run before `needsSiloPrivateLogs`.');
|
|
253
258
|
}
|
|
254
259
|
const privateLogs = this.previousKernel.end.privateLogs;
|
|
255
|
-
const numLogs = privateLogs.filter(l
|
|
260
|
+
const numLogs = privateLogs.filter((l)=>!l.contractAddress.isZero()).length;
|
|
256
261
|
const noteHashes = this.previousKernel.end.noteHashes;
|
|
257
|
-
const squashedNoteHashCounters = this.transientDataIndexHints
|
|
258
|
-
|
|
259
|
-
.map(h => noteHashes[h.noteHashIndex].counter);
|
|
260
|
-
const numSquashedLogs = privateLogs.filter(l => squashedNoteHashCounters.includes(l.inner.noteHashCounter)).length;
|
|
262
|
+
const squashedNoteHashCounters = this.transientDataIndexHints.filter((h)=>h.noteHashIndex < noteHashes.length).map((h)=>noteHashes[h.noteHashIndex].counter);
|
|
263
|
+
const numSquashedLogs = privateLogs.filter((l)=>squashedNoteHashCounters.includes(l.inner.noteHashCounter)).length;
|
|
261
264
|
const numToSilo = numLogs - numSquashedLogs;
|
|
262
265
|
this.requestedDimensions.PRIVATE_LOG_SILOING_AMOUNT = numToSilo;
|
|
263
266
|
return numToSilo > 0;
|
|
264
267
|
}
|
|
265
268
|
}
|
|
266
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"build_private_kernel_reset_private_inputs.js","sourceRoot":"","sources":["../../../src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1 @@
|
|
|
1
1
|
export * from './build_private_kernel_reset_private_inputs.js';
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsX3Byb3Zlci9oaW50cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdEQUFnRCxDQUFDIn0=
|
|
@@ -1,3 +1,2 @@
|
|
|
1
1
|
export * from './kernel_prover.js';
|
|
2
2
|
export * from './proving_data_oracle.js';
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsX3Byb3Zlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsMEJBQTBCLENBQUMifQ==
|