12209 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Wladimir J. van der Laan	74ced54b7e	Merge #9204: Clarify CreateTransaction error messages ... 918b126 fix CreateTransaction error messages (instagibbs)	2016-11-23 08:42:06 +01:00
Wladimir J. van der Laan	5e8631b6cb	Merge #9205: Minor change to comment for consistency. ... f004e67 Minor change to comment above new NODE_WITNESS service flag to keep it consitent with existing comment structure. Helps with readability. (Greg Walker)	2016-11-23 08:41:12 +01:00
Wladimir J. van der Laan	7e2bfd6241	Merge #9196: Send tip change notification from invalidateblock ... 67c6326 Send tip change notification from invalidateblock (Russell Yanofsky)	2016-11-23 08:40:20 +01:00
Wladimir J. van der Laan	791b58d148	Merge #8690: Do not fully sort all nodes for addr relay ... a33b169 Do not fully sort all nodes for addr relay (Pieter Wuille)	2016-11-23 08:19:57 +01:00
Wladimir J. van der Laan	5ea5e0401c	Merge #9141: Remove unnecessary calls to CheckFinalTx ... 4512550 Remove unnecessary calls to CheckFinalTx (Jonas Schnelli)	2016-11-23 07:24:43 +01:00
Wladimir J. van der Laan	40022fe5f2	Merge #9142: Move -salvagewallet, -zap(wtx) to where they belong ... 2e44893 Move -salvagewallet, -zap(wtx) to where they belong (Jonas Schnelli)	2016-11-23 07:18:24 +01:00
Wladimir J. van der Laan	4d8558a287	Merge #9025: getrawtransaction should take a bool for verbose ... 240189b add testcases for getrawtransaction (John Newbery) ce2bb23 getrawtransaction should take a bool for verbose (jnewbery)	2016-11-23 07:13:46 +01:00
Greg Walker	f004e67df3	Minor change to comment above new NODE_WITNESS service flag to keep it consitent with existing comment structure. Helps with readability.	2016-11-22 18:59:20 +00:00
instagibbs	918b126901	fix CreateTransaction error messages	2016-11-22 13:40:57 -05:00
John Newbery	240189b2c1	add testcases for getrawtransaction	2016-11-22 14:37:59 +00:00
jnewbery	ce2bb23aa5	getrawtransaction should take a bool for verbose	2016-11-22 14:37:33 +00:00
Jonas Schnelli	ac489b2445	Merge #9130: Mention the new network toggle functionality in the tooltip. ... 1260c11 Mention the new network toggle functionality in the tooltip. (Pavel Janík)	2016-11-22 15:32:45 +01:00
Wladimir J. van der Laan	55b2eddcc8	Merge #9200: bench: Fix subtle counting issue when rescaling iteration count ... e0a9cb2 bench: Fix subtle counting issue when rescaling iteration count (Wladimir J. van der Laan)	2016-11-22 12:20:34 +01:00
Wladimir J. van der Laan	e0a9cb25b0	bench: Fix subtle counting issue when rescaling iteration count ... Make sure that the count is a zero modulo the new mask before scaling, otherwise the next time until a measure triggers will take only 1/2 as long as accounted for. This caused the 'min time' to be potentially off by as much as 100%.	2016-11-22 10:01:41 +01:00
Jonas Schnelli	e4dbeb9499	Merge #9185: [Qt] fix coincontrol sort issue ... 4231032 [Qt] Clean up and fix coincontrol tree widget handling (Wladimir J. van der Laan) 76af4eb [Qt] fix coincontrol sort issue (Jonas Schnelli)	2016-11-22 08:30:58 +01:00
Wladimir J. van der Laan	0c577f2638	Merge #8872: Remove block-request logic from INV message processing ... 037159c Remove block-request logic from INV message processing (Matt Corallo) 3451203 [qa] Respond to getheaders and do not assume a getdata on inv (Matt Corallo) d768f15 [qa] Make comptool push blocks instead of relying on inv-fetch (mrbandrews)	2016-11-21 15:41:32 +01:00
Wladimir J. van der Laan	210891143b	Merge #8837: allow bitcoin-tx to parse partial transactions ... 7451cf5 Allow bitcoin-tx to parse partial transactions (jnewbery)	2016-11-21 15:33:19 +01:00
Wladimir J. van der Laan	b9a87b459d	Merge #9179: Set DEFAULT_LIMITFREERELAY = 0 kB/minute ... fa7cc5a Set DEFAULT_LIMITFREERELAY = 0 kB/minute (MarcoFalke)	2016-11-21 15:27:48 +01:00
Wladimir J. van der Laan	c3906403c8	Merge #9117: net: don't send feefilter messages before the version handshake is complete ... 4662553 net: don't send feefilter messages before the version handshake is complete (Cory Fields)	2016-11-21 11:51:03 +01:00
Wladimir J. van der Laan	7490ae8b69	Merge #9125: Make CBlock a vector of shared_ptr of CTransactions ... b4e4ba4 Introduce convenience type CTransactionRef (Pieter Wuille) 1662b43 Make CBlock::vtx a vector of shared_ptr<CTransaction> (Pieter Wuille) da60506 Add deserializing constructors to CTransaction and CMutableTransaction (Pieter Wuille) 0e85204 Add serialization for unique_ptr and shared_ptr (Pieter Wuille)	2016-11-21 10:51:37 +01:00
Wladimir J. van der Laan	4231032bfc	[Qt] Clean up and fix coincontrol tree widget handling ... - Do sorting for date, amount and confirmations column as longlong, not unsigned longlong. - Use `UserRole` to store our own data. This makes it treated as ancillary data prevents it from being displayed. - Get rid of `getMappedColumn` `strPad` - these are no longer necessary. - Get rid of hidden `_INT64` columns. - Start enumeration from 0 (otherwise values are undefined).	2016-11-20 20:18:24 +01:00
Pieter Wuille	b4e4ba475a	Introduce convenience type CTransactionRef	2016-11-19 17:53:23 -08:00
Pieter Wuille	1662b437b3	Make CBlock::vtx a vector of shared_ptr<CTransaction>	2016-11-19 17:51:09 -08:00
Pieter Wuille	da60506fc8	Add deserializing constructors to CTransaction and CMutableTransaction	2016-11-19 17:50:40 -08:00
Pieter Wuille	0e85204a10	Add serialization for unique_ptr and shared_ptr	2016-11-19 17:50:35 -08:00
MarcoFalke	44adf683ad	Merge #9159: [qa] Wait for specific block announcement in p2p-compactblocks ... dfa44d1 [qa] Wait for specific block announcement in p2p-compactblocks (Russell Yanofsky)	2016-11-19 23:33:29 +01:00
Wladimir J. van der Laan	ce612f1750	Merge #9186: test: Fix use-after-free in scheduler tests ... 12519bf test: Fix use-after-free in scheduler tests (Wladimir J. van der Laan)	2016-11-19 16:18:38 +01:00
Wladimir J. van der Laan	12519bf62b	test: Fix use-after-free in scheduler tests ... Make a copy of the boost time-point to wait for, otherwise the head of the queue may be deleted by another thread while this one is waiting, while the boost function still has a reference to it. Although this problem is in non-test code, this is not an actual problem outside of the tests because we use the thread scheduler with only one service thread, so there will never be threads fighting at the head of the queue. The old boost fallback escapes this problem because it passes a scalar value to wait_until instead of a const object reference. Found by running the tests in LLVM-4.0-master asan.	2016-11-18 13:10:52 +01:00
Jonas Schnelli	76af4eb876	[Qt] fix coincontrol sort issue	2016-11-18 11:09:29 +01:00
MarcoFalke	fa7cc5a508	Set DEFAULT_LIMITFREERELAY = 0 kB/minute	2016-11-18 00:23:25 +01:00
Pieter Wuille	9346f84299	Merge #9075: Decouple peer-processing-logic from block-connection-logic (#3) ... ae22357 Replace CValidationState param in ProcessNewBlock with BlockChecked (Matt Corallo) 7c98ce5 Remove pfrom parameter from ProcessNewBlock (Matt Corallo) e2e069d Revert "RPC: Give more details when "generate" fails" (Matt Corallo)	2016-11-17 13:23:50 -08:00
Wladimir J. van der Laan	a8b2a82618	Merge #9156: Add compile and link options echo to configure ... d8274bc Add compile and link options echo to configure (Jonas Schnelli)	2016-11-17 16:05:56 +01:00
Wladimir J. van der Laan	aaca05c0da	Merge #9178: Doxygen: Set PROJECT_NAME = "Bitcoin Core" ... fa63ee8 Doxygen: Set PROJECT_NAME = "Bitcoin Core" (MarcoFalke)	2016-11-17 15:29:02 +01:00
MarcoFalke	fa63ee8e3e	Doxygen: Set PROJECT_NAME = "Bitcoin Core"	2016-11-17 14:37:34 +01:00
Wladimir J. van der Laan	f6db48ad1c	Merge #8838: Calculate size and weight of block correctly in CreateNewBlock() ... 5f274a1 log block size and weight correctly. (jnewbery)	2016-11-17 14:14:51 +01:00
Jonas Schnelli	d8274bcd00	Add compile and link options echo to configure	2016-11-16 12:02:05 +01:00
MarcoFalke	cb2ed300a8	Merge #9155: [trivial] update comments for tx weight ... 07ede5d update comments for tx weight (Brian Deery)	2016-11-16 11:05:40 +01:00
MarcoFalke	0a6d48d9ed	Merge #9168: [qa] add assert_raises_message to check specific error message ... 307acdd [qa] add assert_raises_message to check specific error message (mrbandrews)	2016-11-16 10:51:25 +01:00
Wladimir J. van der Laan	434e683f7b	Merge #9133: Unset fImporting for loading mempool ... 79f755d Unset fImporting for loading mempool (Alex Morcos)	2016-11-16 10:11:41 +01:00
Wladimir J. van der Laan	62af164638	Merge #9131: fNetworkActive is not protected by a lock, use an atomic ... 079142b fNetworkActive is not protected by a lock, use an atomic (Jonas Schnelli)	2016-11-16 10:09:52 +01:00
Wladimir J. van der Laan	4333b1c4ea	Merge #9151: [qa] proxy_test: Calculate hardcoded port numbers ... fa80ef8 [qa] proxy_test: Calculate hardcoded port numbers instead (MarcoFalke)	2016-11-16 10:04:18 +01:00
Wladimir J. van der Laan	918ea16dc0	Merge #9169: build: fix qt5.7 build under macOS ... 70266e9 build: fix qt5.7 build under macOS (Cory Fields)	2016-11-16 10:01:20 +01:00
Cory Fields	70266e9829	build: fix qt5.7 build under macOS ... OBJCXX's std flags don't get defined by our cxx macro. Rather than hard-coding to c++11, just force OBJCXX to be the same as CXX unless the user specified otherwise.	2016-11-15 16:12:17 -05:00
mrbandrews	307acdd3df	[qa] add assert_raises_message to check specific error message	2016-11-15 15:37:46 -05:00
Pieter Wuille	6eeac6e30d	Merge #9164: [trivial] credit values are CAmount ... 20c3215 credit values are CAmount (Gregory Sanders)	2016-11-15 09:44:07 -08:00
Gregory Sanders	20c3215a90	credit values are CAmount	2016-11-15 09:19:23 -05:00
Wladimir J. van der Laan	018a4eb120	Merge #9140: Bugfix: Correctly replace generated headers and fail cleanly ... b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)	2016-11-15 10:34:56 +01:00
Wladimir J. van der Laan	f54e4605fc	Merge #9132: Make strWalletFile const ... f734505 Make strWalletFile const (Jonas Schnelli)	2016-11-15 10:06:01 +01:00
Wladimir J. van der Laan	770364b8ea	Merge #9160: [trivial] Fix hungarian variable name ... ec34648 [trivial] Fix hungarian variable name (Russell Yanofsky)	2016-11-15 09:52:14 +01:00
MarcoFalke	b422913346	Merge #9136: sync_blocks cleanup ... 7943b13 [qa] Avoid 2 list comprehensions in sync_blocks (Russell Yanofsky) 05e57cc [qa] Fix sync_blocks timeout argument (Russell Yanofsky) fd6bb70 [qa] Improve sync_blocks error messages. (Russell Yanofsky)	2016-11-14 20:28:08 +01:00