diff --git a/lib/Cargo.lock b/lib/Cargo.lock index d03ea89..99ffbfb 100644 --- a/lib/Cargo.lock +++ b/lib/Cargo.lock @@ -1051,7 +1051,7 @@ version = "0.1.0" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ce987b373505c19784f6482fd900fa1bb988cbce)", + "silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ded8a41fa886a3bfb6e0cefd69c3aedac2abd2a4)", ] [[package]] @@ -1467,7 +1467,7 @@ dependencies = [ [[package]] name = "silentdragonlitelib" version = "0.1.0" -source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=ce987b373505c19784f6482fd900fa1bb988cbce#ce987b373505c19784f6482fd900fa1bb988cbce" +source = "git+https://github.com/MyHush/silentdragonlite-cli?rev=ded8a41fa886a3bfb6e0cefd69c3aedac2abd2a4#ded8a41fa886a3bfb6e0cefd69c3aedac2abd2a4" dependencies = [ "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "bellman 0.1.0 (git+https://github.com/DenioD/librustzcash.git?rev=caaee693c47c2ee9ecd1e1546b8fe3c714f342bc)", @@ -2481,7 +2481,7 @@ dependencies = [ "checksum serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)" = "2f72eb2a68a7dc3f9a691bfda9305a1c017a6215e5a4545c258500d2099a37c2" "checksum serde_yaml 0.8.11 (registry+https://github.com/rust-lang/crates.io-index)" = "691b17f19fc1ec9d94ec0b5864859290dff279dbd7b03f017afda54eb36c3c35" "checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" -"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ce987b373505c19784f6482fd900fa1bb988cbce)" = "" +"checksum silentdragonlitelib 0.1.0 (git+https://github.com/MyHush/silentdragonlite-cli?rev=ded8a41fa886a3bfb6e0cefd69c3aedac2abd2a4)" = "" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" "checksum sodiumoxide 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585232e78a4fc18133eef9946d3080befdf68b906c51b621531c37e91787fa2b" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index faa403c..8f5008f 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -11,4 +11,4 @@ crate-type = ["staticlib"] [dependencies] libc = "0.2.58" lazy_static = "1.4.0" -silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "ce987b373505c19784f6482fd900fa1bb988cbce" } +silentdragonlitelib = { git = "https://github.com/MyHush/silentdragonlite-cli", rev = "ded8a41fa886a3bfb6e0cefd69c3aedac2abd2a4" } diff --git a/src/controller.cpp b/src/controller.cpp index e1b2c71..d181cab 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -162,12 +162,18 @@ void Controller::getInfoThenRefresh(bool force) { prevCallSucceeded = true; int curBlock = reply["latest_block_height"].get(); + int longestchain = reply["longestchain"].get(); + int notarized = reply["notarized"].get(); + int difficulty = reply["difficulty"].get(); int blocks_until_halving= 340000 - curBlock; char halving_days[8]; sprintf(halving_days, "%.2f", (double) (blocks_until_halving * 150) / (60*60*24) ); bool doUpdate = force || (model->getLatestBlock() != curBlock); model->setLatestBlock(curBlock); ui->blockHeight->setText(QString::number(curBlock)); + ui->last_notarized->setText(QString::number(notarized)); + ui->longestchain->setText(QString::number(longestchain)); + ui->difficulty->setText(QString::number(difficulty)); ui->halvingTime->setText( QString::number(blocks_until_halving) % " blocks, " % QString::fromStdString(halving_days) % " days" ); ui->Version->setText(QString::fromStdString(reply["version"].get())); ui->Vendor->setText(QString::fromStdString(reply["vendor"].get())); @@ -189,9 +195,9 @@ void Controller::getInfoThenRefresh(bool force) { ui->volumeExchange->setText(" $ " + QString::number((double) Settings::getInstance()->getUSDVolume() ,'f',2)); ui->marketcapTab->setText(" $ " + QString::number((double) Settings::getInstance()->getUSDCAP() ,'f',2)); } else if (Settings::getInstance()->get_currency_name() == "EUR") { - main->statusLabel->setText(" HUSH/EUR=€ " + QString::number( (double) Settings::getInstance()->getEURPrice() ,'f',2)); - ui->volumeExchange->setText(" € " + QString::number((double) Settings::getInstance()->getEURVolume() ,'f',2)); - ui->marketcapTab->setText(" € " + QString::number((double) Settings::getInstance()->getEURCAP() ,'f',2)); + main->statusLabel->setText(" HUSH/EUR= " + QString::number( (double) Settings::getInstance()->getEURPrice() ,'f',2) + " €"); + ui->volumeExchange->setText(QString::number((double) Settings::getInstance()->getEURVolume() ,'f',2) + " €"); + ui->marketcapTab->setText(QString::number((double) Settings::getInstance()->getEURCAP() ,'f',2)+ " €"); } else if (Settings::getInstance()->get_currency_name() == "BTC") { main->statusLabel->setText(" HUSH/BTC=BTC " + QString::number((double) Settings::getInstance()->getBTCPrice() ,'f',8)); ui->volumeExchange->setText(" BTC " + QString::number((double) Settings::getInstance()->getBTCVolume() ,'f',8)); diff --git a/src/createhushconfdialog.ui b/src/createhushconfdialog.ui index 8719d53..4b040c1 100644 --- a/src/createhushconfdialog.ui +++ b/src/createhushconfdialog.ui @@ -7,34 +7,14 @@ 0 0 596 - 352 + 471 Configure hush.conf - - - - Your hush node will be configured for you automatically - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Enable Fast Sync - - - true - - - - + @@ -61,39 +41,7 @@ - - - - - 0 - 0 - - - - background: #fff; - - - - - - true - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - true - - - - + @@ -192,34 +140,57 @@ - - + + + + Your hush node will be configured for you automatically + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + Qt::Horizontal - - + + + + + 0 + 0 + + + + background: #fff; + - <html><head/><body><p>Skips the most expensive checks during the initial block download. <a href="https://docs.silentdragon.co/using-silentdragon/#fastsync"><span style=" text-decoration: underline; color:#0000ff;">Learn More</span></a></p></body></html> + - - Qt::RichText - - + true - - true - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse - - - + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + true + + + + + Qt::Horizontal diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 06e7a88..6ae47eb 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -458,7 +458,7 @@ void MainWindow::setupSettingsModal() { // List of default servers settings.cmbServer->addItem("https://hush-lightwallet.de:443"); - settings.cmbServer->addItem("https://hush-lightwallet.de:443"); + settings.cmbServer->addItem("https://lite.myhush.org:443"); // Load current values into the dialog auto conf = Settings::getInstance()->getSettings(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 4d39930..a8d0998 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1089,14 +1089,77 @@ - + + + + Last Notarized Block + + + + + + + | + + + + + + + Loading... + + + + + + + Longestchain + + + + + + + | + + + + + + + Loading... + + + + + + + Difficulty + + + + + + + | + + + + + + + Loading... + + + + Qt::Horizontal - + @@ -1108,70 +1171,70 @@ - + Qt::Horizontal - + Market Cap - + | - + Loading... - + Volume on Exchanges - + | - + Loading... - + Qt::Horizontal - + This is a Lightwallet, you cant mine with it! - + Qt::Vertical @@ -1376,7 +1439,6 @@ - tabWidget Address1 Amount1 Max1