fix(sdk): always send note to NoteService for it to deal with duplicates

AztecProtocol · Feb 2, 2020 · 253ee3f · 253ee3f
1 parent 02a2255
commit 253ee3f
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 60 deletions.
diff --git a/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js b/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js
@@ -1,4 +1,5 @@
 import async from 'async';
+import NoteService from '~/background/services/NoteService';
 import {
     subscription as NoteSubscription,
     saveNotes,
@@ -210,6 +211,23 @@ class Watcher {
                 return;
             }
 
+            const {
+                createNotes,
+                updateNotes,
+                destroyNotes,
+            } = groupedNotes;
+            const newNotes = [
+                ...createNotes,
+                ...updateNotes,
+                ...destroyNotes,
+            ].filter(({ owner }) => owner === address);
+
+            NoteService.addNotes(
+                networkId,
+                address,
+                newNotes,
+            );
+
             this.saveQueue.push({
                 name: 'Save Notes',
                 groupedNotes,

diff --git a/packages/extension/src/background/services/EventService/utils/note/createBulkNotes.js b/packages/extension/src/background/services/EventService/utils/note/createBulkNotes.js
@@ -2,8 +2,6 @@ import {
     warnLog,
 } from '~/utils/log';
 import Note from '~/background/database/models/note';
-import NoteService from '~/background/services/NoteService';
-import Web3Service from '~/helpers/Web3Service';
 
 export default async function createBulkNotes(notes, networkId) {
     let created;
@@ -15,17 +13,5 @@ export default async function createBulkNotes(notes, networkId) {
         return null;
     }
 
-    if (created && created.length) {
-        const {
-            address,
-        } = Web3Service.account;
-
-        NoteService.addNotes(
-            networkId,
-            address,
-            notes.filter(({ owner }) => owner === address),
-        );
-    }
-
     return created;
 }
diff --git a/packages/extension/src/background/services/EventService/utils/note/createNote.js b/packages/extension/src/background/services/EventService/utils/note/createNote.js
@@ -2,8 +2,6 @@ import {
     warnLog,
 } from '~/utils/log';
 import Note from '~/background/database/models/note';
-import NoteService from '~/background/services/NoteService';
-import Web3Service from '~/helpers/Web3Service';
 
 export default async function createNote(note, networkId) {
     let newNote;
@@ -14,19 +12,5 @@ export default async function createNote(note, networkId) {
         return null;
     }
 
-    if (newNote) {
-        const {
-            address,
-        } = Web3Service.account;
-
-        if (newNote.owner === address) {
-            NoteService.addNotes(
-                networkId,
-                address,
-                [note],
-            );
-        }
-    }
-
     return newNote;
 }
diff --git a/packages/extension/src/background/services/EventService/utils/note/updateBulkNotes.js b/packages/extension/src/background/services/EventService/utils/note/updateBulkNotes.js
@@ -2,8 +2,6 @@ import {
     warnLog,
 } from '~/utils/log';
 import Note from '~/background/database/models/note';
-import NoteService from '~/background/services/NoteService';
-import Web3Service from '~/helpers/Web3Service';
 
 export default async function updateBulkNotes(notes, networkId) {
     const updatedNotes = [];
@@ -21,17 +19,5 @@ export default async function updateBulkNotes(notes, networkId) {
         }),
     );
 
-    if (updatedNotes.length) {
-        const {
-            address,
-        } = Web3Service.account;
-
-        NoteService.addNotes(
-            networkId,
-            address,
-            updatedNotes.filter(({ owner }) => owner === address),
-        );
-    }
-
     return updatedNotes;
 }
diff --git a/packages/extension/src/background/services/EventService/utils/note/updateNote.js b/packages/extension/src/background/services/EventService/utils/note/updateNote.js
@@ -2,8 +2,6 @@ import {
     warnLog,
 } from '~/utils/log';
 import Note from '~/background/database/models/note';
-import NoteService from '~/background/services/NoteService';
-import Web3Service from '~/helpers/Web3Service';
 
 export default async function updateNote(note, networkId) {
     let updated;
@@ -14,17 +12,5 @@ export default async function updateNote(note, networkId) {
         return null;
     }
 
-    if (updated) {
-        const {
-            address,
-        } = Web3Service.account;
-
-        NoteService.addNotes(
-            networkId,
-            address,
-            [note],
-        );
-    }
-
     return updated;
 }
diff --git a/packages/extension/src/background/services/NoteService/__tests__/Asset.spec.js b/packages/extension/src/background/services/NoteService/__tests__/Asset.spec.js
@@ -251,7 +251,7 @@ describe('Asset.decryptNotes', () => {
         valueFromViewingKeySpy.mockClear();
     });
 
-    it('will not process note that is already in storage', async () => {
+    it('will still process note that is already in storage but will not affect balance', async () => {
         const valueFromViewingKeySpy = jest.spyOn(valueFromViewingKey, 'default');
         let balance = 0;
         let maxBlockNumber = 0;
@@ -275,6 +275,7 @@ describe('Asset.decryptNotes', () => {
 
         expect(asset.balance).toBe(testNotes[duplicatedIndex].value);
         expect(valueFromViewingKeySpy).toHaveBeenCalledTimes(1);
+        valueFromViewingKeySpy.mockClear();
 
         await asset.decryptNotes(notes);
 

diff --git a/packages/extension/src/background/services/NoteService/helpers/Asset.js b/packages/extension/src/background/services/NoteService/helpers/Asset.js
@@ -206,7 +206,7 @@ export default class Asset {
             const destroyed = isDestroyed(status);
             let key = await get(noteHash);
 
-            if (destroyed ^ !!key) { // eslint-disable-line no-bitwise
+            if (destroyed && !key) {
                 if (blockNumber > this.lastSynced) {
                     this.lastSynced = blockNumber;
                 }

diff --git a/packages/extension/src/background/services/NoteService/utils/createNoteKey.js b/packages/extension/src/background/services/NoteService/utils/createNoteKey.js
@@ -12,6 +12,12 @@ export default async function createNoteKey(noteHash) {
     await lock(
         counterKey,
         async () => {
+            const prevNoteKey = await get(noteHash);
+            if (prevNoteKey) {
+                key = prevNoteKey;
+                return;
+            }
+
             const count = await get(counterKey) || 0;
             key = dataKey('note', { count: count + 1 });
             await set({