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

9856 Commits

Author SHA1 Message Date
Wladimir J. van der Laan 9490bd71bd
Merge pull request #7096 
ff723da [Qt] improve minimum absolute fee option - Only display the minimum absolute fee control if CoinControl is enabled (Jonas Schnelli)
31b508a [Qt] make use of the nMinimumTotalFee (absolute) in coincontrols fee calculation (Jonas Schnelli)
80462dd [Qt] use ASYMP_UTF8 (≈) whenever we show a fee that is not absolute (Jonas Schnelli)
ecc7c82 Move fPayAtLeastCustomFee function to CC (Pieter Wuille)
 2015-12-01 09:59:03 +01:00
Wladimir J. van der Laan eb3d1b3487
Merge pull request #7135 
fa3a38a [qa] pull-tester: Cleanup (run keypool, tidy stdout) (MarcoFalke)
 2015-12-01 09:56:09 +01:00
Wladimir J. van der Laan 30c2d8c635
Merge pull request #7105 
9ac63d6 Keep track of explicit wallet conflicts instead of using mempool (Pieter Wuille)
 2015-12-01 09:22:08 +01:00
Wladimir J. van der Laan 1b5118bfa0
Merge pull request #7079 
ebb25f4 Limit setAskFor and retire requested entries only when a getdata returns. (Gregory Maxwell)
5029698 prevent peer flooding request queue for an inv (kazcw)
 2015-12-01 09:02:33 +01:00
Gregory Maxwell c143c499c8
Merge pull request #7072 
996d311 [RPC] Add transaction size to JSON output (Nick)
 2015-11-30 22:58:43 -08:00
Alex Morcos 50947ef23f Change default block priority size to 0 
Make RPC tests have a default block priority size of 50000 (the old default) so we can still use free transactions in RPC tests.  When priority is eliminated, we will have to make a different change if we want to continue allowing free txs.
 2015-11-30 16:16:24 -05:00
Gregory Maxwell 438ee59839
Merge pull request #7044 
d52fbf0 Added additional config option for multiple RPC users. (Gregory Sanders)
 2015-11-30 12:25:28 -08:00
Suhas Daftuar 2d8860e820 Fix removeForReorg to use MedianTimePast 2015-11-30 14:35:17 -05:00
Suhas Daftuar b7fa4aa387 Don't call removeForReorg if DisconnectTip fails 2015-11-30 13:12:55 -05:00
Suhas Daftuar 7e49f5f8b4 Track coinbase spends in CTxMemPoolEntry 
This allows us to optimize CTxMemPool::removeForReorg.
 2015-11-30 13:12:53 -05:00
Matt Corallo bb8ea1f630 removeForReorg calls once-per-disconnect-> once-per-reorg 2015-11-30 13:03:57 -05:00
Matt Corallo 474b84a741 Make indentation in ActivateBestChainStep readable 2015-11-30 13:03:56 -05:00
Matt Corallo b0a064c4b8 Fix comment in removeForReorg 2015-11-30 13:02:05 -05:00
Matt Corallo 9b060e5cfb Fix removal of time-locked transactions during reorg 2015-11-30 13:02:04 -05:00
Matt Corallo 0c9959a308 Add failing test checking timelocked-txn removal during reorg 2015-11-30 13:02:04 -05:00
Suhas Daftuar cfdc66280f Explicitly set chain limits in replace-by-fee test 2015-11-30 12:35:24 -05:00
MarcoFalke fa19a588b9 HelpMessage: Don't hide -mintxfee behind showDebug 2015-11-30 18:02:12 +01:00
MarcoFalke faffc172ec rpcwallet: Clarify what settxfee does 2015-11-30 18:01:43 +01:00
MarcoFalke 9999cb0626 Fix url in .travis.yml 2015-11-30 16:34:33 +01:00
MarcoFalke fa22a10028 contrib: Del. gitian downloader config and update gitian README 2015-11-30 16:34:11 +01:00
MarcoFalke fad3035e8d [doc] Minor markdown fixes 2015-11-30 16:33:15 +01:00
MarcoFalke fa3a38a7f2 [qa] pull-tester: Cleanup (run keypool, tidy stdout) 
* Run keypool (takes 6 seconds)
* Print duration of each rpc test
* Structure output (bold, new lines)
 2015-11-30 16:01:57 +01:00
Wladimir J. van der Laan 34e02e0147
Merge pull request #7094 
1bb289f Assert now > 0 in GetTime GetTimeMillis GetTimeMicros (Patick Strateman)
 2015-11-30 14:49:57 +01:00
Wladimir J. van der Laan eb7741605b
Merge pull request #7008 
c035306 Change GetPriority calculation. (Alex Morcos)
71f1d9f Modify variable names for entry height and priority (Alex Morcos)
5945819 Remove default arguments for CTxMemPoolEntry() (Alex Morcos)
 2015-11-30 14:37:05 +01:00
Wladimir J. van der Laan 9b8fc6c89a
Merge pull request #7035 
4531fc4 torcontrol: only output disconnect if -debug=tor (Daniel Cousens)
 2015-11-30 14:20:22 +01:00
Jonas Schnelli ff723da6f6
[Qt] improve minimum absolute fee option 
- Only display the minimum absolute fee control if CoinControl is enabled
 2015-11-30 14:18:57 +01:00
Jonas Schnelli 31b508a18b
[Qt] make use of the nMinimumTotalFee (absolute) in coincontrols fee calculation 2015-11-30 14:09:05 +01:00
Jonas Schnelli 80462dda0a
[Qt] use ASYMP_UTF8 (≈) whenever we show a fee that is not absolute 2015-11-30 14:09:04 +01:00
Pieter Wuille ecc7c82361
Move fPayAtLeastCustomFee function to CC 2015-11-30 14:09:04 +01:00
Pieter Wuille aa4b0c26b0 When not filtering blocks, getdata sends more in one test 2015-11-30 13:29:20 +01:00
Wladimir J. van der Laan 96b802510d
Merge pull request #7112 
9af5f9c Move uiInterface.NotifyBlockTip signal above the core/wallet signal - This will keep getbestblockhash more in sync with blocknotify callbacks (Jonas Schnelli)
4082e46 [Qt] call GuessVerificationProgress synchronous during core signal, pass double over UI signal (Jonas Schnelli)
947d20b [Qt] reduce cs_main in getVerificationProgress() (Jonas Schnelli)
e6d50fc [Qt] update block tip (height and date) without locking cs_main, update always (each block) (Jonas Schnelli)
012fc91 NotifyBlockTip signal: switch from hash (uint256) to CBlockIndex* - also adds a boolean for indication if the tip update was happening during initial sync - emit notification also during initial sync (Jonas Schnelli)
 2015-11-30 13:04:29 +01:00
Gregory Maxwell d41e44c9ac Actually only use filterInventoryKnown with MSG_TX inventory messages. 
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
 2015-11-30 12:53:48 +01:00
Patick Strateman b6a0da45db Only use filterInventoryKnown with MSG_TX inventory messages. 
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
 2015-11-30 12:53:48 +01:00
Patick Strateman 6b849350ab Rename setInventoryKnown filterInventoryKnown 2015-11-30 12:53:48 +01:00
Gregory Maxwell e20672479e Remove mruset as it is no longer used. 2015-11-30 12:53:48 +01:00
Gregory Maxwell ec73ef37ec Replace setInventoryKnown with a rolling bloom filter. 
Mruset setInventoryKnown was reduced to a remarkably small 1000
 entries as a side effect of sendbuffer size reductions in 2012.

This removes setInventoryKnown filtering from merkleBlock responses
 because false positives there are especially unattractive and
 also because I'm not sure if there aren't race conditions around
 the relay pool that would cause some transactions there to
 be suppressed. (Also, ProcessGetData was accessing
 setInventoryKnown without taking the required lock.)
 2015-11-30 12:53:48 +01:00
Daniel Cousens 4531fc4272 torcontrol: only output disconnect if -debug=tor 2015-11-30 22:20:43 +11:00
Wladimir J. van der Laan a7751824ce
Merge pull request #7103 
fa506c0 [wallet] Add rpc tests to verify fee calculations (MarcoFalke)
4b89f01 Default fPayAtLeastCustomFee to false (Ryan Havar)
 2015-11-30 12:18:20 +01:00
Wladimir J. van der Laan 6fc287f2df
Merge pull request #7027 
4ea1790 [qa] keypool: DRY: Use test framework (MarcoFalke)
c6973ca [qa] keypool: Fix white space to prepare transition to test framework (MarcoFalke)
 2015-11-30 12:15:21 +01:00
Jonas Schnelli 9af5f9cb87
Move uiInterface.NotifyBlockTip signal above the core/wallet signal 
- This will keep getbestblockhash more in sync with blocknotify callbacks
 2015-11-30 11:34:09 +01:00
Wladimir J. van der Laan 9ebedc1756
Merge pull request #7126 
fa4b627 Move blocksonly parameter interaction to InitParameterInteraction() (MarcoFalke)
 2015-11-30 11:34:09 +01:00
Wladimir J. van der Laan 74b5ce24c6
Merge pull request #7116 
cb491e7 Trivial: Fix warning introduced by #7053 by casting to uint64_t (Jorge Timón)
 2015-11-30 10:18:46 +01:00
Jonas Schnelli fa93174a7c
Merge pull request #7127 
a6cbc02 Bugfix: Default -uiplatform is not actually the platform this build was compiled on (Luke Dashjr)
 2015-11-30 09:14:42 +01:00
Jonas Schnelli c28d3937b0
Merge pull request #7025 
2a8e8c2 [Qt] don't allow to store invalid proxy ports (Jonas Schnelli)
d16d1b7 [Qt] refactor and optimize proxy settings behavior (Jonas Schnelli)
 2015-11-30 09:08:29 +01:00
Jonas Schnelli 4082e46603
[Qt] call GuessVerificationProgress synchronous during core signal, pass double over UI signal 2015-11-30 08:53:57 +01:00
Jonas Schnelli 947d20b84a
[Qt] reduce cs_main in getVerificationProgress() 2015-11-30 08:50:59 +01:00
Jonas Schnelli e6d50fcdec
[Qt] update block tip (height and date) without locking cs_main, update always (each block) 2015-11-30 08:50:59 +01:00
Jonas Schnelli 012fc91511
NotifyBlockTip signal: switch from hash (uint256) to CBlockIndex* 
- also adds a boolean for indication if the tip update was happening during initial sync
- emit notification also during initial sync
 2015-11-30 08:50:59 +01:00
Jorge Timón cb491e7788 Trivial: Fix warning introduced by #7053 by casting to uint64_t 2015-11-29 21:19:37 +01:00
Gregory Sanders d52fbf00e3 Added additional config option for multiple RPC users. 2015-11-29 08:34:20 -05:00