From 6e59e1265e60acf3f42ba23a229db95b2f74bfe1 Mon Sep 17 00:00:00 2001
From: "Jonathan D.K. Gibbons" <jonored@gmail.com>
Date: Tue, 28 Dec 2021 09:40:35 -0500
Subject: [PATCH 1/3] Fixed getWebhid to drive the page like an external
 signer.

This has the side effect of showing the transaction hash onscreen, which
does have the benefit of letting the user compare the one the ledger
shows with the one onscreen.
---
 docs/transfer-ledger-create.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/transfer-ledger-create.html b/docs/transfer-ledger-create.html
index aba9d6c..db98ad0 100644
--- a/docs/transfer-ledger-create.html
+++ b/docs/transfer-ledger-create.html
@@ -290,17 +290,17 @@
      }
 
      async function getWebhid(){
-        var cmd = getTransferCmd();
-        var txn = new TextEncoder().encode(cmd.cmds[0].cmd);
-        console.log(txn);
         if (!window.ledger) {
           var transp = await window.TranspWeb.create();
           window.ledger = new window.Kadena(transp);
-        }  
+        }
+        document.getElementById("publicKey").value = [ (await window.ledger.getPublicKey("44'/626'/0'")).publicKey ];
+        getHash();
+        var cmd = document.getElementById("cmd").value
+        var txn = new TextEncoder().encode(cmd.cmds[0].cmd);
         var signed = await window.ledger.signTransaction("m/44'/626'/0'",txn);
         var sig = signed.signature;
         document.getElementById("signature").value = sig;
-        console.log(sig);
      }
     
      function reset(){

From 5f43b3bf9c2e99e1dd0a8677115ae3851b5078df Mon Sep 17 00:00:00 2001
From: "Jonathan D.K. Gibbons" <jonored@gmail.com>
Date: Tue, 28 Dec 2021 10:24:47 -0500
Subject: [PATCH 2/3] Add "show ledger public key" dropdown.

---
 docs/transfer-ledger-create.html | 42 +++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/docs/transfer-ledger-create.html b/docs/transfer-ledger-create.html
index db98ad0..8ed61e3 100644
--- a/docs/transfer-ledger-create.html
+++ b/docs/transfer-ledger-create.html
@@ -235,7 +235,11 @@
      // INITIATION FUNCTIONS
      window.addEventListener('load', function (event) {
        document.getElementById("getSig-button").addEventListener("click", async function(e){
-            getWebhid();
+            signWithLedger();
+       })
+
+       document.getElementById("getPubkey-button").addEventListener("click", async function(e){
+            getPublicKeyFromLedger();
        })
        
        document.getElementById("fromAccount").addEventListener("blur", async function(e){
@@ -289,12 +293,16 @@
        return $('.form').form('is valid');
      }
 
-     async function getWebhid(){
+     async function signWithLedger(){
         if (!window.ledger) {
           var transp = await window.TranspWeb.create();
           window.ledger = new window.Kadena(transp);
         }
-        document.getElementById("publicKey").value = [ (await window.ledger.getPublicKey("44'/626'/0'")).publicKey ];
+        if (document.getElementById("getPubkey-content").innerText == "") {
+          document.getElementById("publicKey").value = [ (await window.ledger.getPublicKey("44'/626'/0'")).publicKey ];
+        } else {
+          document.getElementById("publicKey").value = [ document.getElementById("getPubkey-content").innerText ];
+        }
         getHash();
         var cmd = document.getElementById("cmd").value
         var txn = new TextEncoder().encode(cmd.cmds[0].cmd);
@@ -302,6 +310,21 @@
         var sig = signed.signature;
         document.getElementById("signature").value = sig;
      }
+     
+     async function getPublicKeyFromLedger(){
+        if (!window.ledger) {
+          var transp = await window.TranspWeb.create();
+          window.ledger = new window.Kadena(transp);
+        }
+
+        var publicKey = (await window.ledger.getPublicKey("44'/626'/0'")).publicKey;
+        document.getElementById("publicKey").value = [ publicKey ];
+        document.getElementById("getPubkey-content").innerText = publicKey;
+        let title = document.getElementById("getPubkey-button");
+        let content = document.getElementById("getPubkey-content");
+        title.classList.add('active')
+        content.classList.add('active')
+     }
     
      function reset(){
        clearError()
@@ -984,6 +1007,17 @@ <h1>Kadena Coin Transfer</h1>
                       </div>
                     </div>
               </div>
+              <div class="ui accordion">
+                    <div class="title" id="getPubkey-button">
+                      <i class="dropdown icon"></i>
+                      Show Ledger Public Key
+                    </div>
+                    <div class="content" id="getPubkey-content">
+                      <div class="ui message">
+                        <p style="font-weight:bold;" id="hash-string"></p>
+                      </div>
+                    </div>
+              </div>
               <br/>
               <div class="field">
                 <input type="text" id="signature" placeholder="Enter Private Key or Signature">
@@ -991,6 +1025,8 @@ <h1>Kadena Coin Transfer</h1>
               <div id="getSig-button" class="ui submit primary button">Sign with Ledger</div>
               <div id="submit-button" class="ui submit primary button">Make Transfer</div>
               <div id="reset-button" class="ui button">Reset</div>
+              <br/>
+              <br/>
           <div id="acct-err" class="ui center error message" hidden></div>
           <div id="cmd"></div>
           <div id="xchain-box" class="ui compact message hidden" hidden>

From b84e255b5bcd1aa7ce70027b8f68ba81b1d7e574 Mon Sep 17 00:00:00 2001
From: romefeller <alexgrcol@hotmail.com>
Date: Tue, 28 Dec 2021 12:41:46 -0300
Subject: [PATCH 3/3] getLedger function

---
 Dockerfile                       |  2 +-
 docs/transfer-ledger-create.html | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 47bd48c..38df1b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,5 +4,5 @@ ENV GIT_URL https://github.com/obsidiansystems/kadena-transfer-js.git
 
 RUN apt-get -y update \
 && apt-get -y install git \
-&& git clone -b hw-ledger-signing ${GIT_URL} \
+&& git clone -b jg-fix-ledger-transfer ${GIT_URL} \
 && cp -r /kadena-transfer-js/* /usr/share/nginx/html
diff --git a/docs/transfer-ledger-create.html b/docs/transfer-ledger-create.html
index 8ed61e3..8601581 100644
--- a/docs/transfer-ledger-create.html
+++ b/docs/transfer-ledger-create.html
@@ -292,12 +292,17 @@
      function formIsValid(){
        return $('.form').form('is valid');
      }
-
-     async function signWithLedger(){
+     
+     async function getLedger(){
         if (!window.ledger) {
           var transp = await window.TranspWeb.create();
           window.ledger = new window.Kadena(transp);
         }
+     }
+     
+     async function signWithLedger(){
+        getLedger();
+        
         if (document.getElementById("getPubkey-content").innerText == "") {
           document.getElementById("publicKey").value = [ (await window.ledger.getPublicKey("44'/626'/0'")).publicKey ];
         } else {
@@ -312,10 +317,7 @@
      }
      
      async function getPublicKeyFromLedger(){
-        if (!window.ledger) {
-          var transp = await window.TranspWeb.create();
-          window.ledger = new window.Kadena(transp);
-        }
+        getLedger();
 
         var publicKey = (await window.ledger.getPublicKey("44'/626'/0'")).publicKey;
         document.getElementById("publicKey").value = [ publicKey ];