diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index e0b99dc19..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -mist \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 19f74da8e..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/mist.iml b/.idea/mist.iml deleted file mode 100644 index c956989b2..000000000 --- a/.idea/mist.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b8ccc4fea..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 3e8b8a916..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,280 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - $PROJECT_DIR$/gulpfile.js - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1469908854272 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76330fe10..7a533cac9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ To help make Mist-Expanse (Expanse Wallet) better please file issue with the following basic descriptions: -- What do you run? binary from [releases](https://github.com/ethereum/mist/releases) or the development version from the [commandline](https://github.com/ethereum/mist#run-mist) +- What do you run? binary from [releases](https://github.com/expanse-org/mist/releases) or the development version from the [commandline](https://github.com/expanse-org/mist#run-mist) - Which version do you used? You can find that in the `VERSION` file in the Mist folder - What OS you're on? - Provide a log file if necessary, you can find that in the Mist data folder (Linux: `~/.config/Mist/*.log`, Windows: `%APPDATA%/Roaming/Mist/*.log`, MacOSX: `~/Library/Application Support/Mist/*.log`) diff --git a/README.md b/README.md index 10470c650..24357a40a 100644 --- a/README.md +++ b/README.md @@ -215,7 +215,7 @@ It expects installer/zip files to be in the generated folders e.g. `dist_mist/re ### Code signing for production -**As of [#972](https://github.com/ethereum/mist/pull/972) we've updated the build process and thus need to redo code-signing.** +**As of [#972](https://github.com/expanse-org/mist/pull/972) we've updated the build process and thus need to redo code-signing.** ## Testing diff --git a/clientBinaries.json b/clientBinaries.json index 30a3742bd..4d2a2addf 100644 --- a/clientBinaries.json +++ b/clientBinaries.json @@ -2,36 +2,36 @@ { "clients": { "Gexp": { - "version": "1.5.9", + "version": "1.6.0-unstable", "platforms": { "linux": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.5.9-a07539fb.tar.gz", + "url": "http://build.expanse.tech/release/gexp-linux-amd64.tar.gz", "type": "tar", - "md5": "a0b0dda353a655a65c6d3d809ee852fd", - "bin": "gexp-linux-amd64-1.5.9-a07539fb/gexp" + "md5": "902ff290ed7cf3d6f11e7c00da47806d", + "bin": "gexp-linux-amd64/gexp" }, "bin": "gexp", "commands": { "sanity": { "args": ["version"], - "output": [ "Gexp", "1.5.9" ] + "output": [ "Gexp", "1.6.0-unstable" ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-linux-386-1.5.9-a07539fb.tar.gz", + "url": "http://build.expanse.tech/release/gexp-linux-386.tar.gz", "type": "tar", - "md5": "3198330842cbfc6baa7e7b2624f8f6bd", - "bin": "gexp-linux-386-1.5.9-a07539fb/gexp" + "md5": "41b0e04d89ace2888f60bee88667cc86", + "bin": "gexp-linux-386/gexp" }, "bin": "gexp", "commands": { "sanity": { "args": ["version"], - "output": [ "Gexp", "1.5.9" ] + "output": [ "Gexp", "1.6.0-unstable" ] } } } @@ -39,16 +39,16 @@ "mac": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-darwin-amd64-1.5.9-a07539fb.tar.gz", + "url": "http://build.expanse.tech/release/gexp-darwin-amd64.tar.gz", "type": "tar", - "md5": "6a797a930a0930ec88b810e6b2d204eb", - "bin": "gexp-darwin-amd64-1.5.9-a07539fb/gexp" + "md5": "c7bccd738c5de9904571914319171001", + "bin": "gexp-darwin-amd64/gexp" }, "bin": "gexp", "commands": { "sanity": { "args": ["version"], - "output": [ "Gexp", "1.5.9" ] + "output": [ "Gexp", "1.6.0-unstable" ] } } } @@ -56,31 +56,31 @@ "win": { "x64": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-amd64-1.5.9-a07539fb.zip", + "url": "http://build.expanse.tech/release/gexp-windows-amd64.zip", "type": "zip", - "md5": "057cdfdf4347ec9d5c0bf0b964f1b97b", - "bin": "gexp-windows-amd64-1.5.9-a07539fb\\gexp.exe" + "md5": "4141064b45e569dfb118296206ceef47", + "bin": "gexp-windows-amd64\\gexp.exe" }, "bin": "gexp.exe", "commands": { "sanity": { "args": ["version"], - "output": [ "Gexp", "1.5.9" ] + "output": [ "Gexp", "1.6.0-unstable" ] } } }, "ia32": { "download": { - "url": "https://gethstore.blob.core.windows.net/builds/geth-windows-386-1.5.9-a07539fb.zip", + "url": "http://build.expanse.tech/release/gexp-windows-386.zip", "type": "zip", - "md5": "fa3511985215e151bafdc080e9b1fef6", - "bin": "gexp-windows-386-1.5.9-a07539fb\\gexp.exe" + "md5": "f1afeb5dffd55689dd91e429c169fe20", + "bin": "gexp-windows-386\\gexp.exe" }, "bin": "gexp.exe", "commands": { "sanity": { "args": ["version"], - "output": [ "Gexp", "1.5.9" ] + "output": [ "Gexp", "1.6.0-unstable" ] } } } diff --git a/gulpfile.js b/gulpfile.js index 98eb836c6..a4a5255f7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -27,10 +27,11 @@ const cmp = require('semver-compare'); const parseJson = require('xml2js').parseString; const options = minimist(process.argv.slice(2), { - string: ['platform', 'walletSource'], + string: ['platform', 'walletSource', 'test'], default: { platform: 'all', walletSource: 'master', + test: 'basic', }, }); @@ -44,7 +45,7 @@ if (options.platform.indexOf(',') !== -1) { // CONFIG let type = 'mist'; -let applicationName = 'Mist-Expanse'; +let applicationName = 'Expanse Wallet'; const electronVersion = require('electron/package.json').version; const packJson = require('./package.json'); @@ -231,7 +232,7 @@ gulp.task('build-dist', ['copy-i18n'], (cb) => { name: applicationName.replace(/\s/, ''), productName: applicationName, description: applicationName, - homepage: 'https://github.com/ethereum/mist', + homepage: 'https://github.com/expanse-org/mist', build: { appId: `com.ethereum.${type}`, category: 'public.app-category.productivity', @@ -363,7 +364,7 @@ gulp.task('upload-binaries', () => { const GITHUB_TOKEN = process.env.GITHUB_TOKEN; // query github releases - return got(`https://api.github.com/repos/ethereum/mist/releases?access_token=${GITHUB_TOKEN}`, { + return got(`https://api.github.com/repos/expanse-org/mist/releases?access_token=${GITHUB_TOKEN}`, { json: true, }) // filter draft with current version's tag @@ -385,7 +386,7 @@ gulp.task('upload-binaries', () => { if (!_.isEmpty(existingAssets)) throw new Error(`Github release draft already contains assets (${existingAssets}); will not upload, please remove and trigger rebuild`); return githubUpload({ - url: `https://uploads.github.com/repos/ethereum/mist/releases/${draft.id}/assets{?name}`, + url: `https://uploads.github.com/repos/expanse-org/mist/releases/${draft.id}/assets{?name}`, token: [GITHUB_TOKEN], assets: filePaths, }).then((res) => { @@ -548,8 +549,9 @@ gulp.task('build-nsis', (cb) => { const testApp = (app) => { + // gulp test-mist [--test TESTFILEPREFIX] return gulp.src([ - `./tests/${app}/*.test.js`, + `./tests/${app}/${options.test}.test.js`, ]).pipe(mocha({ timeout: 60000, ui: 'exports', diff --git a/interface/.meteor/packages b/interface/.meteor/packages index 9ba7e7284..6557550ca 100644 --- a/interface/.meteor/packages +++ b/interface/.meteor/packages @@ -14,13 +14,12 @@ frozeman:template-var frozeman:reactive-timer frozeman:storage frozeman:global-notifications -numeral:numeral reactive-var@1.0.11 sacha:spin chuangbo:cookie agnito:simptip mrt:jquery-ui-sortable -expanse:web3 +ethereum:web3 expanse:elements ethereum:accounts ethereum:blocks @@ -43,3 +42,5 @@ standard-minifier-js@1.2.1 tap:i18n-bundler shell-server ecmascript +numeral:numeral +numeral:languages diff --git a/interface/.meteor/versions b/interface/.meteor/versions index 0870d46b0..ffaf37c7c 100644 --- a/interface/.meteor/versions +++ b/interface/.meteor/versions @@ -33,9 +33,10 @@ ejson@1.0.13 ethereum:accounts@0.3.12 ethereum:blocks@0.3.2 ethereum:dapp-styles@0.5.7 -ethereum:elements@0.7.10 -ethereum:tools@0.6.0 ethereum:web3@0.15.3 +expanse:elements@0.7.2 +expanse:tools@0.5.4 +expanse:web3@0.15.3 fastclick@1.0.13 frozeman:animation-helper@0.2.6 frozeman:global-notifications@0.2.1 @@ -71,6 +72,7 @@ mongo@1.1.14 mongo-id@1.0.6 mrt:jquery-ui-sortable@1.10.3 npm-mongo@2.2.11_2 +numeral:languages@1.5.3 numeral:numeral@1.5.3_1 observe-sequence@1.0.14 ordered-dict@1.0.9 diff --git a/interface/client/appStart.js b/interface/client/appStart.js index c410ae641..12df66b74 100644 --- a/interface/client/appStart.js +++ b/interface/client/appStart.js @@ -3,54 +3,57 @@ The init function of Mist @method mistInit */ -mistInit = function(){ +mistInit = function () { console.info('Initialise Mist Interface'); EthBlocks.init(); - Tabs.onceSynced.then(function() { - if (0 <= location.search.indexOf('reset-tabs')) { + Tabs.onceSynced.then(function () { + if (location.search.indexOf('reset-tabs') >= 0) { console.info('Resetting UI tabs'); Tabs.remove({}); } - if(!Tabs.findOne('browser')) { + if (!Tabs.findOne('browser')) { console.debug('Insert tabs'); Tabs.insert({ _id: 'browser', - url: 'https://ethereum.org', - redirect: 'https://ethereum.org', + url: 'https://expanse.tech', + redirect: 'https://expanse.tech', position: 0 }); } // overwrite wallet on start again, but use $set to dont remove titles - Tabs.upsert({_id: 'wallet'}, {$set: { - url: 'https://wallet.ethereum.org', - redirect: 'https://wallet.ethereum.org', - position: 1, - permissions: { - admin: true + Tabs.upsert( + { _id: 'wallet' }, + { + $set: { + url: 'https://wallet.expanse.tech', + redirect: 'https://wallet.expanse.tech', + position: 1, + permissions: { + admin: true + } } - } - }); + }); // Sets browser as default tab if: // 1) there's no record of selected tab // 2) data is corrupted (no saved tab matches localstore) - if(!LocalStore.get('selectedTab') || !Tabs.findOne(LocalStore.get('selectedTab'))){ + if (!LocalStore.get('selectedTab') || !Tabs.findOne(LocalStore.get('selectedTab'))) { LocalStore.set('selectedTab', 'wallet'); } }); }; -Meteor.startup(function(){ +Meteor.startup(function () { console.info('Meteor starting up...'); - if (!location.hash) { + if (!location.hash) { // Main window EthAccounts.init(); mistInit(); } @@ -58,28 +61,32 @@ Meteor.startup(function(){ console.debug('Setting language'); // SET default language - if(Cookie.get('TAPi18next')) { + if (Cookie.get('TAPi18next')) { TAPi18n.setLanguage(Cookie.get('TAPi18next')); } else { - var userLang = navigator.language || navigator.userLanguage, - availLang = TAPi18n.getLanguages(); + const userLang = navigator.language || navigator.userLanguage; + const availLang = TAPi18n.getLanguages(); // set default language if (_.isObject(availLang) && availLang[userLang]) { TAPi18n.setLanguage(userLang); - } else if (_.isObject(availLang) && availLang[userLang.substr(0,2)]) { - TAPi18n.setLanguage(userLang.substr(0,2)); + } else if (_.isObject(availLang) && availLang[userLang.substr(0, 2)]) { + TAPi18n.setLanguage(userLang.substr(0, 2)); } else { TAPi18n.setLanguage('en'); } } // change moment and numeral language, when language changes - Tracker.autorun(function(){ - if(_.isString(TAPi18n.getLanguage())) { - var lang = TAPi18n.getLanguage().substr(0,2); + Tracker.autorun(function () { + if (_.isString(TAPi18n.getLanguage())) { + const lang = TAPi18n.getLanguage().substr(0, 2); moment.locale(lang); - numeral.language(lang); - ExpTools.setLocale(lang); + try { + numeral.language(lang); + } catch (err) { + console.error(`numeral.js couldn't set number formating: ${err.message}`); + } + EthTools.setLocale(lang); } }); }); diff --git a/interface/client/templates/popupWindows/onboardingScreen.html b/interface/client/templates/popupWindows/onboardingScreen.html index e7f415eba..296c3c677 100644 --- a/interface/client/templates/popupWindows/onboardingScreen.html +++ b/interface/client/templates/popupWindows/onboardingScreen.html @@ -60,7 +60,7 @@

{{i18n "mist.popupWindows.onboarding.accountTitle"}}

{{TemplateVar.get "newAccount"}}
{{#unless TemplateVar.get "testnet"}} - {{i18n "mist.popupWindows.onboarding.depositBitcoin"}} + {{i18n "mist.popupWindows.onboarding.depositBitcoin"}}
{{{i18n "mist.popupWindows.onboarding.viaShapeshift"}}}
{{/unless}} {{/if}} @@ -75,7 +75,7 @@
{{{i18n "mist.popupWindows.onboarding.viaShapeshift"}}}

{{i18n "mist.popupWindows.onboarding.learnIt"}}

{{{i18n "mist.popupWindows.onboarding.tutorial1Description"}}} -

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

+

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

@@ -88,7 +88,7 @@

{{i18n "mist.popupWindows.onboarding.learnIt"}}

{{i18n "mist.popupWindows.onboarding.learnIt"}}

{{{i18n "mist.popupWindows.onboarding.tutorial2Description"}}} -

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

+

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

@@ -101,7 +101,7 @@

{{i18n "mist.popupWindows.onboarding.learnIt"}}

{{i18n "mist.popupWindows.onboarding.learnIt"}}

{{{i18n "mist.popupWindows.onboarding.tutorial3Description"}}} -

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

+

{{i18n "mist.popupWindows.onboarding.buttons.learnReceipt"}}

diff --git a/interface/client/templates/popupWindows/onboardingScreen.js b/interface/client/templates/popupWindows/onboardingScreen.js index 6d6a8a718..38775ab7e 100644 --- a/interface/client/templates/popupWindows/onboardingScreen.js +++ b/interface/client/templates/popupWindows/onboardingScreen.js @@ -265,12 +265,14 @@ Template['popupWindows_onboardingScreen_importAccount'].events({ ipc.on('uiAction_checkedWalletFile', function (e, error, type) { switch (type) { case 'presale': + console.log(`Imported ${type} account`); TemplateVar.set(template, 'filePath', files[0].path); Tracker.afterFlush(function () { template.$('.password').focus(); }); break; case 'web3': + console.log(`Imported ${type} account`); TemplateVar.set(template, 'filePath', files[0].path); TemplateVar.set(template, 'importing', true); setTimeout(function () { diff --git a/interface/i18n/mist.de.i18n.json b/interface/i18n/mist.de.i18n.json index 25829063c..4cb99120f 100644 --- a/interface/i18n/mist.de.i18n.json +++ b/interface/i18n/mist.de.i18n.json @@ -5,7 +5,7 @@ "label": "__app__", "about": "Über __app__", "checkForUpdates": "Nach Aktualisierungen suchen...", - "checkForNodeUpdates": "Check for Expanse node updates...", + "checkForNodeUpdates": "Nach Expanse Softwareknoten Aktualisierungen suchen...", "services": "Dienste", "hide": "__app__ ausblenden", "hideOthers": "Andere ausblenden", @@ -24,7 +24,7 @@ "view": { "label": "Ansicht", "fullscreen": "Vollbildmodus", - "default": "Default" + "default": "Standard" }, "accounts": { "label": "Konten", @@ -43,12 +43,12 @@ "runTests": "Tests durchführen", "logFiles": "Logdatei anzeigen", "openRemix": "Remix IDE öffnen", - "ExpanseNode": "Expanse Node", + "ethereumNode": "Expanse Softwareknoten", "network": "Netzwerk", "mainNetwork": "Hauptnetzwerk", "startMining": "⛏ Mining starten (nur auf Testnetz)", "stopMining": "⛏ Mining stoppen", - "externalNode": "using external node", + "externalNode": "externer Softwareknoten aktiv", "nodeMode": "Chain download", "fullNode": "Store full blockchain", "lightNode": "Use light Node (experimental!)" @@ -61,12 +61,12 @@ }, "help": { "label": "Hilfe", - "reportBug": "Report an issue on Github" + "reportBug": "Ein Problem melden" } }, "errors": { - "nodeConnect": "Es konnte keine Verbindung mit dem Node hergestellt werden. Weitere Informatinen finden sich in den Logdateien.", - "nodeStartup": "Anscheinend konnte der Node nicht gestartet werden, läuft evtl. schon eine andere Instanz? Oder läuft eventuell gerade ein Datenbank-Update?", + "nodeConnect": "Es konnte keine Verbindung mit dem Softwareknoten hergestellt werden. Weitere Informatinen finden sich in den Logdateien.", + "nodeStartup": "Anscheinend konnte der Softwareknoten nicht gestartet werden, läuft evtl. schon eine andere Instanz? Oder läuft eventuell gerade ein Datenbank-Update?", "timeSync": { "title": "Deine Computer Uhr ist nicht synchronisiert!", "description": "Um mit dem Expanse netzwerk zu synchronisieren muss deine Computer Uhr mit einem Zeit-Server synchronisiert werden.", @@ -75,8 +75,8 @@ "darwin": "Um Zeit Synchronisation einzuschalten, öffne die System Einstellungen und checke \"Zeit Datum automatisch\"." }, "nodeChecksumMismatch": { - "title": "Checksum mismatch in downloaded node!", - "description": "__algorithm__: __hash__\n\nPlease install the __type__ node version __version__ manually." + "title": "Prüfsumme des heruntergeladenen Softwareknotens stimmt nicht überein!", + "description": "__algorithm__: __hash__\n\nBitte installiere den Softwareknoten __type__ in Version __version__ manuell." }, "legacyChain": { "title": "Legacy chain detected", @@ -115,34 +115,33 @@ } }, "startScreen": { - "runningNodeFound": "Laufender Expanse Node gefunden!", - "startingNode": "Starte Expanse Node...", + "runningNodeFound": "Laufender Expanse Softwareknoten gefunden!", + "startingNode": "Starte Expanse Softwareknoten...", "startedNode": "Starte Anwendung...", - "nodeConnectionTimeout": "Expanse Node konnte nicht gestartet werden!
Wenn Sie Geth installiert haben,, verwenden Sie bitte diesen Befehl, um Geth zu starten:
geth --ipcpath __path__
oder senden Sie einen Fehlerreport", - "nodeBinaryNotFound": "Keine Programmdatei für den Expanse Node gefunden!
Bitte starten Sie den Expanse Node manuell. ", - "nodeSyncing": "Expanse Node muss synchronisiert werden, bitte warten...", + "nodeConnectionTimeout": "Expanse Softwareknoten konnte nicht gestartet werden!
Wenn Sie Geth installiert haben,, verwenden Sie bitte diesen Befehl, um Geth zu starten:
geth --ipcpath __path__
oder senden Sie einen Fehlerreport", + "nodeBinaryNotFound": "Keine Programmdatei für den Expanse Softwareknoten gefunden!
Bitte starten Sie den Expanse Softwareknoten manuell. ", + "nodeSyncing": "Expanse Softwareknoten muss synchronisieren, bitte warten...", "nodeSyncInfo": "Block __displayBlock__ von __highestBlock__ wird heruntergeladen.", "nodeSyncConnecting": "Suche nach Peers...", "peerSearchTimeout": "Peer-Suche überspringen", - "stoppingNode": "Stopping Expanse node...", - "nodeStarting": "Expanse node starting up...", - "nodeStarted": "Expanse node started", - "nodeConnected": "Expanse node connected", - "nodeStopping": "Expanse node stopping...", - "nodeStopped": "Expanse node stopped", - "nodeError": "Expanse node connection error :'(", - "unableToBindPort": "Expanse 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": "Expanse node sync stopped", - "launchApp": "Launch Application", + "stoppingNode": "Stoppe Expanse Softwareknoten...", + "nodeStarting": "Expanse Softwareknoten startet...", + "nodeStarted": "Expanse Softwareknoten gestartet", + "nodeConnected": "Expanse Softwareknoten verbunden", + "nodeStopping": "Expanse Softwareknoten stoppt...", + "nodeStopped": "Expanse Softwareknoten gestoppt", + "nodeError": "Verbindungsproblem zum Expanse Softwareknoten :'(", + "unableToBindPort": "Expanse Softwareknoten kann nicht gestartet werden. Läuft bereits eine andere Instanz?", + "nodeSyncInfoStates": "Lade Block __displayBlock__ von __highestBlock__,
Lade chain structure __displayState__ von __displayKnownStates__", + "nodeSyncFoundPeers": "Verbinde mit __peers__ Peers...", + "launchApp": "Starte die Anwendung", "clientBinaries": { - "scanning": "Checking for node update...", - "downloading": "Downloading new node...", - "loadConfig": "Loading client config...", + "scanning": "Suche nach Softwareknoten Aktualisierung...", + "downloading": "Lade neue Softwareknoten-Version herunter...", + "loadConfig": "Lade Softwareknoten Konfiguration...", "filtering": "Filtering client binaries...", - "done": "Expanse node up-to-date...", - "error": "Error running downloaded binary." + "done": "Expanse Softwareknoten aktuell...", + "error": "Expanse Softwareknoten konnte nicht gestartet werden." } }, "popupWindows": { @@ -153,7 +152,7 @@ "creating": "Konto wird angelegt...", "errors": { "passwordMismatch": "Die Passwörter stimmen nicht überein.", - "passwordTooShort": "Make a longer password" + "passwordTooShort": "Wähle ein längeres Passwort..." } }, "unlockMasterPassword": { @@ -184,14 +183,14 @@ "sendTransaction": "Transaktion absenden" }, "errors": { - "connectionTimeout": "Eine Verbindung mit dem Node war nicht möglich, eventuell ist der Node im Hintergrund abgestürzt?", + "connectionTimeout": "Eine Verbindung mit dem Softwareknoten war nicht möglich, eventuell ist der Softwareknoten im Hintergrund abgestürzt?", "wrongPassword": "Falsches Passwort", "multipleKeysMatchAddress": "Multiple keys match address, please remove duplicates from keystore (menu -> accounts -> backup -> accounts)", - "insufficientFundsForGas": "Insufficient funds in main account (Expansebase) to pay for gas", - "sameAccount": "Can't send to itself" + "insufficientFundsForGas": "Insufficient funds in main account (etherbase) to pay for gas", + "sameAccount": "Kann nicht zum gleichen Konto schicken." }, - "transactionThrow": "The contract won't allow this transaction to be executed", - "noEstimate": "We couldn't estimate the gas.", + "transactionThrow": "Der Vertrag wird diese Transaktion nicht ausführen können", + "noEstimate": "Transaktionsgebühr konnte nicht geschätzt werden.", "gasLimit": "Provide maximum fee", "parameters": "Parameters", "showRawBytecode": "show raw data", @@ -206,8 +205,8 @@ "gotoMainnet": "Verwende das Hauptnetz", "gotoMainnetDescription": " Sie werden etwas Expanse benötigen, um Verträge anzulegen und auszuführen. Wir werden Ihnen helfen, etwas zu bekommen ...", "doYouHaveAWalletFile": "Haben Sie eine Wallet-Datei?", - "walletFileDescription": "

Wallet-Datei zum importieren in dieses Fenster ziehen.
Wenn Sie 2014 am Expanse-Pre-sale teilgenommen haben, sollten Sie über eine Datei mit dem Dateinamen Expanse_wallet_backup.json verfügen. Sie wurde nach dem Kauf heruntergeladen und Ihnen auch per E-Mail geschickt.

", - "dropFilesHere": "Pre-sale Datei hochladen", + "walletFileDescription": "

Wallet-Datei zum importieren in dieses Fenster ziehen.
Wenn Sie 2014 am Expanse-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.

", + "dropFilesHere": "Pre-sale Datei laden", "creating": "Erstellen...", "importing": "Importieren...", "skip": "Diesen Schritt überspringen", @@ -234,7 +233,7 @@ "learnReceipt": "Lernen Sie dieses Rezept kennen" }, "errors": { - "nodeNotStartedYet": "Warten Sie noch einige Sekunden, bis der Node gestartet ist, und versuchen Sie es dann noch einmal", + "nodeNotStartedYet": "Warten Sie noch einige Sekunden, bis der Softwareknoten gestartet ist, und versuchen Sie es dann noch einmal", "unknownFile": "Datei nicht erkannt.", "wrongPassword": "Falsches Passwort.", "importFailed": "Beim Import der Datei ist folgender Fehler aufgetreten: __error__" diff --git a/interface/i18n/mist.en.i18n.json b/interface/i18n/mist.en.i18n.json index 6d178c805..ffd9d0299 100644 --- a/interface/i18n/mist.en.i18n.json +++ b/interface/i18n/mist.en.i18n.json @@ -99,7 +99,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -152,7 +152,6 @@ "nodeSyncInfoStates": "Downloading block __displayBlock__ of __highestBlock__,
Downloading chain structure __displayState__ of __displayKnownStates__", "nodeSyncConnecting": "Looking for peers...", "nodeSyncFoundPeers": "Connecting to __peers__ peers...", - "nodeSyncingStopped": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { diff --git a/interface/i18n/mist.es.i18n.json b/interface/i18n/mist.es.i18n.json index fec761ecf..492301789 100644 --- a/interface/i18n/mist.es.i18n.json +++ b/interface/i18n/mist.es.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -134,7 +134,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "launchApp": "Launch Application", "clientBinaries": { "scanning": "Checking for node update...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse es una plataforma descentralizada para la construcción de aplicaciones en una blockchain: segura y a prueba de manipulaciones que puede transferir valor, propiedad y vive para siempre", diff --git a/interface/i18n/mist.fa.i18n.json b/interface/i18n/mist.fa.i18n.json index 7be5fc079..429fe8fdd 100644 --- a/interface/i18n/mist.fa.i18n.json +++ b/interface/i18n/mist.fa.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -119,7 +119,7 @@ "startingNode": "Starting Expanse node...", "stoppingNode": "Stopping Expanse node...", "startedNode": "Starting application...", - "nodeConnectionTimeout": "Couldn't start Expanse node!
If you installed Geth, use this command to run it:
geth --ipcpath __path__
Or report an issue ", + "nodeConnectionTimeout": "Couldn't start Expanse node!
If you installed Geth, use this command to run it:
geth --ipcpath __path__
Or report an issue ", "nodeBinaryNotFound": "No Expanse node binary found!
Please start one manually before. ", "nodeStarting": "Expanse node starting up...", "nodeStarted": "Expanse node started", @@ -133,7 +133,6 @@ "nodeSyncInfoStates": "Downloading block __displayBlock__ of __highestBlock__,
Downloading chain structure __displayState__ of __displayKnownStates__", "nodeSyncConnecting": "Looking for peers...", "nodeSyncFoundPeers": "Connecting to __peers__ peers...", - "nodeSyncingStopped": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { @@ -209,7 +208,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse is a public blockchain that features a turing complete programming for building solid, decentralized applications.", @@ -276,4 +277,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 360e17722..bd0316bd3 100644 --- a/interface/i18n/mist.fr.i18n.json +++ b/interface/i18n/mist.fr.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "Nœud Expanse actif trouvé !!", "startingNode": "Démarrage du nœud Expanse en cours...", "startedNode": "Démarrage de l'application...", - "nodeConnectionTimeout": "Echec du démarrage du nœud Expanse !
Si vous avez installé Geth, utilisez cette commande pour le lancer :
geth --ipcpath __path__
Ou signalez le problème ", + "nodeConnectionTimeout": "Echec du démarrage du nœud Expanse !
Si vous avez installé Geth, utilisez cette commande pour le lancer :
geth --ipcpath __path__
Ou signalez le problème ", "nodeBinaryNotFound": "Pas de binaire du nœud Expanse trouvé !
Veuillez en lancer d'abord un manuellement. ", "nodeSyncing": "Le nœud Expanse se synchronise, veuillez patienter...", "nodeSyncInfo": "Télechargement du bloc __displayBlock__ depuis le bloc __highestBlock__.", @@ -134,7 +134,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "launchApp": "Launch Application", "clientBinaries": { "scanning": "Checking for node update...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse est une plateforme décentralisée pour la création d'applications sur une blockchain (chaîne de blocs) : logiciel inviolable qui peut transférer de la valeur et de la propriété et qui vit pour toujours", diff --git a/interface/i18n/mist.it.i18n.json b/interface/i18n/mist.it.i18n.json index 0578216e8..c48835500 100644 --- a/interface/i18n/mist.it.i18n.json +++ b/interface/i18n/mist.it.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "Trovato nodo Expanse in esecuzione!", "startingNode": "Avvio nodo Expanse ...", "startedNode": "Avvio applicazione...", - "nodeConnectionTimeout": "Impossibile avviare un nodo Expanse!
Se hai installato Gexp, usa questo comando per eseguirlo:
gexp --ipcpath __path__
o riporta il problema ", + "nodeConnectionTimeout": "Impossibile avviare un nodo Expanse!
Se hai installato Gexp, usa questo comando per eseguirlo:
gexp --ipcpath __path__
o riporta il problema ", "nodeBinaryNotFound": "Impossibile trovare l'eseguibile del nodo Expanse !
Per favore avvialo manualmente prima. ", "nodeSyncing": "Il nodo Expanse deve sincronizzarsi, attendere prego...", "nodeSyncInfo": "Scaricamento blocco __displayBlock__ di __highestBlock__.", @@ -133,7 +133,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse é una piattaforma decentralizzata per costruire applicazioni sfruttando una blockchain: software a prova di manomissione che puó trasferire valore e proprietá vivendo per sempre", diff --git a/interface/i18n/mist.ja.i18n.json b/interface/i18n/mist.ja.i18n.json index 205358d12..607f859ba 100644 --- a/interface/i18n/mist.ja.i18n.json +++ b/interface/i18n/mist.ja.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -134,7 +134,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "launchApp": "Launch Application", "clientBinaries": { "scanning": "Checking for node update...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse は分散型のプラットフォームで、ブロックチェーン上でアプリケーションを作成することが出来ます。価値を転送することが出来、永続的に稼働するセキュリティの高いソフトウェアを作ることが出来ます。", diff --git a/interface/i18n/mist.ko.i18n.json b/interface/i18n/mist.ko.i18n.json index 58578f678..7b4327adb 100644 --- a/interface/i18n/mist.ko.i18n.json +++ b/interface/i18n/mist.ko.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "작동 중인 이더리움 노드를 발견!", "startingNode": "이더리움 노드 시작...", "startedNode": "어플리케이션 시작...", - "nodeConnectionTimeout": "이더리움 노드를 시작할 수 없었습니다!
만일Gexp 를 인스톨 했다면, 다음의 명령어를 사용해 실행하세요:
gexp --ipcpath __path__
또는 이슈를 리포트하세요 ", + "nodeConnectionTimeout": "이더리움 노드를 시작할 수 없었습니다!
만일Gexp 를 인스톨 했다면, 다음의 명령어를 사용해 실행하세요:
gexp --ipcpath __path__
또는 이슈를 리포트하세요 ", "nodeBinaryNotFound": "이더리움 노드 실행파일이 없습니다!
수동으로 이를 먼저 실행하세요. ", "nodeSyncing": "이더리움 노드에 동기화가 필요합니다, 기다려 주세요...", "nodeSyncInfo": "현재 highestBlock__ 중 __currentBlcok 을 다운로드중", @@ -133,7 +133,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "이더리움은 블럭체인상에 앱을 만들기 위한 탈중앙화된 플랫폼이며, 이 블럭체인은 변조방지가능한 소프트웨어로서 가치와 자산을 전송할 수 있고 영구히 존속합니다.", @@ -276,4 +277,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 7808880ea..f3a2a124e 100644 --- a/interface/i18n/mist.kr.i18n.json +++ b/interface/i18n/mist.kr.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "작동 중인 이더리움 노드를 발견!", "startingNode": "이더리움 노드 시작...", "startedNode": "어플리케이션 시작...", - "nodeConnectionTimeout": "이더리움 노드를 시작할 수 없었습니다!
만일Gexp 를 인스톨 했다면, 다음의 명령어를 사용해 실행하세요:
gexp --ipcpath __path__
또는 이슈를 리포트하세요 ", + "nodeConnectionTimeout": "이더리움 노드를 시작할 수 없었습니다!
만일Gexp 를 인스톨 했다면, 다음의 명령어를 사용해 실행하세요:
gexp --ipcpath __path__
또는 이슈를 리포트하세요 ", "nodeBinaryNotFound": "이더리움 노드 실행파일이 없습니다!
수동으로 이를 먼저 실행하세요. ", "nodeSyncing": "이더리움 노드에 동기화가 필요합니다, 기다려 주세요...", "nodeSyncInfo": "현재 highestBlock__ 중 __currentBlcok 을 다운로드중", @@ -133,7 +133,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "이더리움은 블럭체인상에 앱을 만들기 위한 탈중앙화된 플랫폼이며, 이 블럭체인은 변조방지가능한 소프트웨어로서 가치와 자산을 전송할 수 있고 영구히 존속합니다.", @@ -276,4 +277,4 @@ "bytes": "Bytes" } } -} \ No newline at end of file +} diff --git a/interface/i18n/mist.nb.i18n.json b/interface/i18n/mist.nb.i18n.json index 931a40385..b72bee6ee 100644 --- a/interface/i18n/mist.nb.i18n.json +++ b/interface/i18n/mist.nb.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -119,7 +119,7 @@ "startingNode": "Starter Expanse-node...", "stoppingNode": "Stopper Expanse-node...", "startedNode": "Starter applikasjonen...", - "nodeConnectionTimeout": "Kunne ikke starte Expanse-node!
Hvis du installerte Gexp, bruk denne kommandoen for å kjøre det:
gexp --ipcpath __path__
Eller rapporter et problem ", + "nodeConnectionTimeout": "Kunne ikke starte Expanse-node!
Hvis du installerte Gexp, bruk denne kommandoen for å kjøre det:
gexp --ipcpath __path__
Eller rapporter et problem ", "nodeBinaryNotFound": "Ingen Expanse-node kilde funnet!
Vennligst start en manuelt først. ", "nodeStarting": "Expanse-node starter opp...", "nodeStarted": "Expanse-node startet", @@ -131,7 +131,6 @@ "nodeSyncing": "Expanse-node trenger å synkroniseres, vennligst vent...", "nodeSyncInfo": "Laster ned blokk __currentBlock__ av __highestBlock__.", "nodeSyncConnecting": "Leter etter peers...", - "nodeSyncingStopped": "Expanse-node synkronisering stoppet", "peerSearchTimeout": "Hopp over peer søk", "launchApp": "Start Applikasjonen", "nodeSyncInfoStates": "Downloading block __displayBlock__ of __highestBlock__,
Downloading chain structure __displayState__ of __displayKnownStates__", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse er en desentralisert plattform for å bygge applikasjoner på en blokkjede: sabotasjesikker programvare som kan overføre verdi og eiendom, og som lever evig", diff --git a/interface/i18n/mist.nl.i18n.json b/interface/i18n/mist.nl.i18n.json index a53026578..59e017bd0 100644 --- a/interface/i18n/mist.nl.i18n.json +++ b/interface/i18n/mist.nl.i18n.json @@ -98,7 +98,7 @@ }, "legacyChain": { "title": "Legacy chain gedetecteerd", - "description": "Je node draait momenteel op de niet ondersteunde Expanse Classic chain. Om deze chain te gebruiken dien je de tools te gebruiken van het Expanse Classic project op\nhttps://ethereumclassic.github.io.\n\nOm terug te gaan naar de standaard Expanse chain kun je deze tutorial volgen:\nhttps://github.com/ethereum/mist/releases/0.8.2" + "description": "Je node draait momenteel op de niet ondersteunde Expanse Classic chain. Om deze chain te gebruiken dien je de tools te gebruiken van het Expanse Classic project op\nhttps://ethereumclassic.github.io.\n\nOm terug te gaan naar de standaard Expanse chain kun je deze tutorial volgen:\nhttps://github.com/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -137,7 +137,7 @@ "startingNode": "Expanse node starten...", "stoppingNode": "Expanse node stoppen...", "startedNode": "Applicatie starten...", - "nodeConnectionTimeout": "Expanse 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 ", + "nodeConnectionTimeout": "Expanse 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 Expanse node gevonden!
Start er a.u.b. handmatig een. ", "nodeStarting": "Expanse node opstarten...", "nodeStarted": "Expanse node gestart", @@ -151,7 +151,6 @@ "nodeSyncInfoStates": "Blok __displayBlock__ van __highestBlock__ aan het downloaden,
Chain structuur __displayState__ van __displayKnownStates__ aan het downloaden", "nodeSyncConnecting": "Zoeken naar peers...", "nodeSyncFoundPeers": "Verbinden met __peers__ peers...", - "nodeSyncingStopped": "Expanse node sync gestopt", "peerSearchTimeout": "Sla peer search over", "launchApp": "Applicatie Opstarten", "clientBinaries": { @@ -227,7 +226,9 @@ "showRawBytecode": "Toon ruwe data", "showDecodedParameters": "Toon gedecodeerde parameters", "lookupData": "Probeer de data te decoderen", - "lookupDataExplainer": "Zoek hiernaar op het internet" + "lookupDataExplainer": "Zoek hiernaar op het internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse 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", diff --git a/interface/i18n/mist.pt.i18n.json b/interface/i18n/mist.pt.i18n.json index c90868658..50e3100b1 100644 --- a/interface/i18n/mist.pt.i18n.json +++ b/interface/i18n/mist.pt.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -135,7 +135,6 @@ "nodeError": "Expanse node connection error :'(", "unableToBindPort": "Expanse node cannot run. Is another instance already running?", "nodeSyncFoundPeers": "Connecting to __peers__ peers...", - "nodeSyncingStopped": "Expanse node sync stopped", "clientBinaries": { "scanning": "Checking for node update...", "downloading": "Downloading new node...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse é uma plataforma decentralizada para construir aplicativos no blockchain: apps a prova de fraude, censura ou corrupção que podem transferir valor e títulos de propriedade", diff --git a/interface/i18n/mist.ru.i18n.json b/interface/i18n/mist.ru.i18n.json index 18ee7a86b..582d59932 100644 --- a/interface/i18n/mist.ru.i18n.json +++ b/interface/i18n/mist.ru.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -119,7 +119,7 @@ "startingNode": "Запуск Expanse-ноды...", "stoppingNode": "Остановка Expanse-ноды...", "startedNode": "Запуск приложения...", - "nodeConnectionTimeout": "Не удалось запустить Expanse-ноду!
Если вы установили Gexp, используйте следующую команду для запуска:
gexp --ipcpath __path__
Либо сообщите от проблеме ", + "nodeConnectionTimeout": "Не удалось запустить Expanse-ноду!
Если вы установили Gexp, используйте следующую команду для запуска:
gexp --ipcpath __path__
Либо сообщите от проблеме ", "nodeBinaryNotFound": "Не найдены программные файлы для Expanse-ноды!
Пожалуйста, для начала изучите руководство. ", "nodeStarting": "Expanse-нода запускается...", "nodeStarted": "Expanse-нода запущена", @@ -133,7 +133,6 @@ "nodeSyncInfoStates": "Загружено блоков __displayBlock__ из __highestBlock__,
Загружено частей структуры блокчейна __displayState__ из __displayKnownStates__", "nodeSyncConnecting": "Поиск пиров...", "nodeSyncFoundPeers": "Количество подключеных пиров __peers__...", - "nodeSyncingStopped": "Остановилась синхронизация Expanse-ноды", "peerSearchTimeout": "Пропустить поиск пиров", "launchApp": "Запуск приложения", "clientBinaries": { @@ -199,7 +198,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanseium представляет собой децентрализованную платформу основанную на блокчейне для создания надежных и децентрализованных приложений", diff --git a/interface/i18n/mist.sq.i18n.json b/interface/i18n/mist.sq.i18n.json index c8e1e5f98..b63d3d077 100644 --- a/interface/i18n/mist.sq.i18n.json +++ b/interface/i18n/mist.sq.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "U gjet nyje Expansei në punë!", "startingNode": "Duke krijuar nyje Expansei...", "startedNode": "Duke filluar aplikacionin...", - "nodeConnectionTimeout": "Nuk mundi të fillojë krijimin e një nyje Expansei!
Nëse ju installed Gexp, përdorni këtë komandë ta krijoni atë:
gexp --ipcpath __path__
Ose raportoni një problem ", + "nodeConnectionTimeout": "Nuk mundi të fillojë krijimin e një nyje Expansei!
Nëse ju installed Gexp, përdorni këtë komandë ta krijoni atë:
gexp --ipcpath __path__
Ose raportoni një problem ", "nodeBinaryNotFound": "Nuk u gjet nyje binare Expansei!
Lutemi krijoni një manualisht më parë. ", "nodeSyncing": "Nyja e Expanseit ka nevojë të sinkronizohet, lutemi prisni...", "nodeSyncInfo": "Duke marrë bllokun __currentBlock__ of __highestBlock__.", @@ -133,7 +133,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "peerSearchTimeout": "Skip peer search", "launchApp": "Launch Application", "clientBinaries": { @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "Expanse është një platformë e decentralizuar për ndërtim aplikacionesh në një zinxhir blloqesh (blockchain): tamper-proof software i cili mund të transferojë vlerë dhe pronësi dhe jetë përgjithmonë", diff --git a/interface/i18n/mist.zh-TW.i18n.json b/interface/i18n/mist.zh-TW.i18n.json index d34befd45..238a4f0b9 100644 --- a/interface/i18n/mist.zh-TW.i18n.json +++ b/interface/i18n/mist.zh-TW.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -118,7 +118,7 @@ "runningNodeFound": "發現正在運行的以太坊節點！", "startingNode": "正在開啓以太坊節點……", "startedNode": "正在啓動應用程序……", - "nodeConnectionTimeout": "無法開啓以太坊節點！
如果您已經安裝Gexp，使用此命令運行：
gexp --ipcpath __path__
或者上報此問題 ", + "nodeConnectionTimeout": "無法開啓以太坊節點！
如果您已經安裝Gexp，使用此命令運行：
gexp --ipcpath __path__
或者上報此問題 ", "nodeBinaryNotFound": "找不到以太坊節點安裝文件！
請事先手動開啓一個節點 ", "nodeSyncing": "需要同步以太坊節點，請等待……", "nodeSyncInfo": "正在下載第__displayBlock__塊，共__highestBlock__。", @@ -134,7 +134,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "launchApp": "Launch Application", "clientBinaries": { "scanning": "Checking for node update...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "以太坊是一個用於在區塊鏈上創建應用的去中心化平台：一種用於轉移價值和資產，永遠存在並且無法被篡改的軟體", @@ -276,4 +277,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 33fe12f1a..396d0284e 100644 --- a/interface/i18n/mist.zh.i18n.json +++ b/interface/i18n/mist.zh.i18n.json @@ -80,7 +80,7 @@ }, "legacyChain": { "title": "Legacy chain detected", - "description": "Your node is currently on the unsupported Expanse 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" + "description": "Your node is currently on the unsupported Expanse 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/expanse-org/mist/releases/0.8.2" } }, "rightClick": { @@ -134,7 +134,6 @@ "unableToBindPort": "Expanse 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": "Expanse node sync stopped", "launchApp": "Launch Application", "clientBinaries": { "scanning": "Checking for node update...", @@ -197,7 +196,9 @@ "showRawBytecode": "show raw data", "showDecodedParameters": "show decoded parameters", "lookupData": "Try to decode data", - "lookupDataExplainer": "Look this up on the internet" + "lookupDataExplainer": "Look this up on the internet", + "overBlockGasLimit": "The gas required for this execution could exceed the block gas limit.", + "notEnoughGas": "Gas might not be enough to successfully finish this transaction.
Click here to increase the gas amount." }, "onboarding": { "description": "以太坊是一个用于在区块链上创建应用的去中心化平台：一种用于转移价值和资产，永远存在并且无法被篡改的软件", diff --git a/interface/package.json b/interface/package.json index b264b088b..9526cdc48 100644 --- a/interface/package.json +++ b/interface/package.json @@ -8,7 +8,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/ethereum/mist.git" + "url": "git+https://github.com/expanse-org/mist.git" }, "keywords": [ "ethereum", @@ -18,9 +18,9 @@ "author": "Fabian Vogelsteller ", "license": "GPL-3.0", "bugs": { - "url": "https://github.com/ethereum/mist/issues" + "url": "https://github.com/expanse-org/mist/issues" }, - "homepage": "https://github.com/ethereum/mist#readme", + "homepage": "https://github.com/expanse-org/mist#readme", "dependencies": { "babel-runtime": "^6.18.0" } diff --git a/interface/project-tap.i18n b/interface/project-tap.i18n index 505e66bb2..0c215d17d 100644 --- a/interface/project-tap.i18n +++ b/interface/project-tap.i18n @@ -1,5 +1,7 @@ { - "cdn_path" : "i18n", - "helper_name": "i18n", - "supported_languages": ["de", "en", "es", "fa", "fr", "it", "ja", "ko", "nb", "nl", "pt", "ru", "sq", "zh", "zh-TW"] + "cdn_path": "i18n", + "helper_name": "i18n", + "supported_languages": [ + "de", "en", "es", "fa", "fr", "it", "ja", "ko", "nb", "nl", "pt", "ru", "sq", "zh", "zh-TW" + ] } diff --git a/interface/public/dapp-styles b/interface/public/dapp-styles new file mode 160000 index 000000000..64fcd6c88 --- /dev/null +++ b/interface/public/dapp-styles @@ -0,0 +1 @@ +Subproject commit 64fcd6c88ff90aaf55a10f5fa89450fda2c0006d diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index f39553c14..4afd299e2 100644 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -12,11 +12,10 @@ const EventEmitter = require('events').EventEmitter; const log = require('./utils/logger').create('ClientBinaryManager'); -// should be 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json' -const BINARY_URL = 'https://raw.githubusercontent.com/ethereum/mist/master/clientBinaries.json'; +// should be 'https://raw.githubusercontent.com/expanse-org/mist/master/clientBinaries.json' +const BINARY_URL = 'https://raw.githubusercontent.com/expanse-org/mist/master/clientBinaries.json'; -const ALLOWED_DOWNLOAD_URLS_REGEX = - /^https:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)?ethereum\.org\/|gethstore\.blob\.core\.windows\.net\/|bintray\.com\/artifact\/download\/karalabe\/ethereum\/)(?:.+)/; // eslint-disable-line max-len +const ALLOWED_DOWNLOAD_URLS_REGEX = /^http:\/\/(?:(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)?expanse\.tech\/)(?:.+)/; // eslint-disable-line max-len class Manager extends EventEmitter { constructor() { @@ -49,7 +48,7 @@ class Manager extends EventEmitter { } _checkForNewConfig(restart) { - const nodeType = 'Geth'; + const nodeType = 'Gexp'; let binariesDownloaded = false; let nodeInfo; @@ -192,8 +191,8 @@ class Manager extends EventEmitter { return mgr.init({ folders: [ - path.join(Settings.userDataPath, 'binaries', 'Geth', 'unpacked'), - path.join(Settings.userDataPath, 'binaries', 'Eth', 'unpacked'), + path.join(Settings.userDataPath, 'binaries', 'Gexp', 'unpacked'), + path.join(Settings.userDataPath, 'binaries', 'Exp', 'unpacked'), ], }) .then(() => { diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js index 350052039..86f3ee068 100644 --- a/modules/ipcCommunicator.js +++ b/modules/ipcCommunicator.js @@ -115,21 +115,23 @@ ipc.on('backendAction_stopWebviewNavigation', (e, id) => { // 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); + const keyfile = JSON.parse(data); + const result = keyfileRecognizer(keyfile); /** result * [ 'ethersale', undefined ] Ethersale keyfile * [ 'web3', 3 ] web3 (v3) keyfile * null no valid keyfile */ - if (_.first(result) === 'ethersale') { + const type = _.first(result); + + log.debug(`Importing ${type} account...`); + + if (type === 'ethersale') { e.sender.send('uiAction_checkedWalletFile', null, 'presale'); - } else if (_.first(result) === 'web3') { + } else if (type === 'web3') { e.sender.send('uiAction_checkedWalletFile', null, 'web3'); let keystorePath = Settings.userHomePath; @@ -151,15 +153,19 @@ ipc.on('backendAction_checkWalletFile', (e, path) => { if (process.platform === 'win32') keystorePath = `${Settings.appDataPath}\\Ethereum\\keystore`; } - fs.writeFile(`${keystorePath}/0x${wallet.address}`, data, (err) => { + fs.writeFile(`${keystorePath}/0x${keyfile.address}`, data, (err) => { if (err) throw new Error("Can't write file to disk"); }); } else { - throw new Error('Wallet import: Cannot recognize keyfile'); + throw new Error('Account import: Cannot recognize keyfile (invalid)'); } } catch (err) { e.sender.send('uiAction_checkedWalletFile', null, 'invalid'); - log.error(err); + if (/Unexpected token . in JSON at position 0/.test(err.message) === true) { + log.error('Account import: Cannot recognize keyfile (no JSON)'); + } else { + log.error(err); + } } }); }); diff --git a/modules/menuItems.js b/modules/menuItems.js index 391183994..d655496c3 100644 --- a/modules/menuItems.js +++ b/modules/menuItems.js @@ -551,7 +551,7 @@ let menuTempl = function (webviews) { helpMenu.push({ label: i18n.t('mist.applicationMenu.help.reportBug'), click() { - shell.openExternal('https://github.com/ethereum/mist/issues'); + shell.openExternal('https://github.com/expanse-org/mist/issues'); }, }); diff --git a/modules/updateChecker.js b/modules/updateChecker.js index f150a6003..49967d776 100644 --- a/modules/updateChecker.js +++ b/modules/updateChecker.js @@ -24,7 +24,7 @@ const check = exports.check = () => { break; } - return got('https://api.github.com/repos/ethereum/mist/releases', { + return got('https://api.github.com/repos/expanse-org/mist/releases', { timeout: 3000, json: true, }) diff --git a/package.json b/package.json index 7a8408066..3e4d728b8 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "underscore": "^1.8.3", "underscore-deep-extend": "^1.1.5", "uuid": "^3.0.1", - "@expanse/web3": "^0.18.2", + "web3": "^0.18.2", "yargs": "^6.6.0" }, "devDependencies": { diff --git a/scripts/windows-installer.nsi b/scripts/windows-installer.nsi index 4c76e03cb..6a01137ae 100644 --- a/scripts/windows-installer.nsi +++ b/scripts/windows-installer.nsi @@ -27,8 +27,8 @@ 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 HELPURL "https://github.com/expanse-org/mist/releases/issues" +!define UPDATEURL "https://github.com/expanse-org/mist/releases" !define ABOUTURL "https://ethereum.org" !define /date NOW "%Y%m%d" diff --git a/tests/fixtures/fixture-popup.html b/tests/fixtures/fixture-popup.html index c9a6a1645..97aa0338d 100644 --- a/tests/fixtures/fixture-popup.html +++ b/tests/fixtures/fixture-popup.html @@ -4,7 +4,7 @@

Fixture Popup

- Target blank - Target popup + Target blank + Target popup diff --git a/tests/fixtures/js-redirect.html b/tests/fixtures/js-redirect.html new file mode 100644 index 000000000..3a0c9f51f --- /dev/null +++ b/tests/fixtures/js-redirect.html @@ -0,0 +1,17 @@ + + + JS redirect fixture + + +

JS redirect fixture

+ + + + diff --git a/tests/fixtures/meta-redirect.html b/tests/fixtures/meta-redirect.html new file mode 100644 index 000000000..bd0f7a3e6 --- /dev/null +++ b/tests/fixtures/meta-redirect.html @@ -0,0 +1,9 @@ + + + Meta redirect fixture + + + +

Meta redirect fixture

+ + diff --git a/tests/mist/basic.test.js b/tests/mist/basic.test.js index 74ef89ff2..40040af0e 100644 --- a/tests/mist/basic.test.js +++ b/tests/mist/basic.test.js @@ -17,7 +17,6 @@ test['Sanity Check: main window is focused'] = function* () { (yield client.getUrl()).should.match(/interface\/index\.html$/); }; -// FAILING ON TRAVIS test['Browser bar should render urls with separators'] = function* () { const client = this.client; @@ -99,7 +98,7 @@ test['Load fixture page'] = function* () { yield this.loadFixture(); }; -test['"http://" protocol should be allowed on browser bar'] = function* () { // ETH-01-002 +test['"http" protocol should be allowed on browser bar'] = function* () { // ETH-01-002 const client = this.client; yield this.loadFixture(); @@ -117,7 +116,7 @@ test['"http://" protocol should be allowed on browser bar'] = function* () { // browserBarText.should.eql('http://localhost:8080 ▸ index.html'); // checks that did change displayed URL }; -test['"javascript:" protocol should be disallowed on browser bar'] = function* () { // ETH-01-002 +test['"javascript" protocol should be disallowed on browser bar'] = function* () { // ETH-01-002 const client = this.client; yield this.loadFixture(); yield client.setValue('#url-input', 'javascript:window.close()'); @@ -134,7 +133,7 @@ test['"javascript:" protocol should be disallowed on browser bar'] = function* ( browserBarText.should.eql('http://localhost:8080'); // checks that hasn't changed displayed URL }; -test['"data:" protocol should be disallowed on browser bar'] = function* () { // ETH-01-002 +test['"data" protocol should be disallowed on browser bar'] = function* () { // ETH-01-002 const client = this.client; yield this.loadFixture(); yield client.setValue('#url-input', 'data:text/plain;charset=utf-8;base64,dGhpcyB0ZXN0IGlzIG9uIGZpcmU='); @@ -151,15 +150,15 @@ test['"data:" protocol should be disallowed on browser bar'] = function* () { // browserBarText.should.eql('http://localhost:8080'); // checks that hasn't changed displayed URL }; -// test['"file:///" protocol should be disallowed'] = function* () { // ETH-01-002 -// const client = this.client; -// const filePath = 'file://' + path.join(__dirname, '..', 'fixtures', 'index.html'); +test['"file" protocol should be disallowed on browser bar'] = function* () { // ETH-01-012 + const client = this.client; + const filePath = 'file://' + path.join(__dirname, '..', 'fixtures', 'index.html'); -// yield this.navigateTo(filePath); -// yield Q.delay(1500); -// const browserBarText = yield this.getBrowserBarText(); -// browserBarText.should.match(/errorPages ▸ 400.html$/); -// }; + yield this.navigateTo(filePath); + yield Q.delay(1500); + const browserBarText = yield this.getBrowserBarText(); + browserBarText.should.match(/errorPages ▸ 400.html$/); +}; test['Pin tab test'] = function* () { const client = this.client; @@ -174,57 +173,100 @@ test['Pin tab test'] = function* () { sidebarItemsAfterAdd.length.should.eql(3); }; -// test['Browse tab should be changed to pinned tab if the URL is the same'] = function* () { // ETH-01-007 -// const client = this.client; -// yield this.selectTab('browser'); +test['Browse tab should be changed to pinned tab if URLs are the same'] = function* () { // ETH-01-007 + const client = this.client; + yield this.selectTab('browser'); -// yield this.navigateTo('https://wallet.ethereum.org' ); -// yield Q.delay(1000); -// const el = (yield client.element('.sidebar nav > ul > .selected')); -// console.log('el', el); + yield this.navigateTo('https://wallet.ethereum.org'); + yield Q.delay(1000); + const selectedTab = (yield client.execute(() => { // code executed in browser context + return LocalStore.get('selectedTab'); + })).value; -// el.getAttribute('data-tab-id').should.eql('wallet'); + selectedTab.should.eql('wallet'); +}; -// }; +test['Wallet tab shouldn\'t have the page replaced if URLs does not match'] = function* () { // ETH-01-007 + const client = this.client; + const app = this; + yield this.selectTab('wallet'); -// test['Wallet tab shouldn\'t have the page replaced if URLs does not match'] = function* () { // ETH-01-007 -// const client = this.client; -// const app = this; -// yield this.selectTab('wallet'); + yield this.navigateTo(`${this.fixtureBaseUrl}index.html?https://wallet.ethereum.org`); + yield client.waitUntil(() => { + return client.execute(() => { + return LocalStore.get('selectedTab') === 'browser'; + }); + }, 2000); +}; -// yield this.navigateTo(`${this.fixtureBaseUrl}index.html?https://wallet.ethereum.org`); -// yield client.waitUntil(() => { -// return client.element('.sidebar nav > ul > .selected').then((e) => { -// console.log('e', e); -// return e.getAttribute('data-tab-id') === 'browse'; -// }); -// }, 2000); -// }; +test['Wallet tab shouldn\'t have the page replaced if URLs does not match - 2'] = function* () { // ETH-01-007 + const client = this.client; + const app = this; + yield this.selectTab('wallet'); -// test['Wallet tab shouldn\'t have the page replaced if URLs does not match - 2'] = function* () { // ETH-01-007 -// const client = this.client; -// const app = this; -// yield this.selectTab('wallet'); + // Now changing address via JS + yield client.setValue('#url-input', `${this.fixtureBaseUrl}index.html?https://wallet.ethereum.org`); + const isProtocolBlocked = yield client.execute(() => { // Code executed in context of browser + $('form.url').submit(); + }); -// // Now changing address via JS -// yield client.setValue('#url-input', `${this.fixtureBaseUrl}index.html?https://wallet.ethereum.org`); -// const isProtocolBlocked = yield client.execute(() => { // Code executed in context of browser -// $('form.url').submit(); -// }); + yield client.waitUntil(() => { + return client.execute(() => { + return LocalStore.get('selectedTab') === 'browser'; + }); + }, 2000); +}; -// yield client.waitUntil(() => { -// return client.element('.sidebar nav > ul > .selected').then((e) => { -// console.log('e', e); -// return e.getAttribute('data-tab-id') === 'browser'; -// }); -// }, 2000); -// }; +test['Links with target _blank should open inside Mist'] = function* () { + const client = this.client; + yield this.navigateTo(`${this.fixtureBaseUrl}/fixture-popup.html`); + yield this.getWindowByUrl(e => /fixture-popup.html$/.test(e)); -test['Links with target _blank or _popup should open inside Mist'] = function* () { + yield client.click('a[target=_blank]'); + yield client.waitUntil(() => { + return client.getUrl((url) => { + return /index.html$/.test(url); + }); + }); +}; + +test['Links with target _popup should open inside Mist'] = function* () { const client = this.client; yield this.navigateTo(`${this.fixtureBaseUrl}/fixture-popup.html`); - yield this.getWindowByUrl(e => /popup.html$/.test(e)); + yield this.getWindowByUrl(e => /fixture-popup.html$/.test(e)); + + yield client.click('a[target=_popup]'); + yield client.waitUntil(() => { + return client.getUrl((url) => { + return /index.html$/.test(url); + }) + }); +}; + +// ETH-01-005 +test['Mist main webview should not redirect to arbitrary addresses'] = function* () { + const client = this.client; + const initialURL = yield client.getUrl(); + + yield client.execute(() => { // code executed in context of browser + window.location.href = 'http://google.com'; + }); - // TODO: click on the fixtures' links and assert if they opened on the same page + yield Q.delay(1000); + (yield client.getUrl()).should.eql(initialURL); }; + +// ETH-01-008 +test['Mist main webview should not redirect to local files'] = function* () { + const client = this.client; + const initialURL = yield client.getUrl(); + + yield this.navigateTo('https://cure53.de/exchange/8743653459838/ETH-01-008.php'); + + yield client.waitUntil(() => { + return client.getText('.url-breadcrumb').then((e) => { + return /400\.html$/.test(e); + }); + }, 5000, 'expected a URL not allowed as a result'); +}; diff --git a/yarn.lock b/yarn.lock index 49e1e4676..9a2678c1e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1610,9 +1610,15 @@ get-stream@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" -geth-private@^1.3.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/geth-private/-/geth-private-1.7.0.tgz#326eae709fe12cf3545d0bcda7a3fa2c43adc7c8" +getpass@^0.1.1: + version "0.1.6" + resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6" + dependencies: + assert-plus "^1.0.0" + +gexp-private@^1.3.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/gexp-private/-/gexp-private-1.8.0.tgz#1eecf08ea29086134dbc096212bd644d60b6c34a" dependencies: bluebird "^3.3.4" chalk "^1.1.3" @@ -1621,12 +1627,6 @@ geth-private@^1.3.0: which "^1.2.4" yargs "^4.3.2" -getpass@^0.1.1: - version "0.1.6" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6" - dependencies: - assert-plus "^1.0.0" - gh-release-assets@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/gh-release-assets/-/gh-release-assets-1.1.0.tgz#00f76bd151d020032de10712f525d2a944814595"