fix: external cryptstore implementation Closes #18

dashhive · Jun 21, 2023 · 143d49b · 143d49b
1 parent 65f1e63
commit 143d49b
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 415 deletions.
diff --git a/CryptStore.js b/CryptStore.js
diff --git a/components/dialogs/encrypt.js b/components/dialogs/encrypt.js
@@ -6,11 +6,10 @@ import {
   getStakeRows,
 } from '../../lib/ui.js'
 import {
+  isStoreEncrypted,
   getStoredKeys,
   initEncryptedStore,
   encryptKeys,
-  store,
-  ENCRYPT_IV,
 } from '../../lib/storage.js'
 // import {
 //   // Secp256k1,
@@ -37,9 +36,7 @@ let encryptedStore
 let passphrase
 
 export async function setupEncryptDialog(el, state = {}) {
-  const isStoreEncrypted = !!(await store.getItem(`${ENCRYPT_IV}_iv`))
-
-  let cryptDirection = isStoreEncrypted ? 'decrypt' : 'encrypt'
+  let cryptDirection = isStoreEncrypted() ? 'decrypt' : 'encrypt'
   let capCryptDir = `${capitalizeFirstLetter(cryptDirection)}`
   let title = `${capCryptDir} Wallet`
 
@@ -189,7 +186,7 @@ export async function setupEncryptDialog(el, state = {}) {
 
       trigger("set:pass", passphrase);
 
-      if (!isStoreEncrypted || decryptSuccess) {
+      if (!isStoreEncrypted() || decryptSuccess) {
         await encryptKeys(storedKeys, passphrase)
 
         let { storedKeys: decryptedKeys } = await getStoredKeys(passphrase)
@@ -213,7 +210,7 @@ export async function setupEncryptDialog(el, state = {}) {
         storedKeys,
         encryptedStore,
         decryptedStoredKeys,
-        isStoreEncrypted,
+        isStoreEncrypted: isStoreEncrypted(),
         dl: decryptedStoredKeys.length,
         el: storedKeys.length,
       })

diff --git a/components/forms/backup.js b/components/forms/backup.js
@@ -49,7 +49,7 @@ export function setupBackupButton(el, state = {}) {
     }
 
     if (
-      !isStoreEncrypted || (
+      !isStoreEncrypted() || (
         state.passphrase ||
         isDecryptedPhraseOrWif(state.phraseOrWif)
       )
@@ -71,7 +71,7 @@ export function setupBackupButton(el, state = {}) {
     // console.log(`${state.name} button handleSubmit`, event)
 
     if (
-      isStoreEncrypted && (
+      isStoreEncrypted() && (
         !state.passphrase ||
         !isDecryptedPhraseOrWif(state.phraseOrWif)
       )

diff --git a/components/forms/wallet.js b/components/forms/wallet.js
@@ -49,7 +49,7 @@ export function setupWalletButton(el, state = {}) {
     }
 
     if (
-      !isStoreEncrypted || (
+      !isStoreEncrypted() || (
         state.passphrase ||
         isDecryptedPhraseOrWif(state.phraseOrWif)
       )
@@ -78,7 +78,7 @@ export function setupWalletButton(el, state = {}) {
 
     addWalletDialog.showModal()
     // if (
-    //   isStoreEncrypted && (
+    //   isStoreEncrypted() && (
     //     !state.passphrase ||
     //     !isDecryptedPhraseOrWif(state.phraseOrWif)
     //   )