From 8e3a75ed8d58324ac416eba64c8b84048326da05 Mon Sep 17 00:00:00 2001 From: Jaco Date: Sat, 18 Mar 2023 11:58:18 +0200 Subject: [PATCH] Bump deps (& remove unused overrides) (#1770) --- package.json | 2 +- packages/keyring/src/pair/nobody.ts | 30 ++++------- packages/util-crypto/package.json | 2 +- packages/util-crypto/src/address/is.ts | 2 +- packages/util-crypto/src/base32/helpers.ts | 2 +- packages/util-crypto/src/hd/ethereum/index.ts | 2 +- packages/util-crypto/src/mnemonic/bip39.ts | 2 +- packages/util-crypto/src/signature/verify.ts | 4 +- packages/util/src/is/jsonObject.ts | 2 +- packages/util/src/versionDetect.ts | 2 +- packages/x-textdecoder/src/fallback.ts | 2 +- tsconfig.base.json | 3 +- yarn.lock | 50 +++++++++---------- 13 files changed, 47 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 6f779c51b..ed3245f67 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "test:one": "polkadot-dev-run-test --env browser" }, "devDependencies": { - "@polkadot/dev": "^0.72.9", + "@polkadot/dev": "^0.72.15", "@types/node": "^18.15.3" }, "resolutions": { diff --git a/packages/keyring/src/pair/nobody.ts b/packages/keyring/src/pair/nobody.ts index c4db78252..10f81cd52 100644 --- a/packages/keyring/src/pair/nobody.ts +++ b/packages/keyring/src/pair/nobody.ts @@ -28,14 +28,11 @@ const json: KeyringPair$Json = { const pair: KeyringPair = { address, addressRaw: publicKey, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - decodePkcs8: (passphrase?: string, encoded?: Uint8Array): void => + decodePkcs8: (_passphrase?: string, _encoded?: Uint8Array): void => undefined, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair => + derive: (_suri: string, _meta?: KeyringPair$Meta): KeyringPair => pair, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - encodePkcs8: (passphrase?: string): Uint8Array => + encodePkcs8: (_passphrase?: string): Uint8Array => new Uint8Array(0), isLocked: true, lock: (): void => { @@ -43,27 +40,20 @@ const pair: KeyringPair = { }, meta, publicKey, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - setMeta: (meta: KeyringPair$Meta): void => + setMeta: (_meta: KeyringPair$Meta): void => undefined, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - sign: (message: Uint8Array): Uint8Array => + sign: (_message: Uint8Array): Uint8Array => new Uint8Array(64), - // eslint-disable-next-line @typescript-eslint/no-unused-vars - toJson: (passphrase?: string): KeyringPair$Json => + toJson: (_passphrase?: string): KeyringPair$Json => json, type: 'ed25519', - // eslint-disable-next-line @typescript-eslint/no-unused-vars - unlock: (passphrase?: string): void => + unlock: (_passphrase?: string): void => undefined, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - verify: (message: Uint8Array, signature: Uint8Array): boolean => + verify: (_message: Uint8Array, _signature: Uint8Array): boolean => false, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - vrfSign: (message: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array => + vrfSign: (_message: Uint8Array, _context?: string | Uint8Array, _extra?: string | Uint8Array): Uint8Array => new Uint8Array(96), - // eslint-disable-next-line @typescript-eslint/no-unused-vars - vrfVerify: (message: Uint8Array, vrfResult: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): boolean => + vrfVerify: (_message: Uint8Array, _vrfResult: Uint8Array, _context?: string | Uint8Array, _extra?: string | Uint8Array): boolean => false }; diff --git a/packages/util-crypto/package.json b/packages/util-crypto/package.json index 3aac46c17..334ab99d4 100644 --- a/packages/util-crypto/package.json +++ b/packages/util-crypto/package.json @@ -27,7 +27,7 @@ }, "main": "index.js", "dependencies": { - "@noble/hashes": "1.2.0", + "@noble/hashes": "1.3.0", "@noble/secp256k1": "1.7.1", "@polkadot/networks": "11.0.3-7-x", "@polkadot/util": "11.0.3-7-x", diff --git a/packages/util-crypto/src/address/is.ts b/packages/util-crypto/src/address/is.ts index 31c1e27bd..d8174d840 100644 --- a/packages/util-crypto/src/address/is.ts +++ b/packages/util-crypto/src/address/is.ts @@ -9,7 +9,7 @@ import { validateAddress } from './validate.js'; export function isAddress (address?: HexString | string | null, ignoreChecksum?: boolean, ss58Format?: Prefix): address is string { try { return validateAddress(address, ignoreChecksum, ss58Format); - } catch (error) { + } catch { return false; } } diff --git a/packages/util-crypto/src/base32/helpers.ts b/packages/util-crypto/src/base32/helpers.ts index 14ebc8b88..6d39a4d5a 100644 --- a/packages/util-crypto/src/base32/helpers.ts +++ b/packages/util-crypto/src/base32/helpers.ts @@ -56,7 +56,7 @@ export function createIs (validate: ValidateFn): ValidateFn { return (value?: unknown, ipfsCompat?: boolean): value is string => { try { return validate(value, ipfsCompat); - } catch (error) { + } catch { return false; } }; diff --git a/packages/util-crypto/src/hd/ethereum/index.ts b/packages/util-crypto/src/hd/ethereum/index.ts index 401e770b7..34c96b0ed 100644 --- a/packages/util-crypto/src/hd/ethereum/index.ts +++ b/packages/util-crypto/src/hd/ethereum/index.ts @@ -37,7 +37,7 @@ function deriveChild (hd: CodedKeypair, index: number): CodedKeypair { secp256k1PrivateKeyTweakAdd(hd.secretKey, I.slice(0, 32)), I.slice(32) ); - } catch (err) { + } catch { // In case parse256(IL) >= n or ki == 0, proceed with the next value for i return deriveChild(hd, index + 1); } diff --git a/packages/util-crypto/src/mnemonic/bip39.ts b/packages/util-crypto/src/mnemonic/bip39.ts index 3ec149131..f26b046c5 100644 --- a/packages/util-crypto/src/mnemonic/bip39.ts +++ b/packages/util-crypto/src/mnemonic/bip39.ts @@ -115,7 +115,7 @@ export function generateMnemonic (numWords: 12 | 15 | 18 | 21 | 24): string { export function validateMnemonic (mnemonic: string): boolean { try { mnemonicToEntropy(mnemonic); - } catch (e) { + } catch { return false; } diff --git a/packages/util-crypto/src/signature/verify.ts b/packages/util-crypto/src/signature/verify.ts index a21665b28..4b9d27c29 100644 --- a/packages/util-crypto/src/signature/verify.ts +++ b/packages/util-crypto/src/signature/verify.ts @@ -46,7 +46,7 @@ function verifyDetect (result: VerifyResult, { message, publicKey, signature }: return true; } - } catch (error) { + } catch { // do nothing, result.isValid still set to false } @@ -74,7 +74,7 @@ function verifyMultisig (result: VerifyResult, { message, publicKey, signature } }, sr25519: () => sr25519Verify(message, signature.subarray(1), publicKey) }[type](); - } catch (error) { + } catch { // ignore, result.isValid still set to false } diff --git a/packages/util/src/is/jsonObject.ts b/packages/util/src/is/jsonObject.ts index a4a0f3c77..fe41f2f7b 100644 --- a/packages/util/src/is/jsonObject.ts +++ b/packages/util/src/is/jsonObject.ts @@ -41,7 +41,7 @@ export function isJsonObject (value: unknown): value is ObjectIndexed { const obj = JSON.parse(str) as unknown; return typeof obj === 'object' && obj !== null; - } catch (e) { + } catch { return false; } } diff --git a/packages/util/src/versionDetect.ts b/packages/util/src/versionDetect.ts index 2871b489e..c7c4859e2 100644 --- a/packages/util/src/versionDetect.ts +++ b/packages/util/src/versionDetect.ts @@ -92,7 +92,7 @@ function getPath (infoPath?: string, pathOrFn?: FnString | string | false | null } else if (isFunction(pathOrFn)) { try { return pathOrFn() || ''; - } catch (error) { + } catch { return ''; } } diff --git a/packages/x-textdecoder/src/fallback.ts b/packages/x-textdecoder/src/fallback.ts index db5843662..844fa35d4 100644 --- a/packages/x-textdecoder/src/fallback.ts +++ b/packages/x-textdecoder/src/fallback.ts @@ -3,7 +3,7 @@ // This is very limited, only handling Ascii values export class TextDecoder { - // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-useless-constructor + // eslint-disable-next-line no-useless-constructor constructor (_?: 'utf-8' | 'utf8') { // nothing } diff --git a/tsconfig.base.json b/tsconfig.base.json index 6c75cdb39..54dcb05cc 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -29,7 +29,6 @@ "@polkadot/x-textdecoder": ["x-textdecoder/src/browser.ts"], "@polkadot/x-textencoder": ["x-textencoder/src/browser.ts"], "@polkadot/x-ws": ["x-ws/src/browser.ts"] - }, - "skipLibCheck": true + } } } diff --git a/yarn.lock b/yarn.lock index f3a08f64d..f6618ac0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -314,10 +314,10 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.2.0": - version: 1.2.0 - resolution: "@noble/hashes@npm:1.2.0" - checksum: 8ca080ce557b8f40fb2f78d3aedffd95825a415ac8e13d7ffe3643f8626a8c2d99a3e5975b555027ac24316d8b3c02a35b8358567c0c23af681e6573602aa434 +"@noble/hashes@npm:1.3.0": + version: 1.3.0 + resolution: "@noble/hashes@npm:1.3.0" + checksum: d7ddb6d7c60f1ce1f87facbbef5b724cdea536fc9e7f59ae96e0fc9de96c8f1a2ae2bdedbce10f7dcc621338dfef8533daa73c873f2b5c87fa1a4e05a95c2e2e languageName: node linkType: hard @@ -486,34 +486,34 @@ __metadata: languageName: node linkType: hard -"@polkadot/dev-test@npm:^0.72.9": - version: 0.72.9 - resolution: "@polkadot/dev-test@npm:0.72.9" +"@polkadot/dev-test@npm:^0.72.15": + version: 0.72.15 + resolution: "@polkadot/dev-test@npm:0.72.15" dependencies: jsdom: ^21.1.1 tslib: ^2.5.0 - checksum: 8bbd4d5417cdc6ed1ca65af5bc8ec5ff6b26f172e02392cf627efc5093a49e9b6cb58f534fed9c8a997d07d69f1173b382f80210ff0bd4cfb8cbc9306e78180d + checksum: 827bc33d30dd305cc4e43f3e87aa8aad66d928d5692d9ec2df6f4490ee955cec7780a4e06d70631c7626f81f960b591e5bcd208e144cc8ecb7f60853a8878343 languageName: node linkType: hard -"@polkadot/dev-ts@npm:^0.72.9": - version: 0.72.9 - resolution: "@polkadot/dev-ts@npm:0.72.9" +"@polkadot/dev-ts@npm:^0.72.15": + version: 0.72.15 + resolution: "@polkadot/dev-ts@npm:0.72.15" dependencies: json5: ^2.2.3 tslib: ^2.5.0 typescript: ^5.0.2 - checksum: 40756eb32e7e72bd16a1d009ac9e11a0fe513df696ff90552af2ac2cea81d60b084015300d39e85e3006678533779ac03b174623f39f745a1b767cf08167ee49 + checksum: 9ac0a59b3d7790ee747e6575e2c83a1c97c0aca9573a22c0423c3fdf33f2b61caf03561fe011756deb86a759540826cbbac718bc192298f22149479604bc5b54 languageName: node linkType: hard -"@polkadot/dev@npm:^0.72.9": - version: 0.72.9 - resolution: "@polkadot/dev@npm:0.72.9" +"@polkadot/dev@npm:^0.72.15": + version: 0.72.15 + resolution: "@polkadot/dev@npm:0.72.15" dependencies: "@eslint/js": ^8.36.0 - "@polkadot/dev-test": ^0.72.9 - "@polkadot/dev-ts": ^0.72.9 + "@polkadot/dev-test": ^0.72.15 + "@polkadot/dev-ts": ^0.72.15 "@rollup/plugin-alias": ^4.0.3 "@rollup/plugin-commonjs": ^24.0.1 "@rollup/plugin-dynamic-import-vars": ^2.0.3 @@ -547,7 +547,7 @@ __metadata: typescript: ^5.0.2 webpack: ^5.76.2 webpack-cli: ^5.0.1 - webpack-dev-server: ^4.12.0 + webpack-dev-server: ^4.13.0 webpack-merge: ^5.8.0 webpack-subresource-integrity: ^5.2.0-rc.1 yargs: ^17.7.1 @@ -575,7 +575,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: da6e188058e31d8eb11e8547a4e75ae391b6620ce102f9c640c3acf70173c0d8b9f1e5ee0028858e37600575500d753436b5fd583493a14bedabb27f258f692d + checksum: 03ea1b1b886783a2cdaf978c8e51b2ef6f75ddd7e91b4d72dffc2d0efbf7f5c15ed9bb63fc331bbef93ff9df9bb280a3b74c5f1030ce7c6e3dd94be613c270ed languageName: node linkType: hard @@ -635,7 +635,7 @@ __metadata: version: 0.0.0-use.local resolution: "@polkadot/util-crypto@workspace:packages/util-crypto" dependencies: - "@noble/hashes": 1.2.0 + "@noble/hashes": 1.3.0 "@noble/secp256k1": 1.7.1 "@polkadot/networks": 11.0.3-7-x "@polkadot/util": 11.0.3-7-x @@ -7726,7 +7726,7 @@ fsevents@~2.3.2: version: 0.0.0-use.local resolution: "root-workspace-0b6124@workspace:." dependencies: - "@polkadot/dev": ^0.72.9 + "@polkadot/dev": ^0.72.15 "@types/node": ^18.15.3 languageName: unknown linkType: soft @@ -9120,9 +9120,9 @@ fsevents@~2.3.2: languageName: node linkType: hard -"webpack-dev-server@npm:^4.12.0": - version: 4.12.0 - resolution: "webpack-dev-server@npm:4.12.0" +"webpack-dev-server@npm:^4.13.0": + version: 4.13.0 + resolution: "webpack-dev-server@npm:4.13.0" dependencies: "@types/bonjour": ^3.5.9 "@types/connect-history-api-fallback": ^1.3.5 @@ -9161,7 +9161,7 @@ fsevents@~2.3.2: optional: true bin: webpack-dev-server: bin/webpack-dev-server.js - checksum: 3e33acb774457ee787038d66c12e04c3e4a9f91bbff7ca143083e4ac1937b1615a1b9e7387ec623df8ebc36f56b3c34742578c09f665fe811b6e38d2e8222a94 + checksum: 7546dd3b5a05f886209caf3c06265c717dea292e5a1a8e392bb8f1c9c58c7f87cc03daa0b92fa6eb56812c8c88304044bef923642e18c54b0a17ea233c02fdf4 languageName: node linkType: hard