@@ -34,7 +34,7 @@
{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
{{/if}}
-
+
{{#if to}}
{{#if TemplateVar.get "toIsContract"}}
@@ -65,45 +65,11 @@
{{i18n "mist.popupWindows.sendTransactionConfirmation.title.createContract"}
{{/unless}}
{{/if}}
- {{#if data}}
-
- {{#if showFormattedParams}}
-
-
-
- {{# each param in params}}
- {{> dapp_output output=param }}
- {{/each}}
-
-
-
-
-
{{{formattedData}}}
-
- {{i18n "mist.popupWindows.sendTransactionConfirmation.estimatedFee"}}
+ {{i18n "mist.popupWindows.sendTransactionConfirmation.estimatedFee"}}
{{#if $eq (TemplateVar.get "estimatedGas") "invalid"}}
@@ -120,7 +86,7 @@
{{i18n "mist.popupWindows.sendTransactionConfirmation.data"}}
{{/if}}
-
+
{{i18n "mist.popupWindows.sendTransactionConfirmation.gasLimit"}}
@@ -138,23 +104,56 @@
{{i18n "mist.popupWindows.sendTransactionConfirmation.data"}}
+ {{#if data}}
+ {{#if showFormattedParams}}
+
+
+
+ {{# each param in params}}
+ {{> dapp_output output=param }}
+ {{/each}}
+
+
+
+
+
{{{formattedData}}}
+
{{/with}}
-
+
diff --git a/interface/client/templates/popupWindows/sendTransactionConfirmation.js b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
index c0c9e5c48..52d913731 100644
--- a/interface/client/templates/popupWindows/sendTransactionConfirmation.js
+++ b/interface/client/templates/popupWindows/sendTransactionConfirmation.js
@@ -6,7 +6,7 @@ Template Controllers
var setWindowSize = function(template){
Tracker.afterFlush(function(){
- ipc.send('backendAction_setWindowSize', 580, template.$('.popup-windows').height() + 60);
+ ipc.send('backendAction_setWindowSize', 580, template.$('.popup-windows').height() + 120);
});
}
@@ -103,7 +103,7 @@ Template['popupWindows_sendTransactionConfirmation'].onCreated(function(){
var data = Session.get('data');
if(data) {
-
+
// set window size
setWindowSize(template);
@@ -127,10 +127,10 @@ Template['popupWindows_sendTransactionConfirmation'].onCreated(function(){
web3.eth.getCode(data.to, function(e, res){
if(!e && res && res.length > 2) {
TemplateVar.set(template, 'toIsContract', true);
- setWindowSize(template);
+ setWindowSize(template);
}
});
-
+
if (data.data) {
localSignatureLookup(data.data).then(function(textSignature) {
// Clean version of function signature. Striping params
@@ -261,7 +261,7 @@ Template['popupWindows_sendTransactionConfirmation'].helpers({
@method (transactionInvalid)
*/
'transactionInvalid': function() {
- return TemplateVar.get('estimatedGas') === 'invalid'
+ return TemplateVar.get('estimatedGas') === 'invalid'
|| TemplateVar.get('estimatedGas') === 0
|| typeof TemplateVar.get('estimatedGas') === 'undefined';
}
@@ -294,7 +294,7 @@ Template['popupWindows_sendTransactionConfirmation'].events({
*/
'submit form': function(e, template){
e.preventDefault();
-
+
var data = Session.get('data'),
pw = template.find('input[type="password"]').value,
gas = web3.fromDecimal(TemplateVar.get('providedGas'));
@@ -373,7 +373,7 @@ Template['popupWindows_sendTransactionConfirmation'].events({
remoteSignatureLookup(data.data).then(function(textSignature) {
TemplateVar.set(template, 'lookingUpFunctionSignature', false);
-
+
// Clean version of function signature. Striping params
TemplateVar.set(template, 'executionFunction', textSignature.replace(/\(.+$/g, ''));
TemplateVar.set(template, 'hasSignature', true);
@@ -385,10 +385,9 @@ Template['popupWindows_sendTransactionConfirmation'].events({
ipc.send('backendAction_decodeFunctionSignature', textSignature, data.data);
}
}).catch(function(bytesSignature) {
- TemplateVar.set(template, 'lookingUpFunctionSignature', false);
+ TemplateVar.set(template, 'lookingUpFunctionSignature', false);
TemplateVar.set(template, 'executionFunction', bytesSignature);
TemplateVar.set(template, 'hasSignature', false);
});
}
});
-
diff --git a/interface/client/templates/popupWindows/splashScreen.js b/interface/client/templates/popupWindows/splashScreen.js
index 8d51aaa57..4aea7fd79 100644
--- a/interface/client/templates/popupWindows/splashScreen.js
+++ b/interface/client/templates/popupWindows/splashScreen.js
@@ -92,6 +92,7 @@ Template['popupWindows_splashScreen'].onCreated(function(){
if (status === 'inProgress') {
TemplateVar.set(template, 'showStartAppButton', true);
TemplateVar.set(template, 'startAppButtonText', TAPi18n.__('mist.startScreen.launchApp'));
+ ipc.send('backendAction_skipSync');
if (data !== false) {
// if state is "in progress" and we have data
@@ -189,9 +190,9 @@ Template['popupWindows_splashScreen'].helpers({
syncData._displayKnownStates = Number(syncData.knownStates || 0);
} else {
// Increment each them slowly to match target number
- syncData._displayBlock += (Number(syncData.currentBlock) - syncData._displayBlock) / 10;
- syncData._displayState += (Number(syncData.pulledStates || 0) - syncData._displayState) / 10;
- syncData._displayKnownStates += (Number(syncData.knownStates || 0) - syncData._displayKnownStates) / 10;
+ syncData._displayBlock += (Number(syncData.currentBlock) - syncData._displayBlock) / 100;
+ syncData._displayState += (Number(syncData.pulledStates || 0) - syncData._displayState) / 100;
+ syncData._displayKnownStates += (Number(syncData.knownStates || 0) - syncData._displayKnownStates) / 100;
}
// Create the fancy strings
@@ -224,7 +225,7 @@ Template['popupWindows_splashScreen'].helpers({
}
}
- }, 100);
+ }, 10);
return TemplateVar.get(template, "syncStatusMessageLive");
}
diff --git a/interface/client/templates/views/webview.js b/interface/client/templates/views/webview.js
index b64aa6ec6..e28d4b848 100644
--- a/interface/client/templates/views/webview.js
+++ b/interface/client/templates/views/webview.js
@@ -60,6 +60,10 @@ Template['views_webview'].onRendered(function(){
webviewLoadStop.call(this, tabId, e);
});
+ // show error pages
+ webview.addEventListener('did-fail-load', showError.bind(webview, tabId));
+ webview.addEventListener('crashed', showError.bind(webview, tabId));
+
// navigate page, and redirect to browser tab if necessary
webview.addEventListener('will-navigate', webviewLoadStart.bind(webview, tabId));
webview.addEventListener('did-get-redirect-request', webviewLoadStart.bind(webview, tabId));
@@ -122,6 +126,10 @@ Template['views_webview'].helpers({
}});
}
+ // allow error pages
+ if(url && url.indexOf('file://'+ dirname + '/errorPages/') === 0) {
+ return url;
+ }
// CHECK URL and throw error if not allowed
if(!Helpers.sanitizeUrl(url, true)) {
@@ -137,7 +145,7 @@ Template['views_webview'].helpers({
return 'file://'+ dirname + '/errorPages/400.html';
}
- // remove redirect
+ // add url
if(url) {
template.url = url;
Tabs.update(this._id, {$set: {
diff --git a/interface/client/templates/webviewEvents.js b/interface/client/templates/webviewEvents.js
index 26e10bfc8..332676911 100644
--- a/interface/client/templates/webviewEvents.js
+++ b/interface/client/templates/webviewEvents.js
@@ -1,4 +1,31 @@
+showError = function(tabId, e){
+ if(e.isMainFrame || e.killed) {
+ var url,
+ path = 'file://'+ dirname + '/errorPages/';
+
+ if(e.killed) {
+ e.errorCode = 500;
+ }
+
+ switch(e.errorCode) {
+ case -105:
+ url = path +'404.html';
+ break;
+ case 500:
+ url = path +'500.html';
+ break;
+ }
+
+ if(url) {
+ Tabs.update(tabId, {$set: {
+ redirect: url
+ }});
+ }
+ }
+};
+
+
webviewChangeUrl = function(tabId, e){
if(e.type === 'did-navigate-in-page' && !e.isMainFrame)
return;
diff --git a/interface/i18n/app.nl.i18n.json b/interface/i18n/app.nl.i18n.json
index 97b9670a1..a0eceea97 100644
--- a/interface/i18n/app.nl.i18n.json
+++ b/interface/i18n/app.nl.i18n.json
@@ -20,8 +20,8 @@
"sending": "Verzenden...",
"create": "Aanmaken",
"tryToReconnect": "Probeer te verbinden",
- "stayAnonymous": "Stay anonymous",
- "authorize": "Authorize"
+ "stayAnonymous": "Blijf anoniem",
+ "authorize": "Autoriseren"
},
"commonWords": {
"you": "u",
diff --git a/interface/i18n/mist.de.i18n.json b/interface/i18n/mist.de.i18n.json
index fa21cdcc1..2c8016b32 100644
--- a/interface/i18n/mist.de.i18n.json
+++ b/interface/i18n/mist.de.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Konten",
- "importPresale": "Pre-sale-Konto importieren",
+ "importPresale": "Konto importieren",
"newAccount": "Neues Konto",
"backup": "Sicherung",
"backupKeyStore": "Konten",
@@ -42,12 +42,16 @@
"devToolsWebview": "__webview__",
"runTests": "Tests durchführen",
"logFiles": "Logdatei anzeigen",
+ "openRemix": "Remix IDE öffnen",
"ethereumNode": "Ethereum Node",
"network": "Netzwerk",
"mainNetwork": "Hauptnetzwerk",
"startMining": "⛏ Mining starten (nur auf Testnetz)",
"stopMining": "⛏ Mining stoppen",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Fenster",
@@ -70,7 +74,7 @@
"linux": "Um Zeit Synchronisation einzuschalten installiere \"ntp\" via \"apt-get install ntp\".",
"darwin": "Um Zeit Synchronisation einzuschalten, öffne die System Einstellungen und checke \"Zeit Datum automatisch\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -202,7 +206,7 @@
"gotoMainnet": "Verwende das Hauptnetz",
"gotoMainnetDescription": " Sie werden etwas Ether benötigen, um Verträge anzulegen und auszuführen. Wir werden Ihnen helfen, etwas zu bekommen ...",
"doYouHaveAWalletFile": "Haben Sie eine Wallet-Datei?",
- "walletFileDescription": "
Wenn Sie 2014 am Ethereum-Pre-sale teilgenommen haben, sollten Sie über eine Datei mit dem Dateinamen ethereum_wallet_backup.json verfügen. Sie wurde nach dem Kauf heruntergeladen und Ihnen auch per E-Mail geschickt.
",
+ "walletFileDescription": "
Wallet-Datei zum importieren in dieses Fenster ziehen.ethereum_wallet_backup.json verfügen. Sie wurde nach dem Kauf heruntergeladen und Ihnen auch per E-Mail geschickt.
",
"dropFilesHere": "Pre-sale Datei hochladen",
"creating": "Erstellen...",
"importing": "Importieren...",
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json
index 2b0b04f29..cf3bd86b7 100644
--- a/interface/i18n/mist.en.i18n.json
+++ b/interface/i18n/mist.en.i18n.json
@@ -46,7 +46,7 @@
},
"accounts": {
"label": "Accounts",
- "importPresale": "Import Pre-sale Accounts",
+ "importPresale": "Import Accounts",
"newAccount": "New account",
"backup": "Backup",
"backupKeyStore": "Accounts",
@@ -60,10 +60,15 @@
"devToolsWebview": "__webview__",
"runTests": "Run tests",
"logFiles": "Show log file",
+ "openRemix": "Open Remix IDE",
"externalNode": "using external node",
"ethereumNode": "Ethereum Node",
"network": "Network",
"mainNetwork": "Main Network",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)",
+ "mainNetwork": "Main Network",
"startMining": "⛏ Start Mining (Testnet only)",
"stopMining": "⛏ Stop Mining"
},
@@ -226,14 +231,14 @@
"lookupDataExplainer": "Look this up on the internet"
},
"onboarding": {
- "description" : "Ethereum is a public blockchain that features a turing complete programming for building solid, decentralized applications.",
+ "description" : "Ethereum is a platform for decentralized blockchain apps with a fully featured programming language",
"goToTestnet" : "Use the test network",
"goToTestnetDescription" : "Test the technology freely in a sandboxed testnet, without using real ether.",
"gotoMainnet" : "Use the main network",
"gotoMainnetDescription" : "You’ll need some Ether in order to create and execute contracts. Don't worry, we'll help you get some...",
"doYouHaveAWalletFile" : "Do you have a wallet file?",
- "walletFileDescription" : "
If you participated on the Ethereum Pre-sale 2014, you should have a file named ethereum_wallet_backup.json. It was downloaded after the sale and also sent to your email
",
- "dropFilesHere" : "Drop pre-sale file",
+ "walletFileDescription" : "
Move any wallet file here to import.ethereum_wallet_backup.json. It was downloaded after the sale and also sent to your email
",
+ "dropFilesHere" : "Drop wallet file",
"creating": "Creating...",
"importing": "Importing...",
"skip" : "Skip this step",
@@ -253,6 +258,7 @@
"downloadingBlocks": "Downloading blocks",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
"syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync..",
"tutorial1Description" : "
Now the only thing left to do is wait for the download to finish. Here's some reading suggestions:
Make your own money Make a cryptocurrency with a fixed market supply, tokens representing real world assets, etc
",
"tutorial2Description" : "
Create a crowdsale Raise funds for a common goal, fully trustable without a third party. Sidestep the hurdle of traditional funding system and go directly to the source by funding an organization via the blockchain.
",
"tutorial3Description" : "
Create a blockchain organization Create an autonomous organization with rules on spending money and making decisions for you and your investors.
",
diff --git a/interface/i18n/mist.es.i18n.json b/interface/i18n/mist.es.i18n.json
index 50747a5d0..1e7059e9b 100644
--- a/interface/i18n/mist.es.i18n.json
+++ b/interface/i18n/mist.es.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Cuentas",
- "importPresale": "Importar Cuentas de la Pre-venta",
+ "importPresale": "Importar Cuentas",
"newAccount": "Nueva cuenta",
"backup": "Copia de seguridad",
"backupKeyStore": "Cuentas",
@@ -47,7 +47,11 @@
"mainNetwork": "Red principal",
"startMining": "⛏ Empezar a minar (sólo Testnet)",
"stopMining": "⛏ Parar de minar",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Ventana",
@@ -70,7 +74,7 @@
"linux": "Para permitir la sincronización con un servidor de tiempo instale \"ntp\" vía \"apt-get install ntp\".",
"darwin": "Para habilitar la sincronización del tiempo, abra las preferencias de tiempo y marque \"Ajuste la hora y la fecha automáticamente\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"connectAccount": {
"chooseAccountTitle": "Elegir sus cuentas",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.fa.i18n.json b/interface/i18n/mist.fa.i18n.json
index 89faf57fe..b2d807e66 100644
--- a/interface/i18n/mist.fa.i18n.json
+++ b/interface/i18n/mist.fa.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Accounts",
- "importPresale": "Import Pre-sale Accounts",
+ "importPresale": "Import Accounts",
"newAccount": "New account",
"backup": "Backup",
"backupKeyStore": "Accounts",
@@ -47,7 +47,11 @@
"network": "Network",
"mainNetwork": "Main Network",
"startMining": "⛏ Start Mining (Testnet only)",
- "stopMining": "⛏ Stop Mining"
+ "stopMining": "⛏ Stop Mining",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Window",
@@ -70,7 +74,7 @@
"linux": "To enable a time sync server install \"ntp\" via \"apt-get install ntp\".",
"darwin": "To enable time sync, open the time preferences and check \"Set the time and date automatically\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -249,7 +253,8 @@
"unknownFile": "File not recognised.",
"wrongPassword": "Wrong password.",
"importFailed": "Couldn't import the file, got: __error__"
- }
+ },
+ "startingSync": "Getting ready to sync.."
},
"connectAccount": {
"chooseAccountTitle": "Choose account",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.fr.i18n.json b/interface/i18n/mist.fr.i18n.json
index 9a043b95c..74eda619f 100644
--- a/interface/i18n/mist.fr.i18n.json
+++ b/interface/i18n/mist.fr.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Comptes",
- "importPresale": "Importer les comptes de prévente",
+ "importPresale": "Importer les comptes",
"newAccount": "Nouveau compte",
"backup": "Sauvegarder",
"backupKeyStore": "Comptes",
@@ -47,7 +47,11 @@
"mainNetwork": "Réseau principal",
"startMining": "⛏ Commencer à miner (seulement pour Testnet)",
"stopMining": "⛏ Arrêter de miner",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Fenêtre",
@@ -70,7 +74,7 @@
"linux": "Pour activer un serveur de synchronisation de temps, installez \"ntp\" via \"apt-get install ntp\".",
"darwin": "Pour activer la synchronisation du temps, ouvrez les préférences de temps et cochez \"Régler la date et l'heure automatiquement\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.it.i18n.json b/interface/i18n/mist.it.i18n.json
index d81d833f3..b6a312829 100644
--- a/interface/i18n/mist.it.i18n.json
+++ b/interface/i18n/mist.it.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Accounts",
- "importPresale": "Importa Accounts pre-vendita",
+ "importPresale": "Importa Accounts",
"newAccount": "Nuovo account",
"backup": "Backup",
"backupKeyStore": "Accounts",
@@ -47,7 +47,11 @@
"mainNetwork": "Rete principale",
"startMining": "⛏ Inizia mining (solo Testnet)",
"stopMining": "⛏ Ferma mining",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Finestra",
@@ -70,7 +74,7 @@
"linux": "Per abilitare la sincronia con un time server installa \"ntp\" via \"apt-get install ntp\".",
"darwin": "Per abilitare la sincronia dell'ora, apri le preferenze di orario e spunta \"Setta ora e data automaticamente\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.ja.i18n.json b/interface/i18n/mist.ja.i18n.json
index 6d71de12b..9cbb4835b 100644
--- a/interface/i18n/mist.ja.i18n.json
+++ b/interface/i18n/mist.ja.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "アカウント",
- "importPresale": "プリセールアカウントを読み込む",
+ "importPresale": "アカウントを読み込む",
"newAccount": "新規アカウント",
"backup": "バックアップ",
"backupKeyStore": "アカウント",
@@ -47,7 +47,11 @@
"mainNetwork": "メインネットワーク",
"startMining": "⛏ マイニングを始める (テストネット のみ)",
"stopMining": "⛏ マイニングを中止する",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Window",
@@ -70,7 +74,7 @@
"linux": "時間を同期させるサーバーを使うためには、 \"ntp\" を \"apt-get install ntp\" をコマンドラインから入力してインストールする必要があります。",
"darwin": "時間を同期するためには、時間設定を開き \"時間と日にちを同期自動で同期\" にチェックすることが必要です."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.ko.i18n.json b/interface/i18n/mist.ko.i18n.json
index b8d03ced8..948738ecf 100644
--- a/interface/i18n/mist.ko.i18n.json
+++ b/interface/i18n/mist.ko.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "계정",
- "importPresale": "프리세일 계정 추가하기",
+ "importPresale": "계정 추가하기",
"newAccount": "새 계정",
"backup": "백업",
"backupKeyStore": "계정키 백업",
@@ -47,7 +47,11 @@
"mainNetwork": "메인 네트워크",
"startMining": "⛏ 채굴 시작(테스트넷만 해당)",
"stopMining": "⛏ 채굴 중단",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "창",
@@ -70,7 +74,7 @@
"linux": "시간 동기화 서버를 가동시키기 위해서는 \"ntp\" 를 \"apt-get install ntp\" 의 방법으로 설치하세요.",
"darwin": "시간 동기화를 위해서, 시간 옵션을 열고 \"시간과 날짜 자동설정(Set the time and date automatically)\" 옵션을 선택하세요."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.kr.i18n.json b/interface/i18n/mist.kr.i18n.json
index a93c84efc..41babc6ba 100644
--- a/interface/i18n/mist.kr.i18n.json
+++ b/interface/i18n/mist.kr.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "계정",
- "importPresale": "프리세일 계정 추가하기",
+ "importPresale": "계정 추가하기",
"newAccount": "새 계정",
"backup": "백업",
"backupKeyStore": "계정키 백업",
@@ -47,7 +47,11 @@
"mainNetwork": "메인 네트워크",
"startMining": "⛏ 채굴 시작(테스트넷만 해당)",
"stopMining": "⛏ 채굴 중단",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "창",
@@ -70,7 +74,7 @@
"linux": "시간 동기화 서버를 가동시키기 위해서는 \"ntp\" 를 \"apt-get install ntp\" 의 방법으로 설치하세요.",
"darwin": "시간 동기화를 위해서, 시간 옵션을 열고 \"시간과 날짜 자동설정(Set the time and date automatically)\" 옵션을 선택하세요."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
diff --git a/interface/i18n/mist.nb.i18n.json b/interface/i18n/mist.nb.i18n.json
index 1f1b848d1..91ce3fe5c 100644
--- a/interface/i18n/mist.nb.i18n.json
+++ b/interface/i18n/mist.nb.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Kontoer",
- "importPresale": "Importer Forhåndssalg Kontoer",
+ "importPresale": "Importer Kontoer",
"newAccount": "Ny konto",
"backup": "Sikkerhetskopier",
"backupKeyStore": "Kontoer",
@@ -47,7 +47,11 @@
"mainNetwork": "Hovednettverk",
"startMining": "⛏ Start Mining (Kun testnett)",
"stopMining": "⛏ Stopp Mining",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Vindu",
@@ -70,7 +74,7 @@
"linux": "For å aktivere en tidssynkroniseringsserver installer \"ntp\" via \"apt-get install ntp\".",
"darwin": "For å aktivere tidssynkronisering, åpne tidsinnstillinger og velg \"Angi klokkeslett og dato automatisk\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.nl.i18n.json b/interface/i18n/mist.nl.i18n.json
index dca843648..9440f6b4c 100644
--- a/interface/i18n/mist.nl.i18n.json
+++ b/interface/i18n/mist.nl.i18n.json
@@ -5,7 +5,7 @@
"label": "__app__",
"about": "Over __app__",
"checkForUpdates": "Op updates controleren...",
- "checkForNodeUpdates": "Check for Ethereum node updates...",
+ "checkForNodeUpdates": "Controleer op Ethereum node updates...",
"services": "Diensten",
"hide": "__app__ verbergen",
"hideOthers": "Andere verbergen",
@@ -22,13 +22,31 @@
"selectAll": "Alles selecteren"
},
"view": {
- "label": "Bekijken",
+ "label": "Weergave",
"fullscreen": "Volledig Scherm Inschakelen",
- "default": "Default"
+ "languages": "Wijzig taal",
+ "default": "Standaard",
+ "langCodes": {
+ "de": "Deutsch",
+ "en": "English",
+ "es": "Español",
+ "fa": "فارسى",
+ "fr": "Français",
+ "it": "Italiano",
+ "ja": "日本語",
+ "ko": "한국어 ",
+ "nl": "Nederlands",
+ "nb": "Norsk",
+ "pt": "Português",
+ "sq": "Shqip",
+ "ru": "Pусский",
+ "zh": "普通話",
+ "zh-TW": "國語"
+ }
},
"accounts": {
"label": "Accounts",
- "importPresale": "Importeer voorverkoop Accounts",
+ "importPresale": "Importeer Accounts",
"newAccount": "Nieuw account",
"backup": "Backup",
"backupKeyStore": "Accounts",
@@ -42,12 +60,16 @@
"devToolsWebview": "__webview__",
"runTests": "Tests uitvoeren",
"logFiles": "Toon log bestand",
+ "openRemix": "Open Remix IDE",
+ "externalNode": "Externe Node in gebruik",
"ethereumNode": "Ethereum Node",
"network": "Netwerk",
+ "nodeMode": "Chain download",
+ "fullNode": "Bewaar volledige blockchain",
+ "lightNode": "Gebruik light Node (experimenteel!)",
"mainNetwork": "Hoofdnetwerk",
"startMining": "⛏ Start Mining (Alleen testnet)",
- "stopMining": "⛏ Stop Mining",
- "externalNode": "using external node"
+ "stopMining": "⛏ Stop Mining"
},
"window": {
"label": "Scherm",
@@ -57,26 +79,26 @@
},
"help": {
"label": "Help",
- "reportBug": "Report an issue on Github"
+ "reportBug": "Rapporteer een probleem op Github"
}
},
"errors": {
- "nodeConnect": "Verbinden naar node niet mogelijk? Zie de logboek bestanden voor meer informatie:",
- "nodeStartup": "Het lijkt erop dat de node niet kan worden opgestart, heeft u er al een aan staan? Is deze de database aan het upgraden?",
+ "nodeConnect": "Verbinden met node niet mogelijk? Zie de logboek bestanden voor meer informatie:",
+ "nodeStartup": "Het lijkt erop dat de node niet kan worden opgestart, draait er al een? Is deze de database aan het upgraden?",
"timeSync": {
- "title": "Uw computer's klok is niet gesynchroniseerd.",
- "description": "Om succesvol met het Ethereum netwerk te verbinden moet u uw computer's klok synchroniseren met een tijdssynchronisatie server.",
- "win32": "Ga naat uw Internet Tijd Instellingen in uw configuratiescherm en selecteer de optie. Zie deze uitleg voor details: http://www.guidingtech.com/3119/windows-clock-sync/",
+ "title": "Je computer's klok is niet gesynchroniseerd.",
+ "description": "Om succesvol met het Ethereum netwerk te verbinden moet je computer's klok gesynchroniseerd zijn met een tijdssynchronisatie server.",
+ "win32": "Ga naar je Internet Tijd Instellingen in je configuratiescherm en selecteer de optie. Zie deze uitleg voor details: http://www.guidingtech.com/3119/windows-clock-sync/",
"linux": "Installeer voor een tijdssynchronisatieserver \"ntp\" via \"apt-get install ntp\".",
- "darwin": "Om tijdssynchronisatie aan de zetten opent u uw instellingen en activeert u \"Tijd en datum automatisch instellen\"."
+ "darwin": "Zet tijdssynchronisatie aan door in je instellingen de optie \"Tijd en datum automatisch instellen\" te activeren."
},
- "nodeChecksumMismatch": {
- "title": "Checksum mismatch in downloaded node!",
- "description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
+ "nodeChecksumMismatch": {
+ "title": "Checksum mismatch in gedownloade node!",
+ "description": "__algorithm__: __hash__\n\nInstalleer de __type__ node versie __version__ handmatig."
},
"legacyChain": {
- "title": "Legacy chain detected",
- "description": "Your node is currently on the unsupported Ethereum Classic chain. To use this chain use tools provided by the ethereum classic project at\nhttps://ethereumclassic.github.io.\n\nTo revert to the main ethereum chain follow the tutorial here:\nhttps://github.com/ethereum/mist/releases/0.8.2"
+ "title": "Legacy chain gedetecteerd",
+ "description": "Je node draait momenteel op de niet ondersteunde Ethereum Classic chain. Om deze chain te gebruiken dien je de tools te gebruiken van het Ethereum Classic project op\nhttps://ethereumclassic.github.io.\n\nOm terug te gaan naar de standaard Ethereum chain kun je deze tutorial volgen:\nhttps://github.com/ethereum/mist/releases/0.8.2"
}
},
"rightClick": {
@@ -87,17 +109,17 @@
"nodeInfo": {
"nodeSyncing": "__blockDiff__ blokken te gaan",
"blockReceived": "Nieuw blok ontvangen",
- "blockNumber": "Uw laatste bloknummer",
+ "blockNumber": "Jouw laatste bloknummer",
"timeSinceBlock": "Verstreken tijd sinds laatste blok",
- "testnetExplain": "U best actief op een testnet, VERSTUUR GEEN echte ether naar deze adressen",
- "peers": "peers",
- "checkingWhichNetwork": "Checking network...",
+ "checkingWhichNetwork": "Netwerk aan het controleren...",
"mainNetwork": "Main-net",
"testNetwork": "Test-net",
"privateNetwork": "Private-net",
- "mainnetExplain": "You are on the main Ethereum global network",
- "privatenetExplain": "You are on a private net, DO NOT SEND any real ether to these addresses",
- "unknownnetExplain": "Unable to determine which network you are on"
+ "mainnetExplain": "Je zit op het main Ethereum wereldwijde netwerk",
+ "testnetExplain": "Je bent actief op het __name__, VERSTUUR GEEN echte Ether naar deze adressen",
+ "privatenetExplain": "Je zit op een private net, VERSTUUR GEEN echte Ether naar deze adressen",
+ "unknownnetExplain": "Niet in staat om te bepalen op welk netwerk je zit",
+ "peers": "peers"
},
"sidebar": {
"buttons": {
@@ -107,54 +129,66 @@
"browserBar": {
"buttons": {
"noAccounts": "Geen accounts ingesteld",
- "connect": "Connect"
+ "connect": "Verbind"
}
},
"startScreen": {
"runningNodeFound": "Lopende Ethereum node gevonden!",
"startingNode": "Ethereum node starten...",
+ "stoppingNode": "Ethereum node stoppen...",
"startedNode": "Applicatie starten...",
- "nodeConnectionTimeout": "Ethereum node opstarten niet mogelijk!
Als u Geth geinstalleerd heeft , gebruik dan dit commando om het op te starten: geth --ipcpath __path__ Of meld een fout ",
- "nodeBinaryNotFound": "Geen Ethereun node uitvoerbaar bestand gevonden!
Start er a.u.b. handmatig een. ",
- "nodeSyncing": "Ethereum node moet synchroniseren, even gedult alstublieft...",
+ "nodeConnectionTimeout": "Ethereum node opstarten niet mogelijk!
Als je Geth geinstalleerd hebt , gebruik dan dit commando om het op te starten: geth --ipcpath __path__ Of meld een fout ",
+ "nodeBinaryNotFound": "Geen Ethereum node gevonden!
Start er a.u.b. handmatig een. ",
+ "nodeStarting": "Ethereum node opstarten...",
+ "nodeStarted": "Ethereum node gestart",
+ "nodeConnected": "Ethereum node verbonden",
+ "nodeStopping": "Ethereum node afsluiten...",
+ "nodeStopped": "Ethereum node gestopt",
+ "nodeError": "Ethereum node verbindingsfout :'(",
+ "unableToBindPort": "Ethereum node kan niet opstarten. Draait er al een?",
+ "nodeSyncing": "Ethereum node moet synchroniseren, even geduld alstublieft...",
"nodeSyncInfo": "Blok __currentBlock__ van __highestBlock__ aan het downloaden.",
+ "nodeSyncInfoStates": "Blok __displayBlock__ van __highestBlock__ aan het downloaden,
Chain structuur __displayState__ van __displayKnownStates__ aan het downloaden",
"nodeSyncConnecting": "Zoeken naar peers...",
- "stoppingNode": "Stopping Ethereum node...",
- "nodeStarting": "Ethereum node starting up...",
- "nodeStarted": "Ethereum node started",
- "nodeConnected": "Ethereum node connected",
- "nodeStopping": "Ethereum node stopping...",
- "nodeStopped": "Ethereum node stopped",
- "nodeError": "Ethereum node connection error :'(",
- "unableToBindPort": "Ethereum node cannot run. Is another instance already running?",
- "nodeSyncInfoStates": "Downloading block __displayBlock__ of __highestBlock__,
Downloading chain structure __displayState__ of __displayKnownStates__",
- "nodeSyncFoundPeers": "Connecting to __peers__ peers...",
- "nodeSyncingStopped": "Ethereum node sync stopped",
- "peerSearchTimeout": "Skip peer search",
- "launchApp": "Launch Application",
+ "nodeSyncFoundPeers": "Verbinden met __peers__ peers...",
+ "nodeSyncingStopped": "Ethereum node sync gestopt",
+ "peerSearchTimeout": "Sla peer search over",
+ "launchApp": "Applicatie Opstarten",
"clientBinaries": {
- "scanning": "Checking for node update...",
- "downloading": "Downloading new node...",
- "loadConfig": "Loading client config...",
- "filtering": "Filtering client binaries...",
+ "scanning": "Controleren op node update...",
+ "downloading": "Downloaden van nieuwe node...",
+ "loadConfig": "Laden van client config...",
+ "filtering": "Filteren van client binaries...",
"done": "Ethereum node up-to-date...",
- "error": "Error running downloaded binary."
+ "error": "Fout bij het uitvoeren van de gedownloade binary."
}
},
"popupWindows": {
+ "updateAvailable": {
+ "newVersionAvailable": "Nieuwe __name__ versie beschikbaar",
+ "version": "Versie",
+ "downloadURL": "Download URL",
+ "checksum": "Checksum",
+ "downloadAndRestart": "Updaten en opnieuw opstarten",
+ "download": "Download nieuwe versie",
+ "skipUpdate": "Sla update over",
+ "notNow": "Vraag me later opnieuw",
+ "checking": "Controleren op updates voor __name__...",
+ "noUpdateFound": "Geen updates gevonden. Je hebt de laatste versie __name__."
+ },
"requestAccount": {
"title": "Account aanmaken",
"enterPassword": "Wachtwoord invoeren",
"repeatPassword": "Wachtwoord herhalen",
"creating": "Account genereren...",
"errors": {
- "passwordMismatch": "Uw wachtwoorden komen niet overeen.",
- "passwordTooShort": "Make a longer password"
+ "passwordMismatch": "Je wachtwoorden komen niet overeen.",
+ "passwordTooShort": "Kies een langer wachtwoord"
}
},
"unlockMasterPassword": {
- "title": "Voer meesterwachtwoord in",
- "enterPassword": "Voer meesterwachtwoord in",
+ "title": "Voer hoofdwachtwoord in",
+ "enterPassword": "Voer hoofdwachtwoord in",
"unlocking": "Ontgrendelen...",
"errors": {
"wrongPassword": "Wachtwoord is niet correct, probeer het nog eens."
@@ -162,67 +196,71 @@
},
"sendTransactionConfirmation": {
"title": {
- "sendTransaction": "Send transaction",
- "contractExecution": "Execute contract",
- "createContract": "Create contract"
+ "sendTransaction": "Verzend transactie",
+ "contractExecution": "Voer contract uit",
+ "createContract": "Contract aanmaken"
},
- "contractExecutionInfo": "U staat op het punt een functie uit te voeren op een contract. Dit kan overdrachten van waarde tot gevolg hebben.",
- "contractCreationInfo": "U staat op het punt een contract aan te maken met de gegeven gevevens.",
+ "contractExecutionInfo": "Je staat op het punt een functie uit te voeren op een contract. Dit kan overdrachten van waarde tot gevolg hebben.",
+ "contractCreationInfo": "Je staat op het punt een contract aan te maken met de gegeven gevevens.",
"enterPassword": "Voer wachtwoord in om de transactie te bevestigen",
"unlocking": "Bevestigen...",
"createContract": "Contract aanmaken",
- "estimatedFee": "Ingeschatte kosten",
- "estimatedGasError": "Data kon niet worden uitgevoerd, dus het zal alle mogelijke gas gebruiken.",
+ "estimatedFee": "Ingeschatte transactie kosten",
+ "estimatedGasError": "De kans is groot dat de transactie zal mislukken. Als je de transactie toch wilt uitvoeren zal misschien alle gas worden verbruikt.",
+ "transactionThrow": "Het contract staat niet toe dat deze transactie wordt uitgevoerd",
+ "noEstimate": "We konden de hoeveelheid gas niet inschatten.",
"gasPrice": "Gas prijs",
- "perMillionGas": "ether per millioen gas",
- "gasLimit": "Geef maximum kosten aan",
- "data": "Data",
+ "perMillionGas": "Ether per millioen gas",
+ "gasLimit": "Geef maximum transactie kosten aan",
+ "data": "Ruwe Data",
+ "parameters": "Parameters",
"buttons": {
"sendTransaction": "Verstuur transactie"
},
"errors": {
- "connectionTimeout": "Kon niet verbinden naar de node, is het in de achtergrond uitgevallen?",
+ "connectionTimeout": "Kon niet verbinden met de node, is het in de achtergrond uitgevallen?",
"wrongPassword": "Onjuist wachtwoord",
- "multipleKeysMatchAddress": "Multiple keys match address, please remove duplicates from keystore (menu -> accounts -> backup -> accounts)",
- "insufficientFundsForGas": "Insufficient funds in main account (etherbase) to pay for gas",
- "sameAccount": "Can't send to itself"
+ "multipleKeysMatchAddress": "Meerdere keys matchen hebben hetzelfde adres, verwijder duplicaten uit de keystore (menu -> accounts -> backup -> accounts)",
+ "insufficientFundsForGas": "Onvoldoende saldo in hoofd account (Etherbase) om gas te betalen",
+ "sameAccount": "Kan niet naar zichzelf versturen"
},
- "transactionThrow": "The contract won't allow this transaction to be executed",
- "noEstimate": "We couldn't estimate the gas.",
- "parameters": "Parameters",
- "showRawBytecode": "show raw data",
- "showDecodedParameters": "show decoded parameters",
- "lookupData": "Try to decode data",
- "lookupDataExplainer": "Look this up on the internet"
+ "showRawBytecode": "Toon ruwe data",
+ "showDecodedParameters": "Toon gedecodeerde parameters",
+ "lookupData": "Probeer de data te decoderen",
+ "lookupDataExplainer": "Zoek hiernaar op het internet"
},
"onboarding": {
- "description": "Ethereum is een decentraal platform voor het bouwen van applicaties op een blockchain: software die immuun is voor fruide en levenslang waarde en eigendom over kan brengen",
+ "description": "Ethereum is een decentraal platform voor het bouwen van applicaties op een blockchain: software die immuun is voor fraude en levenslang waarde en eigendom over kan brengen",
"goToTestnet": "Gebruik het test netwerk",
- "goToTestnetDescription": "Test de technologie vrij in een testongeving, zonder echte ether te gebruiken.",
+ "goToTestnetDescription": "Test de technologie vrij in een testongeving, zonder echte Ether te gebruiken.",
"gotoMainnet": "Gebruik hoofdnetwerk",
- "gotoMainnetDescription": "U zal een beetje Ether nodig hebben om contracten uit te voeren. Geen zorgen, we helpen u met het verkrijgen...",
- "doYouHaveAWalletFile": "Heeft u een wallet bestand?",
- "walletFileDescription": "
Als u mee heeft gedaan met de Ethereum voorverkoop van 2014 zou u een bestand met de naam ethereum_wallet_backup.json ontvangen moeten hebben. U kon deze downloaden na uw contributie en is ook per email verstuurd
",
+ "gotoMainnetDescription": "Je zult een beetje Ether nodig hebben om contracten uit te voeren. Geen zorgen, we helpen je met het verkrijgen...",
+ "doYouHaveAWalletFile": "Heb je een wallet bestand?",
+ "walletFileDescription": "
Als je mee hebt gedaan met de Ethereum voorverkoop van 2014 zou je een bestand met de naam ethereum_wallet_backup.json ontvangen moeten hebben. Je kon dit bestand downloaden na je contributie en is ook per email verstuurd
",
"dropFilesHere": "Sleep voorverkoop bestand hier",
"creating": "Aanmaken...",
"importing": "Importeren...",
"skip": "Sla deze stap over",
"next": "Volgende",
- "protectTitle": "Bescherm uw account",
- "protectDescription": "Kies een wachtwoord voor uw nieuwe account. Maak het even veilig alsof het uw huissleutels zijn!",
+ "protectTitle": "Bescherm je account",
+ "protectDescription": "Kies een wachtwoord voor je nieuwe account. Maak het even veilig alsof het uw huissleutels zijn!",
"accountTitle": "Opladen!",
"accountTitleTestnet": "Mine wat!",
- "etherDescription": "Het ethereum netwerk is gebaseerd op het “Ether” token. U zal een kleine hoeveelheid nodig hebben om dingen op het netwerk te doen.",
- "loadItDescription": "Als u al Bitcoins of een andere cryptocurrency heeft kan u deze makkelijk omzetten in ether met Shapeshift.
Wij raden aan een hoeveelheid van tussen de
0.25 en 1 ether om te zetten.",
- "mineItDescription": "
Op het testnetwerk kan u zelf ether minen door te gaan naar het Ontwikkelaars menu en te kiezen voor Begin Mining . PROBEER GEEN ECHTE ETHER NAAR DIT ADRES TE VERSTUREN ",
- "you": "U",
- "etherbase": "Centrale account (etherbase)",
+ "etherDescription": "Het Ethereum netwerk is gebaseerd op het “Ether” token. Je zal een kleine hoeveelheid nodig hebben om dingen op het netwerk te doen.",
+ "loadItDescription": "Als je al Bitcoins of een andere cryptocurrency hebt kan je deze makkelijk inwisselen voor Ether met Shapeshift.
Wij raden aan een hoeveelheid van tussen de
0.25 en 1 Ether om te wisselen.",
+ "mineItDescription": "
Op het testnetwerk kun je zelf Ether mijnen door te gaan naar het Ontwikkelaars menu en te kiezen voor Begin Mining . PROBEER GEEN ECHTE ETHER NAAR DIT ADRES TE VERSTUREN ",
+ "you": "Je",
+ "etherbase": "Centrale account (Etherbase)",
"depositBitcoin": "Bitcoin Storten",
- "learnIt": "Leer terwijl u wacht",
+ "viaShapeshift": "Direct omwisselen via
Shapeshift ",
+ "learnIt": "Leer terwijl je wacht",
"downloadingBlocks": "Blokken downloaden",
- "tutorial1Description": "
Het enige wat er nog moet gebeuren is wachten tot de download compleet is. Hier zijn een aantal leessuggesties:
Maak uw eigen geld Maak een cryptocurrency met een vaste uitgeveven hoeveelheid, tokens die vermogen uit de echte wereld voorstellen, etc
",
+ "syncMessage": "Blok __displayBlock__ van __highestBlockString__",
+ "syncMessageWithStates": "Blok __displayBlock__ van __highestBlockString__ (Chain structuur __statesPercent__%)",
+ "startingSync": "Wachten op synchronisatie..",
+ "tutorial1Description": "
Het enige wat er nog moet gebeuren is wachten tot de download compleet is. Hier zijn een aantal leessuggesties:
Maak je eigen geld Maak een cryptocurrency met een vaste uitgeveven hoeveelheid, tokens die vermogen uit de echte wereld voorstellen, etc
",
"tutorial2Description": "
Start een crowdsale Haal geld op voor een gemeenschappelijk doel, volledig betrouwbaar zonder derde partij. Ga om het traditionele systeem heen en haal geld direct bij de bron op door een organisatie te crowdfunden via de blockchain
",
- "tutorial3Description": "
Blockchain Organisatie Maak een autonome organisatie aan met onbreekbare regels over het uitgeven van geld en wie beslissingen kan maken. Laat uw investeerders een actieve rol nemen in het besluiten hoe geld wordt uitgegeven
",
+ "tutorial3Description": "
Blockchain Organisatie Maak een autonome organisatie aan met onbreekbare regels over het uitgeven van geld en wie beslissingen kan maken. Laat je investeerders een actieve rol nemen in het besluiten hoe geld wordt uitgegeven
",
"buttons": {
"showPassword": "Toon wachtwoord",
"importAccount": "Importeer account",
@@ -230,40 +268,25 @@
"learnReceipt": "Leer dit recept"
},
"errors": {
- "nodeNotStartedYet": "Wacht nog een aantal seconden tot uw node volledig is opgestart en probeer het nog een keer",
+ "nodeNotStartedYet": "Wacht nog een aantal seconden tot je node volledig is opgestart en probeer het nog een keer",
"unknownFile": "Bestand niet herkent.",
"wrongPassword": "Incorrect wachtwoord.",
- "importFailed": "Kon bestand niet inporteren en kreeg: __error__"
- },
- "viaShapeshift": "Instant conversion via
Shapeshift ",
- "syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
- },
- "updateAvailable": {
- "newVersionAvailable": "New __name__ version available",
- "version": "Version",
- "downloadURL": "Download URL",
- "checksum": "Checksum",
- "downloadAndRestart": "Update and Restart",
- "download": "Download new version",
- "skipUpdate": "Skip Update",
- "notNow": "Ask me later",
- "checking": "Checking for updates to __name__...",
- "noUpdateFound": "No update found. You are running the latest version of __name__."
+ "importFailed": "Bestand importeren mislukt: __error__"
+ }
},
"connectAccount": {
- "chooseAccountTitle": "Choose account",
- "createAccount": "Create new account",
- "pinToSidebar": "Pin app to the sidebar",
- "connectAccountDescription": "You are sharing your identity with __dappName__. This allows the app to see any public information of your accounts, including balances connected to it."
+ "chooseAccountTitle": "Kies account",
+ "createAccount": "Creëer nieuw account",
+ "pinToSidebar": "Pin app aan de sidebar",
+ "connectAccountDescription": "Je deelt je indentiteit met __dappName__. Hierdoor heeft de app toegen tot alle openbare informatie van uw accounts inclusief de saldi."
}
}
},
"elements": {
- "checksumAlert": "Dit adres ziet er valide uit, maar het mist een aantal beveiligingsfuncties die u zullen beschermen teken typfouten, dus ga graag even na of dit de goede is. Als aangeveven, ga na of het beveiligingsicoon klopt.",
+ "checksumAlert": "Dit adres ziet er valide uit, maar het mist een aantal beveiligingsfuncties die je zullen beschermen teken typfouten, dus ga graag even na of dit de goede is. Als aangeveven, ga na of het beveiligingsicoon klopt.",
"identiconHelper": "Dit is een beveilliginsicoon, als er enige veranderingen op dit adres plaats vinden dan zou er een volledig ander icoon moeten staan",
"type": {
- "address": "Address",
+ "address": "Adres",
"bool": "Boolean",
"int": "Integer",
"uint": "Natural Number",
diff --git a/interface/i18n/mist.pt.i18n.json b/interface/i18n/mist.pt.i18n.json
index a6293987b..8a63a7806 100644
--- a/interface/i18n/mist.pt.i18n.json
+++ b/interface/i18n/mist.pt.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Contas",
- "importPresale": "Importar conta da pré-venda",
+ "importPresale": "Importar conta",
"newAccount": "Nova conta",
"backup": "Cópia de segurança",
"backupKeyStore": "Contas",
@@ -47,7 +47,11 @@
"mainNetwork": "Rede principal",
"startMining": "⛏ Iniciar mineração (somente em teste)",
"stopMining": "⛏ Parar mineração",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Janela",
@@ -70,7 +74,7 @@
"linux": "Para instalar um servidor de tempo, instale \"ntp\" via \"apt-get install ntp\".",
"darwin": "Abra suas preferências, escolha \"preferências de tempo\" e marque \"Ajustar o tempo automaticamente\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.ru.i18n.json b/interface/i18n/mist.ru.i18n.json
index 8ce816d1f..7f4a73b8a 100644
--- a/interface/i18n/mist.ru.i18n.json
+++ b/interface/i18n/mist.ru.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Аккаунты",
- "importPresale": "Импорт предпродажных аккаунтов",
+ "importPresale": "Импорт аккаунтов",
"newAccount": "Создать аккаунт",
"backup": "Резервное копирование",
"backupKeyStore": "Аккаунтов",
@@ -47,7 +47,11 @@
"mainNetwork": "Основная сеть",
"startMining": "⛏ Запустить майнинг (только для тестовой сети)",
"stopMining": "⛏ Остановить майнинг",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Окно",
@@ -70,7 +74,7 @@
"linux": "Чтобы использовать сервер синхронизации времени установите \"ntp\" через команду \"apt-get install ntp\".",
"darwin": "Для включения синхронизации времени откройте системные настройки и укажите: \"Устанавливать время и дату автоматически\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -239,19 +243,24 @@
"wrongPassword": "Неверный пароль.",
"importFailed": "Не удалось импортировать файл, дополнительно: __error__"
},
- "accountTitleTestnet": "Mine some!"
- },
- "clientUpdateAvailable": {
- "downloadAndRestart": "Update and Restart",
- "download": "Update",
- "skipUpdate": "Skip Update",
- "newVersionAvailable": "New Ethereum node versions are available!"
+ "accountTitleTestnet": "Mine some!",
+ "startingSync": "Getting ready to sync.."
},
"connectAccount": {
"chooseAccountTitle": "Choose account",
"createAccount": "Create new account",
"pinToSidebar": "Pin app to the sidebar",
"connectAccountDescription": "You are sharing your identity with __dappName__. This allows the app to see any public information of your accounts, including balances connected to it."
+ },
+ "requestAccount": {
+ "title": "Create account",
+ "enterPassword": "Enter password",
+ "repeatPassword": "Repeat password",
+ "creating": "Generating account...",
+ "errors": {
+ "passwordMismatch": "Your passwords don't match.",
+ "passwordTooShort": "Make a longer password"
+ }
}
}
},
@@ -267,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.sq.i18n.json b/interface/i18n/mist.sq.i18n.json
index c8312af25..8f7713eaa 100644
--- a/interface/i18n/mist.sq.i18n.json
+++ b/interface/i18n/mist.sq.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "Llogari",
- "importPresale": "Merr llogari të para-shitur",
+ "importPresale": "Merr llogari",
"newAccount": "Llogari e re",
"backup": "Ruaj një kopje rezervë",
"backupKeyStore": "Llogari",
@@ -47,7 +47,11 @@
"mainNetwork": "Rrjeti kryesor",
"startMining": "⛏ Fillo të Prodhosh (Rrjet testimi)",
"stopMining": "⛏ Ndalo së Prodhuari",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "Dritare",
@@ -70,7 +74,7 @@
"linux": "Që të fusni në punë një server kohe të sinkronizuar instaloni \"ntp\" nëpërmjet \"apt-get install ntp\".",
"darwin": "Që të mundësoni një sinkronizim kohe, hapni preferencat e kohes dhe përzgjidhni \"Set the time and date automatically\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
diff --git a/interface/i18n/mist.zh-TW.i18n.json b/interface/i18n/mist.zh-TW.i18n.json
index eb33f3286..0a204209c 100644
--- a/interface/i18n/mist.zh-TW.i18n.json
+++ b/interface/i18n/mist.zh-TW.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "帳號",
- "importPresale": "導入預售帳號",
+ "importPresale": "導入帳號",
"newAccount": "新建帳號",
"backup": "備份",
"backupKeyStore": "帳號",
@@ -47,7 +47,11 @@
"mainNetwork": "主網路",
"startMining": "⛏ 開啓挖礦（僅限Testnet網路）",
"stopMining": "⛏ 停止挖礦",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "視窗",
@@ -70,7 +74,7 @@
"linux": "爲開啓時間同步伺服器，請通過\"apt-get install ntp\"安裝\"ntp\"。",
"darwin": "爲開啓時間同步，打開時間選項並勾選\"Set the time and date automatically\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/interface/i18n/mist.zh.i18n.json b/interface/i18n/mist.zh.i18n.json
index fb2754d7d..32b67136a 100644
--- a/interface/i18n/mist.zh.i18n.json
+++ b/interface/i18n/mist.zh.i18n.json
@@ -28,7 +28,7 @@
},
"accounts": {
"label": "账户",
- "importPresale": "导入预售账户",
+ "importPresale": "导入账户",
"newAccount": "新建账户",
"backup": "备份",
"backupKeyStore": "账户",
@@ -47,7 +47,11 @@
"mainNetwork": "主网络",
"startMining": "⛏ 开启挖矿（仅限Testnet网络）",
"stopMining": "⛏ 停止挖矿",
- "externalNode": "using external node"
+ "externalNode": "using external node",
+ "openRemix": "Open Remix IDE",
+ "nodeMode": "Chain download",
+ "fullNode": "Store full blockchain",
+ "lightNode": "Use light Node (experimental!)"
},
"window": {
"label": "窗口",
@@ -70,7 +74,7 @@
"linux": "为开启时间同步服务器，请通过\"apt-get install ntp\"安装\"ntp\"。",
"darwin": "为开启时间同步，打开时间选项并勾选\"Set the time and date automatically\"."
},
- "nodeChecksumMismatch": {
+ "nodeChecksumMismatch": {
"title": "Checksum mismatch in downloaded node!",
"description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually."
},
@@ -237,7 +241,8 @@
},
"viaShapeshift": "Instant conversion via
Shapeshift ",
"syncMessage": "Block __displayBlock__ of __highestBlockString__",
- "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)"
+ "syncMessageWithStates": "Block __displayBlock__ of __highestBlockString__ (Chain structure __statesPercent__%)",
+ "startingSync": "Getting ready to sync.."
},
"updateAvailable": {
"newVersionAvailable": "New __name__ version available",
@@ -271,4 +276,4 @@
"bytes": "Bytes"
}
}
-}
+}
\ No newline at end of file
diff --git a/main.js b/main.js
index 302a1662e..b11a553b6 100644
--- a/main.js
+++ b/main.js
@@ -1,8 +1,3 @@
-const squirrelStartup = require('electron-squirrel-startup');
-// windows only: don't run app during squirrel-install
-function exit() { return; }
-if (squirrelStartup) exit();
-
global._ = require('./modules/utils/underscore');
const { app, dialog, ipcMain, shell } = require('electron');
@@ -415,7 +410,7 @@ onReady = () => {
splashWindow.show();
}
- if (Settings.inAutoTestMode) {
+ if (!Settings.inAutoTestMode) {
return syncResultPromise;
}
diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js
index 7cb5c5e1a..0fa9b5817 100644
--- a/modules/clientBinaryManager.js
+++ b/modules/clientBinaryManager.js
@@ -73,6 +73,8 @@ class Manager extends EventEmitter {
log.warn('Error fetching client binaries config from repo', err);
})
.then((latestConfig) => {
+ if(!latestConfig) return;
+
let localConfig;
let skipedVersion;
const nodeVersion = latestConfig.clients[nodeType].version;
@@ -178,7 +180,9 @@ class Manager extends EventEmitter {
.then((localConfig) => {
if (!localConfig) {
log.info('No config for the ClientBinaryManager could be loaded, using local clientBinaries.json.');
- localConfig = require('../clientBinaries.json');
+
+ const localConfigPath = path.join(Settings.userDataPath, 'clientBinaries.json');
+ localConfig = (fs.existsSync(localConfigPath)) ? require(localConfigPath) : require('../clientBinaries.json'); // eslint-disable-line no-param-reassign, global-require, import/no-dynamic-require, import/no-unresolved
}
// scan for node
diff --git a/modules/db.js b/modules/db.js
index 3b5fbd102..c7d95ce58 100644
--- a/modules/db.js
+++ b/modules/db.js
@@ -1,5 +1,4 @@
const fs = require('fs');
-const path = require('path');
const Q = require('bluebird');
const Loki = require('lokijs');
const Settings = require('./settings');
@@ -10,7 +9,7 @@ let db;
exports.init = () => {
- const filePath = path.join(Settings.userDataPath, 'mist.lokidb');
+ const filePath = Settings.dbFilePath;
return Q.try(() => {
// if db file doesn't exist then create it
diff --git a/modules/dbSync.js b/modules/dbSync.js
index eda6e81f8..b21f9b22d 100644
--- a/modules/dbSync.js
+++ b/modules/dbSync.js
@@ -14,13 +14,13 @@ exports.backendSyncInit = function () {
ipc.on('dbSync-add', (event, args) => {
let collName = args.collName,
- coll = db.getCollection('UI_'+ collName);
+ coll = db.getCollection(`UI_${collName}`);
log.trace('dbSync-add', collName, args._id);
const _id = args._id;
- if (!coll.by("_id", _id)) {
+ if (!coll.by('_id', _id)) {
args.fields._id = _id;
coll.insert(args.fields);
}
@@ -28,12 +28,12 @@ exports.backendSyncInit = function () {
ipc.on('dbSync-changed', (event, args) => {
let collName = args.collName,
- coll = db.getCollection('UI_'+ collName);
+ coll = db.getCollection(`UI_${collName}`);
log.trace('dbSync-changed', collName, args._id);
const _id = args._id;
- const item = coll.by("_id", _id);
+ const item = coll.by('_id', _id);
if (item) {
for (const k in args.fields) {
@@ -50,12 +50,12 @@ exports.backendSyncInit = function () {
ipc.on('dbSync-removed', (event, args) => {
let collName = args.collName,
- coll = db.getCollection('UI_'+ collName);
+ coll = db.getCollection(`UI_${collName}`);
log.trace('dbSync-removed', collName, args._id);
const _id = args._id;
- const item = coll.by("_id", _id);
+ const item = coll.by('_id', _id);
if (item) {
coll.remove(item);
@@ -67,7 +67,7 @@ exports.backendSyncInit = function () {
// Get all data (synchronous)
ipc.on('dbSync-reloadSync', (event, args) => {
let collName = args.collName,
- coll = db.getCollection('UI_'+ collName),
+ coll = db.getCollection(`UI_${collName}`),
docs = coll.find();
log.debug('dbSync-reloadSync, no. of docs:', collName, docs.length);
@@ -88,15 +88,15 @@ exports.backendSyncInit = function () {
});
};
-var syncDataFromBackend = function(coll){
- let ipc = ipcRenderer;
+const syncDataFromBackend = function (coll) {
+ const ipc = ipcRenderer;
- let collName = coll._name;
+ const collName = coll._name;
console.debug('Load collection data from backend: ', collName);
return new Promise((resolve, reject) => {
- let dataJson = ipc.sendSync('dbSync-reloadSync', {
+ const dataJson = ipc.sendSync('dbSync-reloadSync', {
collName,
});
@@ -105,8 +105,9 @@ var syncDataFromBackend = function(coll){
coll.remove({});
- if(!dataJson.length)
+ if (!dataJson.length) {
resolve();
+ }
// we do inserts slowly, to avoid race conditions when it comes
// to updating the UI
@@ -120,10 +121,11 @@ var syncDataFromBackend = function(coll){
record.redirect = null;
}
- if(record._id)
+ if (record._id) {
coll.upsert(record._id, record);
- else
+ } else {
coll.insert(record);
+ }
} catch (err) {
console.error(err.toString());
}
@@ -138,7 +140,7 @@ var syncDataFromBackend = function(coll){
} catch (err) {
reject(err);
}
- })
+ });
};
exports.syncDataFromBackend = syncDataFromBackend;
@@ -146,8 +148,8 @@ exports.frontendSyncInit = function (coll) {
let ipc = ipcRenderer,
syncDoneResolver;
- let collName = coll._name;
-
+ const collName = coll._name;
+
coll.onceSynced = new Promise((resolve, reject) => {
syncDoneResolver = resolve;
});
diff --git a/modules/ethereumNode.js b/modules/ethereumNode.js
index 2932dac0a..b37c67e8e 100644
--- a/modules/ethereumNode.js
+++ b/modules/ethereumNode.js
@@ -315,13 +315,14 @@ class EthereumNode extends EventEmitter {
this._network = network;
this._type = nodeType;
- let client = ClientBinaryManager.getClient(nodeType);
+ const client = ClientBinaryManager.getClient(nodeType);
let binPath;
- if(client)
+ if (client) {
binPath = client.binPath;
- else
+ } else {
throw new Error(`Node "${nodeType}" binPath is not available.`);
+ }
log.info(`Start node using ${binPath}`);
@@ -358,7 +359,7 @@ class EthereumNode extends EventEmitter {
// START MAINNET
else {
args = (nodeType === 'geth')
- ? ['--fast', '--cache', '1024']
+ ? ['--fast', '--cache', '1024']
: ['--unsafe-transactions'];
}
diff --git a/modules/ipc/dechunker.js b/modules/ipc/dechunker.js
index a77e54866..3bf74b22c 100644
--- a/modules/ipc/dechunker.js
+++ b/modules/ipc/dechunker.js
@@ -39,8 +39,9 @@ module.exports = class Dechunker {
return _.each(dechunkedData, (data) => {
// prepend the last chunk
- if (this.lastChunk)
- { data = this.lastChunk + data; }
+ if (this.lastChunk) {
+ data = this.lastChunk + data;
+ }
let result = data;
diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js
index 8ce1b4040..ee9bb46d3 100644
--- a/modules/ipc/ipcProviderBackend.js
+++ b/modules/ipc/ipcProviderBackend.js
@@ -20,7 +20,7 @@ const Windows = require('../windows');
const ERRORS = {
- INVALID_PAYLOAD: { code: -32600, message: 'Payload invalid.' },
+ INVALID_PAYLOAD: { code: -32600, message: 'Payload, or some of its content properties are invalid. Please check if they are valid HEX.' },
METHOD_DENIED: { code: -32601, message: "Method \'__method__\' not allowed." },
METHOD_TIMEOUT: { code: -32603, message: "Request timed out for method \'__method__\'." },
TX_DENIED: { code: -32603, message: 'Transaction denied' },
@@ -100,8 +100,7 @@ class IpcProviderBackend {
socket.destroy().finally(() => {
- if(!owner.isDestroyed())
- owner.send(`ipcProvider-${ev}`, JSON.stringify(data));
+ if (!owner.isDestroyed()) { owner.send(`ipcProvider-${ev}`, JSON.stringify(data)); }
});
delete this._connections[ownerId];
@@ -110,8 +109,9 @@ class IpcProviderBackend {
});
socket.on('connect', (data) => {
- if(!owner.isDestroyed())
+ if (!owner.isDestroyed()) {
owner.send('ipcProvider-connect', JSON.stringify(data));
+ }
});
// pass notifications back up the chain
@@ -124,8 +124,9 @@ class IpcProviderBackend {
data = this._makeResponsePayload(data, data);
}
- if(!owner.isDestroyed())
+ if (!owner.isDestroyed()) {
owner.send('ipcProvider-data', JSON.stringify(data));
+ }
});
}
})
@@ -172,8 +173,9 @@ class IpcProviderBackend {
}
})
.then(() => {
- if(!owner.isDestroyed())
+ if (!owner.isDestroyed()) {
owner.send('ipcProvider-setWritable', true);
+ }
return this._connections[ownerId];
});
@@ -356,7 +358,7 @@ class IpcProviderBackend {
if (isSync) {
event.returnValue = returnValue;
- } else if(!event.sender.isDestroyed()) {
+ } else if (!event.sender.isDestroyed()) {
event.sender.send('ipcProvider-data', returnValue);
}
});
diff --git a/modules/ipc/methods/eth_sendTransaction.js b/modules/ipc/methods/eth_sendTransaction.js
index fc90f073f..d6e4b29b2 100644
--- a/modules/ipc/methods/eth_sendTransaction.js
+++ b/modules/ipc/methods/eth_sendTransaction.js
@@ -34,13 +34,19 @@ module.exports = class extends BaseProcessor {
// validate data
try {
- _.each(payload.params[0], (val) => {
+ _.each(payload.params[0], (val, key) => {
// if doesn't have hex then leave
if (_.isString(val)) {
+
+ // make sure all data is lowercase and has 0x
+ if (val) val = `0x${val.toLowerCase().replace('0x', '')}`;
+
if (val.match(/[^0-9a-fx]/igm)) {
throw this.ERRORS.INVALID_PAYLOAD;
}
}
+
+ payload.params[0][key] = val;
});
} catch (err) {
return reject(err);
@@ -70,8 +76,7 @@ module.exports = class extends BaseProcessor {
ipc.once('backendAction_unlockedAccountAndSentTransaction', (ev, err, result) => {
if (Windows.getById(ev.sender.id) === modalWindow
- && !modalWindow.isClosed)
- {
+ && !modalWindow.isClosed) {
if (err || !result) {
this._log.debug('Confirmation error', err);
diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js
index a833daea5..0d0affe35 100644
--- a/modules/ipcCommunicator.js
+++ b/modules/ipcCommunicator.js
@@ -5,10 +5,14 @@ Window communication
*/
const _ = global._;
+const fs = require('fs');
const { app, ipcMain: ipc, shell, webContents } = require('electron');
const Windows = require('./windows');
const logger = require('./utils/logger');
const appMenu = require('./menuItems');
+const Settings = require('./settings');
+const ethereumNode = require('./ethereumNode.js');
+const keyfileRecognizer = require('ethereum-keyfile-recognizer');
const log = logger.create('ipcCommunicator');
@@ -62,7 +66,7 @@ ipc.on('backendAction_windowCallback', (e, value1, value2, value3) => {
const windowId = e.sender.id;
const senderWindow = Windows.getById(windowId);
- if(senderWindow.callback) {
+ if (senderWindow.callback) {
senderWindow.callback(value1, value2, value3);
}
});
@@ -100,48 +104,99 @@ ipc.on('backendAction_setLanguage', (e, lang) => {
ipc.on('backendAction_stopWebviewNavigation', (e, id) => {
console.log('webcontent ID', id);
- var webContent = webContents.fromId(id);
+ const webContent = webContents.fromId(id);
- if(webContent && !webContent.isDestroyed())
+ if (webContent && !webContent.isDestroyed()) {
webContent.stop();
+ }
e.returnValue = true;
});
+// check wallet file
+ipc.on('backendAction_checkWalletFile', (e, path) => {
+
+ log.warn(111);
+ fs.readFile(path, 'utf8', (event, data) => {
+ try {
+ const wallet = JSON.parse(data);
+ const result = keyfileRecognizer(wallet);
+ /** result
+ * [ 'ethersale', undefined ] Ethersale keyfile
+ * [ 'web3', 3 ] web3 (v3) keyfile
+ * null no valid keyfile
+ */
+
+ if (_.first(result) === 'ethersale') {
+ e.sender.send('uiAction_checkedWalletFile', null, 'presale');
+ } else if (_.first(result) === 'web3') {
+ e.sender.send('uiAction_checkedWalletFile', null, 'web3');
+
+ let keystorePath = Settings.userHomePath;
+ // eth
+ if (ethereumNode.isEth) {
+ if (process.platform === 'win32') {
+ keystorePath = `${Settings.appDataPath}\\Web3\\keys`;
+ } else {
+ keystorePath += '/.web3/keys';
+ }
+ // geth
+ } else {
+ if (process.platform === 'darwin') keystorePath += '/Library/Ethereum/keystore';
+
+ if (process.platform === 'freebsd' ||
+ process.platform === 'linux' ||
+ process.platform === 'sunos') keystorePath += '/.ethereum/keystore';
+
+ if (process.platform === 'win32') keystorePath = `${Settings.appDataPath}\\Ethereum\\keystore`;
+ }
+
+ fs.writeFile(`${keystorePath}/0x${wallet.address}`, data, (err) => {
+ if (err) throw new Error("Can't write file to disk");
+ });
+ } else {
+ throw new Error('Wallet import: Cannot recognize keyfile');
+ }
+ } catch (err) {
+ e.sender.send('uiAction_checkedWalletFile', null, 'invalid');
+ log.error(err);
+ }
+ });
+});
+
-// import presale file
-ipc.on('backendAction_importPresaleFile', (e, path, pw) => {
- const spawn = require('child_process').spawn;
- const ClientBinaryManager = require('./clientBinaryManager');
+// import presale wallet
+ipc.on('backendAction_importWalletFile', (e, path, pw) => {
+ const spawn = require('child_process').spawn; // eslint-disable-line global-require
+ const ClientBinaryManager = require('./clientBinaryManager'); // eslint-disable-line global-require
let error = false;
const binPath = ClientBinaryManager.getClient('geth').binPath;
-
- // start import process
const nodeProcess = spawn(binPath, ['wallet', 'import', path]);
nodeProcess.once('error', () => {
error = true;
- e.sender.send('uiAction_importedPresaleFile', 'Couldn\'t start the "geth wallet import
" process.');
+ e.sender.send('uiAction_importedWalletFile', 'Couldn\'t start the "geth wallet import " process.');
});
- nodeProcess.stdout.on('data', (data) => {
- var data = data.toString();
- if (data)
- { log.info('Imported presale: ', data); }
+ nodeProcess.stdout.on('data', (_data) => {
+ const data = _data.toString();
+ if (data) {
+ log.info('Imported presale: ', data);
+ }
if (/Decryption failed|not equal to expected addr|could not decrypt/.test(data)) {
- e.sender.send('uiAction_importedPresaleFile', 'Decryption Failed');
+ e.sender.send('uiAction_importedWalletFile', 'Decryption Failed');
- // if imported, return the address
+ // if imported, return the address
} else if (data.indexOf('Address:') !== -1) {
const find = data.match(/\{([a-f0-9]+)\}/i);
if (find.length && find[1]) {
- e.sender.send('uiAction_importedPresaleFile', null, `0x${find[1]}`);
+ e.sender.send('uiAction_importedWalletFile', null, `0x${find[1]}`);
} else {
- e.sender.send('uiAction_importedPresaleFile', data);
+ e.sender.send('uiAction_importedWalletFile', data);
}
- // if not stop, so we don't kill the process
+ // if not stop, so we don't kill the process
} else {
return;
}
@@ -155,7 +210,7 @@ ipc.on('backendAction_importPresaleFile', (e, path, pw) => {
setTimeout(() => {
if (!error) {
nodeProcess.stdin.write(`${pw}\n`);
- pw = null;
+ pw = null; // eslint-disable-line no-param-reassign
}
}, 2000);
});
@@ -183,7 +238,7 @@ ipc.on('mistAPI_requestAccount', (e) => {
ownerId: e.sender.id,
electronOptions: {
width: 460,
- height: 497,
+ height: 520,
maximizable: false,
minimizable: false,
alwaysOnTop: true,
diff --git a/modules/menuItems.js b/modules/menuItems.js
index 39b26a8c2..7545068dd 100644
--- a/modules/menuItems.js
+++ b/modules/menuItems.js
@@ -13,10 +13,10 @@ const ClientBinaryManager = require('./clientBinaryManager');
const switchForSystem = function (options) {
if (process.platform in options) {
return options[process.platform];
- }
- else if ('default' in options) {
+ } else if ('default' in options) {
return options.default;
}
+ return null;
};
@@ -298,7 +298,7 @@ let menuTempl = function (webviews) {
// DEVELOP
- let devToolsMenu = [];
+ const devToolsMenu = [];
// change for wallet
if (Settings.uiMode === 'mist') {
@@ -338,16 +338,40 @@ let menuTempl = function (webviews) {
}
const externalNodeMsg = (ethereumNode.isOwnNode) ? '' : ` (${i18n.t('mist.applicationMenu.develop.externalNode')})`;
- devToolsMenu = [{
+ devToolsMenu.push({
label: i18n.t('mist.applicationMenu.develop.devTools'),
submenu: devtToolsSubMenu,
- }, {
+ });
+
+ if (Settings.uiMode === 'mist') {
+ devToolsMenu.push({
+ label: i18n.t('mist.applicationMenu.develop.openRemix'),
+ enabled: true,
+ click() {
+ Windows.createPopup('remix', {
+ url: 'https://remix.ethereum.org',
+ electronOptions: {
+ width: 1024,
+ height: 720,
+ center: true,
+ frame: true,
+ resizable: true,
+ titleBarStyle: 'default',
+ }
+ });
+ },
+ });
+ }
+
+ devToolsMenu.push({
label: i18n.t('mist.applicationMenu.develop.runTests'),
enabled: (Settings.uiMode === 'mist'),
click() {
Windows.getByType('main').send('uiAction_runTests', 'webview');
},
- }, {
+ });
+
+ devToolsMenu.push({
label: i18n.t('mist.applicationMenu.develop.logFiles') + externalNodeMsg,
enabled: ethereumNode.isOwnNode,
click() {
@@ -358,9 +382,7 @@ let menuTempl = function (webviews) {
log = 'Couldn\'t load log file.';
}
},
- },
- ];
-
+ });
// add node switching menu
devToolsMenu.push({
diff --git a/modules/nodeSync.js b/modules/nodeSync.js
index 294ffca8e..558b19584 100644
--- a/modules/nodeSync.js
+++ b/modules/nodeSync.js
@@ -149,7 +149,7 @@ class NodeSync extends EventEmitter {
const diff = now - +blockResult.timestamp;
- log.debug(`Last block: ${blockResult.number}, ${diff}s ago`);
+ log.debug(`Last block: ${Number(blockResult.number)}, ${diff}s ago`);
// need sync if > 1 minute
if (diff > 60) {
diff --git a/modules/preloader/browser.js b/modules/preloader/browser.js
index 92b1241e5..1ba237466 100644
--- a/modules/preloader/browser.js
+++ b/modules/preloader/browser.js
@@ -18,7 +18,7 @@ ipcRenderer.sendToHost('setWebviewId');
ipcRenderer.send('ipcProvider-destroy');
// Security
-process.on('loaded',function () {
+process.on('loaded', function () {
Object.freeze(window.JSON);
// Object.freeze(window.Function);
// Object.freeze(window.Function.prototype);
diff --git a/modules/preloader/include/getFavicon.js b/modules/preloader/include/getFavicon.js
index 6e67db48f..be7e26f2d 100644
--- a/modules/preloader/include/getFavicon.js
+++ b/modules/preloader/include/getFavicon.js
@@ -12,10 +12,11 @@ const { ipcRenderer } = require('electron');
function DOMContentLoaded(event) {
const icon = document.querySelector('link[rel="apple-touch-icon"]') || document.querySelector('link[type="image/x-icon"]') || document.querySelector('link[rel="shortcut"]') || document.querySelector('link[rel="shortcut icon"]') || document.querySelector('link[rel="icon"]');
- if (icon)
- { ipcRenderer.sendToHost('favicon', icon.href); }
- else
- { ipcRenderer.sendToHost('favicon', null); }
+ if (icon) {
+ ipcRenderer.sendToHost('favicon', icon.href);
+ } else {
+ ipcRenderer.sendToHost('favicon', null);
+ }
document.removeEventListener('DOMContentLoaded', DOMContentLoaded, false);
}
diff --git a/modules/preloader/include/getMetaTags.js b/modules/preloader/include/getMetaTags.js
index 233a1260b..6186ddade 100644
--- a/modules/preloader/include/getMetaTags.js
+++ b/modules/preloader/include/getMetaTags.js
@@ -4,7 +4,7 @@ Gest the meta[name="ethereum-dapp-url-bar-style"] meta tag
@module getMetaTags
*/
-const { ipcRenderer } = require('electron');
+const { ipcRenderer } = require('electron');
module.export = (function () {
document.addEventListener('DOMContentLoaded', DOMContentLoaded, false);
@@ -12,10 +12,11 @@ module.export = (function () {
function DOMContentLoaded(event) {
const appBar = document.querySelector('meta[name="ethereum-dapp-url-bar-style"]');
- if (appBar)
- { ipcRenderer.sendToHost('appBar', appBar.content); }
- else
- { ipcRenderer.sendToHost('appBar', null); }
+ if (appBar) {
+ ipcRenderer.sendToHost('appBar', appBar.content);
+ } else {
+ ipcRenderer.sendToHost('appBar', null);
+ }
document.removeEventListener('DOMContentLoaded', DOMContentLoaded, false);
}
diff --git a/modules/preloader/include/mistAPI.js b/modules/preloader/include/mistAPI.js
index bd2389128..d931ac38a 100644
--- a/modules/preloader/include/mistAPI.js
+++ b/modules/preloader/include/mistAPI.js
@@ -56,6 +56,9 @@ module.exports = () => {
ipcRenderer.send('mistAPI_requestAccount');
},
+ solidity: {
+ version: String(packageJson.dependencies.solc).match(/\d+\.\d+\.\d+/)[0],
+ },
sounds: {
bip: function playSound() {
ipcRenderer.sendToHost('mistAPI_sound', `file://${__dirname}/../../../sounds/bip.mp3`);
@@ -102,7 +105,7 @@ module.exports = () => {
@param {Function} callback Change the callback to be called when the menu is pressed.
*/
add(id, options, callback) {
- var args = Array.prototype.slice.call(arguments);
+ const args = Array.prototype.slice.call(arguments);
callback = _.isFunction(args[args.length - 1]) ? args.pop() : null;
options = _.isObject(args[args.length - 1]) ? args.pop() : null;
id = _.isString(args[args.length - 1]) || _.isFinite(args[args.length - 1]) ? args.pop() : null;
diff --git a/modules/preloader/include/openExternal.js b/modules/preloader/include/openExternal.js
index 962eebb19..b4f484d64 100644
--- a/modules/preloader/include/openExternal.js
+++ b/modules/preloader/include/openExternal.js
@@ -12,10 +12,11 @@ document.addEventListener('click', (e) => {
let node = false;
- if (e.target.nodeName === 'A')
- { node = e.target; }
- else if (e.target.parentNode && e.target.parentNode.nodeName === 'A')
- { node = e.target.parentNode; }
+ if (e.target.nodeName === 'A') {
+ node = e.target;
+ } else if (e.target.parentNode && e.target.parentNode.nodeName === 'A') {
+ node = e.target.parentNode;
+ }
// open in browser
if (node && node.attributes.target && node.attributes.target.value === '_blank') {
diff --git a/modules/preloader/include/openPopup.js b/modules/preloader/include/openPopup.js
index 54a1e1278..ddaa73720 100644
--- a/modules/preloader/include/openPopup.js
+++ b/modules/preloader/include/openPopup.js
@@ -10,10 +10,11 @@ const { remote } = require('electron');
document.addEventListener('click', (e) => {
let node = false;
- if (e.target.nodeName === 'A')
- { node = e.target; }
- else if (e.target.parentNode && e.target.parentNode.nodeName === 'A')
- { node = e.target.parentNode; }
+ if (e.target.nodeName === 'A') {
+ node = e.target;
+ } else if (e.target.parentNode && e.target.parentNode.nodeName === 'A') {
+ node = e.target.parentNode;
+ }
// open popup
if (node && node.attributes.target && node.attributes.target.value === '_popup') {
@@ -25,6 +26,6 @@ document.addEventListener('click', (e) => {
nodeIntegration: false,
}
});
- win.loadURL(node.href, true);
+ win.loadURL(node.href);
}
}, false);
diff --git a/modules/preloader/mistUI.js b/modules/preloader/mistUI.js
index b1dd85be2..a42f50508 100644
--- a/modules/preloader/mistUI.js
+++ b/modules/preloader/mistUI.js
@@ -56,11 +56,12 @@ ipcRenderer.on('uiAction_windowMessage', (e, type, id, error, value) => {
}
// forward to the webview (TODO: remove and manage in the ipcCommunicator?)
- var tab = Tabs.findOne({ webviewId: id });
- if(tab) {
- webview = $('webview[data-id='+ tab._id +']')[0];
- if(webview)
+ const tab = Tabs.findOne({ webviewId: id });
+ if (tab) {
+ webview = $(`webview[data-id=${tab._id}]`)[0];
+ if (webview) {
webview.send('uiAction_windowMessage', type, error, value);
+ }
}
});
@@ -73,20 +74,22 @@ ipcRenderer.on('uiAction_enableBlurOverlay', (e, value) => {
ipcRenderer.on('uiAction_toggleWebviewDevTool', (e, id) => {
const webview = Helpers.getWebview(id);
- if (!webview)
- { return; }
+ if (!webview) {
+ return;
+ }
- if (webview.isDevToolsOpened())
- { webview.closeDevTools(); }
- else
- { webview.openDevTools(); }
+ if (webview.isDevToolsOpened()) {
+ webview.closeDevTools();
+ } else {
+ webview.openDevTools();
+ }
});
// randomize accounts and drop half
// also certainly remove the web3.ethbase one
-var randomizeAccounts = (acc, coinbase) => {
- var accounts = _.shuffle(acc);
+const randomizeAccounts = (acc, coinbase) => {
+ let accounts = _.shuffle(acc);
accounts = _.rest(accounts, (accounts.length / 2).toFixed(0));
accounts = _.without(accounts, coinbase);
return accounts;
@@ -117,7 +120,7 @@ ipcRenderer.on('uiAction_runTests', (e, type) => {
// update the permissions, when accounts change
Tracker.autorun(() => {
- var accountList = _.pluck(EthAccounts.find({}, { fields: { address: 1 } }).fetch(), 'address');
+ const accountList = _.pluck(EthAccounts.find({}, { fields: { address: 1 } }).fetch(), 'address');
Tabs.update('tests', { $set: {
'permissions.accounts': randomizeAccounts(accountList, coinbase),
@@ -128,7 +131,6 @@ ipcRenderer.on('uiAction_runTests', (e, type) => {
}
});
-
// CONTEXT MENU
const currentMousePosition = { x: 0, y: 0 };
@@ -136,18 +138,21 @@ const menu = new Menu();
// menu.append(new MenuItem({ type: 'separator' }));
menu.append(new MenuItem({ label: i18n.t('mist.rightClick.reload'), accelerator: 'Command+R', click() {
const webview = Helpers.getWebview(LocalStore.get('selectedTab'));
- if (webview)
- { webview.reloadIgnoringCache(); }
+ if (webview) {
+ webview.reloadIgnoringCache();
+ }
} }));
menu.append(new MenuItem({ label: i18n.t('mist.rightClick.openDevTools'), click() {
const webview = Helpers.getWebview(LocalStore.get('selectedTab'));
- if (webview)
- { webview.openDevTools(); }
+ if (webview) {
+ webview.openDevTools();
+ }
} }));
menu.append(new MenuItem({ label: i18n.t('mist.rightClick.inspectElements'), click() {
const webview = Helpers.getWebview(LocalStore.get('selectedTab'));
- if (webview)
- { webview.inspectElement(currentMousePosition.x, currentMousePosition.y); }
+ if (webview) {
+ webview.inspectElement(currentMousePosition.x, currentMousePosition.y);
+ }
} }));
@@ -167,7 +172,8 @@ document.addEventListener('keydown', (e) => {
// RELOAD current webview
if (e.metaKey && e.keyCode === 82) {
const webview = Helpers.getWebview(LocalStore.get('selectedTab'));
- if (webview)
- { webview.reloadIgnoringCache(); }
+ if (webview) {
+ webview.reloadIgnoringCache();
+ }
}
}, false);
diff --git a/modules/preloader/walletMain.js b/modules/preloader/walletMain.js
index 9b4909579..7bb9115f8 100644
--- a/modules/preloader/walletMain.js
+++ b/modules/preloader/walletMain.js
@@ -17,6 +17,7 @@ setTimeout(() => {
}, 1000);
setTimeout(() => {
- if (document.getElementsByTagName('html')[0])
- { document.getElementsByTagName('html')[0].className = window.platform; }
+ if (document.getElementsByTagName('html')[0]) {
+ document.getElementsByTagName('html')[0].className = window.platform;
+ }
}, 500);
diff --git a/modules/settings.js b/modules/settings.js
index 353cc0fb4..6f81ff7ec 100644
--- a/modules/settings.js
+++ b/modules/settings.js
@@ -156,6 +156,11 @@ class Settings {
return app.getPath('userData');
}
+ get dbFilePath() {
+ const dbFileName = (this.inAutoTestMode) ? 'mist.test.lokidb' : 'mist.lokidb';
+ return path.join(this.userDataPath, dbFileName);
+ }
+
get appDataPath() {
// Application Support/
return app.getPath('appData');
diff --git a/modules/web3Admin.js b/modules/web3Admin.js
index cde4400a7..b0bc656ae 100644
--- a/modules/web3Admin.js
+++ b/modules/web3Admin.js
@@ -13,7 +13,7 @@ module.exports = {
property: 'admin',
methods:
[
- insertMethod('addPeer', 'admin_addPeer', 1, [web3._extend.utils.fromDecimal], web3._extend.formatters.formatOutputBool),
+ insertMethod('addPeer', 'admin_addPeer', 1, [null], web3._extend.formatters.formatOutputBool),
insertMethod('exportChain', 'admin_exportChain', 1, [null], null),
insertMethod('importChain', 'admin_importChain', 1, [null], null),
insertMethod('verbosity', 'admin_verbosity', 1, [web3._extend.utils.formatInputInt], web3._extend.formatters.formatOutputBool),
@@ -52,8 +52,8 @@ module.exports = {
[
insertMethod('start', 'miner_start', 1, [web3._extend.formatters.formatInputInt], web3._extend.formatters.formatOutputBool),
insertMethod('stop', 'miner_stop', 1, [web3._extend.formatters.formatInputInt], web3._extend.formatters.formatOutputBool),
- insertMethod('setExtra', 'miner_setExtra', 1, [web3._extend.utils.formatInputString], web3._extend.formatters.formatOutputBool),
- insertMethod('setGasPrice', 'miner_setGasPrice', 1, [web3._extend.utils.formatInputString], web3._extend.formatters.formatOutputBool),
+ insertMethod('setExtra', 'miner_setExtra', 1, [null], web3._extend.formatters.formatOutputBool),
+ insertMethod('setGasPrice', 'miner_setGasPrice', 1, [web3._extend.utils.fromDecimal], web3._extend.formatters.formatOutputBool),
insertMethod('startAutoDAG', 'miner_startAutoDAG', 0, [], web3._extend.formatters.formatOutputBool),
insertMethod('stopAutoDAG', 'miner_stopAutoDAG', 0, [], web3._extend.formatters.formatOutputBool),
insertMethod('makeDAG', 'miner_makeDAG', 1, [web3._extend.formatters.inputDefaultBlockNumberFormatter], web3._extend.formatters.formatOutputBool),
@@ -69,7 +69,6 @@ module.exports = {
property: 'network',
methods:
[
- insertMethod('addPeer', 'net_addPeer', 1, [web3._extend.utils.formatInputString], web3._extend.formatters.formatOutputBool),
insertMethod('getPeerCount', 'net_peerCount', 0, [], web3._extend.formatters.formatOutputString),
],
properties:
diff --git a/package.json b/package.json
index 049540c38..1842ed745 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "Mist",
- "version": "0.8.8",
+ "version": "0.8.9",
"license": "GPL-3.0",
"author": "Ethereum Mist Team ",
"repository": {
@@ -8,53 +8,60 @@
"url": "https://github.com/ethereum/mist.git"
},
"scripts": {
- "ci": "gulp --platform=linux"
+ "postinstall": "cd interface && yarn"
},
"main": "main.js",
"dependencies": {
- "babel-runtime": "^6.18.0",
- "bignumber.js": "^2.1.4",
- "bluebird": "^3.3.5",
+ "babel-runtime": "^6.22.0",
+ "bignumber.js": "^4.0.0",
+ "bluebird": "^3.4.7",
+ "chai-as-promised": "^6.0.0",
+ "chai-string": "^1.3.0",
"electron-squirrel-startup": "^1.0.0",
"ethereum-client-binaries": "^1.6.1",
+ "ethereum-keyfile-recognizer": "^1.0.2",
"ethereumjs-abi": "^0.6.3",
- "got": "^6.3.0",
- "i18next": "^2.3.4",
+ "got": "^6.7.1",
+ "i18next": "^6.1.1",
"log-rotate": "^0.2.7",
- "log4js": "^0.6.35",
- "lokijs": "^1.4.1",
- "minimongo-standalone": "0.0.9",
- "numeral": "^1.5.3",
- "os-timesync": "^1.0.6",
+ "log4js": "^1.1.0",
+ "lokijs": "^1.4.2",
+ "minimongo-standalone": "^1.1.0-3",
+ "numeral": "^2.0.4",
+ "os-timesync": "^1.0.7",
"semver": "^5.1.0",
- "solc": "0.4.6",
- "typescript": "^1.7.3",
+ "solc": "^0.4.8",
+ "typescript": "^2.1.5",
"underscore": "^1.8.3",
"underscore-deep-extend": "^1.1.5",
- "uuid": "^2.0.2",
+ "uuid": "^3.0.1",
"web3": "^0.17.0-alpha",
- "yargs": "^4.3.1"
+ "yargs": "^6.6.0"
},
"devDependencies": {
"chai": "^3.5.0",
- "co-mocha": "^1.1.2",
- "del": "^1.2.1",
+ "chai-as-promised": "^6.0.0",
+ "co-mocha": "^1.2.0",
+ "del": "^2.2.2",
+ "ecstatic": "^2.1.0",
"electron": "1.3.13",
- "electron-builder": "=9.1.0",
- "eslint": "^3.8.0",
- "eslint-config-airbnb-base": "^8.0.0",
- "eslint-plugin-import": "^1.16.0",
+ "electron-builder": "^12.2.2",
+ "eslint": "^3.14.1",
+ "eslint-config-airbnb-base": "^11.0.1",
+ "eslint-plugin-import": "^2.2.0",
"genomatic": "^1.0.0",
"geth-private": "^1.3.0",
+ "gh-release-assets": "^1.1.0",
"gulp": "^3.9.0",
"gulp-flatten": "^0.3.0",
- "gulp-spawn-mocha": "^2.2.2",
+ "gulp-spawn-mocha": "^3.1.0",
+ "istanbul": "^0.4.5",
"merge-stream": "^1.0.0",
"minimist": "^1.2.0",
+ "mocha": "^3.2.0",
"optimist": "^0.6.1",
"run-sequence": "^1.2.1",
- "shelljs": "^0.7.0",
- "spectron": "^3.2.2",
- "sync-request": "^3.0.1"
+ "shelljs": "^0.7.6",
+ "spectron": "3.3.0"
}
}
diff --git a/scripts/Locate.nsh b/scripts/Locate.nsh
new file mode 100755
index 000000000..a4ed00826
--- /dev/null
+++ b/scripts/Locate.nsh
@@ -0,0 +1,51 @@
+!define locate::Open `!insertmacro locate::Open`
+
+!macro locate::Open _PATH _OPTIONS _HANDLE
+ locate::_Open /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+ Pop ${_HANDLE}
+!macroend
+
+
+!define locate::Find `!insertmacro locate::Find`
+
+!macro locate::Find _HANDLE _PATHANDNAME _PATH _NAME _SIZE _TIME _ATTRIB
+ locate::_Find /NOUNLOAD `${_HANDLE}`
+ Pop ${_PATHANDNAME}
+ Pop ${_PATH}
+ Pop ${_NAME}
+ Pop ${_SIZE}
+ Pop ${_TIME}
+ Pop ${_ATTRIB}
+!macroend
+
+
+!define locate::Close `!insertmacro locate::Close`
+
+!macro locate::Close _HANDLE
+ locate::_Close /NOUNLOAD `${_HANDLE}`
+!macroend
+
+
+!define locate::GetSize `!insertmacro locate::GetSize`
+
+!macro locate::GetSize _PATH _OPTIONS _SIZE _FILES _DIRS
+ locate::_GetSize /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+ Pop ${_SIZE}
+ Pop ${_FILES}
+ Pop ${_DIRS}
+!macroend
+
+
+!define locate::RMDirEmpty `!insertmacro locate::RMDirEmpty`
+
+!macro locate::RMDirEmpty _PATH _OPTIONS _REMOVED
+ locate::_RMDirEmpty /NOUNLOAD `${_PATH}` `${_OPTIONS}`
+ Pop ${_REMOVED}
+!macroend
+
+
+!define locate::Unload `!insertmacro locate::Unload`
+
+!macro locate::Unload
+ locate::_Unload
+!macroend
diff --git a/scripts/MoveFileFolder.nsh b/scripts/MoveFileFolder.nsh
new file mode 100644
index 000000000..dea78c357
--- /dev/null
+++ b/scripts/MoveFileFolder.nsh
@@ -0,0 +1,256 @@
+;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+; MoveFile and MoveFolder macros
+;
+; Author: theblazingangel@aol.com (for the AutoPatcher project - www.autopatcher.com)
+; Created: June 2007
+;%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+;==================
+; MoveFile macro
+;==================
+
+ !macro MoveFile sourceFile destinationFile
+
+ !define MOVEFILE_JUMP ${__LINE__}
+
+ ; Check source actually exists
+
+ IfFileExists "${sourceFile}" +3 0
+ SetErrors
+ goto done_${MOVEFILE_JUMP}
+
+ ; Add message to details-view/install-log
+
+ DetailPrint "Moving/renaming file: ${sourceFile} to ${destinationFile}"
+
+ ; If destination does not already exists simply move file
+
+ IfFileExists "${destinationFile}" +3 0
+ rename "${sourceFile}" "${destinationFile}"
+ goto done_${MOVEFILE_JUMP}
+
+ ; If overwriting without 'ifnewer' check
+
+ ${If} $switch_overwrite == 1
+ delete "${destinationFile}"
+ rename "${sourceFile}" "${destinationFile}"
+ delete "${sourceFile}"
+ goto done_${MOVEFILE_JUMP}
+ ${EndIf}
+
+ ; If destination already exists
+
+ Push $R0
+ Push $R1
+ Push $R2
+ push $R3
+
+ GetFileTime "${sourceFile}" $R0 $R1
+ GetFileTime "${destinationFile}" $R2 $R3
+
+ IntCmp $R0 $R2 0 older_${MOVEFILE_JUMP} newer_${MOVEFILE_JUMP}
+ IntCmp $R1 $R3 older_${MOVEFILE_JUMP} older_${MOVEFILE_JUMP} newer_${MOVEFILE_JUMP}
+
+ older_${MOVEFILE_JUMP}:
+ delete "${sourceFile}"
+ goto time_check_done_${MOVEFILE_JUMP}
+
+ newer_${MOVEFILE_JUMP}:
+ delete "${destinationFile}"
+ rename "${sourceFile}" "${destinationFile}"
+ delete "${sourceFile}" ;incase above failed!
+
+ time_check_done_${MOVEFILE_JUMP}:
+
+ Pop $R3
+ Pop $R2
+ Pop $R1
+ Pop $R0
+
+ done_${MOVEFILE_JUMP}:
+
+ !undef MOVEFILE_JUMP
+
+ !macroend
+
+;==================
+; MoveFolder macro
+;==================
+
+ !macro MoveFolder source destination mask
+
+ !define MOVEFOLDER_JUMP ${__LINE__}
+
+ Push $R0
+ Push $R1
+
+ ; Move path parameters into registers so they can be altered if necessary
+
+ StrCpy $R0 "${source}"
+ StrCpy $R1 "${destination}"
+
+ ; Sort out paths - remove final backslash if supplied
+
+ Push $0
+
+ ; Source
+ StrCpy $0 "$R0" 1 -1
+ StrCmp $0 '\' 0 +2
+ StrCpy $R0 "$R0" -1
+
+ ; Destination
+ StrCpy $0 "$R1" 1 -1
+ StrCmp $0 '\' 0 +2
+ StrCpy $R1 "$R1" -1
+
+ Pop $0
+
+ ; Create destination dir
+
+ CreateDirectory "$R1\"
+
+ ; Add message to details-view/install-log
+
+ DetailPrint "Moving files: $R0\${mask} to $R1\"
+
+ ; Push registers used by ${Locate} onto stack
+
+ Push $R6
+ Push $R7
+ Push $R8
+ Push $R9
+
+ ; Duplicate dir structure (to preserve empty folders and such)
+
+ ${Locate} "$R0" "/L=D" ".MoveFolder_Locate_createDir"
+
+ ; Locate files and move (via callback function)
+
+ ${Locate} "$R0" "/L=F /M=${mask} /S= /G=1" ".MoveFolder_Locate_moveFile"
+
+ ; Delete subfolders left over after move
+
+ Push $R2
+ deldir_loop_${MOVEFOLDER_JUMP}:
+ StrCpy $R2 0
+ ${Locate} "$R0" "/L=DE" ".MoveFolder_Locate_deleteDir"
+ StrCmp $R2 0 0 deldir_loop_${MOVEFOLDER_JUMP}
+ Pop $R2
+
+ ; Delete empty subfolders moved - say the user just wanted to move *.apm files, they now also have a load of empty dir's from dir structure duplication!
+
+ Push $R2
+ delnewdir_loop_${MOVEFOLDER_JUMP}:
+ StrCpy $R2 0
+ ${Locate} "$R1" "/L=DE" ".MoveFolder_Locate_deleteDir"
+ StrCmp $R2 0 0 delnewdir_loop_${MOVEFOLDER_JUMP}
+ Pop $R2
+
+ ; Pop registers used by ${Locate} off the stack again
+
+ Pop $R9
+ Pop $R8
+ Pop $R7
+ Pop $R6
+
+ ; Delete source folder if empty
+
+ rmdir "$R0"
+
+ Pop $R1
+ Pop $R0
+
+ !undef MOVEFOLDER_JUMP
+
+ !macroend
+
+;==================
+; MoveFolder macro's ${Locate} callback functions
+;==================
+
+ Function .MoveFolder_Locate_createDir
+
+ ${If} $R6 == ""
+ Push $R2
+ StrLen $R2 "$R0"
+ StrCpy $R2 $R9 '' $R2
+ CreateDirectory "$R1$R2"
+ Pop $R2
+ ${EndIf}
+
+ Push $R1
+
+ FunctionEnd
+
+ Function .MoveFolder_Locate_moveFile
+
+ Push $R2
+
+ ; Get path to file
+
+ StrLen $R2 "$R0"
+ StrCpy $R2 $R9 '' $R2
+ StrCpy $R2 "$R1$R2"
+
+ ; If destination does not already exists simply move file
+
+ IfFileExists "$R2" +3 0
+ rename "$R9" "$R2"
+ goto done
+
+ ; If overwriting without 'ifnewer' check
+
+ ${If} $switch_overwrite == 1
+ delete "$R2"
+ rename "$R9" "$R2"
+ delete "$R9"
+ goto done
+ ${EndIf}
+
+ ; If destination already exists
+
+ Push $0
+ Push $1
+ Push $2
+ push $3
+
+ GetFileTime "$R9" $0 $1
+ GetFileTime "$R2" $2 $3
+
+ IntCmp $0 $2 0 older newer
+ IntCmp $1 $3 older older newer
+
+ older:
+ delete "$R9"
+ goto time_check_done
+
+ newer:
+ delete "$R2"
+ rename "$R9" "$R2"
+ delete "$R9" ;incase above failed!
+
+ time_check_done:
+
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+
+ done:
+
+ Pop $R2
+
+ Push $R1
+
+ FunctionEnd
+
+ Function .MoveFolder_Locate_deleteDir
+
+ ${If} $R6 == ""
+ RMDir $R9
+ IntOp $R2 $R2 + 1
+ ${EndIf}
+
+ Push $R1
+
+ FunctionEnd
diff --git a/scripts/SimpleFC.dll b/scripts/SimpleFC.dll
new file mode 100755
index 000000000..73b7d9634
Binary files /dev/null and b/scripts/SimpleFC.dll differ
diff --git a/scripts/ZipDLL.dll b/scripts/ZipDLL.dll
new file mode 100755
index 000000000..5925d5916
Binary files /dev/null and b/scripts/ZipDLL.dll differ
diff --git a/scripts/locate.dll b/scripts/locate.dll
new file mode 100755
index 000000000..6a15df88b
Binary files /dev/null and b/scripts/locate.dll differ
diff --git a/scripts/windows-installer.nsi b/scripts/windows-installer.nsi
new file mode 100644
index 000000000..4c76e03cb
--- /dev/null
+++ b/scripts/windows-installer.nsi
@@ -0,0 +1,269 @@
+# Add current directory to plugin path
+!addplugindir .\
+
+# Architecture detection
+!include x64.nsh
+
+# Include LogicLib (http://nsis.sourceforge.net/LogicLib)
+!include 'LogicLib.nsh'
+
+# Include ZipDLL plugin (http://nsis.sourceforge.net/ZipDLL_plug-in)
+!include 'ZipDLL.nsh'
+
+# Include Locate plugin (http://nsis.sourceforge.net/Locate_plugin)
+!include 'locate.nsh'
+
+# Include MoveFileFolder plugin (http://nsis.sourceforge.net/MoveFileFolder)
+!include 'FileFunc.nsh'
+!insertmacro Locate
+Var /GLOBAL switch_overwrite
+!include 'MoveFileFolder.nsh'
+
+# Enable CRC
+CRCCheck on
+
+# Require admin privledges when UAC is on
+RequestExecutionLevel admin
+
+!define APPNAME "Mist"
+!define GROUPNAME "Ethereum"
+!define HELPURL "https://github.com/ethereum/mist/releases/issues"
+!define UPDATEURL "https://github.com/ethereum/mist/releases"
+!define ABOUTURL "https://ethereum.org"
+!define /date NOW "%Y%m%d"
+
+## These must be integers and can be set on the command line by NSIS with "/DMAJORVERSION=0 /DMINORVERSION=8 /DBUILDVERSION=7"
+#!define VERSIONMAJOR 0
+#!define VERSIONMINOR 8
+#!define VERSIONBUILD 7
+
+# Define some script globals
+Name "${GROUPNAME} ${APPNAME}"
+Icon "..\dist_mist\build\icon.ico"
+OutFile "..\dist_mist\release\mist-installer-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.exe"
+var FILEDIR
+var DATADIR
+var NODEDATADIR
+var ARCHDIR
+var SHORTCUTDIR
+var DESKTOPDIR
+
+# Check for administrative rights
+!macro VerifyUserIsAdmin
+UserInfo::GetAccountType
+pop $0
+${If} $0 != "admin"
+ messageBox mb_iconstop "Administrator rights required!"
+ setErrorLevel 740 ;ERROR_ELEVATION_REQUIRED
+ quit
+${EndIf}
+!macroend
+
+# Create a shared function function for setting environment variables
+!macro ENVFUNC un
+ Function ${un}setenv
+
+ SetShellVarContext current
+ StrCpy $DATADIR "$APPDATA\${APPNAME}"
+ StrCpy $NODEDATADIR "$APPDATA\Ethereum"
+ StrCpy $SHORTCUTDIR "$SMPROGRAMS\${APPNAME}"
+ StrCpy $DESKTOPDIR "$DESKTOP"
+
+ ${If} ${RunningX64}
+ StrCpy $FILEDIR "$PROGRAMFILES64\${APPNAME}"
+ StrCpy $ARCHDIR "win-unpacked"
+ ${Else}
+ StrCpy $FILEDIR "$PROGRAMFILES32\${APPNAME}"
+ StrCpy $ARCHDIR "win-ia32-unpacked"
+ ${Endif}
+
+ SetShellVarContext all
+
+ FunctionEnd
+!macroend
+
+!insertmacro ENVFUNC ""
+!insertmacro ENVFUNC "un."
+
+function .onInit
+ !insertmacro VerifyUserIsAdmin
+ call setenv
+functionEnd
+
+# The license page. Can use .txt or .rtf data
+PageEx license
+ LicenseData ..\LICENSE
+PageExEnd
+
+# Components is a good place to allow the user to select optional software to install
+# For example, it could be used to allow the user to select which node they want installed and then download it
+#Page components
+
+# Select the location to install the main program files
+PageEx directory
+ DirVar $FILEDIR
+PageExEnd
+
+## Select the location for Mist's data directory
+#PageEx directory
+# DirText "Select a location for Mist's data files (watched contracts, etc.)"
+# DirVar $DATADIR
+#PageExEnd
+
+# Select the location for the node's data directory
+PageEx directory
+ DirText "Select a location where blockchain data will be stored"
+ DirVar $NODEDATADIR
+PageExEnd
+
+# Installation
+Page instfiles
+
+# Uninstaller confirmation page. Useful to remind the user what data (if any) will remain, for example chaindata or keystore
+UninstPage uninstConfirm
+
+# Uninstallation section
+UninstPage instfiles
+
+# Show details by default
+ShowInstDetails show
+ShowUninstDetails show
+
+# Mist installer instructions
+Section Mist MIST_IDX
+ StrCpy $switch_overwrite 1
+
+ # set the installation directory as the destination for the following actions
+ SetOutPath $TEMP
+ # include both architecture zip files
+ file "..\dist_mist\release\${APPNAME}-win64-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip"
+ file "..\dist_mist\release\${APPNAME}-win32-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip"
+ file "..\dist_mist\build\icon.ico"
+
+ # Extract the zip file from TEMP to the user's selected installation directory
+ ${If} ${RunningX64}
+ ZipDLL::extractALL "$TEMP\${APPNAME}-win64-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip" "$FILEDIR"
+ StrCpy $ARCHDIR "win-unpacked"
+ ${Else}
+ ZipDLL::extractALL "$TEMP\${APPNAME}-win32-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip" "$FILEDIR"
+ StrCpy $ARCHDIR "win-ia32-unpacked"
+ ${Endif}
+
+ # Move files out of subfolder
+ !insertmacro MoveFolder "$FILEDIR\$ARCHDIR" "$FILEDIR" "*.*"
+ # Copy icon from installer (not included in zip)
+ !insertmacro MoveFile "$TEMP\icon.ico" "$FILEDIR\logo.ico"
+
+ # create the uninstaller
+ WriteUninstaller "$FILEDIR\uninstall.exe"
+
+ # create shortcuts with flags in the start menu programs directory
+ createDirectory "$SHORTCUTDIR"
+ createShortCut "$SHORTCUTDIR\${APPNAME}.lnk" "$FILEDIR\${APPNAME}.exe" '--node-datadir="$NODEDATADIR"' "$FILEDIR\${APPNAME}.exe" 0
+
+ # create desktop shortcut
+ createShortCut "$DESKTOPDIR\${APPNAME}.lnk" "$FILEDIR\${APPNAME}.exe" '--node-datadir="$NODEDATADIR"' "$FILEDIR\${APPNAME}.exe" 0
+
+ # create a shortcut for the program uninstaller
+ CreateShortCut "$SHORTCUTDIR\Uninstall.lnk" "$FILEDIR\uninstall.exe"
+
+ ## Firewall - add rules
+ #SimpleFC::AdvAddRule "Geth incoming peers (TCP:30303)" "" 6 1 1 2147483647 1 "$DATADIR\binaries\Geth\unpacked\geth.exe" "" "" "Ethereum" 30303 "" "" ""
+ #SimpleFC::AdvAddRule "Geth outgoing peers (TCP:30303)" "" 6 2 1 2147483647 1 "$DATADIR\binaries\Geth\unpacked\geth.exe" "" "" "Ethereum" "" 30303 "" ""
+ #SimpleFC::AdvAddRule "Geth UDP discovery (UDP:30303)" "" 17 2 1 2147483647 1 "$DATADIR\binaries\Geth\unpacked\geth.exe" "" "" "Ethereum" "" 30303 "" ""
+
+ # write registry strings for uninstallation
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "DisplayName" "${GROUPNAME} ${APPNAME}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "UninstallString" '"$FILEDIR\uninstall.exe"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "InstallLocation" '"$FILEDIR"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "InstallDate" "${NOW}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "DisplayIcon" '"$FILEDIR\logo.ico"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "Publisher" "${GROUPNAME}"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "HelpLink" '"${HELPURL}"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "URLUpdateInfo" '"${UPDATEURL}"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "URLInfoAbout" '"${ABOUTURL}"'
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "DisplayVersion" "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}"
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "VersionMajor" ${VERSIONMAJOR}
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "VersionMinor" ${VERSIONMINOR}
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "NoModify" 1
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "NoRepair" 1
+ # calculate and store installation size
+ Call GetInstalledSize
+ Pop $0
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}" "EstimatedSize" "$0"
+
+ # write registry strings for current user options
+ WriteRegStr HKCU "Software\${GROUPNAME} ${APPNAME}" "DATADIR" "$DATADIR"
+ WriteRegStr HKCU "Software\${GROUPNAME} ${APPNAME}" "NODEDATADIR" "$NODEDATADIR"
+ WriteRegStr HKCU "Software\${GROUPNAME} ${APPNAME}" "DESKTOPDIR" "$DESKTOPDIR"
+
+ # Clean up temporary files
+ Delete "$TEMP\${APPNAME}-win32-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip"
+ Delete "$TEMP\${APPNAME}-win64-${VERSIONMAJOR}-${VERSIONMINOR}-${VERSIONBUILD}.zip"
+SectionEnd
+
+Function .onInstSuccess
+ ExecShell "open" "$SHORTCUTDIR"
+FunctionEnd
+
+function un.onInit
+ call un.setenv
+ !insertmacro VerifyUserIsAdmin
+functionEnd
+
+# uninstaller section start
+Section "uninstall"
+ # get user settings from registry
+ ClearErrors
+ ReadRegStr $0 HKCU "Software\${GROUPNAME} ${APPNAME}" 'DATADIR'
+ ReadRegStr $1 HKCU "Software\${GROUPNAME} ${APPNAME}" 'NODEDATADIR'
+ ReadRegStr $2 HKCU "Software\${GROUPNAME} ${APPNAME}" 'DESKTOPDIR'
+
+ IfErrors 0 +2
+ MessageBox MB_ICONEXCLAMATION|MB_OK "Unable to read from the registry. Not all shortcuts will be removed"
+
+ StrCpy $DATADIR $0
+ StrCpy $NODEDATADIR $1
+ StrCpy $DESKTOPDIR $2
+
+ # remove the link from the start menu
+ rmDir /r "$SHORTCUTDIR"
+
+ # remove desktop shortcut
+ Delete "$DESKTOPDIR\${APPNAME}.lnk"
+
+ # remove files from installation directory
+ rmDir /r /REBOOTOK "$FILEDIR"
+
+ ## Firewall - remove rules (if exists)
+ #SimpleFC::AdvRemoveRule "Geth incoming peers (TCP:30303)"
+ #SimpleFC::AdvRemoveRule "Geth outgoing peers (TCP:30303)"
+ #SimpleFC::AdvRemoveRule "Geth UDP discovery (UDP:30303)"
+
+ # delete registry strings
+ DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GROUPNAME} ${APPNAME}"
+ DeleteRegKey HKCU "Software\${GROUPNAME} ${APPNAME}"
+SectionEnd
+
+Function un.onUnInstSuccess
+ MessageBox MB_OK "Opening leftover data directories (backup before deleting!)"
+ ExecShell "open" "$DATADIR"
+ ExecShell "open" "$NODEDATADIR"
+FunctionEnd
+
+
+# Return on top of stack the total size (as DWORD) of the selected/installed sections.
+Var GetInstalledSize.total
+Function GetInstalledSize
+ StrCpy $GetInstalledSize.total 0
+
+ ${if} ${SectionIsSelected} ${MIST_IDX}
+ ${locate::GetSize} "$FILEDIR" "/S=Kb" $0 $1 $2
+ # TODO check for return of -1 for error
+ IntOp $GetInstalledSize.total $GetInstalledSize.total + $0
+ ${endif}
+
+ IntFmt $GetInstalledSize.total "0x%08X" $GetInstalledSize.total
+ Push $GetInstalledSize.total
+FunctionEnd
diff --git a/scripts/zipdll.nsh b/scripts/zipdll.nsh
new file mode 100755
index 000000000..32e8b7c88
--- /dev/null
+++ b/scripts/zipdll.nsh
@@ -0,0 +1,417 @@
+;ZipDLL include file for NSIS
+;Written by Tim Kosse (mailto:tim.kosse@gmx.de)
+;some improvements by deguix
+
+;Supported languages with their translators in alphabetical order:
+
+;Arabic translation by asdfuae
+;Brazilian Portuguese translation by "deguix"
+;Chinese, Simplified translation by Kii Ali
+;Chinese, Traditional traslation by "matini" and Kii Ali
+;Croatian translation by "iostriz"
+;Danish translation by Claus Futtrup
+;French translation by "veekee"
+;German translation by Tim Kosse
+;Hungarian translation by Toth Laszlo
+;Korean translation by Seongab Kim
+;Lithuanian translation by Vytautas Krivickas
+;Polish translation by Krzysztof Galuszka
+;Russion translation by Sergey
+;Spanish translation by "dark_boy"
+
+!ifndef ZIPDLL_USED
+
+!define ZIPDLL_USED
+
+!macro ZIPDLL_EXTRACT SOURCE DESTINATION FILE
+
+ !define "FILE_${FILE}"
+
+ !ifndef FILE_
+ Push "${FILE}"
+ !endif
+
+ IfFileExists "${DESTINATION}" +2
+ CreateDirectory "${DESTINATION}"
+
+ Push "${DESTINATION}"
+
+ IfFileExists "${SOURCE}" +2
+ SetErrors
+
+ Push "${SOURCE}"
+
+ ;The strings that will be translated are (ready to copy,
+ ;remove leading semicolons in your language block):
+
+ !ifdef LANG_ENGLISH
+
+ ;English is default language of ZipDLL, no need to push the untranslated strings
+
+ ;StrCmp $LANGUAGE ${LANG_ENGLISH} 0 +1
+
+ ;Push " Error: %s"
+ ;Push "Could not get file attributes."
+ ;Push "Error: Could not get file attributes."
+ ;Push "Could not extract %s"
+ ;Push " Error: Could not extract %s"
+
+ ;!ifdef FILE_
+ ;Push " Extract: %s"
+ ;Push " Extracting %d files and directories"
+ ;Push "Extracting contents of %s to %s"
+ ;!else
+ ;Push "Specified file does not exist in archive."
+ ;Push "Error: Specified file does not exist in archive."
+ ;Push "Extracting the file %s from %s to %s"
+ ;!endif
+
+ ;Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_HUNGARIAN
+
+ StrCmp $LANGUAGE ${LANG_HUNGARIAN} 0 +10
+
+ Push " Hiba: %s"
+ Push "Nem olvasható a fájl attribútumai."
+ Push "Hiba: Nem olvasható a fájl attribútumai."
+ Push "Nem sikerült kicsomagolni a(z) %s"
+ Push " Hiba: Nem sikerült kicsomagolni a(z) %s"
+
+ !ifdef FILE_
+ Push " Kicsomagolás: %s"
+ Push " %d fájl és mappa kicsomagolása"
+ Push "%s tartalom kicsomagolása a %s helyre"
+ !else
+ Push "A megadott fájl nem található az arhívumban."
+ Push "Hiba: A megadott fájl nem található az arhívumban."
+ Push "%s fájl kcsomagolása a(z) %s fájlból a %s helyre"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_FRENCH
+
+ StrCmp $LANGUAGE ${LANG_FRENCH} 0 +10
+
+ Push " Erreur : %s"
+ Push "Impossible de récupérer les informations sur le fichier."
+ Push "Erreur : Impossible de récupérer les informations sur le fichier."
+ Push "Impossible de décompresser %s."
+ Push " Erreur : Impossible de décompresser %s."
+
+ !ifdef FILE_
+ Push " Décompression : %s"
+ Push " Décompression de %d fichiers et répertoires"
+ Push "Décompression des données de %s vers %s"
+ !else
+ Push "Le fichier spécifié n'existe pas dans l'archive"
+ Push "Erreur : Le fichier spécifié n'existe pas dans l'archive"
+ Push "Décompression du fichier %s depuis %s vers %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_GERMAN
+
+ StrCmp $LANGUAGE ${LANG_GERMAN} 0 +10
+
+ Push " Fehler: %s"
+ Push "Dateiattribute konnten nicht ermittelt werden."
+ Push "Fehler: Dateiattribute konnten nicht ermittelt werden."
+ Push "%s konnte nicht dekomprimiert werden."
+ Push " Fehler: %s konnte nicht dekomprimiert werden."
+
+ !ifdef FILE_
+ Push " Dekomprimiere: %s"
+ Push " Dekomprimiere %d Dateien und Verzeichnisse"
+ Push "Dekomprimiere Inhalt von %s nach %s"
+ !else
+ Push "Die angegebene Datei existiert nicht im Archiv"
+ Push "Fehler: Die angegebene Datei existiert nicht im Archiv"
+ Push "Dekomprimiere Datei %s von %s nach %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_SPANISH
+
+ StrCmp $LANGUAGE ${LANG_SPANISH} 0 +10
+
+ Push " Error: %s"
+ Push "No se obtuvieron atributos del archivo"
+ Push "Error: No se obtuvieron atributos del archivo"
+ Push "No se pudo extraer %s"
+ Push " Error: No se pudo extraer %s"
+
+ !ifdef FILE_
+ Push " Extraer: %s"
+ Push " Extrayendo %d archivos y directorios"
+ Push "Extraer archivos de %s a %s"
+ !else
+ Push "Archivo especificado no existe en el ZIP"
+ Push "Error: El archivo especificado no existe en el ZIP"
+ Push "Extrayendo el archivo %s de %s a %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_PORTUGUESEBR
+
+ StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} 0 +10
+
+ Push " Erro: %s"
+ Push "Não se pode ler os atributos do arquivo"
+ Push "Error: Não se pode ler os atributos do arquivo"
+ Push "Não se pode extrair %s"
+ Push " Erro: Não se pode extrair %s"
+
+ !ifdef FILE_
+ Push " Extraindo: %s"
+ Push " Extraindo %d arquivos e diretórios"
+ Push "Extraindo arquivos de %s a %s"
+ !else
+ Push "O arquivo especificado não existe no ZIP"
+ Push "Erro: O arquivo especificado não existe no ZIP"
+ Push "Extraindo o arquivo %s de %s a %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_TRADCHINESE
+
+ StrCmp $LANGUAGE ${LANG_TRADCHINESE} 0 +11
+
+ Push " ¿ù»~: %s"
+ Push "µLªk¨ú±oÀÉ®×ÄÝ©Ê¡C"
+ Push "¿ù»~: µLªk¨ú±oÀÉ®×ÄÝ©Ê¡C"
+ Push "µLªk¸ÑÀ£ÁY %s"
+ Push " ¿ù»~¡GµLªk¸ÑÀ£ÁY %s"
+
+ !ifdef FILE_
+ Push " ¸ÑÀ£ÁY¡G%s"
+ Push " ¥¿¦b¸ÑÀ£ÁY %d ÀÉ®×»P¥Ø¿ý"
+ Push "¥¿¦b¸ÑÀ£ÁY %s ªº¤º®e¨ì %s"
+ !else
+ Push "«ü©wªºÀɮר䣦s¦b©óÀ£ÁY¥]¡C"
+ Push "¿ù»~¡G«ü©wªºÀɮר䣦s¦b©óÀ£ÁY¥]¡C"
+ Push "¥¿¦b¸ÑÀ£ÁYÀÉ®× %s ¡A±q %s ¨ì %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_SIMPCHINESE
+
+ StrCmp $LANGUAGE ${LANG_SIMPCHINESE} 0 +11
+
+ Push " ´íÎó: %s"
+ Push "ÎÞ·¨È¡µÃÎļþÊôÐÔ¡£"
+ Push "´íÎó: ÎÞ·¨È¡µÃÎļþÊôÐÔ¡£"
+ Push "ÎÞ·¨½âѹËõ %s"
+ Push " ´íÎó£ºÎÞ·¨½âѹËõ %s"
+
+ !ifdef FILE_
+ Push " ½âѹËõ£º%s"
+ Push " ÕýÔÚ½âѹËõ %d ÎļþÓëĿ¼"
+ Push "ÕýÔÚ½âѹËõ %s µÄÄÚÈݵ½ %s"
+ !else
+ Push "Ö¸¶¨µÄÎļþ²¢²»´æÔÚÓÚѹËõ°ü¡£"
+ Push "´íÎó£ºÖ¸¶¨µÄÎļþ²¢²»´æÔÚÓÚѹËõ°ü¡£"
+ Push "ÕýÔÚ½âѹËõÎļþ %s £¬´Ó %s µ½ %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_LITHUANIAN
+
+ StrCmp $LANGUAGE ${LANG_LITHUANIAN} 0 +10
+
+ Push " Klaida: %s"
+ Push "Negaleta gauti bylos nuorodu."
+ Push "Klaida: Negaleta gauti bylos nuorodu."
+ Push "Negaleta ištraukti %s"
+ Push " Klaida: Negaleta ištraukti %s"
+
+ !ifdef FILE_
+ Push " Ištraukiam : %s"
+ Push " Ištraukiame %d bylas ir katalogus"
+ Push "Ištraukiame viska is %s i %s"
+ !else
+ Push "Parinkta byla nesurasta šiame archyve."
+ Push "Klaida: Parinkta byla nesurasta šiame archyve."
+ Push "Ištraukiame byla %s iš %s i %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef "LANG_POLISH"
+
+ strcmp $LANGUAGE ${LANG_POLISH} 0 +10
+
+ Push " B³¹d: %s"
+ Push "Nie mo¿e pobraæ atrybutu pliku."
+ Push "B³¹d: Nie mo¿e pobraæ atrybutu pliku."
+ Push "Nie mo¿e rozpakowaæ %s."
+ Push " B³¹d: Nie mo¿e rozpakowaæ %s."
+
+ !ifdef FILE_
+ Push " Rozpakuj: %s"
+ Push " Rozpakowywanie %d plików i katalogów"
+ Push "Rozpakowywanie zawartoœci %s do %s"
+ !else
+ Push "Plik nie istnieje w archiwum"
+ Push "B³¹d: Plik nie istnieje w archiwum"
+ Push "Rozpakowywanie pliku %s z %s do %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef "LANG_KOREAN"
+ strcmp $LANGUAGE ${LANG_KOREAN} 0 +10
+ Push " ¿À·ù : %s"
+ Push "ÈÀÏ ¼Ó¼ºÀ» ¾ò¾î¿Ã ¼ö ¾ø½À´Ï´Ù."
+ Push "¿À·ù: ÈÀÏ ¼Ó¼ºÀ» ¾ò¾î¿Ã ¼ö ¾ø½À´Ï´Ù."
+ Push "%sÀ»(¸¦) Ç® ¼ö ¾ø½À´Ï´Ù."
+ Push " ¿À·ù: %sÀ»(¸¦) Ç® ¼ö ¾ø½À´Ï´Ù."
+
+ !ifdef FILE_
+ Push " Ç®±â : %s"
+ Push " %d°³ÀÇ ÆÄÀÏ°ú Æú´õ¸¦ Ǫ´Â Áß"
+ Push "%sÀÇ ³»¿ëÀ» %s¿¡ Ǫ´Â Áß"
+ !else
+ Push "ÁöÁ¤µÈ ÆÄÀÏÀÌ ¾ÐÃà ÆÄÀÏ ¾È¿¡ ¾ø½À´Ï´Ù."
+ Push "¿À·ù: ÁöÁ¤µÈ ÆÄÀÏÀÌ ¾ÐÃà ÆÄÀÏ ¾È¿¡ ¾ø½À´Ï´Ù."
+ Push "%s ÆÄÀÏÀ» %s¿¡¼ %s·Î Ǫ´Â Áß"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef "LANG_RUSSIAN"
+
+ strcmp $LANGUAGE ${LANG_RUSSIAN} 0 +10
+
+ Push " Îøèáêà: %s"
+ Push "Íå ìîãó ïîëó÷èòü àòðèáóòû ôàéëà."
+ Push "Îøèáêà: Íå ìîãó ïîëó÷èòü àòðèáóòû ôàéëà."
+ Push "Íå ìîãó èçâëå÷ü %s"
+ Push " Îøèáêà: Íå ìîãó èçâëå÷ü %s"
+
+ !ifdef LANG_
+ Push " Èçâëåêàþ : %s"
+ Push " Èçâëå÷åíèå %d ôàéëîâ è ïàïîê"
+ Push "Ñïèñîê èçâëåêàåìûõ ôàéëîâ èç %s â %s"
+ !else
+ Push "Èçâëåêàåìûé ôàéë íå îáíàðóæåí â àðõèâå."
+ Push "Îøèáêà: SÈçâëåêàåìûé ôàéë íå îáíàðóæåí â àðõèâå."
+ Push "Èçâëå÷åíèå ôàéëà %s èç %s â %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_ARABIC
+
+ StrCmp $LANGUAGE ${LANG_ARABIC} 0 +10
+
+ Push " ÎØÇÁ: %s"
+ Push "áã íÍÕá Úáì ÎÕÇÆÕ ÇáãáÝ."
+ Push "ÎØÇÁ: áã íÍÕá Úáì ÎÕÇÆÕ ÇáãáÝ."
+ Push "áÇ íãßä ÇÓÊÎÑÇÌ %s"
+ Push " ÎØÇÁ: áÇ íãßä ÇÓÊÎÑÇÌ %s"
+
+ !ifdef FILE_
+ Push " ÇÓÊÎÑÇÌ : %s"
+ Push " ÇÓÊÎÑÇÌ ãÌáÏÇÊ æ ãáÝÇÊ %d"
+ Push "ÇÓÊÎÑÇÌ ãÍÊæíÇÊ %s Åáì %s"
+ !else
+ Push "ÇáãáÝ ÛíÑ ãæÌæÏ Ýí ÇáÓÌá."
+ Push "ÎØÇÁ: ÇáãáÝ ÛíÑ ãæÌæÏ Ýí ÇáÓÌá."
+ Push "ÇÓÊÎÑÇÌ ÇáãáÝ %s ãä %s Åáì %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_DANISH
+
+ StrCmp $LANGUAGE ${LANG_DANISH} 0 +10
+
+ Push " Fejl: %s"
+ Push "Kunne ikke læse fil attributter."
+ Push "Fejl: Kunne ikke læse fil attributter."
+ Push "Kunne ikke udpakke %s"
+ Push " Fejl: Kunne ikke udpakke %s"
+
+ !ifdef FILE_
+ Push " Udpakker: %s"
+ Push " Udpakker %d filer og mapper"
+ Push "Udpakker indhold fra %s til %s"
+ !else
+ Push "Specificeret fil eksisterer ikke i filarkivet"
+ Push "Fejl: Specificeret fil eksisterer ikke i filarkivet"
+ Push "Udpakker fil %s fra %s til %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef LANG_CROATIAN
+
+ StrCmp $LANGUAGE ${LANG_CROATIAN} 0 +10
+
+ Push " Greška: %s"
+ Push "Ne mogu dohvatiti atribute datoteke."
+ Push "Greška: Ne mogu dohvatiti atribute datoteke."
+ Push "Ne mogu ekstrahirati %s"
+ Push " Greška: Ne mogu ekstrahirati %s"
+
+ !ifdef FILE_
+ Push " Ekstrakcija: %s"
+ Push " Ekstrakcija %d datoteka i mapa"
+ Push "Ekstrakcija sadržaja %s u %s"
+ !else
+ Push "Tražena datoteka ne postoji u arhivi."
+ Push "Greška: Tražena datoteka ne postoji u arhivi."
+ Push "Ekstrakcija datoteke %s iz %s u %s"
+ !endif
+
+ Push "/TRANSLATE"
+
+ !endif
+
+ !ifdef FILE_
+ ZipDLL::extractall
+ !else
+ ZipDLL::extractfile
+ !endif
+
+ !undef "FILE_${FILE}"
+
+!macroend
+
+!endif
diff --git a/tests/_base.js b/tests/_base.js
index 12d8a5bbf..a224fce53 100644
--- a/tests/_base.js
+++ b/tests/_base.js
@@ -1,7 +1,4 @@
-
-
require('co-mocha');
-
const _ = require('underscore');
const genomatic = require('genomatic');
const Q = require('bluebird');
@@ -12,14 +9,52 @@ const path = require('path');
const packageJson = require('../package.json');
const gethPrivate = require('geth-private');
const Application = require('spectron').Application;
-
const chai = require('chai');
+const http = require('http');
+const ecstatic = require('ecstatic');
+const ClientBinaryManager = require('ethereum-client-binaries').Manager;
+const Settings = require('../modules/settings');
+
chai.should();
process.env.TEST_MODE = 'true';
+const startGeth = function* () {
+ let gethPath;
-exports.mocha = function (_module, options) {
+ const config = JSON.parse(
+ fs.readFileSync(path.join('clientBinaries.json')).toString()
+ );
+ const manager = new ClientBinaryManager(config);
+ yield manager.init();
+
+ if (manager.clients.Geth.state.available) {
+ gethPath = manager.clients.Geth.activeCli.fullPath;
+ }
+ else {
+ console.info('Downloading geth...');
+ let downloadedGeth = yield manager.download('Geth');
+ gethPath = downloadedGeth.client.activeCli.fullPath;
+ console.info('Geth downloaded at:', gethPath);
+ }
+
+ const geth = gethPrivate({
+ gethPath,
+ balance: 5,
+ genesisBlock: {
+ difficulty: '0x1',
+ extraData: '0x1',
+ },
+ gethOptions: {
+ port: 58546,
+ rpcport: 58545,
+ },
+ });
+ yield geth.start();
+ return geth;
+};
+
+exports.mocha = (_module, options) => {
const tests = {};
options = _.extend({
@@ -28,7 +63,7 @@ exports.mocha = function (_module, options) {
_module.exports[options.name || path.basename(_module.filename)] = {
* before() {
- this.timeout(10000000);
+ this.timeout(1e7);
this.assert = chai.assert;
this.expect = chai.expect;
@@ -36,65 +71,38 @@ exports.mocha = function (_module, options) {
const logFilePath = path.join(__dirname, 'mist.log');
shell.rm('-rf', logFilePath);
- const appFileName = (options.app === 'wallet') ? 'Ethereum Wallet' : 'Mist',
- appVers = packageJson.version.replace(/\./ig, '-'),
- platformArch = `${process.platform}-${process.arch}`;
+ this.geth = yield startGeth();
- let appPath,
- gethPath;
+ const appFileName = (options.app === 'wallet') ? 'Ethereum Wallet' : 'Mist';
+ const appVers = packageJson.version.replace(/\./ig, '-');
+ const platformArch = `${process.platform}-${process.arch}`;
+
+ let appPath;
+ let ipcProviderPath = path.join(this.geth.dataDir, 'geth.ipc');
switch (platformArch) {
case 'darwin-x64':
- appPath = path.join(
- process.cwd(),
- `dist_${options.app}`,
- 'dist',
- 'mac',
- `${appFileName}.app`,
- 'Contents',
- 'MacOS',
- appFileName
- );
+ appPath = path.join(process.cwd(), `dist_${options.app}`, 'dist', 'mac',
+ `${appFileName}.app`, 'Contents', 'MacOS', appFileName
+ );
break;
case 'linux-x64':
- appPath = path.join(
- process.cwd(),
- `dist_${options.app}`,
- `${appFileName}-linux64-${appVers}`,
- appFileName
- );
+ appPath = path.join(process.cwd(), `dist_${options.app}`, 'dist', 'linux-unpacked', appFileName.toLowerCase());
break;
default:
throw new Error(`Cannot run tests on ${platformArch}, please run on: darwin-x64, linux-x64`);
}
- // check that appPath exists
+ // check that appPath exists
if (!shell.test('-f', appPath)) {
throw new Error(`Cannot find binary: ${appPath}`);
}
- this.geth = gethPrivate({
- gethPath: path.join(process.cwd(), 'nodes', 'geth', platformArch, 'geth'),
- balance: 5,
- genesisBlock: {
- difficulty: '0x1',
- extraData: '0x1',
- },
- gethOptions: {
- port: 58546,
- rpcport: 58545,
- },
- });
-
- yield this.geth.start();
-
this.web3 = new Web3(new Web3.providers.HttpProvider('http://localhost:58545'));
-
-
this.app = new Application({
requireName: 'electronRequire',
- startTimeout: 5000,
- waitTimeout: 5000,
+ startTimeout: 10000,
+ waitTimeout: 10000,
quitTimeout: 10000,
path: appPath,
args: [
@@ -102,39 +110,101 @@ exports.mocha = function (_module, options) {
'--loglevel', 'debug',
'--logfile', logFilePath,
'--node-datadir', this.geth.dataDir,
- '--ipcpath', path.join(this.geth.dataDir, 'geth.ipc'),
+ '--rpc', ipcProviderPath,
],
});
-
yield this.app.start();
- this.client = this.app.client;
+ /*
+ Starting HTTP server for HTML fixtures
+ */
+ const serverPort = 8080;
+ this.httpServer = http.createServer(
+ ecstatic({root: path.join(__dirname, 'fixtures')})
+ ).listen(serverPort);
+ this.fixtureBaseUrl = `http://localhost:${serverPort}/`;
- yield this.client.waitUntilWindowLoaded();
- // wait a small amount of time to ensure main app window is ready with data
- yield Q.delay(8000);
-
- // console.log(this.app.chromeDriver.logLines);
+ this.client = this.app.client;
+ yield this.client.waitUntilWindowLoaded();
+ // console.log(this.app.chromeDriver.logLines);
- /*
- Utility methods
- */
+ /*
+ Utility methods
+ */
for (const key in Utils) {
this[key] = genomatic.bind(Utils[key], this);
}
+ // Loop over windows trying to select Main Window
+ let app = this;
+ let selectMainWindow = function* (mainWindowSearch) {
+ let windowHandles = (yield app.client.windowHandles()).value;
+
+ for (let handle in windowHandles) {
+ yield app.client.window(windowHandles[handle]);
+ const windowUrl = yield app.client.getUrl();
+ const isMainWindow = mainWindowSearch.test(windowUrl);
+ if (isMainWindow) return true;
+ }
+
+ // not main window. try again after 1 second.
+ yield Q.delay(1000);
+ yield selectMainWindow(mainWindowSearch);
+ }
+
+ const mainWindowSearch = (options.app === 'wallet') ? /^file:\/\/\/$/ : /interface\/index\.html$/;
+ yield selectMainWindow(mainWindowSearch);
+
this.mainWindowHandle = (yield this.client.windowHandle()).value;
},
- * after() {
+ * beforeEach () {
+ yield this.app.client.window(this.mainWindowHandle);
+
+ yield this.client.execute(() => { // Code executed in context of browser
+ Tabs.remove({});
+ LastVisitedPages.remove({});
+ History.remove({});
+
+ Tabs.insert({
+ _id: 'browser',
+ url: 'http://localhost:8080/',
+ redirect: 'http://localhost:8080/',
+ position: 0
+ });
+ Tabs.upsert({_id: 'wallet'}, {$set: {
+ url: 'https://wallet.ethereum.org',
+ redirect: 'https://wallet.ethereum.org',
+ position: 1,
+ permissions: { admin: true }
+ }});
+
+ LocalStore.set('selectedTab', 'browser');
+ });
+ yield Q.delay(2000);
+ // yield this.client.reload();
+ },
+
+ * afterEach () {
+ },
+
+ * after () {
+ console.log('After tests triggered');
if (this.app && this.app.isRunning()) {
+ console.log('Stopping app...');
yield this.app.stop();
}
if (this.geth && this.geth.isRunning) {
+ console.log('Stopping geth...');
yield this.geth.stop();
}
+
+ if (this.httpServer && this.httpServer.isListening) {
+ console.log('Stopping http server...');
+ yield this.httpServer.close();
+ }
},
tests,
@@ -146,10 +216,15 @@ exports.mocha = function (_module, options) {
const Utils = {
* waitUntil(msg, promiseFn) {
- yield this.client.waitUntil(promiseFn,
- 10000,
- msg,
- 500);
+ yield this.client.waitUntil(promiseFn, 10000, msg, 500);
+ },
+ * waitForText(selector, text, ms = 5000, message = 'Element couldn\'t be found') {
+ const client = this.client;
+ yield client.waitUntil(() => {
+ return client.getText(selector).then((e) => {
+ return e === text;
+ });
+ }, ms, message);
},
* getUiElements(selector) {
const elems = yield this.client.elements(selector);
@@ -176,7 +251,7 @@ const Utils = {
const newHandles = (yield client.windowHandles()).value;
- // focus on new window
+ // focus on new window
yield client.window(newHandles.pop());
},
* execElemsMethod(clientElementIdMethod, selector) {
@@ -214,17 +289,17 @@ const Utils = {
);
accounts = accounts.map(a => a.toLowerCase());
- balances = balances.map(b => parseInt(b));
+ balances = balances.map(b => parseInt(b, 10));
return _.object(accounts, balances);
},
* getUiAccountBalances() {
- // check balances on the pgetUiAccountsBalancesage
+ // check balances on the pgetUiAccountsBalancesage
let _accounts = yield this.execElemsMethod('elementIdText', '.wallet-box .account-id');
let _balances = yield this.execElemsMethod('elementIdText', '.wallet-box .account-balance');
_accounts = _accounts.map(a => a.toLowerCase());
- _balances = _balances.map(b => parseInt(b));
+ _balances = _balances.map(b => parseInt(b, 10));
return _.object(_accounts, _balances);
},
@@ -233,10 +308,10 @@ const Utils = {
let idx = -1;
- accId = accId.toLowerCase();
+ const accountId = accId.toLowerCase();
for (const i in _accounts) {
- if (_accounts[i].toLowerCase() === accId) {
+ if (_accounts[i].toLowerCase() === accountId) {
idx = i;
}
}
@@ -257,5 +332,69 @@ const Utils = {
* stopMining() {
yield this.geth.consoleExec('miner.stop();');
},
+
+ * selectTab(tabId) {
+ const tab = yield this.getUiElement(`.sidebar [data-tab-id=${tabId}]`);
+ yield this.client.click(`.sidebar [data-tab-id=${tabId}] button.main`);
+ // TODO: returns webview reference
+ },
+ * getActiveWebview() {
+ const webview = '';
+ return webview;
+ },
+ * loadFixture(uri = '') {
+ const client = this.client;
+ yield client.setValue('#url-input', `${this.fixtureBaseUrl}${uri}`);
+ yield client.submitForm('form.url');
+ yield client.waitUntil(() => {
+ return client.getText('.dapp-info span', (e) => {
+ /Fixture/.test(e);
+ });
+ }, 3000, 'expected to properly load fixture');
+ },
+ * getBrowserBarText() {
+ return yield this.client.getText('.url-breadcrumb');
+ },
+ *pinCurrentTab() {
+ const client = this.client;
+
+ yield this.openAndFocusNewWindow(() => {
+ return client.click('span.connect-button');
+ });
+ yield client.click('.dapp-primary-button');
+
+ yield client.window(this.mainWindowHandle); // selects main window again
+ yield Q.delay(500);
+
+ const pinnedWebview = (yield client.windowHandles()).value.pop();
+ return pinnedWebview;
+ },
+ *navigateTo(url) {
+ const client = this.client;
+ yield client.setValue('#url-input', url);
+ yield client.submitForm('form.url');
+ },
+
+ /*
+ @method getWindowByUrl
+
+ @param search: function that tells how to search by window
+ @param tries: amount of tries left until give up searching for
+ */
+ *getWindowByUrl(search, tries = 5) {
+ if (tries < 0) throw new Error('Couldn\'t select window using given parameters.');
+
+ let windowHandles = (yield this.client.windowHandles()).value;
+
+ for (let handle in windowHandles) {
+ yield this.client.window(windowHandles[handle]);
+
+ const found = !!search(yield this.client.getUrl());
+ if (found) return true;
+ }
+ yield Q.delay(500);
+ yield this.getWindowByUrl(search, --tries);
+ }
+
};
diff --git a/tests/fixtures/fixture-popup.html b/tests/fixtures/fixture-popup.html
new file mode 100644
index 000000000..c9a6a1645
--- /dev/null
+++ b/tests/fixtures/fixture-popup.html
@@ -0,0 +1,10 @@
+
+
+ Fixture Popup
+
+
+ Fixture Popup
+ Target blank
+ Target popup
+
+
diff --git a/tests/fixtures/index.html b/tests/fixtures/index.html
new file mode 100644
index 000000000..6a1364a1d
--- /dev/null
+++ b/tests/fixtures/index.html
@@ -0,0 +1,11 @@
+
+
+ Fixture title
+
+
+ Index page
+ This is a fixture page
+
+
+
diff --git a/tests/fixtures/page-01.html b/tests/fixtures/page-01.html
new file mode 100644
index 000000000..4779eba84
--- /dev/null
+++ b/tests/fixtures/page-01.html
@@ -0,0 +1,8 @@
+
+
+ Fixture 01
+
+
+ Fixture 01
+
+
diff --git a/tests/mist/basic.test.js b/tests/mist/basic.test.js
new file mode 100644
index 000000000..74ef89ff2
--- /dev/null
+++ b/tests/mist/basic.test.js
@@ -0,0 +1,230 @@
+const _ = require('underscore');
+const Q = require('bluebird');
+const fs = require('fs');
+const path = require('path');
+const should = require('chai').should();
+
+const test = require('../_base').mocha(module, {
+ app: 'mist',
+});
+
+test['Check for Mist title'] = function* () {
+ (yield this.client.getTitle()).should.eql('Mist');
+};
+
+test['Sanity Check: main window is focused'] = function* () {
+ const client = this.client;
+ (yield client.getUrl()).should.match(/interface\/index\.html$/);
+};
+
+// FAILING ON TRAVIS
+test['Browser bar should render urls with separators'] = function* () {
+ const client = this.client;
+
+ yield this.navigateTo('http://localhost:8080/page1/page2?param=value#hash');
+ yield this.waitForText('.url-breadcrumb', 'http://localhost:8080 ▸ page1 ▸ page2 ▸ param=value ▸ hash');
+};
+
+test['Browser bar should not render script tags on breadcrumb view'] = function* () { // ETH-01-001
+ const client = this.client;
+
+ yield this.navigateTo('');
+ yield client.waitUntil(() => {
+ return client.getText('.url-breadcrumb').then((e) => {
+ return /404\.html$/.test(e);
+ });
+ }, 5000, 'expected breadcrumb to render as HTML encoded');
+
+ should.exist(yield this.getUiElement('form.url'));
+ should.not.exist(yield this.getUiElement('form.url script'));
+};
+
+test['Browser bar should not render script tags in disguise on breadcrumb view'] = function* () { // ETH-01-001
+ const client = this.client;
+
+ yield client.setValue('#url-input', '<script>alert()</script>');
+ const isUrlBlocked = (yield client.execute(() => { // Code executed in context of browser
+ try { $('form.url').submit(); }
+ catch(e) { return /Invalid URL/.test(e); }
+ return false;
+ })).value;
+
+ isUrlBlocked.should.be.true;
+ should.not.exist(yield this.getUiElement('form.url script'));
+};
+
+test['Browser bar should not render script tags in disguise (2) on breadcrumb view'] = function* () { // ETH-01-001
+ const client = this.client;
+
+ yield this.navigateTo('