aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-03Now that 0.12 has been branched, master is 0.12.99Wladimir J. van der Laan
... in preparation for 0.13
2015-12-03Merge pull request #7158Wladimir J. van der Laan
fab8347 [qt] Use tr() instead of _() (MarcoFalke)
2015-12-02[qt] Use tr() instead of _()MarcoFalke
Also, `make translate`
2015-12-02Merge pull request #7157Wladimir J. van der Laan
fabd10a Fix typo in wallet.cpp (MarcoFalke) fad2460 Update contrib/devtools/README.md (MarcoFalke) 5e151a8 PartitionCheck: remove useless spaces (paveljanik) fad0088 TRIVIAL: Chainparams: Remove unused CBaseUnitTestParams (Jorge Timón) 74f7341 Update miner.cpp: Fix typo in comment (antonio-fr) e69bad1 [trivial] Fix typo in peertablemodel.cpp (MarcoFalke) 8a03727 Fix various typos (paveljanik)
2015-12-02Fix typo in wallet.cppMarcoFalke
2015-12-02Update contrib/devtools/README.mdMarcoFalke
* Fix order * Update subtree check
2015-12-02PartitionCheck: remove useless spacespaveljanik
2015-12-02TRIVIAL: Chainparams: Remove unused CBaseUnitTestParamsJorge Timón
2015-12-02Update miner.cpp: Fix typo in commentantonio-fr
2015-12-02[trivial] Fix typo in peertablemodel.cppMarcoFalke
2015-12-02Fix various typospaveljanik
2015-12-02Merge pull request #7128Wladimir J. van der Laan
02354c9 Constrain rpcport default values to a single location in code (Luke Dashjr)
2015-12-02qt: Final translation update before 0.12 forkWladimir J. van der Laan
- Add new translations (finally, after a long time) - update-translation script was not considering new translations - oops - fixed this, also remove (nearly) empty translations - Update translation process, it was still describing the old repository structure
2015-12-02Merge pull request #6216Wladimir J. van der Laan
db6047d Take the training wheels off anti-fee-sniping (Peter Todd)
2015-12-02Merge pull request #7147Wladimir J. van der Laan
9827091 Squashed 'src/univalue/' changes from 5839ac3..2740c4f (MarcoFalke)
2015-12-02Merge pull request #7146Wladimir J. van der Laan
1812de9 Name union to prevent compiler warning (Pavel Janík)
2015-12-02Merge pull request #7118Wladimir J. van der Laan
b212f94 Describe maxmempool and mempoolminfee in the getmempoolinfo RPC help. (Pavel Janík)
2015-12-02Merge pull request #7155Wladimir J. van der Laan
092e9ad Remove old replace-by-fee tests (Peter Todd)
2015-12-02Merge commit '982709199f1b4e9e35211c419a81938f9f1dd4ed' into bitcoinMarcoFalke
2015-12-02Squashed 'src/univalue/' changes from 5839ac3..2740c4fMarcoFalke
2740c4f Merge branch '2015_11_escape_plan' into bitcoin 7482163 Add new testcase to Makefile.am 46098ee Version 1.0.1. ccf3575 parser: Ensure multiple values cannot follow each other eb6cd64 Omit Obj/Arr open token from jsonTokenIsValue() test bfef9e2 Makefile.am: list recently added test data, fail{35,36}.json 3e319f3 parser: Tighten array, object syntax checks. c74185c parser: transform C++ variables into bitmask f2568bc Prefer C++ STL vector .at() for accessing object values. 8eafa26 travis: run parallel 'make distcheck' fd448da test: Improve tester diagnostics. Add failing test case from #15 2158205 Use internal, locale-independent isspace(), isdigit() implementations. 2ab9ad4 travis: Make 'make distcheck' for more comprehensive checks. 3339191 Escape all control characters git-subtree-dir: src/univalue git-subtree-split: 2740c4f71242086a7eb3dc32f812546ba9fad913
2015-12-02Remove old replace-by-fee testsPeter Todd
Made redundant by tests in qa/rpc-tests/replace-by-fee.py
2015-12-02Merge pull request #7144Wladimir J. van der Laan
8f0d79e test: Disable scheduler test manythreads (Wladimir J. van der Laan)
2015-12-02Merge pull request #6872Wladimir J. van der Laan
dd5862c Flush coins cache also after transaction processing (Pieter Wuille) bde953e Uncache input txn in utxo cache if a tx is not accepted to mempool (Matt Corallo) 97bf377 Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cached (Matt Corallo) 677aa3d Discard txn cache entries that were loaded for removed mempool txn (Matt Corallo) b2e74bd Get the set of now-uncacheable-txn from CTxMemPool::TrimToSize (Matt Corallo) 74d0f90 Add method to remove a tx from CCoinsViewCache if it is unchanged (Matt Corallo)
2015-12-02Merge pull request #7040Jonas Schnelli
b171c69 [doc] Update OS X build notes for new qt5 configure (Michael Ford)
2015-12-02Name union to prevent compiler warningPavel Janík
2015-12-01Flush coins cache also after transaction processingPieter Wuille
2015-12-01Uncache input txn in utxo cache if a tx is not accepted to mempoolMatt Corallo
2015-12-01Add CCoinsViewCache::HaveCoinsInCache to check if a tx is cachedMatt Corallo
2015-12-01Discard txn cache entries that were loaded for removed mempool txnMatt Corallo
2015-12-01Get the set of now-uncacheable-txn from CTxMemPool::TrimToSizeMatt Corallo
2015-12-01Add method to remove a tx from CCoinsViewCache if it is unchangedMatt Corallo
2015-12-01Merge pull request #6898Pieter Wuille
553cad9 Rewrite CreateNewBlock (Alex Morcos) 5f12263 Expose FormatStateMessage (Alex Morcos) 1f09287 Make accessing mempool parents and children public (Alex Morcos) 7230187 Add TxPriority class and comparator (Alex Morcos) f3fe836 Add a score index to the mempool. (Alex Morcos) c49d5bc Store the total sig op count of a tx. (Alex Morcos)
2015-12-01Rewrite CreateNewBlockAlex Morcos
Use the score index on the mempool to only add sorted txs in order. Remove much of the validation while building the block, relying on mempool to be consistent and only contain txs that can be mined. The mempool is assumed to be consistent as far as not containing txs which spend non-existent outputs or double spends, and scripts are valid. Finality of txs is still checked (except not coinbase maturity, assumed in mempool). Still TestBlockValidity in case mempool consistency breaks and return error state if an invalid block was created. Unit tests are modified to realize that invalid blocks can now be constructed if the mempool breaks its consistency assumptions and also updated to have the right fees, since the cached value is now used for block construction. Conflicts: src/miner.cpp
2015-12-01Expose FormatStateMessageAlex Morcos
2015-12-01Make accessing mempool parents and children publicAlex Morcos
2015-12-01Add TxPriority class and comparatorAlex Morcos
2015-12-01Add a score index to the mempool.Alex Morcos
The score index is meant to represent the order of priority for being included in a block for miners. Initially this is set to the transactions modified (by any feeDelta) fee rate. Index improvements and unit tests by sdaftuar.
2015-12-01Store the total sig op count of a tx.Alex Morcos
Store sum of legacy and P2SH sig op counts. This is calculated in AcceptToMemory pool and storing it saves redoing the expensive calculation in block template creation.
2015-12-01test: Disable scheduler test manythreadsWladimir J. van der Laan
It causes occasional deadlocks, resulting in false negatives in Travis. Disable the test for now. Works around #6540.
2015-12-01Merge pull request #7137Wladimir J. van der Laan
cfdc662 Explicitly set chain limits in replace-by-fee test (Suhas Daftuar)
2015-12-01qt: periodic translations updateWladimir J. van der Laan
2015-12-01Merge pull request #7141Wladimir J. van der Laan
aabc897 rpc: Don't translate warning messages (Wladimir J. van der Laan)
2015-12-01Merge pull request #7143Wladimir J. van der Laan
6da12df qt: use QMetaObject::invokeMethod for cross-thread signaling in clientmodel (Wladimir J. van der Laan)
2015-12-01Merge pull request #6915Wladimir J. van der Laan
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)
2015-12-01Merge pull request #7022Wladimir J. van der Laan
50947ef Change default block priority size to 0 (Alex Morcos)
2015-12-01qt: use QMetaObject::invokeMethod for cross-thread signaling in clientmodelWladimir J. van der Laan
It's surprising to me that Q_EMIT even worked for this. But it doesn't build in Qt4, so switch back to `QMetaObject::invokeMethod`. Fixes #7138.
2015-12-01Describe maxmempool and mempoolminfee in the getmempoolinfo RPC help.Pavel Janík
2015-12-01Constrain rpcport default values to a single location in codeLuke Dashjr
2015-12-01Merge pull request #7063Wladimir J. van der Laan
2b31ab9 Add rpc test for prioritisetransaction (Suhas Daftuar) 6e8b07f Add rounding helper function to util.py (Suhas Daftuar)
2015-12-01Add rpc test for prioritisetransactionSuhas Daftuar