fix: Don't add deleted fnames to sync trie (#1617)

farcasterxyz · Jan 11, 2024 · 11a1e0d · 11a1e0d
1 parent 7379a05
commit 11a1e0d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.changeset/dry-spies-march.md b/.changeset/dry-spies-march.md
@@ -0,0 +1,5 @@
+---
+"@farcaster/hubble": patch
+---
+
+fix: Don't add deleted fnames to sync trie
diff --git a/apps/hubble/src/network/sync/syncEngine.test.ts b/apps/hubble/src/network/sync/syncEngine.test.ts
@@ -562,12 +562,15 @@ describe("SyncEngine", () => {
         expect((await syncEngine.getDbStats()).numFnames).toEqual(1);
       });
       test("does not add a deleted fname to the trie", async () => {
-        userNameProof = Factories.UserNameProof.build({
+        await engine.mergeUserNameProof(userNameProof);
+        const deletionProof = Factories.UserNameProof.build({
           type: UserNameType.USERNAME_TYPE_FNAME,
+          name: userNameProof.name,
+          timestamp: userNameProof.timestamp + 10,
           fid: 0,
         });
-        expect(await syncEngine.trie.exists(SyncId.fromFName(userNameProof))).toBeFalsy();
         await engine.mergeUserNameProof(userNameProof);
+        await engine.mergeUserNameProof(deletionProof);
         expect(await syncEngine.trie.exists(SyncId.fromFName(userNameProof))).toBeFalsy();
         expect((await syncEngine.getDbStats()).numFnames).toEqual(0);
       });

diff --git a/apps/hubble/src/network/sync/syncEngine.ts b/apps/hubble/src/network/sync/syncEngine.ts
@@ -268,7 +268,8 @@ class SyncEngine extends TypedEmitter<SyncEvents> {
       }
       if (
         event.mergeUsernameProofBody.usernameProof &&
-        event.mergeUsernameProofBody.usernameProof.type === UserNameType.USERNAME_TYPE_FNAME
+        event.mergeUsernameProofBody.usernameProof.type === UserNameType.USERNAME_TYPE_FNAME &&
+        event.mergeUsernameProofBody.usernameProof.fid !== 0 // Deletes should not be added to the trie
       ) {
         this._syncTrieQ += 1;
         statsd().gauge("merkle_trie.merge_q", this._syncTrieQ);