BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
9,740 Commits 1 Branch 186 Tags 48 MiB
Commit Graph

9740 Commits

Author SHA1 Message Date
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
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
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
Pieter Wuille 9ac63d6d30 Keep track of explicit wallet conflicts instead of using mempool 2015-11-29 13:24:02 +01:00
Pieter Wuille 5d5ef3a4cf
Merge pull request #7129 
49fb8e8 Documentation updates for BIP 130 (Pieter Wuille)
50262d8 Allow block announcements with headers (Suhas Daftuar)
 2015-11-29 13:06:13 +01:00
Pieter Wuille 49fb8e89b7 Documentation updates for BIP 130 2015-11-29 12:08:12 +01:00
Suhas Daftuar 50262d8953 Allow block announcements with headers 
This replaces using inv messages to announce new blocks, when a peer requests
(via the new "sendheaders" message) that blocks be announced with headers
instead of inv's.

Since headers-first was introduced, peers send getheaders messages in response
to an inv, which requires generating a block locator that is large compared to
the size of the header being requested, and requires an extra round-trip before
a reorg can be relayed.  Save time by tracking headers that a peer is likely to
know about, and send a headers chain that would connect to a peer's known
headers, unless the chain would be too big, in which case we revert to sending
an inv instead.

Based off of @sipa's commit to announce all blocks in a reorg via inv,
which has been squashed into this commit.

Rebased-by: Pieter Wuille
 2015-11-29 11:59:23 +01:00
Gregory Maxwell c894fbbb1d
Merge pull request #7106 
a9f3d3d Fix and improve relay from whitelisted peers (Pieter Wuille)
 2015-11-28 16:09:40 -08:00
MarcoFalke fa506c0c9b [wallet] Add rpc tests to verify fee calculations 2015-11-28 22:52:13 +01:00
Ryan Havar 4b89f01d72 Default fPayAtLeastCustomFee to false 
This allows for much finer control of the transaction fees per kilobyte
as it prevent small transactions using a fee that is more appropriate
for one that is of a kilobyte.

This also allows controlling the fee per kilobyte over rpc such that:

bitcoin-cli settxfee `bitcoin-cli estimatefee 2`

would make sense, while currently it grossly fails often by a factor of x3
 2015-11-28 22:51:41 +01:00
Luke Dashjr a6cbc02b6b Bugfix: Default -uiplatform is not actually the platform this build was compiled on 2015-11-28 21:48:17 +00:00
Pieter Wuille 61457c29d7
Merge pull request #6508 
eece63f Switch blocks to a constant-space Merkle root/branch algorithm. (Pieter Wuille)
ee60e56 Add merkle.{h,cpp}, generic merkle root/branch algorithm (Pieter Wuille)
 2015-11-28 22:27:38 +01:00
MarcoFalke fa4b627269 Move blocksonly parameter interaction to InitParameterInteraction() 2015-11-28 22:26:50 +01:00