aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-04Fixup style a bit by moving { to the same line as if statementsMatt Corallo
2017-02-02Always enforce lock strict lock ordering (try or not)Matt Corallo
2017-02-02Lock cs_vSend and cs_inventory in a consistent order even in TRYMatt Corallo
2017-02-02Merge #9654: Add jtimon pgp keys for commit sigs and future gitian buildsWladimir J. van der Laan
178454d Contrib: Add jtimon pgp keys for commit sigs and future gitian builds (Jorge Timón)
2017-02-02Merge #9656: Check verify-commits on pushes to masterWladimir J. van der Laan
ba94426 Test that pushes to bitcoin/bitcoin are signed per verify-commits (Matt Corallo) 3e900ac Require merge commits merge branches on top of other merge commits (Matt Corallo)
2017-02-02Merge #9556: Remove redundant semicolonsWladimir J. van der Laan
8fc6989 Remove redundant semicolons (practicalswift)
2017-02-02Merge #9580: Fix various minor linearization script issuesWladimir J. van der Laan
b9d95bd Fix various minor linearization script issues (Douglas Roark)
2017-02-02Merge #9663: [RPC] clarify listunspent amount descriptionWladimir J. van der Laan
3eba88d clarify listunspent amount description (Gregory Sanders)
2017-02-01Test that pushes to bitcoin/bitcoin are signed per verify-commitsMatt Corallo
2017-02-01Require merge commits merge branches on top of other merge commitsMatt Corallo
Specifically, require that the left branch (first restult of git show -s --format=format:%P) is a signed merge commit, instead of allowing either. This is fine for now, but might need to be relaxed in the future. Also fixes an out-of-file-descriptors issue by holding too many open FDs writing to /dev/null
2017-02-01clarify listunspent amount descriptionGregory Sanders
2017-02-01Merge #9625: Increase minimum debug.log size to 10MB after shrink.Wladimir J. van der Laan
29fb311 Increase minimum debug.log size to 10MB after shrink. (Alex Morcos)
2017-02-01Merge #9640: Bumpfee: bugfixes for error handling and feerate calculationWladimir J. van der Laan
9522b53 rpc: bumpfee: handle errors more gracefully (Suhas Daftuar) f626594 rpc: bumpfee: use correct maximum signed tx size for fee calculation (Suhas Daftuar) d625b90 wallet: Refactor dummy signature signing for reusability (Suhas Daftuar)
2017-01-31rpc: bumpfee: handle errors more gracefullySuhas Daftuar
2017-01-31rpc: bumpfee: use correct maximum signed tx size for fee calculationSuhas Daftuar
More accurate than simply adding one byte per input, and properly handles the case where the original transaction happened to have very small signatures
2017-01-31Contrib: Add jtimon pgp keys for commit sigs and future gitian buildsJorge Timón
2017-01-30wallet: Refactor dummy signature signing for reusabilitySuhas Daftuar
2017-01-30Merge #9647: Skip RAII event tests if libevent is built without ↵Wladimir J. van der Laan
event_set_mem_functions 95f97f4 Skip RAII event tests if libevent is built without event_set_mem_functions (Luke Dashjr)
2017-01-30Merge #9649: [doc] Remove unused clang format dev scriptMarcoFalke
fa5137c [doc] Remove unused clang format dev script (MarcoFalke)
2017-01-30qt: periodic translations updateWladimir J. van der Laan
2017-01-30Merge #9644: [refactor] Remove using namespace <xxx> from src/MarcoFalke
b7b48c8 Refactor: Remove using namespace <xxx> from src/*.cpp. (Karl-Johan Alm)
2017-01-30Merge #9626: Clean up a few CConnman cs_vNodes/CNode thingsWladimir J. van der Laan
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)
2017-01-30Merge #9615: Wallet incremental feeWladimir J. van der Laan
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)
2017-01-30Merge #9646: depends: Fix cross build for qt5.7Wladimir J. van der Laan
b5f374f qt: fix build with zlib for target (Cory Fields) 8efa34f depends: add a zlib build (Cory Fields) 342eb96 build: find qt's renamed helper libs from 5.7 (Cory Fields)
2017-01-29Merge #9510: [trivial] Fix typos in commentsMarcoFalke
cc16d99 [trivial] Fix typos in comments (practicalswift)
2017-01-28[doc] Remove unused clang format dev scriptMarcoFalke
Also, update the clang format file to reflect the current coding style mentioned in the developer notes.
2017-01-28Skip RAII event tests if libevent is built without event_set_mem_functionsLuke Dashjr
2017-01-28qt: fix build with zlib for targetCory Fields
This contains a few hacks very specific to Qt's buildsystem. These can be reverted once we split the build between native and target builds. Qt's build contains a circular dependency when not using a system zlib. By far the easiest fix is to switch to a system zlib, rather than Qt's own. However, that confuses Qt's cross build which assumes that when using a system zlib, it should also find a system (native) zlib for native tools. The build breaks if that zlib is not present. To solve this: 1. Always use a system zlib rather than the one provided by qt 2. Set force_bootstrap, which instructs the build tools to be built as though we're cross-compiling (build != target) 3. For build tools, use qt's internal zlib so that a native zlib is not required. Step 3 means that if any zlib headers are found by the native build, it will confuse Qt's internal zlib build. So we also need to make sure that the target headers/libs aren't found. To do so, specify that our cflags/cxxflags/cppflags/ldflags only apply for non-host builds.
2017-01-28depends: add a zlib buildCory Fields
qt5.7 changed the location of some of its symbols, creating a circular dependency in Qt5Core. Rather than trying to fix that up, build our own zlib rather than having it built for us.
2017-01-28build: find qt's renamed helper libs from 5.7Cory Fields
2017-01-27[trivial] Fix typos in commentspracticalswift
2017-01-27Merge #9638: qa: Actually test assertions in pruning.pyWladimir J. van der Laan
fab035f qa: Actually test assertions in pruning.py (MarcoFalke)
2017-01-27Merge #9637: [Qt] fix transaction details output-index to reflect vout indexWladimir J. van der Laan
04b8773 [Qt] fix transaction details output-index to reflect vout index (Jonas Schnelli)
2017-01-27Refactor: Remove using namespace <xxx> from src/*.cpp.Karl-Johan Alm
2017-01-26Change bumpfee result value from 'oldfee' to 'origfee'.Alex Morcos
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.
2017-01-26Introduce WALLET_INCREMENTAL_RELAY_FEEAlex Morcos
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.
2017-01-26qa: Actually test assertions in pruning.pyMarcoFalke
Also refactor to use wrapper for stop_node
2017-01-26Use CWallet::GetMinimumFee in bumpfeeAlex Morcos
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).
2017-01-26[Qt] fix transaction details output-index to reflect vout indexJonas Schnelli
2017-01-26Merge #9519: Exclude RBF replacement txs from fee estimationWladimir J. van der Laan
de1ae32 Exclude RBF txs from fee estimation (Alex Morcos)
2017-01-26Merge #9594: Send final alert message to older peers after connecting.Wladimir J. van der Laan
8ff8d21 Send final alert message to older peers after connecting. (Gregory Maxwell)
2017-01-26Merge #9574: [depends] Fix QT build on OSXWladimir J. van der Laan
c36ec71 depends: qt: disable printer for all platforms, not just osx (Cory Fields)
2017-01-26Merge #9587: Do not shadow local variable named `tx`.Wladimir J. van der Laan
44f2baa Do not shadow local variable named `tx`. (Pavel Janík)
2017-01-26Merge #9613: [wallet] Clarify getbalance help string to explain interaction ↵Wladimir J. van der Laan
with bumpfee 5a00659 [wallet] Clarify getbalance help string to explain interaction with bumpfee (Russell Yanofsky)
2017-01-26Merge #9606: net: Consistently use GetTimeMicros() for inactivity checksWladimir J. van der Laan
99464bc net: Consistently use GetTimeMicros() for inactivity checks (Suhas Daftuar)
2017-01-25Refactor GetMinimumFee to give option of providing targetFeeAlex Morcos
2017-01-26Merge #9628: qa: Increase a sync_blocks timeout in pruning.pyMarcoFalke
2f10f06 qa: Increase a sync_blocks timeout in pruning.py (Suhas Daftuar)
2017-01-25Do not add to vNodes until fOneShot/fFeeler/fAddNode have been setMatt Corallo
2017-01-25Fix various minor linearization script issuesDouglas Roark
- The last-timestamp-encountered variable wasn’t being used properly. Rewrite code to properly allow for new blockchain files to be written when split by month. - Properly set a blockchain file’s access and modify times. - Add a “debug output” option to quiet certain output that might not always be desirable. - Update the README.
2017-01-25qa: Increase a sync_blocks timeout in pruning.pySuhas Daftuar
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-07 14:10:47 +0000