Revert master to Solaris

thecrypt0hunter · Jul 6, 2020 · f9bc1b0 · f9bc1b0
1 parent 280bea4
commit f9bc1b0
Show file tree

Hide file tree

Showing 23 changed files with 59 additions and 63 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
   ]
-}
+}
diff --git 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));
-};
+};
diff --git 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
@@ -1,7 +1,7 @@
 <div *ngIf="loading" style="height: 100%; width: 100%; margin-top: -10px;">
-  <div style="background-image: url(./assets/images/city-intro.jpg); background-repeat:no-repeat; background-size:33% 100%">
-    <div style="width: 100%; text-align: center; margin-top: 10px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
-      <h2 style="color: white;">Loading&hellip;</h2>
+  <div style="background-image: url(./assets/images/solaris-intro.gif); background-size: cover; height: 100%; width: 100%; margin: 0; padding: 0;">
+      <div style="width: 100%; text-align: center; margin-top: 10px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
+        <h2 style="color: white;">Loading&hellip;</h2>
     </div>
   </div>
 </div>

diff --git 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
@@ -1,11 +1,10 @@
 
-<section id="GUI" class="container-fluid" style="background-image: url(../../assets/images/city-intro.jpg); background-repeat:no-repeat; background-size:33% 100%;">
+<section id="GUI" class="container-fluid" style="background-image: url(../../assets/images/solaris-intro.gif); background-repeat:no-repeat; background-size:33% 100%;">
 
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="../../assets/images/city-chain-gold.png" height="40" width="228" class="float-left"/>
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
+        <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+        <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>
     </div>
   </div>
   <div class="row justify-content-center">

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
@@ -1,10 +1,8 @@
 <section id="GUI" class="container-fluid">
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="../../../../assets/images/city-chain-gold.png" height="40" width="228" class="float-left" />
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
-    </div>
+      <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+      <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>    </div>
   </div>
   <div class="row d-flex justify-content-center mt-2">
     <div class="col-4">

diff --git a/StratisCore.UI/src/app/setup/create/create.component.html b/StratisCore.UI/src/app/setup/create/create.component.html
@@ -1,10 +1,8 @@
 <section id="GUI" class="container-fluid">
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="./assets/images/city-chain-gold.png" height="40" width="228" class="float-left" />
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
-    </div>
+      <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+      <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>    </div>
   </div>
   <div class="row d-flex justify-content-center mt-2">
     <div class="col-4">

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
@@ -1,9 +1,8 @@
 <section id="GUI" class="container-fluid">
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="./assets/images/city-chain-gold.png" height="40" width="228" class="float-left" />
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
+      <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+      <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>
     </div>
   </div>
   <div class="row d-flex justify-content-center mt-2">

diff --git a/StratisCore.UI/src/app/setup/recover/recover.component.html b/StratisCore.UI/src/app/setup/recover/recover.component.html
@@ -1,9 +1,8 @@
 <section id="GUI" class="container-fluid">
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="../../../assets/images/city-chain-gold.png" height="40" width="228" class="float-left" />
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
+      <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+      <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>
     </div>
   </div>
   <div class="row d-flex justify-content-center mt-2">

diff --git a/StratisCore.UI/src/app/setup/setup.component.html b/StratisCore.UI/src/app/setup/setup.component.html
@@ -1,9 +1,8 @@
-<section id="GUI" class="container-fluid" style="background-image: url(./assets/images/city-intro.jpg); background-repeat:no-repeat; background-size:33% 100%;">
+<section id="GUI" class="container-fluid" style="background-image: url(./assets/images/solaris-intro.gif); background-repeat:no-repeat; background-size:33% 100%;">
   <div class="row justify-content-center">
     <div class="col-12 bg-dark pt-2 pb-2 border-bottom">
-      <img src="./assets/images/city-chain-gold.png" height="40" width="228" class="float-left" />
-
-      <h4 class="float-right mt-2">Blockchain for the Smart City Platform</h4>
+      <img src="./assets/images/solaris-login-logo.png" height="40" width="228" class="float-left"/>
+      <h4 class="float-right mt-2">Security. Privacy. Liberty.</h4>
     </div>
   </div>
   <div class="row justify-content-center">

diff --git a/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html b/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html
@@ -85,12 +85,12 @@ <h3 class="text-uppercase">
                         <span>{{ dateTime }}</span>
                       </div>
                     </div>
-                    <div class="text-center">
-                      <div class="text-success">Staking is active <span class="lnr lnr-checkmark-circle"></span></div>
-                    </div>
                   </div>
                 </div>
-                <div class="col-12 text-right">
+                <div class="col-6 text-left">
+                  <span class="text-success">Staking is active <span class="lnr lnr-checkmark-circle"></span></span>
+                </div>
+                <div class="col-6 text-right">
                   <button type="button" class="btn btn-primary text-uppercase mr-2" (click)="openSplitDialog()"><i class="icon lnr lnr-layers mr-2"></i> Split</button>
                   <button type="button" class="btn btn-danger text-uppercase" [disabled]="isStopping" (click)="stopStaking()"><span class="lnr lnr-cross-circle mr-2"></span> Stop Staking</button>
                 </div>
@@ -225,4 +225,4 @@ <h4>Looks like you haven't made any transactions yet.</h4>
   </section>
   <!-- /CONTAINER-->
 </section>
-<!-- /GUI-->
+<!-- /GUI-->
diff --git 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
@@ -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
@@ -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
@@ -8,7 +8,7 @@
               <h3 class="title-bottom-border text-uppercase">Reward program</h3>
               <form [formGroup]="linkForm">
                 <div class="form-group">
-                  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.
                   <br/><br />
                   Please select the staking address that you want to link to Txbit.
                 </div>

diff --git 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
@@ -3,7 +3,7 @@
 <head>
   <base href="./">
   <meta charset="utf-8">
-  <title>City Core</title>
+  <title>Solaris Core</title>
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="icon" href="./assets/images/icon.ico" type="image/x-icon" />
 </head>