@aztec/pxe 0.75.0-commit.c03ba01a2a4122e43e90d5133ba017e54b90e9d2 → 0.75.0
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.d.ts +3 -0
- package/dest/bin/index.d.ts.map +1 -0
- package/dest/bin/index.js +5 -3
- package/dest/config/index.d.ts +46 -0
- package/dest/config/index.d.ts.map +1 -0
- package/dest/config/index.js +21 -18
- package/dest/config/package_info.d.ts +5 -0
- package/dest/config/package_info.d.ts.map +1 -0
- package/dest/config/package_info.js +2 -4
- package/dest/contract_data_oracle/index.d.ts +104 -0
- package/dest/contract_data_oracle/index.d.ts.map +1 -0
- package/dest/contract_data_oracle/index.js +79 -69
- package/dest/contract_data_oracle/private_functions_tree.d.ts +65 -0
- package/dest/contract_data_oracle/private_functions_tree.d.ts.map +1 -0
- package/dest/contract_data_oracle/private_functions_tree.js +50 -44
- package/dest/database/contracts/contract_artifact_db.d.ts +20 -0
- package/dest/database/contracts/contract_artifact_db.d.ts.map +1 -0
- package/dest/database/contracts/contract_artifact_db.js +2 -3
- package/dest/database/contracts/contract_instance_db.d.ts +19 -0
- package/dest/database/contracts/contract_instance_db.d.ts.map +1 -0
- package/dest/database/contracts/contract_instance_db.js +2 -3
- package/dest/database/index.d.ts +3 -0
- package/dest/database/index.d.ts.map +1 -0
- package/dest/database/index.js +1 -0
- package/dest/database/kv_pxe_database.d.ts +55 -0
- package/dest/database/kv_pxe_database.d.ts.map +1 -0
- package/dest/database/kv_pxe_database.js +259 -243
- package/dest/database/note_dao.d.ts +103 -0
- package/dest/database/note_dao.d.ts.map +1 -0
- package/dest/database/note_dao.js +43 -28
- package/dest/database/outgoing_note_dao.d.ts +73 -0
- package/dest/database/outgoing_note_dao.d.ts.map +1 -0
- package/dest/database/outgoing_note_dao.js +34 -20
- package/dest/database/pxe_database.d.ts +216 -0
- package/dest/database/pxe_database.d.ts.map +1 -0
- package/dest/database/pxe_database.js +2 -4
- package/dest/database/pxe_database_test_suite.d.ts +7 -0
- package/dest/database/pxe_database_test_suite.d.ts.map +1 -0
- package/dest/database/pxe_database_test_suite.js +151 -296
- package/dest/index.d.ts +15 -0
- package/dest/index.d.ts.map +1 -0
- package/dest/index.js +1 -0
- package/dest/kernel_oracle/index.d.ts +34 -0
- package/dest/kernel_oracle/index.d.ts.map +1 -0
- package/dest/kernel_oracle/index.js +6 -9
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts +28 -0
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.d.ts.map +1 -0
- package/dest/kernel_prover/hints/build_private_kernel_reset_private_inputs.js +66 -68
- package/dest/kernel_prover/hints/index.d.ts +2 -0
- package/dest/kernel_prover/hints/index.d.ts.map +1 -0
- package/dest/kernel_prover/hints/index.js +1 -0
- package/dest/kernel_prover/index.d.ts +3 -0
- package/dest/kernel_prover/index.d.ts.map +1 -0
- package/dest/kernel_prover/index.js +1 -0
- package/dest/kernel_prover/kernel_prover.d.ts +38 -0
- package/dest/kernel_prover/kernel_prover.d.ts.map +1 -0
- package/dest/kernel_prover/kernel_prover.js +65 -60
- package/dest/kernel_prover/proving_data_oracle.d.ts +65 -0
- package/dest/kernel_prover/proving_data_oracle.d.ts.map +1 -0
- package/dest/kernel_prover/proving_data_oracle.js +2 -4
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts +10 -0
- package/dest/note_decryption_utils/add_public_values_to_payload.d.ts.map +1 -0
- package/dest/note_decryption_utils/add_public_values_to_payload.js +9 -8
- package/dest/pxe_http/index.d.ts +2 -0
- package/dest/pxe_http/index.d.ts.map +1 -0
- package/dest/pxe_http/index.js +1 -0
- package/dest/pxe_http/pxe_http_server.d.ts +16 -0
- package/dest/pxe_http/pxe_http_server.d.ts.map +1 -0
- package/dest/pxe_http/pxe_http_server.js +6 -8
- package/dest/pxe_service/error_enriching.d.ts +11 -0
- package/dest/pxe_service/error_enriching.d.ts.map +1 -0
- package/dest/pxe_service/error_enriching.js +13 -10
- package/dest/pxe_service/index.d.ts +4 -0
- package/dest/pxe_service/index.d.ts.map +1 -0
- package/dest/pxe_service/index.js +1 -0
- package/dest/pxe_service/pxe_service.d.ts +98 -0
- package/dest/pxe_service/pxe_service.d.ts.map +1 -0
- package/dest/pxe_service/pxe_service.js +290 -282
- package/dest/pxe_service/test/pxe_test_suite.d.ts +3 -0
- package/dest/pxe_service/test/pxe_test_suite.d.ts.map +1 -0
- package/dest/pxe_service/test/pxe_test_suite.js +27 -40
- package/dest/simulator/index.d.ts +10 -0
- package/dest/simulator/index.d.ts.map +1 -0
- package/dest/simulator/index.js +3 -1
- package/dest/simulator_oracle/index.d.ts +129 -0
- package/dest/simulator_oracle/index.d.ts.map +1 -0
- package/dest/simulator_oracle/index.js +231 -266
- package/dest/simulator_oracle/tagging_utils.d.ts +16 -0
- package/dest/simulator_oracle/tagging_utils.d.ts.map +1 -0
- package/dest/simulator_oracle/tagging_utils.js +6 -4
- package/dest/synchronizer/index.d.ts +2 -0
- package/dest/synchronizer/index.d.ts.map +1 -0
- package/dest/synchronizer/index.js +1 -0
- package/dest/synchronizer/synchronizer.d.ts +30 -0
- package/dest/synchronizer/synchronizer.d.ts.map +1 -0
- package/dest/synchronizer/synchronizer.js +42 -42
- package/dest/utils/create_pxe_service.d.ts +16 -0
- package/dest/utils/create_pxe_service.d.ts.map +1 -0
- package/dest/utils/create_pxe_service.js +9 -9
- package/package.json +15 -15
- package/src/pxe_service/pxe_service.ts +10 -5
package/dest/index.d.ts
ADDED
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export * from './pxe_service/index.js';
|
|
2
|
+
export * from './pxe_http/index.js';
|
|
3
|
+
export * from './config/index.js';
|
|
4
|
+
export * from './utils/create_pxe_service.js';
|
|
5
|
+
export { Tx, TxHash } from '@aztec/circuit-types';
|
|
6
|
+
export { TxRequest } from '@aztec/circuits.js';
|
|
7
|
+
export * from '@aztec/foundation/fields';
|
|
8
|
+
export * from '@aztec/foundation/eth-address';
|
|
9
|
+
export * from '@aztec/foundation/aztec-address';
|
|
10
|
+
export * from '@aztec/key-store';
|
|
11
|
+
export * from './database/index.js';
|
|
12
|
+
export { ContractDataOracle } from './contract_data_oracle/index.js';
|
|
13
|
+
export { PrivateFunctionsTree } from './contract_data_oracle/private_functions_tree.js';
|
|
14
|
+
export { SimulatorOracle } from './simulator_oracle/index.js';
|
|
15
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAE9C,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC"}
|
package/dest/index.js
CHANGED
|
@@ -12,3 +12,4 @@ 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=
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { type AztecNode, type L2BlockNumber } from '@aztec/circuit-types';
|
|
2
|
+
import { type AztecAddress, type Fr, type FunctionSelector, type GrumpkinScalar, MembershipWitness, type NOTE_HASH_TREE_HEIGHT, type Point, type VerificationKeyAsFields } from '@aztec/circuits.js';
|
|
3
|
+
import { type KeyStore } from '@aztec/key-store';
|
|
4
|
+
import { type ContractDataOracle } from '../contract_data_oracle/index.js';
|
|
5
|
+
import { type ProvingDataOracle } from './../kernel_prover/proving_data_oracle.js';
|
|
6
|
+
/**
|
|
7
|
+
* A data oracle that provides information needed for simulating a transaction.
|
|
8
|
+
*/
|
|
9
|
+
export declare class KernelOracle implements ProvingDataOracle {
|
|
10
|
+
private contractDataOracle;
|
|
11
|
+
private keyStore;
|
|
12
|
+
private node;
|
|
13
|
+
private blockNumber;
|
|
14
|
+
private log;
|
|
15
|
+
constructor(contractDataOracle: ContractDataOracle, keyStore: KeyStore, node: AztecNode, blockNumber?: L2BlockNumber, log?: import("@aztec/foundation/log").Logger);
|
|
16
|
+
getContractAddressPreimage(address: AztecAddress): Promise<{
|
|
17
|
+
version: 1;
|
|
18
|
+
salt: Fr;
|
|
19
|
+
deployer: AztecAddress;
|
|
20
|
+
contractClassId: Fr;
|
|
21
|
+
initializationHash: Fr;
|
|
22
|
+
publicKeys: import("@aztec/circuits.js").PublicKeys;
|
|
23
|
+
saltedInitializationHash: Fr;
|
|
24
|
+
}>;
|
|
25
|
+
getContractClassIdPreimage(contractClassId: Fr): Promise<import("@aztec/circuits.js").ContractClassIdPreimage>;
|
|
26
|
+
getFunctionMembershipWitness(contractAddress: AztecAddress, selector: FunctionSelector): Promise<MembershipWitness<5>>;
|
|
27
|
+
getVkMembershipWitness(vk: VerificationKeyAsFields): Promise<MembershipWitness<6>>;
|
|
28
|
+
getNoteHashMembershipWitness(leafIndex: bigint): Promise<MembershipWitness<typeof NOTE_HASH_TREE_HEIGHT>>;
|
|
29
|
+
getNullifierMembershipWitness(nullifier: Fr): Promise<import("@aztec/circuit-types").NullifierMembershipWitness | undefined>;
|
|
30
|
+
getNoteHashTreeRoot(): Promise<Fr>;
|
|
31
|
+
getMasterSecretKey(masterPublicKey: Point): Promise<GrumpkinScalar>;
|
|
32
|
+
getDebugFunctionName(contractAddress: AztecAddress, selector: FunctionSelector): Promise<string>;
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel_oracle/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,EAAE,EACP,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,iBAAiB,EACjB,KAAK,qBAAqB,EAC1B,KAAK,KAAK,EAEV,KAAK,uBAAuB,EAG7B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAInF;;GAEG;AACH,qBAAa,YAAa,YAAW,iBAAiB;IAElD,OAAO,CAAC,kBAAkB;IAC1B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,GAAG;gBAJH,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,SAAS,EACf,WAAW,GAAE,aAAwB,EACrC,GAAG,yCAAoC;IAGpC,0BAA0B,CAAC,OAAO,EAAE,YAAY;;;;;;;;;IAQhD,0BAA0B,CAAC,eAAe,EAAE,EAAE;IAK9C,4BAA4B,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB;IAItF,sBAAsB,CAAC,EAAE,EAAE,uBAAuB;IAKzD,4BAA4B,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,CAAC;IAS/G,6BAA6B,CAAC,SAAS,EAAE,EAAE;IAIrC,mBAAmB,IAAI,OAAO,CAAC,EAAE,CAAC;IAKjC,kBAAkB,CAAC,eAAe,EAAE,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;IAInE,oBAAoB,CAAC,eAAe,EAAE,YAAY,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;CAGxG"}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
|
-
import { MembershipWitness, VK_TREE_HEIGHT, computeContractClassIdPreimage, computeSaltedInitializationHash } from '@aztec/circuits.js';
|
|
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
|
-
keyStore
|
|
11
|
-
node;
|
|
12
|
-
blockNumber;
|
|
13
|
-
log;
|
|
14
|
-
constructor(contractDataOracle, keyStore, node, blockNumber = 'latest', log = createLogger('pxe:kernel_oracle')){
|
|
8
|
+
*/
|
|
9
|
+
export class KernelOracle {
|
|
10
|
+
constructor(contractDataOracle, keyStore, node, blockNumber = 'latest', log = createLogger('pxe:kernel_oracle')) {
|
|
15
11
|
this.contractDataOracle = contractDataOracle;
|
|
16
12
|
this.keyStore = keyStore;
|
|
17
13
|
this.node = node;
|
|
@@ -22,7 +18,7 @@ import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-type
|
|
|
22
18
|
const instance = await this.contractDataOracle.getContractInstance(address);
|
|
23
19
|
return {
|
|
24
20
|
saltedInitializationHash: await computeSaltedInitializationHash(instance),
|
|
25
|
-
...instance
|
|
21
|
+
...instance,
|
|
26
22
|
};
|
|
27
23
|
}
|
|
28
24
|
async getContractClassIdPreimage(contractClassId) {
|
|
@@ -54,3 +50,4 @@ import { getVKIndex, getVKSiblingPath } from '@aztec/noir-protocol-circuits-type
|
|
|
54
50
|
return this.contractDataOracle.getDebugFunctionName(contractAddress, selector);
|
|
55
51
|
}
|
|
56
52
|
}
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsX29yYWNsZS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBS0wsaUJBQWlCLEVBR2pCLGNBQWMsRUFFZCw4QkFBOEIsRUFDOUIsK0JBQStCLEdBQ2hDLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3JELE9BQU8sRUFBRSxVQUFVLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSx5Q0FBeUMsQ0FBQztBQUt2Riw2Q0FBNkM7QUFDN0Msc0lBQXNJO0FBQ3RJOztHQUVHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFDdkIsWUFDVSxrQkFBc0MsRUFDdEMsUUFBa0IsRUFDbEIsSUFBZSxFQUNmLGNBQTZCLFFBQVEsRUFDckMsTUFBTSxZQUFZLENBQUMsbUJBQW1CLENBQUM7UUFKdkMsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUN0QyxhQUFRLEdBQVIsUUFBUSxDQUFVO1FBQ2xCLFNBQUksR0FBSixJQUFJLENBQVc7UUFDZixnQkFBVyxHQUFYLFdBQVcsQ0FBMEI7UUFDckMsUUFBRyxHQUFILEdBQUcsQ0FBb0M7SUFDOUMsQ0FBQztJQUVHLEtBQUssQ0FBQywwQkFBMEIsQ0FBQyxPQUFxQjtRQUMzRCxNQUFNLFFBQVEsR0FBRyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxtQkFBbUIsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUM1RSxPQUFPO1lBQ0wsd0JBQXdCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQyxRQUFRLENBQUM7WUFDekUsR0FBRyxRQUFRO1NBQ1osQ0FBQztJQUNKLENBQUM7SUFFTSxLQUFLLENBQUMsMEJBQTBCLENBQUMsZUFBbUI7UUFDekQsTUFBTSxhQUFhLEdBQUcsTUFBTSxJQUFJLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUMsZUFBZSxDQUFDLENBQUM7UUFDdEYsT0FBTyw4QkFBOEIsQ0FBQyxhQUFhLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRU0sS0FBSyxDQUFDLDRCQUE0QixDQUFDLGVBQTZCLEVBQUUsUUFBMEI7UUFDakcsT0FBTyxNQUFNLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyw0QkFBNEIsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDL0YsQ0FBQztJQUVNLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxFQUEyQjtRQUM3RCxNQUFNLFNBQVMsR0FBRyxNQUFNLFVBQVUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUN2QyxPQUFPLElBQUksaUJBQWlCLENBQUMsY0FBYyxFQUFFLE1BQU0sQ0FBQyxTQUFTLENBQUMsRUFBRSxNQUFNLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDckcsQ0FBQztJQUVELEtBQUssQ0FBQyw0QkFBNEIsQ0FBQyxTQUFpQjtRQUNsRCxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsc0JBQXNCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztRQUNqRixPQUFPLElBQUksaUJBQWlCLENBQzFCLElBQUksQ0FBQyxRQUFRLEVBQ2IsU0FBUyxFQUNULElBQUksQ0FBQyxRQUFRLEVBQTZDLENBQzNELENBQUM7SUFDSixDQUFDO0lBRUQsNkJBQTZCLENBQUMsU0FBYTtRQUN6QyxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsNkJBQTZCLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQztJQUM5RSxDQUFDO0lBRUQsS0FBSyxDQUFDLG1CQUFtQjtRQUN2QixNQUFNLE1BQU0sR0FBRyxNQUFNLElBQUksQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUNoRSxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxJQUFJLENBQUM7SUFDaEQsQ0FBQztJQUVNLGtCQUFrQixDQUFDLGVBQXNCO1FBQzlDLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQyxlQUFlLENBQUMsQ0FBQztJQUMzRCxDQUFDO0lBRU0sb0JBQW9CLENBQUMsZUFBNkIsRUFBRSxRQUEwQjtRQUNuRixPQUFPLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxvQkFBb0IsQ0FBQyxlQUFlLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDakYsQ0FBQztDQUNGIn0=
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { type PrivateCallExecutionResult, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
|
|
2
|
+
import { type PrivateKernelCircuitPublicInputs, PrivateKernelResetCircuitPrivateInputs } from '@aztec/circuits.js';
|
|
3
|
+
import { type ProvingDataOracle } from '../proving_data_oracle.js';
|
|
4
|
+
export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
5
|
+
private previousKernelOutput;
|
|
6
|
+
private executionStack;
|
|
7
|
+
private noteHashNullifierCounterMap;
|
|
8
|
+
private validationRequestsSplitCounter;
|
|
9
|
+
private previousKernel;
|
|
10
|
+
private nextIteration?;
|
|
11
|
+
private noteHashResetStates;
|
|
12
|
+
private nullifierResetStates;
|
|
13
|
+
private numTransientData?;
|
|
14
|
+
private transientDataIndexHints;
|
|
15
|
+
private requestedDimensions;
|
|
16
|
+
constructor(previousKernelOutput: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>, executionStack: PrivateCallExecutionResult[], noteHashNullifierCounterMap: Map<number, number>, validationRequestsSplitCounter: number);
|
|
17
|
+
needsReset(): boolean;
|
|
18
|
+
build(oracle: ProvingDataOracle, noteHashLeafIndexMap: Map<bigint, bigint>): Promise<PrivateKernelResetCircuitPrivateInputs>;
|
|
19
|
+
private reduceReadRequestStates;
|
|
20
|
+
private needsResetNoteHashReadRequests;
|
|
21
|
+
private needsResetNullifierReadRequests;
|
|
22
|
+
private needsResetNullifierKeys;
|
|
23
|
+
private needsResetTransientData;
|
|
24
|
+
private needsSiloNoteHashes;
|
|
25
|
+
private needsSiloNullifiers;
|
|
26
|
+
private needsSiloPrivateLogs;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=build_private_kernel_reset_private_inputs.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"build_private_kernel_reset_private_inputs.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/hints/build_private_kernel_reset_private_inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,0BAA0B,EAAE,KAAK,2BAA2B,EAAiB,MAAM,sBAAsB,CAAC;AACxH,OAAO,EAWL,KAAK,gCAAgC,EAErC,sCAAsC,EAqBvC,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAiDnE,qBAAa,sCAAsC;IAY/C,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,8BAA8B;IAdxC,OAAO,CAAC,cAAc,CAAmC;IAEzD,OAAO,CAAC,aAAa,CAAC,CAA6B;IAEnD,OAAO,CAAC,mBAAmB,CAAoE;IAC/F,OAAO,CAAC,oBAAoB,CAAoE;IAChG,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,uBAAuB,CAA8D;IAC7F,OAAO,CAAC,mBAAmB,CAA+B;gBAGhD,oBAAoB,EAAE,2BAA2B,CAAC,gCAAgC,CAAC,EACnF,cAAc,EAAE,0BAA0B,EAAE,EAC5C,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,8BAA8B,EAAE,MAAM;IAahD,UAAU,IAAI,OAAO;IAwBf,KAAK,CAAC,MAAM,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAgEhF,OAAO,CAAC,uBAAuB;IA2B/B,OAAO,CAAC,8BAA8B;IAoDtC,OAAO,CAAC,+BAA+B;IAoDvC,OAAO,CAAC,uBAAuB;IAiB/B,OAAO,CAAC,uBAAuB;IAmE/B,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,mBAAmB;IAgB3B,OAAO,CAAC,oBAAoB;CAmB7B"}
|
|
@@ -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 } from '@aztec/circuits.js';
|
|
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,
|
|
8
|
+
return collectNested(executionStack, executionResult => {
|
|
9
9
|
const nonEmptyReadRequests = getNonEmptyItems(extractReadRequests(executionResult));
|
|
10
|
-
return nonEmptyReadRequests.map(
|
|
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(let i = 0; i < keyValidationRequests.length; ++i){
|
|
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,19 +36,7 @@ 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
|
-
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){
|
|
39
|
+
constructor(previousKernelOutput, executionStack, noteHashNullifierCounterMap, validationRequestsSplitCounter) {
|
|
52
40
|
this.previousKernelOutput = previousKernelOutput;
|
|
53
41
|
this.executionStack = executionStack;
|
|
54
42
|
this.noteHashNullifierCounterMap = noteHashNullifierCounterMap;
|
|
@@ -57,35 +45,32 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
57
45
|
this.requestedDimensions = PrivateKernelResetDimensions.empty();
|
|
58
46
|
this.noteHashResetStates = ReadRequestResetStates.empty(MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
59
47
|
this.nullifierResetStates = ReadRequestResetStates.empty(MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
60
|
-
this.transientDataIndexHints = makeTuple(MAX_NULLIFIERS_PER_TX, ()=>new TransientDataIndexHint(MAX_NULLIFIERS_PER_TX, MAX_NOTE_HASHES_PER_TX));
|
|
48
|
+
this.transientDataIndexHints = makeTuple(MAX_NULLIFIERS_PER_TX, () => new TransientDataIndexHint(MAX_NULLIFIERS_PER_TX, MAX_NOTE_HASHES_PER_TX));
|
|
61
49
|
this.nextIteration = executionStack[this.executionStack.length - 1]?.publicInputs;
|
|
62
50
|
}
|
|
63
51
|
needsReset() {
|
|
64
52
|
const fns = [
|
|
65
|
-
()=>this.needsResetNoteHashReadRequests(),
|
|
66
|
-
()=>this.needsResetNullifierReadRequests(),
|
|
67
|
-
()=>this.needsResetNullifierKeys(),
|
|
68
|
-
()=>this.needsResetTransientData()
|
|
53
|
+
() => this.needsResetNoteHashReadRequests(),
|
|
54
|
+
() => this.needsResetNullifierReadRequests(),
|
|
55
|
+
() => this.needsResetNullifierKeys(),
|
|
56
|
+
() => this.needsResetTransientData(),
|
|
69
57
|
];
|
|
70
58
|
if (this.nextIteration) {
|
|
71
59
|
// If there's a next iteration, reset is needed only when data of a dimension is about to overflow.
|
|
72
60
|
// fns are executed until a dimension that needs reset is found.
|
|
73
|
-
return fns.some(
|
|
74
|
-
}
|
|
61
|
+
return fns.some(fn => fn());
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
75
64
|
// Siloing is only needed after processing all iterations.
|
|
76
|
-
fns.push(...[
|
|
77
|
-
()=>this.needsSiloNoteHashes(),
|
|
78
|
-
()=>this.needsSiloNullifiers(),
|
|
79
|
-
()=>this.needsSiloPrivateLogs()
|
|
80
|
-
]);
|
|
65
|
+
fns.push(...[() => this.needsSiloNoteHashes(), () => this.needsSiloNullifiers(), () => this.needsSiloPrivateLogs()]);
|
|
81
66
|
// If there's no next iteration, reset is needed when any of the dimension has non empty data.
|
|
82
67
|
// All the fns should to be executed so that data in all dimensions will be reset.
|
|
83
|
-
const result = fns.map(
|
|
84
|
-
return result.some(
|
|
68
|
+
const result = fns.map(fn => fn());
|
|
69
|
+
return result.some(r => r);
|
|
85
70
|
}
|
|
86
71
|
}
|
|
87
72
|
async build(oracle, noteHashLeafIndexMap) {
|
|
88
|
-
if (privateKernelResetDimensionNames.every(
|
|
73
|
+
if (privateKernelResetDimensionNames.every(name => !this.requestedDimensions[name])) {
|
|
89
74
|
throw new Error('Reset is not required.');
|
|
90
75
|
}
|
|
91
76
|
const isInner = !!this.nextIteration;
|
|
@@ -98,25 +83,26 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
98
83
|
const previousKernelData = new PrivateKernelData(this.previousKernelOutput.publicInputs, this.previousKernelOutput.verificationKey, Number(previousVkMembershipWitness.leafIndex), assertLength(previousVkMembershipWitness.siblingPath, VK_TREE_HEIGHT));
|
|
99
84
|
this.reduceReadRequestStates(this.noteHashResetStates, dimensions.NOTE_HASH_PENDING_AMOUNT, dimensions.NOTE_HASH_SETTLED_AMOUNT);
|
|
100
85
|
this.reduceReadRequestStates(this.nullifierResetStates, dimensions.NULLIFIER_PENDING_AMOUNT, dimensions.NULLIFIER_SETTLED_AMOUNT);
|
|
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);
|
|
86
|
+
return new PrivateKernelResetCircuitPrivateInputs(previousKernelData, new PrivateKernelResetHints(await buildNoteHashReadRequestHintsFromResetStates(oracle, this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, this.noteHashResetStates, noteHashLeafIndexMap), await buildNullifierReadRequestHintsFromResetStates({ getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(oracle) }, this.previousKernel.validationRequests.nullifierReadRequests, this.nullifierResetStates), await getMasterSecretKeysAndAppKeyGenerators(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndGenerators, oracle), this.transientDataIndexHints, this.validationRequestsSplitCounter), dimensions);
|
|
104
87
|
}
|
|
105
88
|
reduceReadRequestStates(resetStates, maxPending, maxSettled) {
|
|
106
89
|
let numPending = 0;
|
|
107
90
|
let numSettled = 0;
|
|
108
|
-
for(let i = 0; i < resetStates.states.length; i++){
|
|
91
|
+
for (let i = 0; i < resetStates.states.length; i++) {
|
|
109
92
|
const state = resetStates.states[i];
|
|
110
93
|
if (state === ReadRequestState.PENDING) {
|
|
111
94
|
if (numPending < maxPending) {
|
|
112
95
|
numPending++;
|
|
113
|
-
}
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
114
98
|
resetStates.states[i] = ReadRequestState.NADA;
|
|
115
99
|
}
|
|
116
|
-
}
|
|
100
|
+
}
|
|
101
|
+
else if (state === ReadRequestState.SETTLED) {
|
|
117
102
|
if (numSettled < maxSettled) {
|
|
118
103
|
numSettled++;
|
|
119
|
-
}
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
120
106
|
resetStates.states[i] = ReadRequestState.NADA;
|
|
121
107
|
}
|
|
122
108
|
}
|
|
@@ -130,26 +116,28 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
130
116
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
131
117
|
return false;
|
|
132
118
|
}
|
|
133
|
-
const futureNoteHashes = collectNested(this.executionStack,
|
|
119
|
+
const futureNoteHashes = collectNested(this.executionStack, executionResult => {
|
|
134
120
|
const nonEmptyNoteHashes = getNonEmptyItems(executionResult.publicInputs.noteHashes);
|
|
135
|
-
return nonEmptyNoteHashes.map(
|
|
121
|
+
return nonEmptyNoteHashes.map(noteHash => new ScopedNoteHash(noteHash, executionResult.publicInputs.callContext.contractAddress));
|
|
136
122
|
});
|
|
137
123
|
const resetStates = getNoteHashReadRequestResetStates(this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, futureNoteHashes);
|
|
138
124
|
const numPendingReads = resetStates.pendingReadHints.length;
|
|
139
|
-
const numSettledReads = resetStates.states.reduce((accum, state)=>accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
125
|
+
const numSettledReads = resetStates.states.reduce((accum, state) => accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
140
126
|
if (!this.nextIteration) {
|
|
141
127
|
this.noteHashResetStates = resetStates;
|
|
142
128
|
this.requestedDimensions.NOTE_HASH_PENDING_AMOUNT = numPendingReads;
|
|
143
129
|
this.requestedDimensions.NOTE_HASH_SETTLED_AMOUNT = numSettledReads;
|
|
144
|
-
}
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
145
132
|
// Pick only one dimension to reset if next iteration is not empty.
|
|
146
133
|
if (numPendingReads > numSettledReads) {
|
|
147
134
|
this.requestedDimensions.NOTE_HASH_PENDING_AMOUNT = numPendingReads;
|
|
148
|
-
this.noteHashResetStates.states = assertLength(resetStates.states.map(
|
|
135
|
+
this.noteHashResetStates.states = assertLength(resetStates.states.map(state => (state === ReadRequestState.PENDING ? state : ReadRequestState.NADA)), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
149
136
|
this.noteHashResetStates.pendingReadHints = resetStates.pendingReadHints;
|
|
150
|
-
}
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
151
139
|
this.requestedDimensions.NOTE_HASH_SETTLED_AMOUNT = numSettledReads;
|
|
152
|
-
this.noteHashResetStates.states = assertLength(resetStates.states.map(
|
|
140
|
+
this.noteHashResetStates.states = assertLength(resetStates.states.map(state => (state === ReadRequestState.SETTLED ? state : ReadRequestState.NADA)), MAX_NOTE_HASH_READ_REQUESTS_PER_TX);
|
|
153
141
|
}
|
|
154
142
|
}
|
|
155
143
|
return true;
|
|
@@ -161,33 +149,37 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
161
149
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
162
150
|
return false;
|
|
163
151
|
}
|
|
164
|
-
const futureNullifiers = collectNested(this.executionStack,
|
|
152
|
+
const futureNullifiers = collectNested(this.executionStack, executionResult => {
|
|
165
153
|
const nonEmptyNullifiers = getNonEmptyItems(executionResult.publicInputs.nullifiers);
|
|
166
|
-
return nonEmptyNullifiers.map(
|
|
154
|
+
return nonEmptyNullifiers.map(nullifier => new ScopedNullifier(nullifier, executionResult.publicInputs.callContext.contractAddress));
|
|
167
155
|
});
|
|
168
156
|
const resetStates = getNullifierReadRequestResetStates(this.previousKernel.validationRequests.nullifierReadRequests, this.previousKernel.end.nullifiers, futureNullifiers);
|
|
169
157
|
const numPendingReads = resetStates.pendingReadHints.length;
|
|
170
|
-
const numSettledReads = resetStates.states.reduce((accum, state)=>accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
158
|
+
const numSettledReads = resetStates.states.reduce((accum, state) => accum + (state === ReadRequestState.SETTLED ? 1 : 0), 0);
|
|
171
159
|
if (!this.nextIteration) {
|
|
172
160
|
this.nullifierResetStates = resetStates;
|
|
173
161
|
this.requestedDimensions.NULLIFIER_PENDING_AMOUNT = numPendingReads;
|
|
174
162
|
this.requestedDimensions.NULLIFIER_SETTLED_AMOUNT = numSettledReads;
|
|
175
|
-
}
|
|
163
|
+
}
|
|
164
|
+
else {
|
|
176
165
|
// Pick only one dimension to reset if next iteration is not empty.
|
|
177
166
|
if (numPendingReads > numSettledReads) {
|
|
178
167
|
this.requestedDimensions.NULLIFIER_PENDING_AMOUNT = numPendingReads;
|
|
179
|
-
this.nullifierResetStates.states = assertLength(resetStates.states.map(
|
|
168
|
+
this.nullifierResetStates.states = assertLength(resetStates.states.map(state => (state === ReadRequestState.PENDING ? state : ReadRequestState.NADA)), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
180
169
|
this.nullifierResetStates.pendingReadHints = resetStates.pendingReadHints;
|
|
181
|
-
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
182
172
|
this.requestedDimensions.NULLIFIER_SETTLED_AMOUNT = numSettledReads;
|
|
183
|
-
this.nullifierResetStates.states = assertLength(resetStates.states.map(
|
|
173
|
+
this.nullifierResetStates.states = assertLength(resetStates.states.map(state => (state === ReadRequestState.SETTLED ? state : ReadRequestState.NADA)), MAX_NULLIFIER_READ_REQUESTS_PER_TX);
|
|
184
174
|
}
|
|
185
175
|
}
|
|
186
176
|
return true;
|
|
187
177
|
}
|
|
188
178
|
needsResetNullifierKeys() {
|
|
189
179
|
const numCurr = countAccumulatedItems(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndGenerators);
|
|
190
|
-
const numNext = this.nextIteration
|
|
180
|
+
const numNext = this.nextIteration
|
|
181
|
+
? countAccumulatedItems(this.nextIteration.keyValidationRequestsAndGenerators)
|
|
182
|
+
: 0;
|
|
191
183
|
const maxAmountToKeep = !this.nextIteration ? 0 : MAX_KEY_VALIDATION_REQUESTS_PER_TX;
|
|
192
184
|
if (numCurr + numNext <= maxAmountToKeep) {
|
|
193
185
|
return false;
|
|
@@ -198,25 +190,28 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
198
190
|
needsResetTransientData() {
|
|
199
191
|
// Initialize this to 0 so that needsSilo can be run.
|
|
200
192
|
this.numTransientData = 0;
|
|
201
|
-
const nextAccumNoteHashes = countAccumulatedItems(this.previousKernel.end.noteHashes) +
|
|
193
|
+
const nextAccumNoteHashes = countAccumulatedItems(this.previousKernel.end.noteHashes) +
|
|
194
|
+
countAccumulatedItems(this.nextIteration?.noteHashes ?? []);
|
|
202
195
|
const noteHashWillOverflow = nextAccumNoteHashes > MAX_NOTE_HASHES_PER_TX;
|
|
203
|
-
const nextAccumNullifiers = countAccumulatedItems(this.previousKernel.end.nullifiers) +
|
|
196
|
+
const nextAccumNullifiers = countAccumulatedItems(this.previousKernel.end.nullifiers) +
|
|
197
|
+
countAccumulatedItems(this.nextIteration?.nullifiers ?? []);
|
|
204
198
|
const nullifierWillOverflow = nextAccumNullifiers > MAX_NULLIFIERS_PER_TX;
|
|
205
199
|
if (this.nextIteration && !noteHashWillOverflow && !nullifierWillOverflow) {
|
|
206
200
|
return false;
|
|
207
201
|
}
|
|
208
|
-
const futureNoteHashReads = collectNestedReadRequests(this.executionStack,
|
|
209
|
-
const futureNullifierReads = collectNestedReadRequests(this.executionStack,
|
|
202
|
+
const futureNoteHashReads = collectNestedReadRequests(this.executionStack, executionResult => executionResult.publicInputs.noteHashReadRequests);
|
|
203
|
+
const futureNullifierReads = collectNestedReadRequests(this.executionStack, executionResult => executionResult.publicInputs.nullifierReadRequests);
|
|
210
204
|
if (this.nextIteration) {
|
|
211
205
|
// If it's not the final reset, only one dimension will be reset at a time.
|
|
212
206
|
// The note hashes and nullifiers for the remaining read requests can't be squashed.
|
|
213
|
-
futureNoteHashReads.push(...this.previousKernel.validationRequests.noteHashReadRequests.filter(
|
|
214
|
-
futureNullifierReads.push(...this.previousKernel.validationRequests.nullifierReadRequests.filter(
|
|
207
|
+
futureNoteHashReads.push(...this.previousKernel.validationRequests.noteHashReadRequests.filter(r => !r.isEmpty()));
|
|
208
|
+
futureNullifierReads.push(...this.previousKernel.validationRequests.nullifierReadRequests.filter(r => !r.isEmpty()));
|
|
215
209
|
}
|
|
216
210
|
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);
|
|
217
211
|
if (this.nextIteration && !numTransientData) {
|
|
218
212
|
const forceResetAll = true;
|
|
219
|
-
const canClearReadRequests = noteHashWillOverflow && this.needsResetNoteHashReadRequests(forceResetAll) ||
|
|
213
|
+
const canClearReadRequests = (noteHashWillOverflow && this.needsResetNoteHashReadRequests(forceResetAll)) ||
|
|
214
|
+
(nullifierWillOverflow && this.needsResetNullifierReadRequests(forceResetAll));
|
|
220
215
|
if (!canClearReadRequests) {
|
|
221
216
|
const overflownData = noteHashWillOverflow ? 'note hashes' : 'nullifiers';
|
|
222
217
|
throw new Error(`Number of ${overflownData} exceeds the limit.`);
|
|
@@ -234,7 +229,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
234
229
|
if (this.numTransientData === undefined) {
|
|
235
230
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNoteHashes`.');
|
|
236
231
|
}
|
|
237
|
-
const numNoteHashes = this.previousKernel.end.noteHashes.filter(
|
|
232
|
+
const numNoteHashes = this.previousKernel.end.noteHashes.filter(n => !n.contractAddress.isZero()).length;
|
|
238
233
|
const numToSilo = Math.max(0, numNoteHashes - this.numTransientData);
|
|
239
234
|
this.requestedDimensions.NOTE_HASH_SILOING_AMOUNT = numToSilo;
|
|
240
235
|
return numToSilo > 0;
|
|
@@ -243,7 +238,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
243
238
|
if (this.numTransientData === undefined) {
|
|
244
239
|
throw new Error('`needsResetTransientData` must be run before `needsSiloNullifiers`.');
|
|
245
240
|
}
|
|
246
|
-
const numNullifiers = this.previousKernel.end.nullifiers.filter(
|
|
241
|
+
const numNullifiers = this.previousKernel.end.nullifiers.filter(n => !n.contractAddress.isZero()).length;
|
|
247
242
|
const numToSilo = Math.max(0, numNullifiers - this.numTransientData);
|
|
248
243
|
// Include the first nullifier if there's something to silo.
|
|
249
244
|
// The reset circuit checks that capped_size must be greater than or equal to all non-empty nullifiers.
|
|
@@ -257,12 +252,15 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
257
252
|
throw new Error('`needsResetTransientData` must be run before `needsSiloPrivateLogs`.');
|
|
258
253
|
}
|
|
259
254
|
const privateLogs = this.previousKernel.end.privateLogs;
|
|
260
|
-
const numLogs = privateLogs.filter(
|
|
255
|
+
const numLogs = privateLogs.filter(l => !l.contractAddress.isZero()).length;
|
|
261
256
|
const noteHashes = this.previousKernel.end.noteHashes;
|
|
262
|
-
const squashedNoteHashCounters = this.transientDataIndexHints
|
|
263
|
-
|
|
257
|
+
const squashedNoteHashCounters = this.transientDataIndexHints
|
|
258
|
+
.filter(h => h.noteHashIndex < noteHashes.length)
|
|
259
|
+
.map(h => noteHashes[h.noteHashIndex].counter);
|
|
260
|
+
const numSquashedLogs = privateLogs.filter(l => squashedNoteHashCounters.includes(l.inner.noteHashCounter)).length;
|
|
264
261
|
const numToSilo = numLogs - numSquashedLogs;
|
|
265
262
|
this.requestedDimensions.PRIVATE_LOG_SILOING_AMOUNT = numToSilo;
|
|
266
263
|
return numToSilo > 0;
|
|
267
264
|
}
|
|
268
265
|
}
|
|
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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel_prover/hints/index.ts"],"names":[],"mappings":"AAAA,cAAc,gDAAgD,CAAC"}
|
|
@@ -1 +1,2 @@
|
|
|
1
1
|
export * from './build_private_kernel_reset_private_inputs.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMva2VybmVsX3Byb3Zlci9oaW50cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGdEQUFnRCxDQUFDIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export * from './kernel_prover.js';
|
|
2
2
|
export * from './proving_data_oracle.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMva2VybmVsX3Byb3Zlci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLG9CQUFvQixDQUFDO0FBQ25DLGNBQWMsMEJBQTBCLENBQUMifQ==
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { type PrivateExecutionResult, type PrivateKernelProver, type PrivateKernelSimulateOutput } from '@aztec/circuit-types';
|
|
2
|
+
import { type PrivateKernelTailCircuitPublicInputs, type TxRequest } from '@aztec/circuits.js';
|
|
3
|
+
import { type ProvingDataOracle } from './proving_data_oracle.js';
|
|
4
|
+
export type ProvingConfig = {
|
|
5
|
+
simulate: boolean;
|
|
6
|
+
profile: boolean;
|
|
7
|
+
dryRun: boolean;
|
|
8
|
+
};
|
|
9
|
+
/**
|
|
10
|
+
* The KernelProver class is responsible for generating kernel proofs.
|
|
11
|
+
* It takes a transaction request, its signature, and the simulation result as inputs, and outputs a proof
|
|
12
|
+
* along with output notes. The class interacts with a ProvingDataOracle to fetch membership witnesses and
|
|
13
|
+
* constructs private call data based on the execution results.
|
|
14
|
+
*/
|
|
15
|
+
export declare class KernelProver {
|
|
16
|
+
private oracle;
|
|
17
|
+
private proofCreator;
|
|
18
|
+
private fakeProofs;
|
|
19
|
+
private log;
|
|
20
|
+
constructor(oracle: ProvingDataOracle, proofCreator: PrivateKernelProver, fakeProofs?: boolean);
|
|
21
|
+
/**
|
|
22
|
+
* Generate a proof for a given transaction request and execution result.
|
|
23
|
+
* The function iterates through the nested executions in the execution result, creates private call data,
|
|
24
|
+
* and generates a proof using the provided ProofCreator instance. It also maintains an index of new notes
|
|
25
|
+
* created during the execution and returns them as a part of the KernelProverOutput.
|
|
26
|
+
*
|
|
27
|
+
* @param txRequest - The authenticated transaction request object.
|
|
28
|
+
* @param executionResult - The execution result object containing nested executions and preimages.
|
|
29
|
+
* @param profile - Set true to profile the gate count for each circuit
|
|
30
|
+
* @param dryRun - Set true to skip the IVC proof generation (only simulation is run). Useful for profiling gate count without proof gen.
|
|
31
|
+
* @returns A Promise that resolves to a KernelProverOutput object containing proof, public inputs, and output notes.
|
|
32
|
+
* TODO(#7368) this should be refactored to not recreate the ACIR bytecode now that it operates on a program stack
|
|
33
|
+
*/
|
|
34
|
+
prove(txRequest: TxRequest, executionResult: PrivateExecutionResult, { simulate, profile, dryRun }?: ProvingConfig): Promise<PrivateKernelSimulateOutput<PrivateKernelTailCircuitPublicInputs>>;
|
|
35
|
+
private createPrivateCallData;
|
|
36
|
+
private isPrivateOnly;
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=kernel_prover.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,mBAAmB,EACxB,KAAK,2BAA2B,EAMjC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAWL,KAAK,oCAAoC,EAGzC,KAAK,SAAS,EAGf,MAAM,oBAAoB,CAAC;AAmB5B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AA8ClE,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,YAAY;IAIrB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IALpB,OAAO,CAAC,GAAG,CAAqC;gBAGtC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ;IAG5B;;;;;;;;;;;;OAYG;IACG,KAAK,CACT,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAE,aAAkE,GAChG,OAAO,CAAC,2BAA2B,CAAC,oCAAoC,CAAC,CAAC;YA+M/D,qBAAqB;IAqCnC,OAAO,CAAC,aAAa;CAYtB"}
|