Commit graph

328 commits

Author SHA1 Message Date
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
5f85d5672b Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693) 2020-11-26 01:08:16 +00:00
Andrew Poelstra
63a52d3633 Merge 29893ec875 into merged_master (Bitcoin PR #18454) 2020-11-26 01:08:15 +00:00
Andrew Poelstra
9587ad280d Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334) 2020-11-26 01:08:05 +00:00
Andrew Poelstra
bdd87dc5fa Merge 694f4cbd78 into merged_master (Bitcoin PR #18312) 2020-11-26 01:08:02 +00:00
Andrew Poelstra
ff1454245a Merge d478a737db into merged_master (Bitcoin PR #18392) 2020-11-26 01:08:00 +00:00
Andrew Poelstra
e1f1d5dc40 Merge 67de1ee8bc into merged_master (Bitcoin PR #18378) 2020-11-26 01:07:59 +00:00
Andrew Poelstra
ad33c3a204 Merge 309b0c4c19 into merged_master (Bitcoin PR #13693) 2020-11-26 01:07:54 +00:00
Andrew Poelstra
f19177a927 Merge 1a97c9a483 into merged_master (Bitcoin PR #15443) 2020-11-26 01:07:52 +00:00
Andrew Poelstra
6b887e82dc Merge d0601e67f1 into merged_master (Bitcoin PR #17812) 2020-11-26 01:07:49 +00:00
Andrew Poelstra
1f0738f05f Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172) 2020-11-26 01:07:44 +00:00
Andrew Poelstra
bca8bce3b7 Merge caa2f3af29 into merged_master (Bitcoin PR #12134) 2020-11-26 01:07:42 +00:00
Andrew Poelstra
ca0936ab69 Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585) 2020-11-26 00:29:43 +00:00
Andrew Poelstra
74d2e8da1b Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578) 2020-11-14 16:52:04 +00:00
Andrew Poelstra
7776084b8f Merge 988fe5b1ad into merged_master (Bitcoin PR #12763) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
f9acc8330d Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
3875efaaa2 Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
371868fdac Merge 4258fd7377 into merged_master (Bitcoin PR #17091) 2020-11-09 21:20:43 +00:00
Andrew Poelstra
e413b2ebbb Merge ca97d292ce into merged_master (Bitcoin PR #16551) 2020-11-09 21:20:24 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642)
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
29e73c226a Merge 5e202382a9 into merged_master (Bitcoin PR #16624) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
b81a29337a Merge b80cdfec9a into merged_master (Bitcoin PR #16618) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
19def18ab9 Merge 0d65106dce into merged_master (Bitcoin PR #16383) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
c7076b25b0 Merge e00501e00c into merged_master (Bitcoin PR #16561) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89 Merge 67be6d7a17 into merged_master (Bitcoin PR #16248) 2020-11-09 21:20:14 +00:00
Andrew Poelstra
84a62eb305 Merge c77f7cdbd1 into merged_master (Bitcoin PR #16197) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
62ce823f8f Merge c67ef2938c into merged_master (Elements PR #600)
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
9a159f8617 Merge c606e6fc53 into merged_master (Bitcoin PR #15996) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
31aa2513fb Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
04f0e67e67 Merge 51a6e2c419 into merged_master (Bitcoin PR #15681) 2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e09e584fd Merge 0515406acb into merged_master (Bitcoin PR #16374) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
47aaf203e4 Merge 8f9725c83f into merged_master (Bitcoin PR #16390) 2020-11-09 21:20:06 +00:00
Andrew Poelstra
6515bef81f Merge 413e438ea9 into merged_master (Bitcoin PR #16243) 2020-11-06 15:20:16 +00:00
Andrew Poelstra
4a70305bf8 Merge 44d8172323 into merged_master (Bitcoin PR #13756)
This PR introduces a `avoid_reuse` flag to the `getnewaddress` `sendtoaddress` `getbalance`
RPCs, which we've also added some asset-specific stuff. Since both changes have default
values they aren't individually breaking, but together they are since some existing
asset-related RPC workflows now require the user to jam a `False` in there to make
the new avoid-reuse stuff go away.
2020-11-06 15:20:16 +00:00
Andrew Poelstra
bbc59975b0 Merge 4858d36163 into merged_master (Elements PR #639) 2020-11-06 15:20:11 +00:00
Andrew Poelstra
b8e90ed29c Merge df7addc4c6 into merged_master (Bitcoin PR #15990) 2020-10-29 18:38:42 +00:00
Andrew Poelstra
66138a5309 Merge 9d266dbdec into merged_master (Bitcoin PR #15943) 2020-10-29 17:41:14 +00:00
Andrew Poelstra
62944887ff Merge f19a3b2ded into merged_master (Bitcoin PR #15949) 2020-10-29 02:07:59 +00:00
Andrew Poelstra
ff3067ebc1 Merge 45d8b71778 into merged_master (Bitcoin PR #15696) 2020-10-29 02:05:58 +00:00
Andrew Poelstra
52b8a8ee48 Merge e4beef611a into merged_master (Bitcoin PR #14121) 2020-10-28 16:46:47 +00:00
Andrew Poelstra
ef17d97342 Merge 27781b6530 into merged_master (Bitcoin PR #15466) 2020-10-28 00:07:44 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Andrew Poelstra
0f6e886bdb Merge f9dbb319d2 into merged_master (Bitcoin PR #15485) 2020-10-27 20:06:35 +00:00
MarcoFalke
fa488f131f
scripted-diff: Bump copyright headers
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
2020-04-16 13:33:09 -04:00
MarcoFalke
51e2ce45d6
Merge #17693: rpc: Add generateblock to mine a custom set of transactions
7524b6479c Add tests for generateblock (Andrew Toth)
dcc8332543 Add generateblock rpc (Andrew Toth)

Pull request description:

  The existing block generation rpcs for regtest, `generatetoaddress` and `generatetodescriptor`, mine everything in the mempool up to the block weight limit. This makes it difficult to test a system for several scenarios where a different set of transactions are mined. For example:
  - Testing the common scenario where a transaction is replaced in the mempool but the replaced transaction is mined instead.
  - Testing for a double-spent transaction where a transaction that conflicts with the mempool is mined.
  - Testing for non-standard transactions that are mined.
  - Testing the scenario where several blocks are mined without a specific transaction in the mempool being included in a block.

  This PR introduces a new rpc, `generateblock`, that takes an array of raw transactions and txids and mines only those and the coinbase. Any txids must be in the mempool, but the raw txs can be anything conforming to consensus rules. The coinbase can be specified as either an address or descriptor.

  This reopens #17653 since it was closed by mistake.

  Thanks to instagibbs for code suggestions that I used here.

ACKs for top commit:
  MarcoFalke:
    re-ACK 7524b6479c 📁

Tree-SHA512: 857106007465b5b9b8a84b6d07c17cbf8378a33a72d32ff79abea1d5ab4babb4d53a11ddbb14595aa1fac9dfa1391e3a11403d742f69951beea2f683e8a01cd4
2020-04-10 13:12:30 -04:00
MarcoFalke
29893ec875
Merge #18454: net: Make addr relay mockable, add test
fa1da3d4bf test: Add basic addr relay test (MarcoFalke)
fa1793c1c4 net: Pass connman const when relaying address (MarcoFalke)
fa47a0b003 net: Make addr relay mockable (MarcoFalke)

Pull request description:

  As usual:

  * Switch to std::chrono time to be type-safe and mockable
  * Add basic test that relies on mocktime to add code coverage

ACKs for top commit:
  naumenkogs:
    utACK  fa1da3d
  promag:
    ACK fa1da3d4bf (fabe56e44b6f683e24e37246a7a8851190947cb3 before https://github.com/bitcoin/bitcoin/pull/18454#issuecomment-607866453), fa5bf23d527a450e72c2bf13d013e5393b664ca3 was dropped since last review.

Tree-SHA512: 0552bf8fcbe375baa3cab62acd8c23b2994efa47daff818ad1116d0ffaa0b9e520dc1bca2bbc68369b25584e85e54861fe6fd0968de4f503b95439c099df9bd7
2020-04-10 10:12:46 -04:00
MarcoFalke
fa1da3d4bf
test: Add basic addr relay test 2020-04-02 23:29:32 +08:00
MarcoFalke
7e1fc03b18
Merge #18334: test: Add basic test for BIP 37
fa15699969 test: Add basic test for BIP 37 (MarcoFalke)

Pull request description:

  This does not add full coverage, but should be a good start and can be extended in the future. Currently, none of the BIP 37 p2p code has test coverage.

ACKs for top commit:
  practicalswift:
    Code review ACK fa15699969 -- more testing coverage is better than less testing coverage

Tree-SHA512: d52e8be79240dffb769105c087ae0ae9305d599282546e4ca7379c4c7add2dbcd668265b46670aa07c357638044cf0f61a6fab7dba8971dd0f80c8f99768686e
2020-03-30 15:28:02 -04:00
Andrew Toth
7524b6479c Add tests for generateblock 2020-03-27 12:09:31 -04:00