@aztec-labs/pxe 6.0.0 → 6.1.0-nightly.20261023
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/config/package_info.js +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts +3 -3
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.d.ts.map +1 -1
- package/dest/private_kernel/hints/private_kernel_reset_private_inputs_builder.js +9 -9
- package/dest/private_kernel/index.d.ts +2 -2
- package/dest/private_kernel/index.d.ts.map +1 -1
- package/dest/private_kernel/index.js +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.d.ts +4 -4
- package/dest/private_kernel/private_kernel_execution_prover.d.ts.map +1 -1
- package/dest/private_kernel/private_kernel_execution_prover.js +11 -11
- package/dest/private_kernel/{private_kernel_oracle.d.ts → private_kernel_inputs_provider.d.ts} +2 -2
- package/dest/private_kernel/private_kernel_inputs_provider.d.ts.map +1 -0
- package/dest/private_kernel/{private_kernel_oracle.js → private_kernel_inputs_provider.js} +1 -1
- package/dest/pxe.js +3 -3
- package/package.json +18 -18
- package/src/config/package_info.ts +1 -1
- package/src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts +10 -10
- package/src/private_kernel/index.ts +1 -1
- package/src/private_kernel/private_kernel_execution_prover.ts +10 -10
- package/src/private_kernel/{private_kernel_oracle.ts → private_kernel_inputs_provider.ts} +1 -1
- package/src/pxe.ts +3 -3
- package/dest/private_kernel/private_kernel_oracle.d.ts.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type PrivateKernelCircuitPublicInputs, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, type PrivateKernelSimulateOutput } from '@aztec-labs/stdlib/kernel';
|
|
2
2
|
import { type PrivateCallExecutionResult } from '@aztec-labs/stdlib/tx';
|
|
3
|
-
import type {
|
|
3
|
+
import type { PrivateKernelInputsProvider } from '../private_kernel_inputs_provider.js';
|
|
4
4
|
export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
5
5
|
private previousKernelOutput;
|
|
6
6
|
private executionStack;
|
|
@@ -16,7 +16,7 @@ export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
|
16
16
|
constructor(previousKernelOutput: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs>, executionStack: PrivateCallExecutionResult[], noteHashNullifierCounterMap: Map<number, number>, splitCounter: number);
|
|
17
17
|
getRequestedDimensions(): PrivateKernelResetDimensions;
|
|
18
18
|
needsReset(): boolean;
|
|
19
|
-
build(
|
|
19
|
+
build(inputsProvider: PrivateKernelInputsProvider): Promise<PrivateKernelResetCircuitPrivateInputs>;
|
|
20
20
|
private reduceReadRequestActions;
|
|
21
21
|
private needsResetNoteHashReadRequests;
|
|
22
22
|
private needsResetNullifierReadRequests;
|
|
@@ -26,4 +26,4 @@ export declare class PrivateKernelResetPrivateInputsBuilder {
|
|
|
26
26
|
private needsSiloNullifiers;
|
|
27
27
|
private needsSiloPrivateLogs;
|
|
28
28
|
}
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfcmVzZXRfcHJpdmF0ZV9pbnB1dHNfYnVpbGRlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL2hpbnRzL3ByaXZhdGVfa2VybmVsX3Jlc2V0X3ByaXZhdGVfaW5wdXRzX2J1aWxkZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBZ0JBLE9BQU8sRUFLTCxLQUFLLGdDQUFnQyxFQUVyQyxzQ0FBc0MsRUFDdEMsNEJBQTRCLEVBRTVCLEtBQUssMkJBQTJCLEVBY2pDLE1BQU0sMkJBQTJCLENBQUM7QUFDbkMsT0FBTyxFQUFFLEtBQUssMEJBQTBCLEVBQWlCLE1BQU0sdUJBQXVCLENBQUM7QUFHdkYsT0FBTyxLQUFLLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxzQ0FBc0MsQ0FBQztBQW1DeEYscUJBQWEsc0NBQXNDO0lBZS9DLE9BQU8sQ0FBQyxvQkFBb0I7SUFDNUIsT0FBTyxDQUFDLGNBQWM7SUFDdEIsT0FBTyxDQUFDLDJCQUEyQjtJQUNuQyxPQUFPLENBQUMsWUFBWTtJQWpCdEIsT0FBTyxDQUFDLGNBQWMsQ0FBbUM7SUFFekQsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUE2QjtJQUVuRCxPQUFPLENBQUMsb0JBQW9CLENBQXFFO0lBQ2pHLE9BQU8sQ0FBQyxxQkFBcUIsQ0FBcUU7SUFDbEcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQVM7SUFDbEMsT0FBTyxDQUFDLDJCQUEyQixDQUdqQztJQUNGLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBd0M7SUFFbkUsWUFDVSxvQkFBb0IsRUFBRSwyQkFBMkIsQ0FBQyxnQ0FBZ0MsQ0FBQyxFQUNuRixjQUFjLEVBQUUsMEJBQTBCLEVBQUUsRUFDNUMsMkJBQTJCLEVBQUUsR0FBRyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsRUFDaEQsWUFBWSxFQUFFLE1BQU0sRUFJN0I7SUFFRCxzQkFBc0IsSUFBSSw0QkFBNEIsQ0FFckQ7SUFFRCxVQUFVLElBQUksT0FBTyxDQXNCcEI7SUFFSyxLQUFLLENBQUMsY0FBYyxFQUFFLDJCQUEyQixtREF1RnREO0lBRUQsT0FBTyxDQUFDLHdCQUF3QjtJQTJCaEMsT0FBTyxDQUFDLDhCQUE4QjtJQTBFdEMsT0FBTyxDQUFDLCtCQUErQjtJQXlFdkMsT0FBTyxDQUFDLCtCQUErQjtJQWF2QyxPQUFPLENBQUMsdUJBQXVCO0lBMEYvQixPQUFPLENBQUMsbUJBQW1CO0lBaUIzQixPQUFPLENBQUMsbUJBQW1CO0lBaUIzQixPQUFPLENBQUMsb0JBQW9CO0NBcUI3QiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_kernel_reset_private_inputs_builder.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAKL,KAAK,gCAAgC,EAErC,sCAAsC,EACtC,4BAA4B,EAE5B,KAAK,2BAA2B,EAcjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,uBAAuB,CAAC;AAGvF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"private_kernel_reset_private_inputs_builder.d.ts","sourceRoot":"","sources":["../../../src/private_kernel/hints/private_kernel_reset_private_inputs_builder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAKL,KAAK,gCAAgC,EAErC,sCAAsC,EACtC,4BAA4B,EAE5B,KAAK,2BAA2B,EAcjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,uBAAuB,CAAC;AAGvF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sCAAsC,CAAC;AAmCxF,qBAAa,sCAAsC;IAe/C,OAAO,CAAC,oBAAoB;IAC5B,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,2BAA2B;IACnC,OAAO,CAAC,YAAY;IAjBtB,OAAO,CAAC,cAAc,CAAmC;IAEzD,OAAO,CAAC,aAAa,CAAC,CAA6B;IAEnD,OAAO,CAAC,oBAAoB,CAAqE;IACjG,OAAO,CAAC,qBAAqB,CAAqE;IAClG,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,2BAA2B,CAGjC;IACF,OAAO,CAAC,mBAAmB,CAAwC;IAEnE,YACU,oBAAoB,EAAE,2BAA2B,CAAC,gCAAgC,CAAC,EACnF,cAAc,EAAE,0BAA0B,EAAE,EAC5C,2BAA2B,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAChD,YAAY,EAAE,MAAM,EAI7B;IAED,sBAAsB,IAAI,4BAA4B,CAErD;IAED,UAAU,IAAI,OAAO,CAsBpB;IAEK,KAAK,CAAC,cAAc,EAAE,2BAA2B,mDAuFtD;IAED,OAAO,CAAC,wBAAwB;IA2BhC,OAAO,CAAC,8BAA8B;IA0EtC,OAAO,CAAC,+BAA+B;IAyEvC,OAAO,CAAC,+BAA+B;IAavC,OAAO,CAAC,uBAAuB;IA0F/B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,oBAAoB;CAqB7B"}
|
|
@@ -8,9 +8,9 @@ import { privateKernelResetDimensionsConfig } from '@aztec-labs/noir-protocol-ci
|
|
|
8
8
|
import { KeyValidationHint, PaddedSideEffects, PrivateKernelData, PrivateKernelResetCircuitPrivateInputs, PrivateKernelResetDimensions, PrivateKernelResetHints, ReadRequestActionEnum, ReadRequestResetActions, TransientDataSquashingHint, buildNoteHashReadRequestHintsFromResetActions, buildNullifierReadRequestHintsFromResetActions, buildTransientDataHints, countSquashedLogs, findPrivateKernelResetDimensions, getNoteHashReadRequestResetActions, getNullifierReadRequestResetActions, kernelStateIsForPublic, privateKernelResetDimensionNames } from '@aztec-labs/stdlib/kernel';
|
|
9
9
|
import { collectNested } from '@aztec-labs/stdlib/tx';
|
|
10
10
|
import { VkData } from '@aztec-labs/stdlib/vks';
|
|
11
|
-
function getNullifierMembershipWitnessResolver(
|
|
11
|
+
function getNullifierMembershipWitnessResolver(inputsProvider) {
|
|
12
12
|
return async (nullifier)=>{
|
|
13
|
-
const res = await
|
|
13
|
+
const res = await inputsProvider.getNullifierMembershipWitness(nullifier);
|
|
14
14
|
if (!res) {
|
|
15
15
|
throw new Error(`Cannot find the leaf for nullifier ${nullifier}.`);
|
|
16
16
|
}
|
|
@@ -21,10 +21,10 @@ function getNullifierMembershipWitnessResolver(oracle) {
|
|
|
21
21
|
};
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
async function getMasterSecretKeysAndKeyTypeDomainSeparators(keyValidationRequests, numRequestsToVerify,
|
|
24
|
+
async function getMasterSecretKeysAndKeyTypeDomainSeparators(keyValidationRequests, numRequestsToVerify, inputsProvider) {
|
|
25
25
|
const numRequestsToProcess = Math.min(keyValidationRequests.claimedLength, numRequestsToVerify);
|
|
26
26
|
const keysHints = await allToCompletion(keyValidationRequests.array.slice(0, numRequestsToProcess).map(async ({ request })=>{
|
|
27
|
-
const secretKeys = await
|
|
27
|
+
const secretKeys = await inputsProvider.getMasterSecretKey(request.request.pkMHash);
|
|
28
28
|
return new KeyValidationHint(secretKeys);
|
|
29
29
|
}));
|
|
30
30
|
return padArrayEnd(keysHints, KeyValidationHint.empty(), MAX_KEY_VALIDATION_REQUESTS_PER_TX);
|
|
@@ -81,7 +81,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
81
81
|
return result.some((r)=>r);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
-
async build(
|
|
84
|
+
async build(inputsProvider) {
|
|
85
85
|
if (privateKernelResetDimensionNames.every((name)=>!this.requestedDimensions[name])) {
|
|
86
86
|
throw new Error('Reset is not required.');
|
|
87
87
|
}
|
|
@@ -98,12 +98,12 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
98
98
|
this.reduceReadRequestActions(this.nullifierResetActions, dimensions.NULLIFIER_PENDING_READ, dimensions.NULLIFIER_SETTLED_READ);
|
|
99
99
|
// Execute all the expensive node querying operations in parallel.
|
|
100
100
|
const [previousVkMembershipWitness, noteHashReadRequestHints, nullifierReadRequestHints, keyValidationHints] = await allToCompletion([
|
|
101
|
-
|
|
102
|
-
buildNoteHashReadRequestHintsFromResetActions(
|
|
101
|
+
inputsProvider.getVkMembershipWitness(this.previousKernelOutput.verificationKey.keyAsFields),
|
|
102
|
+
buildNoteHashReadRequestHintsFromResetActions(inputsProvider, this.previousKernel.validationRequests.noteHashReadRequests, this.previousKernel.end.noteHashes, this.noteHashResetActions),
|
|
103
103
|
buildNullifierReadRequestHintsFromResetActions({
|
|
104
|
-
getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(
|
|
104
|
+
getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(inputsProvider)
|
|
105
105
|
}, this.previousKernel.validationRequests.nullifierReadRequests, this.nullifierResetActions),
|
|
106
|
-
getMasterSecretKeysAndKeyTypeDomainSeparators(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndSeparators, dimensions.KEY_VALIDATION,
|
|
106
|
+
getMasterSecretKeysAndKeyTypeDomainSeparators(this.previousKernel.validationRequests.scopedKeyValidationRequestsAndSeparators, dimensions.KEY_VALIDATION, inputsProvider)
|
|
107
107
|
]);
|
|
108
108
|
const vkData = new VkData(this.previousKernelOutput.verificationKey, Number(previousVkMembershipWitness.leafIndex), previousVkMembershipWitness.siblingPath);
|
|
109
109
|
const previousKernelData = new PrivateKernelData(this.previousKernelOutput.publicInputs, vkData);
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
export * from './private_kernel_execution_prover.js';
|
|
2
|
-
export * from './
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
export * from './private_kernel_inputs_provider.js';
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9wcml2YXRlX2tlcm5lbC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHNDQUFzQyxDQUFDO0FBQ3JELGNBQWMscUNBQXFDLENBQUMifQ==
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/private_kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/private_kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './private_kernel_execution_prover.js';
|
|
2
|
-
export * from './
|
|
2
|
+
export * from './private_kernel_inputs_provider.js';
|
|
@@ -2,7 +2,7 @@ import { type LoggerBindings } from '@aztec-labs/foundation/log';
|
|
|
2
2
|
import type { PrivateKernelProver } from '@aztec-labs/stdlib/interfaces/client';
|
|
3
3
|
import { type PrivateKernelExecutionProofOutput, type PrivateKernelTailCircuitPublicInputs } from '@aztec-labs/stdlib/kernel';
|
|
4
4
|
import { type PrivateExecutionResult, TxRequest } from '@aztec-labs/stdlib/tx';
|
|
5
|
-
import type {
|
|
5
|
+
import type { PrivateKernelInputsProvider } from './private_kernel_inputs_provider.js';
|
|
6
6
|
export interface PrivateKernelExecutionProverConfig {
|
|
7
7
|
simulate: boolean;
|
|
8
8
|
skipFeeEnforcement: boolean;
|
|
@@ -15,12 +15,12 @@ export interface PrivateKernelExecutionProverConfig {
|
|
|
15
15
|
* inform state tree updates.
|
|
16
16
|
*/
|
|
17
17
|
export declare class PrivateKernelExecutionProver {
|
|
18
|
-
private
|
|
18
|
+
private inputsProvider;
|
|
19
19
|
private proofCreator;
|
|
20
20
|
private fakeProofs;
|
|
21
21
|
private maxBatchSize;
|
|
22
22
|
private log;
|
|
23
|
-
constructor(
|
|
23
|
+
constructor(inputsProvider: PrivateKernelInputsProvider, proofCreator: PrivateKernelProver, fakeProofs?: boolean, bindings?: LoggerBindings, maxBatchSize?: number);
|
|
24
24
|
/**
|
|
25
25
|
* Generate a proof for a given transaction request and execution result.
|
|
26
26
|
* The function iterates through the nested executions in the execution result, creates private call data,
|
|
@@ -46,4 +46,4 @@ export declare class PrivateKernelExecutionProver {
|
|
|
46
46
|
private createPrivateCallData;
|
|
47
47
|
private runBatchedKernel;
|
|
48
48
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfZXhlY3V0aW9uX3Byb3Zlci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3ByaXZhdGVfa2VybmVsL3ByaXZhdGVfa2VybmVsX2V4ZWN1dGlvbl9wcm92ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTUEsT0FBTyxFQUFlLEtBQUssY0FBYyxFQUFnQixNQUFNLDRCQUE0QixDQUFDO0FBTzVGLE9BQU8sS0FBSyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDaEYsT0FBTyxFQVFMLEtBQUssaUNBQWlDLEVBYXRDLEtBQUssb0NBQW9DLEVBRzFDLE1BQU0sMkJBQTJCLENBQUM7QUFFbkMsT0FBTyxFQUVMLEtBQUssc0JBQXNCLEVBQzNCLFNBQVMsRUFJVixNQUFNLHVCQUF1QixDQUFDO0FBTy9CLE9BQU8sS0FBSyxFQUFFLDJCQUEyQixFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFTdkYsTUFBTSxXQUFXLGtDQUFrQztJQUNqRCxRQUFRLEVBQUUsT0FBTyxDQUFDO0lBQ2xCLGtCQUFrQixFQUFFLE9BQU8sQ0FBQztJQUM1QixXQUFXLEVBQUUsT0FBTyxHQUFHLGlCQUFpQixHQUFHLE1BQU0sR0FBRyxNQUFNLENBQUM7Q0FDNUQ7QUFFRDs7Ozs7R0FLRztBQUNILHFCQUFhLDRCQUE0QjtJQUlyQyxPQUFPLENBQUMsY0FBYztJQUN0QixPQUFPLENBQUMsWUFBWTtJQUNwQixPQUFPLENBQUMsVUFBVTtJQUVsQixPQUFPLENBQUMsWUFBWTtJQVB0QixPQUFPLENBQUMsR0FBRyxDQUFTO0lBRXBCLFlBQ1UsY0FBYyxFQUFFLDJCQUEyQixFQUMzQyxZQUFZLEVBQUUsbUJBQW1CLEVBQ2pDLFVBQVUsVUFBUSxFQUMxQixRQUFRLENBQUMsRUFBRSxjQUFjLEVBQ2pCLFlBQVksR0FBRSxNQUE0QixFQUduRDtJQUVEOzs7Ozs7Ozs7O09BVUc7SUFDRyxnQkFBZ0IsQ0FDcEIsU0FBUyxFQUFFLFNBQVMsRUFDcEIsZUFBZSxFQUFFLHNCQUFzQixFQUN2QyxFQUFFLFFBQVEsRUFBRSxrQkFBa0IsRUFBRSxXQUFXLEVBQUUsR0FBRSxrQ0FJOUMsR0FDQSxPQUFPLENBQUMsaUNBQWlDLENBQUMsb0NBQW9DLENBQUMsQ0FBQyxDQXdObEY7SUFFRDs7Ozs7T0FLRztJQUNILE9BQU8sQ0FBQyx1QkFBdUI7WUFvQmpCLFNBQVM7WUFjVCxjQUFjO1lBNkJkLDJCQUEyQjtZQWlCM0IscUJBQXFCO1lBdUNyQixnQkFBZ0I7Q0E4TS9CIn0=
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"private_kernel_execution_prover.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_execution_prover.ts"],"names":[],"mappings":"AAMA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAO5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAQL,KAAK,iCAAiC,EAatC,KAAK,oCAAoC,EAG1C,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAEL,KAAK,sBAAsB,EAC3B,SAAS,EAIV,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"private_kernel_execution_prover.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_execution_prover.ts"],"names":[],"mappings":"AAMA,OAAO,EAAe,KAAK,cAAc,EAAgB,MAAM,4BAA4B,CAAC;AAO5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAQL,KAAK,iCAAiC,EAatC,KAAK,oCAAoC,EAG1C,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAEL,KAAK,sBAAsB,EAC3B,SAAS,EAIV,MAAM,uBAAuB,CAAC;AAO/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AASvF,MAAM,WAAW,kCAAkC;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,WAAW,EAAE,OAAO,GAAG,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;CAC5D;AAED;;;;;GAKG;AACH,qBAAa,4BAA4B;IAIrC,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,UAAU;IAElB,OAAO,CAAC,YAAY;IAPtB,OAAO,CAAC,GAAG,CAAS;IAEpB,YACU,cAAc,EAAE,2BAA2B,EAC3C,YAAY,EAAE,mBAAmB,EACjC,UAAU,UAAQ,EAC1B,QAAQ,CAAC,EAAE,cAAc,EACjB,YAAY,GAAE,MAA4B,EAGnD;IAED;;;;;;;;;;OAUG;IACG,gBAAgB,CACpB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,sBAAsB,EACvC,EAAE,QAAQ,EAAE,kBAAkB,EAAE,WAAW,EAAE,GAAE,kCAI9C,GACA,OAAO,CAAC,iCAAiC,CAAC,oCAAoC,CAAC,CAAC,CAwNlF;IAED;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;YAoBjB,SAAS;YAcT,cAAc;YA6Bd,2BAA2B;YAiB3B,qBAAqB;YAuCrB,gBAAgB;CA8M/B"}
|
|
@@ -30,13 +30,13 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
30
30
|
* The result can be a chonk proof of the private transaction portion, or just a simulation that can e.g.
|
|
31
31
|
* inform state tree updates.
|
|
32
32
|
*/ export class PrivateKernelExecutionProver {
|
|
33
|
-
|
|
33
|
+
inputsProvider;
|
|
34
34
|
proofCreator;
|
|
35
35
|
fakeProofs;
|
|
36
36
|
maxBatchSize;
|
|
37
37
|
log;
|
|
38
|
-
constructor(
|
|
39
|
-
this.
|
|
38
|
+
constructor(inputsProvider, proofCreator, fakeProofs = false, bindings, maxBatchSize = MAX_APPS_PER_KERNEL){
|
|
39
|
+
this.inputsProvider = inputsProvider;
|
|
40
40
|
this.proofCreator = proofCreator;
|
|
41
41
|
this.fakeProofs = fakeProofs;
|
|
42
42
|
this.maxBatchSize = maxBatchSize;
|
|
@@ -83,7 +83,7 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
83
83
|
while(resetBuilder.needsReset()){
|
|
84
84
|
// Inner reset: without siloing.
|
|
85
85
|
const witgenTimer = new Timer();
|
|
86
|
-
const privateInputs = await resetBuilder.build(this.
|
|
86
|
+
const privateInputs = await resetBuilder.build(this.inputsProvider);
|
|
87
87
|
output = generateWitnesses ? await this.proofCreator.generateResetOutput(privateInputs) : await this.proofCreator.simulateReset(privateInputs);
|
|
88
88
|
executionSteps.push({
|
|
89
89
|
functionName: 'private_kernel_reset',
|
|
@@ -134,7 +134,7 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
134
134
|
// Round the aggregated expirationTimestamp down to reduce precision and avoid leaking which private
|
|
135
135
|
// functions were called via their exact expiration offsets.
|
|
136
136
|
const expirationTimestampUpperBound = computeTxExpirationTimestamp(output.publicInputs);
|
|
137
|
-
const resetInputs = await finalResetBuilder.build(this.
|
|
137
|
+
const resetInputs = await finalResetBuilder.build(this.inputsProvider);
|
|
138
138
|
const mergedInputs = new PrivateKernelResetTailCircuitPrivateInputs(resetInputs.previousKernel, resetInputs.paddedSideEffects, resetInputs.hints, resetInputs.dimensions, paddedSideEffectAmounts, expirationTimestampUpperBound);
|
|
139
139
|
this.log.debug(`Calling terminal private kernel reset+tail (${mergedInputs.isForPublic() ? 'to-public' : 'to-rollup'}) with hwm ${output.publicInputs.minRevertibleSideEffectCounter}`);
|
|
140
140
|
const witgenTimer = new Timer();
|
|
@@ -228,7 +228,7 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
228
228
|
}
|
|
229
229
|
}
|
|
230
230
|
async getVkData(verificationKey) {
|
|
231
|
-
const previousVkMembershipWitness = await this.
|
|
231
|
+
const previousVkMembershipWitness = await this.inputsProvider.getVkMembershipWitness(verificationKey.keyAsFields);
|
|
232
232
|
return new VkData(verificationKey, Number(previousVkMembershipWitness.leafIndex), previousVkMembershipWitness.siblingPath);
|
|
233
233
|
}
|
|
234
234
|
/**
|
|
@@ -240,7 +240,7 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
240
240
|
executionStack.push(...[
|
|
241
241
|
...next.nestedExecutionResults
|
|
242
242
|
].reverse());
|
|
243
|
-
const functionName = await this.
|
|
243
|
+
const functionName = await this.inputsProvider.getDebugFunctionName(next.publicInputs.callContext.contractAddress, next.publicInputs.callContext.functionSelector);
|
|
244
244
|
executionSteps.push({
|
|
245
245
|
functionName: functionName,
|
|
246
246
|
bytecode: next.acir,
|
|
@@ -263,16 +263,16 @@ const NULL_SIMULATE_OUTPUT = {
|
|
|
263
263
|
const uniqueAddresses = uniqueBy(allAddresses, (a)=>a.toString());
|
|
264
264
|
return new Map(await allToCompletion(uniqueAddresses.map(async (addr)=>[
|
|
265
265
|
addr.toString(),
|
|
266
|
-
await this.
|
|
266
|
+
await this.inputsProvider.getUpdatedClassIdHints(addr)
|
|
267
267
|
])));
|
|
268
268
|
}
|
|
269
269
|
async createPrivateCallData({ publicInputs, vk: vkAsBuffer }, updatedClassIdHintsMap) {
|
|
270
270
|
const { contractAddress, functionSelector } = publicInputs.callContext;
|
|
271
271
|
const vkFields = await vkAsFields(vkAsBuffer, CircuitKind.App);
|
|
272
272
|
const vk = await VerificationKeyAsFields.fromKey(vkFields);
|
|
273
|
-
const { currentContractClassId, publicKeys, saltedInitializationHash } = await this.
|
|
274
|
-
const functionLeafMembershipWitness = await this.
|
|
275
|
-
const { artifactHash: contractClassArtifactHash, publicBytecodeCommitment: contractClassPublicBytecodeCommitment } = await this.
|
|
273
|
+
const { currentContractClassId, publicKeys, saltedInitializationHash } = await this.inputsProvider.getContractAddressPreimage(contractAddress);
|
|
274
|
+
const functionLeafMembershipWitness = await this.inputsProvider.getFunctionMembershipWitness(currentContractClassId, functionSelector);
|
|
275
|
+
const { artifactHash: contractClassArtifactHash, publicBytecodeCommitment: contractClassPublicBytecodeCommitment } = await this.inputsProvider.getContractClassIdPreimage(currentContractClassId);
|
|
276
276
|
const updatedClassIdHints = updatedClassIdHintsMap.get(contractAddress.toString());
|
|
277
277
|
return PrivateCallData.from({
|
|
278
278
|
publicInputs,
|
package/dest/private_kernel/{private_kernel_oracle.d.ts → private_kernel_inputs_provider.d.ts}
RENAMED
|
@@ -16,7 +16,7 @@ import type { ContractStore } from '../storage/contract_store/contract_store.js'
|
|
|
16
16
|
/**
|
|
17
17
|
* Provides functionality needed by the private kernel for interacting with our state trees.
|
|
18
18
|
*/
|
|
19
|
-
export declare class
|
|
19
|
+
export declare class PrivateKernelInputsProvider {
|
|
20
20
|
private contractStore;
|
|
21
21
|
private keyStore;
|
|
22
22
|
private node;
|
|
@@ -62,4 +62,4 @@ export declare class PrivateKernelOracle {
|
|
|
62
62
|
*/
|
|
63
63
|
getUpdatedClassIdHints(contractAddress: AztecAddress): Promise<UpdatedClassIdHints>;
|
|
64
64
|
}
|
|
65
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
65
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJpdmF0ZV9rZXJuZWxfaW5wdXRzX3Byb3ZpZGVyLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvcHJpdmF0ZV9rZXJuZWwvcHJpdmF0ZV9rZXJuZWxfaW5wdXRzX3Byb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFDTCxvQkFBb0IsRUFDcEIscUJBQXFCLEVBR3JCLGNBQWMsRUFDZixNQUFNLHVCQUF1QixDQUFDO0FBQy9CLE9BQU8sS0FBSyxFQUFFLEVBQUUsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQzlELE9BQU8sS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLHdDQUF3QyxDQUFDO0FBQzdFLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLDhCQUE4QixDQUFDO0FBQ2pFLE9BQU8sS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3RELE9BQU8sS0FBSyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDL0QsT0FBTyxLQUFLLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFDckUsT0FBTyxFQUFFLEtBQUssMkJBQTJCLEVBQW1DLE1BQU0sNkJBQTZCLENBQUM7QUFNaEgsT0FBTyxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0NBQXNDLENBQUM7QUFDdEUsT0FBTyxFQUFFLG1CQUFtQixFQUFFLE1BQU0sMkJBQTJCLENBQUM7QUFDaEUsT0FBTyxLQUFLLEVBQUUsMEJBQTBCLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUMzRSxPQUFPLEtBQUssRUFBRSxXQUFXLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUN6RCxPQUFPLEtBQUssRUFBRSx1QkFBdUIsRUFBRSxNQUFNLHdCQUF3QixDQUFDO0FBRXRFLE9BQU8sS0FBSyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sdUNBQXVDLENBQUM7QUFFbEYsT0FBTyxLQUFLLEVBQUUsYUFBYSxFQUFFLE1BQU0sNkNBQTZDLENBQUM7QUFFakY7O0dBRUc7QUFDSCxxQkFBYSwyQkFBMkI7SUFJcEMsT0FBTyxDQUFDLGFBQWE7SUFFckIsT0FBTyxDQUFDLFFBQVE7SUFDaEIsT0FBTyxDQUFDLElBQUk7SUFDWixPQUFPLENBQUMsV0FBVztJQVByQixPQUFPLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUF1QjtJQUU1RCxZQUNVLGFBQWEsRUFBRSxhQUFhLEVBQ3BDLG9CQUFvQixFQUFFLG9CQUFvQixFQUNsQyxRQUFRLEVBQUUsUUFBUSxFQUNsQixJQUFJLEVBQUUsU0FBUyxFQUNmLFdBQVcsRUFBRSxXQUFXLEVBS2pDO0lBRUQsOEZBQThGO0lBQ2pGLDBCQUEwQixDQUNyQyxPQUFPLEVBQUUsWUFBWSxHQUNwQixPQUFPLENBQUMsMkJBQTJCLEdBQUc7UUFBRSx3QkFBd0IsRUFBRSxFQUFFLENBQUE7S0FBRSxDQUFDLENBZXpFO0lBRUQsa0ZBQWtGO0lBQ3JFLDBCQUEwQixDQUFDLGVBQWUsRUFBRSxFQUFFOzs7O09BVTFEO0lBRUQsdUdBQXVHO0lBQzFGLDRCQUE0QixDQUN2QyxlQUFlLEVBQUUsRUFBRSxFQUNuQixRQUFRLEVBQUUsZ0JBQWdCLEdBQ3pCLE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLG9CQUFvQixDQUFDLENBQUMsQ0FRekQ7SUFFRDs7O09BR0c7SUFDSSxzQkFBc0IsQ0FBQyxFQUFFLEVBQUUsdUJBQXVCLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLE9BQU8sY0FBYyxDQUFDLENBQUMsQ0FHNUc7SUFFRCwrRkFBK0Y7SUFDekYsNEJBQTRCLENBQ2hDLFFBQVEsRUFBRSxFQUFFLEdBQ1gsT0FBTyxDQUFDLGlCQUFpQixDQUFDLE9BQU8scUJBQXFCLENBQUMsR0FBRyxTQUFTLENBQUMsQ0FFdEU7SUFFRCw4R0FBOEc7SUFDeEcsNkJBQTZCLENBQUMsU0FBUyxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsMEJBQTBCLEdBQUcsU0FBUyxDQUFDLENBRWxHO0lBRUQscURBQXFEO0lBQ3JELG1CQUFtQixJQUFJLEVBQUUsQ0FFeEI7SUFFRDs7Ozs7O09BTUc7SUFDSSxrQkFBa0IsQ0FBQyxtQkFBbUIsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLGNBQWMsQ0FBQyxDQUUxRTtJQUVELDJFQUEyRTtJQUM5RCxvQkFBb0IsQ0FDL0IsZUFBZSxFQUFFLFlBQVksRUFDN0IsUUFBUSxFQUFFLGdCQUFnQixHQUN6QixPQUFPLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQyxDQUc3QjtJQUVEOzs7T0FHRztJQUNVLHNCQUFzQixDQUFDLGVBQWUsRUFBRSxZQUFZLEdBQUcsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBb0MvRjtDQUNGIn0=
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"private_kernel_inputs_provider.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_inputs_provider.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EAGrB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,KAAK,2BAA2B,EAAmC,MAAM,6BAA6B,CAAC;AAMhH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAElF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAEjF;;GAEG;AACH,qBAAa,2BAA2B;IAIpC,OAAO,CAAC,aAAa;IAErB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,WAAW;IAPrB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAE5D,YACU,aAAa,EAAE,aAAa,EACpC,oBAAoB,EAAE,oBAAoB,EAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,WAAW,EAKjC;IAED,8FAA8F;IACjF,0BAA0B,CACrC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,2BAA2B,GAAG;QAAE,wBAAwB,EAAE,EAAE,CAAA;KAAE,CAAC,CAezE;IAED,kFAAkF;IACrE,0BAA0B,CAAC,eAAe,EAAE,EAAE;;;;OAU1D;IAED,uGAAuG;IAC1F,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAQzD;IAED;;;OAGG;IACI,sBAAsB,CAAC,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,cAAc,CAAC,CAAC,CAG5G;IAED,+FAA+F;IACzF,4BAA4B,CAChC,QAAQ,EAAE,EAAE,GACX,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,GAAG,SAAS,CAAC,CAEtE;IAED,8GAA8G;IACxG,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAElG;IAED,qDAAqD;IACrD,mBAAmB,IAAI,EAAE,CAExB;IAED;;;;;;OAMG;IACI,kBAAkB,CAAC,mBAAmB,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAE1E;IAED,2EAA2E;IAC9D,oBAAoB,CAC/B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;IAED;;;OAGG;IACU,sBAAsB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoC/F;CACF"}
|
|
@@ -9,7 +9,7 @@ import { UpdatedClassIdHints } from '@aztec-labs/stdlib/kernel';
|
|
|
9
9
|
import { AnchoredContractData } from '../contract_function_simulator/anchored_contract_data.js';
|
|
10
10
|
/**
|
|
11
11
|
* Provides functionality needed by the private kernel for interacting with our state trees.
|
|
12
|
-
*/ export class
|
|
12
|
+
*/ export class PrivateKernelInputsProvider {
|
|
13
13
|
contractStore;
|
|
14
14
|
keyStore;
|
|
15
15
|
node;
|
package/dest/pxe.js
CHANGED
|
@@ -24,7 +24,7 @@ import { TxResolverService } from './messages/tx_resolver_service.js';
|
|
|
24
24
|
import { withCache } from './node/caching_aztec_node.js';
|
|
25
25
|
import { OperationQueue } from './operation_queue.js';
|
|
26
26
|
import { PrivateKernelExecutionProver } from './private_kernel/private_kernel_execution_prover.js';
|
|
27
|
-
import {
|
|
27
|
+
import { PrivateKernelInputsProvider } from './private_kernel/private_kernel_inputs_provider.js';
|
|
28
28
|
import { openPxeStores } from './storage/open_pxe_stores.js';
|
|
29
29
|
import { StagedWriteCoordinator } from './storage/staged_write_coordinator.js';
|
|
30
30
|
import { persistSenderTaggingIndexRangesForTx } from './tagging/index.js';
|
|
@@ -308,8 +308,8 @@ import { persistSenderTaggingIndexRangesForTx } from './tagging/index.js';
|
|
|
308
308
|
* @param config - The configuration for the kernel execution prover.
|
|
309
309
|
* @returns An object that contains the output of the kernel execution, including the ChonkProof if proving is enabled.
|
|
310
310
|
*/ async #prove(txExecutionRequest, proofCreator, privateExecutionResult, anchorBlockHeader, config) {
|
|
311
|
-
const
|
|
312
|
-
const kernelTraceProver = new PrivateKernelExecutionProver(
|
|
311
|
+
const kernelInputsProvider = new PrivateKernelInputsProvider(this.contractStore, this.contractClassService, this.keyStore, this.node, anchorBlockHeader);
|
|
312
|
+
const kernelTraceProver = new PrivateKernelExecutionProver(kernelInputsProvider, proofCreator, !this.proverEnabled, this.log.getBindings());
|
|
313
313
|
this.log.debug(`Executing kernel trace prover (${JSON.stringify(config)})...`);
|
|
314
314
|
return await kernelTraceProver.proveWithKernels(txExecutionRequest.toTxRequest(), privateExecutionResult, config);
|
|
315
315
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/pxe",
|
|
3
|
-
"version": "6.0.
|
|
3
|
+
"version": "6.1.0-nightly.20261023",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"typedocOptions": {
|
|
6
6
|
"entryPoints": [
|
|
@@ -71,21 +71,21 @@
|
|
|
71
71
|
]
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@aztec-foundation/bb.js": "6.0.0",
|
|
75
|
-
"@aztec-foundation/noir-acvm_js": "6.0.0",
|
|
76
|
-
"@aztec-foundation/noir-noirc_abi": "6.0.0",
|
|
77
|
-
"@aztec-foundation/noir-types": "6.0.0",
|
|
78
|
-
"@aztec-labs/bb-prover": "6.0.
|
|
79
|
-
"@aztec-labs/constants": "6.0.
|
|
80
|
-
"@aztec-labs/ethereum": "6.0.
|
|
81
|
-
"@aztec-labs/foundation": "6.0.
|
|
82
|
-
"@aztec-labs/key-store": "6.0.
|
|
83
|
-
"@aztec-labs/kv-store": "6.0.
|
|
84
|
-
"@aztec-labs/noir-protocol-circuits-types": "6.0.
|
|
85
|
-
"@aztec-labs/protocol-contracts": "6.0.
|
|
86
|
-
"@aztec-labs/simulator": "6.0.
|
|
87
|
-
"@aztec-labs/standard-contracts": "6.0.
|
|
88
|
-
"@aztec-labs/stdlib": "6.0.
|
|
74
|
+
"@aztec-foundation/bb.js": "6.0.0-rc.7",
|
|
75
|
+
"@aztec-foundation/noir-acvm_js": "6.0.0-rc.7",
|
|
76
|
+
"@aztec-foundation/noir-noirc_abi": "6.0.0-rc.7",
|
|
77
|
+
"@aztec-foundation/noir-types": "6.0.0-rc.7",
|
|
78
|
+
"@aztec-labs/bb-prover": "6.1.0-nightly.20261023",
|
|
79
|
+
"@aztec-labs/constants": "6.1.0-nightly.20261023",
|
|
80
|
+
"@aztec-labs/ethereum": "6.1.0-nightly.20261023",
|
|
81
|
+
"@aztec-labs/foundation": "6.1.0-nightly.20261023",
|
|
82
|
+
"@aztec-labs/key-store": "6.1.0-nightly.20261023",
|
|
83
|
+
"@aztec-labs/kv-store": "6.1.0-nightly.20261023",
|
|
84
|
+
"@aztec-labs/noir-protocol-circuits-types": "6.1.0-nightly.20261023",
|
|
85
|
+
"@aztec-labs/protocol-contracts": "6.1.0-nightly.20261023",
|
|
86
|
+
"@aztec-labs/simulator": "6.1.0-nightly.20261023",
|
|
87
|
+
"@aztec-labs/standard-contracts": "6.1.0-nightly.20261023",
|
|
88
|
+
"@aztec-labs/stdlib": "6.1.0-nightly.20261023",
|
|
89
89
|
"buffer": "^6.0.3",
|
|
90
90
|
"koa": "^2.16.1",
|
|
91
91
|
"koa-router": "^13.1.1",
|
|
@@ -95,8 +95,8 @@
|
|
|
95
95
|
"viem": "2.57.1"
|
|
96
96
|
},
|
|
97
97
|
"devDependencies": {
|
|
98
|
-
"@aztec-labs/noir-test-contracts.js": "6.0.
|
|
99
|
-
"@aztec-labs/world-state": "6.0.
|
|
98
|
+
"@aztec-labs/noir-test-contracts.js": "6.1.0-nightly.20261023",
|
|
99
|
+
"@aztec-labs/world-state": "6.1.0-nightly.20261023",
|
|
100
100
|
"@jest/globals": "^30.0.0",
|
|
101
101
|
"@types/jest": "^30.0.0",
|
|
102
102
|
"@types/lodash.omit": "^4.5.7",
|
|
@@ -42,11 +42,11 @@ import {
|
|
|
42
42
|
import { type PrivateCallExecutionResult, collectNested } from '@aztec-labs/stdlib/tx';
|
|
43
43
|
import { VkData } from '@aztec-labs/stdlib/vks';
|
|
44
44
|
|
|
45
|
-
import type {
|
|
45
|
+
import type { PrivateKernelInputsProvider } from '../private_kernel_inputs_provider.js';
|
|
46
46
|
|
|
47
|
-
function getNullifierMembershipWitnessResolver(
|
|
47
|
+
function getNullifierMembershipWitnessResolver(inputsProvider: PrivateKernelInputsProvider) {
|
|
48
48
|
return async (nullifier: Fr) => {
|
|
49
|
-
const res = await
|
|
49
|
+
const res = await inputsProvider.getNullifierMembershipWitness(nullifier);
|
|
50
50
|
if (!res) {
|
|
51
51
|
throw new Error(`Cannot find the leaf for nullifier ${nullifier}.`);
|
|
52
52
|
}
|
|
@@ -65,12 +65,12 @@ async function getMasterSecretKeysAndKeyTypeDomainSeparators(
|
|
|
65
65
|
typeof MAX_KEY_VALIDATION_REQUESTS_PER_TX
|
|
66
66
|
>,
|
|
67
67
|
numRequestsToVerify: number,
|
|
68
|
-
|
|
68
|
+
inputsProvider: PrivateKernelInputsProvider,
|
|
69
69
|
) {
|
|
70
70
|
const numRequestsToProcess = Math.min(keyValidationRequests.claimedLength, numRequestsToVerify);
|
|
71
71
|
const keysHints = await allToCompletion(
|
|
72
72
|
keyValidationRequests.array.slice(0, numRequestsToProcess).map(async ({ request }) => {
|
|
73
|
-
const secretKeys = await
|
|
73
|
+
const secretKeys = await inputsProvider.getMasterSecretKey(request.request.pkMHash);
|
|
74
74
|
return new KeyValidationHint(secretKeys);
|
|
75
75
|
}),
|
|
76
76
|
);
|
|
@@ -129,7 +129,7 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
|
|
132
|
-
async build(
|
|
132
|
+
async build(inputsProvider: PrivateKernelInputsProvider) {
|
|
133
133
|
if (privateKernelResetDimensionNames.every(name => !this.requestedDimensions[name])) {
|
|
134
134
|
throw new Error('Reset is not required.');
|
|
135
135
|
}
|
|
@@ -170,12 +170,12 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
170
170
|
// Execute all the expensive node querying operations in parallel.
|
|
171
171
|
const [previousVkMembershipWitness, noteHashReadRequestHints, nullifierReadRequestHints, keyValidationHints] =
|
|
172
172
|
await allToCompletion([
|
|
173
|
-
|
|
173
|
+
inputsProvider.getVkMembershipWitness(this.previousKernelOutput.verificationKey.keyAsFields),
|
|
174
174
|
buildNoteHashReadRequestHintsFromResetActions<
|
|
175
175
|
typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX,
|
|
176
176
|
typeof MAX_NOTE_HASH_READ_REQUESTS_PER_TX
|
|
177
177
|
>(
|
|
178
|
-
|
|
178
|
+
inputsProvider,
|
|
179
179
|
this.previousKernel.validationRequests.noteHashReadRequests,
|
|
180
180
|
this.previousKernel.end.noteHashes,
|
|
181
181
|
this.noteHashResetActions,
|
|
@@ -184,14 +184,14 @@ export class PrivateKernelResetPrivateInputsBuilder {
|
|
|
184
184
|
typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX,
|
|
185
185
|
typeof MAX_NULLIFIER_READ_REQUESTS_PER_TX
|
|
186
186
|
>(
|
|
187
|
-
{ getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(
|
|
187
|
+
{ getNullifierMembershipWitness: getNullifierMembershipWitnessResolver(inputsProvider) },
|
|
188
188
|
this.previousKernel.validationRequests.nullifierReadRequests,
|
|
189
189
|
this.nullifierResetActions,
|
|
190
190
|
),
|
|
191
191
|
getMasterSecretKeysAndKeyTypeDomainSeparators(
|
|
192
192
|
this.previousKernel.validationRequests.scopedKeyValidationRequestsAndSeparators,
|
|
193
193
|
dimensions.KEY_VALIDATION,
|
|
194
|
-
|
|
194
|
+
inputsProvider,
|
|
195
195
|
),
|
|
196
196
|
]);
|
|
197
197
|
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export * from './private_kernel_execution_prover.js';
|
|
2
|
-
export * from './
|
|
2
|
+
export * from './private_kernel_inputs_provider.js';
|
|
@@ -52,7 +52,7 @@ import { Buffer } from 'buffer';
|
|
|
52
52
|
import { BatchPlanner } from './batch_planner.js';
|
|
53
53
|
import { computeTxExpirationTimestamp } from './hints/compute_tx_expiration_timestamp.js';
|
|
54
54
|
import { PrivateKernelResetPrivateInputsBuilder } from './hints/private_kernel_reset_private_inputs_builder.js';
|
|
55
|
-
import type {
|
|
55
|
+
import type { PrivateKernelInputsProvider } from './private_kernel_inputs_provider.js';
|
|
56
56
|
|
|
57
57
|
const NULL_SIMULATE_OUTPUT: PrivateKernelSimulateOutput<PrivateKernelCircuitPublicInputs> = {
|
|
58
58
|
publicInputs: PrivateKernelCircuitPublicInputs.empty(),
|
|
@@ -77,7 +77,7 @@ export class PrivateKernelExecutionProver {
|
|
|
77
77
|
private log: Logger;
|
|
78
78
|
|
|
79
79
|
constructor(
|
|
80
|
-
private
|
|
80
|
+
private inputsProvider: PrivateKernelInputsProvider,
|
|
81
81
|
private proofCreator: PrivateKernelProver,
|
|
82
82
|
private fakeProofs = false,
|
|
83
83
|
bindings?: LoggerBindings,
|
|
@@ -144,7 +144,7 @@ export class PrivateKernelExecutionProver {
|
|
|
144
144
|
while (resetBuilder.needsReset()) {
|
|
145
145
|
// Inner reset: without siloing.
|
|
146
146
|
const witgenTimer = new Timer();
|
|
147
|
-
const privateInputs = await resetBuilder.build(this.
|
|
147
|
+
const privateInputs = await resetBuilder.build(this.inputsProvider);
|
|
148
148
|
output = generateWitnesses
|
|
149
149
|
? await this.proofCreator.generateResetOutput(privateInputs)
|
|
150
150
|
: await this.proofCreator.simulateReset(privateInputs);
|
|
@@ -215,7 +215,7 @@ export class PrivateKernelExecutionProver {
|
|
|
215
215
|
// functions were called via their exact expiration offsets.
|
|
216
216
|
const expirationTimestampUpperBound = computeTxExpirationTimestamp(output.publicInputs);
|
|
217
217
|
|
|
218
|
-
const resetInputs = await finalResetBuilder.build(this.
|
|
218
|
+
const resetInputs = await finalResetBuilder.build(this.inputsProvider);
|
|
219
219
|
const mergedInputs = new PrivateKernelResetTailCircuitPrivateInputs(
|
|
220
220
|
resetInputs.previousKernel,
|
|
221
221
|
resetInputs.paddedSideEffects,
|
|
@@ -350,7 +350,7 @@ export class PrivateKernelExecutionProver {
|
|
|
350
350
|
}
|
|
351
351
|
|
|
352
352
|
private async getVkData(verificationKey: VerificationKeyData) {
|
|
353
|
-
const previousVkMembershipWitness = await this.
|
|
353
|
+
const previousVkMembershipWitness = await this.inputsProvider.getVkMembershipWitness(verificationKey.keyAsFields);
|
|
354
354
|
return new VkData(
|
|
355
355
|
verificationKey,
|
|
356
356
|
Number(previousVkMembershipWitness.leafIndex),
|
|
@@ -371,7 +371,7 @@ export class PrivateKernelExecutionProver {
|
|
|
371
371
|
const next = executionStack.pop()!;
|
|
372
372
|
executionStack.push(...[...next.nestedExecutionResults].reverse());
|
|
373
373
|
|
|
374
|
-
const functionName = await this.
|
|
374
|
+
const functionName = await this.inputsProvider.getDebugFunctionName(
|
|
375
375
|
next.publicInputs.callContext.contractAddress,
|
|
376
376
|
next.publicInputs.callContext.functionSelector,
|
|
377
377
|
);
|
|
@@ -403,7 +403,7 @@ export class PrivateKernelExecutionProver {
|
|
|
403
403
|
await allToCompletion(
|
|
404
404
|
uniqueAddresses.map(
|
|
405
405
|
async addr =>
|
|
406
|
-
[addr.toString(), await this.
|
|
406
|
+
[addr.toString(), await this.inputsProvider.getUpdatedClassIdHints(addr)] as [string, UpdatedClassIdHints],
|
|
407
407
|
),
|
|
408
408
|
),
|
|
409
409
|
);
|
|
@@ -419,14 +419,14 @@ export class PrivateKernelExecutionProver {
|
|
|
419
419
|
const vk = await VerificationKeyAsFields.fromKey(vkFields);
|
|
420
420
|
|
|
421
421
|
const { currentContractClassId, publicKeys, saltedInitializationHash } =
|
|
422
|
-
await this.
|
|
423
|
-
const functionLeafMembershipWitness = await this.
|
|
422
|
+
await this.inputsProvider.getContractAddressPreimage(contractAddress);
|
|
423
|
+
const functionLeafMembershipWitness = await this.inputsProvider.getFunctionMembershipWitness(
|
|
424
424
|
currentContractClassId,
|
|
425
425
|
functionSelector,
|
|
426
426
|
);
|
|
427
427
|
|
|
428
428
|
const { artifactHash: contractClassArtifactHash, publicBytecodeCommitment: contractClassPublicBytecodeCommitment } =
|
|
429
|
-
await this.
|
|
429
|
+
await this.inputsProvider.getContractClassIdPreimage(currentContractClassId);
|
|
430
430
|
|
|
431
431
|
const updatedClassIdHints = updatedClassIdHintsMap.get(contractAddress.toString())!;
|
|
432
432
|
|
|
@@ -32,7 +32,7 @@ import type { ContractStore } from '../storage/contract_store/contract_store.js'
|
|
|
32
32
|
/**
|
|
33
33
|
* Provides functionality needed by the private kernel for interacting with our state trees.
|
|
34
34
|
*/
|
|
35
|
-
export class
|
|
35
|
+
export class PrivateKernelInputsProvider {
|
|
36
36
|
private readonly anchoredContractData: AnchoredContractData;
|
|
37
37
|
|
|
38
38
|
constructor(
|
package/src/pxe.ts
CHANGED
|
@@ -77,7 +77,7 @@ import {
|
|
|
77
77
|
PrivateKernelExecutionProver,
|
|
78
78
|
type PrivateKernelExecutionProverConfig,
|
|
79
79
|
} from './private_kernel/private_kernel_execution_prover.js';
|
|
80
|
-
import {
|
|
80
|
+
import { PrivateKernelInputsProvider } from './private_kernel/private_kernel_inputs_provider.js';
|
|
81
81
|
import { AddressStore } from './storage/address_store/address_store.js';
|
|
82
82
|
import { AnchorBlockStore } from './storage/anchor_block_store/anchor_block_store.js';
|
|
83
83
|
import { CapsuleStore } from './storage/capsule_store/capsule_store.js';
|
|
@@ -643,7 +643,7 @@ export class PXE {
|
|
|
643
643
|
anchorBlockHeader: BlockHeader,
|
|
644
644
|
config: PrivateKernelExecutionProverConfig,
|
|
645
645
|
): Promise<PrivateKernelExecutionProofOutput<PrivateKernelTailCircuitPublicInputs>> {
|
|
646
|
-
const
|
|
646
|
+
const kernelInputsProvider = new PrivateKernelInputsProvider(
|
|
647
647
|
this.contractStore,
|
|
648
648
|
this.contractClassService,
|
|
649
649
|
this.keyStore,
|
|
@@ -651,7 +651,7 @@ export class PXE {
|
|
|
651
651
|
anchorBlockHeader,
|
|
652
652
|
);
|
|
653
653
|
const kernelTraceProver = new PrivateKernelExecutionProver(
|
|
654
|
-
|
|
654
|
+
kernelInputsProvider,
|
|
655
655
|
proofCreator,
|
|
656
656
|
!this.proverEnabled,
|
|
657
657
|
this.log.getBindings(),
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"private_kernel_oracle.d.ts","sourceRoot":"","sources":["../../src/private_kernel/private_kernel_oracle.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EAGrB,cAAc,EACf,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,KAAK,2BAA2B,EAAmC,MAAM,6BAA6B,CAAC;AAMhH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAElF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAEjF;;GAEG;AACH,qBAAa,mBAAmB;IAI5B,OAAO,CAAC,aAAa;IAErB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,WAAW;IAPrB,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAuB;IAE5D,YACU,aAAa,EAAE,aAAa,EACpC,oBAAoB,EAAE,oBAAoB,EAClC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,WAAW,EAKjC;IAED,8FAA8F;IACjF,0BAA0B,CACrC,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,2BAA2B,GAAG;QAAE,wBAAwB,EAAE,EAAE,CAAA;KAAE,CAAC,CAezE;IAED,kFAAkF;IACrE,0BAA0B,CAAC,eAAe,EAAE,EAAE;;;;OAU1D;IAED,uGAAuG;IAC1F,4BAA4B,CACvC,eAAe,EAAE,EAAE,EACnB,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,iBAAiB,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAQzD;IAED;;;OAGG;IACI,sBAAsB,CAAC,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,cAAc,CAAC,CAAC,CAG5G;IAED,+FAA+F;IACzF,4BAA4B,CAChC,QAAQ,EAAE,EAAE,GACX,OAAO,CAAC,iBAAiB,CAAC,OAAO,qBAAqB,CAAC,GAAG,SAAS,CAAC,CAEtE;IAED,8GAA8G;IACxG,6BAA6B,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,0BAA0B,GAAG,SAAS,CAAC,CAElG;IAED,qDAAqD;IACrD,mBAAmB,IAAI,EAAE,CAExB;IAED;;;;;;OAMG;IACI,kBAAkB,CAAC,mBAAmB,EAAE,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAE1E;IAED,2EAA2E;IAC9D,oBAAoB,CAC/B,eAAe,EAAE,YAAY,EAC7B,QAAQ,EAAE,gBAAgB,GACzB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;IAED;;;OAGG;IACU,sBAAsB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoC/F;CACF"}
|