From 9571e51b8a7e8b4f44a5b838010945123f9ab769 Mon Sep 17 00:00:00 2001
From: Evan <choue@google.com>
Date: Tue, 30 Apr 2019 06:25:18 +0000
Subject: [PATCH 1/5] Add username choice for sign buffer

---
 css/dialog.css       |  2 +-
 example/main.html    |  3 ++-
 example/main.js      |  2 +-
 html/dialog.html     |  8 ++++----
 js/background.js     | 17 +++++++++++------
 js/dialog.js         | 17 +++++++++++------
 js/steem_keychain.js |  3 ++-
 js/web_interface.js  |  6 +++---
 8 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/css/dialog.css b/css/dialog.css
index 48b5cc4..16827f7 100644
--- a/css/dialog.css
+++ b/css/dialog.css
@@ -96,7 +96,7 @@ h3 .small {
 
 #modal-body-msg .msg-data>div,
 #modal-body-msg .msg-data>h3,
-#transfer_acct_list {
+#acct_list {
     display: none;
 }
 
diff --git a/example/main.html b/example/main.html
index d454947..1af2ab3 100644
--- a/example/main.html
+++ b/example/main.html
@@ -57,6 +57,7 @@ <h3>Transfer</h3>
     <h3>Sign message</h3>
     <input type="text" placeholder="username" id="sign_username" />
     <input type="text" placeholder="message" id="sign_message" />
+    <input type="checkbox" id="sign_enforce" /><label for="sign_enforce">Enforce username</label>
     <select id="sign_method">
       <option>Memo</option>
       <option>Posting</option>
@@ -70,7 +71,7 @@ <h3>Add Account Authority</h3>
       <option>Posting</option>
       <option>Active</option>
     </select>
-    <input type="number" placeholder="1" id="addauth_weight" />
+    <input type="number" placeholder="1" id="addauth_weight" value=1 />
     <button id="send_addauth">Send</button>
     <h3>Remove Account Authority</h3>
     <input type="text" placeholder="username" id="removeauth_username" />
diff --git a/example/main.js b/example/main.js
index 7e0b306..3555101 100644
--- a/example/main.js
+++ b/example/main.js
@@ -68,7 +68,7 @@ $("#send_signature").click(function() {
     steem_keychain.requestSignBuffer($("#sign_username").val(), $("#sign_message").val(), $("#sign_method option:selected").text(), function(response) {
         console.log('main js response - sign');
         console.log(response);
-    });
+    }, $("#sign_enforce").is(":checked"));
 });
 
 $("#send_addauth").click(function() {
diff --git a/html/dialog.html b/html/dialog.html
index 0c09883..89f6003 100644
--- a/html/dialog.html
+++ b/html/dialog.html
@@ -31,14 +31,14 @@ <h3 class="dialog-message" id="dialog_message" style="display: none;"></h3>
         </div>
 
         <div id="modal-body-msg" style="display: none;">
-            <div id="transfer_acct_list" class="custom-select custom-select-main transfer">
-                <select id="select_transfer">
+            <div id="acct_list" class="custom-select custom-select-main transfer signBuffer">
+                <select id="select_account">
 						</select>
             </div>
 
             <div class="msg-data">
-                <h3 class="decode vote post custom delegation addAccountAuthority removeAccountAuthority broadcast signBuffer signedCall witnessVote powerUp powerDown">Account</h3>
-                <div class="decode vote post custom delegation addAccountAuthority removeAccountAuthority broadcast signBuffer signedCall witnessVote powerUp powerDown" id="username"></div>
+                <h3 class="decode vote post custom delegation addAccountAuthority removeAccountAuthority broadcast signedCall witnessVote powerUp powerDown">Account</h3>
+                <div class="decode vote post custom delegation addAccountAuthority removeAccountAuthority broadcast signedCall witnessVote powerUp powerDown" id="username"></div>
                 <h3 class="decode">Key</h3>
                 <div class="decode" id="wif"></div>
                 <h3 class="vote">Author</h3>
diff --git a/js/background.js b/js/background.js
index eb6a780..cabe70d 100644
--- a/js/background.js
+++ b/js/background.js
@@ -575,8 +575,12 @@ async function performTransaction(data, tab,no_confirm) {
                 }
                 break;
             case "signBuffer":
+                let signAcc = accounts.list.find(function(e) {
+                    return e.name == data.username;
+                });
+                const signKey = signAcc.keys[data.method.toLowerCase()];
                 try {
-                    let signed = window.signBuffer(data.message, key);
+                    let signed = window.signBuffer(data.message, signKey);
 
                     let message = {
                         command: "answerRequest",
@@ -711,8 +715,9 @@ function checkBeforeCreate(request, tab, domain) {
                     list: []
                 }) ? null : decryptToJson(items.accounts, mk);
                 let account = null;
-                if (request.type == "transfer") {
-                    let tr_accounts = accounts.list.filter(a => a.keys.hasOwnProperty("active"));
+                if (request.type == 'transfer' || request.type == 'signBuffer') {
+                    const keyType = request.type == 'transfer' ? 'active' : request.method.toLowerCase();
+                    let tr_accounts = accounts.list.filter(a => a.keys.hasOwnProperty(keyType));
                     const encode = (request.memo != undefined && request.memo.length > 0 && request.memo[0] == "#");
                     const enforce = request.enforce || encode;
                     if (encode)
@@ -723,18 +728,18 @@ function checkBeforeCreate(request, tab, domain) {
                     if (enforce && request.username && !tr_accounts.find(a => a.name == request.username)) {
                         createPopup(function() {
                             console.log("error1");
-                            sendErrors(tab, "user_cancel", "Request was canceled by the user.", "The current website is trying to send a transfer request to the Steem Keychain browser extension for account @" + request.username + " using the active key, which has not been added to the wallet.", request);
+                            sendErrors(tab, "user_cancel", "Request was canceled by the user.", `The current website is trying to send a request to the Steem Keychain browser extension for account @${request.username} using the ${keyType} key, which has not been added to the wallet.`, request);
                         });
                     } else if (encode && !account.keys.hasOwnProperty("memo")) {
                         createPopup(function() {
                             console.log("error2");
-                            sendErrors(tab, "user_cancel", "Request was canceled by the user.", "The current website is trying to send a request to the Steem Keychain browser extension for account @" + request.username + " using the memo key, which has not been added to the wallet.", request);
+                            sendErrors(tab, "user_cancel", "Request was canceled by the user.", `The current website is trying to send a request to the Steem Keychain browser extension for account @${request.username} using the memo key, which has not been added to the wallet.`, request);
                         });
                     }
                     else if (tr_accounts.length==0){
                       createPopup(function() {
                           console.log("error3");
-                        sendErrors(tab, "user_cancel", "Request was canceled by the user.", "The current website is trying to send a transfer request to the Steem Keychain browser extension for account @" + request.username + " using the active key, which has not been added to the wallet.", request);
+                        sendErrors(tab, "user_cancel", "Request was canceled by the user.", `The current website is trying to send a request to the Steem Keychain browser extension for account @${request.username} using the ${keyType} key, which has not been added to the wallet.`, request);
                       });
                     }
                     else {
diff --git a/js/dialog.js b/js/dialog.js
index c4b7fd3..52ee2c5 100644
--- a/js/dialog.js
+++ b/js/dialog.js
@@ -80,7 +80,7 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
             $("#dialog_message").text(msg.data.display_msg);
         }
 
-        if (type == "transfer") {
+        if (type == 'transfer' || type == 'signBuffer') {
             $('#modal-body-msg .msg-data').css('max-height', '200px');
             let accounts = msg.accounts;
             if (msg.data.username !== undefined) {
@@ -94,7 +94,7 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
             }
             for (acc of accounts) {
                 if (acc != undefined)
-                    $("#select_transfer").append("<option>" + acc.name + "</option>");
+                    $("#select_account").append("<option>" + acc.name + "</option>");
             }
             initiateCustomSelect();
         }
@@ -122,8 +122,13 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
                 $("#dialog_message").text('The website ' + msg.domain + ' would like to verify that you have access to the private ' + msg.data.method + ' key for the account: @' + msg.data.username);
                 break;
             case "signBuffer":
+                if (msg.data.enforce) {
+                    $("#username").show();
+                    $("#username").prev().show();
+                    $("#acct_list").hide();
+                }
                 $("#dialog_message").show();
-                $("#dialog_message").text('The website ' + msg.domain + ' would like you to sign a message using the ' + msg.data.method + ' key for the account: @' + msg.data.username);
+                $("#dialog_message").text('The website ' + msg.domain + ' would like you to sign a message using the ' + msg.data.method + ' key.');
                 const fullMessage = msg.data.message;
                 let truncatedMessage = fullMessage.substring(0, 200);
                 if (fullMessage.length > 200) {
@@ -185,7 +190,7 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
                 if (enforce) {
                     $("#username").show();
                     $("#username").prev().show();
-                    $("#transfer_acct_list").hide();
+                    $("#acct_list").hide();
                 }
                 $("#to").text('@' + msg.data.to);
                 $("#amount").text(msg.data.amount + " " + msg.data.currency);
@@ -254,8 +259,8 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
         // Closes the window and launch the transaction in background
         $("#proceed").click(function() {
             let data = msg.data;
-            if (data.type == "transfer" && !enforce)
-                data.username = $("#select_transfer option:selected").val();
+            if ((data.type == 'transfer' || data.type == 'signBuffer') && !enforce)
+                data.username = $("#select_account option:selected").val();
             chrome.runtime.sendMessage({
                 command: "acceptTransaction",
                 data: data,
diff --git a/js/steem_keychain.js b/js/steem_keychain.js
index e4af0a9..93be120 100644
--- a/js/steem_keychain.js
+++ b/js/steem_keychain.js
@@ -20,11 +20,12 @@ var steem_keychain = {
         this.dispatchCustomEvent("swRequest", request, callback);
     },
 
-    requestSignBuffer: function(account, message, key, callback) {
+    requestSignBuffer: function(account, message, key, callback, enforce = false) {
         var request = {
             type: "signBuffer",
             username: account,
             message: message,
+            enforce: enforce,
             method: key
         };
 
diff --git a/js/web_interface.js b/js/web_interface.js
index afb3ff3..7dbf329 100644
--- a/js/web_interface.js
+++ b/js/web_interface.js
@@ -66,7 +66,7 @@ function sendResponse(response) {
 function validate(req) {
     return req != null && req != undefined && req.type != undefined && req.type != null &&
         ((req.type == "decode" && isFilled(req.username) && isFilled(req.message) && req.message[0] == "#" && isFilledKey(req.method)) ||
-            (req.type == "signBuffer" && isFilled(req.username) && isFilled(req.message) && isFilledKey(req.method)) ||
+            (req.type == "signBuffer" && isFilled(req.message) && isFilledKey(req.method) && checkEnforceUsername(req)) ||
             (req.type == "vote" && isFilled(req.username) && isFilledWeight(req.weight) && isFilled(req.permlink) && isFilled(req.author)) ||
             (req.type == "post" && isFilled(req.username) && isFilled(req.body) && 
                 ( (isFilled(req.title) && isFilledOrEmpty(req.permlink) && !isFilled(req.parent_username) && !isFilled(req.parent_perm) && isFilled(req.json_metadata)) ||
@@ -79,7 +79,7 @@ function validate(req) {
             (req.type == "signedCall" && isFilled(req.method) && isFilled(req.params) && isFilled(req.typeWif)) ||
             (req.type == "witnessVote" && isFilled(req.username) && isFilled(req.witness) && isBoolean(req.vote)) ||
             (req.type == "delegation" && isFilled(req.username) && isFilled(req.delegatee) && isFilledAmtSP(req) && isFilledDelegationMethod(req.unit)) ||
-            (req.type == "transfer" && isFilledAmt(req.amount) && isFilled(req.to) && isFilledCurrency(req.currency) && hasTransferInfo(req)) ||
+            (req.type == "transfer" && isFilledAmt(req.amount) && isFilled(req.to) && isFilledCurrency(req.currency) && checkEnforceUsername(req)) ||
             (req.type == "sendToken" && isFilledAmt(req.amount) && isFilled(req.to) && isFilled(req.currency))||
             (req.type == "powerUp" && isFilled(req.username)&& isFilledAmt(req.steem) && isFilled(req.recipient))||
             (req.type == "powerDown" && isFilled(req.username)&& (isFilledAmt(req.steem_power)||req.steem_power=="0.000"))
@@ -88,7 +88,7 @@ function validate(req) {
 
 // Functions used to check the incoming data
 
-function hasTransferInfo(req) {
+function checkEnforceUsername(req) {
     if (req.enforce)
         return isFilled(req.username);
     else if (isFilled(req.memo) && req.memo[0] == "#")

From f172e5c57d27328d9e84f33d3f059314f041c712 Mon Sep 17 00:00:00 2001
From: Evan <choue@google.com>
Date: Tue, 30 Apr 2019 06:28:04 +0000
Subject: [PATCH 2/5] add readme comment

---
 README.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 01b1db3..d51f93c 100644
--- a/README.md
+++ b/README.md
@@ -74,9 +74,9 @@ Sites can request that the extension sign and broadcast a transfer operation for
 ```
 steem_keychain.requestTransfer(account_name, to_account, amount, memo, currency, function(response) {
 	console.log(response);
-},enforce);
+}, enforce);
 ```
-where `memo` will be encrypted using Memo key if it is starting by `#`, and `enforce` doesn't allow the user to chose which account will make the transfer but rather enforce `account_name`.
+where `memo` will be encrypted using Memo key if it is starting by `#`, and `enforce` doesn't allow the user to chose which account will make the transfer but rather enforce `account_name` (optional, defaults to false).
 
 ### Decode Memo / Verify Key
 
@@ -129,10 +129,12 @@ Sites can request that the extension sign messages:
 ```
 steem_keychain.requestSignBuffer(account_name, message, key_type, function(response) {
         console.log(response);
-});
+}, enforce);
 ```
 
-Where "message" is any string and "key_type" can be "Posting" or "Active". This is equivalent to
+Where "message" is any string and "key_type" can be "Posting" or "Active", and `enforce` doesn't allow the user to chose which account will make the request but rather enforce `account_name` (optional, defaults to false).
+
+. This is equivalent to
 
 ```Signature.signBufferSha256(hash.sha256(message), wif).toHex();```
 

From 958c18068e9c2ff49afefa8d67ce4102655c24c2 Mon Sep 17 00:00:00 2001
From: Evan <choue@google.com>
Date: Tue, 30 Apr 2019 06:34:13 +0000
Subject: [PATCH 3/5] do not show prompt again when selecting / e.g. user
 missing

---
 js/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/dialog.js b/js/dialog.js
index 52ee2c5..e5f67ae 100644
--- a/js/dialog.js
+++ b/js/dialog.js
@@ -105,7 +105,7 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
         $("#modal-content").css("align-items", "flex-start");
         const keyVerifyAction = msg.data.type == 'decode' || msg.data.type == 'signBuffer';
         console.log(msg.data.key);
-        if (msg.data.key!=="active"&&msg.data.type!="transfer") {
+        if (msg.data.key !== "active" && msg.data.type !== "transfer" && msg.data.username) {
             $("#keep_div").show();
             var prompt_msg = keyVerifyAction ? "Do not prompt again to verify keys for the @" + msg.data.username + " account on " + msg.domain :
                 "Do not prompt again to send " + msg.data.type + " transactions from the @" + msg.data.username + " account on " + msg.domain

From 0e787335a1b8e9243dadbabf9847ad808fd621c8 Mon Sep 17 00:00:00 2001
From: Evan <choue@google.com>
Date: Tue, 30 Apr 2019 06:39:10 +0000
Subject: [PATCH 4/5] disable noprompt for signbuffer

---
 js/dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/dialog.js b/js/dialog.js
index e5f67ae..c01e3ea 100644
--- a/js/dialog.js
+++ b/js/dialog.js
@@ -105,7 +105,7 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
         $("#modal-content").css("align-items", "flex-start");
         const keyVerifyAction = msg.data.type == 'decode' || msg.data.type == 'signBuffer';
         console.log(msg.data.key);
-        if (msg.data.key !== "active" && msg.data.type !== "transfer" && msg.data.username) {
+        if (msg.data.key !== 'active' && msg.data.type !== 'transfer' && msg.data.type !== 'signBuffer') {
             $("#keep_div").show();
             var prompt_msg = keyVerifyAction ? "Do not prompt again to verify keys for the @" + msg.data.username + " account on " + msg.domain :
                 "Do not prompt again to send " + msg.data.type + " transactions from the @" + msg.data.username + " account on " + msg.domain

From dfb25a24e31d340deede46d6eea11341592ef9be Mon Sep 17 00:00:00 2001
From: Evan <choue@google.com>
Date: Mon, 8 Jul 2019 14:22:11 +0000
Subject: [PATCH 5/5] remove enforce selection. Only enforce if the user is
 specified.

---
 README.md            | 2 +-
 example/main.html    | 1 -
 example/main.js      | 2 +-
 js/background.js     | 3 ++-
 js/dialog.js         | 4 ++--
 js/steem_keychain.js | 3 +--
 js/web_interface.js  | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index d51f93c..29b80bb 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ steem_keychain.requestSignBuffer(account_name, message, key_type, function(respo
 }, enforce);
 ```
 
-Where "message" is any string and "key_type" can be "Posting" or "Active", and `enforce` doesn't allow the user to chose which account will make the request but rather enforce `account_name` (optional, defaults to false).
+Where "message" is any string and "key_type" can be "Posting" or "Active", and "account_name" can be omitted optionally to allow the user to choose an account to sign the message with.
 
 . This is equivalent to
 
diff --git a/example/main.html b/example/main.html
index fad5a0b..bdb6d61 100644
--- a/example/main.html
+++ b/example/main.html
@@ -57,7 +57,6 @@ <h3>Transfer</h3>
     <h3>Sign message</h3>
     <input type="text" placeholder="username" id="sign_username" />
     <input type="text" placeholder="message" id="sign_message" />
-    <input type="checkbox" id="sign_enforce" /><label for="sign_enforce">Enforce username</label>
     <select id="sign_method">
       <option>Memo</option>
       <option>Posting</option>
diff --git a/example/main.js b/example/main.js
index 6d2cad4..e303a4b 100644
--- a/example/main.js
+++ b/example/main.js
@@ -68,7 +68,7 @@ $("#send_signature").click(function() {
     steem_keychain.requestSignBuffer($("#sign_username").val(), $("#sign_message").val(), $("#sign_method option:selected").text(), function(response) {
         console.log('main js response - sign');
         console.log(response);
-    }, $("#sign_enforce").is(":checked"));
+    });
 });
 
 $("#send_addauth").click(function() {
diff --git a/js/background.js b/js/background.js
index 163ffff..4565332 100644
--- a/js/background.js
+++ b/js/background.js
@@ -772,7 +772,8 @@ function checkBeforeCreate(request, tab, domain) {
                     const keyType = request.type == 'transfer' ? 'active' : request.method.toLowerCase();
                     let tr_accounts = accounts.list.filter(a => a.keys.hasOwnProperty(keyType));
                     const encode = (request.memo != undefined && request.memo.length > 0 && request.memo[0] == "#");
-                    const enforce = request.enforce || encode;
+                    const enforce = request.enforce || encode
+                        || (request.type == 'signBuffer' && request.username);
                     if (encode)
                         account = accounts.list.find(function(e) {
                             return e.name == request.username;
diff --git a/js/dialog.js b/js/dialog.js
index 5562d08..6878ea9 100644
--- a/js/dialog.js
+++ b/js/dialog.js
@@ -126,13 +126,13 @@ chrome.runtime.onMessage.addListener(function(msg, sender, sendResp) {
                 $("#dialog_message").text('The website ' + msg.domain + ' would like to verify that you have access to the private ' + msg.data.method + ' key for the account: @' + msg.data.username);
                 break;
             case "signBuffer":
-                if (msg.data.enforce) {
+                if (msg.data.username) {
                     $("#username").show();
                     $("#username").prev().show();
                     $("#acct_list").hide();
                 }
                 $("#dialog_message").show();
-                $("#dialog_message").text('The website ' + msg.domain + ' would like you to sign a message using the ' + msg.data.method + ' key.');
+                $("#dialog_message").text('The website ' + msg.domain + ' would like you to sign a message using the ' + msg.data.method + ' key' + (msg.data.username ? ' for the account: @' + msg.data.username : '') + '.');
                 const fullMessage = msg.data.message;
                 let truncatedMessage = fullMessage.substring(0, 200);
                 if (fullMessage.length > 200) {
diff --git a/js/steem_keychain.js b/js/steem_keychain.js
index cef7278..3e0be67 100644
--- a/js/steem_keychain.js
+++ b/js/steem_keychain.js
@@ -20,12 +20,11 @@ var steem_keychain = {
         this.dispatchCustomEvent("swRequest", request, callback);
     },
 
-    requestSignBuffer: function(account, message, key, callback, enforce = false) {
+    requestSignBuffer: function(account, message, key, callback) {
         var request = {
             type: "signBuffer",
             username: account,
             message: message,
-            enforce: enforce,
             method: key
         };
 
diff --git a/js/web_interface.js b/js/web_interface.js
index 0c50775..f51b418 100644
--- a/js/web_interface.js
+++ b/js/web_interface.js
@@ -66,7 +66,7 @@ function sendResponse(response) {
 function validate(req) {
     return req != null && req != undefined && req.type != undefined && req.type != null &&
         ((req.type == "decode" && isFilled(req.username) && isFilled(req.message) && req.message[0] == "#" && isFilledKey(req.method)) ||
-            (req.type == "signBuffer" && isFilled(req.message) && isFilledKey(req.method) && checkEnforceUsername(req)) ||
+            (req.type == "signBuffer" && isFilled(req.message) && isFilledKey(req.method)) ||
             (req.type == "vote" && isFilled(req.username) && isFilledWeight(req.weight) && isFilled(req.permlink) && isFilled(req.author)) ||
             (req.type == "post" && isFilled(req.username) && isFilled(req.body) &&
                 ( (isFilled(req.title) && isFilledOrEmpty(req.permlink) && !isFilled(req.parent_username) && isFilled(req.parent_perm) && isFilled(req.json_metadata)) ||