aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-07-02Use script matching rather than destination matching for watch-only.Pieter Wuille
This changes the keystore data format, wallet format and IsMine logic to detect watch-only outputs based on direct script matching rather than first trying to convert outputs to destinations (addresses). The reason is that we don't know how the software that has the spending keys works. It may support the same types of scripts as us, but that is not guaranteed. Furthermore, it removes the ambiguity between addresses used as identifiers for output scripts or identifiers for public keys. One practical implication is that adding a normal pay-to-pubkey-hash address via importaddress will not cause payments to the corresponding full public key to be detected as IsMine. If that is wanted, add those scripts directly (importaddress now also accepts any hex-encoded script). Conflicts: src/wallet.cpp
2014-07-02added includedWatchonly argument to listreceivedbyaddress/...accountJaSK
2014-07-02added includeWatchonly argument to 'gettransaction' because it affects ↵JaSK
balance calculation
2014-07-02fixed tiny glitch and improved readability like laanwj suggestedJaSK
2014-07-02Added argument to listtransactions and listsinceblock to include watchonly ↵JaSK
addresses
2014-07-02Showing 'involvesWatchonly' property for transactions returned by ↵JaSK
'listtransactions' and 'listsinceblock'. It is only appended when the transaction involves a watchonly address.
2014-07-02Added argument to listaccounts to include watchonly addressesJaSK
2014-07-02Added argument to getbalance to include watchonly addresses and fixed errors ↵JaSK
in balance calculation.
2014-07-02Watchonly transactions are marked in transaction historyJaSK
2014-07-02Watchonly balances are shown separately in gui.JaSK
2014-07-02qt: Hide unspendable outputs in coin controlWladimir J. van der Laan
2014-07-02Add support for watch-only addressesPieter Wuille
Changes: * Add Add/Have WatchOnly methods to CKeyStore, and implementations in CBasicKeyStore. * Add similar methods to CWallet, and support entries for it in CWalletDB. * Make IsMine in script/wallet return a new enum 'isminetype', rather than a boolean. This allows distinguishing between spendable and unspendable coins. * Add a field fSpendable to COutput (GetAvailableCoins' return type). * Mark watchonly coins in listunspent as 'watchonly': true. * Add 'watchonly' to validateaddress, suppressing script/pubkey/... in this case. Based on a patch by Eric Lombrozo. Conflicts: src/qt/walletmodel.cpp src/rpcserver.cpp src/wallet.cpp
2014-07-02qt: fix 'opens in testnet mode when presented with a BIP-72 link with no ↵Julian Haight
fallback' Passes tests: ``` $ ./bitcoin-qt 'bitcoin:?r=http://www.example.com/' .. fixed the original problem - this launches mainnet. $ ./bitcoin-qt 'bitcoin:mngeNQbTKnmaMbx8EXCYdwUbnt9JJD52cC' .. launches testnet $ ./bitcoin-qt -testnet 'bitcoin:1NXXeQRyMFFFRfyUix2o7mk1vhvk2Nxp78' .. sanity check - launches mainnet. ``` Fixes #4355. Closes #4411.
2014-07-02Merge pull request #4312Wladimir J. van der Laan
fda3fed libsecp256k1 integration (Pieter Wuille) 5566826 secp256k1: Add build-side changes for libsecp256k1 (Cory Fields) b150b09 secp256k1: add libtool as a dependency (Cory Fields)
2014-07-02Merge pull request #4449Wladimir J. van der Laan
462ad22 Clean up release-process.md after OS X gitian changes (Micha)
2014-07-02Fix the Qt5 build after d95ba75Wladimir J. van der Laan
Sorry, my own fault this time.
2014-07-01Clean up release-process.md after OS X gitian changesMicha
This is PR #4271, but with the changes to the descriptors, both the names of the files and the names of the intermediate build artifact archives, removed. This also closes #3775 if it goes in, because it covers the changes in that PR.
2014-07-01libsecp256k1 integrationPieter Wuille
2014-07-01secp256k1: Add build-side changes for libsecp256k1Cory Fields
Note: This is added to our existing automake targets rather than as a libtool-style lib. The switch to libtool-style targets can come later if it proves to not add any complications.
2014-07-01secp256k1: add libtool as a dependencyCory Fields
2014-07-01Merge pull request #4448 from laanwj/2014_07_qt_payment_rq_loggingGavin Andresen
qt: Always log warning/error messages to debug.log
2014-07-01qt: Change serious messages from qDebug to qWarningWladimir J. van der Laan
By changing the logging stream for warnings from qDebug to qWarning, these will always be logged to debug.log.
2014-07-01qt: Log messages with type>QtDebugMsg as non-debugWladimir J. van der Laan
More important messages should end up in the log no matter if -debug=qt is set.
2014-07-01Merge pull request #4325Wladimir J. van der Laan
4aaa017 rework help messages for fee-related options (Philip Kaufmann)
2014-07-01Merge pull request #4447Wladimir J. van der Laan
9a6497e http to https, 2013 to 2014 (Trevin Hofmann)
2014-07-01typedef std::map<uint256, CCoins> to CCoinsMapWladimir J. van der Laan
This makes it possible to switch to a more efficient map type without changing all occurences manually. Merges half of #4413.
2014-07-01fix copyright string in two of our *.rc filesPhilip Kaufmann
- also make comment about rc-files in clientversion.h generic Merges #4429.
2014-07-01Merge pull request #4397Wladimir J. van der Laan
5d59921 add missing BOOST_FOREACH indentation in ThreadSocketHandler() (Philip Kaufmann) 9e9ca2b small cleanup of #ifdefs in BindListenPort() (Philip Kaufmann)
2014-07-01http to https, 2013 to 2014Trevin Hofmann
2014-06-30test: Fix warning about integer signedness in P2SH testsWladimir J. van der Laan
2014-06-30Merge pull request #4415Wladimir J. van der Laan
e35b37b RPC client: Simplify command line string-to-JSON-value conversion code (Jeff Garzik)
2014-06-30Fix the build for Qt5Wladimir J. van der Laan
Merging #3883 broke the Qt5 build, define the color in the standard way.
2014-06-30Merge pull request #3883 from dgenr8/first_double_spendGavin Andresen
Relay and alert user to double spends
2014-06-30Merge pull request #4420 from sipa/skiplistGavin Andresen
Add a skiplist to the CBlockIndex structure.
2014-06-30Merge pull request #4437Wladimir J. van der Laan
de79aaa Move non-trivial uint256.h methods to uint256.cpp (Pieter Wuille)
2014-06-30Merge pull request #4440Wladimir J. van der Laan
16f33f1 fix RPC error replies (kazcw)
2014-06-29Add skiplist unit testsPieter Wuille
2014-06-29Add a skiplist to the CBlockIndex structure.Pieter Wuille
This allows fast (O(log n)) access to far predecessor blocks. Use it to speed up CChain::FindFork and CChain::GetLocator.
2014-06-29Track peers' available blocksPieter Wuille
2014-06-29Merge pull request #4441Wladimir J. van der Laan
ffebc1b Update verify.sh script to point to bitcoin.org (Michael Ford)
2014-06-29Update verify.sh script to point to bitcoin.orgMichael Ford
Now that downloads are no longer hosted on Sourceforge, update the script to retrieve the binaries and signature file from bitcoin.org.
2014-06-28fix RPC error replieskazcw
After pull #4288, RPC messages indicating errors have a Content-Length unrelated to their actual contents, rendering bitcoin-cli and curl unable to decode the reply. This patch sets the Content-Length field based on the actual content returned. Additionally, pull #4288 clobbered the error descriptions provided in ErrorReply, which bitcoin-cli relies upon; this patch moves #4288 http-error descriptions to an HTTPError method, allowing HTTPReply to pass content on unchanged.
2014-06-28Move non-trivial uint256.h methods to uint256.cppPieter Wuille
2014-06-28Merge pull request #4436Wladimir J. van der Laan
675bcd5 Correct comment for 15-of-15 p2sh script size (Michael Ford)
2014-06-28Merge pull request #4425Wladimir J. van der Laan
6ecf3ed Display unknown commands received. (R E Broadley)
2014-06-28Merge pull request #4398Wladimir J. van der Laan
86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann) e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
2014-06-28Merge pull request #4418Wladimir J. van der Laan
d618965 Add note about PPA to build instructions (Drak) e5f0247 Simplify build instructions (Drak)
2014-06-28Merge pull request #4422Wladimir J. van der Laan
645d497 Replace HexBits with strprintf (jtimon)
2014-06-28Merge pull request #4435Wladimir J. van der Laan
92ddf2c Update OS X build instructions (Michael Ford)
2014-06-28Correct comment for 15-of-15 p2sh script sizeMichael Ford
The original comment forgets to account for the script push which will need an OP_PUSHDATA2 + 2-bytes for the 513 script bytes. props davecgh fixes #4224