@aztec/pxe 0.15.1 → 0.16.0

package/dest/index.d.ts

@@ -2,7 +2,7 @@ export * from './pxe_service/index.js';
 export * from './pxe_http/index.js';
 export * from './config/index.js';
 export { Tx, TxHash } from '@aztec/types';
-export { TxRequest, CircuitsWasm, PartialAddress } from '@aztec/circuits.js';
+export { TxRequest, PartialAddress } from '@aztec/circuits.js';
 export * from '@aztec/foundation/fields';
 export * from '@aztec/foundation/eth-address';
 export * from '@aztec/foundation/aztec-address';

package/dest/index.d.ts.map

@@ -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;AAElC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC7E,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC"}
+{"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;AAElC,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC/D,cAAc,0BAA0B,CAAC;AACzC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,kBAAkB,CAAC"}

package/dest/index.js

@@ -2,9 +2,9 @@ export * from './pxe_service/index.js';
 export * from './pxe_http/index.js';
 export * from './config/index.js';
 export { Tx, TxHash } from '@aztec/types';
-export { TxRequest, CircuitsWasm } from '@aztec/circuits.js';
+export { TxRequest } from '@aztec/circuits.js';
 export * from '@aztec/foundation/fields';
 export * from '@aztec/foundation/eth-address';
 export * from '@aztec/foundation/aztec-address';
 export * from '@aztec/key-store';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFFbEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUMsT0FBTyxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQWtCLE1BQU0sb0JBQW9CLENBQUM7QUFDN0UsY0FBYywwQkFBMEIsQ0FBQztBQUN6QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYyxrQkFBa0IsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyx3QkFBd0IsQ0FBQztBQUN2QyxjQUFjLHFCQUFxQixDQUFDO0FBQ3BDLGNBQWMsbUJBQW1CLENBQUM7QUFFbEMsT0FBTyxFQUFFLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxjQUFjLENBQUM7QUFFMUMsT0FBTyxFQUFFLFNBQVMsRUFBa0IsTUFBTSxvQkFBb0IsQ0FBQztBQUMvRCxjQUFjLDBCQUEwQixDQUFDO0FBQ3pDLGNBQWMsK0JBQStCLENBQUM7QUFDOUMsY0FBYyxpQ0FBaUMsQ0FBQztBQUNoRCxjQUFjLGtCQUFrQixDQUFDIn0=

package/dest/kernel_prover/kernel_prover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EACL,YAAY,EAGZ,EAAE,EAeF,SAAS,EAKV,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAsB,YAAY,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAClB;;OAEG;IACH,UAAU,EAAE,EAAE,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;OAEG;IACH,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED;;;;;GAKG;AACH,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;IAAqB,OAAO,CAAC,YAAY;gBAA/C,MAAM,EAAE,iBAAiB,EAAU,YAAY,GAAE,YAAuC;IAE5G;;;;;;;;;OASG;IACG,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAmHlF,qBAAqB;IAqCnC;;;;;;;;OAQG;YACW,WAAW;IAezB;;;;;;;;;OASG;IACH,OAAO,CAAC,mBAAmB;IAmB3B;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;CAsB1B"}
+{"version":3,"file":"kernel_prover.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,EACL,YAAY,EAIZ,EAAE,EAeF,SAAS,EAKV,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAsB,YAAY,EAAe,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACrG,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAClB;;OAEG;IACH,UAAU,EAAE,EAAE,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;OAEG;IACH,WAAW,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED;;;;;GAKG;AACH,qBAAa,YAAY;IACX,OAAO,CAAC,MAAM;IAAqB,OAAO,CAAC,YAAY;gBAA/C,MAAM,EAAE,iBAAiB,EAAU,YAAY,GAAE,YAAuC;IAE5G;;;;;;;;;OASG;IACG,KAAK,CAAC,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,kBAAkB,CAAC;YA2GlF,qBAAqB;IA+CnC;;;;;;;;OAQG;YACW,WAAW;IAezB;;;;;;;;;OASG;IACH,OAAO,CAAC,mBAAmB;IAmB3B;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;CAsB1B"}

package/dest/kernel_prover/kernel_prover.js

@@ -1,4 +1,5 @@
-import { CONTRACT_TREE_HEIGHT, EMPTY_NULLIFIED_COMMITMENT, Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_READ_REQUESTS_PER_CALL, MAX_READ_REQUESTS_PER_TX, MembershipWitness, PreviousKernelData, PrivateCallData, PrivateCallStackItem, PrivateKernelInputsInit, PrivateKernelInputsInner, PrivateKernelInputsOrdering, PrivateKernelPublicInputs, ReadRequestMembershipWitness, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, makeTuple, } from '@aztec/circuits.js';
+import { CONTRACT_TREE_HEIGHT, CallRequest, EMPTY_NULLIFIED_COMMITMENT, Fr, MAX_NEW_NULLIFIERS_PER_TX, MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL, MAX_READ_REQUESTS_PER_CALL, MAX_READ_REQUESTS_PER_TX, MembershipWitness, PreviousKernelData, PrivateCallData, PrivateKernelInputsInit, PrivateKernelInputsInner, PrivateKernelInputsOrdering, PrivateKernelPublicInputs, ReadRequestMembershipWitness, VK_TREE_HEIGHT, VerificationKey, makeEmptyProof, makeTuple, } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { assertLength } from '@aztec/foundation/serialize';
 import { KernelProofCreator } from './proof_creator.js';
 /**
@@ -34,14 +35,8 @@ export class KernelProver {
         while (executionStack.length) {
             const currentExecution = executionStack.pop();
             executionStack.push(...currentExecution.nestedExecutions);
-            const privateCallStackPreimages = currentExecution.nestedExecutions.map(result => result.callStackItem);
-            if (privateCallStackPreimages.length > MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL) {
-                throw new Error(`Too many items in the call stack. Maximum amount is ${MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL}. Got ${privateCallStackPreimages.length}.`);
-            }
-            // Pad with empty items to reach max/const length expected by circuit.
-            privateCallStackPreimages.push(...Array(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL - privateCallStackPreimages.length)
-                .fill(0)
-                .map(() => PrivateCallStackItem.empty()));
+            const privateCallRequests = currentExecution.nestedExecutions.map(result => result.callStackItem.toCallRequest());
+            const publicCallRequests = currentExecution.enqueuedPublicFunctionCalls.map(result => result.toCallRequest());
             // Start with the partially filled in read request witnesses from the simulator
             // and fill the non-transient ones in with sibling paths via oracle.
             const readRequestMembershipWitnesses = currentExecution.readRequestPartialWitnesses;
@@ -65,7 +60,7 @@ export class KernelProver {
             readRequestMembershipWitnesses.push(...Array(MAX_READ_REQUESTS_PER_CALL - readRequestMembershipWitnesses.length)
                 .fill(0)
                 .map(() => ReadRequestMembershipWitness.empty(BigInt(0))));
-            const privateCallData = await this.createPrivateCallData(currentExecution, readRequestMembershipWitnesses, makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, i => privateCallStackPreimages[i], 0));
+            const privateCallData = await this.createPrivateCallData(currentExecution, privateCallRequests, publicCallRequests, readRequestMembershipWitnesses);
             if (firstIteration) {
                 output = await this.proofCreator.createProofInit(new PrivateKernelInputsInit(txRequest, privateCallData));
             }
@@ -91,9 +86,12 @@ export class KernelProver {
         const outputNotes = finalNewCommitments.map(c => newNotes[c.toString()]).filter(c => !!c);
         return { ...outputFinal, outputNotes };
     }
-    async createPrivateCallData({ callStackItem, vk }, readRequestMembershipWitnesses, privateCallStackPreimages) {
+    async createPrivateCallData({ callStackItem, vk }, privateCallRequests, publicCallRequests, readRequestMembershipWitnesses) {
         const { contractAddress, functionData, publicInputs } = callStackItem;
         const { portalContractAddress } = publicInputs.callContext;
+        // Pad with empty items to reach max/const length expected by circuit.
+        const privateCallStack = padArrayEnd(privateCallRequests, CallRequest.empty(), MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL);
+        const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
         const contractLeafMembershipWitness = functionData.isConstructor
             ? MembershipWitness.random(CONTRACT_TREE_HEIGHT)
             : await this.oracle.getContractMembershipWitness(contractAddress);
@@ -103,7 +101,7 @@ export class KernelProver {
         const acirHash = Fr.fromBuffer(Buffer.alloc(32, 0));
         // TODO
         const proof = makeEmptyProof();
-        return new PrivateCallData(callStackItem, privateCallStackPreimages, proof, VerificationKey.fromBuffer(vk), functionLeafMembershipWitness, contractLeafMembershipWitness, makeTuple(MAX_READ_REQUESTS_PER_CALL, i => readRequestMembershipWitnesses[i], 0), portalContractAddress.toField(), acirHash);
+        return new PrivateCallData(callStackItem, privateCallStack, publicCallStack, proof, VerificationKey.fromBuffer(vk), functionLeafMembershipWitness, contractLeafMembershipWitness, makeTuple(MAX_READ_REQUESTS_PER_CALL, i => readRequestMembershipWitnesses[i], 0), portalContractAddress.toField(), acirHash);
     }
     /**
      * Retrieves the new output notes for a given execution result.
@@ -176,4 +174,4 @@ export class KernelProver {
         return hints;
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,oBAAoB,EACpB,0BAA0B,EAC1B,EAAE,EAEF,yBAAyB,EACzB,sCAAsC,EACtC,0BAA0B,EAC1B,wBAAwB,EACxB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,oBAAoB,EACpB,uBAAuB,EACvB,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,4BAA4B,EAE5B,cAAc,EACd,eAAe,EACf,cAAc,EACd,SAAS,GACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAS,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,EAAE,kBAAkB,EAA+C,MAAM,oBAAoB,CAAC;AAkCrG;;;;;GAKG;AACH,MAAM,OAAO,YAAY;IACvB,YAAoB,MAAyB,EAAU,eAA6B,IAAI,kBAAkB,EAAE;QAAxF,WAAM,GAAN,MAAM,CAAmB;QAAU,iBAAY,GAAZ,YAAY,CAAyC;IAAG,CAAC;IAEhH;;;;;;;;;OASG;IACH,KAAK,CAAC,KAAK,CAAC,SAAoB,EAAE,eAAgC;QAChE,MAAM,cAAc,GAAG,CAAC,eAAe,CAAC,CAAC;QACzC,MAAM,QAAQ,GAAgD,EAAE,CAAC;QACjE,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,uBAAuB,GAAG,eAAe,CAAC,QAAQ,EAAE,CAAC;QAEzD,IAAI,MAAM,GAAgB;YACxB,YAAY,EAAE,yBAAyB,CAAC,KAAK,EAAE;YAC/C,KAAK,EAAE,cAAc,EAAE;SACxB,CAAC;QAEF,OAAO,cAAc,CAAC,MAAM,EAAE;YAC5B,MAAM,gBAAgB,GAAG,cAAc,CAAC,GAAG,EAAG,CAAC;YAC/C,cAAc,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;YAC1D,MAAM,yBAAyB,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;YACxG,IAAI,yBAAyB,CAAC,MAAM,GAAG,sCAAsC,EAAE;gBAC7E,MAAM,IAAI,KAAK,CACb,uDAAuD,sCAAsC,SAAS,yBAAyB,CAAC,MAAM,GAAG,CAC1I,CAAC;aACH;YACD,sEAAsE;YACtE,yBAAyB,CAAC,IAAI,CAC5B,GAAG,KAAK,CAAC,sCAAsC,GAAG,yBAAyB,CAAC,MAAM,CAAC;iBAChF,IAAI,CAAC,CAAC,CAAC;iBACP,GAAG,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC,CAC3C,CAAC;YAEF,+EAA+E;YAC/E,oEAAoE;YACpE,MAAM,8BAA8B,GAAG,gBAAgB,CAAC,2BAA2B,CAAC;YACpF,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,8BAA8B,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;gBACjE,oGAAoG;gBACpG,+CAA+C;gBAC/C,iFAAiF;gBACjF,qBAAqB;gBACrB,0IAA0I;gBAC1I,OAAO;gBACP,IAAI;gBACJ,MAAM,SAAS,GAAG,8BAA8B,CAAC,EAAE,CAAC,CAAC;gBACrD,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE;oBAC1B,sGAAsG;oBACtG,sFAAsF;oBACtF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACrG,SAAS,CAAC,WAAW,GAAG,iBAAiB,CAAC,WAAW,CAAC;iBACvD;aACF;YAED,sDAAsD;YACtD,8BAA8B,CAAC,IAAI,CACjC,GAAG,KAAK,CAAC,0BAA0B,GAAG,8BAA8B,CAAC,MAAM,CAAC;iBACzE,IAAI,CAAC,CAAC,CAAC;iBACP,GAAG,CAAC,GAAG,EAAE,CAAC,4BAA4B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAC5D,CAAC;YAEF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,CACtD,gBAAgB,EAChB,8BAA8B,EAC9B,SAAS,CAAC,sCAAsC,EAAE,CAAC,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CACxF,CAAC;YAEF,IAAI,cAAc,EAAE;gBAClB,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,IAAI,uBAAuB,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;aAC3G;iBAAM;gBACL,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC;gBACtG,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,KAAK,EACZ,uBAAuB,EACvB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;gBACF,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAC/C,IAAI,wBAAwB,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAClE,CAAC;aACH;YACD,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;gBACrD,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;YACH,cAAc,GAAG,KAAK,CAAC;YACvB,uBAAuB,GAAG,eAAe,CAAC,EAAE,CAAC;SAC9C;QAED,MAAM,2BAA2B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC;QACtG,MAAM,kBAAkB,GAAG,IAAI,kBAAkB,CAC/C,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,KAAK,EACZ,uBAAuB,EACvB,MAAM,CAAC,2BAA2B,CAAC,SAAS,CAAC,EAC7C,YAAY,CAA4B,2BAA2B,CAAC,WAAW,EAAE,cAAc,CAAC,CACjG,CAAC;QAEF,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAClD,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EACpC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CACvC,CAAC;QAEF,MAAM,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CACrD,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CACvC,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,2BAA2B,CACnD,kBAAkB,EAClB,mBAAmB,EACnB,wBAAwB,CACzB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;QAE/E,mFAAmF;QACnF,MAAM,mBAAmB,GAAG,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,CAAC;QACxE,MAAM,WAAW,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAE1F,OAAO,EAAE,GAAG,WAAW,EAAE,WAAW,EAAE,CAAC;IACzC,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,EAAE,aAAa,EAAE,EAAE,EAAmB,EACtC,8BAA8D,EAC9D,yBAAqG;QAErG,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;QACtE,MAAM,EAAE,qBAAqB,EAAE,GAAG,YAAY,CAAC,WAAW,CAAC;QAE3D,MAAM,6BAA6B,GAAG,YAAY,CAAC,aAAa;YAC9D,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,oBAAoB,CAAC;YAChD,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAAC,eAAe,CAAC,CAAC;QAEpE,MAAM,6BAA6B,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,4BAA4B,CAClF,eAAe,EACf,YAAY,CAAC,QAAQ,CACtB,CAAC;QAEF,iCAAiC;QACjC,yDAAyD;QACzD,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAEpD,OAAO;QACP,MAAM,KAAK,GAAG,cAAc,EAAE,CAAC;QAE/B,OAAO,IAAI,eAAe,CACxB,aAAa,EACb,yBAAyB,EACzB,KAAK,EACL,eAAe,CAAC,UAAU,CAAC,EAAE,CAAC,EAC9B,6BAA6B,EAC7B,6BAA6B,EAC7B,SAAS,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAChF,qBAAqB,CAAC,OAAO,EAAE,EAC/B,QAAQ,CACT,CAAC;IACJ,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,WAAW,CAAC,eAAgC;QACxD,MAAM,EACJ,aAAa,EAAE,EAAE,YAAY,EAAE,EAC/B,QAAQ,GACT,GAAG,eAAe,CAAC;QACpB,MAAM,eAAe,GAAG,YAAY,CAAC,WAAW,CAAC,sBAAsB,CAAC;QACxE,8FAA8F;QAC9F,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;QAClF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAChC,eAAe;YACf,IAAI;YACJ,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;SAC9B,CAAC,CAAC,CAAC;IACN,CAAC;IAED;;;;;;;;;OASG;IACK,mBAAmB,CACzB,YAAwD,EACxD,WAAyD;QAEzD,MAAM,KAAK,GAAG,SAAS,CAAC,wBAAwB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,wBAAwB,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE;YAC9E,MAAM,SAAS,GAAG,CAAC,GAAO,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;YAChD,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE;gBAChB,MAAM,IAAI,KAAK,CACb,6BAA6B,CAAC,eAAe,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,oCAAoC,CAC5G,CAAC;aACH;iBAAM;gBACL,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;aAC3B;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;;;;;;;;OASG;IACK,iBAAiB,CACvB,oBAAiE,EACjE,WAAyD;QAEzD,MAAM,KAAK,GAAG,SAAS,CAAC,yBAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,yBAAyB,EAAE,CAAC,EAAE,EAAE;YAClD,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,0BAA0B,CAAC,CAAC,EAAE;gBAC5G,MAAM,iBAAiB,GAAG,CAAC,GAAO,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC3E,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBACxD,IAAI,MAAM,IAAI,CAAC,CAAC,EAAE;oBAChB,MAAM,IAAI,KAAK,CACb,qCAAqC,CAAC,eAAe,oBAAoB,CACvE,CAAC,CACF,CAAC,QAAQ,EAAE,oCAAoC,CACjD,CAAC;iBACH;qBAAM;oBACL,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;iBAC3B;aACF;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;CACF"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"kernel_prover.js","sourceRoot":"","sources":["../../src/kernel_prover/kernel_prover.ts"],"names":[],"mappings":"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"}

package/dest/kernel_prover/proof_creator.d.ts

@@ -7,8 +7,6 @@ import { Fr } from '@aztec/foundation/fields';
 export interface ProofOutput {
     /**
      * The public inputs required for the proof generation process.
-     * Note: C++ side does not define the specific data structure PrivateKernelPublicInputs and therefore
-     * would not generate a binding in circuits.gen.ts.
      */
     publicInputs: KernelCircuitPublicInputs;
     /**
@@ -23,8 +21,6 @@ export interface ProofOutput {
 export interface ProofOutputFinal {
     /**
      * The public inputs required for the proof generation process.
-     * Note: C++ side does not define the specific data structure PrivateKernelPublicInputsFinal and therefore
-     * would not generate a binding in circuits.gen.ts.
      */
     publicInputs: KernelCircuitPublicInputsFinal;
     /**
@@ -68,10 +64,10 @@ export interface ProofCreator {
 }
 /**
  * The KernelProofCreator class is responsible for generating siloed commitments and zero-knowledge proofs
- * for private kernel circuit. It leverages Barretenberg and Circuits Wasm libraries
- * to perform cryptographic operations and proof creation. The class provides methods to compute commitments
- * based on the given public inputs and to generate proofs based on signed transaction requests, previous kernel
- * data, private call data, and a flag indicating whether it's the first iteration or not.
+ * for private kernel circuit. It leverages Barretenberg to perform cryptographic operations and proof creation.
+ * The class provides methods to compute commitments based on the given public inputs and to generate proofs based on
+ * signed transaction requests, previous kernel data, private call data, and a flag indicating whether it's the first
+ * iteration or not.
  */
 export declare class KernelProofCreator implements ProofCreator {
     private log;

package/dest/kernel_prover/proof_creator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proof_creator.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/proof_creator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,8BAA8B,EAC9B,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,2BAA2B,EAC3B,KAAK,EAEN,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAM9C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,YAAY,EAAE,yBAAyB,CAAC;IACxC;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,YAAY,EAAE,8BAA8B,CAAC;IAC7C;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,oBAAoB,CAAC,YAAY,EAAE,0BAA0B,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,eAAe,CAAC,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAExF;;;;;OAKG;IACH,gBAAgB,CAAC,wBAAwB,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3F;;;;;OAKG;IACH,mBAAmB,CAAC,2BAA2B,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC1G;AAED;;;;;;GAMG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IACzC,OAAO,CAAC,GAAG;gBAAH,GAAG,8CAAkD;IAElE,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAMvD,eAAe,CAAC,aAAa,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAkB7E,gBAAgB,CAAC,aAAa,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC;IAkB/E,mBAAmB,CAAC,aAAa,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiBxG"}
+{"version":3,"file":"proof_creator.d.ts","sourceRoot":"","sources":["../../src/kernel_prover/proof_creator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,8BAA8B,EAC9B,0BAA0B,EAC1B,uBAAuB,EACvB,wBAAwB,EACxB,2BAA2B,EAC3B,KAAK,EAEN,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAM9C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,YAAY,EAAE,yBAAyB,CAAC;IACxC;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,YAAY,EAAE,8BAA8B,CAAC;IAC7C;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,oBAAoB,CAAC,YAAY,EAAE,0BAA0B,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9E;;;;;OAKG;IACH,eAAe,CAAC,uBAAuB,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAExF;;;;;OAKG;IACH,gBAAgB,CAAC,wBAAwB,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAE3F;;;;;OAKG;IACH,mBAAmB,CAAC,2BAA2B,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAC1G;AAED;;;;;;GAMG;AACH,qBAAa,kBAAmB,YAAW,YAAY;IACzC,OAAO,CAAC,GAAG;gBAAH,GAAG,8CAAkD;IAElE,oBAAoB,CAAC,YAAY,EAAE,0BAA0B;IAMvD,eAAe,CAAC,aAAa,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAkB7E,gBAAgB,CAAC,aAAa,EAAE,wBAAwB,GAAG,OAAO,CAAC,WAAW,CAAC;IAkB/E,mBAAmB,CAAC,aAAa,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAiBxG"}

package/dest/kernel_prover/proof_creator.js

@@ -5,10 +5,10 @@ import { elapsed } from '@aztec/foundation/timer';
 import { executeInit, executeInner, executeOrdering } from '@aztec/noir-protocol-circuits';
 /**
  * The KernelProofCreator class is responsible for generating siloed commitments and zero-knowledge proofs
- * for private kernel circuit. It leverages Barretenberg and Circuits Wasm libraries
- * to perform cryptographic operations and proof creation. The class provides methods to compute commitments
- * based on the given public inputs and to generate proofs based on signed transaction requests, previous kernel
- * data, private call data, and a flag indicating whether it's the first iteration or not.
+ * for private kernel circuit. It leverages Barretenberg to perform cryptographic operations and proof creation.
+ * The class provides methods to compute commitments based on the given public inputs and to generate proofs based on
+ * signed transaction requests, previous kernel data, private call data, and a flag indicating whether it's the first
+ * iteration or not.
  */
 export class KernelProofCreator {
     constructor(log = createDebugLogger('aztec:kernel_proof_creator')) {
@@ -67,4 +67,4 @@ export class KernelProofCreator {
         };
     }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvb2ZfY3JlYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Byb29mX2NyZWF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQVFMLGNBQWMsR0FDZixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUEyRTNGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFBb0IsTUFBTSxpQkFBaUIsQ0FBQyw0QkFBNEIsQ0FBQztRQUFyRCxRQUFHLEdBQUgsR0FBRyxDQUFrRDtJQUFHLENBQUM7SUFFdEUsb0JBQW9CLENBQUMsWUFBd0M7UUFDbEUsTUFBTSxlQUFlLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsQ0FBQztRQUV4RSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsZUFBZSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNySCxDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFzQztRQUNqRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsK0JBQStCLEVBQUU7WUFDeEMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUscUJBQXFCO1lBQ2xDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMseUNBQXlDLENBQUMsQ0FBQztRQUNwRCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxhQUF1QztRQUNuRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLEVBQUU7WUFDekMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsMENBQTBDLENBQUMsQ0FBQztRQUNyRCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxhQUEwQztRQUN6RSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQy9FLElBQUksQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEVBQUU7WUFDNUMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUseUJBQXlCO1lBQ3RDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQztRQUN4RCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztDQUNGIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvb2ZfY3JlYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9rZXJuZWxfcHJvdmVyL3Byb29mX2NyZWF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQVFMLGNBQWMsR0FDZixNQUFNLG9CQUFvQixDQUFDO0FBQzVCLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUV6RCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFDbEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxZQUFZLEVBQUUsZUFBZSxFQUFFLE1BQU0sK0JBQStCLENBQUM7QUF1RTNGOzs7Ozs7R0FNRztBQUNILE1BQU0sT0FBTyxrQkFBa0I7SUFDN0IsWUFBb0IsTUFBTSxpQkFBaUIsQ0FBQyw0QkFBNEIsQ0FBQztRQUFyRCxRQUFHLEdBQUgsR0FBRyxDQUFrRDtJQUFHLENBQUM7SUFFdEUsb0JBQW9CLENBQUMsWUFBd0M7UUFDbEUsTUFBTSxlQUFlLEdBQUcsWUFBWSxDQUFDLFdBQVcsQ0FBQyxzQkFBc0IsQ0FBQztRQUV4RSxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxjQUFjLENBQUMsZUFBZSxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNySCxDQUFDO0lBRU0sS0FBSyxDQUFDLGVBQWUsQ0FBQyxhQUFzQztRQUNqRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzNFLElBQUksQ0FBQyxHQUFHLENBQUMsK0JBQStCLEVBQUU7WUFDeEMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUscUJBQXFCO1lBQ2xDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMseUNBQXlDLENBQUMsQ0FBQztRQUNwRCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxhQUF1QztRQUNuRSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLFlBQVksQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQzVFLElBQUksQ0FBQyxHQUFHLENBQUMsZ0NBQWdDLEVBQUU7WUFDekMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUsc0JBQXNCO1lBQ25DLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsMENBQTBDLENBQUMsQ0FBQztRQUNyRCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztJQUVNLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxhQUEwQztRQUN6RSxNQUFNLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxHQUFHLE1BQU0sT0FBTyxDQUFDLEdBQUcsRUFBRSxDQUFDLGVBQWUsQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDO1FBQy9FLElBQUksQ0FBQyxHQUFHLENBQUMsbUNBQW1DLEVBQUU7WUFDNUMsU0FBUyxFQUFFLG9CQUFvQjtZQUMvQixXQUFXLEVBQUUseUJBQXlCO1lBQ3RDLFFBQVE7WUFDUixTQUFTLEVBQUUsYUFBYSxDQUFDLFFBQVEsRUFBRSxDQUFDLE1BQU07WUFDMUMsVUFBVSxFQUFFLE1BQU0sQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNO1NBQ0osQ0FBQyxDQUFDO1FBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsNkNBQTZDLENBQUMsQ0FBQztRQUN4RCxNQUFNLEtBQUssR0FBRyxjQUFjLEVBQUUsQ0FBQztRQUUvQixPQUFPO1lBQ0wsWUFBWSxFQUFFLE1BQU07WUFDcEIsS0FBSyxFQUFFLEtBQUs7U0FDYixDQUFDO0lBQ0osQ0FBQztDQUNGIn0=

package/dest/pxe_service/pxe_service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,YAAY,EACZ,eAAe,EAEf,kBAAkB,EAGlB,cAAc,EAEf,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAG9C,OAAO,EACL,WAAW,EACX,SAAS,EAET,YAAY,EACZ,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EAEZ,0BAA0B,EAC1B,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,SAAS,EAET,QAAQ,EACR,UAAU,EACV,GAAG,EAEH,EAAE,EACF,kBAAkB,EAClB,MAAM,EAEN,SAAS,EAKV,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,gBAAgB,EAAkB,MAAM,oBAAoB,CAAC;AAEtE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAOhD;;GAEG;AACH,qBAAa,UAAW,YAAW,GAAG;;IAQlC,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,EAAE;IACV,OAAO,CAAC,MAAM;IAVhB,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,kBAAkB,CAAqB;IAC/C,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,GAAG,CAAc;IACzB,OAAO,CAAC,cAAc,CAAS;gBAGrB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,SAAS,EACf,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,gBAAgB,EAChC,SAAS,CAAC,EAAE,MAAM;IAUpB;;;;OAIG;IACU,KAAK;IAOlB;;;;;;OAMG;IACU,IAAI;IAKjB,mDAAmD;IAC5C,cAAc;IAId,cAAc,CAAC,OAAO,EAAE,WAAW;IAInC,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE;IAIlB,eAAe,CAAC,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IActG,qBAAqB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IASnD,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAMjF,iBAAiB,CAAC,SAAS,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D,aAAa,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAS3C,YAAY,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAMzE,YAAY,CAAC,SAAS,EAAE,gBAAgB,EAAE;IAU1C,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAIvC,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE;IAOnD,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAqBrD,OAAO,CAAC,IAAI,EAAE,YAAY;IA6CvC;;;;;OAKG;YACW,aAAa;IAoCd,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAQ3D,UAAU,CAAC,SAAS,EAAE,kBAAkB,EAAE,cAAc,EAAE,OAAO;IAsBjE,MAAM,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAU/B,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,YAAY;IAShF,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAyBhD,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAIvD,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAI1B,uBAAuB,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC;IAIjG,eAAe,CAAC,eAAe,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAI9F;;;;OAIG;IACI,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;IAwBpE,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;YA0M/B,4BAA4B;IA8B7B,yBAAyB;IAIzB,0BAA0B,CAAC,OAAO,EAAE,YAAY;IAItD,aAAa;;;;;;IAIb,WAAW;CAGnB"}
+{"version":3,"file":"pxe_service.d.ts","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}

package/dest/pxe_service/pxe_service.js

@@ -1,7 +1,7 @@
 var _PXEService_instances, _PXEService_getFunctionCall, _PXEService_getSimulationParameters, _PXEService_simulate, _PXEService_simulateUnconstrained, _PXEService_simulatePublicCalls, _PXEService_simulateAndProve, _PXEService_enrichSimulationError;
 import { __classPrivateFieldGet } from "tslib";
 import { collectEncryptedLogs, collectEnqueuedPublicFunctionCalls, collectUnencryptedLogs, resolveOpcodeLocations, } from '@aztec/acir-simulator';
-import { AztecAddress, CompleteAddress, FunctionData, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, } from '@aztec/circuits.js';
+import { AztecAddress, CallRequest, CompleteAddress, FunctionData, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, } from '@aztec/circuits.js';
 import { computeCommitmentNonce, siloNullifier } from '@aztec/circuits.js/abis';
 import { encodeArguments } from '@aztec/foundation/abi';
 import { padArrayEnd } from '@aztec/foundation/collection';
@@ -248,16 +248,20 @@ export class PXEService {
         return executionResult;
     }
     async getTxReceipt(txHash) {
+        let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
+        // We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
+        // for mined and then for pending there could be a race condition where the tx is mined between the two checks
+        // and we would incorrectly return a TxReceipt with status DROPPED
+        const pendingTx = await this.node.getPendingTxByHash(txHash);
+        if (pendingTx) {
+            txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
+        }
         const settledTx = await this.node.getTx(txHash);
         if (settledTx) {
             const deployedContractAddress = settledTx.newContractData.find(c => !c.contractAddress.equals(AztecAddress.ZERO))?.contractAddress;
-            return new TxReceipt(txHash, TxStatus.MINED, '', settledTx.blockHash, settledTx.blockNumber, deployedContractAddress);
-        }
-        const pendingTx = await this.node.getPendingTxByHash(txHash);
-        if (pendingTx) {
-            return new TxReceipt(txHash, TxStatus.PENDING, '');
+            txReceipt = new TxReceipt(txHash, TxStatus.MINED, '', settledTx.blockHash, settledTx.blockNumber, deployedContractAddress);
         }
-        return new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
+        return txReceipt;
     }
     async getTx(txHash) {
         return await this.node.getTx(txHash);
@@ -302,18 +306,17 @@ export class PXEService {
     // See https://github.com/AztecProtocol/aztec-packages/issues/1615
     // TODO(#757): Enforce proper ordering of enqueued public calls
     async patchPublicCallStackOrdering(publicInputs, enqueuedPublicCalls) {
-        const callToHash = (call) => call.toPublicCallStackItem().hash();
-        const enqueuedPublicCallsHashes = await Promise.all(enqueuedPublicCalls.map(callToHash));
+        const enqueuedPublicCallStackItems = await Promise.all(enqueuedPublicCalls.map(c => c.toCallRequest()));
         const { publicCallStack } = publicInputs.end;
         // Validate all items in enqueued public calls are in the kernel emitted stack
-        const areEqual = enqueuedPublicCallsHashes.reduce((accum, enqueued) => accum && !!publicCallStack.find(item => item.equals(enqueued)), true);
+        const areEqual = enqueuedPublicCallStackItems.reduce((accum, enqueued) => accum && !!publicCallStack.find(item => item.equals(enqueued)), true);
         if (!areEqual) {
-            throw new Error(`Enqueued public function calls and public call stack do not match.\nEnqueued calls: ${enqueuedPublicCallsHashes
-                .map(h => h.toString())
+            throw new Error(`Enqueued public function calls and public call stack do not match.\nEnqueued calls: ${enqueuedPublicCallStackItems
+                .map(h => h.hash.toString())
                 .join(', ')}\nPublic call stack: ${publicCallStack.map(i => i.toString()).join(', ')}`);
         }
         // Override kernel output
-        publicInputs.end.publicCallStack = padArrayEnd(enqueuedPublicCallsHashes, Fr.ZERO, MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX);
+        publicInputs.end.publicCallStack = padArrayEnd(enqueuedPublicCallStackItems, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX);
     }
     async isGlobalStateSynchronized() {
         return await this.synchronizer.isGlobalStateSynchronized();
@@ -487,4 +490,4 @@ async function _PXEService_enrichSimulationError(err) {
         }
     }));
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_service.js","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":";;AAAA,OAAO,EAGL,oBAAoB,EACpB,kCAAkC,EAClC,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,YAAY,EACZ,eAAe,EACf,YAAY,EAGZ,mCAAmC,GAGpC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAe,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAIL,YAAY,EAEZ,oBAAoB,EACpB,YAAY,EAOZ,YAAY,EAIZ,eAAe,EACf,EAAE,EAGF,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,6BAA6B,EAC7B,yBAAyB,EACzB,aAAa,GACd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAoB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD;;GAEG;AACH,MAAM,OAAO,UAAU;IAOrB,YACU,QAAkB,EAClB,IAAe,EACf,EAAY,EACZ,MAAwB,EAChC,SAAkB;;QAJV,aAAQ,GAAR,QAAQ,CAAU;QAClB,SAAI,GAAJ,IAAI,CAAW;QACf,OAAE,GAAF,EAAE,CAAU;QACZ,WAAM,GAAN,MAAM,CAAkB;QAGhC,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,qBAAqB,SAAS,EAAE,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QACjG,IAAI,CAAC,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,SAAS,GAAG,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAE/E,IAAI,CAAC,cAAc,GAAG,cAAc,EAAE,CAAC,OAAO,CAAC;IACjD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,KAAK;QAChB,MAAM,EAAE,wBAAwB,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAClE,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAC5E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACtC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,OAAO,YAAY,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAClG,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,IAAI;QACf,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED,mDAAmD;IAC5C,cAAc;QACnB,OAAO,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;IAChC,CAAC;IAEM,cAAc,CAAC,OAAoB;QACxC,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,CAAC;IAEM,UAAU,CAAC,OAAa;QAC7B,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,OAA2B,EAAE,cAA8B;QACtF,MAAM,eAAe,GAAG,eAAe,CAAC,+BAA+B,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACjG,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QACnE,IAAI,QAAQ,EAAE;YACZ,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACjF,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC1E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,wBAAwB,eAAe,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;SAC9E;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,eAAe,CAAC,OAAO,CAAC,QAAQ,EAAE,yBAAyB,CAAC,CAAC;SAC3F;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,iEAAiE;QACjE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC;QACvD,yDAAyD;QACzD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9G,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,OAAqB;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,iBAAiB,CAAC,SAA0B;QACvD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAC7D,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;SACrE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,SAAS,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAC;SACvF;IACH,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,iEAAiE;QACjE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC;QACvD,qDAAqD;QACrD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACjH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,OAAqB;QAC7C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,SAA6B;QACrD,MAAM,YAAY,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;QACxG,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;YACnC,MAAM,UAAU,GACd,QAAQ,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,gBAAgB,QAAQ,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,kBAAkB,QAAQ,CAAC,IAAI,OAAO,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,UAAU,EAAE,CAAC,CAAC;SACtG;IACH,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,kBAAkB,CAAC,QAAsB,EAAE,IAAQ;QAC9D,IAAI,CAAC,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,KAAK,SAAS,EAAE;YACxD,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;SACpE;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,MAAkB;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAEhD,8GAA8G;QAC9G,sCAAsC;QACtC,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;YAC7C,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YACzB,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,MAAM,iBAAiB,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAC9E,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CACxC,CAAC;gBACF,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACnC,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;iBAC5F;gBACD,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC;aACnC;YACD,OAAO,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,eAAe,EAAE,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;QAC7F,CAAC,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAkB;QACrC,MAAM,EAAE,SAAS,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3E,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;SACrC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,+BAA+B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SAChE;QAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;YAC1B,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,oBAAoB,EAAE,cAAc,EAAE,GAC3E,MAAM,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAE7G,oEAAoE;YACpE,8FAA8F;YAC9F,MAAM,gBAAgB,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,CAAC;YAChF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAAC;YAC3F,IAAI,KAAK,KAAK,SAAS,EAAE;gBACvB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,eAAe,GAAG,aAAa,CAAC,IAAI,CAAC,eAAe,EAAE,cAAe,CAAC,CAAC;YAC7E,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;YACnG,IAAI,cAAc,KAAK,SAAS,EAAE;gBAChC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;aACjD;YAED,MAAM,IAAI,CAAC,EAAE,CAAC,OAAO,CACnB,IAAI,OAAO,CACT,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,MAAM,EACX,KAAK,EACL,aAAa,EACb,eAAe,EACf,KAAK,EACL,SAAS,CACV,CACF,CAAC;SACH;IACH,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,aAAa,CAAC,IAAkB;QAC5C,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,KAAK,CAAC,eAAe,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SAC/C;QAED,MAAM,MAAM,GAAS,EAAE,CAAC;QACxB,MAAM,cAAc,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,WAAW,GAAG,EAAE,CAAC,cAAc,CAAC;QACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YAC3C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE;gBAC9B,MAAM;aACP;YAED,MAAM,KAAK,GAAG,sBAAsB,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;YACxD,MAAM,EAAE,cAAc,EAAE,oBAAoB,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAC/F,IAAI,CAAC,eAAe,EACpB,KAAK,EACL,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,IAAI,CACV,CAAC;YACF,oEAAoE;YACpE,gEAAgE;YAChE,IAAI,UAAU,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;gBACrC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBACrB,MAAM;aACP;YACD,IAAI,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE;gBAC3C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aACpB;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,WAAmB;QACvC,8EAA8E;QAC9E,IAAI,WAAW,GAAG,CAAC,EAAE;YACnB,WAAW,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;SAChD;QACD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,SAA6B,EAAE,cAAuB;QAC5E,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE;YACrC,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;QACD,IAAI,SAAS,CAAC,YAAY,CAAC,UAAU,KAAK,SAAS,EAAE;YACnD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;SACzD;QAED,qHAAqH;QACrH,0DAA0D;QAC1D,MAAM,uBAAuB,GAAG,SAAS,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,MAAM,WAAW,GAAG,uBAAuB,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE7G,MAAM,EAAE,GAAG,MAAM,uBAAA,IAAI,2DAAkB,MAAtB,IAAI,EAAmB,SAAS,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,cAAc,EAAE;YAClB,MAAM,uBAAA,IAAI,8DAAqB,MAAzB,IAAI,EAAsB,EAAE,CAAC,CAAC;SACrC;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iCAAiC,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAEvE,OAAO,EAAE,CAAC;IACZ,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,EAAM;QACxB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,SAAS,EAAE,CAAC;QACpC,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,gCAAgC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,MAAM,EAAE,CAAC,CAAC;QAC/C,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,YAAoB,EAAE,IAAW,EAAE,EAAgB,EAAE,KAAoB;QAC3F,8EAA8E;QAC9E,MAAM,YAAY,GAAG,MAAM,uBAAA,IAAI,0DAAiB,MAArB,IAAI,EAAkB,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,MAAM,uBAAA,IAAI,gEAAuB,MAA3B,IAAI,EAAwB,YAAY,CAAC,CAAC;QAExE,6DAA6D;QAC7D,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,MAAc;QACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,SAAS,EAAE;YACb,MAAM,uBAAuB,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAC5D,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAClD,EAAE,eAAe,CAAC;YAEnB,OAAO,IAAI,SAAS,CAClB,MAAM,EACN,QAAQ,CAAC,KAAK,EACd,EAAE,EACF,SAAS,CAAC,SAAS,EACnB,SAAS,CAAC,WAAW,EACrB,uBAAuB,CACxB,CAAC;SACH;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAC7D,IAAI,SAAS,EAAE;YACb,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;SACpD;QAED,OAAO,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;IAC5E,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,MAAc;QAC/B,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1C,CAAC;IAEM,KAAK,CAAC,uBAAuB,CAAC,eAA6B;QAChE,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,eAA6B;QACxD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;IAC1D,CAAC;IAED;;;;OAIG;IACI,kBAAkB,CAAC,MAAiB;QACzC,OAAO,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAsBM,KAAK,CAAC,WAAW;QACtB,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC9D,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAa;YACzB,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,sBAAsB,EAAE,eAAe;YACvC,OAAO;YACP,eAAe,EAAE,OAAO;YACxB,mBAAmB,EAAE,iBAAiB;SACvC,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAoLD,mHAAmH;IACnH,iHAAiH;IACjH,mHAAmH;IACnH,0EAA0E;IAC1E,uDAAuD;IACvD,kEAAkE;IAClE,+DAA+D;IACvD,KAAK,CAAC,4BAA4B,CACxC,YAA4C,EAC5C,mBAAwC;QAExC,MAAM,UAAU,GAAG,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,IAAI,EAAE,CAAC;QACpF,MAAM,yBAAyB,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QACzF,MAAM,EAAE,eAAe,EAAE,GAAG,YAAY,CAAC,GAAG,CAAC;QAE7C,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,yBAAyB,CAAC,MAAM,CAC/C,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAK,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EACnF,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CACb,uFAAuF,yBAAyB;iBAC7G,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;iBACtB,IAAI,CAAC,IAAI,CAAC,wBAAwB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzF,CAAC;SACH;QAED,yBAAyB;QACzB,YAAY,CAAC,GAAG,CAAC,eAAe,GAAG,WAAW,CAC5C,yBAAyB,EACzB,EAAE,CAAC,IAAI,EACP,mCAAmC,CACpC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,yBAAyB;QACpC,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,0BAA0B,CAAC,OAAqB;QAC3D,OAAO,MAAM,IAAI,CAAC,YAAY,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;IACrE,CAAC;IAEM,aAAa;QAClB,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAC5D,CAAC;IAEM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;CACF;qEA3QC,KAAK,sCAAkB,YAAoB,EAAE,IAAW,EAAE,EAAgB;IACxE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CACb,oBAAoB,EAAE,wKAAwK,CAC/L,CAAC;KACH;IAED,MAAM,WAAW,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC1E,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,oBAAoB,YAAY,gBAAgB,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAC;KACnF;IAED,OAAO;QACL,IAAI,EAAE,eAAe,CAAC,WAAW,EAAE,IAAI,CAAC;QACxC,YAAY,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/C,EAAE;KACH,CAAC;AACJ,CAAC;AAmBD;;;;;;GAMG;AACH,KAAK,8CAA0B,WAA8C;IAC3E,MAAM,eAAe,GAAI,WAA4B,CAAC,EAAE,IAAK,WAAkC,CAAC,MAAM,CAAC;IACvG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CACxE,eAAe,EACf,WAAW,CAAC,YAAY,CAAC,QAAQ,CAClC,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAClE,eAAe,EACf,WAAW,CAAC,YAAY,CAAC,QAAQ,CAClC,CAAC;IACF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,eAAe,CAAC,CAAC;IAE/F,OAAO;QACL,eAAe;QACf,gBAAgB,EAAE;YAChB,GAAG,gBAAgB;YACnB,KAAK;SACN;QACD,cAAc;KACf,CAAC;AACJ,CAAC,yBAED,KAAK,+BAAW,SAA6B;IAC3C,yCAAyC;IAEzC,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,MAAM,uBAAA,IAAI,kEAAyB,MAA7B,IAAI,EAA0B,SAAS,CAAC,CAAC;IAE7G,IAAI,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACnC,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC;QACtG,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAClC,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,YAAY,eAAe,EAAE;YAClC,MAAM,uBAAA,IAAI,gEAAuB,MAA3B,IAAI,EAAwB,GAAG,CAAC,CAAC;SACxC;QACD,MAAM,GAAG,CAAC;KACX;AACH,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,4CAAwB,WAAyB;IACpD,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,GAAG,MAAM,uBAAA,IAAI,kEAAyB,MAA7B,IAAI,EAA0B,WAAW,CAAC,CAAC;IAE/F,IAAI,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACjD,IAAI;QACF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAChH,IAAI,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;QAEhD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,YAAY,eAAe,EAAE;YAClC,MAAM,uBAAA,IAAI,gEAAuB,MAA3B,IAAI,EAAwB,GAAG,CAAC,CAAC;SACxC;QACD,MAAM,GAAG,CAAC;KACX;AACH,CAAC;AAED;;;;;GAKG;AACH,KAAK,0CAAsB,EAAM;IAC/B,IAAI;QACF,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;KACzC;IAAC,OAAO,GAAG,EAAE;QACZ,yFAAyF;QACzF,IAAI,GAAG,YAAY,eAAe,EAAE;YAClC,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC;YACrC,MAAM,uBAAuB,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAChE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CACtE,uBAAuB,CAAC,eAAe,EACvC,uBAAuB,CAAC,gBAAgB,CACzC,CAAC;YACF,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC7C,IAAI,SAAS,IAAI,yBAAyB,CAAC,aAAa,CAAC,EAAE;gBACzD,MAAM,eAAe,GAAG,sBAAsB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;gBACzE,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;aACvC;YACD,MAAM,uBAAA,IAAI,gEAAuB,MAA3B,IAAI,EAAwB,GAAG,CAAC,CAAC;SACxC;QAED,MAAM,GAAG,CAAC;KACX;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,KAAK,uCAAmB,kBAAsC,EAAE,WAAoC;IAClG,yCAAyC;IAEzC,yDAAyD;IACzD,MAAM,eAAe,GAAG,MAAM,uBAAA,IAAI,mDAAU,MAAd,IAAI,EAAW,kBAAkB,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1E,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,YAAY,CAAC,CAAC;IACpD,IAAI,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;IACvC,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;IAE5G,MAAM,aAAa,GAAG,IAAI,QAAQ,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,CAAC;IAC1E,MAAM,eAAe,GAAG,IAAI,QAAQ,CAAC,sBAAsB,CAAC,eAAe,CAAC,CAAC,CAAC;IAC9E,MAAM,uBAAuB,GAAG,kCAAkC,CAAC,eAAe,CAAC,CAAC;IAEpF,MAAM,oBAAoB,GAAG,WAAW;QACtC,CAAC,CAAC,IAAI,oBAAoB,CACtB,IAAI,YAAY,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,cAAc,CAAC,EACjF,6BAA6B,CAAC,WAAW,CAAC,EAC1C,WAAW,CAAC,eAAe,CAAC,cAAc,EAC1C,WAAW,CAAC,eAAe,CAAC,SAAS,CACtC;QACH,CAAC,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;IAEjC,sEAAsE;IACtE,+DAA+D;IAC/D,MAAM,IAAI,CAAC,4BAA4B,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;IAE/E,OAAO,IAAI,EAAE,CAAC,YAAY,EAAE,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,uBAAuB,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;AACtH,CAAC;AAED;;;GAGG;AACH,KAAK,4CAAwB,GAAoB;IAC/C,gFAAgF;IAChF,wDAAwD;IACxD,MAAM,kBAAkB,GAA6B,IAAI,GAAG,EAAE,CAAC;IAE/D,GAAG,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,EAAE,gBAAgB,EAAE,EAAE,EAAE;QACnE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,EAAE;YACvD,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;SAC/D;QACD,kBAAkB,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAE,CAAC,GAAG,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC,EAAE,EAAE;QAC3E,MAAM,qBAAqB,GAAG,YAAY,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAClE,IAAI,QAAQ,EAAE;YACZ,GAAG,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;YACjE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC3B,MAAM,gBAAgB,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,QAAQ,CAAC,CAAC;gBAC1F,IAAI,gBAAgB,EAAE;oBACpB,GAAG,CAAC,sBAAsB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,CAAC,IAAI,CAAC,CAAC;iBACrG;YACH,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CACH,CAAC;AACJ,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"pxe_service.js","sourceRoot":"","sources":["../../src/pxe_service/pxe_service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.15.1",
+  "version": "0.16.0",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -32,14 +32,14 @@
     "rootDir": "./src"
   },
   "dependencies": {
-    "@aztec/acir-simulator": "0.15.1",
-    "@aztec/circuits.js": "0.15.1",
-    "@aztec/ethereum": "0.15.1",
-    "@aztec/foundation": "0.15.1",
-    "@aztec/key-store": "0.15.1",
-    "@aztec/noir-compiler": "0.15.1",
-    "@aztec/noir-protocol-circuits": "0.15.1",
-    "@aztec/types": "0.15.1",
+    "@aztec/acir-simulator": "0.16.0",
+    "@aztec/circuits.js": "0.16.0",
+    "@aztec/ethereum": "0.16.0",
+    "@aztec/foundation": "0.16.0",
+    "@aztec/key-store": "0.16.0",
+    "@aztec/noir-compiler": "0.16.0",
+    "@aztec/noir-protocol-circuits": "0.16.0",
+    "@aztec/types": "0.16.0",
     "koa": "^2.14.2",
     "koa-router": "^12.0.0",
     "lodash.omit": "^4.5.0",

package/src/index.ts

@@ -4,7 +4,7 @@ export * from './config/index.js';
 
 export { Tx, TxHash } from '@aztec/types';
 
-export { TxRequest, CircuitsWasm, PartialAddress } from '@aztec/circuits.js';
+export { TxRequest, PartialAddress } from '@aztec/circuits.js';
 export * from '@aztec/foundation/fields';
 export * from '@aztec/foundation/eth-address';
 export * from '@aztec/foundation/aztec-address';

package/src/kernel_prover/kernel_prover.ts

@@ -2,17 +2,18 @@ import { ExecutionResult, NoteAndSlot } from '@aztec/acir-simulator';
 import {
   AztecAddress,
   CONTRACT_TREE_HEIGHT,
+  CallRequest,
   EMPTY_NULLIFIED_COMMITMENT,
   Fr,
   MAX_NEW_COMMITMENTS_PER_TX,
   MAX_NEW_NULLIFIERS_PER_TX,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
+  MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL,
   MAX_READ_REQUESTS_PER_CALL,
   MAX_READ_REQUESTS_PER_TX,
   MembershipWitness,
   PreviousKernelData,
   PrivateCallData,
-  PrivateCallStackItem,
   PrivateKernelInputsInit,
   PrivateKernelInputsInner,
   PrivateKernelInputsOrdering,
@@ -24,6 +25,7 @@ import {
   makeEmptyProof,
   makeTuple,
 } from '@aztec/circuits.js';
+import { padArrayEnd } from '@aztec/foundation/collection';
 import { Tuple, assertLength } from '@aztec/foundation/serialize';
 
 import { KernelProofCreator, ProofCreator, ProofOutput, ProofOutputFinal } from './proof_creator.js';
@@ -93,18 +95,9 @@ export class KernelProver {
     while (executionStack.length) {
       const currentExecution = executionStack.pop()!;
       executionStack.push(...currentExecution.nestedExecutions);
-      const privateCallStackPreimages = currentExecution.nestedExecutions.map(result => result.callStackItem);
-      if (privateCallStackPreimages.length > MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL) {
-        throw new Error(
-          `Too many items in the call stack. Maximum amount is ${MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL}. Got ${privateCallStackPreimages.length}.`,
-        );
-      }
-      // Pad with empty items to reach max/const length expected by circuit.
-      privateCallStackPreimages.push(
-        ...Array(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL - privateCallStackPreimages.length)
-          .fill(0)
-          .map(() => PrivateCallStackItem.empty()),
-      );
+
+      const privateCallRequests = currentExecution.nestedExecutions.map(result => result.callStackItem.toCallRequest());
+      const publicCallRequests = currentExecution.enqueuedPublicFunctionCalls.map(result => result.toCallRequest());
 
       // Start with the partially filled in read request witnesses from the simulator
       // and fill the non-transient ones in with sibling paths via oracle.
@@ -135,8 +128,9 @@ export class KernelProver {
 
       const privateCallData = await this.createPrivateCallData(
         currentExecution,
+        privateCallRequests,
+        publicCallRequests,
         readRequestMembershipWitnesses,
-        makeTuple(MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, i => privateCallStackPreimages[i], 0),
       );
 
       if (firstIteration) {
@@ -196,12 +190,21 @@ export class KernelProver {
 
   private async createPrivateCallData(
     { callStackItem, vk }: ExecutionResult,
+    privateCallRequests: CallRequest[],
+    publicCallRequests: CallRequest[],
     readRequestMembershipWitnesses: ReadRequestMembershipWitness[],
-    privateCallStackPreimages: Tuple<PrivateCallStackItem, typeof MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL>,
   ) {
     const { contractAddress, functionData, publicInputs } = callStackItem;
     const { portalContractAddress } = publicInputs.callContext;
 
+    // Pad with empty items to reach max/const length expected by circuit.
+    const privateCallStack = padArrayEnd(
+      privateCallRequests,
+      CallRequest.empty(),
+      MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL,
+    );
+    const publicCallStack = padArrayEnd(publicCallRequests, CallRequest.empty(), MAX_PUBLIC_CALL_STACK_LENGTH_PER_CALL);
+
     const contractLeafMembershipWitness = functionData.isConstructor
       ? MembershipWitness.random(CONTRACT_TREE_HEIGHT)
       : await this.oracle.getContractMembershipWitness(contractAddress);
@@ -220,7 +223,8 @@ export class KernelProver {
 
     return new PrivateCallData(
       callStackItem,
-      privateCallStackPreimages,
+      privateCallStack,
+      publicCallStack,
       proof,
       VerificationKey.fromBuffer(vk),
       functionLeafMembershipWitness,

package/src/kernel_prover/proof_creator.ts

@@ -22,8 +22,6 @@ import { CircuitSimulationStats } from '@aztec/types/stats';
 export interface ProofOutput {
   /**
    * The public inputs required for the proof generation process.
-   * Note: C++ side does not define the specific data structure PrivateKernelPublicInputs and therefore
-   * would not generate a binding in circuits.gen.ts.
    */
   publicInputs: KernelCircuitPublicInputs;
   /**
@@ -39,8 +37,6 @@ export interface ProofOutput {
 export interface ProofOutputFinal {
   /**
    * The public inputs required for the proof generation process.
-   * Note: C++ side does not define the specific data structure PrivateKernelPublicInputsFinal and therefore
-   * would not generate a binding in circuits.gen.ts.
    */
   publicInputs: KernelCircuitPublicInputsFinal;
   /**
@@ -89,10 +85,10 @@ export interface ProofCreator {
 
 /**
  * The KernelProofCreator class is responsible for generating siloed commitments and zero-knowledge proofs
- * for private kernel circuit. It leverages Barretenberg and Circuits Wasm libraries
- * to perform cryptographic operations and proof creation. The class provides methods to compute commitments
- * based on the given public inputs and to generate proofs based on signed transaction requests, previous kernel
- * data, private call data, and a flag indicating whether it's the first iteration or not.
+ * for private kernel circuit. It leverages Barretenberg to perform cryptographic operations and proof creation.
+ * The class provides methods to compute commitments based on the given public inputs and to generate proofs based on
+ * signed transaction requests, previous kernel data, private call data, and a flag indicating whether it's the first
+ * iteration or not.
  */
 export class KernelProofCreator implements ProofCreator {
   constructor(private log = createDebugLogger('aztec:kernel_proof_creator')) {}

package/src/pxe_service/pxe_service.ts

@@ -8,6 +8,7 @@ import {
 } from '@aztec/acir-simulator';
 import {
   AztecAddress,
+  CallRequest,
   CompleteAddress,
   FunctionData,
   GrumpkinPrivateKey,
@@ -355,13 +356,23 @@ export class PXEService implements PXE {
   }
 
   public async getTxReceipt(txHash: TxHash): Promise<TxReceipt> {
+    let txReceipt = new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
+
+    // We first check if the tx is in pending (instead of first checking if it is mined) because if we first check
+    // for mined and then for pending there could be a race condition where the tx is mined between the two checks
+    // and we would incorrectly return a TxReceipt with status DROPPED
+    const pendingTx = await this.node.getPendingTxByHash(txHash);
+    if (pendingTx) {
+      txReceipt = new TxReceipt(txHash, TxStatus.PENDING, '');
+    }
+
     const settledTx = await this.node.getTx(txHash);
     if (settledTx) {
       const deployedContractAddress = settledTx.newContractData.find(
         c => !c.contractAddress.equals(AztecAddress.ZERO),
       )?.contractAddress;
 
-      return new TxReceipt(
+      txReceipt = new TxReceipt(
         txHash,
         TxStatus.MINED,
         '',
@@ -371,12 +382,7 @@ export class PXEService implements PXE {
       );
     }
 
-    const pendingTx = await this.node.getPendingTxByHash(txHash);
-    if (pendingTx) {
-      return new TxReceipt(txHash, TxStatus.PENDING, '');
-    }
-
-    return new TxReceipt(txHash, TxStatus.DROPPED, 'Tx dropped by P2P node.');
+    return txReceipt;
   }
 
   public async getTx(txHash: TxHash): Promise<L2Tx | undefined> {
@@ -630,28 +636,27 @@ export class PXEService implements PXE {
     publicInputs: KernelCircuitPublicInputsFinal,
     enqueuedPublicCalls: PublicCallRequest[],
   ) {
-    const callToHash = (call: PublicCallRequest) => call.toPublicCallStackItem().hash();
-    const enqueuedPublicCallsHashes = await Promise.all(enqueuedPublicCalls.map(callToHash));
+    const enqueuedPublicCallStackItems = await Promise.all(enqueuedPublicCalls.map(c => c.toCallRequest()));
     const { publicCallStack } = publicInputs.end;
 
     // Validate all items in enqueued public calls are in the kernel emitted stack
-    const areEqual = enqueuedPublicCallsHashes.reduce(
+    const areEqual = enqueuedPublicCallStackItems.reduce(
       (accum, enqueued) => accum && !!publicCallStack.find(item => item.equals(enqueued)),
       true,
     );
 
     if (!areEqual) {
       throw new Error(
-        `Enqueued public function calls and public call stack do not match.\nEnqueued calls: ${enqueuedPublicCallsHashes
-          .map(h => h.toString())
+        `Enqueued public function calls and public call stack do not match.\nEnqueued calls: ${enqueuedPublicCallStackItems
+          .map(h => h.hash.toString())
           .join(', ')}\nPublic call stack: ${publicCallStack.map(i => i.toString()).join(', ')}`,
       );
     }
 
     // Override kernel output
     publicInputs.end.publicCallStack = padArrayEnd(
-      enqueuedPublicCallsHashes,
-      Fr.ZERO,
+      enqueuedPublicCallStackItems,
+      CallRequest.empty(),
       MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
     );
   }