aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/crypter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6415Wladimir J. van der Laan2015-08-141-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | d042854 SQUASH "Implement watchonly support in fundrawtransaction" (Matt Corallo) 428a898 SQUASH "Add have-pubkey distinction to ISMINE flags" (Matt Corallo) 6bdb474 Implement watchonly support in fundrawtransaction (Matt Corallo) f5813bd Add logic to track pubkeys as watch-only, not just scripts (Matt Corallo) d3354c5 Add have-pubkey distinction to ISMINE flags (Matt Corallo) 5c17059 Update importaddress help to push its use to script-only (Matt Corallo) a1d7df3 Add importpubkey method to import a watch-only pubkey (Matt Corallo) 907a425 Add p2sh option to importaddress to import redeemScripts (Matt Corallo) 983d2d9 Split up importaddress into helper functions (Matt Corallo) cfc3dd3 Also remove pay-2-pubkey from watch when adding a priv key (Matt Corallo)
| * Add logic to track pubkeys as watch-only, not just scriptsMatt Corallo2015-07-201-1/+3
| |
* | Make sure LogPrintf strings are line-terminatedWladimir J. van der Laan2015-08-031-1/+1
|/ | | | | | | Fix the cases where LogPrint[f] was accidentally called without line terminator, which resulted in concatenated log lines. (see e.g. #6492)
* wallet: move crypter to walletCory Fields2015-03-221-0/+292