slackcoder/bitcoin - Bitcoin Code integration/staging tree

Age	Commit message (Collapse)	Author
2018-09-10	qa: Fix silent merge conflict in wallet_importmulti	MarcoFalke

2018-09-10	Merge #9332: Let wallet importmulti RPC accept labels for standard scriptPubKeys	Wladimir J. van der Laan
	98ea64cf232c34d4b1aebe738b3956191667cd76 Let wallet importmulti RPC accept labels for standard scriptPubKeys (Russell Yanofsky) Pull request description: Allow importmulti RPC to apply address labels when importing standard scriptPubKeys. This makes the importmulti RPC less finnicky about import formats and also simpler internally. Tree-SHA512: 102426b21239f1fa5f38162dc3f4145572caef76e63906afd786b7aff1670d6cd93456f8d85f737588eedc49c11bef2e1e8019b8b2cbf6097c77b3501b0cab1f
2018-08-13	tests: Use explicit imports	practicalswift

2018-07-27	Update copyright headers to 2018	DrahtBot

2018-03-29	Remove assigned but never used local variables	practicalswift

2018-02-22	Let wallet importmulti RPC accept labels for standard scriptPubKeys	Russell Yanofsky
	Allow importmulti RPC to apply address labels when importing standard scriptPubKeys. This makes the importmulti RPC less finnicky about import formats and also simpler internally.
2018-02-16	scripted-diff: validateaddress to getaddressinfo in tests	Andrew Chow
	Change all instances of validateaddress to getaddressinfo since it seems that no test actually uses validateaddress for actually validating addresses. -BEGIN VERIFY SCRIPT- find ./test/functional -path '*py' -not -path ./test/functional/wallet_disable.py -not -path ./test/functional/rpc_deprecated.py -not -path ./test/functional/wallet_address_types.py -exec sed -i'' -e 's/validateaddress/getaddressinfo/g' {} \; -END VERIFY SCRIPT-
2018-01-25	[tests] Rename wallet_* functional tests.	Anthony Towns