v2 (#2)

* fix umbrella bugs #1
* docs: update.

Author: n8tb1t

README.md

@@ -1,5 +1,7 @@
 # Catalyst GUI Wallet
-
+ 
+> After you start the wallet for the first time, please **refresh the node list**, and then select one of the public nodes.
+the `wallet.cx-pool.gq` is our official node, the transaction fee is 10CX, the fee will be used for development porpuses and various community events.
 ### Features:
 This wallet contains the basic functions required to manage your Catalyst assets:
 
@@ -40,21 +42,19 @@ The wallet relies on `catalyst-service` to manage wallet container & rpc com
 On first launch, Catalyst WalletShell will try to detect location/path of bundled `catalyst-service` binary,
 but if it's failed, you can manually set path to the `catalyst-service` binary on the Settings screen.
 
-In windows configuration files are found in directory %USERPROFILE%\AppData\Roaming\catalyst-gui-wallet ,
+In windows configuration files are found in directory %USERPROFILE%\AppData\Roaming\CatalystLedger ,
 on issues it helps to delete it and restart the wallet.
 
-Program File are situated %USERPROFILE%\AppData\Local\Programs\catalyst-gui-wallet
+Program File are situated %USERPROFILE%\AppData\Local\Programs\CatalystLedger
 
 ### Download & Run Catalyst Wallet
 
 
 #### GNU/Linux (AppImage):
 1. Download latest AppImage bundle here: https://github.com/catalystdevelopment/catalyst-gui-wallet/releases/latest
 2. Make it executable, either via GUI file manager or command line, e.g. `chmod +x catalyst-wallet-<version>-linux.AppImage`
-3. Run ./catalystd by locating the app in your Catalyst directory and double clicking, then Run the `wallet` file by double clicking the app
-4. To use own blockchain the Daemon or public node address needs setting as 127.0.0.1 and Daemon/node port set as 17291
-   To use a public node visit the main website to see a list of available nodes.
-
+4. To use your local dameon the set the public node address to 127.0.0.1 and Daemon/node port to 17291.
+   To use a public node visit the main website to see the list of available nodes.
 
 See: https://docs.appimage.org/user-guide/run-appimages.html
 
@@ -76,12 +76,6 @@ $ cd catalyst-gui-wallet
 ### install dependencies
 $ npm install
 
-### create build+dist directory
-$ mkdir -p ./build && mkdir -p ./dist
-
-### copy/symlink icons from assets, required for packaging
-$ cp ./src/assets/icon.* ./build/
-
 ### build GNU/Linux package
 $ mkdir -p ./bin/lin
 $ cp /path/to/linux-version-of/catalyst-service ./bin/lin/

main.js

@@ -35,7 +35,7 @@ const DEFAULT_SETTINGS = {
     node_address: DEFAULT_REMOTE_NODE,
     pubnodes_last_updated: 946697799000,
     pubnodes_data: config.remoteNodeListFallback,
-    pubnodes_custom: ['127.0.0.1:17122'],
+    pubnodes_custom: ['127.0.0.1:17291'],
     pubnodes_exclude_offline: false,
     tray_minimize: false,
     tray_close: false,
@@ -56,7 +56,7 @@ app.setAppUserModelId(config.appId);
 log.transports.console.level = LOG_LEVEL;
 log.transports.file.level = LOG_LEVEL;
 log.transports.file.maxSize = 5 * 1024 * 1024;
-log.info(`Starting WalletShell ${WALLETSHELL_VERSION}`);
+log.info(`Starting Catalyst Wallet ${WALLETSHELL_VERSION}`);
 if (IS_DEV || IS_DEBUG) log.warn(`Running in ${IS_DEV ? 'dev' : 'debug'} mode`);
 
 let trayIcon = path.join(__dirname, 'src/assets/tray.png');

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "catalyst-gui-wallet",
-  "productName": "catalyst-gui-wallet",
+  "name": "CatalystLedger",
+  "productName": "CatalystLedger",
   "description": "Catalyst GUI Wallet",
-  "version": "v1.1.6",
+  "version": "v2.0.0",
   "homepage": "https://dirtybits.github.io/",
   "repository": "https://github.com/catalystdevelopment/catalyst-gui-wallet",
   "main": "main.js",
@@ -15,7 +15,7 @@
     "dist-mac": "./node_modules/.bin/electron-builder --x64 --mac -c.extraResources=./bin/osx/catalyst-service"
   },
   "keywords": [],
-  "author": "TurtleCoin Developers, Catalyst Developers",
+  "author": "TurtleCoin Developers, (n8tb1t, dirtybits) Catalyst Developers",
   "license": "ISC",
   "devDependencies": {
     "devtron": "^1.4.0",
@@ -37,8 +37,8 @@
     "request-promise-native": "^1.0.7"
   },
   "build": {
-    "appId": "Catalyst",
-    "copyright": "Copyright (c) 2018 TurtleCoin Developers, 2019 Catalyst Developers",
+    "appId": "CatalystLedger",
+    "copyright": "Copyright (c) 2018 TurtleCoin Developers, 2019 (n8tb1t, dirtybits) Catalyst Developers",
     "directories": {
       "output": "dist",
       "buildResources": "build"
@@ -68,7 +68,7 @@
       "target": [
         "AppImage"
       ],
-      "maintainer": "Sups (@Sudosups), MadHatter (@MadHatter)",
+      "maintainer": "n8tb1t (@n8tb1t), dirtybits (@dirtybits)",
       "category": "Office",
       "vendor": "Catalyst",
       "synopsis": "Catalyst GUI Wallet"

src/html/about.html

@@ -27,7 +27,7 @@
                     </div>
                     <div class="splitted-content last">
                         <p class="small-space">Donate to: <strong>dirtybits (@dirtybits)</strong></p>
-                        <input data-cplabel="@dirtybits´s wallet address" tabindex="0" data-noclear="1" title="Click to copy" type="text" class="text-block  small-space ctcl" value="N/A" readonly="readonly" />
+                        <input data-cplabel="@dirtybits´s wallet address" tabindex="0" data-noclear="1" title="Click to copy" type="text" class="text-block  small-space ctcl" value="cat1Az2Xwt4byGrYeiKwxacV2pMahz7JaFPqW7eLbFPDP9kKT4rYMMq428KsZMbv8xK44j3dKBvaZW1VGzX4WVvb4R8ndN6WnD" readonly="readonly" />
                     </div>
                 </div>
 

src/js/ws_config.js

@@ -1,10 +1,9 @@
 var config = {};
-//Rebase File
-// self explanatory, your application name, descriptions, etc
-config.appName = 'catalyst-gui-wallet';
-config.appDescription = 'Catalyst GUI Wallet';
+
+config.appName = 'CatalystLedger';
+config.appDescription = 'Catalyst Wallet';
 config.appSlogan = 'Catalyst building a better tomorrow.!';
-config.appId = 'catalyst-gui-wallet';
+config.appId = 'CatalystLedger';
 config.appGitRepo = 'https://github.com/catalystdevelopment/catalyst-gui-wallet';
 
 // default port number for your daemon (e.g. Catalyst daemon)
@@ -24,29 +23,25 @@ config.walletServiceBinaryVersion = "v0.3.1.1";
 // json --> for turtle service (or its forks) version >= v0.8.4
 config.walletServiceConfigFormat = "json";
 
-// default port number for your wallet service (e.g. turtle-service)
+// default port number for your wallet service (e.g. catalyst-service)
 config.walletServiceRpcPort = 17280;
 
 // block explorer url, the [[TX_HASH]] will be substituted w/ actual transaction hash
-config.blockExplorerUrl = 'https://www.cx-explorer.gq/?hash=[[TX_HASH]]#blockchain_transaction';
+config.blockExplorerUrl = 'https://www.cx-explorer.gq/index.html?hash=[[TX_HASH]]#blockchain_transaction';
 
 // default remote node to connect to, set this to a known reliable node for 'just works' user experience
-config.remoteNodeDefaultHost = 'pool.cx-pool.gq';
+config.remoteNodeDefaultHost = 'wallet.cx-pool.gq';
 
 
 // remote node list update url, set to null if you don't have one
-// for TRTL:
-// raw list: https://raw.githubusercontent.com/turtlecoin/turtlecoin-nodes-json/master/turtlecoin-nodes.json
-// filtered: https://trtl.nodes.pub/api/getNodes
-config.remoteNodeListUpdateUrl = 'https://raw.githubusercontent.com/catalystdevelopment/catalyst-gui-wallet/master/catalyst-nodes.json';
-// config.remoteNodeListUpdateUrl = null; //disables autoupdate
+config.remoteNodeListUpdateUrl = 'https://raw.githubusercontent.com/catalystdevelopment/catalyst-nodes-json/master/catalyst-nodes.json';
 
 // set to false if using raw/unfiltered node list
 config.remoteNodeListFiltered = false;
 
 // fallback remote node list, in case fetching update failed, fill this with known to works remote nodes
 config.remoteNodeListFallback = [
-  'pool.cx-pool.gq:17291',
+  'wallet.cx-pool.gq:17291',
   '127.0.0.1:17291'
 ];
 
@@ -84,9 +79,14 @@ config.addressBookObfuscationKey = '79009fb00ca1b7130832a42de45142cf6c4b7f333fe6
 // initial/sample entries to fill new address book
 config.addressBookSampleEntries = [
   {
-    name: 'Catalyst Developers Funds',
+    name: 'Catalyst Developers Funds [n8tb1t]',
     address: 'cat18x93ufCQWaX4f8f2c2fZ8Ku2A4VTcgEoSpweiDbgEBF9i7YA2XGX1dSR7UbguQU5UKYEXyjfaTfnJBmRhHju26n8Y9AAFx',
     paymentId: '',
+  },
+  {
+    name: 'Catalyst Developers Funds [dirtybits]',
+    address: 'cat1Az2Xwt4byGrYeiKwxacV2pMahz7JaFPqW7eLbFPDP9kKT4rYMMq428KsZMbv8xK44j3dKBvaZW1VGzX4WVvb4R8ndN6WnD',
+    paymentId: '',
   }
 ];
 // cipher config for private address book

src/js/ws_manager.js

@@ -27,7 +27,7 @@ const ERROR_WALLET_EXEC = `Failed to start ${config.walletServiceBinaryFilename}
 const ERROR_WALLET_PASSWORD = 'Failed to load your wallet, please check your password';
 const ERROR_WALLET_IMPORT = 'Import failed, please check that you have entered all information correctly';
 const ERROR_WALLET_CREATE = 'Wallet can not be created, please check your input and try again';
-const ERROR_RPC_TIMEOUT = 'Unable to communicate with selected node, please try again in a few seconds or switch to another node address';
+const ERROR_RPC_TIMEOUT = 'Unable to communicate with selected node, please check your password and try again in a few seconds or switch to another node address';
 const INFO_FUSION_DONE = 'Wallet optimization completed, your balance may appear incorrect for a while.';
 const INFO_FUSION_SKIPPED = 'Wallet already optimized. No further optimization is needed.';
 const ERROR_FUSION_FAILED = 'Unable to optimize your wallet, please try again in a few seconds';