Merge pull request #21 from qvqc/master

cleaning up

README.md

@@ -1,4 +1,4 @@
-![](https://light.wownero.com/wowlight.png)
+![](https://raw.githubusercontent.com/wiki/qvqc/wowlite/images/wowlite.gif)
 
 Simple wrapper for `wownero-wallet-cli` as a GUI.
 
@@ -8,7 +8,6 @@ Simple wrapper for `wownero-wallet-cli` as a GUI.
 - 100% WOW
 - Safu™
 
-Download: [https://github.com/wownero/Wownero-Light-Wallet/releases](https://github.com/wownero/Wownero-Light-Wallet/releases)
 
 See `Install.md` for compilation instructions.
 

light_patch.diff

@@ -1,8 +1,8 @@
 diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
-index 94b116a89..86f8058a3 100644
+index c532b3764..6b3243de7 100644
 --- a/src/simplewallet/simplewallet.cpp
 +++ b/src/simplewallet/simplewallet.cpp
-@@ -3875,26 +3875,8 @@ bool simple_wallet::ask_wallet_create_if_needed()
+@@ -3875,23 +3875,10 @@ bool simple_wallet::ask_wallet_create_if_needed()
   */
  void simple_wallet::print_seed(const epee::wipeable_string &seed)
  {
@@ -10,10 +10,10 @@ index 94b116a89..86f8058a3 100644
 -    "Write them down and store them somewhere safe and secure. Please do not store them in "
 -    "your email or on file storage services outside of your immediate control.\n")) % (m_wallet->multisig() ? tr("string") : tr("25 words"));
 -  // don't log
--  int space_index = 0;
+   int space_index = 0;
--  size_t len  = seed.size();
+   size_t len  = seed.size();
--  for (const char *ptr = seed.data(); len--; ++ptr)
+   for (const char *ptr = seed.data(); len--; ++ptr)
--  {
+   {
 -    if (*ptr == ' ')
 -    {
 -      if (space_index == 15 || space_index == 7)
@@ -23,15 +23,10 @@ index 94b116a89..86f8058a3 100644
 -      ++space_index;
 -    }
 -    else
--      putchar(*ptr);
+       putchar(*ptr);
--  }
+   }
--  putchar('\n');
+   putchar('\n');
-+  success_msg_writer(true) << "**********************************************************************SEED\n";
+@@ -4639,40 +4626,9 @@ bool simple_wallet::try_connect_to_daemon(bool silent, uint32_t* version)
-+  seed.data();
-   fflush(stdout);
- }
- //----------------------------------------------------------------------------------------------------
-@@ -4639,40 +4621,9 @@ bool simple_wallet::try_connect_to_daemon(bool silent, uint32_t* version)
   */
  std::string simple_wallet::get_mnemonic_language()
  {
@@ -75,7 +70,7 @@ index 94b116a89..86f8058a3 100644
  }
  //----------------------------------------------------------------------------------------------------
  boost::optional<tools::password_container> simple_wallet::get_and_verify_password() const
-@@ -4777,11 +4728,9 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
+@@ -4777,11 +4733,9 @@ boost::optional<epee::wipeable_string> simple_wallet::new_wallet(const boost::pr
      "your wallet again (your wallet keys are NOT at risk in any case).\n")
    ;
  
@@ -90,8 +85,26 @@ index 94b116a89..86f8058a3 100644
  
    return password;
  }
+@@ -6618,17 +6572,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector<std::stri
+         {
+           prompt << tr("WARNING: this is a non default ring size, which may harm your privacy. Default is recommended.");
+         }
+-        prompt << ENDL << tr("Is this okay?");
+-        
+-        std::string accepted = input_line(prompt.str(), true);
+-        if (std::cin.eof())
+-          return false;
+-        if (!command_line::is_yes(accepted))
+-        {
+-          fail_msg_writer() << tr("transaction cancelled.");
+-
+-          return false;
+-        }
+     }
+ 
+     // actually commit the transactions
 diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
-index 9c08708e4..a4e3bc1f6 100644
+index c7135783c..2d94b6236 100644
 --- a/src/wallet/wallet2.cpp
 +++ b/src/wallet/wallet2.cpp
 @@ -1115,7 +1115,7 @@ wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):

package.json

@@ -1,9 +1,9 @@
 {
-    "name": "wowlight",
+    "name": "wowlite",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "__version": "bumping this should also bump LandingPage.vue (version checker)",
-    "author": "dsc <xmrdsc@protonmail.com>",
+    "author": "ride <ridethe@candy.surf >",
-    "description": "Wownero Light Wallet",
+    "description": "Wownero Lite Wallet",
     "license": "WTFPL",
     "main": "./dist/electron/main.js",
     "scripts": {
@@ -18,8 +18,8 @@
         "postinstall": ""
     },
     "build": {
-        "productName": "wowlight",
+        "productName": "wowlite",
-        "appId": "org.wownero.wowlight",
+        "appId": "org.wownero.wowlite",
         "directories": {
             "output": "build"
         },

src/index.ejs

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <title>wowlight</title>
+    <title>wowlite</title>
     <script>
         const {ipcRenderer} = require('electron');
     </script>

src/main/config.js

@@ -24,10 +24,13 @@ export class Config {
         }
 
         let data = JSON.stringify({
-            "node": "node.wowne.ro:34568",
+            "node": "wow.candy.surf:34568",
             "nodes": [
-                {"address": "node.wowne.ro:34568", "location": "New Jersey, United States", "region": "US"},
+                {"address": "wow.candy.surf:34568", "location": "All you can eat.", "region": "WOW"},
-                {"address": "wow.aluisyo.network:34568", "location": "The Moon", "region": "Moon"},
+                {"address": "so.wow.candy.surf:34568", "location": "San Francisco, United States", "region": "US"},
+                {"address": "much.wow.candy.surf:34568", "location": "London, England", "region": "UK"},
+                {"address": "such.wow.candy.surf:34568", "location": "Montreal, Canada", "region": "CA"},
+                {"address": "very.wow.candy.surf:34568", "location": "Bangalore, India", "region": "IN"},
                 {"address": "localhost:34568", 'location': "", "region": "*"}
             ],
             "wallets": []

src/main/wowrpc.js

@@ -371,7 +371,7 @@ export class WowRpc {
 
         if(typeof this._cli_daemon_address == 'undefined'){
             // this is some truly stupid hacky shit
-            this._cli_daemon_address = 'node.wowne.ro:34568';
+            this._cli_daemon_address = 'wow.candy.surf:34568';
         }
 
         let cli_args = ['--daemon-address', this._cli_daemon_address];

src/renderer/components/Landing/LandingPage.vue

@@ -4,12 +4,6 @@
             <div class="col-sm-7">
                 <img id="logo" src="~@/assets/wownero-light-intro.png" alt="electron-vue">
 
-                <p>Welcome to wownero light!</p>
-                <ul style="margin-bottom: 22px">
-                    <li>Electron/Vue.js <small>(OSX/Windows/Linux)</small></li>
-                    <li>Works most of the time</li>
-                </ul>
-
                 <button id="create_wallet_btn" v-on:click="createWallet" type="button" class="btn btn-success btn-sm">
                     <i class="fa fa-plus" id="create_wallet_icon" aria-hidden="true"></i>
                     Create wallet
@@ -45,13 +39,6 @@
                         </div>
                     </div>
                 </div>
-
-                <div class="card my-4 wfs-explorer" style="margin-top: 0 !important;">
-                    <h5 class="card-header">Funding required</h5>
-                    <div class="card-body">
-                        <wfs-explorer></wfs-explorer>
-                    </div>
-                </div>
             </div>
         </div>