Skip to content

Commit f9bc1b0

Browse files
thecrypt0hunterthecrypt0hunter
committed
Revert master to Solaris
1 parent 280bea4 commit f9bc1b0

23 files changed

Lines changed: 59 additions & 63 deletions

‎Scripts/Packager/build-linux-arm.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ configuration=Release
44
os_platform=linux
55
log_prefix=LINUXARM-BUILD
66
build_directory=$(dirname $(dirname "$PWD"))
7-
release_directory="/tmp/solris/${log_prefix}"
7+
release_directory="/tmp/solaris/${log_prefix}"
88
node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node
99

1010
# exit if error

‎Scripts/Packager/build-linux-x64.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ configuration=Release
44
os_platform=linux
55
log_prefix=LINUX-BUILD
66
build_directory=$(dirname $(dirname "$PWD"))
7-
release_directory="/tmp/solris/${log_prefix}"
7+
release_directory="/tmp/solaris/${log_prefix}"
88
node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node
99

1010
# exit if error

‎Scripts/Packager/build-mac-x64.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ configuration=Release
55
os_platform=osx
66
log_prefix=MAC-BUILD
77
build_directory=$(dirname $(dirname "$PWD"))
8-
release_directory="/tmp/solris/${log_prefix}"
8+
release_directory="/tmp/solaris/${log_prefix}"
99
node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node
1010

1111
# exit if error

‎Scripts/Packager/build-win-x64.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ configuration=Release
55
os_platform=win
66
log_prefix=WINDOWS-BUILD
77
build_directory=$(dirname $(dirname "$PWD"))
8-
release_directory="/tmp/solris/${log_prefix}"
8+
release_directory="/tmp/solaris/${log_prefix}"
99
node_directory=$build_directory/blockcore-nodes/XLR/src/Solaris.Node
1010

1111
# exit if error

‎StratisCore.UI/e2e/app.e2e-spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ describe('stratis-core App', () => {
88
page = new AngularElectronPage();
99
});
1010

11-
it('Page title should be City Core', () => {
11+
it('Page title should be Solaris Core', () => {
1212
page.navigateTo('/');
13-
expect(page.getTitle()).toEqual('City Core');
13+
expect(page.getTitle()).toEqual('Solaris Core');
1414
});
1515
});

‎StratisCore.UI/electron-builder.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"appId": "com.city.core",
3-
"productName": "City Core",
2+
"appId": "com.solarisplatform.core",
3+
"productName": "Solaris Core",
44
"publish": null,
55
"directories": {
66
"output": "app-builds"
@@ -25,14 +25,18 @@
2525
"target": [
2626
"nsis"
2727
],
28+
"signingHashAlgorithms": [ "sha256" ],
29+
"certificateSubjectName": "CN=CryptSoft B.V., O=CryptSoft B.V., STREET=Siriusdreef 17-27, L=Hoofddorp, S=North-Holland, PostalCode=2132 WT, C=NL",
2830
"artifactName": "${productName}-v${version}-setup-${os}-${arch}.${ext}"
2931
},
3032
"linux": {
3133
"icon": "dist/assets/images/",
3234
"target": [
35+
// "deb",
36+
// "tar.gz",
3337
"AppImage"
3438
],
35-
"synopsis": "City Core' staking wallet.",
39+
"synopsis": "Blockcore Solaris' staking wallet.",
3640
"category": "Utility",
3741
"artifactName": "${productName}-v${version}-${os}-${arch}.${ext}"
3842
},
@@ -62,4 +66,4 @@
6266
"src/assets/images/icon-tray.png",
6367
"src/assets/images/license_en.txt"
6468
]
65-
}
69+
}

‎StratisCore.UI/main.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ nodaemon = args.some(val => val === "--nodaemon" || val === "-nodaemon");
1818

1919
let apiPort;
2020
if (testnet && !sidechain) {
21-
apiPort = 24335;
21+
apiPort = 62009;
2222
} else if (!testnet && !sidechain) {
23-
apiPort = 4335;
23+
apiPort = 62000;
2424
} else if (sidechain && testnet) {
2525
apiPort = 38225;
2626
} else if (sidechain && !testnet) {
@@ -55,7 +55,7 @@ function createWindow() {
5555
frame: true,
5656
minWidth: 1150,
5757
minHeight: 650,
58-
title: "City Core",
58+
title: "Solaris Core",
5959
webPreferences: {
6060
webSecurity: false
6161
},
@@ -107,7 +107,7 @@ app.on('ready', () => {
107107
if (sidechain && !nodaemon) {
108108
startDaemon("Stratis.SidechainD");
109109
} else if (!nodaemon) {
110-
startDaemon("City.Chain")
110+
startDaemon("Solaris.Node")
111111
}
112112
}
113113
createTray();
@@ -185,7 +185,7 @@ function startDaemon(daemonName) {
185185
});
186186

187187
daemonProcess.stdout.on('data', (data) => {
188-
writeLog(`City: ${data}`);
188+
writeLog(`Solaris: ${data}`);
189189
});
190190
}
191191

@@ -213,7 +213,7 @@ function createTray() {
213213
}
214214
}
215215
]);
216-
systemTray.setToolTip('City Core');
216+
systemTray.setToolTip('Solaris Core');
217217
systemTray.setContextMenu(contextMenu);
218218
systemTray.on('click', function() {
219219
if (!mainWindow.isVisible()) {
@@ -253,4 +253,4 @@ function createMenu() {
253253
];
254254

255255
Menu.setApplicationMenu(Menu.buildFromTemplate(menuTemplate));
256-
};
256+
};

‎StratisCore.UI/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"name": "city-core",
3-
"description": "City Core Wallet",
4-
"version": "3.0.0",
2+
"name": "solaris-core",
3+
"description": "Solaris Core Wallet",
4+
"version": "3.0.2",
55
"author": {
6-
"name": "City Core",
7-
"email": "support@citychain.com"
6+
"name": "Solaris Platform",
7+
"email": "support@solarisplatform.com"
88
},
99
"license": "MIT",
10-
"homepage": "https://github.com/CityChainFoundation/",
10+
"homepage": "https://github.com/SolarisPlatform/SolarisCore",
1111
"keywords": [
1212
"fullnode",
1313
"ui",
14-
"City",
15-
"City Chain",
14+
"solaris",
15+
"solarisplatform",
1616
"core",
1717
"bitcoin",
1818
"angular",

‎StratisCore.UI/src/app/app.component.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div *ngIf="loading" style="height: 100%; width: 100%; margin-top: -10px;">
2-
<div style="background-image: url(./assets/images/city-intro.jpg); background-repeat:no-repeat; background-size:33% 100%">
3-
<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';">
4-
<h2 style="color: white;">Loading&hellip;</h2>
2+
<div style="background-image: url(./assets/images/solaris-intro.gif); background-size: cover; height: 100%; width: 100%; margin: 0; padding: 0;">
3+
<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';">
4+
<h2 style="color: white;">Loading&hellip;</h2>
55
</div>
66
</div>
77
</div>

‎StratisCore.UI/src/app/app.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ export class AppComponent implements OnInit, OnDestroy {
7575
}
7676

7777
private setTitle() {
78-
let applicationName = "City Core";
78+
let applicationName = "Solaris Core";
7979
let applicationVersion = this.globalService.getApplicationVersion();
8080
let newTitle = applicationName + " " + applicationVersion;
8181
this.titleService.setTitle(newTitle);
8282
}
8383

8484
public openSupport() {
85-
this.electronService.shell.openExternal("https://github.com/CityChainFoundation/");
85+
this.electronService.shell.openExternal("https://github.com/SolarisPlatform/");
8686
}
8787
}

0 commit comments

Comments
 (0)