From 0906372bfea438c06810dd27f7f98cb36f8e56d1 Mon Sep 17 00:00:00 2001
From: Raptor <blueraptor1001@gmail.com>
Date: Thu, 11 Feb 2021 05:54:07 -0800
Subject: [PATCH] Add personal_sign

---
 package.json                         |  1 +
 src/content/WalletProvider.ts        |  5 ++-
 src/popup/pages/API/PersonalSign.vue | 55 ++++++++++++++++++++++------
 src/services/APIService.js           |  6 +--
 4 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index f66d98e..86e8b71 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "bignumber.js": "^9.0.0",
     "clean-webpack-plugin": "^3.0.0",
     "copy-webpack-plugin": "^6.0.0",
+    "elliptic": "^6.5.4",
     "ethjs-util": "^0.1.6",
     "file-loader": "^6.0.0",
     "file-saver": "^2.0.2",
diff --git a/src/content/WalletProvider.ts b/src/content/WalletProvider.ts
index 8c29f3a..119dcac 100644
--- a/src/content/WalletProvider.ts
+++ b/src/content/WalletProvider.ts
@@ -66,13 +66,14 @@ class WalletProvider {
       }
     });
   }
-  sign(data: string) {
+  sign(msgData: string | Uint8Array, prefixMsg = "Ethereum Signed Message") {
     return new Promise(async (resolve, reject) => {
       try {
         const res = await sendAsyncMessageToContentScript({
           type: THIRDPARTY_PERSONAL_SIGN_REQUEST,
           payload: {
-            data,
+            msgData,
+            prefixMsg,
           },
         });
         if (res.rejected) {
diff --git a/src/popup/pages/API/PersonalSign.vue b/src/popup/pages/API/PersonalSign.vue
index 93e60d7..4a404b2 100644
--- a/src/popup/pages/API/PersonalSign.vue
+++ b/src/popup/pages/API/PersonalSign.vue
@@ -12,7 +12,7 @@
       <div class="sign__address">{{ wallet.address }}</div>
       <span class="action_caption">Data</span>
       <div class="data_container">
-        {{ msgData }}
+        {{ getString(signData) }}
       </div>
       <div v-if="!loading">
         <div v-if="!wallet.isLedger" class="password-content">
@@ -76,8 +76,10 @@
 <script>
 import { decryptKeyStore } from "services/AccountService";
 import { mapState, mapGetters } from "vuex";
-import { sign } from "@harmony-js/crypto";
+import { joinSignature, hexZeroPad, keccak256 } from "@harmony-js/crypto";
 import _ from "lodash";
+import { strip0x } from "@harmony-js/utils";
+import elliptic from "elliptic";
 import {
   GET_WALLET_SERVICE_STATE,
   THIRDPARTY_PERSONAL_SIGN_CONNECT,
@@ -93,7 +95,7 @@ export default {
     host: "",
     password: "",
     hasError: false,
-    msgData: "",
+    signData: false,
     caption: LEDGER_CONFIRM_PREPARE,
     privateKey: null,
     wallet: {
@@ -109,15 +111,46 @@ export default {
     }),
   },
   methods: {
-    async personal_sign(msgData) {
+    getString(signData) {
+      const { msgData } = signData;
+      return typeof msgData === "string"
+        ? msgData
+        : Buffer.from(Object.values(msgData)).toString();
+    },
+    async personal_sign(signData) {
       try {
-        let signature;
-        signature = sign(msgData, this.privateKey);
+        const { msgData, prefixMsg } = signData;
+        const data =
+          typeof msgData === "string"
+            ? Buffer.from(msgData, "utf8")
+            : Buffer.from(Object.values(msgData));
+        const secp256k1 = elliptic.ec("secp256k1");
+        const prefix = Buffer.from(
+          `\u0019${prefixMsg}:\n${data.length.toString()}`,
+          "utf-8"
+        );
+        const msgHashHarmony = keccak256(Buffer.concat([prefix, data])).slice(
+          2
+        );
+
+        const keyPair = secp256k1.keyFromPrivate(
+          strip0x(this.privateKey),
+          "hex"
+        );
+
+        const signature = keyPair.sign(msgHashHarmony, { canonical: true });
+
+        const result = {
+          recoveryParam: signature.recoveryParam,
+          r: hexZeroPad("0x" + signature.r.toString(16), 32),
+          s: hexZeroPad("0x" + signature.s.toString(16), 32),
+          v: 27 + signature.recoveryParam,
+        };
 
         chrome.runtime.sendMessage({
           action: THIRDPARTY_PERSONAL_SIGN_SUCCESS_RESPONSE,
           payload: {
-            data: signature,
+            data: joinSignature(result),
           },
         });
       } catch (err) {
@@ -154,7 +187,7 @@ export default {
       this.privateKey = privateKey;
 
       this.$store.commit("loading", true);
-      await this.personal_sign(this.msgData);
+      await this.personal_sign(this.signData);
       this.$store.commit("loading", false);
     },
 
@@ -178,10 +211,10 @@ export default {
     chrome.runtime.sendMessage(
       { action: GET_WALLET_SERVICE_STATE },
       async ({ state } = {}) => {
-        if (state && state.msgData && state.session) {
+        if (state && state.signData && state.session) {
           try {
-            const { msgData, session } = state;
-            this.msgData = msgData;
+            const { signData, session } = state;
+            this.signData = signData;
             this.host = session.host;
             this.wallet = _.find(this.wallets.accounts, {
               address: session.account.address,
diff --git a/src/services/APIService.js b/src/services/APIService.js
index 88ce088..340cecf 100644
--- a/src/services/APIService.js
+++ b/src/services/APIService.js
@@ -144,7 +144,7 @@ class APIService {
   constructor() {
     this.params = null;
     this.txnInfo = null;
-    this.msgData = null;
+    this.signData = null;
     this.type = null;
     this.sender = null;
     this.host = "";
@@ -156,7 +156,7 @@ class APIService {
       type: this.type,
       host: this.host,
       txnInfo: this.txnInfo,
-      msgData: this.msgData,
+      signData: this.signData,
       params: this.params,
       session: this.activeSession,
     };
@@ -201,7 +201,7 @@ class APIService {
       const store = this.getVuexStore();
       this.sender = sender.tab.id;
       this.host = getHostNameFromTab(sender.tab);
-      this.msgData = payload.data;
+      this.signData = payload;
       const session = await this.getSession(this.host);
       if (session.exist) {
         const findAcc = _.find(store.wallets.accounts, {