From 0ad927590a5f94c5db275d2bcc5bfc2ebbce7e5d Mon Sep 17 00:00:00 2001 From: Kacper-RF <111343884+Kacper-RF@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:35:21 +0100 Subject: [PATCH 1/9] Wait for all NEW_USER events until emitting FINISHED_ISSUING_CERTIFICATES_FOR_ID (#2049) * feat: wait for all NEW_USER events until emitting FINISHED_ISSUING_CERTIFICATES_FOR_ID * fix: change it name --- .../registration/registration.service.spec.ts | 34 +++++++++++++++++++ .../nest/registration/registration.service.ts | 9 +++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/packages/backend/src/nest/registration/registration.service.spec.ts b/packages/backend/src/nest/registration/registration.service.spec.ts index 6355013592..98abe55d4b 100644 --- a/packages/backend/src/nest/registration/registration.service.spec.ts +++ b/packages/backend/src/nest/registration/registration.service.spec.ts @@ -9,6 +9,7 @@ import { Time } from 'pkijs' import { issueCertificate, extractPendingCsrs } from './registration.functions' import { jest } from '@jest/globals' import { createTmpDir } from '../common/utils' +import { RegistrationEvents } from './registration.types' describe('RegistrationService', () => { let module: TestingModule @@ -146,4 +147,37 @@ describe('RegistrationService', () => { expect(pendingCsrs.length).toEqual(1) expect(pendingCsrs[0]).toBe(userCsr.userCsr) }) + + it('wait for all NEW_USER events until emitting FINISHED_ISSUING_CERTIFICATES_FOR_ID', async () => { + registrationService.permsData = permsData + + const eventSpy = jest.spyOn(registrationService, 'emit') + + const userCsr = await createUserCsr({ + nickname: 'alice', + commonName: 'nqnw4kc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion', + peerId: 'Qmf3ySkYqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6', + dmPublicKey: 'testdmPublicKey', + signAlg: configCrypto.signAlg, + hashAlg: configCrypto.hashAlg, + }) + const userCsr2 = await createUserCsr({ + nickname: 'karol', + commonName: 'nnnnnnc4c77fb47lk52m5l57h4tcxceo7ymxekfn7yh5m66t4jv2olad.onion', + peerId: 'QmffffffqLET9xtAtDzvAr5Pp3egK1H3C5iJAZm1SpLEp6', + dmPublicKey: 'testdmPublicKey', + signAlg: configCrypto.signAlg, + hashAlg: configCrypto.hashAlg, + }) + + const csrs: string[] = [userCsr.userCsr, userCsr2.userCsr] + // @ts-ignore - fn 'issueCertificates' is private + await registrationService.issueCertificates({ certificates: [], csrs, id: 1 }) + + expect(eventSpy).toHaveBeenLastCalledWith(RegistrationEvents.FINISHED_ISSUING_CERTIFICATES_FOR_ID, { + id: 1, + }) + + expect(eventSpy).toHaveBeenCalledTimes(3) + }) }) diff --git a/packages/backend/src/nest/registration/registration.service.ts b/packages/backend/src/nest/registration/registration.service.ts index ac9dadd7d7..2f6e0d90d9 100644 --- a/packages/backend/src/nest/registration/registration.service.ts +++ b/packages/backend/src/nest/registration/registration.service.ts @@ -31,9 +31,12 @@ export class RegistrationService extends EventEmitter implements OnModuleInit { return } const pendingCsrs = await extractPendingCsrs(payload) - pendingCsrs.forEach(async csr => { - await this.registerUserCertificate(csr) - }) + + await Promise.all( + pendingCsrs.map(async csr => { + await this.registerUserCertificate(csr) + }) + ) if (payload.id) this.emit(RegistrationEvents.FINISHED_ISSUING_CERTIFICATES_FOR_ID, { id: payload.id }) } From 2898bee80bbf2f16cbda67281a29e47716faa77c Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 9 Nov 2023 10:46:43 +0100 Subject: [PATCH 2/9] fix: trigger desktop --- .../src/renderer/containers/widgets/update/UpdateModal.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/desktop/src/renderer/containers/widgets/update/UpdateModal.tsx b/packages/desktop/src/renderer/containers/widgets/update/UpdateModal.tsx index 0a66f3ca0f..30096a2c84 100644 --- a/packages/desktop/src/renderer/containers/widgets/update/UpdateModal.tsx +++ b/packages/desktop/src/renderer/containers/widgets/update/UpdateModal.tsx @@ -1,7 +1,6 @@ import React from 'react' import { AnyAction, Dispatch, bindActionCreators } from 'redux' import { useDispatch } from 'react-redux' - import UpdateModal from '../../../components/widgets/update/UpdateModal' import updateHandlers from '../../../store/handlers/update' import { useModal } from '../../hooks' From 4a26b64ba14baca1076137727c59b4987dc467da Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 9 Nov 2023 10:47:35 +0100 Subject: [PATCH 3/9] Publish - @quiet/backend@2.0.3-alpha.2 - @quiet/desktop@2.0.3-alpha.2 - @quiet/mobile@2.0.3-alpha.2 --- packages/backend/CHANGELOG.md | 8 ++++++++ packages/backend/package-lock.json | 4 ++-- packages/backend/package.json | 2 +- packages/desktop/CHANGELOG.md | 11 +++++++++++ packages/desktop/package-lock.json | 4 ++-- packages/desktop/package.json | 2 +- packages/mobile/CHANGELOG.md | 8 ++++++++ packages/mobile/android/app/build.gradle | 4 ++-- packages/mobile/ios/Quiet/Info.plist | 2 +- packages/mobile/ios/QuietTests/Info.plist | 2 +- packages/mobile/package-lock.json | 4 ++-- packages/mobile/package.json | 4 ++-- 12 files changed, 41 insertions(+), 14 deletions(-) diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md index 1c6ad3dafd..3911ccfcd7 100644 --- a/packages/backend/CHANGELOG.md +++ b/packages/backend/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.3-alpha.1...@quiet/backend@2.0.3-alpha.2) (2023-11-09) + +**Note:** Version bump only for package @quiet/backend + + + + + ## [2.0.3-alpha.1](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.3-alpha.0...@quiet/backend@2.0.3-alpha.1) (2023-11-08) **Note:** Version bump only for package @quiet/backend diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json index 85c772d158..d88842dbe6 100644 --- a/packages/backend/package-lock.json +++ b/packages/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/backend", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/backend", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "license": "MIT", "dependencies": { "@chainsafe/libp2p-gossipsub": "6.1.0", diff --git a/packages/backend/package.json b/packages/backend/package.json index 962a0fe82f..0a9101004c 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/backend", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "tlg-manager", "types": "lib/index.d.ts", "type": "module", diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 76314dcb9b..9695179be6 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.3-alpha.1...@quiet/desktop@2.0.3-alpha.2) (2023-11-09) + + +### Bug Fixes + +* trigger desktop ([2898bee](https://github.com/TryQuiet/quiet/commit/2898bee80bbf2f16cbda67281a29e47716faa77c)) + + + + + ## [2.0.3-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.3-alpha.0...@quiet/desktop@2.0.3-alpha.1) (2023-11-08) **Note:** Version bump only for package @quiet/desktop diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json index 912309b297..88d8f4db77 100644 --- a/packages/desktop/package-lock.json +++ b/packages/desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/desktop", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/desktop", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "license": "ISC", "dependencies": { "@electron/remote": "^2.0.8", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index b316ef16b7..3a23269ad4 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -80,7 +80,7 @@ }, "homepage": "https://github.com/TryQuiet", "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "description": "Decentralized team chat", "main": "dist/main/main.js", "scripts": { diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 4a5dec92ef..6592a6d7a1 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.1...@quiet/mobile@2.0.3-alpha.2) (2023-11-09) + +**Note:** Version bump only for package @quiet/mobile + + + + + ## [2.0.3-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.0...@quiet/mobile@2.0.3-alpha.1) (2023-11-08) diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index 153200b053..8c68c7e16c 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -172,8 +172,8 @@ android { applicationId "com.quietmobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 368 - versionName "2.0.3-alpha.1" + versionCode 369 + versionName "2.0.3-alpha.2" resValue "string", "build_config_package", "com.quietmobile" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist index 906afb1f67..72870e03b1 100644 --- a/packages/mobile/ios/Quiet/Info.plist +++ b/packages/mobile/ios/Quiet/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 328 + 329 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist index 82d7ab4c4b..d3247726b9 100644 --- a/packages/mobile/ios/QuietTests/Info.plist +++ b/packages/mobile/ios/QuietTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 328 + 329 diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json index 35cf3ee6c2..9fca155edc 100644 --- a/packages/mobile/package-lock.json +++ b/packages/mobile/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/mobile", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "dependencies": { "@peculiar/webcrypto": "^1.4.3", "@react-native-clipboard/clipboard": "^1.11.2", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 44e8ec9a5a..ecb0efa562 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.1", + "version": "2.0.3-alpha.2", "scripts": { "build": "tsc -p tsconfig.build.json --noEmit", "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug", @@ -22,7 +22,7 @@ }, "dependencies": { "@peculiar/webcrypto": "^1.4.3", - "@quiet/backend": "^2.0.3-alpha.1", + "@quiet/backend": "^2.0.3-alpha.2", "@quiet/common": "^2.0.2-alpha.0", "@quiet/identity": "^2.0.2-alpha.0", "@quiet/state-manager": "^2.0.2-alpha.0", From 1e89199cc10160176158f88fc22743828ba6b380 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Thu, 9 Nov 2023 13:15:02 +0100 Subject: [PATCH 4/9] docs: update links in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f60ac424a1..d0c76e8899 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Encrypted p2p team chat with no servers, just Tor.
- Downloads | + Downloads | How it Works | Features | Threat Model | @@ -52,7 +52,7 @@ See our [FAQ](https://github.com/TryQuiet/monorepo/wiki/Quiet-FAQ) for answers t ## Getting started -To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. +To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.6) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-to-quiet). From aa3e777778b0861d5f96e6116bfc70031ed67929 Mon Sep 17 00:00:00 2001 From: Kacper-RF <111343884+Kacper-RF@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:25:39 +0100 Subject: [PATCH 5/9] feat: add debug logs (#2057) --- .../widgets/channels/BasicMessage.tsx | 6 +++++ .../widgets/userLabel/UserLabel.component.tsx | 2 ++ .../src/sagas/users/users.selectors.ts | 25 +++++++++++-------- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx index fe6ab39c28..460d577e7e 100644 --- a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx +++ b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx @@ -177,11 +177,17 @@ export const BasicMessageComponent: React.FC = ({ const isUnregistered = type === UserLabelType.UNREGISTERED const handleOpen = isUnregistered ? unregisteredUsernameModalHandleOpen : duplicatedUsernameModalHandleOpen + console.log('Unregistered Debug - UserLabel Component', { isUnregistered }) + return ( u.username) const duplicateUsernames: string[] = allUsernames.filter((val, index) => allUsernames.indexOf(val) !== index) + // Temporary backward compatiblility! Old communities do not have csrs + Object.keys(certs).map(pubKey => { + users[pubKey] = { + ...certs[pubKey], + isRegistered: true, + isDuplicated: false, + pubKey, + } + console.log('Unregistered Debug - allUsers selector - certs - user', users[pubKey]) + }) + Object.keys(csrs).map(pubKey => { + if (users[pubKey]) return const username = csrs[pubKey].username let isDuplicated: boolean @@ -89,23 +101,16 @@ export const allUsers = createSelector(csrsMapping, certificatesMapping, (csrs, } const isRegistered = Boolean(certs[pubKey]) + console.log('Unregistered Debug - allUsers selector - csrs - certs[pubKey]', certs[pubKey]) users[pubKey] = { ...csrs[pubKey], isRegistered, isDuplicated, pubKey, } + console.log('Unregistered Debug - allUsers selector - csrs - user', users[pubKey]) }) - // Temporary backward compatiblility! Old communities do not have csrs - Object.keys(certs).map(pubKey => { - if (users[pubKey]) return - users[pubKey] = { - ...certs[pubKey], - isRegistered: true, - isDuplicated: false, - pubKey, - } - }) + return users }) From 39807511960a9753f0afad2166758ec505371c46 Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Mon, 13 Nov 2023 11:30:34 +0100 Subject: [PATCH 6/9] Publish - @quiet/backend@2.0.3-alpha.3 - @quiet/desktop@2.0.3-alpha.3 - integration-tests@2.0.2-alpha.1 - @quiet/mobile@2.0.3-alpha.3 - @quiet/state-manager@2.0.2-alpha.1 --- packages/backend/CHANGELOG.md | 8 ++++++++ packages/backend/package-lock.json | 4 ++-- packages/backend/package.json | 4 ++-- packages/desktop/CHANGELOG.md | 11 +++++++++++ packages/desktop/package-lock.json | 4 ++-- packages/desktop/package.json | 4 ++-- packages/integration-tests/CHANGELOG.md | 8 ++++++++ packages/integration-tests/package-lock.json | 4 ++-- packages/integration-tests/package.json | 4 ++-- packages/mobile/CHANGELOG.md | 8 ++++++++ packages/mobile/android/app/build.gradle | 4 ++-- packages/mobile/ios/Quiet/Info.plist | 2 +- packages/mobile/ios/QuietTests/Info.plist | 2 +- packages/mobile/package-lock.json | 4 ++-- packages/mobile/package.json | 6 +++--- packages/state-manager/CHANGELOG.md | 11 +++++++++++ packages/state-manager/package-lock.json | 4 ++-- packages/state-manager/package.json | 2 +- 18 files changed, 70 insertions(+), 24 deletions(-) diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md index 3911ccfcd7..0665f2f495 100644 --- a/packages/backend/CHANGELOG.md +++ b/packages/backend/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.3](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.3-alpha.2...@quiet/backend@2.0.3-alpha.3) (2023-11-13) + +**Note:** Version bump only for package @quiet/backend + + + + + ## [2.0.3-alpha.2](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.3-alpha.1...@quiet/backend@2.0.3-alpha.2) (2023-11-09) **Note:** Version bump only for package @quiet/backend diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json index d88842dbe6..15500283f1 100644 --- a/packages/backend/package-lock.json +++ b/packages/backend/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/backend", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/backend", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "license": "MIT", "dependencies": { "@chainsafe/libp2p-gossipsub": "6.1.0", diff --git a/packages/backend/package.json b/packages/backend/package.json index 0a9101004c..d167a3615d 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/backend", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "description": "tlg-manager", "types": "lib/index.d.ts", "type": "module", @@ -54,7 +54,7 @@ "@nestjs/schematics": "^10.0.0", "@nestjs/testing": "^10.0.0", "@quiet/eslint-config": "^2.0.2-alpha.0", - "@quiet/state-manager": "^2.0.2-alpha.0", + "@quiet/state-manager": "^2.0.2-alpha.1", "@types/crypto-js": "^4.0.2", "@types/express": "^4.17.9", "@types/jest": "28.1.8", diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 9695179be6..7508693170 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.3-alpha.2...@quiet/desktop@2.0.3-alpha.3) (2023-11-13) + + +### Features + +* add debug logs ([#2057](https://github.com/TryQuiet/quiet/issues/2057)) ([aa3e777](https://github.com/TryQuiet/quiet/commit/aa3e777778b0861d5f96e6116bfc70031ed67929)) + + + + + ## [2.0.3-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.3-alpha.1...@quiet/desktop@2.0.3-alpha.2) (2023-11-09) diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json index 88d8f4db77..a412d51019 100644 --- a/packages/desktop/package-lock.json +++ b/packages/desktop/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/desktop", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/desktop", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "license": "ISC", "dependencies": { "@electron/remote": "^2.0.8", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 3a23269ad4..c15fe02713 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -80,7 +80,7 @@ }, "homepage": "https://github.com/TryQuiet", "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "description": "Decentralized team chat", "main": "dist/main/main.js", "scripts": { @@ -158,7 +158,7 @@ "@mui/material": "~5.10.15", "@quiet/eslint-config": "^2.0.2-alpha.0", "@quiet/identity": "^2.0.2-alpha.0", - "@quiet/state-manager": "^2.0.2-alpha.0", + "@quiet/state-manager": "^2.0.2-alpha.1", "@redux-saga/types": "^1.1.0", "@reduxjs/toolkit": "^1.9.1", "@sentry/browser": "^6.19.7", diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md index 06857e23c9..ca63f68fb4 100644 --- a/packages/integration-tests/CHANGELOG.md +++ b/packages/integration-tests/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.2-alpha.1](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.2-alpha.0...integration-tests@2.0.2-alpha.1) (2023-11-13) + +**Note:** Version bump only for package integration-tests + + + + + ## [2.0.2-alpha.0](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.6...integration-tests@2.0.2-alpha.0) (2023-10-26) **Note:** Version bump only for package integration-tests diff --git a/packages/integration-tests/package-lock.json b/packages/integration-tests/package-lock.json index 49c8cffa59..6d6818265f 100644 --- a/packages/integration-tests/package-lock.json +++ b/packages/integration-tests/package-lock.json @@ -1,12 +1,12 @@ { "name": "integration-tests", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "integration-tests", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "license": "ISC", "dependencies": { "@peculiar/webcrypto": "1.4.3", diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 64f201cee8..318e296358 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -1,6 +1,6 @@ { "name": "integration-tests", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "description": "", "types": "lib/index.d.ts", "main": "lib/index.js", @@ -36,7 +36,7 @@ "@peculiar/webcrypto": "1.4.3", "@quiet/identity": "^2.0.2-alpha.0", "@quiet/logger": "^2.0.2-alpha.0", - "@quiet/state-manager": "^2.0.2-alpha.0", + "@quiet/state-manager": "^2.0.2-alpha.1", "@reduxjs/toolkit": "^1.6.1", "commander": "^9.1.0", "debug": "^4.3.2", diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 6592a6d7a1..a936df1506 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.2...@quiet/mobile@2.0.3-alpha.3) (2023-11-13) + +**Note:** Version bump only for package @quiet/mobile + + + + + ## [2.0.3-alpha.2](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.1...@quiet/mobile@2.0.3-alpha.2) (2023-11-09) **Note:** Version bump only for package @quiet/mobile diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index 8c68c7e16c..1621ebbb0e 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -172,8 +172,8 @@ android { applicationId "com.quietmobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 369 - versionName "2.0.3-alpha.2" + versionCode 370 + versionName "2.0.3-alpha.3" resValue "string", "build_config_package", "com.quietmobile" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist index 72870e03b1..1bd9ea1954 100644 --- a/packages/mobile/ios/Quiet/Info.plist +++ b/packages/mobile/ios/Quiet/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 329 + 330 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist index d3247726b9..d1d10d5b43 100644 --- a/packages/mobile/ios/QuietTests/Info.plist +++ b/packages/mobile/ios/QuietTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 329 + 330 diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json index 9fca155edc..3c4f866c5c 100644 --- a/packages/mobile/package-lock.json +++ b/packages/mobile/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/mobile", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "dependencies": { "@peculiar/webcrypto": "^1.4.3", "@react-native-clipboard/clipboard": "^1.11.2", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index ecb0efa562..3641e2c34e 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.2", + "version": "2.0.3-alpha.3", "scripts": { "build": "tsc -p tsconfig.build.json --noEmit", "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug", @@ -22,10 +22,10 @@ }, "dependencies": { "@peculiar/webcrypto": "^1.4.3", - "@quiet/backend": "^2.0.3-alpha.2", + "@quiet/backend": "^2.0.3-alpha.3", "@quiet/common": "^2.0.2-alpha.0", "@quiet/identity": "^2.0.2-alpha.0", - "@quiet/state-manager": "^2.0.2-alpha.0", + "@quiet/state-manager": "^2.0.2-alpha.1", "@quiet/types": "^2.0.2-alpha.0", "@react-native-clipboard/clipboard": "^1.11.2", "@react-navigation/native": "^6.0.0", diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md index 3fe30c0d3a..95d8665a14 100644 --- a/packages/state-manager/CHANGELOG.md +++ b/packages/state-manager/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.2-alpha.1](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.2-alpha.0...@quiet/state-manager@2.0.2-alpha.1) (2023-11-13) + + +### Features + +* add debug logs ([#2057](https://github.com/TryQuiet/quiet/issues/2057)) ([aa3e777](https://github.com/TryQuiet/quiet/commit/aa3e777778b0861d5f96e6116bfc70031ed67929)) + + + + + ## [2.0.2-alpha.0](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.6...@quiet/state-manager@2.0.2-alpha.0) (2023-10-26) **Note:** Version bump only for package @quiet/state-manager diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json index 7228b856c3..bff02c6bb6 100644 --- a/packages/state-manager/package-lock.json +++ b/packages/state-manager/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/state-manager", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/state-manager", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "license": "ISC", "dependencies": { "@reduxjs/toolkit": "^1.9.1", diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json index 07c2846536..6f3d309c23 100644 --- a/packages/state-manager/package.json +++ b/packages/state-manager/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/state-manager", - "version": "2.0.2-alpha.0", + "version": "2.0.2-alpha.1", "description": "", "main": "lib/index.js", "private": true, From 104c6569805efecffcc23a801a8ba91a352966fe Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Mon, 13 Nov 2023 11:57:37 +0100 Subject: [PATCH 7/9] feat: bump versionCode --- packages/mobile/android/app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index 1621ebbb0e..c8cdda4dc0 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -172,7 +172,7 @@ android { applicationId "com.quietmobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 370 + versionCode 373 versionName "2.0.3-alpha.3" resValue "string", "build_config_package", "com.quietmobile" testBuildType System.getProperty('testBuildType', 'debug') From d128c403b5cd251a45fd6117ade1331f92a61bda Mon Sep 17 00:00:00 2001 From: Kacper Michalik Date: Mon, 13 Nov 2023 11:58:03 +0100 Subject: [PATCH 8/9] Publish - @quiet/mobile@2.0.3-alpha.4 --- packages/mobile/CHANGELOG.md | 11 +++++++++++ packages/mobile/android/app/build.gradle | 4 ++-- packages/mobile/ios/Quiet/Info.plist | 2 +- packages/mobile/ios/QuietTests/Info.plist | 2 +- packages/mobile/package-lock.json | 4 ++-- packages/mobile/package.json | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index a936df1506..815d484c97 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.0.3-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.3...@quiet/mobile@2.0.3-alpha.4) (2023-11-13) + + +### Features + +* bump versionCode ([104c656](https://github.com/TryQuiet/quiet/commit/104c6569805efecffcc23a801a8ba91a352966fe)) + + + + + ## [2.0.3-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.3-alpha.2...@quiet/mobile@2.0.3-alpha.3) (2023-11-13) **Note:** Version bump only for package @quiet/mobile diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle index c8cdda4dc0..3c990ca016 100644 --- a/packages/mobile/android/app/build.gradle +++ b/packages/mobile/android/app/build.gradle @@ -172,8 +172,8 @@ android { applicationId "com.quietmobile" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 373 - versionName "2.0.3-alpha.3" + versionCode 374 + versionName "2.0.3-alpha.4" resValue "string", "build_config_package", "com.quietmobile" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist index 1bd9ea1954..54eb7fdb2b 100644 --- a/packages/mobile/ios/Quiet/Info.plist +++ b/packages/mobile/ios/Quiet/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 330 + 331 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist index d1d10d5b43..4bd108f49e 100644 --- a/packages/mobile/ios/QuietTests/Info.plist +++ b/packages/mobile/ios/QuietTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 330 + 331 diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json index 3c4f866c5c..d56e53e2c0 100644 --- a/packages/mobile/package-lock.json +++ b/packages/mobile/package-lock.json @@ -1,12 +1,12 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.3", + "version": "2.0.3-alpha.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@quiet/mobile", - "version": "2.0.3-alpha.3", + "version": "2.0.3-alpha.4", "dependencies": { "@peculiar/webcrypto": "^1.4.3", "@react-native-clipboard/clipboard": "^1.11.2", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 3641e2c34e..1264bec9d4 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@quiet/mobile", - "version": "2.0.3-alpha.3", + "version": "2.0.3-alpha.4", "scripts": { "build": "tsc -p tsconfig.build.json --noEmit", "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug", From 27e79169804bfd26990bc0092f8277aa619f023a Mon Sep 17 00:00:00 2001 From: Kacper-RF <111343884+Kacper-RF@users.noreply.github.com> Date: Mon, 13 Nov 2023 12:29:36 +0100 Subject: [PATCH 9/9] docs/handleCsrReplicationEvent --- docs/example.md | 19 ++++++++++++++++++ docs/handleCsrReplicationEvent.md | 20 +++++++++++++++++++ .../src/nest/storage/storage.service.ts | 1 + 3 files changed, 40 insertions(+) create mode 100644 docs/example.md create mode 100644 docs/handleCsrReplicationEvent.md diff --git a/docs/example.md b/docs/example.md new file mode 100644 index 0000000000..c2dd809d77 --- /dev/null +++ b/docs/example.md @@ -0,0 +1,19 @@ +# Title: + +## Status: +(accepted | rejected | proposed | deprecated) + +## Context: +(what is our problem) + +## Decision: +(how it will affect app or individual parts of the app) + +## Consequences: +(how it will affect app or individual parts of the app) + +## Code location: +(package->file) + +## Date: +(dd.mm.rrrr) \ No newline at end of file diff --git a/docs/handleCsrReplicationEvent.md b/docs/handleCsrReplicationEvent.md new file mode 100644 index 0000000000..7835ba10c6 --- /dev/null +++ b/docs/handleCsrReplicationEvent.md @@ -0,0 +1,20 @@ +# Title: +Handle possibility of multiple replication events in certificate requests at the same time + +## Status: +accepted + +## Context: +Kinga discovered a bug where when the owner is offline and several (3) users with the same name have joined, sometimes the owner can register two users with the same name + +## Decision: +Introducing a locking mechanism to prevent the next event from being processed if the previous one is still being processed + +## Consequences: +We added queue concept and events will be processed individually in chronological order + +## Code location: +backend -> storage.service.ts + +## Date: +07-11-2023 \ No newline at end of file diff --git a/packages/backend/src/nest/storage/storage.service.ts b/packages/backend/src/nest/storage/storage.service.ts index 9a46b8ee23..0068130d95 100644 --- a/packages/backend/src/nest/storage/storage.service.ts +++ b/packages/backend/src/nest/storage/storage.service.ts @@ -432,6 +432,7 @@ export class StorageService extends EventEmitter { }, }) + // DOCS -> handleCsrReplicationEvent.md this.certificatesRequests.events.on('replicated', async () => { this.logger('REPLICATED: CSRs')