aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-08-21Only return hex field once in getrawtransactionAndrew Chow
The hex is already returned in TxToUniv, no need to give it out a second independent time in getrawtransaction itself. Github-Pull: #11027 Rebased-From: e029c6e709d251809aa04edc08f76a077a2443e7 Tree-SHA512: 4f7892431ddb9b59bcc59756890b97a20d046d1d4898f8a80c564223e1cde1c922da403cea4b8ae79d70741d1a9ff337f077043e5bb538cdc4d34fbe09301240
2017-08-21[wallet] Add logging to MarkReserveKeysAsUsedJohn Newbery
Github-Pull: #11044 Rebased-From: 67ceff4039ae038ae16f06128f868a2e8395b59a Tree-SHA512: 850c5b1010c84e164edf24a83ae36e46309b2eb7a67854bad509265ed590ba67d5f743a8416590da6ecca85fe4bda7f20e8c3152e422638eb7898db11a416af7
2017-08-21[wallet] Remove keypool_topup_cleanupsJohn Newbery
Unused function. Mostly reverts c25d90f125d69e33688288eff439eb7be75012e9 c25d90f... was merged as part of PR 11022 but is not required. Github-Pull: #11044 Rebased-From: 1221f60c94971c0f66abe5fdf086087a173bb0ac Tree-SHA512: da229b128bee5f124c009a1a2adfb4fa879366c81789824c426c9ce5209c835888a7e6cfeb1724551320a98cd08406a605372f84487a0d289cd6e02f9ac3ea21
2017-08-21doc: Update build-openbsd for 6.1Wladimir J. van der Laan
- Bump "updated for" - Fix link to boost (haenet mirror is broken) - Upgrade boost version to 1.64 Github-Pull: #11080 Rebased-From: 5be6e9b4f9991a5f8ff74aa8aaa4962cb45728b6 Tree-SHA512: 72877bf32e4f38fb530946c065c23edd683a0da379c33fa3eee4fbeb51e2c97171f5d33ebe1e77f25c3e14779d94e8198cc8fbb6e1055a1024638458ef7cc032
2017-08-21Add length check for CExtKey deserializationJonas Schnelli
Github-Pull: #11081 Rebased-From: 07685d1bc1b0b815c00a68a5b7b335ffa0d4d90d Tree-SHA512: 7f6b9ca6714d059d500531eb842c1c25edfa04ecba0ea1d9a28010fced657c066cea67d2016bbaa9b96c431a05ca9c0dcf2ba301898ecf96a65a4e01aac7fae9
2017-08-21Fix combinerawtransaction RPC help result sectionJonas Nick
Github-Pull: #11083 Rebased-From: f9ca0fe44ec673695e601045630f151a806e000d Tree-SHA512: ef94958d7de11e091db456e253fa4a188b0b0e713149bd568aa2de11a8a3c1585b34bbfb78aaac12f969533f05602ed8b1cd16275429d86a80c36bb594ce6526
2017-08-21disable jni in buildsGregory Sanders
Github-Pull: #11056 Rebased-From: 844b73e486ca146f3f9f3060e878814752c25fd5 Tree-SHA512: f735853c3d9abbde5032cc55201b0ddc29679e681ba7d3822cbcbeee17c7185ee984b235411224cfb8ff12550de88a0f1367d55ad24bf52c5c03061330849eb2
2017-08-21Merge #11090: Update contributor names in release-notes.mdWladimir J. van der Laan
008f64f Update release-notes.md (Derek Miller) Pull request description: Eric Shaw Jr -> Eric Shaw (from GitHub profile) gubatron -> Angel Leon (from GitHub profile) jonnynewbs -> John Newbery (duplicate) keystrike -> James Evans (duplicate) Kibbled Jive Elk Zoo -> KibbledJiveElkZoo (duplicate) kirit93 -> Kirit Thadaka (from GitHub profile) NicolasDorier -> Nicolas Dorier (duplicate) Tree-SHA512: c952e72cc82fd780532488fbd10b35918c9ac686cb6352b752a04ce5694bbdb7c2d3402b3187cdf4e5325e42e98cfacf2a95b565792cfdf7efeef1d369669e36
2017-08-18Update release-notes.mdDerek Miller
Eric Shaw Jr -> Eric Shaw (from GitHub profile) gubatron -> Angel Leon (from GitHub profile) jonnynewbs -> John Newbery (duplicate) keystrike -> James Evans (duplicate) Kibbled Jive Elk Zoo -> KibbledJiveElkZoo (duplicate) kirit93 -> Kirit Thadaka (from GitHub profile) NicolasDorier -> Nicolas Dorier (duplicate)
2017-08-18Merge #11076: 0.15 release-notes nits: fix redundancy, remove accidental ↵Wladimir J. van der Laan
parenthesis & fix range style 30c246b Updating the release notes (minor stylistic changes) (practicalswift) Pull request description: 0.15 release-notes nits: * Remove accidental parenthesis * Fix redundancy ("remain" vs. previous "continue to remain") * Fix range style ("from X to Y" vs. previous "from X-Y") Tree-SHA512: d3621b6cc781e82d0156a559f71b8190c0fb1aed9ae7a8173ac9c57387a1a03fb9b8a6e4c709adadf80bcc2c2eff113dd6aa8471899c0121392c8138218cdb6c
2017-08-18Updating the release notes (minor stylistic changes)practicalswift
2017-08-14build: bump version to 0.15.0v0.15.0rc1Wladimir J. van der Laan
Tree-SHA512: 7cdf0efaafeb47ec25d29fa9dc1c5caa762ee62614288fc849370d89bd64c1e8039175fe44163fb5655db10b567baa028ae514a05ebdaf06432b9698849da195
2017-08-14Merge #10607: scripted-diff: stop using the gArgs wrappersWladimir J. van der Laan
fcbde90 remove unused gArgs wrappers (Marko Bencun) bb81e17 scripted-diff: stop using the gArgs wrappers (Marko Bencun) Tree-SHA512: 49190740dfc723d680a093b625bf4e4e010bc121741b035d790f787e73eedd74966e4ceaf56975050d06b5d7d6cd8f46f9deb5cc78569df1e9faf0d7e543ee21
2017-08-14remove unused gArgs wrappersMarko Bencun
2017-08-14scripted-diff: stop using the gArgs wrappersMarko Bencun
They were temporary additions to ease the transition. -BEGIN VERIFY SCRIPT- find src/ -name "*.cpp" ! -wholename "src/util.h" ! -wholename "src/util.cpp" | xargs perl -i -pe 's/(?<!\.)(ParseParameters|ReadConfigFile|IsArgSet|(Soft|Force)?(Get|Set)(|Bool|)Arg(s)?)\(/gArgs.\1(/g' -END VERIFY SCRIPT-
2017-08-14doc: Update release notes from wikiWladimir J. van der Laan
Update release notes from wiki, and fill in authors list from git. Additional credits: - Awemany (for #10854) - Gregory Maxwell (release notes writing) - John Newbery (release notes writing) - Kibbled Jive Elk Zoo (for https://github.com/bitcoin/bitcoin/pull/10177#issuecomment-309244097) - Luke Dashjr (release notes writing) - Marco Falke (release notes writing) - Pieter Wuille (release notes writing) - Rusty Russell (release notes writing) - tintinweb (for early-announcing miniupnp CVE-2017-8798, forgot this for 0.14.2) Tree-SHA512: 8024eb761fcac4bb7f16ba3a9db376508f1f1bcf8a89cfb5e2928ad384675d3e912cada6ffef7d5aac181a965ebb8b823f6a63d9e976c1be753ec8eb9a8b9ef5
2017-08-14Merge #10483: scripted-diff: Use the C++11 keyword nullptr to denote the ↵Wladimir J. van der Laan
pointer literal instead of the macro NULL 90d4d89 scripted-diff: Use the C++11 keyword nullptr to denote the pointer literal instead of the macro NULL (practicalswift) Pull request description: Since C++11 the macro `NULL` may be: * an integer literal with value zero, or * a prvalue of type `std::nullptr_t` By using the C++11 keyword `nullptr` we are guaranteed a prvalue of type `std::nullptr_t`. For a more thorough discussion, see "A name for the null pointer: nullptr" (Sutter & Stroustrup), http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf With this patch applied there are no `NULL` macro usages left in the repo: ``` $ git grep NULL -- "*.cpp" "*.h" | egrep -v '(/univalue/|/secp256k1/|/leveldb/|_NULL|NULLDUMMY|torcontrol.*NULL|NULL cert)' | wc -l 0 ``` The road towards `nullptr` (C++11) is split into two PRs: * `NULL` → `nullptr` is handled in PR #10483 (scripted, this PR) * `0` → `nullptr` is handled in PR #10645 (manual) Tree-SHA512: 3c395d66f2ad724a8e6fed74b93634de8bfc0c0eafac94e64e5194c939499fefd6e68f047de3083ad0b4eff37df9a8a3a76349aa17d55eabbd8e0412f140a297
2017-08-14Merge #11012: Make sure to clean up mapBlockSource if we've already seen the ↵Wladimir J. van der Laan
block 3f8fa7f Make sure to clean up mapBlockSource if we've already seen the block (Cory Fields) Pull request description: Otherwise we may leave them dangling. Credit TheBlueMatt. Tree-SHA512: 8be77e08ebfc4f5b206d5ee7cfbe87f92c1eb5bc2b412471993658fe210306789aaf0f3d1454c635508a7d8effede2cf5ac144d622b0157b872733d9661d65c3
2017-08-14Merge #11028: Avoid masking of difficulty adjustment errors by checkpointsWladimir J. van der Laan
85c82b5 Avoid masking of difficulty adjustment errors by checkpoints (Pieter Wuille) Pull request description: Currently difficulty adjustment violations are not reported for chains that branch off before the last checkpoint. Change this by moving the checkpoint check after the difficulty check. Tree-SHA512: 33666f2c3459151b28c42041a463779e6df18f61d3dd5b1879a0af4e5b199ef74d1e33e06af68bebfdfb211569ad5fb56556bfebe9d63b5688d910ea211b839a
2017-08-14Merge #11022: Basic keypool topupWladimir J. van der Laan
d34957e [wallet] [tests] Add keypool topup functional test (Jonas Schnelli) 095142d [wallet] keypool mark-used and topup (John Newbery) c25d90f [wallet] Add HasUnusedKeys() helper (John Newbery) f2123e3 [wallet] Cache keyid -> keypool id mappings (John Newbery) 83f1ec3 [wallet] Don't hold cs_LastBlockFile while calling setBestChain (John Newbery) 2376bfc [wallet] [moveonly] Move LoadKeyPool to cpp (Matt Corallo) cab8557 [wallet] [moveonly] Move CAffectedKeysVisitor (Jonas Schnelli) Pull request description: This PR contains the first part of #10882 : - if a key from the keypool is used, mark all keys up to that key as used, and then try to top up the keypool - top up the keypool on startup Notably, it does not stop the node or prevent the best block from advancing if the keypool drops below a threshold (which means that transactions may be missed and funds lost if restoring from an old HD wallet backup). Tree-SHA512: ac681fefeaf7ec2aab2fa1da93d12273ea80bd05eb48d7b3b551ea6e5d975dd97ba7de52b7fba52993823280ac4079cc36cf78a27dac708107ebf8fb6326142b
2017-08-14Merge #10968: Add instructions for parallel gitian builds.Wladimir J. van der Laan
e93ff71 Add instructions for multi-processor gitian builds (Charlie Lee) Pull request description: This makes builds much faster if you have a multi-core machine. Tree-SHA512: edb64c691a31a8a2e6c45f87886912d429a3fd600ebc0de2b16d44efd9d38bb92fea33c5fed207ad684b75d3247218912cab67661466a5538d534845e0808c9f
2017-08-13Add instructions for multi-processor gitian buildsCharlie Lee
2017-08-12Merge #11032: [qa] Fix block message processing error in sendheaders.pyMarcoFalke
f1bf31186 [qa] Fix block message processing error in sendheaders.py (Suhas Daftuar) Pull request description: Introduced in #10169 @jnewbery Tree-SHA512: f330b926c51bd4f1b63738e1ddac23c58cb32345baed36343f7a989b3b9906c5c6e7dbd74b416f662c6ef68b8d256a6c69a977ec5f85789b2c1dc802bc831f6b
2017-08-12Merge #11000: test: Add resendwallettransactions functional testsMarcoFalke
bdf607e43 test: Add resendwallettransactions functional tests (João Barbosa) Pull request description: Adds functional tests to cover the behaviour introduced in #10995. Tree-SHA512: 3be337cbe51edab2cc0eb9ecfa68d00cd3c3a00aef0672cd841706802726c9cd4138626a8f209c3d9fbd207ce332daa062f270e4c94c1c2398bfc475e36423f6
2017-08-12test: Add resendwallettransactions functional testsJoão Barbosa
2017-08-11[qa] Fix block message processing error in sendheaders.pySuhas Daftuar
2017-08-11Merge #11023: [tests] Add option to attach a python debugger if functional ↵MarcoFalke
test fails cc5d38f4b Add option to attach a python debugger if test fails (John Newbery) Pull request description: Adds a simple option to the test_framework to attach pdb if the test fails. Helpful for catching and debugging intermittent failures: Run the test in a loop with this option. The first failure will cause execution to pause and nodes will be left running for interactive debugging. @sdaftuar Tree-SHA512: 01cfae15fa3f04ed6ec6a99fef60a6c6a59723429309e81eacd6767caf12f5758f59b337804291ecab33a38a2958f36e2b513d201bee72a2eeb207a67046f952
2017-08-11Merge #10765: Tests: address placement should be deterministic by defaultMarcoFalke
c5ebddd11 Tests: address placement should be deterministic by default (René Nyffenegger) Pull request description: Better version of wrong and closed pull request https://github.com/bitcoin/bitcoin/pull/10764 Tree-SHA512: dfda6ea4a9dd0f4c8b96212ad43a716ff1dddf115cd2712a2a7e42c97fc9494079c746906b39d880a9827c05d2b75c728afd4ca4519ce4d365f0dae0c4aec24c
2017-08-11Merge #11025: qa: Fix inv race in example_testMarcoFalke
faa76d1b7 qa: Fix inv race in example_test (MarcoFalke) Pull request description: There have been intermittent test failures on this script. ```py File "./test/functional/example_test.py", line 216, in run_test assert_equal(block, 1) AssertionError: not(2 == 1) ``` Probably the simplest way to fix them is overriding the `on_inv` method, so that no "colliding" getdata for the blocks are sent out. Additionally, all getdata are now sent in a single message. Tree-SHA512: 809c2bbfa90a67fc97905769fcbe90ba9abe1aac1f145530934f56a364835973b94d3302b6be68f4f2987acf333bce146bcc4c878c283301871ba5bb1a9bedb6
2017-08-11Merge #11029: [RPC] trivial: gettxout no longer shows version of txMarcoFalke
86279464b [RPC] trivial: gettxout no longer shows version of tx (Felix Weis) Pull request description: Since the switch to a per-txout chainstate db in #10195, the tx version information is no longer stored. Updated `gettxout` rpc help text accordingly. Tree-SHA512: 3d7f42ef0f649056ece98bf22a1e972d1876324733adc81fa31bc2cd160550c5b6cb8682209fb8e8dbc56a8139ed5f5f0e740945f709039e69d52997ddbca7b8
2017-08-11[RPC] trivial: gettxout no longer shows version of txFelix Weis
Since the switch to a per-txout chainstate db in #10195, the tx version information is no longer stored. Updated `gettxout` rpc help text accordingly.
2017-08-10Avoid masking of difficulty adjustment errors by checkpointsPieter Wuille
Currently difficulty adjustment violations are not reported for chains that branch off before the last checkpoint. Change this by moving the checkpoint check after the difficulty check.
2017-08-10qa: Fix inv race in example_testMarcoFalke
2017-08-10[wallet] [tests] Add keypool topup functional testJonas Schnelli
2017-08-10[wallet] keypool mark-used and topupJohn Newbery
This commit adds basic keypool mark-used and topup: - try to topup the keypool on initial load - if a key in the keypool is used, mark all keys before that as used and try to top up
2017-08-10Add option to attach a python debugger if test failsJohn Newbery
2017-08-09Merge #10835: Rename member field according to the style guideMarcoFalke
4d4fb33fc Rename member field according to the style guide. (Pavel Janík) Pull request description: After #10193, approx. five instances of this warning are printed when compiling with `-Wshadow`: ``` In file included from txmempool.cpp:14: ./reverse_iterator.h:20:22: warning: declaration shadows a field of 'reverse_range<T>' [-Wshadow] reverse_range(T &x) : x(x) {} ^ ./reverse_iterator.h:17:8: note: previous declaration is here T &x; ^ 1 warning generated. ``` Tree-SHA512: 6c07c2ed6f4f232a3a8bdcdd6057040967c74552fd29d80f42e8a453b95baf203c410aa31dccc08ff2e765cbba02b1a282f6ea7804955f09b31ab20ef383792e
2017-08-09qt: Periodic translations updateWladimir J. van der Laan
Tree-SHA512: f967af98ba40908f3ba1286659a7ffedd1319d8d7d5c8d658f266897cb61ea28bace3f20f8ec77b83a69ac311c7e65467e40c3ee8b320a88768afa15e8c802cc
2017-08-09Merge #10963: [bench] Restore format state of cout after printing with ↵MarcoFalke
std::fixed/setprecision fd05132e5 Restore default format state of cout after printing with std::fixed/setprecision (practicalswift) Pull request description: Restore default format state of `std::cout` after printing with `std::fixed`/`std::setprecision`. Tree-SHA512: 445b5b42aff58e2350939e8febc9b4a6fff478616abfe831aec42bee906cefac7a153c93d506407fb213d04dae9c7afbb5bfd344be63ca0f40ae39b331a4144f
2017-08-09Merge #11003: Docs: Capitalize bullet points in CONTRIBUTING guideMarcoFalke
13b1e9a16 Capitalize bullet points in CONTRIBUTING guide (Evan Klitzke) Pull request description: English grammar dictates that these bullet points should be capitalized. This also makes the capitalization style consistent with the rest of the document, e.g. the "Decision Making Process" section. Tree-SHA512: 59f5a8941180ff3862ba63d364c27fd83d2e144299a71b2e784d58f806e8a02d7951dcc80fcc7152d0c78c2d1f5a22db1236af7ea6b9abece8dbe93533e4b65c
2017-08-08Make sure to clean up mapBlockSource if we've already seen the blockCory Fields
Credit TheBlueMatt
2017-08-08Merge #10695: [qa] Rewrite BIP65/BIP66 functional testsMarcoFalke
4ccc12a54 [qa] Rewrite BIP66 functional tests (Suhas Daftuar) d4f0d87b6 [qa] Rewrite BIP65 functional tests (Suhas Daftuar) Pull request description: After 122786d0e0170c73536360b705af711e1338adbf, BIP65 and BIP66 activate at particular fixed heights (without regard to version numbers of blocks below those heights). Rewrite the functional tests to take this into account, and remove two tests that weren't really testing anything. Moves the rewritten functional tests out of the extended test suite, so that they run in travis regularly. Note: I discovered that the ComparisonTestFramework (which the original versions of these p2p tests were written is, has a bug that caused them to not catch obvious errors, eg if you just comment out setting the script flags for these softforks in ConnectBlock, the versions of these tests in master do not fail(!) -- will separately PR a fix for the comparison test framework). Tree-SHA512: 2108b79951f2e980854d0d14ccc0fd1810a43dd4251fd6e3b203e7f104ea55e00650bb1a60a28c2801b4249f46563a8559ac3e3cd39db220914acfed0b3b163d
2017-08-08Capitalize bullet points in CONTRIBUTING guideEvan Klitzke
English grammar dictates that these bullet points should be capitalized. This also makes the capitalization style consistent with the rest of the document, e.g. the "Decision Making Process" section.
2017-08-08Merge #10998: Fix upgrade cancel warningsWladimir J. van der Laan
861f9a2 Skip remainder of init if upgrade is cancelled (Matt Corallo) Pull request description: Based on #10919. Without this, if you cancel upgrade, you get a needless error: ERROR: VerifyDB(): *** irrecoverable inconsistency in block data at Tree-SHA512: aa47665682c6605ada376f1c100ce17cf8c4312427929eb2e75306f2199b47cbcdb4e0d98d5efcfefff03947b2c0fcbd3aab487a4ed14d50607df685c91a03d0
2017-08-08Merge #11002: [wallet] return correct error code from resendwallettransactionWladimir J. van der Laan
055d95f [wallet] return correct error code from resendwallettransaction (John Newbery) Pull request description: New code in #10995 uses `RPC_INVALID_REQUEST`. According to the comment in rpc/protocol.h: ``` // RPC_INVALID_REQUEST is internally mapped to HTTP_BAD_REQUEST (400). // It should not be used for application-layer errors. ``` Change the returned error code to `RPC_WALLET_ERROR` #11000 will need to be updated to test for the correct error code. Tree-SHA512: 0201b3a2091adf17ad301825da5bd29f0ea7e284b5394cbef80483fc293a558acc849f74a0780bb8501acab324fc722e41ae049cffec7afb76884e26df4b809e
2017-08-08Merge #10999: Fix amounts formatting in `decoderawtransaction`Wladimir J. van der Laan
ce07638 doc: Add comment to use ValueFromAmount/AmountFromValue for JSON, not utilmoneystr (Wladimir J. van der Laan) ec05c50 rpc: Use ValueFromAmount instead of FormatMoney in TxToUniv (Wladimir J. van der Laan) 46347ad rpc: Move ValueFromAmount to core_write (Wladimir J. van der Laan) dac3782 doc: Correct AmountFromValue/ValueFromAmount names (Wladimir J. van der Laan) Pull request description: With this, the amounts returned in `decoderawtransaction` will be padded to 8 digits like anywhere else in the API. This is accomplished by using `ValueFromAmount` in `TxToUniv`, instead of `FormatMoney` which it currently (mistakingly) uses. The `FormatMoney` function is only for debugging/logging use! To avoid dependency issues, `ValueFromAmount` is moved to `core_write.cpp`, where it also fits better. I don't move `AmountFromValue` to `core_read.cpp` at the same time, as this would have more impact due to the RPCError dependency there. (n.b.: large number of changed files is solely due to the util_tests JSONs needing update) Tree-SHA512: 10fc2d27d33a77dbcb57aa7eccd4f53110c05d38eb7df6d40f10f14c08fad4274472e93af75aa59fe68ad0720fdf0930f0108124abef518e0dd162b3d2b2b292
2017-08-07Merge #11001: [tests] Test disconnecting unsupported service bits logic.MarcoFalke
5e35cd94c [tests] Test disconnecting unsupported service bits logic. (John Newbery) Pull request description: In v0.15, we disconnect nodes that send us version messages with unsupported service bits (1 << 5 and 1 << 7). This commit adds a test that bitcoind will disconnect those nodes before August 1st 2018, and won't disconnect those nodes after August 1st 2018. @sdaftuar @TheBlueMatt Tree-SHA512: cb1bf311f9edc4aa5acf621e392543fd92952b2462ae2a8c20339e5c41e67ece1a2a9ede38db5dcd16563faa9ee58318e118f54024dd282c580132202d2df01b
2017-08-07[wallet] return correct error code from resendwallettransactionJohn Newbery
2017-08-07[tests] Test disconnecting unsupported service bits logic.John Newbery
In v0.15, we disconnect nodes that send us version messages with unsupported service bits (1 << 5 and 1 << 7). This commit adds a test that bitcoind will disconnect those nodes before August 1st 2018, and won't disconnect those nodes after August 1st 2018.
2017-08-07Skip remainder of init if upgrade is cancelledMatt Corallo
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-07 12:55:57 +0000