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
Jimmy Kiselak
df370a367f
switch to dedicated PoW hash function for CheckProofOfWork
2016-04-01 21:37:44 -04:00
Pieter Wuille
6851107b3a
BIP9 Implementation
...
Inspired by former implementations by Eric Lombrozo and Rusty Russell, and
based on code by Jorge Timon.
2016-03-15 16:54:38 +01:00
Wladimir J. van der Laan
47ac04e8b1
Merge #7311 : MOVEONLY: Move non-consensus functions out of pow
...
e867561
2016-02-02 14:16:16 +01:00
Jorge Timón
e86756193e
MOVEONLY: non-consensus: from pow to chain:
...
- GetBlockProof
- GetBlockProofEquivalentTime
2016-01-12 13:43:14 +01:00
MarcoFalke
fa24439ff3
Bump copyright headers to 2015
2015-12-13 18:08:39 +01:00
Jimmy Kiselak
eb25177f5e
do some rebranding and change default ports
2015-09-24 01:15:28 -04:00
Jimmy Kiselak
6bca5ead23
merge in changes from upstream
2015-05-20 10:26:14 -04:00
Luke Dashjr
b05a89b2de
Non-grammatical language improvements
2015-05-02 15:23:59 +00:00
Jimmy Kiselak
746ffd13c8
Merge branch 'master' of https://github.com/bitcoin/bitcoin
2015-02-23 17:52:07 -05:00
Jimmy Kiselak
79be562ff2
rpc commands for browsing ncc trie, fix bugs caused by adding ncc merkle to header
...
create an rpc command to print the whole ncc trie
create an rpc command to search get transaction info
for a particular name
change the number of bytes in the header expected by miner.cpp
make sure the ncc merkle hash is copied to all structures that
need it
2015-02-07 12:32:05 -05:00
Wladimir J. van der Laan
f5791c6ae3
Add more information to errors in ReadBlockFromDisk
...
A lot of times, disk corruption problems appear here.
To facilitate debugging and troubleshooting, add position information
to the error messages.
2015-02-05 14:21:25 +01:00
Wladimir J. van der Laan
734f85c4f0
Use arith_uint256 where necessary
...
Also add conversion from/to uint256 where needed.
2015-01-05 15:45:35 +01:00
Wladimir J. van der Laan
4f1524966a
Replace direct use of 0 with SetNull and IsNull
...
Replace x=0 with .SetNull(),
x==0 with IsNull(), x!=0 with !IsNull().
Replace uses of uint256(0) with uint256().
2015-01-05 15:45:34 +01:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
...
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Pavel Janík
bf7835c271
Fix small typos in comments and error messages
...
Rebased-From: 67b2d819cdf6181e7f016e5366ce7479830893bd
Github-Pull: #5404
2014-12-16 11:24:43 +01:00
Pieter Wuille
9dcd524f32
Make IsSuperMajority a standalone function
2014-12-11 17:39:09 +01:00
Wladimir J. van der Laan
dcc1304426
Merge pull request #5367
...
63d1ae5
2014-12-11 16:15:34 +01:00
Luke Dashjr
d227011184
MOVEONLY: core/ -> primitives/
2014-12-03 10:52:58 +00:00
Pieter Wuille
63d1ae5556
Do all block index writes in a batch
2014-11-25 16:26:35 +01:00
Wladimir J. van der Laan
f2ada138c2
Merge pull request #5170
...
092b58d22c4272
2014-11-21 14:33:22 +01:00
Pavel Janík
84738627ce
Fix all header defines
2014-11-03 16:16:40 +01:00
Wladimir J. van der Laan
f157cbb443
Merge pull request #5142
...
02fe12df2e03ff2fdc335
2014-10-30 10:28:42 +01:00
jtimon
092b58d13d
CBlockIndex::GetBlockWork() + GetProofIncrement(nBits) -> GetBlockProof(CBlockIndex)
2014-10-29 21:01:07 +01:00
jtimon
99f41b9cf7
MOVEONLY: core.o -> core/block.o
2014-10-27 13:54:37 +01:00
Michael Ford
2fdc3351d7
Update comments in chain to be doxygen compatible
2014-10-25 16:46:54 +08:00
Wladimir J. van der Laan
25cc1cf8dc
Merge pull request #4981
...
85c579edb8eb54e9ca428066e2a1
2014-10-22 12:16:50 +02:00
21E14
b7ae2c172a
Chain::SetTip return type to void
2014-10-20 17:56:19 -04:00
Cory Fields
85c579e3a6
script: add a slew of includes all around and drop includes from script.h
...
Lots of files ended up with indirect includes from script.h.
2014-10-17 13:44:57 -04:00
Pieter Wuille
341735eb8f
Headers-first synchronization
...
Many changes:
* Do not use 'getblocks', but 'getheaders', and use it to build a headers tree.
* Blocks are fetched in parallel from all available outbound peers, using a
limited moving window. When one peer stalls the movement of the window, it is
disconnected.
* No more orphan blocks. At all. We only ever request a block for which we have
verified the headers, and store it to disk immediately. This means that a
disk-fill attack would require PoW.
* Require protocol version 31800 for every peer (released in december 2010).
* No more syncnode (we sync from everyone we can, though limited to 1 during
initial *headers* sync).
* Introduce some extra named constants, comments and asserts.
2014-10-14 15:42:01 -07:00
Philip Kaufmann
7bec6dd230
cleanup license and header end comment in chain.cpp/.h
2014-09-29 08:22:03 +02:00
jtimon
e8b5f0d549
Move CBlockIndex, CChain and related code out of main
2014-09-08 22:17:19 +02:00
