Andrew Poelstra
cf718f2179
Merge 478fe328a7 into merged_master (Bitcoin PR #16475 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
7b34c1b724
Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
29e9ba5bc9
Merge dfb7fd60f2 into merged_master (Bitcoin PR #16402 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
bf4ccc84dd
Merge dbf4f3f86a into merged_master (Bitcoin PR #16301 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
152198061a
Merge 459baa1756 into merged_master (Bitcoin PR #16208 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
082a6486a0
Merge 4fcccdac78 into merged_master (Bitcoin PR #16244 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
8a94b6b2cb
Merge ff0aad8a40 into merged_master (Bitcoin PR #16361 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
7774f13936
Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4
Merge 8d1286014c into merged_master (Bitcoin PR #16237 )
...
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
969b50e413
Merge 1212808762 into merged_master (Bitcoin PR #16257 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
d363ffe5e4
Merge ca80fec973 into merged_master (Bitcoin PR #16286 )
2020-11-09 03:58:17 +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
d4b074ad4b
Merge d54d02bfe1 into merged_master (Elements PR #660 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
c6ad410dd9
Merge a6beb256ed into merged_master (Elements PR #629 )
2020-11-06 15:20:11 +00:00
Andrew Poelstra
4862e2ee48
Merge ed40fbb02a into merged_master (Bitcoin PR #15741 )
2020-10-29 23:21:56 +00:00
Andrew Poelstra
4c663b631a
Merge f3d27d126b into merged_master (Bitcoin PR #16033 )
2020-10-29 19:10:55 +00:00
Andrew Poelstra
5cb1c16c7d
Merge d5931f3676 into merged_master (Bitcoin PR #15870 )
2020-10-29 18:02:26 +00:00
Andrew Poelstra
ff1c4012ad
Merge de5af41e35 into merged_master (Bitcoin PR #15452 )
2020-10-29 14:52:44 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
9ca74a409b
Merge c5ffe8d515 into merged_master (Bitcoin PR #15730 )
2020-10-29 02:14:31 +00:00
Andrew Poelstra
4c22d34cd1
Merge 0936f35f65 into merged_master (Bitcoin PR #15842 )
2020-10-29 02:07:15 +00:00
Andrew Poelstra
ae82f80186
Merge bdd7217f2c into merged_master (Bitcoin PR #15901 )
2020-10-28 23:29:30 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
cbc704afd2
Merge 2d5419feed into merged_master (Bitcoin PR #15780 )
2020-10-28 22:06:46 +00:00
Andrew Poelstra
ad7eb71596
Merge 56376f3365 into merged_master (Bitcoin PR #15670 )
2020-10-28 20:53:16 +00:00
Andrew Poelstra
3f7417909f
Merge b6a5583c4f into merged_master (Bitcoin PR #15853 )
2020-10-28 20:53:09 +00:00
Andrew Poelstra
e316ed34be
Merge ae2c19f578 into merged_master (Bitcoin PR #15655 )
2020-10-28 20:52:58 +00:00
Andrew Poelstra
1a69098698
Merge dae72998e8 into merged_master (Bitcoin PR #15779 )
2020-10-28 16:45:01 +00:00
Andrew Poelstra
1c4e3cbb5f
Merge 4f4ef3138b into merged_master (Bitcoin PR #15557 )
...
This restricts the `bumpfee` RPC, when given a feerate target, to unblinded
transactions, because this is the only way I could figure out quickly to
allow adding inputs to an already-created transaction. It appears to be the
strategy used by the `fundrawtransaction` RPC which has similar behaviour.
This should be fixed in a followup PR.
2020-10-28 15:36:05 +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
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
d587731748
Merge 93de9abe6d into merged_master (Bitcoin PR #15632 )
2020-10-28 02:56:25 +00:00
Andrew Poelstra
ccc0b0afff
Merge db2985651d into merged_master (Bitcoin PR #15747 )
2020-10-28 01:43:49 +00:00
Andrew Poelstra
dd652858a0
Merge daef20fb50 into merged_master (Bitcoin PR #15596 )
2020-10-28 00:53:40 +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
5f340cc9ac
Merge 2607d960a0 into merged_master (Bitcoin PR #10973 )
2020-10-28 00:10:27 +00:00
Andrew Poelstra
aa93130e24
Merge 7ec7aea442 into merged_master (Bitcoin PR #15491 )
2020-10-27 23:50:29 +00:00
Andrew Poelstra
987d3f5fbd
Merge 726d0668ff into merged_master (Bitcoin PR #15530 )
2020-10-27 23:19:10 +00:00
Andrew Poelstra
edfdf46351
Merge 45f434f44d into merged_master (Bitcoin PR #15288 )
2020-10-27 21:55:08 +00:00
Andrew Poelstra
b612189f3c
Merge 9e3122de05 into merged_master (Bitcoin PR #15492 )
2020-10-27 20:46:09 +00:00
fanquake
478fe328a7
Merge #16475 : wallet: Enumerate walletdb keys
...
fa6f22bf44fa6dc7fa5ffa6f22bf44fa6f22bf44fa6f22bf44fa6f22bf44fa6f22bf44
2019-07-30 11:37:01 +08:00
MarcoFalke
74ea1f3b0f
Merge #16399 : wallet: Improve wallet creation
...
e967cae8faba1f128d6cd6649d16b53199610ad3#16244
The following suggestions are included:
- Usage of `enum class` (https://github.com/bitcoin/bitcoin/pull/16244#discussion_r296434142 )
- Placing out args at the end convention (https://github.com/bitcoin/bitcoin/pull/16244#discussion_r296434172 )
- Return error when passphrase would be ignored because of disabled private keys (including functional test) (https://github.com/bitcoin/bitcoin/pull/16244#pullrequestreview-252015195 )
- Make `status` return variable of `CreateWallet` (https://github.com/bitcoin/bitcoin/pull/16244#discussion_r302107394 )
- Using a `switch` statement instead of `if/else` in `RpcWallet` (https://github.com/bitcoin/bitcoin/pull/16244#discussion_r302112502 )
Not included was:
- "new create wallet function [could take] separate option arguments instead of wallet flags" (https://github.com/bitcoin/bitcoin/pull/16244#pullrequestreview-252015195 )
- "blank wallet and disable private keys options could be combined into a single option" (https://github.com/bitcoin/bitcoin/pull/16244#pullrequestreview-252015195 )
For these last two changes, I was not sure what an ideal solution could look like and/or this might be of slightly larger scope than the other changes, but I would be happy to work on these as well in this PR or another follow-up if I get positive feedback on that. Is there a place in the codebase that handles flags like these in a better way that I can refer to? Nonetheless, I would prefer keeping it in a separate PR unless it is a really simple change.
ACKs for top commit:
jnewbery:
Code review utACK e967cae8fae967cae8fa
2019-07-29 09:36:55 -04:00
