Skip to content

Conversation

@codablock
Copy link

#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".

I assume this happened while resolving merge conflicts while rebasing after #1770 was merged.

dashpay#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
@codablock
Copy link
Author

FYI: Encountered this while preparing next batch of backported PRs. New tests were failing because of this.

@UdjinM6
Copy link

UdjinM6 commented Dec 27, 2017

🤦‍♂️

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6 UdjinM6 added this to the 12.3 milestone Dec 27, 2017
@UdjinM6 UdjinM6 merged commit fa25499 into dashpay:develop Dec 28, 2017
@codablock codablock deleted the pr_fix_ApproximateBestSubset branch December 28, 2017 10:44
@UdjinM6 UdjinM6 mentioned this pull request Jan 2, 2018
9 tasks
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jan 5, 2018
…et (dashpay#1819)

dashpay#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
NarubyRiverlione added a commit to NarubyRiverlione/spice that referenced this pull request Feb 4, 2018
* 'spice' of github.com:NarubyRiverlione/spice: (8382 commits)
  updated testnet genessis
  spice images
  more rename
  genesis blocks ports magic message letters start letter addresses
  cleanup : * remove gitian signatures * remove seeds
  rename: more originale files
  rename
  Prepare 0.12.2.3 release notes (dashpay#1846)
  Avoid reference leakage in CKeyHolderStorage::AddKey (dashpay#1840)
  Protect CKeyHolderStorage via mutex (dashpay#1834)
  Skip existing masternode conections on mixing (dashpay#1833)
  Merge pull request dashpay#1836 from lodgepole/feature/backport-11847
  Fix -liquidityprovider option (dashpay#1829)
  Vote on IS only if it was accepted to mempool (dashpay#1826)
  bump version to 0.12.2.3 (dashpay#1827)
  Merge bitcoin#8256: BUG: bitcoin-qt crash
  Swap iterations and fUseInstantSend parameters in ApproximateBestSubset (dashpay#1819)
  Fix crash on exit when -createwalletbackups=0 (dashpay#1810)
  Prepare v0.12.2.2 release notes (dashpay#1769)
  Force rcc to use resource format version 1. (dashpay#1784)
  ...

# Conflicts:
#	contrib/gitian-descriptors/gitian-osx-signer.yml
#	contrib/gitian-descriptors/gitian-win-signer.yml
#	src/chainparams.cpp
#	src/qt/res/icons/bitcoin.icns
#	src/qt/res/icons/bitcoin.ico
#	src/qt/res/icons/bitcoin.png
#	src/qt/res/icons/crownium/about.png
#	src/qt/res/icons/drkblue/about.png
#	src/qt/res/icons/drkblue/bitcoin.png
#	src/qt/res/icons/light/about.png
#	src/qt/res/icons/light/remove.png
#	src/qt/res/icons/remove.png
#	src/qt/res/icons/trad/about.png
#	src/qt/res/icons/trad/remove.png
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Dec 26, 2018
…et (dashpay#1819)

dashpay#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants