add fixed geth start and add eth master password

ethereum · Oct 13, 2015 · ba6000e · ba6000e
1 parent 3e41443
commit ba6000e
Show file tree

Hide file tree

Showing 14 changed files with 205 additions and 107 deletions.
diff --git a/interface/client/templates/index.js b/interface/client/templates/index.js
@@ -32,6 +32,10 @@ Template.body.helpers({
             // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
             return 'popupWindows_requestAccount';
         }
+        if(location.hash === '#unlockMasterPassword') {
+            // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
+            return 'popupWindows_unlockMasterPassword';
+        }
         if(location.hash === '#sendTransactionConfirmation') {
             // $('title').text(TAPi18n.__('mist.popupWindows.requestAccount.title')
             return 'popupWindows_sendTransactionConfirmation';

diff --git a/interface/client/templates/popupWindows/sendTransactionConfirmation.js b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
@@ -192,10 +192,6 @@ Template['popupWindows_sendTransactionConfirmation'].events({
 
             if(!e && res) {
                 ipc.send('uiAction_unlockedAccount', null, gas);
-                // make sure we first confirm, before we close the window
-                setTimeout(function(){
-                    ipc.send('uiAction_closePopupWindow');
-                }, 200);
 
             } else {
                 Tracker.afterFlush(function(){

diff --git a/interface/client/templates/popupWindows/unlockMasterPassword.html b/interface/client/templates/popupWindows/unlockMasterPassword.html
@@ -0,0 +1,14 @@
+<template name="popupWindows_unlockMasterPassword">
+    <div class="popup-windows">
+        <form action="#">
+            <h1>{{i18n "mist.popupWindows.unlockMasterPassword.title"}}</h1>
+
+            <input type="password" placeholder="{{i18n 'mist.popupWindows.unlockMasterPassword.enterPassword'}}" class="password">
+
+            <div class="dapp-modal-buttons">
+                <button class="cancel" type="button">{{i18n "buttons.cancel"}}</button>
+                <button class="ok dapp-primary-button" type="submit">{{i18n "buttons.ok"}}</button>
+            </div>
+        </form>
+    </div>
+</template>
diff --git a/interface/client/templates/popupWindows/unlockMasterPassword.js b/interface/client/templates/popupWindows/unlockMasterPassword.js
@@ -0,0 +1,32 @@
+/**
+Template Controllers
+
+@module Templates
+*/
+
+/**
+The request account popup window template
+
+@class [template] popupWindows_unlockMasterPassword
+@constructor
+*/
+
+Template['popupWindows_unlockMasterPassword'].onRendered(function(){
+    this.$('input.password').focus();
+});
+
+
+Template['popupWindows_unlockMasterPassword'].events({
+   'click .cancel': function(){
+        ipc.send('uiAction_closePopupWindow');
+   },
+   'submit form': function(e, template){
+        e.preventDefault();
+        var pw = template.find('input.password').value;
+
+        ipc.send('uiAction_unlockedMasterPassword', null, pw);
+
+        template.find('input.password').value = '';
+        pw = null;
+   } 
+});
diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json
@@ -76,6 +76,10 @@
                     "passwordMismatch": "Your passwords don't match."
                 }
             },
+            "unlockMasterPassword": {
+                "title": "Unlock master password",
+                "enterPassword": "Enter master password"
+            },
             "sendTransactionConfirmation": {
                 "title": {
                     "sendTransaction": "Send transaction",

diff --git a/main.js b/main.js
@@ -109,11 +109,10 @@ app.on('before-quit', function(event){
     });
 
 
-    ethereumNodes.stopNodes();
-
     // delay quit, so the sockets can close
     setTimeout(function(){
         killedSockets = true;
+        ethereumNodes.stopNodes();
         app.quit();
     }, 500);
 });
@@ -305,37 +304,38 @@ app.on('ready', function() {
                 if(appStartWindow && appStartWindow.webContents)
                     appStartWindow.webContents.send('startScreenText', 'mist.startScreen.startingNode');
 
-                var node = ethereumNodes.startGeth();
-
-                // if we couldn't write to stdin, show binary error
-                node.stdin.on('error', function(e){
-                    if(appStartWindow && appStartWindow.webContents) {
-                        appStartWindow.webContents.send('startScreenText', 'mist.startScreen.nodeBinaryNotFound');
-                    }
+                var node = ethereumNodes.startNode('geth', false, function(e){
+                    // TRY TO CONNECT EVER 500MS
+                    if(!e) {
+                        intervalId = setInterval(function(){
+                            socket.connect({path: ipcPath});
+                            count++;
 
-                    clearInterval(intervalId);
+                            // timeout after 10 seconds
+                            if(count >= 60) {
 
-                    clearSocket(socket, appStartWindow, ipcPath, true);
-                });
-
+                                if(appStartWindow && appStartWindow.webContents)
+                                    appStartWindow.webContents.send('startScreenText', 'mist.startScreen.nodeConnectionTimeout', ipcPath);
+
+                                clearInterval(intervalId);
 
+                                clearSocket(socket, appStartWindow, ipcPath, true);
+                            }
+                        }, 200);
 
-                // TRY TO CONNECT EVER 500MS
-                intervalId = setInterval(function(){
-                    socket.connect({path: ipcPath});
-                    count++;
 
-                    // timeout after 10 seconds
-                    if(count >= 60) {
+                    // NO Binary
+                    } else {
 
-                        if(appStartWindow && appStartWindow.webContents)
-                            appStartWindow.webContents.send('startScreenText', 'mist.startScreen.nodeConnectionTimeout', ipcPath);
+                        if(appStartWindow && appStartWindow.webContents) {
+                            appStartWindow.webContents.send('startScreenText', 'mist.startScreen.nodeBinaryNotFound');
+                        }
 
                         clearInterval(intervalId);
 
                         clearSocket(socket, appStartWindow, ipcPath, true);
                     }
-                }, 200);
+                });
             }
         });
         socket.on('connect', function(data){

diff --git a/menuItems.js b/menuItems.js
@@ -165,12 +165,13 @@ var menuTempl = function(webviews) {
                 click: function(){
                     ethereumNodes.stopNodes();
                     setTimeout(function(){
-                        ethereumNodes.startGeth();
+                        ethereumNodes.startNode('geth', function(){
+                            setTimeout(function(){
+                                global.mainWindow.reload();
+                            }, 200);
+                        });
                         createMenu(webviews);
 
-                        setTimeout(function(){
-                            global.mainWindow.reload();
-                        }, 200);
                     }, 10);
                 }
               },
@@ -182,12 +183,13 @@ var menuTempl = function(webviews) {
                 click: function(){
                     ethereumNodes.stopNodes();
                     setTimeout(function(){
-                        ethereumNodes.startEth();
+                        ethereumNodes.startNode('eth', function(){
+                            setTimeout(function(){
+                                global.mainWindow.reload();
+                            }, 200);
+                        });
                         createMenu(webviews);
 
-                        setTimeout(function(){
-                            global.mainWindow.reload();
-                        }, 200);
                     }, 10);
                 }
               }
@@ -208,10 +210,7 @@ var menuTempl = function(webviews) {
 
         //             global.network = 'main';
         //             setTimeout(function(){
-        //                 if(geth)
-        //                     ethereumNodes.startGeth();
-        //                 else
-        //                     ethereumNodes.startEth();
+        //                 ethereumNodes.startNode(geth ? 'geth' : 'eth', false);
         //                 createMenu(webviews);
 
         //                 setTimeout(function(){
@@ -232,10 +231,7 @@ var menuTempl = function(webviews) {
 
         //             global.network = 'test';
         //             setTimeout(function(){
-        //                 if(geth)
-        //                     ethereumNodes.startGeth(true);
-        //                 else
-        //                     ethereumNodes.startEth(true);
+        //                 ethereumNodes.startNode(geth ? 'geth' : 'eth', true);
         //                 createMenu(webviews);
 
         //                 setTimeout(function(){

diff --git a/modules/checkNodeSync.js b/modules/checkNodeSync.js
@@ -129,7 +129,7 @@ module.exports = function(socket, appStartWindow, callback){
                                     cbCalled = true;
                                 });
                             }
-                        }, 1000 * 10);
+                        }, 1000 * 12);
                     }
 
                 // update progress bar

diff --git a/modules/createPopupWindow.js b/modules/createPopupWindow.js
@@ -33,7 +33,7 @@ module.exports = {
         // load URL
         this.loadingwindow.loadUrl(global.interfacePopupsUrl +'#loadingWindow');
     },
-    show: function(windowType, width, height, data, e){
+    show: function(windowType, width, height, data, e, noWeb3){
         var _this = this;
 
         this.loadingwindow.center();
@@ -49,7 +49,7 @@ module.exports = {
             show: false,
             icon: global.icon,
             'standard-window': false,
-            preload: __dirname +'/preloader/popupWindows.js',
+            preload: noWeb3 ? __dirname +'/preloader/popupWindowsNoWeb3.js' : __dirname +'/preloader/popupWindows.js',
             'use-content-size': true,
             'node-integration': false,
             'web-preferences': {