Skip to content

Commit

Permalink
Rebrand into Xaya, dashboard show wallet build, reformat transaction …
Browse files Browse the repository at this point in the history
…list dates, RC7
  • Loading branch information
RyuMaster committed Jul 9, 2018
1 parent 7ec1226 commit 0557542
Show file tree
Hide file tree
Showing 19 changed files with 62 additions and 57 deletions.
2 changes: 1 addition & 1 deletion .angular-cli.json
@@ -1,7 +1,7 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"project": {
"name": "xyonwallet"
"name": "xayawallet"
},
"apps": [
{
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
@@ -1,2 +1,2 @@
### Changelog
[0.5] initial alpha
[0.5.8] initial
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -10,7 +10,7 @@ Uses angular + electron to build the wallet
Clone this repository locally :

``` bash
git clone https://github.com/chimaera/angu_elec_chimaera.git
git clone https://github.com/xaya/xaya.git
```

Install dependencies with npm :
Expand Down
12 changes: 6 additions & 6 deletions daemon/chim.bat
@@ -1,14 +1,14 @@
@echo off
setlocal EnableExtensions EnableDelayedExpansion
cls
if exist "!AppData!\Chimaera\appdata.orv" (
set /p DataDirPath=<!AppData!\Chimaera\appdata.orv
tasklist|find /i "chimaerad.exe" >NUL
if errorlevel 1 chimaerad.exe -wallet=vault.dat -wallet=game.dat -testnet -server -rpcallowip=127.0.0.1 -datadir=!DataDirPath! -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332 -addnode=46.101.15.140
if exist "!AppData!\Xaya\appdata.orv" (
set /p DataDirPath=<!AppData!\Xaya\appdata.orv
tasklist|find /i "xayad.exe" >NUL
if errorlevel 1 xayad.exe -wallet=vault.dat -wallet=game.dat -testnet -server -rpcallowip=127.0.0.1 -datadir=!DataDirPath! -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332
goto :eof
) else (
tasklist|find /i "chimaerad.exe" >NUL
if errorlevel 1 chimaerad.exe -wallet=vault.dat -wallet=game.dat -testnet -server -rpcallowip=127.0.0.1 -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332 -addnode=46.101.15.140
tasklist|find /i "xayad.exe" >NUL
if errorlevel 1 xayad.exe -wallet=vault.dat -wallet=game.dat -testnet -server -rpcallowip=127.0.0.1 -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332
goto :eof
)

12 changes: 6 additions & 6 deletions daemon/chim_main.bat
@@ -1,14 +1,14 @@
@echo off
setlocal EnableExtensions EnableDelayedExpansion
cls
if exist "!AppData!\Chimaera\appdata.orv" (
set /p DataDirPath=<!AppData!\Chimaera\appdata.orv
tasklist|find /i "chimaerad.exe" >NUL
if errorlevel 1 chimaerad.exe -wallet=vault.dat -wallet=game.dat -server -rpcallowip=127.0.0.1 -datadir=!DataDirPath! -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332 -addnode=46.101.15.140
if exist "!AppData!\Xaya\appdata.orv" (
set /p DataDirPath=<!AppData!\Xaya\appdata.orv
tasklist|find /i "xayad.exe" >NUL
if errorlevel 1 xayad.exe -wallet=vault.dat -wallet=game.dat -server -rpcallowip=127.0.0.1 -datadir=!DataDirPath! -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332
goto :eof
) else (
tasklist|find /i "chimaerad.exe" >NUL
if errorlevel 1 chimaerad.exe -wallet=vault.dat -wallet=game.dat -server -rpcallowip=127.0.0.1 -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332 -addnode=46.101.15.140
tasklist|find /i "xayad.exe" >NUL
if errorlevel 1 xayad.exe -wallet=vault.dat -wallet=game.dat -server -rpcallowip=127.0.0.1 -namehistory -zmqpubhashtx=tcp://127.0.0.1:28332 -zmqpubhashblock=tcp://127.0.0.1:28332 -zmqpubrawblock=tcp://127.0.0.1:28332 -zmqpubrawtx=tcp://127.0.0.1:28332
goto :eof
)

2 changes: 1 addition & 1 deletion electron-builder.json
@@ -1,5 +1,5 @@
{
"productName": "xyonwallet",
"productName": "xayawallet",
"npmSkipBuildFromSource" : "true",
"directories": {
"output": "app-builds"
Expand Down
6 changes: 3 additions & 3 deletions package.json
@@ -1,8 +1,8 @@
{
"name": "xyonwallet",
"version": "0.5.7",
"description": "xyonwallet",
"homepage": "https://github.com/xyonplatform/angu_elec_chimaera",
"version": "0.5.8",
"description": "xayawallet",
"homepage": "https://github.com/xaya/xayawallet",
"author": {
"name": "Typhon LTD",
"email": "info@xyon.io"
Expand Down
4 changes: 2 additions & 2 deletions src/app/console/console.component.ts
Expand Up @@ -62,11 +62,11 @@ export class ConsoleComponent {

if(testnet == true)
{
filename = path.join(basepath, './Chimaera/testnet/debug.log');
filename = path.join(basepath, './Xaya/testnet/debug.log');
}
else
{
filename = path.join(basepath, './Chimaera/debug.log');
filename = path.join(basepath, './Xaya/debug.log');
}


Expand Down
6 changes: 1 addition & 5 deletions src/app/dashboard/dashboard.component.html
Expand Up @@ -15,6 +15,7 @@
</div>

<div class = "walletversion">{{'SOVERVIEW.WALLETVERSION' | translate }}: {{this.tWalletVersion}}</div>
<div class = "walletbuildversion">{{'SOVERVIEW.WALLETBUILDVERSION' | translate }}: {{this.tWalletBuildVersion}}</div>
<div class = "bottomInfoBlock">

<div class = "intoEntry">
Expand All @@ -32,11 +33,6 @@
<div class = "entryText">{{'SOVERVIEW.PRUNED' | translate }}: {{this.tPruned}}</div>
</div>

<div class = "intoEntry">
<div class = "entryPic3"></div>
<div class = "entryText">{{'SOVERVIEW.DIFFICULTY' | translate }}: {{this.tDifficulty}}</div>
</div>

<div class = "intoEntry">
<div class = "entryPic4"></div>
<div class = "entryText">{{'SOVERVIEW.MEDIANTIME' | translate }}: {{this.tMedianTime}}</div>
Expand Down
13 changes: 3 additions & 10 deletions src/app/dashboard/dashboard.component.ts
Expand Up @@ -46,16 +46,15 @@ export class DashboardComponent {
private tBlockMaxSs: ISubscription;

public tPruned: string;
public tDifficulty: string;
public tMedianTime: string;

private tPrunedSs: ISubscription;
private tDifficultySs: ISubscription;
private tMedianTimeSs: ISubscription;

public precisionText: string;
public barFillPercentage: string;
public synchText: string;
public tWalletBuildVersion: string;

constructor(private translate: TranslateService, private globalService:GlobalService, private cdr: ChangeDetectorRef)
{
Expand All @@ -66,10 +65,10 @@ export class DashboardComponent {
this.tConnections = 0;
this.tNetType = "";
this.tWalletVersion = 0;
this.tWalletBuildVersion = window.require('electron').remote.app.getVersion();
this.tBlockStatus = "";

this.tPruned = "";
this.tDifficulty = "";
this.tMedianTime = "";


Expand Down Expand Up @@ -305,7 +304,6 @@ export class DashboardComponent {
this.tBlockMaxSs.unsubscribe();

this.tPrunedSs.unsubscribe();
this.tDifficultySs.unsubscribe();
this.tMedianTimeSs.unsubscribe();


Expand All @@ -320,12 +318,7 @@ export class DashboardComponent {
value => {
this.tPruned = value + "";
});

this.tDifficultySs = this.globalService.tDifficultyChanged$.subscribe
(
value => {
this.tDifficulty = value + "";
});


this.tMedianTimeSs = this.globalService.tMedianTimeChanged$.subscribe
(
Expand Down
8 changes: 4 additions & 4 deletions src/app/service/global.service.ts
Expand Up @@ -711,16 +711,16 @@ export class GlobalService implements OnDestroy {
testnet = true; //TODO - change after wallet goes life to false
}

let filename = path.join(basepath, './Chimaera/.cookie');
let filename = path.join(basepath, './Xaya/.cookie');

if(testnet == true)
{
filename = path.join(basepath, './Chimaera/testnet/.cookie');
filename = path.join(basepath, './Xaya/testnet/.cookie');
}

const fs = window.require('fs');

let filenameRewrite = path.join(basepath, './Chimaera/appdata.orv');
let filenameRewrite = path.join(basepath, './Xaya/appdata.orv');

if (fs.existsSync(filenameRewrite))
{
Expand Down Expand Up @@ -924,7 +924,7 @@ export class GlobalService implements OnDestroy {
translate.setDefaultLang('en');

this.container = persistenceService.createContainer(
'org.CHIMAERA.global',
'org.XAYA.global',
{type: StorageType.LOCAL, timeout: 220752000000}
);

Expand Down
4 changes: 2 additions & 2 deletions src/app/settings/settings.component.ts
Expand Up @@ -239,7 +239,7 @@ export class SettingsComponent {
{
const path = window.require('path');
let basepath = window.require('electron').remote.app.getPath('appData');
let filename = path.join(basepath, './Chimaera/appdata.orv');
let filename = path.join(basepath, './Xaya/appdata.orv');
const fs = window.require('fs');

try { fs.unlinkSync(filename); }
Expand All @@ -258,7 +258,7 @@ export class SettingsComponent {
{
const path = window.require('path');
let basepath = window.require('electron').remote.app.getPath('appData');
let filename = path.join(basepath, './Chimaera/appdata.orv');
let filename = path.join(basepath, './Xaya/appdata.orv');
const fs = window.require('fs');


Expand Down
13 changes: 10 additions & 3 deletions src/app/transactions/transactions.component.ts
Expand Up @@ -31,14 +31,22 @@ export class TransactionsComponent implements OnInit {

timeConverter(UNIX_timestamp){
var a = new Date(UNIX_timestamp * 1000);
var months = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
var months = ['01','02','03','04','05','06','07','08','09','10','11','12'];
var year = a.getFullYear();
var month = months[a.getMonth()];
var date = a.getDate();
var hour = a.getHours();
var min = a.getMinutes();
var sec = a.getSeconds();
var time = date + ' ' + month + ' ' + year + ' ' + hour + ':' + min + ':' + sec ;

var sdate = "" + date;

if(date < 10)
{
sdate = "0" + date;
}

var time = year + '-' + month + '-' + sdate + ' ' + hour + ':' + min + ':' + sec ;
return time;
}

Expand Down Expand Up @@ -77,7 +85,6 @@ export class TransactionsComponent implements OnInit {
{

var formattedTime =this.timeConverter(transactionArray[d].time);

let newEntry = {"time" : formattedTime, "address": transactionArray[d].address, "name" : transactionArray[d].label, "category" : transactionArray[d].category, "amount" : transactionArray[d].amount, "confirmations" : transactionArray[d].confirmations };
this.transactionsTable.push(newEntry);

Expand Down
8 changes: 4 additions & 4 deletions src/assets/i18n/en.json
@@ -1,10 +1,9 @@
{

"NAVBAR": {
"ABOUT": "About",
"HELP": "Help",
"HELPTEXT" : "Documentation and source code for the wallet can be found here:<br><br>https://github.com/xyonplatform/xyon<br><br>General help is available through the community site at:<br><br>https://forum.xyon.io/<br><br>Questions that must be posed in confidence can be sent to:<br><br>support@xyon.io<br><br>",
"ABOUTEXT" : "Copyright Bitcoin developers, Namecoin developers and Xyon developers<br><br>Please contribute if you find Xyon useful. Visit https://chimaera.io for further information about the software.<br>The source code is available from https://github.com/xyonplatform/<br><br><br>This is experimental software.<br>Distributed under the MIT software license, see the accompanying file COPYING<br>or https://opensource.org/licenses/MIT<br><br>This product includes software developed by the OpenSSL Project for use in the<br>OpenSSL Toolkit https://www.openssl.org and cryptographic software written by<br>Eric Young and UPnP software written by Thomas Bernard.<br><br>Based on nodeJS, angular, electron and complementing packages made by different nodeJS contributors",
"HELPTEXT" : "Documentation and source code for the wallet can be found here:<br><br>https://github.com/xaya/xaya<br><br>General help is available through the community site at:<br><br>https://forum.xaya.io/<br><br>Questions that must be posed in confidence can be sent to:<br><br>support@xaya.io<br><br>",
"ABOUTEXT" : "Copyright Bitcoin developers, Namecoin developers and Xaya developers<br><br>Please contribute if you find Xaya useful. Visit https://xaya.io for further information about the software.<br>The source code is available from https://github.com/xaya/<br><br><br>This is experimental software.<br>Distributed under the MIT software license, see the accompanying file COPYING<br>or https://opensource.org/licenses/MIT<br><br>This product includes software developed by the OpenSSL Project for use in the<br>OpenSSL Toolkit https://www.openssl.org and cryptographic software written by<br>Eric Young and UPnP software written by Thomas Bernard.<br><br>Based on nodeJS, angular, electron and complementing packages made by different nodeJS contributors",
"MINIMIZE" : "Minimize"
},

Expand All @@ -26,6 +25,7 @@
"CONNECTIONS": "Connections",
"NETTYPE": "Net Type",
"WALLETVERSION": "Daemon Version",
"WALLETBUILDVERSION": "Wallet Version",
"BLOCKPROGRESSION": "Block Progression",
"PRUNED" : "Is Pruned?",
"DIFFICULTY" : "Difficulty",
Expand Down Expand Up @@ -101,7 +101,7 @@
"DEBUGTOGGLE": "Debug Log Toggle"
},
"SCHIMAERA": {
"ACCOUNTNAME": "Xyon Name",
"ACCOUNTNAME": "Xaya Name",
"VALUE": "Name Value (optional)",
"ADDRESS": "Address",
"TITLE": "Owned Names",
Expand Down
11 changes: 5 additions & 6 deletions src/assets/i18n/ru.json
@@ -1,11 +1,9 @@
{


"NAVBAR": {
"ABOUT": "О программе",
"HELPTEXT" : "Documentation and source code for the wallet can be found here:<br><br>https://github.com/xyonplatform/xyon<br><br>General help is available through the community site at:<br><br>https://forum.xyon.io/<br><br>Questions that must be posed in confidence can be sent to:<br><br>support@xyon.io<br><br>",
"HELPTEXT" : "Here goes the help description. We can fill it with any kind of info.",
"ABOUTEXT" : "Copyright Bitcoin developers, Namecoin developers and Xyon developers<br><br>Please contribute if you find Xyon useful. Visit https://chimaera.io for further information about the software.<br>The source code is available from https://github.com/xyonplatform/<br><br><br>This is experimental software.<br>Distributed under the MIT software license, see the accompanying file COPYING<br>or https://opensource.org/licenses/MIT<br><br>This product includes software developed by the OpenSSL Project for use in the<br>OpenSSL Toolkit https://www.openssl.org and cryptographic software written by<br>Eric Young and UPnP software written by Thomas Bernard.<br><br>Based on nodeJS, angular, electron and complementing packages made by different nodeJS contributors",
"HELP": "Помощь",
"HELPTEXT" : "Documentation and source code for the wallet can be found here:<br><br>https://github.com/xaya/xaya<br><br>General help is available through the community site at:<br><br>https://forum.xaya.io/<br><br>Questions that must be posed in confidence can be sent to:<br><br>support@xaya.io<br><br>",
"ABOUTEXT" : "Copyright Bitcoin developers, Namecoin developers and Xaya developers<br><br>Please contribute if you find Xaya useful. Visit https://xaya.io for further information about the software.<br>The source code is available from https://github.com/xaya/<br><br><br>This is experimental software.<br>Distributed under the MIT software license, see the accompanying file COPYING<br>or https://opensource.org/licenses/MIT<br><br>This product includes software developed by the OpenSSL Project for use in the<br>OpenSSL Toolkit https://www.openssl.org and cryptographic software written by<br>Eric Young and UPnP software written by Thomas Bernard.<br><br>Based on nodeJS, angular, electron and complementing packages made by different nodeJS contributors",
"MINIMIZE" : "Минимизировать"
},
"LEFTMENU": {
Expand All @@ -26,6 +24,7 @@
"CONNECTIONS": "Соединений",
"NETTYPE": "Тип сети",
"WALLETVERSION": "Версия daemon",
"WALLETBUILDVERSION": "Версия кошелька",
"BLOCKPROGRESSION": "Прогресс блоков",
"PRUNED" : "Отрезана?",
"DIFFICULTY" : "Сложность",
Expand Down Expand Up @@ -100,7 +99,7 @@
"DEBUGTOGGLE": "Переключиться на логи отладчика"
},
"SCHIMAERA": {
"ACCOUNTNAME": "Имя Ксион",
"ACCOUNTNAME": "Имя Xaya",
"VALUE": "Значение (не обязательно)",
"ADDRESS": "Адрес",
"TITLE": "Собственные Имена",
Expand Down
Binary file modified src/assets/img/logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/img/xyontext.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion src/assets/scss/material-dashboard.scss
Expand Up @@ -526,6 +526,16 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#005902', end
left: 20px;
}

.walletbuildversion
{
font-family: "Roboto";
font-size: 12px;
color: #aaaaaa;
position: absolute;
bottom: 36px;
left: 20px;
}

.skiptop
{
width: 100%;
Expand Down Expand Up @@ -594,7 +604,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#005902', end
position: absolute;
right: 0px;
bottom:0px;
height:200px;
height:160px;
background-size: cover;
width: 280px;
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Expand Up @@ -7,7 +7,7 @@
<link rel="icon" type="image/png" href="../assets/img/favicon.png" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

<title>Chimaera</title>
<title>XAYA</title>

<meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0' name='viewport' />
<meta name="viewport" content="width=device-width" />
Expand Down

0 comments on commit 0557542

Please sign in to comment.