Skip to content

Commit b60b703

Browse files
authored
v2 (#2)
* fix umbrella bugs #1 * docs: update.
1 parent 11fa4cb commit b60b703

File tree

7 files changed

+2454
-39
lines changed

7 files changed

+2454
-39
lines changed

README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Catalyst GUI Wallet
2-
2+
3+
> After you start the wallet for the first time, please **refresh the node list**, and then select one of the public nodes.
4+
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.
35
### Features:
46
This wallet contains the basic functions required to manage your Catalyst assets:
57

@@ -40,21 +42,19 @@ The wallet relies on `catalyst-service` to manage wallet container & rpc com
4042
On first launch, Catalyst WalletShell will try to detect location/path of bundled `catalyst-service` binary,
4143
but if it's failed, you can manually set path to the `catalyst-service` binary on the Settings screen.
4244

43-
In windows configuration files are found in directory %USERPROFILE%\AppData\Roaming\catalyst-gui-wallet ,
45+
In windows configuration files are found in directory %USERPROFILE%\AppData\Roaming\CatalystLedger ,
4446
on issues it helps to delete it and restart the wallet.
4547

46-
Program File are situated %USERPROFILE%\AppData\Local\Programs\catalyst-gui-wallet
48+
Program File are situated %USERPROFILE%\AppData\Local\Programs\CatalystLedger
4749

4850
### Download & Run Catalyst Wallet
4951

5052

5153
#### GNU/Linux (AppImage):
5254
1. Download latest AppImage bundle here: https://github.com/catalystdevelopment/catalyst-gui-wallet/releases/latest
5355
2. Make it executable, either via GUI file manager or command line, e.g. `chmod +x catalyst-wallet-<version>-linux.AppImage`
54-
3. Run ./catalystd by locating the app in your Catalyst directory and double clicking, then Run the `wallet` file by double clicking the app
55-
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
56-
To use a public node visit the main website to see a list of available nodes.
57-
56+
4. To use your local dameon the set the public node address to 127.0.0.1 and Daemon/node port to 17291.
57+
To use a public node visit the main website to see the list of available nodes.
5858

5959
See: https://docs.appimage.org/user-guide/run-appimages.html
6060

@@ -76,12 +76,6 @@ $ cd catalyst-gui-wallet
7676
### install dependencies
7777
$ npm install
7878

79-
### create build+dist directory
80-
$ mkdir -p ./build && mkdir -p ./dist
81-
82-
### copy/symlink icons from assets, required for packaging
83-
$ cp ./src/assets/icon.* ./build/
84-
8579
### build GNU/Linux package
8680
$ mkdir -p ./bin/lin
8781
$ cp /path/to/linux-version-of/catalyst-service ./bin/lin/

main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const DEFAULT_SETTINGS = {
3535
node_address: DEFAULT_REMOTE_NODE,
3636
pubnodes_last_updated: 946697799000,
3737
pubnodes_data: config.remoteNodeListFallback,
38-
pubnodes_custom: ['127.0.0.1:17122'],
38+
pubnodes_custom: ['127.0.0.1:17291'],
3939
pubnodes_exclude_offline: false,
4040
tray_minimize: false,
4141
tray_close: false,
@@ -56,7 +56,7 @@ app.setAppUserModelId(config.appId);
5656
log.transports.console.level = LOG_LEVEL;
5757
log.transports.file.level = LOG_LEVEL;
5858
log.transports.file.maxSize = 5 * 1024 * 1024;
59-
log.info(`Starting WalletShell ${WALLETSHELL_VERSION}`);
59+
log.info(`Starting Catalyst Wallet ${WALLETSHELL_VERSION}`);
6060
if (IS_DEV || IS_DEBUG) log.warn(`Running in ${IS_DEV ? 'dev' : 'debug'} mode`);
6161

6262
let trayIcon = path.join(__dirname, 'src/assets/tray.png');

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name": "catalyst-gui-wallet",
3-
"productName": "catalyst-gui-wallet",
2+
"name": "CatalystLedger",
3+
"productName": "CatalystLedger",
44
"description": "Catalyst GUI Wallet",
5-
"version": "v1.1.6",
5+
"version": "v2.0.0",
66
"homepage": "https://dirtybits.github.io/",
77
"repository": "https://github.com/catalystdevelopment/catalyst-gui-wallet",
88
"main": "main.js",
@@ -15,7 +15,7 @@
1515
"dist-mac": "./node_modules/.bin/electron-builder --x64 --mac -c.extraResources=./bin/osx/catalyst-service"
1616
},
1717
"keywords": [],
18-
"author": "TurtleCoin Developers, Catalyst Developers",
18+
"author": "TurtleCoin Developers, (n8tb1t, dirtybits) Catalyst Developers",
1919
"license": "ISC",
2020
"devDependencies": {
2121
"devtron": "^1.4.0",
@@ -37,8 +37,8 @@
3737
"request-promise-native": "^1.0.7"
3838
},
3939
"build": {
40-
"appId": "Catalyst",
41-
"copyright": "Copyright (c) 2018 TurtleCoin Developers, 2019 Catalyst Developers",
40+
"appId": "CatalystLedger",
41+
"copyright": "Copyright (c) 2018 TurtleCoin Developers, 2019 (n8tb1t, dirtybits) Catalyst Developers",
4242
"directories": {
4343
"output": "dist",
4444
"buildResources": "build"
@@ -68,7 +68,7 @@
6868
"target": [
6969
"AppImage"
7070
],
71-
"maintainer": "Sups (@Sudosups), MadHatter (@MadHatter)",
71+
"maintainer": "n8tb1t (@n8tb1t), dirtybits (@dirtybits)",
7272
"category": "Office",
7373
"vendor": "Catalyst",
7474
"synopsis": "Catalyst GUI Wallet"

src/html/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</div>
2828
<div class="splitted-content last">
2929
<p class="small-space">Donate to: <strong>dirtybits (@dirtybits)</strong></p>
30-
<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" />
30+
<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" />
3131
</div>
3232
</div>
3333

src/js/ws_config.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
var config = {};
2-
//Rebase File
3-
// self explanatory, your application name, descriptions, etc
4-
config.appName = 'catalyst-gui-wallet';
5-
config.appDescription = 'Catalyst GUI Wallet';
2+
3+
config.appName = 'CatalystLedger';
4+
config.appDescription = 'Catalyst Wallet';
65
config.appSlogan = 'Catalyst building a better tomorrow.!';
7-
config.appId = 'catalyst-gui-wallet';
6+
config.appId = 'CatalystLedger';
87
config.appGitRepo = 'https://github.com/catalystdevelopment/catalyst-gui-wallet';
98

109
// default port number for your daemon (e.g. Catalyst daemon)
@@ -24,29 +23,25 @@ config.walletServiceBinaryVersion = "v0.3.1.1";
2423
// json --> for turtle service (or its forks) version >= v0.8.4
2524
config.walletServiceConfigFormat = "json";
2625

27-
// default port number for your wallet service (e.g. turtle-service)
26+
// default port number for your wallet service (e.g. catalyst-service)
2827
config.walletServiceRpcPort = 17280;
2928

3029
// block explorer url, the [[TX_HASH]] will be substituted w/ actual transaction hash
31-
config.blockExplorerUrl = 'https://www.cx-explorer.gq/?hash=[[TX_HASH]]#blockchain_transaction';
30+
config.blockExplorerUrl = 'https://www.cx-explorer.gq/index.html?hash=[[TX_HASH]]#blockchain_transaction';
3231

3332
// default remote node to connect to, set this to a known reliable node for 'just works' user experience
34-
config.remoteNodeDefaultHost = 'pool.cx-pool.gq';
33+
config.remoteNodeDefaultHost = 'wallet.cx-pool.gq';
3534

3635

3736
// remote node list update url, set to null if you don't have one
38-
// for TRTL:
39-
// raw list: https://raw.githubusercontent.com/turtlecoin/turtlecoin-nodes-json/master/turtlecoin-nodes.json
40-
// filtered: https://trtl.nodes.pub/api/getNodes
41-
config.remoteNodeListUpdateUrl = 'https://raw.githubusercontent.com/catalystdevelopment/catalyst-gui-wallet/master/catalyst-nodes.json';
42-
// config.remoteNodeListUpdateUrl = null; //disables autoupdate
37+
config.remoteNodeListUpdateUrl = 'https://raw.githubusercontent.com/catalystdevelopment/catalyst-nodes-json/master/catalyst-nodes.json';
4338

4439
// set to false if using raw/unfiltered node list
4540
config.remoteNodeListFiltered = false;
4641

4742
// fallback remote node list, in case fetching update failed, fill this with known to works remote nodes
4843
config.remoteNodeListFallback = [
49-
'pool.cx-pool.gq:17291',
44+
'wallet.cx-pool.gq:17291',
5045
'127.0.0.1:17291'
5146
];
5247

@@ -84,9 +79,14 @@ config.addressBookObfuscationKey = '79009fb00ca1b7130832a42de45142cf6c4b7f333fe6
8479
// initial/sample entries to fill new address book
8580
config.addressBookSampleEntries = [
8681
{
87-
name: 'Catalyst Developers Funds',
82+
name: 'Catalyst Developers Funds [n8tb1t]',
8883
address: 'cat18x93ufCQWaX4f8f2c2fZ8Ku2A4VTcgEoSpweiDbgEBF9i7YA2XGX1dSR7UbguQU5UKYEXyjfaTfnJBmRhHju26n8Y9AAFx',
8984
paymentId: '',
85+
},
86+
{
87+
name: 'Catalyst Developers Funds [dirtybits]',
88+
address: 'cat1Az2Xwt4byGrYeiKwxacV2pMahz7JaFPqW7eLbFPDP9kKT4rYMMq428KsZMbv8xK44j3dKBvaZW1VGzX4WVvb4R8ndN6WnD',
89+
paymentId: '',
9090
}
9191
];
9292
// cipher config for private address book

src/js/ws_manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const ERROR_WALLET_EXEC = `Failed to start ${config.walletServiceBinaryFilename}
2727
const ERROR_WALLET_PASSWORD = 'Failed to load your wallet, please check your password';
2828
const ERROR_WALLET_IMPORT = 'Import failed, please check that you have entered all information correctly';
2929
const ERROR_WALLET_CREATE = 'Wallet can not be created, please check your input and try again';
30-
const ERROR_RPC_TIMEOUT = 'Unable to communicate with selected node, please try again in a few seconds or switch to another node address';
30+
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';
3131
const INFO_FUSION_DONE = 'Wallet optimization completed, your balance may appear incorrect for a while.';
3232
const INFO_FUSION_SKIPPED = 'Wallet already optimized. No further optimization is needed.';
3333
const ERROR_FUSION_FAILED = 'Unable to optimize your wallet, please try again in a few seconds';

0 commit comments

Comments
 (0)