From 4186f085c71577a37c026f4c39910b17bfa12f09 Mon Sep 17 00:00:00 2001
From: sairajzero <sairaj0630@gmail.com>
Date: Tue, 14 Jun 2022 21:29:22 +0530
Subject: [PATCH] Adding address formats

- Supported address formats: legacy, segwit, bech32
- View all address formats of key generation and retrieval
- View WIF of key generation
---
 index.html | 43 ++++++++++++++++++++++++++++++++++---------
 lib_btc.js | 25 ++++++++++++++++++-------
 2 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/index.html b/index.html
index abab194..e207d78 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <html>
 
 <head>
-    <title>test</title>
+    <title>BTC webWallet</title>
     <style>
         body {
             background-color: grey;
@@ -23,16 +23,20 @@
         <fieldset>
             <legend>generate-address</legend>
             <input type="button" value="generate" onclick="generateNew();">
-            Address: <input name="address" type="text" placeholder="Address" disabled />
-            PrivateKey: <input name="private" type="text" placeholder="Private-Key" disabled />
+            Address: <input name="address" type="text" placeholder="Address" disabled /><br />
+            SegwitAddress: <input name="segwit" type="text" placeholder="SegwitAddress" disabled /><br />
+            Bech32Address: <input name="bech32" type="text" placeholder="Bech32Address" disabled /><br />
+            PrivateKey: <input name="private" type="text" placeholder="Private-Key" disabled /><br />
         </fieldset>
     </form>
     <form id="retrieve-address">
         <fieldset>
             <legend>retrieve-address</legend>
             <input name="private" type="text" placeholder="Private-Key" />
-            <input type="button" value="retrieve" onclick="retrieveAddress();">
-            Address: <input name="address" type="text" placeholder="Address" disabled />
+            <input type="button" value="retrieve" onclick="retrieveAddress();"><br />
+            Address: <input name="address" type="text" placeholder="Address" disabled /><br />
+            SegwitAddress: <input name="segwit" type="text" placeholder="SegwitAddress" disabled /><br />
+            Bech32Address: <input name="bech32" type="text" placeholder="Bech32Address" disabled /><br />
         </fieldset>
     </form>
     <form id="send-tx">
@@ -40,8 +44,8 @@
             <legend>send-tx</legend>
             <input name="sender" type="text" placeholder="Sender" />
             <input name="receiver" type="text" placeholder="Receiver" />
-            <input name="amount" type="number" placeholder="Amount" />
-            <input name="fee" type="number" placeholder="fee" step="0.0001" />
+            <input name="amount" type="number" placeholder="Amount" step="0.01"/>
+            <input name="fee" type="number" placeholder="fee" step="0.000001" />
             <input type="button" value="send" onclick="sendTx();">
         </fieldset>
     </form>
@@ -71,13 +75,18 @@
     function generateNew() {
         let newKeys = btc_api.newKeys;
         let form = document.forms['generate-address'];
-        form['private'].value = newKeys.privkey;
+        form['private'].value = newKeys.wif;
         form['address'].value = newKeys.address;
+        form['segwit'].value = newKeys.segwitAddress;
+        form['bech32'].value = newKeys.bech32Address;
     }
 
     function retrieveAddress() {
         let form = document.forms['retrieve-address'];
-        form['address'].value = btc_api.address(form['private'].value);
+        let wif = form['private'].value;
+        form['address'].value = btc_api.address(wif);
+        form['segwit'].value = btc_api.segwitAddress(wif);
+        form['bech32'].value = btc_api.bech32Address(wif);
     }
 
     function checkBalance() {
@@ -154,6 +163,22 @@
             }).catch(error => reject(error))
         })
     }
+
+    function testGenerator() {
+        let n = btc_api.newKeys;
+        let a1 = btc_api.address(n.wif);
+        let b1 = btc_api.bech32Address(n.wif);
+        let c1 = btc_api.segwitAddress(n.wif);
+        let p1 = btc_api.pubkey(n.wif);
+        let a2 = btc_api.address(n.privkey);
+        let b2 = btc_api.bech32Address(n.privkey);
+        let c2 = btc_api.segwitAddress(n.privkey);
+        let p2 = btc_api.pubkey(n.privkey);
+        console.log(n.pubkey === p1 && p2 === p1);
+        console.log(n.address === a1 && a1 === a2);
+        console.log(n.segwitAddress === c1 && c2 === c1);
+        console.log(n.bech32Address === b1 && b1 === b2);
+    }
 </script>
 
 </html>
\ No newline at end of file
diff --git a/lib_btc.js b/lib_btc.js
index 1054c9c..2fa91ca 100644
--- a/lib_btc.js
+++ b/lib_btc.js
@@ -2549,7 +2549,7 @@
     })();
 })(typeof global !== "undefined" ? global : window);
 
-(function(EXPORTS) { //btc_api v1.0.0
+(function(EXPORTS) { //btc_api v1.0.1
     const btc_api = EXPORTS;
 
     const URL = "https://chain.so/api/v2/";
@@ -2557,12 +2557,9 @@
     const fetch_api = btc_api.fetch = function(api, post = null) {
         return new Promise((resolve, reject) => {
             let uri = URL + api;
-            console.debug(uri);
+            console.debug(uri, post);
             (post === null ? fetch(uri) : fetch(uri, {
                 method: "POST",
-                headers: {
-                    'Content-Type': 'application/json'
-                },
                 body: JSON.stringify(post)
             })).then(response => {
                 response.json()
@@ -2574,10 +2571,24 @@
 
     Object.defineProperties(btc_api, {
         newKeys: {
-            get: () => coinjs.newKeys()
+            get: () => {
+                let r = coinjs.newKeys();
+                r.segwitAddress = coinjs.segwitAddress(r.pubkey).address;
+                r.bech32Address = coinjs.bech32Address(r.pubkey).address;
+                return r;
+            }
+        },
+        pubkey: {
+            value: key => key.length === 64 ? coinjs.newPubkey(key) : coinjs.wif2pubkey(key).pubkey
         },
         address: {
-            value: key => coinjs.wif2address(key.length === 64 ? coinjs.privkey2wif(key) : key).address
+            value: key => coinjs.pubkey2address(btc_api.pubkey(key))
+        },
+        segwitAddress: {
+            value: key => coinjs.segwitAddress(btc_api.pubkey(key)).address
+        },
+        bech32Address: {
+            value: key => coinjs.bech32Address(btc_api.pubkey(key)).address
         }
     });
 
