Fix(2321): No Duplicate CSRs (#2460)

* Fix issue of duplicate CRSs being generated * Install LFS with checkout to avoid random errors
TryQuiet · Apr 29, 2024 · 042ad63 · 042ad63
1 parent d185fdf
commit 042ad63
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
@@ -9,7 +9,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
+        with:
+          lfs: true
+
       - uses: actions/setup-node@master
         with:
           node-version: 18.12.1

diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -9,7 +9,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-
+        with:
+          lfs: true
+
       - uses: actions/setup-node@master
         with:
           node-version: 18.12.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 # Chores
 
 * Cleanup data directory at end of e2e tests
+* Don't create duplicate CSRs when joining a community under certain circumstances ([#2321](https://github.com/TryQuiet/quiet/issues/2321))
 
 [2.2.0]
 

diff --git a/packages/backend/src/nest/storage/certifacteRequests/certificatesRequestsStore.ts b/packages/backend/src/nest/storage/certifacteRequests/certificatesRequestsStore.ts
@@ -29,6 +29,7 @@ export class CertificatesRequestsStore extends EventEmitter {
         write: ['*'],
       },
     })
+    await this.store.load()
 
     this.store.events.on('write', async (_address, entry) => {
       this.logger('Added CSR to database')

diff --git a/packages/backend/src/nest/storage/storage.service.ts b/packages/backend/src/nest/storage/storage.service.ts
@@ -313,7 +313,7 @@ export class StorageService extends EventEmitter {
 
   public async updatePeersList() {
     const users = this.getAllUsers()
-    const peers = users.map(peer => createLibp2pAddress(peer.onionAddress, peer.peerId))
+    const peers = Array.from(new Set(users.map(peer => createLibp2pAddress(peer.onionAddress, peer.peerId))))
     console.log('updatePeersList, peers count:', peers.length)
 
     const community = await this.localDbService.getCurrentCommunity()