@aztec/pxe 0.47.1 → 0.49.2

package/dest/synchronizer/synchronizer.js

@@ -289,25 +289,23 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
     }
     // keep track of decoded notes
     const incomingNotes = [];
-    const outgoingNotes = [];
     // now process each txHash
     for (const deferredNotes of txHashToDeferredNotes.values()) {
         // to be safe, try each note processor in case the deferred notes are for different accounts.
         for (const processor of this.noteProcessors) {
             const { incomingNotes: inNotes, outgoingNotes: outNotes } = await processor.decodeDeferredNotes(deferredNotes);
             incomingNotes.push(...inNotes);
-            outgoingNotes.push(...outNotes);
+            await this.db.addNotes(inNotes, outNotes, processor.account);
+            inNotes.forEach(noteDao => {
+                this.log.debug(`Decoded deferred incoming note under account ${processor.account.toString()} for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
+            });
+            outNotes.forEach(noteDao => {
+                this.log.debug(`Decoded deferred outgoing note under account ${processor.account.toString()} for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
+            });
         }
     }
     // now drop the deferred notes, and add the decoded notes
     await this.db.removeDeferredNotesByContract(contractAddress);
-    await this.db.addNotes(incomingNotes, outgoingNotes);
-    incomingNotes.forEach(noteDao => {
-        this.log.debug(`Decoded deferred incoming note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot} with nullifier ${noteDao.siloedNullifier.toString()}`);
-    });
-    outgoingNotes.forEach(noteDao => {
-        this.log.debug(`Decoded deferred outgoing note for contract ${noteDao.contractAddress} at slot ${noteDao.storageSlot}`);
-    });
     await __classPrivateFieldGet(this, _Synchronizer_instances, "m", _Synchronizer_removeNullifiedNotes).call(this, incomingNotes);
 }, _Synchronizer_removeNullifiedNotes = async function _Synchronizer_removeNullifiedNotes(notes) {
     // now group the decoded incoming notes by public key
@@ -331,4 +329,4 @@ _Synchronizer_instances = new WeakSet(), _Synchronizer_reprocessDeferredNotesFor
         await this.db.removeNullifiedNotes(relevantNullifiers, publicKey);
     }
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAgC,YAAY,EAAe,MAAM,sBAAsB,CAAC;AAE/F,OAAO,EAA8B,oBAAoB,EAAkB,MAAM,oBAAoB,CAAC;AAEtG,OAAO,EAAoB,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAOnE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D;;;;;;GAMG;AACH,MAAM,OAAO,YAAY;IAQvB,YAAoB,IAAe,EAAU,EAAe,EAAU,QAAqB,EAAE,SAAS,GAAG,EAAE;;QAAvF,SAAI,GAAJ,IAAI,CAAW;QAAU,OAAE,GAAF,EAAE,CAAa;QAAU,aAAQ,GAAR,QAAQ,CAAa;QANnF,mBAAc,GAAoB,EAAE,CAAC;QACrC,YAAO,GAAG,KAAK,CAAC;QAChB,2BAAsB,GAAG,oBAAoB,GAAG,CAAC,CAAC;QAElD,4BAAuB,GAAoB,EAAE,CAAC;QAGpD,IAAI,CAAC,GAAG,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC,CAAC,0BAA0B,SAAS,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC7G,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,EAAE,aAAa,GAAG,IAAI;QAChD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAES,KAAK,CAAC,WAAW;QACzB,mCAAmC;QACnC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACjD,IAAI,CAAC,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1F,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;;;;;OAUG;IACO,IAAI,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;YAClC,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,2DAA2D;YAC3D,OAAO,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBAChC,IAAI,IAAI,CAAC,uBAAuB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,4GAA4G;oBAC5G,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;gBACxD,CAAC;qBAAM,CAAC;oBACN,yEAAyE;oBACzE,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,sDAAsD;YACtD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;YAE3C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,MAAM,CAAC,MAAM,cAAc,IAAI,CAAC,cAAc,CAAC,MAAM,kBAAkB,CAAC,CAAC;YACtG,KAAK,MAAM,aAAa,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChD,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;YAClD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACO,KAAK,CAAC,wBAAwB,CAAC,KAAK,GAAG,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAEnD,wDAAwD;QACxD,+EAA+E;QAC/E,MAAM,uBAAuB,GAAoB,EAAE,CAAC;QAEpD,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YACnD,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,IAAI,aAAa,EAAE,CAAC;gBACxD,sDAAsD;gBACtD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC1C,CAAC;iBAAM,CAAC;gBACN,uBAAuB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QAEvD,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC;YACzC,sDAAsD;YACtD,uDAAuD;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,yBAAyB;QACzB,8DAA8D;QAC9D,0DAA0D;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB;aAC9C,KAAK,EAAE;YACR,mDAAmD;aAClD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAEnE,0DAA0D;QAC1D,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,CAAC;QACtD,6EAA6E;QAC7E,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC;QAClD,qHAAqH;QAErH,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,oBAAoB,KAAK,8BAA8B,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACtD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,0GAA0G;gBAC1G,oBAAoB;gBACpB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;YAED,KAAK,MAAM,aAAa,IAAI,YAAY,EAAE,CAAC;gBACzC,iFAAiF;gBACjF,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC3F,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;oBACjB,yFAAyF;oBACzF,8EAA8E;oBAC9E,4DAA4D;oBAC5D,MAAM;gBACR,CAAC;gBAED,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8BAA8B,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,kBAC5D,MAAM,CAAC,MAAM,GAAG,KAClB,SAAS,CACV,CAAC;gBACF,MAAM,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;gBAEjD,IAAI,aAAa,CAAC,MAAM,CAAC,aAAa,KAAK,aAAa,EAAE,CAAC;oBACzD,wFAAwF;oBACxF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE;wBACrF,SAAS,EAAE,0BAA0B;wBACrC,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE;wBACzC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,EAAE;wBAClC,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC,YAAY,EAAE;wBACpC,GAAG,aAAa,CAAC,KAAK;qBACc,CAAC,CAAC;oBAExC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAChE,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAChD,CAAC;oBACF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,OAAO,IAAI,CAAC,CAAC,mDAAmD;QAClE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gDAAgD,EAAE,GAAG,CAAC,CAAC;YACtE,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,WAAoB;QACnD,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACrD,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,MAAM,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC3B,CAAC;IAED;;;;;;;;;OASG;IACI,KAAK,CAAC,UAAU,CAAC,OAAqB,EAAE,QAAkB,EAAE,aAAqB;QACtF,MAAM,SAAS,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtG,IAAI,SAAS,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;IACtH,CAAC;IAED;;;;;;;OAOG;IACI,KAAK,CAAC,0BAA0B,CAAC,OAAqB;QAC3D,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,gCAAgC,CAAC,CAAC;QACjH,CAAC;QACD,MAAM,oBAAoB,GAAG,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAM,SAAS,GACb,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAC5G,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,IAAI,KAAK,CACb,sDAAsD,OAAO,gDAAgD,CAC9G,CAAC;QACJ,CAAC;QACD,OAAO,MAAM,SAAS,CAAC,cAAc,EAAE,CAAC;IAC1C,CAAC;IAEO,qBAAqB;QAC3B,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC,sBAAsB,CAAC;IACjE,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,yBAAyB;QACpC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,OAAO,MAAM,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,aAAa;QAClB,MAAM,eAAe,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACrD,OAAO;YACL,MAAM,EAAE,eAAe;YACvB,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;SACxG,CAAC;IACJ,CAAC;IAED;;;OAGG;IACI,YAAY;QACjB,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;IAED;;;OAGG;IACI,iCAAiC,CAAC,eAA6B;QACpE,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,uBAAA,IAAI,gFAAmC,MAAvC,IAAI,EAAoC,eAAe,CAAC,CAAC,CAAC;IAC3F,CAAC;CAuEF;2FArEC,KAAK,0DAAoC,eAA6B;IACpE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC;IAEhF,2EAA2E;IAC3E,MAAM,qBAAqB,GAAmC,IAAI,GAAG,EAAE,CAAC;IACxE,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAChE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,8BAA8B;IAC9B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,0BAA0B;IAC1B,KAAK,MAAM,aAAa,IAAI,qBAAqB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC3D,6FAA6F;QAC7F,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC5C,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;YAC/G,aAAa,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;YAC/B,aAAa,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,yDAAyD;IACzD,MAAM,IAAI,CAAC,EAAE,CAAC,6BAA6B,CAAC,eAAe,CAAC,CAAC;IAC7D,MAAM,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAErD,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,+CAA+C,OAAO,CAAC,eAAe,YACpE,OAAO,CAAC,WACV,mBAAmB,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE,CACxD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,+CAA+C,OAAO,CAAC,eAAe,YAAY,OAAO,CAAC,WAAW,EAAE,CACxG,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,uBAAA,IAAI,mEAAsB,MAA1B,IAAI,EAAuB,aAAa,CAAC,CAAC;AAClD,CAAC,uCAED,KAAK,6CAAuB,KAAwB;IAClD,qDAAqD;IACrD,MAAM,wBAAwB,GAAsC,IAAI,GAAG,EAAE,CAAC;IAC9E,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QAC5E,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAED,oEAAoE;IACpE,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC;QACpE,MAAM,UAAU,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,kBAAkB,GAAS,EAAE,CAAC;QACpC,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACnC,mFAAmF;YACnF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;YAC9F,IAAI,KAAK,EAAE,CAAC;gBACV,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;QACH,CAAC;QACD,MAAM,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;IACpE,CAAC;AACH,CAAC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"synchronizer.js","sourceRoot":"","sources":["../../src/synchronizer/synchronizer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/pxe",
-  "version": "0.47.1",
+  "version": "0.49.2",
   "type": "module",
   "exports": "./dest/index.js",
   "bin": "./dest/bin/index.js",
@@ -56,19 +56,19 @@
     ]
   },
   "dependencies": {
-    "@aztec/bb-prover": "0.47.1",
-    "@aztec/bb.js": "0.47.1",
-    "@aztec/builder": "0.47.1",
-    "@aztec/circuit-types": "0.47.1",
-    "@aztec/circuits.js": "0.47.1",
-    "@aztec/ethereum": "0.47.1",
-    "@aztec/foundation": "0.47.1",
-    "@aztec/key-store": "0.47.1",
-    "@aztec/kv-store": "0.47.1",
-    "@aztec/noir-protocol-circuits-types": "0.47.1",
-    "@aztec/protocol-contracts": "0.47.1",
-    "@aztec/simulator": "0.47.1",
-    "@aztec/types": "0.47.1",
+    "@aztec/bb-prover": "0.49.2",
+    "@aztec/bb.js": "0.49.2",
+    "@aztec/builder": "0.49.2",
+    "@aztec/circuit-types": "0.49.2",
+    "@aztec/circuits.js": "0.49.2",
+    "@aztec/ethereum": "0.49.2",
+    "@aztec/foundation": "0.49.2",
+    "@aztec/key-store": "0.49.2",
+    "@aztec/kv-store": "0.49.2",
+    "@aztec/noir-protocol-circuits-types": "0.49.2",
+    "@aztec/protocol-contracts": "0.49.2",
+    "@aztec/simulator": "0.49.2",
+    "@aztec/types": "0.49.2",
     "@msgpack/msgpack": "^3.0.0-beta2",
     "@noir-lang/noirc_abi": "portal:../../noir/packages/noirc_abi",
     "@noir-lang/types": "workspace:*",

package/src/config/index.ts

@@ -1,4 +1,11 @@
 import { INITIAL_L2_BLOCK_NUM } from '@aztec/circuits.js/constants';
+import {
+  type ConfigMappingsType,
+  booleanConfigHelper,
+  getConfigFromMappings,
+  numberConfigHelper,
+} from '@aztec/foundation/config';
+import { type Network } from '@aztec/types/network';
 
 import { readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
@@ -10,6 +17,7 @@ import { fileURLToPath } from 'url';
 export interface BBProverConfig {
   bbWorkingDirectory?: string;
   bbBinaryPath?: string;
+  bbSkipCleanup?: boolean;
 }
 
 /**
@@ -33,26 +41,94 @@ export interface PXEConfig {
 
 export type PXEServiceConfig = PXEConfig & KernelProverConfig & BBProverConfig;
 
+export type CliPXEOptions = {
+  /** External Aztec network to connect to. e.g. devnet */
+  network?: Network;
+  /** API Key required by the external network's node */
+  apiKey?: string;
+  /** Custom Aztec Node URL to connect to  */
+  nodeUrl?: string;
+};
+
+export const pxeConfigMappings: ConfigMappingsType<PXEServiceConfig> = {
+  l2BlockPollingIntervalMS: {
+    env: 'PXE_BLOCK_POLLING_INTERVAL_MS',
+    description: 'The interval to wait between polling for new blocks.',
+    ...numberConfigHelper(1_000),
+  },
+  l2StartingBlock: {
+    env: 'PXE_L2_STARTING_BLOCK',
+    ...numberConfigHelper(INITIAL_L2_BLOCK_NUM),
+    description: 'L2 block to start scanning from for new accounts',
+  },
+  dataDirectory: {
+    env: 'PXE_DATA_DIRECTORY',
+    description: 'Where to store PXE data. If not set, will store in memory',
+  },
+  bbBinaryPath: {
+    env: 'BB_BINARY_PATH',
+    description: 'Path to the BB binary',
+  },
+  bbWorkingDirectory: {
+    env: 'BB_WORKING_DIRECTORY',
+    description: 'Working directory for the BB binary',
+  },
+  bbSkipCleanup: {
+    env: 'BB_SKIP_CLEANUP',
+    description: 'True to skip cleanup of temporary files for debugging purposes',
+    ...booleanConfigHelper(),
+  },
+  proverEnabled: {
+    env: 'PXE_PROVER_ENABLED',
+    description: 'Enable real proofs',
+    ...booleanConfigHelper(),
+  },
+};
+
 /**
  * Creates an instance of PXEServiceConfig out of environment variables using sensible defaults for integration testing if not set.
  */
 export function getPXEServiceConfig(): PXEServiceConfig {
-  const {
-    PXE_BLOCK_POLLING_INTERVAL_MS,
-    PXE_L2_STARTING_BLOCK,
-    PXE_DATA_DIRECTORY,
-    BB_BINARY_PATH,
-    BB_WORKING_DIRECTORY,
-    PXE_PROVER_ENABLED,
-  } = process.env;
+  return getConfigFromMappings<PXEServiceConfig>(pxeConfigMappings);
+}
+
+export const pxeCliConfigMappings: ConfigMappingsType<CliPXEOptions> = {
+  network: {
+    env: 'NETWORK',
+    parseEnv: (val: string) => val as Network,
+    description: 'External Aztec network to connect to. e.g. devnet',
+  },
+  apiKey: {
+    env: 'API_KEY',
+    description: "API Key required by the external network's node",
+  },
+  nodeUrl: {
+    env: 'AZTEC_NODE_URL',
+    description: 'Custom Aztec Node URL to connect to',
+  },
+};
 
+export const allPxeConfigMappings: ConfigMappingsType<CliPXEOptions & PXEServiceConfig> = {
+  ...pxeConfigMappings,
+  ...pxeCliConfigMappings,
+  proverEnabled: {
+    env: 'PXE_PROVER_ENABLED',
+    parseEnv: (val: string) => ['1', 'true', 'TRUE'].includes(val) || !!process.env.NETWORK,
+    description: 'Enable real proofs',
+    isBoolean: true,
+  },
+};
+
+/**
+ * Creates an instance of CliPxeOptions out of environment variables
+ */
+export function getCliPXEOptions(): CliPXEOptions & PXEServiceConfig {
+  const pxeConfig = getPXEServiceConfig();
+  const cliOptions = getConfigFromMappings<CliPXEOptions>(pxeCliConfigMappings);
   return {
-    l2BlockPollingIntervalMS: PXE_BLOCK_POLLING_INTERVAL_MS ? +PXE_BLOCK_POLLING_INTERVAL_MS : 1000,
-    l2StartingBlock: PXE_L2_STARTING_BLOCK ? +PXE_L2_STARTING_BLOCK : INITIAL_L2_BLOCK_NUM,
-    dataDirectory: PXE_DATA_DIRECTORY,
-    bbBinaryPath: BB_BINARY_PATH,
-    bbWorkingDirectory: BB_WORKING_DIRECTORY,
-    proverEnabled: ['1', 'true'].includes(PXE_PROVER_ENABLED!),
+    ...pxeConfig,
+    ...cliOptions,
+    proverEnabled: pxeConfig.proverEnabled || !!cliOptions.network,
   };
 }
 

package/src/database/incoming_note_dao.ts

@@ -23,10 +23,10 @@ export class IncomingNoteDao implements NoteData {
     /** The nonce of the note. */
     public nonce: Fr,
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
+     * A hash of the note. This is customizable by the app circuit.
      * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
      */
-    public innerNoteHash: Fr,
+    public noteHash: Fr,
     /**
      * The nullifier of the note (siloed by contract address).
      * Note: Might be set as 0 if the note was added to PXE as nullified.
@@ -46,7 +46,7 @@ export class IncomingNoteDao implements NoteData {
       this.noteTypeId,
       this.txHash.buffer,
       this.nonce,
-      this.innerNoteHash,
+      this.noteHash,
       this.siloedNullifier,
       this.index,
       this.ivpkM,
@@ -61,7 +61,7 @@ export class IncomingNoteDao implements NoteData {
     const noteTypeId = reader.readObject(NoteSelector);
     const txHash = reader.readObject(TxHash);
     const nonce = Fr.fromBuffer(reader);
-    const innerNoteHash = Fr.fromBuffer(reader);
+    const noteHash = Fr.fromBuffer(reader);
     const siloedNullifier = Fr.fromBuffer(reader);
     const index = toBigIntBE(reader.readBytes(32));
     const publicKey = Point.fromBuffer(reader);
@@ -73,7 +73,7 @@ export class IncomingNoteDao implements NoteData {
       noteTypeId,
       txHash,
       nonce,
-      innerNoteHash,
+      noteHash,
       siloedNullifier,
       index,
       publicKey,

package/src/database/kv_pxe_database.ts

@@ -14,6 +14,7 @@ import {
   type AztecKVStore,
   type AztecMap,
   type AztecMultiMap,
+  type AztecSet,
   type AztecSingleton,
 } from '@aztec/kv-store';
 import { contractArtifactFromBuffer, contractArtifactToBuffer } from '@aztec/types/abi';
@@ -36,10 +37,7 @@ export class KVPxeDatabase implements PxeDatabase {
   #notes: AztecMap<string, Buffer>;
   #nullifiedNotes: AztecMap<string, Buffer>;
   #nullifierToNoteId: AztecMap<string, string>;
-  #notesByContract: AztecMultiMap<string, string>;
-  #notesByStorageSlot: AztecMultiMap<string, string>;
-  #notesByTxHash: AztecMultiMap<string, string>;
-  #notesByIvpkM: AztecMultiMap<string, string>;
+
   #nullifiedNotesByContract: AztecMultiMap<string, string>;
   #nullifiedNotesByStorageSlot: AztecMultiMap<string, string>;
   #nullifiedNotesByTxHash: AztecMultiMap<string, string>;
@@ -57,6 +55,12 @@ export class KVPxeDatabase implements PxeDatabase {
   #outgoingNotesByTxHash: AztecMultiMap<string, string>;
   #outgoingNotesByOvpkM: AztecMultiMap<string, string>;
 
+  #scopes: AztecSet<string>;
+  #notesByContractAndScope: Map<string, AztecMultiMap<string, string>>;
+  #notesByStorageSlotAndScope: Map<string, AztecMultiMap<string, string>>;
+  #notesByTxHashAndScope: Map<string, AztecMultiMap<string, string>>;
+  #notesByIvpkMAndScope: Map<string, AztecMultiMap<string, string>>;
+
   constructor(private db: AztecKVStore) {
     this.#db = db;
 
@@ -76,11 +80,6 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#nullifiedNotes = db.openMap('nullified_notes');
     this.#nullifierToNoteId = db.openMap('nullifier_to_note');
 
-    this.#notesByContract = db.openMultiMap('notes_by_contract');
-    this.#notesByStorageSlot = db.openMultiMap('notes_by_storage_slot');
-    this.#notesByTxHash = db.openMultiMap('notes_by_tx_hash');
-    this.#notesByIvpkM = db.openMultiMap('notes_by_ivpk_m');
-
     this.#nullifiedNotesByContract = db.openMultiMap('nullified_notes_by_contract');
     this.#nullifiedNotesByStorageSlot = db.openMultiMap('nullified_notes_by_storage_slot');
     this.#nullifiedNotesByTxHash = db.openMultiMap('nullified_notes_by_tx_hash');
@@ -94,6 +93,19 @@ export class KVPxeDatabase implements PxeDatabase {
     this.#outgoingNotesByStorageSlot = db.openMultiMap('outgoing_notes_by_storage_slot');
     this.#outgoingNotesByTxHash = db.openMultiMap('outgoing_notes_by_tx_hash');
     this.#outgoingNotesByOvpkM = db.openMultiMap('outgoing_notes_by_ovpk_m');
+
+    this.#scopes = db.openSet('scopes');
+    this.#notesByContractAndScope = new Map<string, AztecMultiMap<string, string>>();
+    this.#notesByStorageSlotAndScope = new Map<string, AztecMultiMap<string, string>>();
+    this.#notesByTxHashAndScope = new Map<string, AztecMultiMap<string, string>>();
+    this.#notesByIvpkMAndScope = new Map<string, AztecMultiMap<string, string>>();
+
+    for (const scope of this.#scopes.entries()) {
+      this.#notesByContractAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_contract`));
+      this.#notesByStorageSlotAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_storage_slot`));
+      this.#notesByTxHashAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_tx_hash`));
+      this.#notesByIvpkMAndScope.set(scope, db.openMultiMap(`${scope}:notes_by_ivpk_m`));
+    }
   }
 
   public async getContract(
@@ -154,11 +166,19 @@ export class KVPxeDatabase implements PxeDatabase {
     return val?.map(b => Fr.fromBuffer(b));
   }
 
-  async addNote(note: IncomingNoteDao): Promise<void> {
-    await this.addNotes([note], []);
+  async addNote(note: IncomingNoteDao, scope?: AztecAddress): Promise<void> {
+    await this.addNotes([note], [], scope);
   }
 
-  addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[]): Promise<void> {
+  async addNotes(
+    incomingNotes: IncomingNoteDao[],
+    outgoingNotes: OutgoingNoteDao[],
+    scope: AztecAddress = AztecAddress.ZERO,
+  ): Promise<void> {
+    if (!this.#scopes.has(scope.toString())) {
+      await this.#addScope(scope);
+    }
+
     return this.db.transaction(() => {
       for (const dao of incomingNotes) {
         // store notes by their index in the notes hash tree
@@ -168,10 +188,11 @@ export class KVPxeDatabase implements PxeDatabase {
         const noteIndex = toBufferBE(dao.index, 32).toString('hex');
         void this.#notes.set(noteIndex, dao.toBuffer());
         void this.#nullifierToNoteId.set(dao.siloedNullifier.toString(), noteIndex);
-        void this.#notesByContract.set(dao.contractAddress.toString(), noteIndex);
-        void this.#notesByStorageSlot.set(dao.storageSlot.toString(), noteIndex);
-        void this.#notesByTxHash.set(dao.txHash.toString(), noteIndex);
-        void this.#notesByIvpkM.set(dao.ivpkM.toString(), noteIndex);
+
+        void this.#notesByContractAndScope.get(scope.toString())!.set(dao.contractAddress.toString(), noteIndex);
+        void this.#notesByStorageSlotAndScope.get(scope.toString())!.set(dao.storageSlot.toString(), noteIndex);
+        void this.#notesByTxHashAndScope.get(scope.toString())!.set(dao.txHash.toString(), noteIndex);
+        void this.#notesByIvpkMAndScope.get(scope.toString())!.set(dao.ivpkM.toString(), noteIndex);
       }
 
       for (const dao of outgoingNotes) {
@@ -244,16 +265,31 @@ export class KVPxeDatabase implements PxeDatabase {
 
     const candidateNoteSources = [];
 
+    filter.scopes ??= [...this.#scopes.entries()].map(addressString => AztecAddress.fromString(addressString));
+
+    const activeNoteIdsPerScope: IterableIterator<string>[] = [];
+
+    for (const scope of new Set(filter.scopes)) {
+      const formattedScopeString = scope.toString();
+      if (!this.#scopes.has(formattedScopeString)) {
+        throw new Error('Trying to get incoming notes of an scope that is not in the PXE database');
+      }
+
+      activeNoteIdsPerScope.push(
+        publicKey
+          ? this.#notesByIvpkMAndScope.get(formattedScopeString)!.getValues(publicKey.toString())
+          : filter.txHash
+          ? this.#notesByTxHashAndScope.get(formattedScopeString)!.getValues(filter.txHash.toString())
+          : filter.contractAddress
+          ? this.#notesByContractAndScope.get(formattedScopeString)!.getValues(filter.contractAddress.toString())
+          : filter.storageSlot
+          ? this.#notesByStorageSlotAndScope.get(formattedScopeString)!.getValues(filter.storageSlot.toString())
+          : this.#notesByIvpkMAndScope.get(formattedScopeString)!.values(),
+      );
+    }
+
     candidateNoteSources.push({
-      ids: publicKey
-        ? this.#notesByIvpkM.getValues(publicKey.toString())
-        : filter.txHash
-        ? this.#notesByTxHash.getValues(filter.txHash.toString())
-        : filter.contractAddress
-        ? this.#notesByContract.getValues(filter.contractAddress.toString())
-        : filter.storageSlot
-        ? this.#notesByStorageSlot.getValues(filter.storageSlot.toString())
-        : this.#notes.keys(),
+      ids: new Set(activeNoteIdsPerScope.flatMap(iterableIterator => [...iterableIterator])),
       notes: this.#notes,
     });
 
@@ -358,7 +394,7 @@ export class KVPxeDatabase implements PxeDatabase {
     return Promise.resolve(notes);
   }
 
-  removeNullifiedNotes(nullifiers: Fr[], account: PublicKey): Promise<IncomingNoteDao[]> {
+  removeNullifiedNotes(nullifiers: Fr[], accountIvpkM: PublicKey): Promise<IncomingNoteDao[]> {
     if (nullifiers.length === 0) {
       return Promise.resolve([]);
     }
@@ -380,7 +416,7 @@ export class KVPxeDatabase implements PxeDatabase {
         }
 
         const note = IncomingNoteDao.fromBuffer(noteBuffer);
-        if (!note.ivpkM.equals(account)) {
+        if (!note.ivpkM.equals(accountIvpkM)) {
           // tried to nullify someone else's note
           continue;
         }
@@ -388,10 +424,13 @@ export class KVPxeDatabase implements PxeDatabase {
         nullifiedNotes.push(note);
 
         void this.#notes.delete(noteIndex);
-        void this.#notesByIvpkM.deleteValue(account.toString(), noteIndex);
-        void this.#notesByTxHash.deleteValue(note.txHash.toString(), noteIndex);
-        void this.#notesByContract.deleteValue(note.contractAddress.toString(), noteIndex);
-        void this.#notesByStorageSlot.deleteValue(note.storageSlot.toString(), noteIndex);
+
+        for (const scope in this.#scopes.entries()) {
+          void this.#notesByIvpkMAndScope.get(scope)!.deleteValue(accountIvpkM.toString(), noteIndex);
+          void this.#notesByTxHashAndScope.get(scope)!.deleteValue(note.txHash.toString(), noteIndex);
+          void this.#notesByContractAndScope.get(scope)!.deleteValue(note.contractAddress.toString(), noteIndex);
+          void this.#notesByStorageSlotAndScope.get(scope)!.deleteValue(note.storageSlot.toString(), noteIndex);
+        }
 
         void this.#nullifiedNotes.set(noteIndex, note.toBuffer());
         void this.#nullifiedNotesByContract.set(note.contractAddress.toString(), noteIndex);
@@ -440,6 +479,22 @@ export class KVPxeDatabase implements PxeDatabase {
     return Header.fromBuffer(headerBuffer);
   }
 
+  async #addScope(scope: AztecAddress): Promise<boolean> {
+    const scopeString = scope.toString();
+
+    if (this.#scopes.has(scopeString)) {
+      return false;
+    }
+
+    await this.#scopes.add(scopeString);
+    this.#notesByContractAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_contract`));
+    this.#notesByStorageSlotAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_storage_slot`));
+    this.#notesByTxHashAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_tx_hash`));
+    this.#notesByIvpkMAndScope.set(scopeString, this.#db.openMultiMap(`${scopeString}:notes_by_ivpk_m`));
+
+    return true;
+  }
+
   addCompleteAddress(completeAddress: CompleteAddress): Promise<boolean> {
     return this.#db.transaction(() => {
       const addressString = completeAddress.address.toString();

package/src/database/outgoing_note_dao.ts

@@ -22,10 +22,10 @@ export class OutgoingNoteDao {
     /** The nonce of the note. */
     public nonce: Fr,
     /**
-     * Inner note hash of the note. This is customizable by the app circuit.
-     * We can use this value to compute siloedNoteHash and uniqueSiloedNoteHash.
+     * A hash of the note. This is customizable by the app circuit.
+     * We can use this value to compute unique note hash and then siloed note hash.
      */
-    public innerNoteHash: Fr,
+    public noteHash: Fr,
     /** The location of the relevant note in the note hash tree. */
     public index: bigint,
     /** The public key with which the note was encrypted. */
@@ -40,7 +40,7 @@ export class OutgoingNoteDao {
       this.noteTypeId,
       this.txHash.buffer,
       this.nonce,
-      this.innerNoteHash,
+      this.noteHash,
       this.index,
       this.ovpkM,
     ]);
@@ -54,7 +54,7 @@ export class OutgoingNoteDao {
     const noteTypeId = reader.readObject(NoteSelector);
     const txHash = new TxHash(reader.readBytes(TxHash.SIZE));
     const nonce = Fr.fromBuffer(reader);
-    const innerNoteHash = Fr.fromBuffer(reader);
+    const noteHash = Fr.fromBuffer(reader);
     const index = toBigIntBE(reader.readBytes(32));
     const publicKey = Point.fromBuffer(reader);
 
@@ -65,7 +65,7 @@ export class OutgoingNoteDao {
       noteTypeId,
       txHash,
       nonce,
-      innerNoteHash,
+      noteHash,
       index,
       publicKey,
     );

package/src/database/pxe_database.ts

@@ -62,8 +62,10 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
   /**
    * Adds a note to DB.
    * @param note - The note to add.
+   * @param scope - The scope to add the note under. Currently optional.
+   * @remark - Will create a database for the scope if it does not already exist.
    */
-  addNote(note: IncomingNoteDao): Promise<void>;
+  addNote(note: IncomingNoteDao, scope?: AztecAddress): Promise<void>;
 
   /**
    * Adds a nullified note to DB.
@@ -78,8 +80,10 @@ export interface PxeDatabase extends ContractArtifactDatabase, ContractInstanceD
    *
    * @param incomingNotes - An array of notes which were decrypted as incoming.
    * @param outgoingNotes - An array of notes which were decrypted as outgoing.
+   * @param scope - The scope to add the notes under. Currently optional.
+   * @remark - Will create a database for the scope if it does not already exist.
    */
-  addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[]): Promise<void>;
+  addNotes(incomingNotes: IncomingNoteDao[], outgoingNotes: OutgoingNoteDao[], scope?: AztecAddress): Promise<void>;
 
   /**
    * Add notes to the database that are intended for us, but we don't yet have the contract.