diff --git a/README.md b/README.md index 5e9fd714d..5b440cff1 100755 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ To run a private network you will need to set the IPC path, network id and data folder: ```bash -$ yarn dev:electron --rpc ~/Library/Ethereum/geth.ipc --node-networkid 1234 --node-datadir ~/Library/Ethereum/privatenet +$ yarn dev:electron --rpc ~/Library/Expanse/gexp.ipc --node-networkid 1234 --node-datadir ~/Library/Ethereum/privatenet ``` _NOTE: since `ipcpath` is also a Mist option you do not need to also include a diff --git a/Wallet-README.txt b/Wallet-README.txt index 13993f370..7a86dc9d5 100755 --- a/Wallet-README.txt +++ b/Wallet-README.txt @@ -9,11 +9,11 @@ The wallet contains its own node, but can also use an already running one, if th When you start the wallet on a testnet (e.g. different `--datadir`) you need to make sure to set the `--ipcpath` back to the original one. -On OSX its `~/Library/Ethereum/geth.ipc` on linux `~/.ethereum/geth.ipc` and on windows it uses a named pipe, which doesn't need to be renamed. +On OSX its `~/Library/Expanse/gexp.ipc` on linux `~/.expanse/gexp.ipc` and on windows it uses a named pipe, which doesn't need to be renamed. Example: - $ geth --datadir /my/chain/ --networkid 23 --ipcpath ~/Library/Ethereum/geth.ipc + $ gexp --datadir /my/chain/ --networkid 23 --ipcpath ~/Library/Expanse/gexp.ipc diff --git a/main.js b/main.js index fabd4fa1c..3a2d5781e 100755 --- a/main.js +++ b/main.js @@ -151,7 +151,7 @@ app.on('ready', () => { // if using HTTP RPC then inform user if (Settings.rpcMode === 'http') { dialog.showErrorBox('Insecure RPC connection', ` -WARNING: You are connecting to an Ethereum node via: ${Settings.rpcHttpPath} +WARNING: You are connecting to an Expanse node via: ${Settings.rpcHttpPath} This is less secure than using local IPC - your passwords will be sent over the wire in plaintext. diff --git a/modules/clientBinaryManager.js b/modules/clientBinaryManager.js index d256a5a7a..16b0df5a1 100755 --- a/modules/clientBinaryManager.js +++ b/modules/clientBinaryManager.js @@ -297,7 +297,7 @@ class Manager extends EventEmitter { __dirname, '..', 'nodes', - 'eth', + 'exp', `${platform}-${process.arch}` ); diff --git a/modules/ipc/ipcProviderBackend.js b/modules/ipc/ipcProviderBackend.js index 0b76b8748..a6763768f 100755 --- a/modules/ipc/ipcProviderBackend.js +++ b/modules/ipc/ipcProviderBackend.js @@ -144,7 +144,7 @@ class IpcProviderBackend { if (ethereumNode.STATES.CONNECTED === newState) { ethereumNode.removeListener('state', onStateChange); - log.debug(`Ethereum node connected, resume connecting socket ${ownerId}`); + log.debug(`Expanse node connected, resume connecting socket ${ownerId}`); resolve(); } @@ -209,7 +209,7 @@ class IpcProviderBackend { switch (state) { // eslint-disable-line default-case // stop syncing when node about to be stopped case ethereumNode.STATES.STOPPING: - log.info('Ethereum node stopping, disconnecting sockets'); + log.info('Expanse node stopping, disconnecting sockets'); Q.all(_.map(this._connections, (item) => { if (item.socket.isConnected) { diff --git a/modules/ipcCommunicator.js b/modules/ipcCommunicator.js index 915520489..bd201a9d9 100755 --- a/modules/ipcCommunicator.js +++ b/modules/ipcCommunicator.js @@ -145,13 +145,13 @@ ipc.on('backendAction_checkWalletFile', (e, path) => { } // geth } else { - if (process.platform === 'darwin') keystorePath += '/Library/Ethereum/keystore'; + if (process.platform === 'darwin') keystorePath += '/Library/Expanse/keystore'; if (process.platform === 'freebsd' || process.platform === 'linux' || - process.platform === 'sunos') keystorePath += '/.ethereum/keystore'; + process.platform === 'sunos') keystorePath += '/.expanse/keystore'; - if (process.platform === 'win32') keystorePath = `${Settings.appDataPath}\\Ethereum\\keystore`; + if (process.platform === 'win32') keystorePath = `${Settings.appDataPath}\\Expanse\\keystore`; } if (!/^[0-9a-fA-F]{40}$/.test(keyfile.address)) { @@ -187,7 +187,7 @@ ipc.on('backendAction_importWalletFile', (e, path, pw) => { nodeProcess.once('error', () => { error = true; - e.sender.send('uiAction_importedWalletFile', 'Couldn\'t start the "geth wallet import " process.'); + e.sender.send('uiAction_importedWalletFile', 'Couldn\'t start the "gexp wallet import " process.'); }); nodeProcess.stdout.on('data', (_data) => { const data = _data.toString(); diff --git a/modules/menuItems.js b/modules/menuItems.js index eee73db0e..fbdf8acbf 100755 --- a/modules/menuItems.js +++ b/modules/menuItems.js @@ -211,17 +211,17 @@ let menuTempl = function (webviews) { // geth } else { if (process.platform === 'darwin') { - userPath += '/Library/Ethereum/keystore'; + userPath += '/Library/Expanse/keystore'; } if (process.platform === 'freebsd' || process.platform === 'linux' || process.platform === 'sunos') { - userPath += '/.ethereum/keystore'; + userPath += '/.expanse/keystore'; } if (process.platform === 'win32') { - userPath = `${Settings.appDataPath}\\Ethereum\\keystore`; + userPath = `${Settings.appDataPath}\\Expanse\\keystore`; } } @@ -482,17 +482,17 @@ let menuTempl = function (webviews) { if (process.platform === 'darwin' || process.platform === 'win32') { const nodeSubmenu = []; - const ethClient = ClientBinaryManager.getClient('eth'); - const gethClient = ClientBinaryManager.getClient('geth'); + const ethClient = ClientBinaryManager.getClient('exp'); + const gethClient = ClientBinaryManager.getClient('gexp'); if (gethClient) { nodeSubmenu.push({ - label: `Geth ${gethClient.version}`, + label: `Gexp ${gethClient.version}`, checked: ethereumNode.isOwnNode && ethereumNode.isGeth, enabled: ethereumNode.isOwnNode, type: 'checkbox', click() { - restartNode('geth', null, 'fast', webviews); + restartNode('gexp', null, 'fast', webviews); }, }); } @@ -500,13 +500,13 @@ let menuTempl = function (webviews) { if (ethClient) { nodeSubmenu.push( { - label: `Eth ${ethClient.version} (C++)`, + label: `Exp ${ethClient.version} (C++)`, checked: ethereumNode.isOwnNode && ethereumNode.isEth, enabled: ethereumNode.isOwnNode, // enabled: false, type: 'checkbox', click() { - restartNode('eth'); + restartNode('exp'); }, } ); @@ -572,7 +572,7 @@ let menuTempl = function (webviews) { checked: ethereumNode.isLightMode, type: 'checkbox', click() { - restartNode('geth', null, (ethereumNode.isLightMode) ? 'fast' : 'light'); + restartNode('gexp', null, (ethereumNode.isLightMode) ? 'fast' : 'light'); }, }); } diff --git a/modules/settings.js b/modules/settings.js index b818af295..daba03c33 100755 --- a/modules/settings.js +++ b/modules/settings.js @@ -34,7 +34,7 @@ const argv = require('yargs') node: { demand: false, default: null, - describe: 'Node to use: geth, eth', + describe: 'Node to use: Gexp, eth', requiresArg: true, nargs: 1, type: 'string', @@ -68,7 +68,7 @@ const argv = require('yargs') }, gethpath: { demand: false, - describe: 'Path to Geth executable to use instead of default.', + describe: 'Path to Gexp executable to use instead of default.', requiresArg: true, nargs: 1, type: 'string', @@ -118,7 +118,7 @@ const argv = require('yargs') syncmode: { demand: false, requiresArg: true, - describe: 'Geth synchronization mode: [fast|light|full]', + describe: 'Gexp synchronization mode: [fast|light|full]', nargs: 1, type: 'string', group: 'Mist options:', @@ -141,7 +141,7 @@ const argv = require('yargs') type: 'boolean', }, '': { - describe: 'To pass options to the underlying node (e.g. Geth) use the --node- prefix, e.g. --node-datadir', + describe: 'To pass options to the underlying node (e.g. Gexp) use the --node- prefix, e.g. --node-datadir', group: 'Node options:', }, }) diff --git a/package.json b/package.json index 0df0f36ed..9663c5608 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Mist", - "version": "0.9.3", + "version": "0.9.4", "license": "GPL-3.0", "author": "Expanse Mist Team ", "repository": { diff --git a/scripts/windows-installer.nsi b/scripts/windows-installer.nsi index f00383b7d..7f9542244 100755 --- a/scripts/windows-installer.nsi +++ b/scripts/windows-installer.nsi @@ -26,16 +26,16 @@ CRCCheck on RequestExecutionLevel admin !searchreplace APPNAMENOHYPEN ${APPNAME} "-" " " -!define GROUPNAME "Ethereum" +!define GROUPNAME "Expanse" !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 ABOUTURL "https://expanse.tech" !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 VERSIONMINOR 9 +#!define VERSIONBUILD 4 # Define some script globals Name "${GROUPNAME} ${APPNAME}" @@ -65,7 +65,7 @@ ${EndIf} SetShellVarContext current StrCpy $DATADIR "$APPDATA\${APPNAME}" - StrCpy $NODEDATADIR "$APPDATA\Ethereum" + StrCpy $NODEDATADIR "$APPDATA\Expanse" StrCpy $SHORTCUTDIR "$SMPROGRAMS\${APPNAMENOHYPEN}" StrCpy $DESKTOPDIR "$DESKTOP" diff --git a/tests/_base.js b/tests/_base.js index e6bf7f3b1..6b3a57e4e 100755 --- a/tests/_base.js +++ b/tests/_base.js @@ -98,7 +98,7 @@ exports.mocha = (_module, options) => { this.geth = yield startGeth(); - const appFileName = (options.app === 'wallet') ? 'Ethereum Wallet' : 'Mist'; + const appFileName = (options.app === 'wallet') ? 'Expanse Wallet' : 'Mist'; const platformArch = `${process.platform}-${process.arch}`; let appPath;