Show syncing progress at startup
This commit is contained in:
parent
c3fcdcb4c5
commit
2fabc1ec8d
|
@ -1051,7 +1051,7 @@ version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=6dc22e4d74e9cec458d279d793477dea3bfe27e5)",
|
"zecwalletlitelib 0.1.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
@ -2266,7 +2266,6 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zecwalletlitelib"
|
name = "zecwalletlitelib"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=6dc22e4d74e9cec458d279d793477dea3bfe27e5#6dc22e4d74e9cec458d279d793477dea3bfe27e5"
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"bellman 0.1.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)",
|
"bellman 0.1.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)",
|
||||||
|
@ -2562,4 +2561,3 @@ dependencies = [
|
||||||
"checksum zcash_client_backend 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
"checksum zcash_client_backend 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
||||||
"checksum zcash_primitives 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
"checksum zcash_primitives 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
||||||
"checksum zcash_proofs 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
"checksum zcash_proofs 0.0.0 (git+https://github.com/adityapk00/librustzcash.git?rev=188537ea025fcb7fbdfc11266f307a084a5451e4)" = "<none>"
|
||||||
"checksum zecwalletlitelib 0.1.0 (git+https://github.com/adityapk00/zecwallet-light-cli?rev=6dc22e4d74e9cec458d279d793477dea3bfe27e5)" = "<none>"
|
|
||||||
|
|
|
@ -11,4 +11,4 @@ crate-type = ["staticlib"]
|
||||||
[dependencies]
|
[dependencies]
|
||||||
libc = "0.2.58"
|
libc = "0.2.58"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
zecwalletlitelib = { git = "https://github.com/adityapk00/zecwallet-light-cli", rev = "6dc22e4d74e9cec458d279d793477dea3bfe27e5" }
|
zecwalletlitelib = { path="../../lightwallet/lightwalletclient/lib/" }
|
||||||
|
|
|
@ -4,7 +4,7 @@ extern crate lazy_static;
|
||||||
use libc::{c_char};
|
use libc::{c_char};
|
||||||
|
|
||||||
use std::ffi::{CStr, CString};
|
use std::ffi::{CStr, CString};
|
||||||
use std::sync::{Mutex};
|
use std::sync::{Mutex, Arc};
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
use zecwalletlitelib::{commands, lightclient::{LightClient, LightClientConfig}};
|
use zecwalletlitelib::{commands, lightclient::{LightClient, LightClientConfig}};
|
||||||
|
@ -13,7 +13,7 @@ use zecwalletlitelib::{commands, lightclient::{LightClient, LightClientConfig}};
|
||||||
// so we don't have to keep creating it. We need to store it here, in rust
|
// so we don't have to keep creating it. We need to store it here, in rust
|
||||||
// because we can't return such a complex structure back to C++
|
// because we can't return such a complex structure back to C++
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref LIGHTCLIENT: Mutex<RefCell<Option<LightClient>>> = Mutex::new(RefCell::new(None));
|
static ref LIGHTCLIENT: Mutex<RefCell<Option<Arc<LightClient>>>> = Mutex::new(RefCell::new(None));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if there is an existing wallet
|
// Check if there is an existing wallet
|
||||||
|
@ -65,7 +65,7 @@ pub extern fn litelib_initialize_new(dangerous: bool, server: *const c_char) ->
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
LIGHTCLIENT.lock().unwrap().replace(Some(lightclient));
|
LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
|
||||||
|
|
||||||
// Return the wallet's seed
|
// Return the wallet's seed
|
||||||
let s_str = CString::new(seed).unwrap();
|
let s_str = CString::new(seed).unwrap();
|
||||||
|
@ -113,7 +113,7 @@ pub extern fn litelib_initialize_new_from_phrase(dangerous: bool, server: *const
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
LIGHTCLIENT.lock().unwrap().replace(Some(lightclient));
|
LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
|
||||||
|
|
||||||
let c_str = CString::new("OK").unwrap();
|
let c_str = CString::new("OK").unwrap();
|
||||||
return c_str.into_raw();
|
return c_str.into_raw();
|
||||||
|
@ -145,7 +145,7 @@ pub extern fn litelib_initialize_existing(dangerous: bool, server: *const c_char
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
LIGHTCLIENT.lock().unwrap().replace(Some(lightclient));
|
LIGHTCLIENT.lock().unwrap().replace(Some(Arc::new(lightclient)));
|
||||||
|
|
||||||
let c_str = CString::new("OK").unwrap();
|
let c_str = CString::new("OK").unwrap();
|
||||||
return c_str.into_raw();
|
return c_str.into_raw();
|
||||||
|
@ -167,16 +167,21 @@ pub extern fn litelib_execute(cmd: *const c_char, args: *const c_char) -> *mut c
|
||||||
|
|
||||||
let resp: String;
|
let resp: String;
|
||||||
{
|
{
|
||||||
let lc = LIGHTCLIENT.lock().unwrap();
|
let lightclient: Arc<LightClient>;
|
||||||
|
{
|
||||||
|
let lc = LIGHTCLIENT.lock().unwrap();
|
||||||
|
|
||||||
if lc.borrow().is_none() {
|
if lc.borrow().is_none() {
|
||||||
let e_str = CString::new("Error: Light Client is not initialized").unwrap();
|
let e_str = CString::new("Error: Light Client is not initialized").unwrap();
|
||||||
return e_str.into_raw();
|
return e_str.into_raw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lightclient = lc.borrow().as_ref().unwrap().clone();
|
||||||
|
};
|
||||||
|
|
||||||
let args = if arg_str.is_empty() { vec![] } else { vec![arg_str.as_ref()] };
|
let args = if arg_str.is_empty() { vec![] } else { vec![arg_str.as_ref()] };
|
||||||
|
|
||||||
resp = commands::do_user_command(&cmd_str, &args, lc.borrow().as_ref().unwrap()).clone();
|
resp = commands::do_user_command(&cmd_str, &args, lightclient.as_ref()).clone();
|
||||||
};
|
};
|
||||||
|
|
||||||
let c_str = CString::new(resp.as_bytes()).unwrap();
|
let c_str = CString::new(resp.as_bytes()).unwrap();
|
||||||
|
|
|
@ -58,10 +58,53 @@ void ConnectionLoader::doAutoConnect() {
|
||||||
|
|
||||||
// After the lib is initialized, try to do get info
|
// After the lib is initialized, try to do get info
|
||||||
connection->doRPC("info", "", [=](auto reply) {
|
connection->doRPC("info", "", [=](auto reply) {
|
||||||
// If success, set the connection
|
// If success, set the connection
|
||||||
main->logger->write("Connection is online.");
|
main->logger->write("Connection is online.");
|
||||||
this->doRPCSetConnection(connection);
|
|
||||||
}, [=](auto err) {});
|
QAtomicInteger<bool>* isSyncing = new QAtomicInteger<bool>();
|
||||||
|
isSyncing->store(true);
|
||||||
|
|
||||||
|
// Do a sync at startup
|
||||||
|
syncTimer = new QTimer(main);
|
||||||
|
connection->doRPCWithDefaultErrorHandling("sync", "", [=](auto) {
|
||||||
|
isSyncing->store(false);
|
||||||
|
|
||||||
|
// Cancel the timer
|
||||||
|
syncTimer->deleteLater();
|
||||||
|
|
||||||
|
// When sync is done, set the connection
|
||||||
|
this->doRPCSetConnection(connection);
|
||||||
|
});
|
||||||
|
|
||||||
|
// While it is syncing, we'll show the status updates while it is alive.
|
||||||
|
QObject::connect(syncTimer, &QTimer::timeout, [=]() {
|
||||||
|
qDebug() << "Sync timer" << isSyncing->load();
|
||||||
|
// Check the sync status
|
||||||
|
if (isSyncing->load()) {
|
||||||
|
// Get the sync status
|
||||||
|
connection->doRPC("syncstatus", "", [=](json reply) {
|
||||||
|
qDebug() << QString::fromStdString("Sync statys = ") << QString::fromStdString(reply.dump());
|
||||||
|
|
||||||
|
if (isSyncing->load() && reply.find("synced_blocks") != reply.end()) {
|
||||||
|
qint64 synced = reply["synced_blocks"].get<json::number_unsigned_t>();
|
||||||
|
qint64 total = reply["total_blocks"].get<json::number_unsigned_t>();
|
||||||
|
showInformation("Synced " + QString::number(synced) + " / " + QString::number(total));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[=](QString err) {
|
||||||
|
qDebug() << "Sync error" << err;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
delete isSyncing;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
syncTimer->setInterval(1* 1000);
|
||||||
|
syncTimer->start(1000);
|
||||||
|
|
||||||
|
}, [=](QString err) {
|
||||||
|
showError(err);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConnectionLoader::createOrRestore(bool dangerous, QString server) {
|
void ConnectionLoader::createOrRestore(bool dangerous, QString server) {
|
||||||
|
@ -75,6 +118,7 @@ void ConnectionLoader::createOrRestore(bool dangerous, QString server) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConnectionLoader::doRPCSetConnection(Connection* conn) {
|
void ConnectionLoader::doRPCSetConnection(Connection* conn) {
|
||||||
|
qDebug() << "Connectionloader finished, setting connection";
|
||||||
rpc->setConnection(conn);
|
rpc->setConnection(conn);
|
||||||
|
|
||||||
d->accept();
|
d->accept();
|
||||||
|
@ -88,20 +132,9 @@ Connection* ConnectionLoader::makeConnection(std::shared_ptr<ConnectionConfig> c
|
||||||
|
|
||||||
// Update the UI with the status
|
// Update the UI with the status
|
||||||
void ConnectionLoader::showInformation(QString info, QString detail) {
|
void ConnectionLoader::showInformation(QString info, QString detail) {
|
||||||
static int rescanCount = 0;
|
qDebug() << "Showing info " << info << ":" << detail;
|
||||||
if (detail.toLower().startsWith("rescan")) {
|
|
||||||
rescanCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rescanCount > 10) {
|
|
||||||
detail = detail + "\n" + QObject::tr("This may take several hours");
|
|
||||||
}
|
|
||||||
|
|
||||||
connD->status->setText(info);
|
connD->status->setText(info);
|
||||||
connD->statusDetail->setText(detail);
|
connD->statusDetail->setText(detail);
|
||||||
|
|
||||||
if (rescanCount < 10)
|
|
||||||
main->logger->write(info + ":" + detail);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -40,6 +40,8 @@ private:
|
||||||
|
|
||||||
void doRPCSetConnection(Connection* conn);
|
void doRPCSetConnection(Connection* conn);
|
||||||
|
|
||||||
|
QTimer* syncTimer;
|
||||||
|
|
||||||
QDialog* d;
|
QDialog* d;
|
||||||
Ui_ConnectionDialog* connD;
|
Ui_ConnectionDialog* connD;
|
||||||
|
|
||||||
|
|
|
@ -161,21 +161,25 @@ void Controller::getInfoThenRefresh(bool force) {
|
||||||
prevCallSucceeded = true;
|
prevCallSucceeded = true;
|
||||||
|
|
||||||
// Testnet?
|
// Testnet?
|
||||||
|
QString chainName;
|
||||||
if (!reply["chain_name"].is_null()) {
|
if (!reply["chain_name"].is_null()) {
|
||||||
Settings::getInstance()->setTestnet(reply["chain_name"].get<json::string_t>() == "test");
|
chainName = QString::fromStdString(reply["chain_name"].get<json::string_t>());
|
||||||
|
Settings::getInstance()->setTestnet(chainName == "test");
|
||||||
};
|
};
|
||||||
|
|
||||||
// Recurring pamynets are testnet only
|
// Recurring pamynets are testnet only
|
||||||
if (!Settings::getInstance()->isTestnet())
|
if (!Settings::getInstance()->isTestnet())
|
||||||
main->disableRecurring();
|
main->disableRecurring();
|
||||||
|
|
||||||
// Connected, so display checkmark.
|
|
||||||
QIcon i(":/icons/res/connected.gif");
|
|
||||||
main->statusIcon->setPixmap(i.pixmap(16, 16));
|
|
||||||
|
|
||||||
static int lastBlock = 0;
|
static int lastBlock = 0;
|
||||||
int curBlock = reply["latest_block_height"].get<json::number_integer_t>();
|
int curBlock = reply["latest_block_height"].get<json::number_integer_t>();
|
||||||
model->setLatestBlock(curBlock);
|
model->setLatestBlock(curBlock);
|
||||||
|
|
||||||
|
// Connected, so display checkmark.
|
||||||
|
QIcon i(":/icons/res/connected.gif");
|
||||||
|
main->statusLabel->setText(chainName + "(" + QString::number(curBlock) + ")");
|
||||||
|
main->statusIcon->setPixmap(i.pixmap(16, 16));
|
||||||
|
|
||||||
//int version = reply["version"].get<json::string_t>();
|
//int version = reply["version"].get<json::string_t>();
|
||||||
int version = 1;
|
int version = 1;
|
||||||
Settings::getInstance()->setZcashdVersion(version);
|
Settings::getInstance()->setZcashdVersion(version);
|
||||||
|
|
|
@ -127,7 +127,7 @@ RestoreSeedPage::RestoreSeedPage(FirstTimeWizard *parent) : QWizardPage(parent)
|
||||||
|
|
||||||
bool RestoreSeedPage::validatePage() {
|
bool RestoreSeedPage::validatePage() {
|
||||||
// 1. Validate that we do have 24 words
|
// 1. Validate that we do have 24 words
|
||||||
QString seed = form.txtSeed->toPlainText().replace(QRegExp("[ \n\r]+"), " ");
|
QString seed = form.txtSeed->toPlainText().replace(QRegExp("[ \n\r\t]+"), " ");
|
||||||
if (seed.trimmed().split(" ").length() != 24) {
|
if (seed.trimmed().split(" ").length() != 24) {
|
||||||
QMessageBox::warning(this, tr("Failed to restore wallet"),
|
QMessageBox::warning(this, tr("Failed to restore wallet"),
|
||||||
tr("Zecwallet needs 24 words to restore wallet"),
|
tr("Zecwallet needs 24 words to restore wallet"),
|
||||||
|
|
Loading…
Reference in New Issue