From f9bc1b0924755134481261908b829bcf1c28ab2b Mon Sep 17 00:00:00 2001 From: Hunter Date: Mon, 6 Jul 2020 12:12:28 +0100 Subject: [PATCH] Revert master to Solaris --- Scripts/Packager/build-linux-arm.sh | 2 +- Scripts/Packager/build-linux-x64.sh | 2 +- Scripts/Packager/build-mac-x64.sh | 2 +- Scripts/Packager/build-win-x64.sh | 2 +- StratisCore.UI/e2e/app.e2e-spec.ts | 4 ++-- StratisCore.UI/electron-builder.json | 12 ++++++++---- StratisCore.UI/main.ts | 14 +++++++------- StratisCore.UI/package.json | 16 ++++++++-------- StratisCore.UI/src/app/app.component.html | 6 +++--- StratisCore.UI/src/app/app.component.ts | 4 ++-- .../src/app/login/login.component.html | 7 +++---- .../confirm-mnemonic.component.html | 6 ++---- .../src/app/setup/create/create.component.html | 6 ++---- .../show-mnemonic/show-mnemonic.component.html | 5 ++--- .../src/app/setup/recover/recover.component.html | 5 ++--- .../src/app/setup/setup.component.html | 7 +++---- .../wallet/dashboard/dashboard.component.html | 10 +++++----- .../src/app/wallet/receive/receive.component.ts | 2 +- .../src/app/wallet/send/send.component.ts | 2 +- .../src/app/wallet/split/split.component.ts | 2 +- .../src/app/wallet/txbit/txbit.component.html | 2 +- StratisCore.UI/src/assets/images/license_en.txt | 2 +- StratisCore.UI/src/index.html | 2 +- 23 files changed, 59 insertions(+), 63 deletions(-) diff --git a/Scripts/Packager/build-linux-arm.sh b/Scripts/Packager/build-linux-arm.sh index 23c79f4a..cf00377e 100755 --- a/Scripts/Packager/build-linux-arm.sh +++ b/Scripts/Packager/build-linux-arm.sh @@ -4,7 +4,7 @@ configuration=Release os_platform=linux log_prefix=LINUXARM-BUILD build_directory=$(dirname $(dirname "$PWD")) -release_directory="/tmp/solris/${log_prefix}" +release_directory="/tmp/solaris/${log_prefix}" node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node # exit if error diff --git a/Scripts/Packager/build-linux-x64.sh b/Scripts/Packager/build-linux-x64.sh index ab7f1679..adbe73ac 100755 --- a/Scripts/Packager/build-linux-x64.sh +++ b/Scripts/Packager/build-linux-x64.sh @@ -4,7 +4,7 @@ configuration=Release os_platform=linux log_prefix=LINUX-BUILD build_directory=$(dirname $(dirname "$PWD")) -release_directory="/tmp/solris/${log_prefix}" +release_directory="/tmp/solaris/${log_prefix}" node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node # exit if error diff --git a/Scripts/Packager/build-mac-x64.sh b/Scripts/Packager/build-mac-x64.sh index 60a6ae74..1f40e876 100755 --- a/Scripts/Packager/build-mac-x64.sh +++ b/Scripts/Packager/build-mac-x64.sh @@ -5,7 +5,7 @@ configuration=Release os_platform=osx log_prefix=MAC-BUILD build_directory=$(dirname $(dirname "$PWD")) -release_directory="/tmp/solris/${log_prefix}" +release_directory="/tmp/solaris/${log_prefix}" node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node # exit if error diff --git a/Scripts/Packager/build-win-x64.sh b/Scripts/Packager/build-win-x64.sh index 8e441eeb..8f50a4a0 100755 --- a/Scripts/Packager/build-win-x64.sh +++ b/Scripts/Packager/build-win-x64.sh @@ -5,7 +5,7 @@ configuration=Release os_platform=win log_prefix=WINDOWS-BUILD build_directory=$(dirname $(dirname "$PWD")) -release_directory="/tmp/solris/${log_prefix}" +release_directory="/tmp/solaris/${log_prefix}" node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node # exit if error diff --git a/StratisCore.UI/e2e/app.e2e-spec.ts b/StratisCore.UI/e2e/app.e2e-spec.ts index afe567c6..d2be85e4 100755 --- a/StratisCore.UI/e2e/app.e2e-spec.ts +++ b/StratisCore.UI/e2e/app.e2e-spec.ts @@ -8,8 +8,8 @@ describe('stratis-core App', () => { page = new AngularElectronPage(); }); - it('Page title should be City Core', () => { + it('Page title should be Solaris Core', () => { page.navigateTo('/'); - expect(page.getTitle()).toEqual('City Core'); + expect(page.getTitle()).toEqual('Solaris Core'); }); }); diff --git a/StratisCore.UI/electron-builder.json b/StratisCore.UI/electron-builder.json index 726e3d73..e496b35b 100755 --- a/StratisCore.UI/electron-builder.json +++ b/StratisCore.UI/electron-builder.json @@ -1,6 +1,6 @@ { - "appId": "com.city.core", - "productName": "City Core", + "appId": "com.solarisplatform.core", + "productName": "Solaris Core", "publish": null, "directories": { "output": "app-builds" @@ -25,14 +25,18 @@ "target": [ "nsis" ], + "signingHashAlgorithms": [ "sha256" ], + "certificateSubjectName": "CN=CryptSoft B.V., O=CryptSoft B.V., STREET=Siriusdreef 17-27, L=Hoofddorp, S=North-Holland, PostalCode=2132 WT, C=NL", "artifactName": "${productName}-v${version}-setup-${os}-${arch}.${ext}" }, "linux": { "icon": "dist/assets/images/", "target": [ + // "deb", + // "tar.gz", "AppImage" ], - "synopsis": "City Core' staking wallet.", + "synopsis": "Blockcore Solaris' staking wallet.", "category": "Utility", "artifactName": "${productName}-v${version}-${os}-${arch}.${ext}" }, @@ -62,4 +66,4 @@ "src/assets/images/icon-tray.png", "src/assets/images/license_en.txt" ] -} +} \ No newline at end of file diff --git a/StratisCore.UI/main.ts b/StratisCore.UI/main.ts index 7680ac98..087b52fa 100755 --- a/StratisCore.UI/main.ts +++ b/StratisCore.UI/main.ts @@ -18,9 +18,9 @@ nodaemon = args.some(val => val === "--nodaemon" || val === "-nodaemon"); let apiPort; if (testnet && !sidechain) { - apiPort = 24335; + apiPort = 62009; } else if (!testnet && !sidechain) { - apiPort = 4335; + apiPort = 62000; } else if (sidechain && testnet) { apiPort = 38225; } else if (sidechain && !testnet) { @@ -55,7 +55,7 @@ function createWindow() { frame: true, minWidth: 1150, minHeight: 650, - title: "City Core", + title: "Solaris Core", webPreferences: { webSecurity: false }, @@ -107,7 +107,7 @@ app.on('ready', () => { if (sidechain && !nodaemon) { startDaemon("Stratis.SidechainD"); } else if (!nodaemon) { - startDaemon("City.Chain") + startDaemon("Solaris.Node") } } createTray(); @@ -185,7 +185,7 @@ function startDaemon(daemonName) { }); daemonProcess.stdout.on('data', (data) => { - writeLog(`City: ${data}`); + writeLog(`Solaris: ${data}`); }); } @@ -213,7 +213,7 @@ function createTray() { } } ]); - systemTray.setToolTip('City Core'); + systemTray.setToolTip('Solaris Core'); systemTray.setContextMenu(contextMenu); systemTray.on('click', function() { if (!mainWindow.isVisible()) { @@ -253,4 +253,4 @@ function createMenu() { ]; Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplate)); -}; +}; \ No newline at end of file diff --git a/StratisCore.UI/package.json b/StratisCore.UI/package.json index 733b0eba..5e8229fa 100755 --- a/StratisCore.UI/package.json +++ b/StratisCore.UI/package.json @@ -1,18 +1,18 @@ { - "name": "city-core", - "description": "City Core Wallet", - "version": "3.0.0", + "name": "solaris-core", + "description": "Solaris Core Wallet", + "version": "3.0.2", "author": { - "name": "City Core", - "email": "support@citychain.com" + "name": "Solaris Platform", + "email": "support@solarisplatform.com" }, "license": "MIT", - "homepage": "https://github.com/CityChainFoundation/", + "homepage": "https://github.com/SolarisPlatform/SolarisCore", "keywords": [ "fullnode", "ui", - "City", - "City Chain", + "solaris", + "solarisplatform", "core", "bitcoin", "angular", diff --git a/StratisCore.UI/src/app/app.component.html b/StratisCore.UI/src/app/app.component.html index 3619ed90..f4dbdcb7 100755 --- a/StratisCore.UI/src/app/app.component.html +++ b/StratisCore.UI/src/app/app.component.html @@ -1,7 +1,7 @@
-
-
-

Loading…

+
+
+

Loading…

diff --git a/StratisCore.UI/src/app/app.component.ts b/StratisCore.UI/src/app/app.component.ts index bce7bd5f..1b5be2e0 100755 --- a/StratisCore.UI/src/app/app.component.ts +++ b/StratisCore.UI/src/app/app.component.ts @@ -75,13 +75,13 @@ export class AppComponent implements OnInit, OnDestroy { } private setTitle() { - let applicationName = "City Core"; + let applicationName = "Solaris Core"; let applicationVersion = this.globalService.getApplicationVersion(); let newTitle = applicationName + " " + applicationVersion; this.titleService.setTitle(newTitle); } public openSupport() { - this.electronService.shell.openExternal("https://github.com/CityChainFoundation/"); + this.electronService.shell.openExternal("https://github.com/SolarisPlatform/"); } } diff --git a/StratisCore.UI/src/app/login/login.component.html b/StratisCore.UI/src/app/login/login.component.html index 69ce9e51..62d31a5e 100755 --- a/StratisCore.UI/src/app/login/login.component.html +++ b/StratisCore.UI/src/app/login/login.component.html @@ -1,11 +1,10 @@ -
+
- - -

Blockchain for the Smart City Platform

+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html b/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html index 22a5375d..71a4a9ac 100755 --- a/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html +++ b/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html @@ -1,10 +1,8 @@
- - -

Blockchain for the Smart City Platform

-
+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/setup/create/create.component.html b/StratisCore.UI/src/app/setup/create/create.component.html index 0fe22349..de1d2a21 100755 --- a/StratisCore.UI/src/app/setup/create/create.component.html +++ b/StratisCore.UI/src/app/setup/create/create.component.html @@ -1,10 +1,8 @@
- - -

Blockchain for the Smart City Platform

-
+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html b/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html index f6ecc5d1..4cddafbb 100755 --- a/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html +++ b/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html @@ -1,9 +1,8 @@
- - -

Blockchain for the Smart City Platform

+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/setup/recover/recover.component.html b/StratisCore.UI/src/app/setup/recover/recover.component.html index 03f2a7bb..5689e1a2 100755 --- a/StratisCore.UI/src/app/setup/recover/recover.component.html +++ b/StratisCore.UI/src/app/setup/recover/recover.component.html @@ -1,9 +1,8 @@
- - -

Blockchain for the Smart City Platform

+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/setup/setup.component.html b/StratisCore.UI/src/app/setup/setup.component.html index 6b318209..d5ddb592 100755 --- a/StratisCore.UI/src/app/setup/setup.component.html +++ b/StratisCore.UI/src/app/setup/setup.component.html @@ -1,9 +1,8 @@ -
+
- - -

Blockchain for the Smart City Platform

+ +

Security. Privacy. Liberty.

diff --git a/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html b/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html index 6b2a9e77..75bbd556 100755 --- a/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html +++ b/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html @@ -85,12 +85,12 @@

{{ dateTime }}

-
-
Staking is active
-
-
+
+ Staking is active +
+
@@ -225,4 +225,4 @@

Looks like you haven't made any transactions yet.

- + \ No newline at end of file diff --git a/StratisCore.UI/src/app/wallet/receive/receive.component.ts b/StratisCore.UI/src/app/wallet/receive/receive.component.ts index b1846ecf..4abef54d 100755 --- a/StratisCore.UI/src/app/wallet/receive/receive.component.ts +++ b/StratisCore.UI/src/app/wallet/receive/receive.component.ts @@ -55,7 +55,7 @@ export class ReceiveComponent { response => { this.address = response; // TODO: fix this later to use the actual sidechain name instead of 'cirrus' - const networkName = this.globalService.getSidechainEnabled() ? 'cirrus' : 'city'; + const networkName = this.globalService.getSidechainEnabled() ? 'cirrus' : 'solaris'; this.qrString = `${networkName}:${response}`; } ); diff --git a/StratisCore.UI/src/app/wallet/send/send.component.ts b/StratisCore.UI/src/app/wallet/send/send.component.ts index 9431cbef..26e64f48 100755 --- a/StratisCore.UI/src/app/wallet/send/send.component.ts +++ b/StratisCore.UI/src/app/wallet/send/send.component.ts @@ -174,7 +174,7 @@ export class SendComponent implements OnInit, OnDestroy { 'amount': { 'required': 'An amount is required.', 'pattern': 'Enter a valid transaction amount. Only positive numbers and no more than 8 decimals are allowed.', - 'min': "The amount has to be more or equal to 0.00001 City.", + 'min': "The amount has to be more or equal to 0.00001 XLR.", 'max': 'The total transaction amount exceeds your spendable balance.' }, 'fee': { diff --git a/StratisCore.UI/src/app/wallet/split/split.component.ts b/StratisCore.UI/src/app/wallet/split/split.component.ts index d52947a9..01646985 100755 --- a/StratisCore.UI/src/app/wallet/split/split.component.ts +++ b/StratisCore.UI/src/app/wallet/split/split.component.ts @@ -88,7 +88,7 @@ export class SplitComponent implements OnInit, OnDestroy { 'amount': { 'required': 'An amount is required.', 'pattern': 'Enter a valid transaction amount. Only positive numbers and no more than 8 decimals are allowed.', - 'min': "The amount has to be more or equal to 0.00001 City.", + 'min': "The amount has to be more or equal to 0.00001 XLR.", 'max': 'The total transaction amount exceeds your spendable balance.' }, 'password': { diff --git a/StratisCore.UI/src/app/wallet/txbit/txbit.component.html b/StratisCore.UI/src/app/wallet/txbit/txbit.component.html index cd418052..22ac6610 100755 --- a/StratisCore.UI/src/app/wallet/txbit/txbit.component.html +++ b/StratisCore.UI/src/app/wallet/txbit/txbit.component.html @@ -8,7 +8,7 @@

Reward program

- Txbit is rewarding 50% of the Net Transaction Fees to all users who link their City Staking Address to a Txbit account. The rewards will be distributed to your Txbit account every month. + Txbit is rewarding 50% of the Net Transaction Fees to all users who link their Solaris Staking Address to a Txbit account. The rewards will be distributed to your Txbit account every month.

Please select the staking address that you want to link to Txbit.
diff --git a/StratisCore.UI/src/assets/images/license_en.txt b/StratisCore.UI/src/assets/images/license_en.txt index 58193608..0b731b67 100755 --- a/StratisCore.UI/src/assets/images/license_en.txt +++ b/StratisCore.UI/src/assets/images/license_en.txt @@ -2,7 +2,7 @@ By installing this software the user agrees to all of the following: That this software is an experimental release and any use of it shall be at the users own discretion and risk. That the sole and exclusive remedy for any problem(s), malfunctions or defects in the product, software and / or service shall be to uninstall and/or to stop using it . -In no event shall City, its officers, shareholders, investors, employees, agents, directors, subsidiaries, affiliates, successors, assignees or suppliers be liable for +In no event shall Solaris, its officers, shareholders, investors, employees, agents, directors, subsidiaries, affiliates, successors, assignees or suppliers be liable for Any indirect, incidental, punitive, exemplary or consequential damages Any loss of data, use, sales, business (including profits) whether direct or indirect in any and all cases arising out of use or inability to use the software including any form of security breach, hack or attack. Any loss, errors, omissions or misplacement of coins or any other digital asset transacted through the software or otherwise. diff --git a/StratisCore.UI/src/index.html b/StratisCore.UI/src/index.html index 5f19d268..8a17b8e3 100755 --- a/StratisCore.UI/src/index.html +++ b/StratisCore.UI/src/index.html @@ -3,7 +3,7 @@ - City Core + Solaris Core