-added address type prefixes

Author: matt-o-how

electron-ui/cc_wallet/cc_wallet.html

@@ -152,7 +152,7 @@ <h4>Colour Info</h4>
             </div>
               <div class="wallet-address">
                 <h4>Send Coloured Coins</h4>
-                <p>Receiver Address:</p>
+                <p>Recipient Address:</p>
               <div class="input-group" style="padding-top:0px">
               <input type="text" class="form-control"  id="receiver_puzzle_hash" value="">
               </div>/

electron-ui/cc_wallet/cc_wallet_renderer.js

@@ -419,7 +419,7 @@ function get_colour_response(response) {
     wallet_id = response["wallet_id"]
     colour = response["colour"]
     if (wallet_id == g_wallet_id) {
-      colour_textfield.innerHTML = "Colour: " + colour;
+      colour_textfield.innerHTML = "Colour: colour_desc://" + colour;
     }
 }
 
@@ -487,6 +487,13 @@ send.addEventListener('click', () => {
 
     try {
         puzzle_hash = receiver_address.value;
+        if (puzzle_hash.includes("chia_addr") || puzzle_hash.includes("colour_desc")){
+          alert("Error: recipient address is not a coloured wallet address. Please enter a coloured wallet address")
+          return
+        }
+        if (puzzle_hash.substring(0,14) == "colour_addr://"){
+          puzzle_hash = puzzle_hash.substring(14)
+        }
         if (puzzle_hash.startsWith("0x") || puzzle_hash.startsWith("0X")) {
             puzzle_hash = puzzle_hash.substring(2);
         }
@@ -588,7 +595,8 @@ function get_innerpuzzlehash_response(response) {
     /*
     Called when response is received for get_new_puzzle_hash request
     */
-    puzzle_holder.value = response["innerpuz"];
+    puzzle_hash = "colour_addr://"
+    puzzle_holder.value = puzzle_hash.concat(response["innerpuz"]);
     QRCode.toCanvas(canvas, response["innerpuz"], function (error) {
     if (error) console.error(error)
     })

electron-ui/cc_wallet/create_cc_wallet.js

@@ -90,6 +90,9 @@ function create_wallet_input_colour() {
 
     try {
         colour = input_colour_text.value;
+        if (colour.substring(0,14) == "colour_desc://"){
+          colour = colour.substring(14)
+        }
         if (colour.startsWith("0x") || colour.startsWith("0X")) {
             colour = colour.substring(2);
         }

electron-ui/renderer.js

@@ -169,6 +169,12 @@ send.addEventListener('click', () => {
 
     try {
         puzzle_hash = receiver_address.value;
+        if (puzzle_hash.includes("colour")){
+          dialogs.alert("Error: Cannot send chia to coloured address. Please enter a chia address.")
+          return
+        } else if (puzzle_hash.substring(0, 12) == "chia_addr://") {
+          puzzle_hash = puzzle_hash.substring(12)
+        }
         if (puzzle_hash.startsWith("0x") || puzzle_hash.startsWith("0X")) {
             puzzle_hash = puzzle_hash.substring(2);
         }
@@ -215,7 +221,13 @@ farm_button.addEventListener('click', () => {
         dialogs.alert("Specify puzzle_hash for coinbase reward", ok => {
         })
         return
+    } else if (puzzle_hash.includes("colour")){
+      dialogs.alert("Please enter a chia address for coinbase reward.")
+      return
+    } else if (puzzle_hash.substring(0, 12) == "chia_addr://") {
+      puzzle_hash = puzzle_hash.substring(12)
     }
+
     data = {
         "puzzle_hash": puzzle_hash,
         "wallet_id": g_wallet_id,
@@ -295,7 +307,9 @@ function get_new_puzzlehash_response(response) {
     Called when response is received for get_new_puzzle_hash request
     */
     let puzzle_holder = document.querySelector("#puzzle_holder");
-    puzzle_holder.value = response["puzzlehash"];
+    puzzle_hash = "chia_addr://"
+    puzzle_hash = puzzle_hash.concat(response["puzzlehash"]);
+    puzzle_holder.value = puzzle_hash
     QRCode.toCanvas(canvas, response["puzzlehash"], function (error) {
     if (error) console.error(error)
     })

electron-ui/wallet-dark.html

@@ -114,7 +114,7 @@ <h3 id="pending_textfield">0 CH</h3>
                 </li>
               </ul>
               <div class="wallet-address">
-                <p>Receiver Address:</p>
+                <p>Recipient Address:</p>
               <div class="input-group" style="padding-top:0px">
               <input type="text" class="form-control"  id="receiver_puzzle_hash" value="">
               </div>/