From 4d09a939bd7579851a3ec9d48c5b56884960dde7 Mon Sep 17 00:00:00 2001 From: Tomi Date: Sun, 25 Apr 2021 00:08:51 -0400 Subject: [PATCH 1/3] Account.isValidPair method used in repo --- .../Validator/AddValidatorSigningKeysModal/index.tsx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx b/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx index 2fa0a3e9..9fc8913e 100644 --- a/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx +++ b/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx @@ -54,12 +54,8 @@ const AddValidatorSigningKeysModal: FC = ({close}) => { }; const checkPrivateSigningKey = (publicKey: string, privateKey: string): boolean => { - try { - const {accountNumberHex} = new Account(privateKey); - return accountNumberHex === publicKey; - } catch (error) { - return false; - } + const {accountNumberHex} = new Account(privateKey); + return Account.isValidPair(accountNumberHex, publicKey); }; const validationSchema = useMemo(() => { From 6c02f1ee87f910c2c4229fafc419fe5cb975a912 Mon Sep 17 00:00:00 2001 From: Tomi Date: Sun, 25 Apr 2021 08:43:15 -0400 Subject: [PATCH 2/3] correct implementation of Account.isValidPair method --- .../Validator/AddValidatorSigningKeysModal/index.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx b/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx index 9fc8913e..59d59778 100644 --- a/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx +++ b/src/renderer/containers/Validator/AddValidatorSigningKeysModal/index.tsx @@ -53,10 +53,8 @@ const AddValidatorSigningKeysModal: FC = ({close}) => { close(); }; - const checkPrivateSigningKey = (publicKey: string, privateKey: string): boolean => { - const {accountNumberHex} = new Account(privateKey); - return Account.isValidPair(accountNumberHex, publicKey); - }; + const checkPrivateSigningKey = (publicKey: string, privateKey: string): boolean => + Account.isValidPair(privateKey, publicKey); const validationSchema = useMemo(() => { return yup.object().shape({ From 7aee782a6813d7bfd542af1973e50868c5312f7b Mon Sep 17 00:00:00 2001 From: Tomi Date: Thu, 29 Apr 2021 15:29:57 -0400 Subject: [PATCH 3/3] Removed unnecessary use of 'as' keyword --- package-lock.json | 18 +++++++++--------- package.json | 2 +- src/renderer/dispatchers/banks.ts | 2 +- src/renderer/dispatchers/validators.ts | 2 +- src/renderer/hooks/useCleanSockets.tsx | 6 ++---- src/renderer/hooks/useCrawlSockets.tsx | 6 +++--- src/renderer/hooks/useNetworkCleanFetcher.tsx | 4 ++-- src/renderer/hooks/useNetworkCrawlFetcher.tsx | 4 ++-- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5af1d689..3d1d9c7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "thenewboston", - "version": "1.0.0-alpha.44", + "version": "1.0.0-alpha.45", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "thenewboston", - "version": "1.0.0-alpha.44", + "version": "1.0.0-alpha.45", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -47,7 +47,7 @@ "resolve-url-loader": "^3.1.2", "semver": "7.3.2", "terser-webpack-plugin": "^4.2.3", - "thenewboston": "^1.1.0-alpha.3", + "thenewboston": "^1.1.0-alpha.4", "ts-pnp": "^1.2.0", "tweetnacl": "^1.0.3", "typeface-roboto": "^0.0.75", @@ -30340,9 +30340,9 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, "node_modules/thenewboston": { - "version": "1.1.0-alpha.3", - "resolved": "https://registry.npmjs.org/thenewboston/-/thenewboston-1.1.0-alpha.3.tgz", - "integrity": "sha512-Oe2nJu8iMlEsrV3vJriLBSI/hvyL+479DPcky+lClLx3+li6HPnS2H9TW9L1Rpjmgy6JMenle6JdE4dQdSWk1A==", + "version": "1.1.0-alpha.4", + "resolved": "https://registry.npmjs.org/thenewboston/-/thenewboston-1.1.0-alpha.4.tgz", + "integrity": "sha512-rn2C4iILodynVDTdA7ym17Ad5LmrQ1Ud20/tvCsb8qgK9H2PI11Gwqpk5sXoYqpJDEOwR5hTNaF+CtJdiB/YqQ==", "dependencies": { "@babel/runtime": "^7.13.9", "axios": "^0.21.0", @@ -58275,9 +58275,9 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=" }, "thenewboston": { - "version": "1.1.0-alpha.3", - "resolved": "https://registry.npmjs.org/thenewboston/-/thenewboston-1.1.0-alpha.3.tgz", - "integrity": "sha512-Oe2nJu8iMlEsrV3vJriLBSI/hvyL+479DPcky+lClLx3+li6HPnS2H9TW9L1Rpjmgy6JMenle6JdE4dQdSWk1A==", + "version": "1.1.0-alpha.4", + "resolved": "https://registry.npmjs.org/thenewboston/-/thenewboston-1.1.0-alpha.4.tgz", + "integrity": "sha512-rn2C4iILodynVDTdA7ym17Ad5LmrQ1Ud20/tvCsb8qgK9H2PI11Gwqpk5sXoYqpJDEOwR5hTNaF+CtJdiB/YqQ==", "requires": { "@babel/runtime": "^7.13.9", "axios": "^0.21.0", diff --git a/package.json b/package.json index 54f35f18..ac459100 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "resolve-url-loader": "^3.1.2", "semver": "7.3.2", "terser-webpack-plugin": "^4.2.3", - "thenewboston": "^1.1.0-alpha.3", + "thenewboston": "^1.1.0-alpha.4", "ts-pnp": "^1.2.0", "tweetnacl": "^1.0.3", "typeface-roboto": "^0.0.75", diff --git a/src/renderer/dispatchers/banks.ts b/src/renderer/dispatchers/banks.ts index 35534567..76fbe7a4 100644 --- a/src/renderer/dispatchers/banks.ts +++ b/src/renderer/dispatchers/banks.ts @@ -85,7 +85,7 @@ export const fetchBankConfig = (address: string) => async ( ): Promise<{address: string; data?: BankConfig; error?: any}> => { try { const rawData = await new Bank(address).getConfig(); - const data = sanitizePortFieldFromRawBankConfig(rawData as RawBankConfig); + const data = sanitizePortFieldFromRawBankConfig(rawData); if (data.node_type !== NodeType.bank) { const errorObject = {address, error: 'Node not a bank'}; diff --git a/src/renderer/dispatchers/validators.ts b/src/renderer/dispatchers/validators.ts index 6503c012..ee770613 100644 --- a/src/renderer/dispatchers/validators.ts +++ b/src/renderer/dispatchers/validators.ts @@ -60,7 +60,7 @@ export const fetchValidatorConfig = (address: string) => async ( const rawData = await validator.getConfig(); - const data = sanitizePortFieldFromRawValidatorConfig(rawData as RawValidatorConfig); + const data = sanitizePortFieldFromRawValidatorConfig(rawData); if (data.node_type !== NodeType.primaryValidator && data.node_type !== NodeType.confirmationValidator) { const errorObject = {address, error: 'Node not a validator'}; diff --git a/src/renderer/hooks/useCleanSockets.tsx b/src/renderer/hooks/useCleanSockets.tsx index 4d1a0a06..4fa2d923 100644 --- a/src/renderer/hooks/useCleanSockets.tsx +++ b/src/renderer/hooks/useCleanSockets.tsx @@ -32,15 +32,13 @@ const useCleanSockets = (): void => { node = new Bank(address); const nodeConfig = await node.getConfig(); - if (nodeConfig.node_type === NodeType.confirmationValidator) { + if (nodeConfig.node_type !== NodeType.bank) { node = new ConfirmationValidator(address); } const inCleaning = cleanSocket.clean_status === CleanStatus.cleaning; - const data = inCleaning - ? ((await node.stopClean(socketNetworkId)) as NodeCleanStatusWithAddress) - : ((await node.startClean(socketNetworkId)) as NodeCleanStatusWithAddress); + const data = inCleaning ? await node.stopClean(socketNetworkId) : await node.startClean(socketNetworkId); dispatch( updateCleanProcess({ diff --git a/src/renderer/hooks/useCrawlSockets.tsx b/src/renderer/hooks/useCrawlSockets.tsx index e89ae1a9..c320e1f6 100644 --- a/src/renderer/hooks/useCrawlSockets.tsx +++ b/src/renderer/hooks/useCrawlSockets.tsx @@ -32,15 +32,15 @@ const useCrawlSockets = (): void => { node = new Bank(address); const nodeConfig = await node.getConfig(); - if (nodeConfig.node_type === NodeType.confirmationValidator) { + if (nodeConfig.node_type !== NodeType.bank) { node = new ConfirmationValidator(address); } const inCrawling = crawlSocket.crawl_status === CrawlStatus.crawling; const data = inCrawling - ? ((await node.stopCrawl(socketNetworkKeyPair)) as NodeCrawlStatusWithAddress) - : ((await node.startCrawl(socketNetworkKeyPair)) as NodeCrawlStatusWithAddress); + ? await node.stopCrawl(socketNetworkKeyPair) + : await node.startCrawl(socketNetworkKeyPair); dispatch( updateCrawlProcess({ diff --git a/src/renderer/hooks/useNetworkCleanFetcher.tsx b/src/renderer/hooks/useNetworkCleanFetcher.tsx index b90972a2..3592585e 100644 --- a/src/renderer/hooks/useNetworkCleanFetcher.tsx +++ b/src/renderer/hooks/useNetworkCleanFetcher.tsx @@ -53,11 +53,11 @@ const useNetworkCleanFetcher = ( node = new Bank(address); const nodeConfig = await node.getConfig(); - if (nodeConfig.node_type === NodeType.confirmationValidator) { + if (nodeConfig.node_type !== NodeType.bank) { node = new ConfirmationValidator(address); } - const data = (await node.getCleanStatus()) as NodeCleanStatusWithAddress; + const data = await node.getCleanStatus(); setCleanStatus(data.clean_status || CleanStatus.notCleaning); setCleanLastCompleted(data.clean_last_completed); diff --git a/src/renderer/hooks/useNetworkCrawlFetcher.tsx b/src/renderer/hooks/useNetworkCrawlFetcher.tsx index 5d3ad4d1..b403ffc0 100644 --- a/src/renderer/hooks/useNetworkCrawlFetcher.tsx +++ b/src/renderer/hooks/useNetworkCrawlFetcher.tsx @@ -53,11 +53,11 @@ const useNetworkCrawlFetcher = ( node = new Bank(address); const nodeConfig = await node.getConfig(); - if (nodeConfig.node_type === NodeType.confirmationValidator) { + if (nodeConfig.node_type !== NodeType.bank) { node = new ConfirmationValidator(address); } - const data = (await node.getCrawlStatus()) as NodeCrawlStatusWithAddress; + const data = await node.getCrawlStatus(); setCrawlStatus(data.crawl_status || CrawlStatus.notCrawling); setCrawlLastCompleted(data.crawl_last_completed);