aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge #9647: Skip RAII event tests if libevent is built without ↵Wladimir J. van der Laan2017-01-301-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event_set_mem_functions 95f97f4 Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)
| * | | | | | | | | | | | | | | Skip RAII event tests if libevent is built without event_set_mem_functionsLuke Dashjr2017-01-281-0/+6
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge #9649: [doc] Remove unused clang format dev scriptMarcoFalke2017-01-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
| * | | | | | | | | | | | | | | | [doc] Remove unused clang format dev scriptMarcoFalke2017-01-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, update the clang format file to reflect the current coding style mentioned in the developer notes.
* | | | | | | | | | | | | | | | | qt: periodic translations updateWladimir J. van der Laan2017-01-3049-201/+450
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge #9644: [refactor] Remove using namespace <xxx> from src/MarcoFalke2017-01-3013-206/+179
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
| * | | | | | | | | | | | | | | | | Refactor: Remove using namespace <xxx> from src/*.cpp.Karl-Johan Alm2017-01-2713-206/+179
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge #9626: Clean up a few CConnman cs_vNodes/CNode thingsWladimir J. van der Laan2017-01-302-46/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2366180 Do not add to vNodes until fOneShot/fFeeler/fAddNode have been set (Matt Corallo) 3c37dc4 Ensure cs_vNodes is held when using the return value from FindNode (Matt Corallo) 5be0190 Delete some unused (and broken) functions in CConnman (Matt Corallo)
| * | | | | | | | | | | | | | | | | | Do not add to vNodes until fOneShot/fFeeler/fAddNode have been setMatt Corallo2017-01-251-9/+10
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Ensure cs_vNodes is held when using the return value from FindNodeMatt Corallo2017-01-241-5/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Delete some unused (and broken) functions in CConnmanMatt Corallo2017-01-242-32/+0
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge #9615: Wallet incremental feeWladimir J. van der Laan2017-01-306-36/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b189c1 Change bumpfee result value from 'oldfee' to 'origfee'. (Alex Morcos) 0c0c63f Introduce WALLET_INCREMENTAL_RELAY_FEE (Alex Morcos) e8021ec Use CWallet::GetMinimumFee in bumpfee (Alex Morcos) ae9719a Refactor GetMinimumFee to give option of providing targetFee (Alex Morcos) fe8e8ef [rpc] Add incremental relay fee to getnetworkinfo (Alex Morcos) 6b331e6 Fix to have miner test aware of new separate block min tx fee (Alex Morcos) de6400d Fix missing use of dustRelayFee (Alex Morcos) 5b15870 Use incrementalRelayFee for BIP 125 replacement (Alex Morcos)
| * | | | | | | | | | | | | | | | | Change bumpfee result value from 'oldfee' to 'origfee'.Alex Morcos2017-01-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result value indicates the actual fee on the transaction that was replaced. But there is an error message which uses the description 'oldfee' to refer to the original fee rate applied to the new transaction's estimated max size. It was confusing that two different uses of 'oldfee' had two different numeric values.
| * | | | | | | | | | | | | | | | | Introduce WALLET_INCREMENTAL_RELAY_FEEAlex Morcos2017-01-262-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have wallet's default bump value be higher than the default incrementalRelayFee to future proof against changes to incremental relay fee. Only applies when not setting the fee rate directly.
| * | | | | | | | | | | | | | | | | Use CWallet::GetMinimumFee in bumpfeeAlex Morcos2017-01-261-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the wallet's fee calculation logic to properly clamp fee against minimums and maximums when calculating the fee for a bumpfee transaction. Unless totalFee is explictly given, in which case, manually check against min, but do nothing to adjust given fee. In all cases do a final check against maxTxFee (after adding any incremental amount).
| * | | | | | | | | | | | | | | | | Refactor GetMinimumFee to give option of providing targetFeeAlex Morcos2017-01-252-2/+12
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | [rpc] Add incremental relay fee to getnetworkinfoAlex Morcos2017-01-202-2/+5
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix to have miner test aware of new separate block min tx feeAlex Morcos2017-01-191-4/+7
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix missing use of dustRelayFeeAlex Morcos2017-01-191-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Use incrementalRelayFee for BIP 125 replacementAlex Morcos2017-01-192-9/+9
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | [trivial] Fix typos in commentspracticalswift2017-01-2720-23/+23
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | [Qt] fix transaction details output-index to reflect vout indexJonas Schnelli2017-01-261-3/+4
| |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge #9519: Exclude RBF replacement txs from fee estimationWladimir J. van der Laan2017-01-261-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de1ae32 Exclude RBF txs from fee estimation (Alex Morcos)
| * | | | | | | | | | | | | | | | Exclude RBF txs from fee estimationAlex Morcos2017-01-201-5/+7
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge #9594: Send final alert message to older peers after connecting.Wladimir J. van der Laan2017-01-261-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ff8d21 Send final alert message to older peers after connecting. (Gregory Maxwell)
| * | | | | | | | | | | | | | | | | Send final alert message to older peers after connecting.Gregory Maxwell2017-01-201-0/+6
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old Bitcoin alert system has long since been retired. ( See also: https://bitcoin.org/en/alert/2016-11-01-alert-retirement ) This change causes each node to send any old peers that it connects with a copy of the final alert. The alert it hardcode cancels all other alerts including other final alerts.
* | | | | | | | | | | | | | | | | Merge #9587: Do not shadow local variable named `tx`.Wladimir J. van der Laan2017-01-261-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 44f2baa Do not shadow local variable named `tx`. (Pavel Janík)
| * | | | | | | | | | | | | | | | | Do not shadow local variable named `tx`.Pavel Janík2017-01-201-2/+2
| |/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge #9613: [wallet] Clarify getbalance help string to explain interaction ↵Wladimir J. van der Laan2017-01-261-5/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with bumpfee 5a00659 [wallet] Clarify getbalance help string to explain interaction with bumpfee (Russell Yanofsky)
| * | | | | | | | | | | | | | | | | [wallet] Clarify getbalance help string to explain interaction with bumpfeeRussell Yanofsky2017-01-231-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation change only, no change in behavior.
* | | | | | | | | | | | | | | | | | Merge #9606: net: Consistently use GetTimeMicros() for inactivity checksWladimir J. van der Laan2017-01-265-18/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99464bc net: Consistently use GetTimeMicros() for inactivity checks (Suhas Daftuar)
| * | | | | | | | | | | | | | | | | net: Consistently use GetTimeMicros() for inactivity checksSuhas Daftuar2017-01-255-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of mocktime in test logic means that comparisons between GetTime() and GetTimeMicros()/1000000 are unreliable since the former can use mocktime values while the latter always gets the system clock; this changes the networking code's inactivity checks to consistently use the system clock for inactivity comparisons. Also remove some hacks from setmocktime() that are no longer needed, now that we're using the system clock for nLastSend and nLastRecv.
* | | | | | | | | | | | | | | | | | [Trivial] fix logging typo in FlushStateToDisk()John Newbery2017-01-241-1/+1
| |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge #9617: [Trivial] Update license year range to 2017Wladimir J. van der Laan2017-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be31a2b [Trivial] Update license year range to 2017 (Lauda)
| * | | | | | | | | | | | | | | | | [Trivial] Update license year range to 2017Lauda2017-01-231-1/+1
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The same as #7363.
* | | | | | | | | | | | | | | | | Merge #9371: Notify on removalWladimir J. van der Laan2017-01-245-21/+103
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 094e4b3 Better document usage of SyncTransaction (Alex Morcos) 4afbde6 Introduce MemPoolConflictRemovalTracker (Alex Morcos) ff25c32 mempool: add notification for added/removed entries (Wladimir J. van der Laan)
| * | | | | | | | | | | | | | | | | Better document usage of SyncTransactionAlex Morcos2017-01-232-4/+19
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Introduce MemPoolConflictRemovalTrackerAlex Morcos2017-01-231-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Analogue to ConnectTrace that tracks transactions that have been removed from the mempool due to conflicts and then passes them through SyncTransaction at the end of its scope.
| * | | | | | | | | | | | | | | | | mempool: add notification for added/removed entriesWladimir J. van der Laan2017-01-233-17/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notification signals to make it possible to subscribe to mempool changes: - NotifyEntryAdded(CTransactionRef)> - NotifyEntryRemoved(CTransactionRef, MemPoolRemovalReason)> Also add a mempool removal reason enumeration, which is passed to the removed notification based on why the transaction was removed from the mempool.
* | | | | | | | | | | | | | | | | | Merge #9588: qt: Use nPowTargetSpacing constantJonas Schnelli2017-01-244-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa4d478 qt: Use nPowTargetSpacing constant (MarcoFalke)
| * | | | | | | | | | | | | | | | | qt: Use nPowTargetSpacing constantMarcoFalke2017-01-194-6/+10
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge #9596: [bugfix] save feeDelta instead of priorityDelta in DumpMempoolPieter Wuille2017-01-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd92f24 [bugfix] save feeDelta instead of priorityDelta in DumpMempool (Alex Morcos)
| * | | | | | | | | | | | | | | | | | [bugfix] save feeDelta instead of priorityDelta in DumpMempoolAlex Morcos2017-01-191-1/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge #9516: Bug-fix: listsinceblock: use fork point as reference for blocks ↵Wladimir J. van der Laan2017-01-231-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in reorg'd chains 7ba0a00 Testing: listsinceblock should not use orphan block height. (Karl-Johan Alm) ee5c1ce Bug-fix: listsinceblock: use closest common ancestor when a block hash was provided for a chain that was not the main chain. (Karl-Johan Alm)
| * | | | | | | | | | | | | | | | | Bug-fix: listsinceblock: use closest common ancestor when a block hash was ↵Karl-Johan Alm2017-01-181-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provided for a chain that was not the main chain.
* | | | | | | | | | | | | | | | | | Merge #9511: Don't overwrite validation state with corruption checkWladimir J. van der Laan2017-01-231-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 116419e Don't overwrite validation state with corruption check (Alex Morcos)
| * | | | | | | | | | | | | | | | | | Don't overwrite validation state with corruption checkAlex Morcos2017-01-101-3/+4
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AcceptToMemoryPool has several classes of return false statements. - return state.Invalid or state.DoS directly itself - return false and set fMissingInputs (state is valid) - return false and state is set by failed CheckTransaction - return false and state is set by failed CheckInputs. This commit patches the last case where the state variable was reused for additional calls to CheckInputs to identify witness stripping as cause of validation failure. After this commit, it should be the case that if !fMissingInputs, state is always Invalid if AcceptToMemoryPool returns false.
* | | | | | | | | | | | | | | | | | Merge #9583: Move wallet callbacks into cs_main (this effectively reverts #7946)Wladimir J. van der Laan2017-01-231-9/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9899893 Move wallet callbacks into cs_main (this effectively reverts #7946) (Matt Corallo)
| * | | | | | | | | | | | | | | | | | Move wallet callbacks into cs_main (this effectively reverts #7946)Matt Corallo2017-01-191-9/+8
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge #9610: [Trivial] Grammar and typo correction (laudaa)MarcoFalke2017-01-226-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c66d41 [Trivial] Grammar and typo correction (Lauda)