zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,333 Commits 9 Branches 176 Tags 87 MiB
Commit Graph

11333 Commits

Author SHA1 Message Date
Wladimir J. van der Laan b41ac928b8
Merge #8521: qa: Remove duplicate `hash160` implementation 
c1582d5 qa: Remove duplicate `hash160` implementation (Wladimir J. van der Laan)
 2016-08-17 12:00:47 +02:00
Wladimir J. van der Laan b40e19c6c4
Merge #8520: build: Remove check for `openssl/ec.h` 
936c144 build: Remove check for `openssl/ec.h` (Wladimir J. van der Laan)
 2016-08-17 11:59:36 +02:00
Wladimir J. van der Laan c1582d5d85 qa: Remove duplicate `hash160` implementation 
`hash160` is defined in `test_framework.script`, so there is no need
to define it here again.
 2016-08-16 12:04:49 +02:00
Wladimir J. van der Laan 2c2d471e18
Merge #8516: [trivial] remove no-longer-used InitError logic 
edb6cf1 remove no-longer-used InitError logic (instagibbs)
 2016-08-16 11:25:31 +02:00
Wladimir J. van der Laan 936c1448ed build: Remove check for `openssl/ec.h` 
We don't use any elliptic curves from OpenSSL anymore, nor include this
header anywhere but optionally in the tests of secp256k1 (which has
its own autoconf setup).

Reported by sinetek on IRC.
 2016-08-16 11:19:55 +02:00
Wladimir J. van der Laan bbd9740f53
Merge #8058: [Doc] Add issue template 
3897668 Adds issue template. [skip ci] (CryptoVote)
 2016-08-16 08:05:39 +02:00
instagibbs edb6cf1432 remove no-longer-used InitError logic 2016-08-15 10:28:53 -04:00
MarcoFalke 6e5e5abba6
Merge #8270: Tests: Use portable #! in python scripts (/usr/bin/env) 
7b01ce2 Favour python over python2 as per PR #7723 (Matthew King)
873e81f Use portable #! in python scripts (/usr/bin/env) (Matthew King)
 2016-08-15 15:45:20 +02:00
Jonas Schnelli c503863150
Merge #8192: [trivial] Remove URLs from About dialog translations 
208d37f [trivial] Remove URLs from About dialog translations (fanquake)
 2016-08-15 15:36:42 +02:00
Wladimir J. van der Laan 1030fa718c
Merge #8128: Net: Turn net structures into dumb storage classes 
9e9d644 net: fixup nits (Cory Fields)
8945384 net: Have LookupNumeric return a CService directly (Cory Fields)
21ba407 net: narrow include scope after moving to netaddress (Cory Fields)
21e5b96 net: move CNetAddr/CService/CSubNet out of netbase (Cory Fields)
1017b8a net: Add direct tests for new CSubNet constructors (Cory Fields)
b6c3ff3 net: Split resolving out of CSubNet (Cory Fields)
f96c7c4 net: Split resolving out of CService (Cory Fields)
31d6b1d net: Split resolving out of CNetAddr (Cory Fields)
 2016-08-15 13:35:27 +02:00
Pieter Wuille d727f77e39
Merge #7946: Reduce cs_main locks during ConnectTip/SyncWithWallets 
b3b3c2a Reduce cs_main locks during ConnectTip/SyncWithWallets (Jonas Schnelli)
 2016-08-15 11:56:37 +02:00
Wladimir J. van der Laan 3859072963
Merge #8353: Trivial: tiny c++11 refactors 
c784086 use std::map::emplace() instead of std::map::insert() (whythat)
5e187e7 use c++11 std::unique_ptr instead of boost::shared_ptr (whythat)
947913f use std::map::erase(const_iterator, const_iterator) to get non-constant iterator (whythat)
 2016-08-13 15:55:09 +02:00
Wladimir J. van der Laan efce84d888
Merge #8293: Bugfix: Allow building libbitcoinconsensus without any univalue 
8a270b2 Bugfix: Allow building libbitcoinconsensus without any univalue (Luke Dashjr)
 2016-08-13 15:28:30 +02:00
Wladimir J. van der Laan fe1780ed3e
Merge #8492: configure: Allow building bench_bitcoin by itself 
216d796 configure: Allow building bench_bitcoin by itself (Luke Dashjr)
 2016-08-13 15:13:02 +02:00
Wladimir J. van der Laan 94368d6434
Merge #8503: [doc] typos, text errors 
e11f9a2 [doc] typos, READMEs, comments (Justin Camarena)
 2016-08-13 15:09:56 +02:00
Justin Camarena e11f9a2f02 [doc] typos, READMEs, comments 
Just a quick run through some docs and fixing some text errors.
 2016-08-12 15:30:11 -07:00
Cory Fields 9e9d644f51 net: fixup nits 2016-08-12 14:22:49 -04:00
Jonas Schnelli b3b3c2a562
Reduce cs_main locks during ConnectTip/SyncWithWallets 2016-08-12 14:53:10 +02:00
Wladimir J. van der Laan 0d0abcac1e
Merge #8481: Qt: Fix minimize and close bugs 
05242e9 Fix minimize and close bugs (adlawren)
 2016-08-11 15:23:05 +02:00
CryptoVote 3897668f5e Adds issue template. [skip ci] 2016-08-10 12:25:52 -05:00
Wladimir J. van der Laan edebf425a2
Merge #8489: Bugfix: Use pre-BIP141 sigops until segwit activates (GBT) 
239cbd2 qa/rpc-tests/segwit: Test GBT sigops before and after activation (Luke Dashjr)
160f895 Bugfix: Use pre-BIP141 sigops until segwit activates (Luke Dashjr)
 2016-08-10 09:21:34 +02:00
Pieter Wuille 484312bda2
Merge #8467: [Trivial] Do not shadow members in dbwrapper 
4a35e0f Do not shadow members in dbwrapper (Pavel Janík)
 2016-08-10 07:49:15 +02:00
Luke Dashjr 8a270b25fc Bugfix: Allow building libbitcoinconsensus without any univalue 2016-08-09 05:30:59 +00:00
Luke Dashjr 216d796ce0 configure: Allow building bench_bitcoin by itself 2016-08-09 05:10:16 +00:00
whythat c784086075 use std::map::emplace() instead of std::map::insert() 2016-08-09 03:11:45 +03:00
whythat 5e187e7001 use c++11 std::unique_ptr instead of boost::shared_ptr 2016-08-09 03:11:45 +03:00
whythat 947913fc54 use std::map::erase(const_iterator, const_iterator) to get non-constant iterator 2016-08-09 03:11:28 +03:00
Luke Dashjr 239cbd2e5c qa/rpc-tests/segwit: Test GBT sigops before and after activation 2016-08-08 21:58:36 +00:00
Luke Dashjr 160f895a80 Bugfix: Use pre-BIP141 sigops until segwit activates 2016-08-08 21:56:32 +00:00
adlawren 05242e937d Fix minimize and close bugs 
refs #8225

To ensure the GUI closes when the "Minimize on close" window option is disabled, and the "Minimize to the tray instead of the taskbar" window option is enbaled, remove a check made against the "Minimize to the tray instead of the taskbar" value, made during GUI closure.

To ensure the GUI minimizes to the taskbar when the "Minimize on close" window option is enabled, and the "Minimize to the tray instead of the taskbar" window option is disabled, minimize the GUI and ignore the closure event.
 2016-08-06 23:58:30 -07:00
Pavel Janík 4a35e0f34c Do not shadow members in dbwrapper 2016-08-05 21:17:50 +02:00
Cory Fields 8945384bca net: Have LookupNumeric return a CService directly 
Also fix up a few small issues:
- Lookup with "badip:port" now sets the port to 0
- Don't allow assert to have side-effects
 2016-08-04 16:41:39 -04:00
Wladimir J. van der Laan 6e6ab2c323
Merge #8444: Fix p2p-feefilter.py for changed tx relay behavior 
2c517b3 Fix p2p-feefilter.py for changed tx relay behavior (Suhas Daftuar)
 2016-08-04 13:31:06 +02:00
Wladimir J. van der Laan f97d335942
Merge #8392: Fix several node initialization issues 
9d4eb9a Do diskspace check before import thread is started (Pieter Wuille)
aa59f2e Add extra message to avoid a long 'Loading banlist' (Pieter Wuille)
0fd2a33 Use a signal to continue init after genesis activation (Pieter Wuille)
 2016-08-04 12:33:21 +02:00
Wladimir J. van der Laan 37d83bb0a9
Merge #8391: Consensus: Remove ISM 
122786d Consensus: Remove ISM (NicolasDorier)
 2016-08-04 12:20:35 +02:00
Wladimir J. van der Laan 5c7a5e1f66
Merge #8439: [doc] Increase recommended memory in gitian build guide 
7fdbce9 [doc] Increase recommended memory in gitian build guide (fanquake)
 2016-08-03 12:50:19 +02:00
Wladimir J. van der Laan 194110fb91
Merge #8189: rename mapAddrCount to mapNetGroupNodes 
657fc19 rename mapAddrCount to mapNetGroupNodes (instagibbs)
 2016-08-03 11:50:45 +02:00
Wladimir J. van der Laan ced2d5ef7c
Merge #8446: [Trivial] BIP9 parameters on regtest cleanup 
0fc00be Do not shadow previous local variable (Pavel Janík)
115265b Trivial: bip -> BIP in help text and comment (Pavel Janík)
 2016-08-03 11:05:29 +02:00
Wladimir J. van der Laan fc93486d2a
Merge #8428: Update README.md inside of src/test/ 
b8db185 Update README.md (Chris Stewart)
 2016-08-03 11:00:30 +02:00
Wladimir J. van der Laan 2eed09fe1e
Merge #8442: [qa] Rework hd wallet dump test 
fa4439d [qa] Rework hd wallet dump test (MarcoFalke)
 2016-08-03 10:58:59 +02:00
Pavel Janík 0fc00bea5d Do not shadow previous local variable 2016-08-02 10:26:54 +02:00
Pavel Janík 115265bb10 Trivial: bip -> BIP in help text and comment 2016-08-02 10:26:05 +02:00
Wladimir J. van der Laan 63c03dd41c
Merge #8418: Add tests for compact blocks 
45c7ddd Add p2p test for BIP 152 (compact blocks) (Suhas Daftuar)
9a22a6c Add support for compactblocks to mininode (Suhas Daftuar)
a8689fd Tests: refactor compact size serialization in mininode (Suhas Daftuar)
9c8593d Implement SipHash in Python (Pieter Wuille)
56c87e9 Allow changing BIP9 parameters on regtest (Suhas Daftuar)
 2016-08-02 08:26:57 +02:00
Suhas Daftuar 2c517b3928 Fix p2p-feefilter.py for changed tx relay behavior 2016-08-01 12:40:38 -04:00
MarcoFalke fa4439d355 [qa] Rework hd wallet dump test 2016-08-01 12:33:20 +02:00
Wladimir J. van der Laan ea268747b6
Merge #8419: Enable size accounting in mining unit tests 
8bfd708 Enable size accounting in mining unit tests (Suhas Daftuar)
 2016-08-01 10:42:31 +02:00
fanquake 7fdbce9de4
[doc] Increase recommended memory in gitian build guide 2016-08-01 09:30:32 +08:00
Pieter Wuille c7e05b35ab
Merge #8432: Make CWallet::fFileBacked private. 
29c2d99 Make CWallet::fFileBacked private. (Patrick Strateman)
 2016-08-01 02:12:47 +02:00
Pieter Wuille b9c1cd8184
Merge #8152: [Wallet] Remove CWalletDB* parameter from CWallet::AddToWallet 
5723bb4 Remove unused pwalletdb from CWallet::AddToWallet (Patrick Strateman)
867f842 Remove CWalletDB* parameter from CWallet::AddToWallet (Patrick Strateman)
00f09c9 Split CWallet::AddToWallet into AddToWallet and LoadToWallet. (Patrick Strateman)
 2016-08-01 02:06:42 +02:00
Pieter Wuille 8ea7d31e38
Merge #8413: Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock 
c8664ee Trivial: pass Consensus::Params& instead of CChainParams& in ContextualCheckBlock (Jorge Timón)
 2016-08-01 01:53:29 +02:00