Skip to content
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

Reduce usage of auto in line with new recommendation #9

Open
wants to merge 17 commits into
base: 2018-01-auto-devnotes
Choose a base branch
from
Open

Reduce usage of auto in line with new recommendation #9

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0c8ea63
Abstract out IsSolvable from Witnessifier
sipa Dec 1, 2017
cbe1974
[refactor] GetAccount{PubKey,Address} -> GetAccountDestination
sipa Dec 18, 2017
985c795
Improve witness destination types and use them more
sipa Dec 1, 2017
30a27dc
Expose method to find key for a single-key destination
sipa Dec 1, 2017
3eaa003
Extend validateaddress information for P2SH-embedded witness
sipa Dec 1, 2017
37c03d3
Support P2WPKH addresses in create/addmultisig
sipa Dec 1, 2017
cf2c0b6
Support P2WPKH and P2SH-P2WPKH in dumpprivkey
sipa Dec 1, 2017
57273f2
[test] Serialize CTransaction with witness by default
sipa Dec 1, 2017
f37c64e
Implicitly know about P2WPKH redeemscripts
sipa Dec 1, 2017
940a219
SegWit wallet support
sipa Dec 1, 2017
7ee54fd
Support downgrading after recovered keypool witness keys
sipa Dec 1, 2017
b224a47
Add address_types test
sipa Dec 2, 2017
91769d6
[Doc] Fix link for bip 159 pull request
Jan 11, 2018
b0d626d
Merge #12143: [Doc] Fix link for BIP-159 pull request
jonasschnelli Jan 11, 2018
d889c03
Merge #11403: SegWit wallet support
jonasschnelli Jan 11, 2018
5e267c4
Merge with master (segwit wallet)
ajtowns Jan 11, 2018
03ce238
Provide explicit types for various auto vars
ajtowns Jan 11, 2018
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
Prev Previous commit
Next Next commit
Support downgrading after recovered keypool witness keys
  • Loading branch information
@sipa
sipa committed Jan 9, 2018
commit 7ee54fd7c7fa31e3cec382651dd373f7ef2d7327
1 change: 1 addition & 0 deletions src/wallet/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3636,6 +3636,7 @@ void CWallet::MarkReserveKeysAsUsed(int64_t keypool_id)
if (walletdb.ReadPool(index, keypool)) { //TODO: This should be unnecessary
m_pool_key_to_index.erase(keypool.vchPubKey.GetID());
}
LearnAllRelatedScripts(keypool.vchPubKey);
walletdb.ErasePool(index);
LogPrintf("keypool index %d removed\n", index);
it = setKeyPool->erase(it);
Expand Down