LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity
10606 commits 22 branches 42 tags 99 MiB
Commit graph

10606 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jimmy Kiselak
e08d765f11 Merge branch 'master' of https://github.com/bitcoin/bitcoin into realusmerge 
Conflicts:
	Makefile.am
	README.md
	configure.ac
	contrib/seeds/nodes_main.txt
	qa/rpc-tests/decodescript.py
	qa/rpc-tests/test_framework/util.py
	src/Makefile.am
	src/Makefile.qt.include
	src/Makefile.qttest.include
	src/Makefile.test.include
	src/bitcoin-cli-res.rc
	src/bitcoin-cli.cpp
	src/bitcoin-tx.cpp
	src/bitcoind.cpp
	src/chainparams.cpp
	src/chainparamsseeds.h
	src/init.cpp
	src/main.cpp
	src/main.h
	src/miner.cpp
	src/net.cpp
	src/primitives/block.cpp
	src/rpc/mining.cpp
	src/rpc/rawtransaction.cpp
	src/rpc/server.cpp
	src/rpcserver.h
	src/script/interpreter.cpp
	src/script/script.cpp
	src/script/script.h
	src/test/alert_tests.cpp
	src/test/data/alertTests.raw
	src/test/data/script_invalid.json
	src/test/data/script_valid.json
	src/test/data/tx_invalid.json
	src/test/data/tx_valid.json
	src/test/miner_tests.cpp
	src/test/script_tests.cpp
	src/test/test_bitcoin.cpp
	src/test/test_bitcoin.h
	src/test/transaction_tests.cpp
	src/timedata.cpp
	src/util.cpp
	src/wallet/rpcwallet.cpp
	src/wallet/wallet.cpp
	src/wallet/wallet.h
 2016-05-15 22:16:56 -04:00
Wladimir J. van der Laan
d289950180
Merge #7900: fix spelling mistake 
3107c47 fix spelling mistake (Chris Moore)
 2016-04-18 14:15:12 +02:00
Wladimir J. van der Laan
9eb7565cdd
Merge #7897: add missing newline 
dc0693f add missing newline (Chris Moore)
 2016-04-18 14:14:30 +02:00
Wladimir J. van der Laan
88616d2008
Merge #7848: Divergence between 32- and 64-bit when hashing >4GB affects gettxoutsetinfo 
28b400f doc: update release-notes for `gettxoutsetinfo` change (Wladimir J. van der Laan)
76212bb rpc: make sure `gettxoutsetinfo` hash has txids (Wladimir J. van der Laan)
9ad1a51 crypto: bytes counts are 64 bit (Wladimir J. van der Laan)
 2016-04-18 12:48:09 +02:00
Wladimir J. van der Laan
b1bf511af6
Merge #7833: tests: Check Content-Type header returned from RPC server 
5078ca4 tests: Check Content-Type header returned from RPC server (Wladimir J. van der Laan)
 2016-04-18 12:45:04 +02:00
Wladimir J. van der Laan
ec870e1399
Merge #7888: prevector: fix 2 bugs in currently unreached code paths 
a7af72a prevector::swap: fix (unreached) data corruption (Kaz Wesley)
4ed41a2 test prevector::swap (Kaz Wesley)
1e2c29f prevector: destroy elements only via erase() (Kaz Wesley)
 2016-04-18 12:42:14 +02:00
Chris Moore
3107c475a7 fix spelling mistake 2016-04-17 00:01:49 -07:00
Jimmy Kiselak
a78dfae04f get tests passing for new block rewards, change initial reward to 400M 2016-04-16 18:42:11 -04:00
Chris Moore
dc0693f637 add missing newline 
Without the newline I see "bein" where the two lines are concatenated:

Note that all inputs selected must be of standard form and P2SH scripts must *bein* the wallet using importaddress or addmultisigaddress (to calculate fees).
 2016-04-16 13:42:28 -07:00
Jeremy Kauffman
76b40a0ab4 ramp up block rewards during test window 2016-04-16 14:59:29 -04:00
Jimmy Kiselak
3b5a316c64 include claimtriehash in rpc call for block header 2016-04-16 14:50:22 -04:00
Kaz Wesley
a7af72a697 prevector::swap: fix (unreached) data corruption 
swap was using an incorrect condition to determine when to apply an optimization
(not swapping the full direct[] when swapping two indirect prevectors).

Rather than correct the optimization I'm removing it for simplicity. Removing
this optimization minutely improves performance in the typical (currently only)
usage of member swap(), which is swapping with a freshly value-initialized
object.
 2016-04-16 08:05:11 -07:00
Kaz Wesley
4ed41a2b61 test prevector::swap 
- add a swap operation to prevector tests (fails due to broken prevector::swap)
- fix 2 prevector test operation conditions that were impossible
 2016-04-16 08:05:11 -07:00
Kaz Wesley
1e2c29f263 prevector: destroy elements only via erase() 
Fixes a bug in which pop_back did not call the deleted item's destructor.

Using the most general erase() implementation to implement all the others
prevents similar bugs because the coupling between deallocation and destructor
invocation only needs to be maintained in one place.
Also reduces duplication of complex memmove logic.
 2016-04-16 08:05:11 -07:00
Jimmy Kiselak
f2ebd4bcd4 fix address prefix tests and change difficulty readjustment interval 2016-04-16 02:16:32 -04:00
Wladimir J. van der Laan
28b400f7d1 doc: update release-notes for gettxoutsetinfo change 2016-04-15 18:03:10 +02:00
Wladimir J. van der Laan
76212bbc6a rpc: make sure gettxoutsetinfo hash has txids 
The key (transaction id for the following outputs) should be serialized
to the HashWriter.

This is a problem as it means different transactions in the same
position with the same outputs will potentially result in the same hash.

Fixes primary concern of #7758.
 2016-04-15 18:03:05 +02:00
Wladimir J. van der Laan
9ad1a51857 crypto: bytes counts are 64 bit 
Byte counts for SHA256, SHA512, SHA1 and RIPEMD160 must be 64 bits.
`size_t` has a different size per platform, causing divergent results
when hashing more than 4GB of data.
 2016-04-15 16:44:23 +02:00
Wladimir J. van der Laan
73fc922ed6
Merge #7603: Build System: Use PACKAGE_TARNAME in NSIS script 
0528e30 Remove wxwidgets references from NSIS script. (JeremyRand)
26880c3 build: Use PACKAGE_TARNAME and new bin names in NSIS script. (JeremyRand)
0dbf6e4 build: define base filenames for use elsewhere in the buildsystem (Cory Fields)
 2016-04-15 16:43:44 +02:00
Wladimir J. van der Laan
9e47fcec17
Merge #7756: Add cursor to iterate over utxo set, use this in gettxoutsetinfo 
509cb00 txdb: Add Cursor() method to CCoinsView to iterate over UTXO set (Wladimir J. van der Laan)
 2016-04-15 16:43:21 +02:00
Wladimir J. van der Laan
509cb006d5 txdb: Add Cursor() method to CCoinsView to iterate over UTXO set 
Add a method Cursor() to CCoinsView that returns a cursor which can be
used to iterate over the whole UTXO set.

- rpc: Change gettxoutsetinfo to use new Cursor method

- txdb: Remove GetStats method - Now that GetStats is implemented in
  terms of Cursor, remove it.
 2016-04-15 16:33:05 +02:00
Wladimir J. van der Laan
be14ca5e8c
Merge #7518: Add multiple options to fundrawtransaction 
f2d0944 Add lockUnspents option to fundrawtransaction (João Barbosa)
af4fe7f Add change options to fundrawtransaction (João Barbosa)
41e835d Add strict flag to RPCTypeCheckObj (João Barbosa)
 2016-04-15 16:24:02 +02:00
João Barbosa
f2d0944eb3 Add lockUnspents option to fundrawtransaction 2016-04-15 15:36:05 +02:00
João Barbosa
af4fe7fd12 Add change options to fundrawtransaction 2016-04-15 15:36:05 +02:00
João Barbosa
41e835dd50 Add strict flag to RPCTypeCheckObj 
Strict flag forces type check on all object keys.
 2016-04-15 14:55:52 +02:00
Wladimir J. van der Laan
a4ca44d276
Merge #7870: [contrib] Add MarcoFalke key and move all keys to contrib/gitian-keys 
faf4c83 [gitian] Move keys to contrib/gitian-keys (MarcoFalke)
fa93936 [gitian] Add marcofalke-key.pgp (MarcoFalke)
 2016-04-15 13:16:33 +02:00
MarcoFalke
faf4c837fb [gitian] Move keys to contrib/gitian-keys 2016-04-15 11:58:46 +02:00
MarcoFalke
fa93936691 [gitian] Add marcofalke-key.pgp 2016-04-15 11:58:25 +02:00
Wladimir J. van der Laan
64e71b3721
Merge #7856: Only send one GetAddr response per connection. 
66b0724 Only send one GetAddr response per connection. (Gregory Maxwell)
 2016-04-15 09:03:17 +02:00
Wladimir J. van der Laan
efc059322c
Merge #7877: Change mapRelay to store CTransactions 
38c3102 Change mapRelay to store CTransactions (Pieter Wuille)
 2016-04-15 08:59:40 +02:00
Wladimir J. van der Laan
bbd210d927
Merge #7809: depends: some base fixes/changes 
11d9f6b depends: qt/cctools: fix checksum checksum tests (Cory Fields)
bb717f4 depends: fix "unexpected operator" error during "make download" (Cory Fields)
fe740f1 depends: fix fallback downloads (Cory Fields)
dc4ec6d depends: create a hostid and buildid and add option for salts (Cory Fields)
 2016-04-15 08:58:30 +02:00
Wladimir J. van der Laan
cabba24a5b
Merge #7798: [travis] Print the commit which was evaluated 
fac9ca2 [travis] echo $TRAVIS_COMMIT_RANGE (MarcoFalke)
faef3b7 [travis] Print the commit which was evaluated (MarcoFalke)
 2016-04-15 08:42:26 +02:00
Wladimir J. van der Laan
48c5adfbce
Merge #6215: add bip32 pub key serialization 
90604f1 add bip32 pubkey serialization (Jonas Schnelli)
 2016-04-15 07:59:38 +02:00
Wladimir J. van der Laan
53adc8310d
Merge #7878: [test] bctest.py: Revert faa41ee 
fa7abe0 [test] bctest.py: Revert faa41ee (MarcoFalke)
 2016-04-15 07:56:07 +02:00
Jimmy Kiselak
0c6e9d1eca change address prefixes 2016-04-14 22:02:44 -04:00
Jonas Schnelli
90604f16af
add bip32 pubkey serialization 
CExtPubKey should be serializable like CPubKey
 2016-04-14 20:56:33 +02:00
MarcoFalke
fa7abe0a00 [test] bctest.py: Revert faa41ee 2016-04-14 19:39:53 +02:00
Wladimir J. van der Laan
e6a4d48a9b
Merge #7874: Improve AlreadyHave 
c6cb6f7 Avoid unnecessary database access for unknown transactions (Alex Morcos)
 2016-04-14 17:54:42 +02:00
Wladimir J. van der Laan
6ef5e000a2
Merge #7853: [qa] py2: Unfiddle strings into bytes explicitly 
faa41ee [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
 2016-04-14 17:40:31 +02:00
Wladimir J. van der Laan
430fffefaa
Merge #7812: Tiny refactor of IsRBFOptIn, avoid exception 
4f7c959 Refactor IsRBFOptIn, avoid exception (Jonas Schnelli)
 2016-04-14 16:35:02 +02:00
Pieter Wuille
38c310299c Change mapRelay to store CTransactions 2016-04-14 16:24:56 +02:00
Wladimir J. van der Laan
d97101e5a8
Merge #7842: RPC: do not print minping time in getpeerinfo when no ping received yet 
62a6486 RPC: do not print ping info in getpeerinfo when no ping received yet, fix help (Pavel Janík)
 2016-04-14 16:09:53 +02:00
Wladimir J. van der Laan
491171f929
Merge #7846: Clean up lockorder data of destroyed mutexes 
5eeb913 Clean up lockorder data of destroyed mutexes (Pieter Wuille)
 2016-04-14 15:47:08 +02:00
Wladimir J. van der Laan
97d0b9889f
Merge #7862: Use txid as key in mapAlreadyAskedFor 
7e91f63 Use txid as key in mapAlreadyAskedFor (Suhas Daftuar)
 2016-04-14 14:55:01 +02:00
Wladimir J. van der Laan
ab8586e667
Merge #7849: tests: add varints_bitpatterns test 
4521f00 tests: add varints_bitpatterns test (Wladimir J. van der Laan)
 2016-04-14 14:46:13 +02:00
Wladimir J. van der Laan
229a17ca91
Merge #7850: Removed call to TryCreateDirectory from GetDefaultDataDir in src/util.cpp. 
41dbc48 Removed call to `TryCreateDirectory` from `GetDefaultDataDir` in `src/util.cpp`. (Alexander Regueiro)
 2016-04-14 13:38:49 +02:00
Wladimir J. van der Laan
3911a0a1b7
Merge #7818: Refactor script tests 
dde46d3 Merge script_valid and script_invalid tests (Pieter Wuille)
009b503 Get rid of expect in script_tests as it's implied by scripterror (Pieter Wuille)
76da761 Make script_error a mandatory 4th field for script_tests (Pieter Wuille)
269281b Fix some misconstructed tests (Pieter Wuille)
d03e466 Fix formatting of NOPs for generated script tests (Pieter Wuille)
c7c6641 Fix JSON pretty printing in script_tests (Pieter Wuille)
 2016-04-14 13:27:41 +02:00
Wladimir J. van der Laan
3eae681493
Merge #7847: doc: add arch linux build example 
fe53a2a doc: add arch linux setup and build example [skip ci] (mruddy)
 2016-04-14 12:16:00 +02:00
Wladimir J. van der Laan
72c54e3883
Merge #7863: getblockchaininfo: make bip9_softforks an object, not an array. 
d12760b rpc-tests: handle KeyError nicely in test_framework.py (Rusty Russell)
85c807c getblockchaininfo: make bip9_softforks an object, not an array. (Rusty Russell)
 2016-04-14 12:14:42 +02:00
Wladimir J. van der Laan
b778e5993a
Merge #7855: [doc] gitian: Replace precise with trusty 
fa6399d [doc] gitian: Replace precise with trusty (MarcoFalke)
 2016-04-14 12:09:58 +02:00