Merge pull request #42 from Beldex-Coin/feature-keys-to-import-wallet

Feature keys to import wallet

Author: sanada08

src-electron/main-process/modules/wallet-rpc.js

@@ -27,7 +27,8 @@ export class WalletRPC {
       password_hash: null,
       balance: null,
       unlocked_balance: null,
-      bnsRecords: []
+      bnsRecords: [],
+      view_only: false
     };
     this.isRPCSyncing = false;
     this.dirs = null;
@@ -303,6 +304,21 @@ export class WalletRPC {
         );
         break;
 
+      case "restore_wallet_with_keys":
+        // TODO: Decide if we want this for Beldex
+        this.restoreWalletWithKeys(
+          params.name,
+          params.password,
+          params.address,
+          params.viewkey,
+          params.spendkey,
+          params.refresh_type,
+          params.refresh_type == "date"
+            ? params.refresh_start_date
+            : params.refresh_start_height
+        );
+        break;
+
       case "import_wallet":
         this.importWallet(params.name, params.password, params.path);
         break;
@@ -505,7 +521,7 @@ export class WalletRPC {
             address: response.result.per_subaddress[0].address,
             balance: response.result.balance,
             unlocked_balance: response.result.unlocked_balance,
-            view_only: false,
+            view_only: this.wallet_state.view_only,
             load_balance: false
           }
         };
@@ -738,6 +754,73 @@ export class WalletRPC {
     });
   }
 
+  restoreWalletWithKeys(
+    filename,
+    password,
+    address,
+    viewkey,
+    spendkey,
+    refresh_type,
+    refresh_start_timestamp_or_height
+  ) {
+    if (refresh_type == "date") {
+      // Convert timestamp to 00:00 and move back a day
+      // Core code also moved back some amount of blocks
+      let timestamp = refresh_start_timestamp_or_height;
+      timestamp = timestamp - (timestamp % 86400000) - 86400000;
+
+      this.backend.daemon.timestampToHeight(timestamp).then(height => {
+        if (height === false) {
+          this.sendGateway("set_wallet_error", {
+            status: {
+              code: -1,
+              i18n: "notification.errors.invalidRestoreDate"
+            }
+          });
+        } else {
+          this.restoreWalletWithKeys(
+            filename,
+            password,
+            address,
+            viewkey,
+            spendkey,
+            "height",
+            height
+          );
+        }
+      });
+      return;
+    }
+
+    let restore_height = refresh_start_timestamp_or_height;
+
+    if (!Number.isInteger(restore_height)) {
+      restore_height = 0;
+    }
+    this.sendRPC("generate_from_keys", {
+      filename,
+      password,
+      address,
+      viewkey,
+      spendkey,
+      restore_height
+    }).then(data => {
+      if (data.hasOwnProperty("error")) {
+        this.sendGateway("set_wallet_error", { status: data.error });
+        return;
+      }
+
+      // store hash of the password so we can check against it later when requesting private keys, or for sending txs
+      this.wallet_state.password_hash = crypto
+        .pbkdf2Sync(password, this.auth[2], 1000, 64, "sha512")
+        .toString("hex");
+      this.wallet_state.name = filename;
+      this.wallet_state.open = true;
+
+      this.finalizeNewWallet(filename);
+    });
+  }
+
   importWallet(wallet_name, password, import_path) {
     // Reset the status error
     this.sendGateway("reset_wallet_error");
@@ -851,6 +934,12 @@ export class WalletRPC {
       };
       for (let n of data) {
         if (n.hasOwnProperty("error") || !n.hasOwnProperty("result")) {
+          if (n.params.key_type == "spend_key") {
+            if (n.error?.code == -29) {
+              wallet.info.view_only = true;
+              this.wallet_state.view_only = true;
+            }
+          }
           continue;
         }
         if (n.method == "get_address") {
@@ -865,6 +954,7 @@ export class WalletRPC {
           if (n.params.key_type == "spend_key") {
             if (/^0*$/.test(n.result.key)) {
               wallet.info.view_only = true;
+              this.wallet_state.view_only = true;
             }
           }
         }
@@ -930,6 +1020,17 @@ export class WalletRPC {
       // Check if we have a view only wallet by querying the spend key
       this.sendRPC("query_key", { key_type: "spend_key" }).then(data => {
         if (data.hasOwnProperty("error") || !data.hasOwnProperty("result")) {
+          if (data.params.key_type == "spend_key") {
+            if (data.error?.code == -29) {
+              // wallet.info.view_only = true;
+              this.wallet_state.view_only = true;
+              this.sendGateway("set_wallet_data", {
+                info: {
+                  view_only: true
+                }
+              });
+            }
+          }
           return;
         }
         if (/^0*$/.test(data.result.key)) {

src/assets/images/viewOnlyMode.svg

@@ -1054,7 +1054,6 @@ h1, h2, h3, h4, h5, h6, img, .q-list-header, .q-header, .q-menu .q-item-label, .
     background-color $beldex-lightgray
     margin-top 50px
     margin-bottom 20px
-    padding 20px 50px
     border-radius 20px
     box-shadow 0 6px 24px rgba(0, 0, 0, .2)
     overflow-y auto

src/css/app.styl

@@ -17,7 +17,11 @@
       <!-- <router-link to="/wallet/send"> -->
       <div :class="[this.routes === 'send' ? 'active' : '']">
         <!-- <q-btn class="large-btn send-btn" size="md" @click="router('send')"> -->
-        <q-btn class="large-btn send-btn" @click="router('send')">
+        <q-btn
+          class="large-btn send-btn"
+          :disable="view_only"
+          @click="router('send')"
+        >
           <!-- width="16"
             height="20" -->
           <svg
@@ -110,6 +114,7 @@ export default {
   },
   computed: mapState({
     info: state => state.gateway.wallet.info,
+    view_only: state => state.gateway.wallet.info.view_only,
     routes: state => state.gateway.router_path_rightpane
   }),
   data() {

src/layouts/wallet/rightPane.vue

@@ -66,50 +66,52 @@
         </div>
       </div>
 
-      <div class="col wallet ">
-        <h6 style="font-family: Poppins-Regular">
-          <span
-            class="ft-bold"
-            style="color: white; font-size: 16px; margin-left: 20px"
-            >{{ $t("strings.seedWords") }}</span
-          >
-          <span style="color: #00e509;font-size: 12px;">
-            - {{ $t("strings.saveSeedWarning") }}</span
-          >
-        </h6>
-      </div>
+      <template v-if="secret.mnemonic.length > 0">
+        <div class="col wallet ">
+          <h6 style="font-family: Poppins-Regular">
+            <span
+              class="ft-bold"
+              style="color: white; font-size: 16px; margin-left: 20px"
+              >{{ $t("strings.seedWords") }}</span
+            >
+            <span style="color: #00e509;font-size: 12px;">
+              - {{ $t("strings.saveSeedWarning") }}</span
+            >
+          </h6>
+        </div>
 
-      <div
-        class="row items-center"
-        style="
+        <div
+          class="row items-center"
+          style="
           border: 1px #484856 solid;
           border-radius: 12px;
           font-family: Poppins-Regular;
           padding: 10px 20px;
           margin-left: 20px;
 
         "
-      >
-        <div class="col" style="color: white; padding: 0px 10px 0px 0px">
-          {{ secret.mnemonic }}
-        </div>
-        <div class="q-item-side">
-          <q-btn
-            color="secondary"
-            size="md"
-            :label="this.$t('buttons.copy')"
-            icon-right="content_copy"
-            @click="copyPrivateKey('mnemonic', $event)"
-          >
-            <q-tooltip
-              anchor="center left"
-              self="center right"
-              :offset="[5, 10]"
-              >{{ $t("menuItems.copySeed") }}</q-tooltip
+        >
+          <div class="col" style="color: white; padding: 0px 10px 0px 0px">
+            {{ secret.mnemonic }}
+          </div>
+          <div class="q-item-side">
+            <q-btn
+              color="secondary"
+              size="md"
+              :label="this.$t('buttons.copy')"
+              icon-right="content_copy"
+              @click="copyPrivateKey('mnemonic', $event)"
             >
-          </q-btn>
+              <q-tooltip
+                anchor="center left"
+                self="center right"
+                :offset="[5, 10]"
+                >{{ $t("menuItems.copySeed") }}</q-tooltip
+              >
+            </q-btn>
+          </div>
         </div>
-      </div>
+      </template>
 
       <div style="margin-top: 18px; padding: 10px 20px">
         <template v-if="secret.view_key != secret.spend_key">