diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 12:41:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-12-01 13:17:34 +0100 |
| commit | 2ef5ffa59afaf9b1d30cc0c97e6b1ab2b7ab30f4 (patch) | |
| tree | 3c4ac4a7ca5ac44c5e8ef1cae9545f7c196aad87 /src/main.h | |
| parent | 9afbd96919afd1f773e4c2633b0cfd6068e2b228 (diff) | |
| parent | 2d8860e820e2ca73000f558eb9686206bec2652a (diff) | |
| download | bitcoin-2ef5ffa59afaf9b1d30cc0c97e6b1ab2b7ab30f4.tar.xz | |
Merge pull request #6915
2d8860e Fix removeForReorg to use MedianTimePast (Suhas Daftuar)
b7fa4aa Don't call removeForReorg if DisconnectTip fails (Suhas Daftuar)
7e49f5f Track coinbase spends in CTxMemPoolEntry (Suhas Daftuar)
bb8ea1f removeForReorg calls once-per-disconnect-> once-per-reorg (Matt Corallo)
474b84a Make indentation in ActivateBestChainStep readable (Matt Corallo)
b0a064c Fix comment in removeForReorg (Matt Corallo)
9b060e5 Fix removal of time-locked transactions during reorg (Matt Corallo)
0c9959a Add failing test checking timelocked-txn removal during reorg (Matt Corallo)
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index bdbfa3826e..2996fdcb5a 100644 --- a/src/main.h +++ b/src/main.h @@ -467,7 +467,7 @@ bool InvalidateBlock(CValidationState& state, const Consensus::Params& consensus /** Remove invalidity status from a block and its descendants. */ bool ReconsiderBlock(CValidationState& state, CBlockIndex *pindex); -/** The currently-connected chain of blocks. */ +/** The currently-connected chain of blocks (protected by cs_main). */ extern CChain chainActive; /** Global variable that points to the active CCoinsView (protected by cs_main) */ |