DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-10-25 23:05:45 -07:00
parent 719f6d9ce4
commit ae00476b62
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/turnstile.cpp
View File

@@ -155,7 +155,7 @@ QList<double> Turnstile::splitAmount(double amount, int parts) {
// Add the Tx fees // Add the Tx fees
sumofparts += amounts.size() * Utils::getMinerFee(); sumofparts += amounts.size() * Utils::getMinerFee();
Q_ASSERT(sumofparts == amount); Q_ASSERT(QString::number(sumofparts, 'f', 8) == QString::number(amount, 'f', 8));
return amounts; return amounts;
} }
@@ -276,6 +276,11 @@ void Turnstile::executeMigrationStep() {
// Execute this step // Execute this step
if (nextStep->status == TurnstileMigrationItemStatus::NotStarted) { if (nextStep->status == TurnstileMigrationItemStatus::NotStarted) {
// Does this z addr have enough balance? // Does this z addr have enough balance?
if (fnHasUnconfirmed(nextStep->fromAddr)) {
qDebug() << QString("unconfirmed, waiting");
return;
}
auto balance = rpc->getAllBalances()->value(nextStep->fromAddr); auto balance = rpc->getAllBalances()->value(nextStep->fromAddr);
if (nextStep->amount > balance) { if (nextStep->amount > balance) {
qDebug() << "Not enough balance!"; qDebug() << "Not enough balance!";
@@ -306,7 +311,8 @@ void Turnstile::executeMigrationStep() {
} else if (nextStep->status == TurnstileMigrationItemStatus::SentToT) { } else if (nextStep->status == TurnstileMigrationItemStatus::SentToT) {
// First thing to do is check to see if the funds are confirmed. // First thing to do is check to see if the funds are confirmed.
if (fnHasUnconfirmed(nextStep->intTAddr)) { // We'll check both the original sprout address and the intermediate T addr for safety.
if (fnHasUnconfirmed(nextStep->intTAddr) || fnHasUnconfirmed(nextStep->fromAddr)) {
qDebug() << QString("unconfirmed, waiting"); qDebug() << QString("unconfirmed, waiting");
return; return;
} }
@@ -316,7 +322,7 @@ void Turnstile::executeMigrationStep() {
auto sendAmt = bal - Utils::getMinerFee(); auto sendAmt = bal - Utils::getMinerFee();
if (sendAmt < 0) { if (sendAmt < 0) {
qDebug() << "Not enough balance!"; qDebug() << "Not enough balance!." << bal << ":" << sendAmt;
nextStep->status = TurnstileMigrationItemStatus::NotEnoughBalance; nextStep->status = TurnstileMigrationItemStatus::NotEnoughBalance;
writeMigrationPlan(plan); writeMigrationPlan(plan);
return; return;