Commit graph

29954 commits

Author SHA1 Message Date
Andrew Poelstra
9915395a3e Merge bb68abe784 into merged_master (Bitcoin PR #15718) 2020-10-28 15:15:23 +00:00
Andrew Poelstra
fa9e0619fa Merge 570eb7b130 into merged_master (Bitcoin PR #15782) 2020-10-28 15:11:01 +00:00
Andrew Poelstra
f3b06ff713 Merge c536dfbcb0 into merged_master (Bitcoin PR #15639)
asp: the point of this PR was to completely decouple libbitcoin_server from
bitcoin_tool; it removes $(LIBBITCOIN_SERVER) from the `elements_wallet_LDADD`.
I put this back in because our additional code related to pegin claiming makes
heavy use of methods from libbitcoin_server.

If we want to morally accept this PR then we need to do a nontrivial refactoring.
2020-10-28 15:00:23 +00:00
John Newbery
778cd0d88d [tests] Remove getnettotals/getpeerinfo consistency test
We make no guarantees about consistency between RPC calls.
2020-10-28 10:18:09 +00:00
Wladimir J. van der Laan
db26eeba71
Merge #19877: [test] clarify rpc_net & p2p_disconnect_ban functional tests
47ff5098ad [test] Clarify setup of node topology. (Amiti Uttarwar)
0672522aed [move-only, test]: Match test order with run order (Amiti Uttarwar)

Pull request description:

  small improvements to clarify logic in the functional tests
  1. have test logic in `rpc_net.py` match run order of the test
  2. remove `connect_nodes` calls that are redundant with the automatic test setup executed by the test framework

  Noticed when I was trying to debug a test for #19725. Small changes but imo very helpful, because they initially confused me.

ACKs for top commit:
  laanwj:
    ACK 47ff5098ad

Tree-SHA512: 2843da2c0b4f06b2600b3adb97900a62be7bb2228770abd67d86f2a65c58079af22c7c20957474a98c17da85f40a958a6f05cb8198aa0c56a58adc1c31100492
2020-10-28 10:25:34 +01:00
MarcoFalke
488b77f72e
Merge #20256: qt: Pre-splitoff translations update
a193f969ee qt: Pre-splitoff translations update (Wladimir J. van der Laan)

Pull request description:

  Do a pre-splitoff translations update. Pulls the translations from Transifex, and apparently, there are also some new English messages in the source code since the transtlations freeze, but not many.

ACKs for top commit:
  fanquake:
    ACK a193f969ee - I got the same changes (branch: [translation_check_0210](https://github.com/fanquake/bitcoin/tree/translation_check_0210)), except for a diff in `src/qt/locale/bitcoin_es_MX.ts`. Although from a look on Transifex it seems that transalation may have been updated in the last hour or so.

Tree-SHA512: 315c1f4327142caae01179a8398b0a8adb9108e1fc8122585274b7ed74ae878554399a06fd12a8103a4933ecf0ad6e211d6efc63edc6827c0168317f2b83528f
2020-10-28 08:50:12 +01:00
Pieter Wuille
5803f5f5f6 Update secp256k1 subtree to latest master 2020-10-27 23:08:48 -07:00
Pieter Wuille
6c0259fc2f Squashed 'src/secp256k1/' changes from c6b6b8f1bb..3967d96bf1
3967d96bf1 Merge #838: Make autotools check for all the used openssl functions
3734b68200 Configure echo if openssl tests are enabled
6f54e69f03 Merge #841: Avoids a potentially shortening size_t to int cast in strauss_wnaf_
8893f42438 Avoids a potentially shortening size_t to int cast in strauss_wnaf_
e6692778d3 Modify bitcoin_secp.m4's openssl check to call all the functions that we use in the tests/benchmarks. That way linking will fail if those symbols are missing
ac05f61fcf Merge #809: Stop treating ECDH as experimental
e6e3d5da2f travis: add schnorrsig to valgrind and big endian platform test
353dff156f Stop treating ECDH as experimental

git-subtree-dir: src/secp256k1
git-subtree-split: 3967d96bf184519eb98b766af665b4d4b072563e
2020-10-27 23:08:48 -07:00
Andrew Poelstra
8291a9baa8 Merge f6120d40d5 into merged_master (Bitcoin PR #15728) 2020-10-28 03:32:35 +00:00
Andrew Poelstra
a8581ea138 Merge 6a135fbe5b into merged_master (Bitcoin PR #15638) 2020-10-28 03:16:57 +00:00
Andrew Poelstra
52dcca25f1 Merge e3a0688f82 into merged_master (Bitcoin PR #15659) 2020-10-28 03:11:38 +00:00
Andrew Poelstra
5af007d081 Merge e82f6ad6f2 into merged_master (Bitcoin PR #15754) 2020-10-28 03:11:29 +00:00
Andrew Poelstra
27d91fd4fa Merge 8c022e8ac4 into merged_master (Bitcoin PR #15746) 2020-10-28 03:11:21 +00:00
Andrew Poelstra
228f1a27ee Merge 5392aee64f into merged_master (Bitcoin PR #15629) 2020-10-28 03:11:10 +00:00
Andrew Poelstra
d587731748 Merge 93de9abe6d into merged_master (Bitcoin PR #15632) 2020-10-28 02:56:25 +00:00
Amiti Uttarwar
47ff5098ad [test] Clarify setup of node topology.
Since the test framework automatically sets up a connection between the nodes,
the second connect_nodes call was a no-op. Remove the redundant call & add
comments to explain the expected topology.
2020-10-27 19:23:02 -07:00
Andrew Poelstra
d7e441aead Merge 23712f8ab9 into merged_master (Bitcoin PR #15693) 2020-10-28 02:13:08 +00:00
Andrew Poelstra
8b4b800d49 Merge f9f6c11a74 into merged_master (Bitcoin PR #15771) 2020-10-28 02:12:01 +00:00
Andrew Poelstra
c8a4572c1f Merge f3ecf3025f into merged_master (Bitcoin PR #15772) 2020-10-28 02:02:37 +00:00
Andrew Poelstra
f58b9ee068 Merge 54798c3a31 into merged_master (Bitcoin PR #15749) 2020-10-28 01:51:02 +00:00
Andrew Poelstra
ccc0b0afff Merge db2985651d into merged_master (Bitcoin PR #15747) 2020-10-28 01:43:49 +00:00
Andrew Poelstra
0374822983 Merge 8088ff21e4 into merged_master (Bitcoin PR #15765) 2020-10-28 01:07:59 +00:00
Andrew Poelstra
c85c0c1473 Merge 79f73436a9 into merged_master (Bitcoin PR #15757) 2020-10-28 00:55:50 +00:00
Andrew Poelstra
2a125939bb Merge a238fccce8 into merged_master (Bitcoin PR #15763) 2020-10-28 00:55:43 +00:00
Andrew Poelstra
a4ff5d1443 Merge 297ea51caf into merged_master (Bitcoin PR #15760) 2020-10-28 00:55:38 +00:00
Andrew Poelstra
07b4e64805 Merge 414d8461fd into merged_master (Bitcoin PR #15711) 2020-10-28 00:55:29 +00:00
Andrew Poelstra
2ae17352e9 Merge b4e74f938b into merged_master (Bitcoin PR #15446) 2020-10-28 00:55:13 +00:00
Andrew Poelstra
b10d0a931c Merge 327d2746fb into merged_master (Bitcoin PR #15495) 2020-10-28 00:55:06 +00:00
Andrew Poelstra
de7ec6ebb1 Merge efbc86733a into merged_master (Bitcoin PR #15660) 2020-10-28 00:54:56 +00:00
Andrew Poelstra
d0fde0a054 Merge e439aeb30c into merged_master (Bitcoin PR #15508) 2020-10-28 00:54:38 +00:00
Andrew Poelstra
3ce8c07674 Merge 35991b162f into merged_master (Bitcoin PR #15755) 2020-10-28 00:53:53 +00:00
Andrew Poelstra
550f2d6486 Merge c83442e174 into merged_master (Bitcoin PR #15654) 2020-10-28 00:53:47 +00:00
Andrew Poelstra
dd652858a0 Merge daef20fb50 into merged_master (Bitcoin PR #15596) 2020-10-28 00:53:40 +00:00
Andrew Poelstra
fcce829ca6 Merge ba54342c9d into merged_master (Bitcoin PR #15685) 2020-10-28 00:53:18 +00:00
Andrew Poelstra
b09684d9a2 Merge 2c364fde42 into merged_master (Bitcoin PR #14853) 2020-10-28 00:53:12 +00:00
Andrew Poelstra
4ddc27c626 Merge 8dbb2c5e67 into merged_master (Bitcoin PR #15680) 2020-10-28 00:53:05 +00:00
Andrew Poelstra
977c818532 Merge 5a2a9b5b06 into merged_master (Bitcoin PR #15652) 2020-10-28 00:52:44 +00:00
Andrew Poelstra
c74f7eb72c Merge 35477e9e4e into merged_master (Bitcoin PR #15644) 2020-10-28 00:51:55 +00:00
Andrew Poelstra
d3f175e7cb Merge 79c345a011 into merged_master (Bitcoin PR #15669) 2020-10-28 00:51:46 +00:00
Andrew Poelstra
e593b8c25c Merge 00ca24b68f into merged_master (Bitcoin PR #15533) 2020-10-28 00:51:20 +00:00
Andrew Poelstra
1fbe0f774a Merge 0baf4b1f96 into merged_master (Bitcoin PR #15683) 2020-10-28 00:51:15 +00:00
Andrew Poelstra
e790cca639 Merge dc5c2e4407 into merged_master (Bitcoin PR #15686) 2020-10-28 00:48:57 +00:00
Andrew Poelstra
094dd366e4 Merge 904129b35d into merged_master (Bitcoin PR #15255) 2020-10-28 00:48:46 +00:00
Andrew Poelstra
073e184a66 Merge edc68d40e9 into merged_master (Bitcoin PR #15663) 2020-10-28 00:48:24 +00:00
Andrew Poelstra
900b857231 Merge 9e7dc682e0 into merged_master (Bitcoin PR #15616) 2020-10-28 00:48:17 +00:00
Andrew Poelstra
8e677306d0 Merge 32e0428e37 into merged_master (Bitcoin PR #15684) 2020-10-28 00:47:51 +00:00
Andrew Poelstra
cab2785c07 Merge edb8df4fea into merged_master (Bitcoin PR #15682) 2020-10-28 00:47:44 +00:00
Andrew Poelstra
215a7cb64d Merge 3702e1c17b into merged_master (Bitcoin PR #15646) 2020-10-28 00:47:30 +00:00
Andrew Poelstra
0fe213a5d9 Merge 656a15e539 into merged_master (Bitcoin PR #15620) 2020-10-28 00:35:45 +00:00
João Barbosa
989e579d07 qt: Make transaction notification queue wallet specific
Drop global vQueueNotifications and make one for each wallet.
2020-10-28 00:35:17 +00:00