From bc51d0d279e5e0d424d2c90112c2149a9b16c23e Mon Sep 17 00:00:00 2001 From: Aleksandr Kraiz Date: Tue, 3 May 2022 13:24:54 +0400 Subject: [PATCH] Replaced csprng with @lukeed/csprng (#6) --- package-lock.json | 54 +++++++++++++------------------------ package.json | 5 ++-- src/utils/generateSecret.ts | 7 +++-- 3 files changed, 23 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index b7670c3..aa05d62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,20 @@ { "name": "@orionprotocol/sdk", - "version": "0.2.5", + "version": "0.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@orionprotocol/sdk", - "version": "0.2.5", + "version": "0.3.0", "license": "ISC", "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", + "@lukeed/csprng": "^1.0.1", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", - "csprng": "^0.1.2", "ethers": "^5.6.2", "isomorphic-ws": "^4.0.1", "just-clone": "^5.0.1", @@ -24,7 +24,6 @@ "tiny-invariant": "^1.2.0", "uuid": "^8.3.2", "websocket-heartbeat-js": "^1.1.0", - "ws": "^8.5.0", "zod": "^3.14.4" }, "devDependencies": { @@ -2445,6 +2444,14 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@lukeed/csprng": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.0.1.tgz", + "integrity": "sha512-uSvJdwQU5nK+Vdf6zxcWAY2A8r7uqe+gePwLWzJ+fsQehq18pc0I2hJKwypZ2aLM90+Er9u1xn4iLJPZ+xlL4g==", + "engines": { + "node": ">=8" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -4484,17 +4491,6 @@ "node": "*" } }, - "node_modules/csprng": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/csprng/-/csprng-0.1.2.tgz", - "integrity": "sha1-S8aPEvo2jSUqWYQcusqXSxirReI=", - "dependencies": { - "sequin": "*" - }, - "engines": { - "node": ">=0.6.0" - } - }, "node_modules/cssom": { "version": "0.4.4", "dev": true, @@ -9929,14 +9925,6 @@ "node": ">=10" } }, - "node_modules/sequin": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/sequin/-/sequin-0.1.1.tgz", - "integrity": "sha1-XC04nWajg3NOqvvEXt6ywcsb5wE=", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -11010,6 +10998,7 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "peer": true, "engines": { "node": ">=10.0.0" }, @@ -12691,6 +12680,11 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "@lukeed/csprng": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.0.1.tgz", + "integrity": "sha512-uSvJdwQU5nK+Vdf6zxcWAY2A8r7uqe+gePwLWzJ+fsQehq18pc0I2hJKwypZ2aLM90+Er9u1xn4iLJPZ+xlL4g==" + }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -14258,14 +14252,6 @@ "randomfill": "^1.0.3" } }, - "csprng": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/csprng/-/csprng-0.1.2.tgz", - "integrity": "sha1-S8aPEvo2jSUqWYQcusqXSxirReI=", - "requires": { - "sequin": "*" - } - }, "cssom": { "version": "0.4.4", "dev": true @@ -18034,11 +18020,6 @@ "lru-cache": "^6.0.0" } }, - "sequin": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/sequin/-/sequin-0.1.1.tgz", - "integrity": "sha1-XC04nWajg3NOqvvEXt6ywcsb5wE=" - }, "serialize-javascript": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", @@ -18802,6 +18783,7 @@ "version": "8.5.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", + "peer": true, "requires": {} }, "xml-name-validator": { diff --git a/package.json b/package.json index 138c7c9..8935932 100644 --- a/package.json +++ b/package.json @@ -64,10 +64,10 @@ "dependencies": { "@ethersproject/abstract-signer": "^5.6.0", "@ethersproject/providers": "^5.6.2", + "@lukeed/csprng": "^1.0.1", "bignumber.js": "^9.0.2", "buffer": "^6.0.3", "crypto-browserify": "^3.12.0", - "csprng": "^0.1.2", "ethers": "^5.6.2", "isomorphic-ws": "^4.0.1", "just-clone": "^5.0.1", @@ -77,11 +77,10 @@ "tiny-invariant": "^1.2.0", "uuid": "^8.3.2", "websocket-heartbeat-js": "^1.1.0", - "ws": "^8.5.0", "zod": "^3.14.4" }, "homepage": "https://github.com/orionprotocol/sdk#readme", "files": [ "lib/**/*" ] -} \ No newline at end of file +} diff --git a/src/utils/generateSecret.ts b/src/utils/generateSecret.ts index e002a01..16fda3d 100644 --- a/src/utils/generateSecret.ts +++ b/src/utils/generateSecret.ts @@ -1,11 +1,10 @@ -import rand from 'csprng'; +import { random } from '@lukeed/csprng'; import { ethers } from 'ethers'; const generateSecret = () => { - const RANDOM_RADIX = 16; const RANDOM_BITS = 256; - const random = rand(RANDOM_BITS, RANDOM_RADIX); - const secret = ethers.utils.keccak256(`0x${random}`); + const rand = random(RANDOM_BITS); + const secret = ethers.utils.keccak256(rand); return secret; };