Merge pull request #24 from aliascash/develop

Develop
aliascash · Mar 27, 2022 · 624a923 · 624a923
2 parents 2b82d66 + 263023c
commit 624a923
Show file tree

Hide file tree

Showing 15 changed files with 263 additions and 55 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,6 +1,8 @@
 # ALiWa - Alias Light Wallet Release Notes
 
 ## Changelog
+### 0.1.2
+Adding type native currency for sending & receiving
 ### 0.1.1
 MAC BUILD PATCH
 ### 0.1.0

diff --git a/confg package b/confg package
@@ -1,7 +1,7 @@
 --------fresh package.json---------
 {
   "name": "ALiWa",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "dynamiccreator",
   "description": "ALiWa - A light wallet for the Alias cryptocurrency.",
   "main": "main.js",

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>ALiWa v0.1.1 - Alias Light Wallet</title>
+    <title>ALiWa v0.1.2 - Alias Light Wallet</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="aliwa_current_site" content="null">
     <!-- You MUST include jQuery before Fomantic -->

diff --git a/inno-setup.iss b/inno-setup.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ALiWa"
-#define MyAppVersion "0.1.1"
+#define MyAppVersion "0.1.2"
 
 #define MyAppPublisher "Alias Team"
 #define MyAppURL "https://github.com/aliascash/aliwa"

diff --git a/ipc_communications.js b/ipc_communications.js
@@ -190,8 +190,8 @@ module.exports = function () {
         return list_result;
    });
 
-   ipcMain.handle('list_contact_addresses', async (event,page, order_field, direction, search) => {
-        var list_result= wallet.list_contact_addresses(page, order_field, direction, search);
+   ipcMain.handle('list_contact_addresses', async (event,page, order_field, direction, search,strict_label=false) => {
+        var list_result= wallet.list_contact_addresses(page, order_field, direction, search,strict_label);
         return list_result;
    });
 

diff --git a/logic/wallet.js b/logic/wallet.js
@@ -50,6 +50,9 @@ class aliwa_wallet{
        this.db_wallet=new db_wallet_r.db_wallet();
        const wallet_functions_r=require("./wallet_functions");
        this.wallet_functions=new wallet_functions_r.wallet_functions();
+
+     this.last_send_tx_hash=null;
+     this.last_send_tx_object=null;
     }
 
 
@@ -141,7 +144,8 @@ class aliwa_wallet{
         }  
 
         if(cnf.aliwa_server_address!=null && cnf.aliwa_server_address.includes(".onion")){
-            this.socket =  await io.connect(cnf.aliwa_server_address, { agent: agent });
+            this.socket =  await io.connect(cnf.aliwa_server_address, { agent: agent,
+            withCredentials: true,  extraHeaders: {"aliwa-server": "true"}});
         }    
 
 
@@ -170,14 +174,25 @@ class aliwa_wallet{
             var message = JSON.parse(result.message);
             if (message.result == undefined || message.result == null) {
                 this.gui_was_updated = "failed_send";
+                this.last_send_tx_hash=null;
+                this.last_send_tx_object=null;
                 return false;
             }
             if (message.result.length == 64) {    //only if result is a valid tx
 
-                //update self sent                                                   
-                this.db_wallet.update_self_sent_txs(message.result, result.data.inputs, result.data.outputs);
-                //update transactions
-
+                //update self sent
+                if(this.last_send_tx_hash!=result.data && this.last_send_tx_hash!=null){                   
+                    this.last_send_tx_hash=null;
+                    this.last_send_tx_object=null;
+
+                    this.gui_was_updated = "failed_send";
+                    return false;
+                }                             
+                this.db_wallet.update_self_sent_txs(message.result, this.last_send_tx_object.inputs, this.last_send_tx_object.outputs);
+                this.last_send_tx_hash=null;
+                this.last_send_tx_object=null;
+
+                //update address list                
                 var cnf = this.db_wallet.get_config_values();
                 var private_standard_address_list = this.db_wallet.get_wallet_addresses(0, 0, (cnf.used_pos.standard + 20));
                 var private_change_address_list = this.db_wallet.get_wallet_addresses(1, 0, (cnf.used_pos.change + 20));
@@ -187,6 +202,8 @@ class aliwa_wallet{
             } else {
                 console.error(message.error);
                 this.gui_was_updated = "failed_send";
+                this.last_send_tx_hash=null;
+                this.last_send_tx_object=null;
                 return message.error;
             }
 
@@ -582,7 +599,7 @@ class aliwa_wallet{
     }
 
 
-     list_contact_addresses(page, order_field, direction, search) { 
+     list_contact_addresses(page, order_field, direction, search,strict_label=false) { 
         // add / update standard contacts
 
 
@@ -600,12 +617,19 @@ class aliwa_wallet{
         } else {
             search=search.trim();
             var txs = this.db_wallet.get_contact_addresses();
-            var result = [];
-            var tx_array = txs.chain().find({'$or': [
+            var result = [];           
+            var tx_array=[];
+            if(strict_label){
+                tx_array = txs.chain().find({"label": {'$aeq': search}})
+                    .simplesort(order_field, {desc: direction}).data({forceClones: true, removeMeta: true});
+            }
+            else{
+                tx_array = txs.chain().find({'$or': [
                     {"pos": {'$aeq': (parseInt(search)-1)}},
                     {"label": {'$contains': search}},
                     {"address": {'$contains': search}}                    
                 ]}).simplesort(order_field, {desc: direction}).data({forceClones: true, removeMeta: true});
+            }
             var len = tx_array.length;
             var page_start = page * this.pagination_num;
             for (var i = page_start; i < page_start + this.pagination_num && i < len; i++) {
@@ -747,7 +771,10 @@ class aliwa_wallet{
 
 
     async send_transaction(hex,tx_object){
-        this.socket.emit("send_raw_tx",hex,tx_object);             
+        this.last_send_tx_hash= createHash('sha256').update(hex).digest().toString("hex");
+        this.last_send_tx_object=tx_object;
+        //console.log("send_raw_tx",hex,this.last_send_tx_hash);
+        this.socket.emit("send_raw_tx",hex,this.last_send_tx_hash);         
     }
 
     create_transaction(destinations,fee,utxo_result,fee_only) { 
@@ -757,7 +784,7 @@ class aliwa_wallet{
         var amount=new Big(0);
         for(var i=0;i<destinations.length;i++){
             amount=amount.plus(destinations[i].amount);
-            console.log("correct value ? :",(destinations[i].amount));
+            //console.log("correct value ? :",(destinations[i].amount));
         }
         if(fee==undefined){fee=this.const_fee;}
         amount=amount.plus(fee);

diff --git a/logic/wallet_functions.js b/logic/wallet_functions.js
@@ -64,7 +64,7 @@ class wallet_functions {
         for (var o = 0; o < tx_input_data.outputs.length; o++) {
             output_hex += int_toVarint_byte(Math.floor(new Big(tx_input_data.outputs[o].amount).times(100000000).toNumber()), 8); // Math.floor because of javascript adding some 0.000000000001 at the end after multiplying 
             output_hex += int_toVarint_byte(25, 1);// script length  
-            output_hex += "76a914" + bs58_2.decode(tx_input_data.outputs[o].destination_address).toString("hex").substr(2, 40) + "88ac";//output script            
+            output_hex += "76a914" + Buffer(bs58_2.decode(tx_input_data.outputs[o].destination_address)).toString("hex").substr(2, 40) + "88ac";//output script          
             //build narration if available
             if (tx_input_data.outputs[o].narration != undefined) {
 //                console.log("narration:\n");
@@ -162,4 +162,4 @@ class wallet_functions {
 
 }
 
-exports.wallet_functions = wallet_functions;
+exports.wallet_functions = wallet_functions;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ALiWa",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "author": "dynamiccreator",
   "description": "ALiWa - A light wallet for the Alias cryptocurrency.",
   "main": "main.js",

diff --git a/view_resources/css/custom.css b/view_resources/css/custom.css
@@ -93,7 +93,7 @@ html * {
     color: #db2828;
 }
 
-.aliwa_input_field,.aliwa_input_field_search,.aliwa_input_field_white,.aliwa_input_field_red{
+.aliwa_input_field,.aliwa_input_field_search,.aliwa_input_field_white,.aliwa_input_field_red,.aliwa_input_field_secondary{
     background: none !important;
     border:none !important;
     color:#f38320 !important;
@@ -104,11 +104,22 @@ html * {
     text-overflow: ellipsis !important;
 }
 
+.aliwa_input_field_secondary{
+    border-bottom: none !important;
+    color:#ccc !important;
+    padding: 0.5rem 0.5rem 0.0rem 0 !important;
+}
+
 .aliwa_input_field::placeholder,.aliwa_input_field_search::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
   color: #f38320 !important;
   opacity: 0.6 !important; /* Firefox */
 }
 
+.aliwa_input_field_secondary::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+  color: #ccc !important;
+  opacity: 0.6 !important; /* Firefox */
+}
+
 .aliwa_input_field_search{
      padding: 0.5rem 0.5rem 0.5rem 2rem !important;
 }

diff --git a/view_resources/html/templ_about.html b/view_resources/html/templ_about.html
@@ -2,7 +2,7 @@
     <div style="margin: auto;text-align: center;">             
         <div style="text-align: left">
             <div  style="font-size: 1.5rem;color:#fff;">Thanks for using the ALiWa Wallet!<br><br> 
-                <b>Version:</b>  v0.1.1  <br><br>
+                <b>Version:</b>  v0.1.2  <br><br>
                 <b>Blockheight: </b>  <span id="view_about_blockheight"></span> <br><br>
                 <b>Server Label: </b>  <br><span id="view_about_server_label" style="display: inline;overflow: hidden;text-overflow: ellipsis;max-width: 90%;"></span> <br><br>
                 <b>Server Address: </b> <br> <span id="view_about_server_address" style="display: inline-block;overflow: hidden;text-overflow: ellipsis;max-width: 90%;"></span> <br><br>

diff --git a/view_resources/html/templ_receive_payment.html b/view_resources/html/templ_receive_payment.html
@@ -30,12 +30,20 @@
             </div>
      <!--   <span class="aliwa_input_label_distance">Amount</span> <br> -->
             <div class="ui action input large fluid">
-                <input id="view_receive_payment_amount_input" type="text" value="" class="aliwa_input_field" placeholder="0.00000000"> 
+                <input id="view_receive_payment_amount_input" type="text" value="" class="aliwa_input_field" placeholder="0.00000000">               
                 <i id="view_receive_payment_amount_input_clear" class="times link icon white inverted large" style="margin-top: 0.5rem"></i>
+                <span style="color:#f38320;padding-top:0.7rem;padding-right: 0rem;">ALIAS</span>
+            </div>
+
+            <div class="ui action input large fluid">
+                <input id="view_receive_payment_value_input" type="text" value="" class="aliwa_input_field_secondary" placeholder="0.00000000"> 
+
+                <i id="view_receive_payment_value_input_clear" class="times link icon white inverted large" style="margin-top: 0.5rem"></i>
+                <span id="view_receive_payment_value_input_currency" style="color:#ccc;padding-top:0.7rem;padding-right: 1rem;">USD</span>
+
             </div>
 
-
-
+
  <div style="text-align: center;">
         <button id="view_receive_payment_copy_button" class="ui icon button alias_orange_button2 massive" style="margin-top: 2rem;">
             <i class="clone outline icon white"></i>&nbsp;Copy Payment

diff --git a/view_resources/html/templ_send.html b/view_resources/html/templ_send.html
@@ -49,14 +49,19 @@
                 <i id="view_send_input_amount_clear" class="times link icon white inverted large" style="margin-top: 0.5rem"></i>
             </div>
 
-            <span id="send_currency_value" style="color:#8a8c8e;font-size: 1.5rem;margin-top: 0.7rem;display: inline-block;font-family:aliwa_mono;">0.00</span> 
+            <!--<span id="send_currency_value" style="color:#8a8c8e;font-size: 1.5rem;margin-top: 0.7rem;display: inline-block;font-family:aliwa_mono;">0.00</span> -->
+
+            <div class="ui input large fluid">
+                <input id="send_currency_input_value" type="text" value="" class="aliwa_input_field_secondary" style= "font-family:aliwa_mono;" placeholder="0.00000000">
+                <i id="send_currency_input_value_clear" class="times link icon white inverted large" style="margin-top: 0.5rem"></i>
+            </div>
 
         </div>
 
         <div style="float: left;width: 9rem;">            
             <div style="float:left;margin-left: 0.5rem;">              
                 <span style="color: #f38320;font-size: 1.1rem;margin-top: 1.3rem;display: inline-block;">ALIAS</span> <br>
-                <span id="send_currency_label" style="color: #8a8c8e;font-size: 1.1rem;margin-top: 1.3rem;display: inline-block;">
+                <span id="send_currency_label" style="color: #ccc;font-size: 1.1rem;margin-top: 1.3rem;display: inline-block;">
 
                 <!-- <button class="ui icon button">
                    
@@ -100,7 +105,7 @@
             <div style="clear: both;"></div>
 
         <div style="margin: auto;text-align: center;margin-top:1rem;">                       
-            <button id="view_send_button_send_transaction" class="ui icon button alias_orange_button2 massive" style="margin-top:calc(100vh - 40rem);width:20rem;">
+            <button id="view_send_button_send_transaction" class="ui icon button alias_orange_button2 massive" style="margin-top:calc(100vh - 41rem);width:20rem;">
                 Send
             </button>
         </div>

diff --git a/view_resources/html/templ_start_up.html b/view_resources/html/templ_start_up.html
@@ -1,6 +1,6 @@
 <section id="view_startup" style="background: #382b3f;height:100%;width:100%;">
     <img src="view_resources/img/aliwa_logo_5_light.png" style="margin:auto;display: block;max-height: 20rem;max-width:50%;"> 
-    <div style="color: #fff;text-align: center;margin-top:0.5rem;" class="ui text">v0.1.1</div>
+    <div style="color: #fff;text-align: center;margin-top:0.5rem;" class="ui text">v0.1.2</div>
     <div style="color: #fff;text-align: center;margin-top:0.5rem;" class="ui text">@2021 by dynamiccreator</div>