LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity
lbrycrd/src
History
Jimmy Kiselak df59145787 Merge branch 'master' of https://github.com/bitcoin/bitcoin 
Conflicts:
	src/main.cpp

merge in bitcoin changes. conflict in src/main.cc, where
applying tx undos was separated into its own function.
2015-02-09 10:26:35 -05:00
..
compat Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
config build: move bitcoin-config.h to its own directory 2014-06-21 19:47:43 +02:00
crypto Use libsecp256k1's RFC6979 implementation 2015-01-06 00:28:44 +01:00
json json_spirit: #include <stdint.h> 2014-05-13 11:41:59 +02:00
leveldb Merge src/leveldb changes for LevelDB 1.18. 2014-10-16 12:23:50 -07:00
obj
obj-test Rename src/obj/test to src/obj-test to workaround bug in older GNU Make 2012-01-23 14:27:08 -05:00
primitives rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
qt Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-09 10:26:35 -05:00
script merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
secp256k1 Update libsecp256k1 2015-01-06 00:28:47 +01:00
test merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
univalue Remove references to X11 licence 2014-12-16 15:56:50 +08:00
.clang-format Update coding style and add .clang-format 2014-07-28 22:08:13 +02:00
addrman.cpp Replace GetLow64 with GetCheapHash 2015-01-05 15:45:34 +01:00
addrman.h Fix all header defines 2014-11-03 16:16:40 +01:00
alert.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
alert.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
allocators.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
allocators.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
amount.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
amount.h Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-01-05 12:17:58 -05:00
arith_uint256.cpp arith_uint256: remove initialization from byte vector 2015-01-05 15:45:36 +01:00
arith_uint256.h arith_uint256: remove initialization from byte vector 2015-01-05 15:45:36 +01:00
base58.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
base58.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
bitcoin-cli-res.rc Remove references to X11 licence 2014-12-16 15:56:50 +08:00
bitcoin-cli.cpp namespace: remove boost namespace pollution 2015-01-02 15:12:03 -05:00
bitcoin-tx.cpp Avoid storing a reference passed to SignatureChecker constructors 2015-02-02 20:19:46 -08:00
bitcoind-res.rc Remove references to X11 licence 2014-12-16 15:56:50 +08:00
bitcoind.cpp Get rid of DetectShutdownThread 2015-01-19 15:37:48 +01:00
bloom.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
bloom.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
chain.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
chain.h rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
chainparams.cpp merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
chainparams.h Merge pull request #5598 2015-01-06 18:12:58 +01:00
chainparamsbase.cpp Merge pull request #5513 2015-01-06 20:32:45 +01:00
chainparamsbase.h Merge pull request #5598 2015-01-06 18:12:58 +01:00
chainparamsseeds.h merge in bitcoin changes 2015-01-15 12:52:38 -05:00
checkpoints.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
checkpoints.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
checkqueue.h Merge pull request #5721 2015-02-06 16:51:39 +01:00
clientversion.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
clientversion.h Bump project-wide COPYRIGHT_YEAR to 2015 2015-01-02 10:53:13 +01:00
coincontrol.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
coins.cpp Enable spending NCC transactions (both updating and abandoning their claims), and enable printing them out with their info 2015-01-14 19:17:19 -05:00
coins.h Replace direct use of 0 with SetNull and IsNull 2015-01-05 15:45:34 +01:00
compat.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
compressor.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
compressor.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
core_io.h Merge pull request #5499 2014-12-31 10:50:06 +01:00
core_read.cpp namespace: drop most boost namespaces and a few header cleanups 2015-01-02 15:12:03 -05:00
core_write.cpp Replace direct use of 0 with SetNull and IsNull 2015-01-05 15:45:34 +01:00
crypter.cpp Merge pull request #5319 2015-02-04 13:56:57 +01:00
crypter.h Merge pull request #5319 2015-02-04 13:56:57 +01:00
db.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
db.h Merge pull request #4805 2015-01-26 12:19:12 +01:00
eccryptoverify.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
eccryptoverify.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
ecwrapper.cpp Improve robustness of DER recoding code 2015-01-12 08:59:03 +01:00
ecwrapper.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
hash.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
hash.h Squashed 'src/secp256k1/' changes from bccaf86..50cc6ab 2015-01-06 00:28:47 +01:00
init.cpp merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
init.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
key.cpp Use libsecp256k1's RFC6979 implementation 2015-01-06 00:28:44 +01:00
key.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
keystore.cpp c++11: don't forward-declare types used in maps 2015-02-03 23:30:59 -05:00
keystore.h c++11: don't forward-declare types used in maps 2015-02-03 23:30:59 -05:00
leveldbwrapper.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
leveldbwrapper.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
limitedmap.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
main.cpp Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-09 10:26:35 -05:00
main.h merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
Makefile.am rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
Makefile.qt.include [Qt] optimize helpmessage dialog 2015-01-09 21:11:47 +01:00
Makefile.qttest.include build: make a distinction between static app ldflags and static lib ldflags 2014-11-19 22:08:27 -05:00
Makefile.test.include merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
merkleblock.cpp Replace direct use of 0 with SetNull and IsNull 2015-01-05 15:45:34 +01:00
merkleblock.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
miner.cpp rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
miner.h Merge pull request #5599 2015-01-24 16:00:40 +01:00
mruset.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
ncc.cpp move everything trie related into its own file, enable serialization of trie nodes and values, and create some tests for serialization 2015-02-02 20:57:53 -05:00
ncc.h move everything trie related into its own file, enable serialization of trie nodes and values, and create some tests for serialization 2015-02-02 20:57:53 -05:00
ncctrie.cpp rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
ncctrie.h rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
net.cpp Sanitize command strings before logging them. 2015-02-08 19:58:59 +00:00
net.h Delete RecvLine function 2015-01-20 18:03:20 +01:00
netbase.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
netbase.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
noui.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
noui.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
pow.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
pow.h Use arith_uint256 where necessary 2015-01-05 15:45:35 +01:00
protocol.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
protocol.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
pubkey.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
pubkey.h Replace direct use of 0 with SetNull and IsNull 2015-01-05 15:45:34 +01:00
random.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
random.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
rest.cpp Replace direct use of 0 with SetNull and IsNull 2015-01-05 15:45:34 +01:00
rpcblockchain.cpp rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
rpcclient.cpp enable limiting output of listnameclaims to transactions which have a minimum number of confirmations 2015-01-15 18:02:30 -05:00
rpcclient.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
rpcdump.cpp Removed main.h dependency from rpcserver.cpp 2015-01-28 07:41:54 +01:00
rpcmining.cpp Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-09 10:26:35 -05:00
rpcmisc.cpp Removed main.h dependency from rpcserver.cpp 2015-01-28 07:41:54 +01:00
rpcncctrie.cpp rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
rpcnet.cpp Removed main.h dependency from rpcserver.cpp 2015-01-28 07:41:54 +01:00
rpcprotocol.cpp namespace: drop most boost namespaces and a few header cleanups 2015-01-02 15:12:03 -05:00
rpcprotocol.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
rpcrawtransaction.cpp Merge pull request #5711 2015-02-04 10:23:09 +01:00
rpcserver.cpp Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-02-09 10:26:35 -05:00
rpcserver.h rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
rpcwallet.cpp merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
serialize.h Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
streams.h Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
sync.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
sync.h Removed main.h dependency from rpcserver.cpp 2015-01-28 07:41:54 +01:00
threadsafety.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
timedata.cpp Merge pull request #5476 2015-01-02 17:54:21 +01:00
timedata.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
tinyformat.h Move *Version() functions to version.h/cpp 2014-08-26 13:25:21 +02:00
txdb.cpp rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header 2015-02-07 12:32:05 -05:00
txdb.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
txmempool.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
txmempool.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
ui_interface.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
uint256.cpp uint256->arith_uint256 blob256->uint256 2015-01-05 15:45:35 +01:00
uint256.h uint256->arith_uint256 blob256->uint256 2015-01-05 15:45:35 +01:00
undo.h MOVEONLY: CBlockUndo from main.h to undo.h 2014-12-27 16:01:31 +01:00
util.cpp Merge branch 'master' of https://github.com/bitcoin/bitcoin 2015-01-05 12:17:58 -05:00
util.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utilmoneystr.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utilmoneystr.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utilstrencodings.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utilstrencodings.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utiltime.cpp Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
utiltime.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
version.h Added "Core" to copyright headers 2014-12-19 19:55:32 +01:00
wallet.cpp merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
wallet.h merge in changes from bitcoin 2015-02-05 16:02:05 -05:00
wallet_ismine.cpp Enable spending NCC transactions (both updating and abandoning their claims), and enable printing them out with their info 2015-01-14 19:17:19 -05:00
wallet_ismine.h Enable spending NCC transactions (both updating and abandoning their claims), and enable printing them out with their info 2015-01-14 19:17:19 -05:00
walletdb.cpp Remove whitespaces before double colon in errors and logs 2015-01-31 17:38:28 -05:00
walletdb.h Merge pull request #4805 2015-01-26 12:19:12 +01:00