Commit graph

9306 commits

Author SHA1 Message Date
Jimmy Kiselak
f976d965c7 merge upstream changes, set up testnet and regtestnet 2015-10-21 22:30:56 -04:00
Wladimir J. van der Laan
c6de5cc886
Merge pull request #6796
c7b36cc Change URLs to https in debian/control (Matt Corallo)
e253e83 Update debian/changelog and slight tweak to debian/control (Matt Corallo)
2015-10-20 17:09:22 +02:00
Wladimir J. van der Laan
e26a3f6713
Merge pull request #6235
55a8975 Chainparams: Translations: DRY: options and error strings (Jorge Timón)
f3525e2 Chainparams: Replace CBaseChainParams::Network enum with string constants (suggested by Wladimir) (Jorge Timón)
2015-10-20 17:06:28 +02:00
Jorge Timón
55a89751fa Chainparams: Translations: DRY: options and error strings
Also remove SelectBaseParamsFromCommandLine and SelectParamsFromCommandLine
2015-10-20 14:28:43 +02:00
Jorge Timón
f3525e24e3 Chainparams: Replace CBaseChainParams::Network enum with string constants (suggested by Wladimir) 2015-10-20 14:22:44 +02:00
Wladimir J. van der Laan
020c4073a0
Merge pull request #6841
b6d5e32 Make fee aware of min relay in pruning.py RPC test (Alex Morcos)
2015-10-20 12:53:45 +02:00
Wladimir J. van der Laan
ae69a75c55
Merge pull request #6801
e76d9e4 [depends] Latest config.guess and config.sub (fanquake)
2015-10-20 12:35:54 +02:00
Wladimir J. van der Laan
87e5539e9c
Merge pull request #6827
bd4c22e [rpc-tests] Check return code (MarcoFalke)
0d8b175 [rpc-tests] fundrawtransaction: Update fee after minRelayTxFee increase (MarcoFalke)
2015-10-20 12:21:25 +02:00
Wladimir J. van der Laan
c834f56869
Merge pull request #6853
7801f43 Added fPowNoRetargeting field to Consensus::Params that disables nBits recalculation. (Eric Lombrozo)
2015-10-20 12:07:44 +02:00
Wladimir J. van der Laan
488f8517a1
Merge pull request #6829
53b86d0 doc: add comment explaining initial header request (Daniel Kraft)
2015-10-20 12:06:44 +02:00
MarcoFalke
bd4c22ed56 [rpc-tests] Check return code 2015-10-20 10:28:42 +02:00
MarcoFalke
0d8b1759d2 [rpc-tests] fundrawtransaction: Update fee after minRelayTxFee increase 2015-10-20 10:25:45 +02:00
Eric Lombrozo
7801f4387d Added fPowNoRetargeting field to Consensus::Params that disables nBits recalculation. 2015-10-19 14:25:21 -04:00
Wladimir J. van der Laan
da7d57fb95
Merge pull request #6852
bfcdc21 build: make sure OpenSSL heeds noexecstack (Wladimir J. van der Laan)
2015-10-19 15:02:57 +02:00
Wladimir J. van der Laan
5f5ee0f3ce
Merge pull request #6837
0658d0b temporarily comment out rpcbind.py (Alex Morcos)
2015-10-19 12:15:26 +02:00
Wladimir J. van der Laan
bfcdc21a5d build: make sure OpenSSL heeds noexecstack
This passes `-Wa,--noexecstack` to the assembler when building
platform-specific assembly files, to signal that a non-executable stack
can be used. This is the same approach as used by Debian
(see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430583)
2015-10-19 12:03:29 +02:00
Wladimir J. van der Laan
fc41278e96
Merge pull request #6843
99963b9 Correct spelling mistakes in doc folder (Mitchell Cash)
2015-10-19 12:01:07 +02:00
Wladimir J. van der Laan
5888046323
Merge pull request #6849
d2e3fbc Mention PHP bindings to libbitcoinconsensus (Thomas Kerin)
2015-10-19 11:29:25 +02:00
Thomas Kerin
d2e3fbc620
Mention PHP bindings to libbitcoinconsensus 2015-10-18 19:04:14 +01:00
Mitchell Cash
99963b938f Correct spelling mistakes in doc folder
- OSX —> OS X
- XCode —> Xcode
- github —> GitHub
- homebrew —> Homebrew
- gitian —> Gitian
- Other miscellaneous obvious spelling fixes and whitespace removal
2015-10-18 06:25:43 +10:00
Alex Morcos
b6d5e32e0e Make fee aware of min relay in pruning.py RPC test 2015-10-17 15:52:40 -04:00
Alex Morcos
0658d0ba82 temporarily comment out rpcbind.py
until libevent is fixed.  also remove duplicate commented-out forknotify.py.
2015-10-16 10:27:03 -04:00
Wladimir J. van der Laan
d78a880900
Merge pull request #6820
60af755 build: univalue subdir build fixups (Cory Fields)
2015-10-15 12:55:25 +02:00
Wladimir J. van der Laan
8ce9920635
Merge pull request #6817
a0d5e0d [doc] Cleanup release-process documentation (Michael)
2015-10-15 12:54:13 +02:00
Wladimir J. van der Laan
fa6b405f05
Merge pull request #6823
f8f2ace trivial: use constants for db keys (Daniel Kraft)
2015-10-15 12:52:34 +02:00
Wladimir J. van der Laan
34f200d140
Merge pull request #6830
d57586f Add historical release notes for October 2015 bugfix releases (Micha)
2015-10-15 12:46:01 +02:00
Micha
d57586f91c
Add historical release notes for October 2015 bugfix releases
[skip ci]
2015-10-14 23:14:13 +03:00
Daniel Kraft
53b86d0de5 doc: add comment explaining initial header request
Add a comment that explains why the initial "getheader" requests are
made starting from the block preceding the currently best one.

Thanks to sdaftuar for the explanation!
2015-10-14 20:42:49 +02:00
Michael
a0d5e0d2f4 [doc] Cleanup release-process documentation 2015-10-14 07:54:29 +08:00
Daniel Kraft
f8f2aceadd trivial: use constants for db keys
Replace literal occurances of the key "prefixes" 'c' and 'b' in txdb.cpp
by the respective constants.
2015-10-13 20:25:57 +02:00
Cory Fields
60af755e56 build: univalue subdir build fixups
- Force a rebuild if the headers change
- Only build the lib target
- Clean univalue on 'make clean'
2015-10-13 13:40:49 -04:00
Wladimir J. van der Laan
a1d623da3e
Merge pull request #6810
7d325b9 zmq: point API link to 4.0 as that is what we are conforming to [Trivial] (Johnathan Corgan)
2015-10-13 12:31:50 +02:00
Wladimir J. van der Laan
9caaf6ed22
Merge pull request #6777
dcd8e27 Refer to obfuscate_key via pointer in peripheral CLevelDB classes (James O'Beirne)
1488506 Add tests for gettxoutsetinfo, CLevelDBBatch, CLevelDBIterator (James O'Beirne)
0fdf8c8 Handle obfuscation in CLevelDBIterator (James O'Beirne)
3499ce1 Encapsulate CLevelDB iterators cleanly (Pieter Wuille)
2015-10-13 12:23:45 +02:00
Wladimir J. van der Laan
16faccb736
Merge pull request #6791
d0321a4 [doc] trivial: fix markdown syntax in qa/rpc-tests/README.md (MarcoFalke)
60a8b70 [doc] trivial: developer-notes.md covers more than just coding standards (MarcoFalke)
3507992 [trivial] Make optimize-pngs.py also cover share/pixmaps (MarcoFalke)
8a320c7 [trivial] Remove obsolete share/qt/make_windows_icon.sh (MarcoFalke)
2015-10-13 11:50:26 +02:00
Wladimir J. van der Laan
01f74999e3
Merge pull request #6798
700f52e Clarification of unit test build instructions. (Eric Lombrozo)
2015-10-13 11:35:24 +02:00
Wladimir J. van der Laan
feea3057df
Merge pull request #6812
3a4a458 Update bluematt-key, the old one is long-since revoked (Matt Corallo)
2015-10-13 10:57:03 +02:00
Wladimir J. van der Laan
97bee37d4c
Merge pull request #6788
3b1279f build: match upstream build change (Cory Fields)
313e7f5 Squashed 'src/univalue/' changes from 87d9045..5839ac3 (MarcoFalke)
2015-10-13 10:54:31 +02:00
Wladimir J. van der Laan
cd57f344a5
Merge pull request #6807
3b363df Updated Prab's PGP Key -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 (Paul Rabahy)
2015-10-13 10:04:51 +02:00
Wladimir J. van der Laan
1fc5ca05ca
Merge pull request #6805
2c4ffbc Create btcdrak-key.pgp (BtcDrak)
2015-10-13 10:04:04 +02:00
Matt Corallo
3a4a458fe5 Update bluematt-key, the old one is long-since revoked 2015-10-12 14:25:51 -07:00
Johnathan Corgan
7d325b9de7
zmq: point API link to 4.0 as that is what we are conforming to [Trivial]
Signed-off-by: Johnathan Corgan <johnathan@corganlabs.com>
2015-10-12 13:40:13 -07:00
Paul Rabahy
3b363dfe88
Updated Prab's PGP Key
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

This message is to inform you that I, Paul Rabahy have rolled over GPG
keys.

My old key = EA695E0CE2D0DCB0D65167A8D1CBA2A21BCD88F6
My new key = D62A803E27E7F43486035ADBBCD04D8E9CCCAC2A

My new key now has an offline primary key with an online subkey that I
will be
using for normal communications.

I have signed this message with both the old and new key so it should show
up
as validly signed. Please add my new key to your keyring so that future
communication will be properly verified.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWB3/LAAoJENHLoqIbzYj2LBwQAMgH5u2KDuxK2gmpRjEpVXe8
XPOon+SRL5zXfu1dFInXCg8APJEVaXhSeY+/s0GmUq0INRpK4r0tvZVN84X2UoHz
y88P6BeHzQI7dsCStINhW4Hb7DVpFvkHAxsRhy05/geD56/IOXnsG+5SvsH3essJ
O6DuRQOipDWkZ9NQuQPrqzlkcBErMbL4Cs0ED5DOOYccntnt5HM909KDHfKcG8iJ
/qNTVzVFYMGbLn6MVq89reatmIOxuVBkbixsqad5M4P9rQ3iGPnUzIEp4wn7/Ssd
XDiCZypzlHkcs1GKBLtWnYWahlWHItcd/Yz3AiHLfUehcZb52p0mvIaTf4lyAR5p
kQFTXZwrrzJDaomSE2Y2IeMIATZE7/7RInkHD6okUTFSoCFgxOeAxLBI6sxLH5x5
xLIdv45iiv3P5fz1gungfzn2OYy+dHgT74bJ32N18hs+xwZM2G6AYYvVvkTSDqC0
c3AopnjEV4i+4Aq0QfDD9fXpBc0QuDN7c5GkcFCiFlhN+gffjT8hkFliiW3e2X5K
Vsycv1sYXFSS/YYZ7RCixWgTkpi18ABaLu/N1ses7hLNMxx9ovjrMIJ5gC6Nyga9
2BiumvNMh0iE9yhPiN0a4YsZZnW/tc5K1+OJxnKZvxWrXqOgIhnKZA1U1Y83COgA
6pI5uKrggGQWgQFJxTmciQEcBAEBCAAGBQJWB3/LAAoJEDJeXsBcJ6amLBwH/ib+
wiD3wDy+VeTDFvh4AgQqDRCk+CvGEKJlcoBLm3ZDwzi+/26XB/BCFoopW9h67ZmC
yMFhgvCJ3RwPcVGgZBOZ//88E2symcYRBSZJVwMN/n3McmEKBmmEH6/tTqhLeBal
2pynse7qgfZV7P/rSMcqFdhzMYq6Jt25obTl3IqTo939G1oOxRK8ORNT3Hs4/uiF
7xsx+nUBe/L6dvw2Rxr8bWm7WKi/LF7fKN/HZuBfK2qH0S4ctG49fiBw3DTV+erO
lYHdOMA9sjk90Le5sNBw75Hyr4WMLUkGFkh9SvDK1Xe3bUCfCpBTpcPnRUqnHL32
9GbqORFiaUGPRCnaWKQ=
=JR4m
-----END PGP SIGNATURE-----
2015-10-11 19:45:01 -04:00
BtcDrak
2c4ffbc76e
Create btcdrak-key.pgp 2015-10-11 13:17:41 +01:00
Wladimir J. van der Laan
4ca6ddec4d
Merge pull request #6793
4e2efb3 tests: update transaction_tests for new dust threshold (Wladimir J. van der Laan)
28e3249 Bump minrelaytxfee default (Wladimir J. van der Laan)
2015-10-11 10:33:12 +02:00
fanquake
e76d9e4c15 [depends] Latest config.guess and config.sub 2015-10-11 10:17:06 +08:00
Wladimir J. van der Laan
4e2efb3c5f tests: update transaction_tests for new dust threshold 2015-10-10 14:49:38 +02:00
Eric Lombrozo
700f52e0f6 Clarification of unit test build instructions. 2015-10-10 06:46:35 -04:00
Wladimir J. van der Laan
b94ae81576
Merge pull request #6795
21d27eb net: Disable upnp by default (Wladimir J. van der Laan)
2015-10-10 11:38:11 +02:00
Matt Corallo
c7b36ccf4a Change URLs to https in debian/control 2015-10-09 15:32:05 -07:00
Matt Corallo
e253e83c5c Update debian/changelog and slight tweak to debian/control 2015-10-09 13:43:16 -07:00