diff --git a/packages/backend/jestSetup.js b/packages/backend/jestSetup.js index 4a946da192..42d304a40c 100644 --- a/packages/backend/jestSetup.js +++ b/packages/backend/jestSetup.js @@ -1,5 +1,4 @@ import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' const crypto = new Crypto() diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json index d9c6a3709e..92a5b8c721 100644 --- a/packages/backend/package-lock.json +++ b/packages/backend/package-lock.json @@ -14,7 +14,6 @@ "@nestjs/common": "^10.2.10", "@nestjs/core": "^10.2.10", "@nestjs/platform-express": "^10.2.10", - "@peculiar/webcrypto": "1.4.3", "abortable-iterator": "^3.0.0", "class-transformer": "^0.5.1", "class-validator": "^0.13.1", @@ -6640,39 +6639,6 @@ "webidl-conversions": "^3.0.0" } }, - "node_modules/@peculiar/asn1-schema": { - "version": "2.3.6", - "license": "MIT", - "dependencies": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@peculiar/json-schema": { - "version": "1.1.12", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@peculiar/webcrypto": { - "version": "1.4.3", - "license": "MIT", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - }, - "engines": { - "node": ">=10.12.0" - } - }, "node_modules/@pnpm/network.ca-file": { "version": "1.0.2", "license": "MIT", @@ -23244,17 +23210,6 @@ "defaults": "^1.0.3" } }, - "node_modules/webcrypto-core": { - "version": "1.7.7", - "license": "MIT", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, "node_modules/webpack": { "version": "5.75.0", "license": "MIT", @@ -28126,30 +28081,6 @@ } } }, - "@peculiar/asn1-schema": { - "version": "2.3.6", - "requires": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "@peculiar/json-schema": { - "version": "1.1.12", - "requires": { - "tslib": "^2.0.0" - } - }, - "@peculiar/webcrypto": { - "version": "1.4.3", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - } - }, "@pnpm/network.ca-file": { "version": "1.0.2", "requires": { @@ -38795,16 +38726,6 @@ "defaults": "^1.0.3" } }, - "webcrypto-core": { - "version": "1.7.7", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, "webpack": { "version": "5.75.0", "requires": { diff --git a/packages/backend/package.json b/packages/backend/package.json index 0b21fa4ccf..4dbeaa6f2f 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -92,7 +92,6 @@ "@nestjs/common": "^10.2.10", "@nestjs/core": "^10.2.10", "@nestjs/platform-express": "^10.2.10", - "@peculiar/webcrypto": "1.4.3", "@quiet/common": "^2.0.2-alpha.1", "@quiet/identity": "^2.0.2-alpha.2", "@quiet/logger": "^2.0.2-alpha.0", diff --git a/packages/backend/src/backendManager.ts b/packages/backend/src/backendManager.ts index bf86ba95a8..63041b583a 100644 --- a/packages/backend/src/backendManager.ts +++ b/packages/backend/src/backendManager.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { Command } from 'commander' import { NestFactory } from '@nestjs/core' import path from 'path' diff --git a/packages/backend/src/nest/connections-manager/connections-manager.service.ts b/packages/backend/src/nest/connections-manager/connections-manager.service.ts index a29ee01d4c..279b6a4de1 100644 --- a/packages/backend/src/nest/connections-manager/connections-manager.service.ts +++ b/packages/backend/src/nest/connections-manager/connections-manager.service.ts @@ -1,6 +1,5 @@ import { peerIdFromKeys } from '@libp2p/peer-id' import { Inject, Injectable, OnModuleInit } from '@nestjs/common' -import { Crypto } from '@peculiar/webcrypto' import { EventEmitter } from 'events' import fs from 'fs' import getPort from 'get-port' diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json index d749dbf492..1f7b070e8d 100644 --- a/packages/desktop/package-lock.json +++ b/packages/desktop/package-lock.json @@ -10,7 +10,6 @@ "license": "GPL-3.0-or-later", "dependencies": { "@electron/remote": "^2.0.10", - "@peculiar/webcrypto": "1.4.3", "@sentry/electron": "^2.5.4", "electron-debug": "^3.0.1", "electron-localshortcut": "^3.2.1", @@ -7090,57 +7089,6 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", "dev": true }, - "node_modules/@peculiar/asn1-schema": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz", - "integrity": "sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==", - "dependencies": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@peculiar/asn1-schema/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, - "node_modules/@peculiar/json-schema": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", - "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@peculiar/json-schema/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, - "node_modules/@peculiar/webcrypto": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz", - "integrity": "sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/@peculiar/webcrypto/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, "node_modules/@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -44235,23 +44183,6 @@ "minimalistic-assert": "^1.0.0" } }, - "node_modules/webcrypto-core": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.7.tgz", - "integrity": "sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "node_modules/webcrypto-core/node_modules/tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -50329,57 +50260,6 @@ } } }, - "@peculiar/asn1-schema": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz", - "integrity": "sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==", - "requires": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - }, - "dependencies": { - "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - } - } - }, - "@peculiar/json-schema": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", - "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", - "requires": { - "tslib": "^2.0.0" - }, - "dependencies": { - "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - } - } - }, - "@peculiar/webcrypto": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz", - "integrity": "sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - }, - "dependencies": { - "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - } - } - }, "@popperjs/core": { "version": "2.11.6", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", @@ -78485,25 +78365,6 @@ "minimalistic-assert": "^1.0.0" } }, - "webcrypto-core": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.7.tgz", - "integrity": "sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - }, - "dependencies": { - "tslib": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", - "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==" - } - } - }, "webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", diff --git a/packages/desktop/package.json b/packages/desktop/package.json index d88748812f..05b1b30098 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -129,7 +129,6 @@ }, "dependencies": { "@electron/remote": "^2.0.10", - "@peculiar/webcrypto": "1.4.3", "@quiet/common": "^2.0.2-alpha.1", "@quiet/logger": "^2.0.2-alpha.0", "@quiet/types": "^2.0.2-alpha.1", diff --git a/packages/desktop/src/main/main.ts b/packages/desktop/src/main/main.ts index 4ef33e5004..c9f37bb06c 100644 --- a/packages/desktop/src/main/main.ts +++ b/packages/desktop/src/main/main.ts @@ -7,7 +7,6 @@ import electronLocalshortcut from 'electron-localshortcut' import url from 'url' import { getPorts, ApplicationPorts, closeHangingBackendProcess } from './backendHelpers' import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' import { createLogger } from './logger' import { fork, ChildProcess } from 'child_process' import { DESKTOP_DATA_DIR, DESKTOP_DEV_DATA_DIR, getFilesData } from '@quiet/common' diff --git a/packages/desktop/src/shared/setupTests.ts b/packages/desktop/src/shared/setupTests.ts index dc8fef1d6a..397eedb4d6 100644 --- a/packages/desktop/src/shared/setupTests.ts +++ b/packages/desktop/src/shared/setupTests.ts @@ -1,5 +1,4 @@ import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' import { io } from 'socket.io-client' diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json index 97258e79d2..f2c4d7a2e0 100644 --- a/packages/e2e-tests/package-lock.json +++ b/packages/e2e-tests/package-lock.json @@ -14,7 +14,7 @@ "get-port": "^5.1.1", "jest": "^29.4.2", "path-browserify": "^1.0.1", - "selenium-webdriver": "^4.8.0", + "selenium-webdriver": "^4.25.0", "yargs": "^17.3.1" }, "devDependencies": { @@ -5665,47 +5665,36 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/selenium-webdriver": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.8.0.tgz", - "integrity": "sha512-s/HL8WNwy1ggHR244+tAhjhyKMJnZLt1HKJ6Gn7nQgVjB/ybDF+46Uui0qI2J7AjPNJzlUmTncdC/jg/kKkn0A==", + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz", + "integrity": "sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==", "dependencies": { - "jszip": "^3.10.0", - "tmp": "^0.2.1", - "ws": ">=8.11.0" + "@bazel/runfiles": "^5.8.1", + "jszip": "^3.10.1", + "tmp": "^0.2.3", + "ws": "^8.18.0" }, "engines": { - "node": ">= 14.20.0" + "node": ">= 14.21.0" } }, - "node_modules/selenium-webdriver/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } + "node_modules/selenium-webdriver/node_modules/@bazel/runfiles": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz", + "integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g==" }, "node_modules/selenium-webdriver/node_modules/tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dependencies": { - "rimraf": "^3.0.0" - }, + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", "engines": { - "node": ">=8.17.0" + "node": ">=14.14" } }, "node_modules/selenium-webdriver/node_modules/ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "engines": { "node": ">=10.0.0" }, @@ -10298,35 +10287,30 @@ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "selenium-webdriver": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.8.0.tgz", - "integrity": "sha512-s/HL8WNwy1ggHR244+tAhjhyKMJnZLt1HKJ6Gn7nQgVjB/ybDF+46Uui0qI2J7AjPNJzlUmTncdC/jg/kKkn0A==", + "version": "4.25.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.25.0.tgz", + "integrity": "sha512-zl9IX93caOT8wbcCpZzAkEtYa+hNgJ4C5GUN8uhpzggqRLvsg1asfKi0p1uNZC8buYVvsBZbx8S+9MjVAjs4oA==", "requires": { - "jszip": "^3.10.0", - "tmp": "^0.2.1", - "ws": ">=8.11.0" + "@bazel/runfiles": "^5.8.1", + "jszip": "^3.10.1", + "tmp": "^0.2.3", + "ws": "^8.18.0" }, "dependencies": { - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "requires": { - "glob": "^7.1.3" - } + "@bazel/runfiles": { + "version": "5.8.1", + "resolved": "https://registry.npmjs.org/@bazel/runfiles/-/runfiles-5.8.1.tgz", + "integrity": "sha512-NDdfpdQ6rZlylgv++iMn5FkObC/QlBQvipinGLSOguTYpRywmieOyJ29XHvUilspwTFSILWpoE9CqMGkHXug1g==" }, "tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "requires": { - "rimraf": "^3.0.0" - } + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==" }, "ws": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz", - "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", "requires": {} } } diff --git a/packages/identity/package.json b/packages/identity/package.json index 3f227a3399..493cff59d0 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -51,7 +51,6 @@ ] }, "dependencies": { - "@peculiar/webcrypto": "1.4.3", "@quiet/eslint-config": "^2.0.2-alpha.0", "@quiet/logger": "^2.0.2-alpha.0", "@quiet/types": "^2.0.2-alpha.1", diff --git a/packages/identity/src/test/helpers.ts b/packages/identity/src/test/helpers.ts index 61c6e952b9..c95ec34733 100644 --- a/packages/identity/src/test/helpers.ts +++ b/packages/identity/src/test/helpers.ts @@ -1,5 +1,4 @@ import { Time, setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' import { createRootCA, type RootCA } from '../createRootCA' import { createUserCert, type UserCert } from '../createUserCert' import { createUserCsr, type UserCsr } from '../createUserCsr' diff --git a/packages/identity/src/test/index.test.ts b/packages/identity/src/test/index.test.ts index b6af8010ea..a0939f7ffc 100644 --- a/packages/identity/src/test/index.test.ts +++ b/packages/identity/src/test/index.test.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { sign } from '../sign' import { extractPubKey, parseCertificate, parseCertificationRequest } from '../extractPubKey' import { verifySignature } from '../verifySignature' diff --git a/packages/identity/src/test/setupTests.ts b/packages/identity/src/test/setupTests.ts index 3a2f248bce..fd316d32de 100644 --- a/packages/identity/src/test/setupTests.ts +++ b/packages/identity/src/test/setupTests.ts @@ -1,5 +1,4 @@ import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' const webcrypto = new Crypto() setEngine( diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json index 2af10a2e1a..f8eeb57f97 100644 --- a/packages/integration-tests/package.json +++ b/packages/integration-tests/package.json @@ -37,7 +37,6 @@ "typescript": "^4.9.3" }, "dependencies": { - "@peculiar/webcrypto": "1.4.3", "@quiet/identity": "^2.0.2-alpha.2", "@quiet/logger": "^2.0.2-alpha.0", "@quiet/state-manager": "^2.0.2-alpha.3", diff --git a/packages/integration-tests/src/bot/bot.ts b/packages/integration-tests/src/bot/bot.ts index c4388344f3..e6b25c197b 100644 --- a/packages/integration-tests/src/bot/bot.ts +++ b/packages/integration-tests/src/bot/bot.ts @@ -10,8 +10,6 @@ import { assertReceivedChannel } from '../testUtils/assertions' import { CryptoEngine, setEngine } from 'pkijs' import { createLogger } from '../logger' const logger = createLogger('bot') -// eslint-disable-next-line -const { Crypto } = require('@peculiar/webcrypto') const webcrypto = new Crypto() setEngine( diff --git a/packages/integration-tests/src/integrationTests/createJoinCommunity.test.ts b/packages/integration-tests/src/integrationTests/createJoinCommunity.test.ts index 73e09b01dd..b9e21daf77 100644 --- a/packages/integration-tests/src/integrationTests/createJoinCommunity.test.ts +++ b/packages/integration-tests/src/integrationTests/createJoinCommunity.test.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { AsyncReturnType } from '../types/AsyncReturnType.interface' import { createApp, sleep } from '../utils' import { createCommunity, getCommunityOwnerData, joinCommunity } from './appActions' diff --git a/packages/integration-tests/src/integrationTests/restartApp.test.ts b/packages/integration-tests/src/integrationTests/restartApp.test.ts index 28f1fe5c66..72ee2b5c17 100644 --- a/packages/integration-tests/src/integrationTests/restartApp.test.ts +++ b/packages/integration-tests/src/integrationTests/restartApp.test.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { createCommunity, clearInitializedCommunitiesAndRegistrars } from './appActions' import { createApp, sleep, storePersistor } from '../utils' import { AsyncReturnType } from '../types/AsyncReturnType.interface' diff --git a/packages/integration-tests/src/integrationTests/sendFiles.test.ts b/packages/integration-tests/src/integrationTests/sendFiles.test.ts index 1e36a01eaa..184db89568 100644 --- a/packages/integration-tests/src/integrationTests/sendFiles.test.ts +++ b/packages/integration-tests/src/integrationTests/sendFiles.test.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { assertDownloadedImage, assertReceivedCertificates, diff --git a/packages/integration-tests/src/integrationTests/sendMessages.test.ts b/packages/integration-tests/src/integrationTests/sendMessages.test.ts index eecdcd4614..d7ae51bd24 100644 --- a/packages/integration-tests/src/integrationTests/sendMessages.test.ts +++ b/packages/integration-tests/src/integrationTests/sendMessages.test.ts @@ -1,4 +1,3 @@ -import { Crypto } from '@peculiar/webcrypto' import { assertReceivedCertificates, assertReceivedChannelsAndSubscribe, @@ -9,8 +8,6 @@ import { createCommunity, joinCommunity, getCommunityOwnerData, sendMessage } fr import { createApp, createAppWithoutTor, sleep, storePersistor } from '../utils' import { AsyncReturnType } from '../types/AsyncReturnType.interface' -const crypto = new Crypto() - describe('send message - users go offline and online', () => { let owner: AsyncReturnType let userOne: AsyncReturnType diff --git a/packages/integration-tests/src/setupTests.ts b/packages/integration-tests/src/setupTests.ts index 3a2f248bce..fd316d32de 100644 --- a/packages/integration-tests/src/setupTests.ts +++ b/packages/integration-tests/src/setupTests.ts @@ -1,5 +1,4 @@ import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' const webcrypto = new Crypto() setEngine( diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json index 3633c68c77..73dc5448d6 100644 --- a/packages/mobile/package-lock.json +++ b/packages/mobile/package-lock.json @@ -8,7 +8,6 @@ "name": "@quiet/mobile", "version": "2.3.1", "dependencies": { - "@peculiar/webcrypto": "^1.4.3", "@react-native-clipboard/clipboard": "^1.13.2", "@react-navigation/native": "^6.0.0", "@react-navigation/native-stack": "^6.9.0", @@ -4732,42 +4731,6 @@ "node": ">= 8" } }, - "node_modules/@peculiar/asn1-schema": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz", - "integrity": "sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==", - "dependencies": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "node_modules/@peculiar/json-schema": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", - "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@peculiar/webcrypto": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz", - "integrity": "sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - }, - "engines": { - "node": ">=10.12.0" - } - }, "node_modules/@react-native-async-storage/async-storage": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.21.0.tgz", @@ -28944,18 +28907,6 @@ "defaults": "^1.0.3" } }, - "node_modules/webcrypto-core": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.7.tgz", - "integrity": "sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==", - "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, "node_modules/webpack": { "version": "4.46.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", @@ -32840,36 +32791,6 @@ "fastq": "^1.6.0" } }, - "@peculiar/asn1-schema": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz", - "integrity": "sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==", - "requires": { - "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, - "@peculiar/json-schema": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", - "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", - "requires": { - "tslib": "^2.0.0" - } - }, - "@peculiar/webcrypto": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz", - "integrity": "sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" - } - }, "@react-native-async-storage/async-storage": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.21.0.tgz", @@ -51773,18 +51694,6 @@ "defaults": "^1.0.3" } }, - "webcrypto-core": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.7.tgz", - "integrity": "sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==", - "requires": { - "@peculiar/asn1-schema": "^2.3.6", - "@peculiar/json-schema": "^1.1.12", - "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" - } - }, "webpack": { "version": "4.46.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz", diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 80517ae1ea..70970e7698 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -23,7 +23,6 @@ "version": "react-native-version --skip-tag" }, "dependencies": { - "@peculiar/webcrypto": "^1.4.3", "@quiet/backend": "^2.0.3-alpha.5", "@quiet/common": "^2.0.2-alpha.1", "@quiet/identity": "^2.0.2-alpha.2", diff --git a/packages/mobile/src/setupTests.tsx b/packages/mobile/src/setupTests.tsx index 5871a07641..cb45ea1145 100644 --- a/packages/mobile/src/setupTests.tsx +++ b/packages/mobile/src/setupTests.tsx @@ -1,7 +1,6 @@ /* eslint-disable */ import { setEngine, CryptoEngine } from 'pkijs' import { setEngine as setIdentityEngine } from '../../identity/node_modules/pkijs' -import { Crypto } from '@peculiar/webcrypto' import React from 'react' import { io } from 'socket.io-client' diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json index c6caac81ff..1c153f2281 100644 --- a/packages/state-manager/package.json +++ b/packages/state-manager/package.json @@ -46,7 +46,6 @@ "@babel/core": "^7.24.7", "@babel/preset-env": "^7.24.7", "@babel/preset-typescript": "^7.24.7", - "@peculiar/webcrypto": "1.4.3", "@quiet/eslint-config": "^2.0.2-alpha.0", "@quiet/identity": "^2.0.2-alpha.2", "@types/factory-girl": "^5.0.8", diff --git a/packages/state-manager/src/setupTests.ts b/packages/state-manager/src/setupTests.ts index 3a2f248bce..fd316d32de 100644 --- a/packages/state-manager/src/setupTests.ts +++ b/packages/state-manager/src/setupTests.ts @@ -1,5 +1,4 @@ import { setEngine, CryptoEngine } from 'pkijs' -import { Crypto } from '@peculiar/webcrypto' const webcrypto = new Crypto() setEngine(