Skip to content

wallet: always apply balance deltas to lockedUnconfirmed balance #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pinheadmz wants to merge 1 commit into from
Closed

wallet: always apply balance deltas to lockedUnconfirmed balance #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 20 additions & 32 deletions lib/wallet/txdb.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1643,9 +1643,8 @@ class TXDB {
switch (covenant.type) {
case types.CLAIM:
case types.BID: {
if (height === -1)
state.ulocked(path, output.value);
else
state.ulocked(path, output.value);
if (height !== -1)
state.clocked(path, output.value);
break;
}
Expand All @@ -1659,21 +1658,18 @@ class TXDB {
const bb = await this.getBid(nameHash, prevout);
assert(bb);

if (height === -1) {
state.ulocked(path, -bb.lockup);
state.ulocked(path, output.value);
} else {
state.ulocked(path, -bb.lockup);
state.ulocked(path, output.value);
if (height !== -1) {
state.clocked(path, -bb.lockup);
state.clocked(path, output.value);
}

break;
}

case types.REDEEM: {
if (height === -1)
state.ulocked(path, -output.value);
else
state.ulocked(path, -output.value);
if (height !== -1)
state.clocked(path, -output.value);
break;
}
Expand All @@ -1687,14 +1683,12 @@ class TXDB {
const brv = await this.getReveal(nameHash, prevout);
assert(brv);

if (height === -1) {
state.ulocked(path, -brv.value);
state.ulocked(path, output.value);
} else {
state.ulocked(path, -brv.value);
state.ulocked(path, output.value);
if (height !== -1) {
state.clocked(path, -brv.value);
state.clocked(path, output.value);
}

break;
}
}
Expand All @@ -1717,9 +1711,8 @@ class TXDB {
switch (covenant.type) {
case types.CLAIM:
case types.BID: {
if (height === -1)
state.ulocked(path, -output.value);
else
state.ulocked(path, -output.value);
if (height !== -1)
state.clocked(path, -output.value);
break;
}
Expand All @@ -1733,21 +1726,18 @@ class TXDB {
const bb = await this.getBid(nameHash, prevout);
assert(bb);

if (height === -1) {
state.ulocked(path, bb.lockup);
state.ulocked(path, -output.value);
} else {
state.ulocked(path, bb.lockup);
state.ulocked(path, -output.value);
if (height !== -1) {
state.clocked(path, bb.lockup);
state.clocked(path, -output.value);
}

break;
}

case types.REDEEM: {
if (height === -1)
state.ulocked(path, output.value);
else
state.ulocked(path, output.value);
if (height !== -1)
state.clocked(path, output.value);
break;
}
Expand All @@ -1761,14 +1751,12 @@ class TXDB {
const brv = await this.getReveal(nameHash, prevout);
assert(brv);

if (height === -1) {
state.ulocked(path, brv.value);
state.ulocked(path, -output.value);
} else {
state.ulocked(path, brv.value);
state.ulocked(path, -output.value);
if (height !== -1) {
state.clocked(path, brv.value);
state.clocked(path, -output.value);
}

break;
}
}
Expand Down