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.

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

wallet2: fix off by one in output picking #4761

Merged
merged 1 commit into from Nov 14, 2018

Conversation

5 participants
@moneromooo-monero
Contributor

moneromooo-monero commented Oct 30, 2018

No description provided.

@xiphon

xiphon approved these changes Oct 30, 2018

@stoffu

stoffu approved these changes Oct 30, 2018

@moneromooo-monero moneromooo-monero force-pushed the moneromooo-monero:op1 branch 2 times, most recently from a4a4ec2 to 2947b1d Oct 30, 2018

break;
// expand up to bounds
if (first_block_offset > 0)
--first_block_offset;
if (last_block_offset < rct_offsets.size() - 1)
if (last_block_offset < last_usable_block)

This comment has been minimized.

@vtnerd

vtnerd Nov 4, 2018

Contributor

Should this stop at the spendable age cutoff?

This comment has been minimized.

@moneromooo-monero

moneromooo-monero Nov 4, 2018

Contributor

Good question. I think it should probably reject that pick then. Originally last_usable_block was taking that spendable delay into account, but you asked to reject the pick in that case, and this falls in the same case I think. I'll ask sarang for what he prefers.

This comment has been minimized.

@moneromooo-monero

moneromooo-monero Nov 5, 2018

Contributor

sarang says pick again, so I've done that.

wallet2: fix off by one in output picking
and take into account wallet level minimum spend age

@moneromooo-monero moneromooo-monero force-pushed the moneromooo-monero:op1 branch from 2947b1d to 6e1282b Nov 5, 2018

@stoffu

stoffu approved these changes Nov 7, 2018

@fluffypony

Reviewed

@fluffypony fluffypony merged commit 6e1282b into monero-project:master Nov 14, 2018

9 of 10 checks passed

buildbot/monero-static-ubuntu-i686 Build done.
Details
buildbot/monero-linux-armv7 Build done.
Details
buildbot/monero-linux-armv8 Build done.
Details
buildbot/monero-static-osx-10.11 Build done.
Details
buildbot/monero-static-osx-10.12 Build done.
Details
buildbot/monero-static-osx-10.13 Build done.
Details
buildbot/monero-static-ubuntu-amd64 Build done.
Details
buildbot/monero-static-win32 Build done.
Details
buildbot/monero-static-win64 Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

fluffypony added a commit that referenced this pull request Nov 14, 2018

Merge pull request #4761
6e1282b wallet2: fix off by one in output picking (moneromooo-monero)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment