Commit graph

956 commits

Author SHA1 Message Date
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
MarcoFalke
4fcccdac78
Merge #16244: Move wallet creation out of the createwallet rpc into its own function
1aecdf2063 Move wallet creation out of the createwallet rpc into its own function (Andrew Chow)

Pull request description:

  Moves the wallet creation logic from within the `createwallet` rpc and into its own function within wallet.cpp.

ACKs for top commit:
  jnewbery:
    ACK 1aecdf2063
  MarcoFalke:
    ACK 1aecdf2063
  Sjors:
    ACK 1aecdf2 with some suggestions for followup.

Tree-SHA512: 8d26d7ff48db4f8fac12408a5a294f788b7f50a72e7eb4008fb74ff14d7400eb3970f8038a19f989eff55198fc11c0cf86f52231c62b9015eb777132edc8ea88
2019-07-10 13:51:25 -04:00
Gregory Sanders
96b6dd468a Remove redundant pre-TopUpKeypool checks 2019-07-10 09:39:26 -04:00
Wladimir J. van der Laan
6c1e45c4c4
Merge #16322: wallet: Fix -maxtxfee check by moving it to CWallet::CreateTransaction
0d101a340c test: Add test for maxtxfee option (MarcoFalke)
177550101b wallet: Remove unreachable code in CreateTransaction (MarcoFalke)
5c1b9714cb wallet: Fix -maxtxfee check by moving it to CWallet::CreateTransaction (João Barbosa)

Pull request description:

  Follow up to #16257, this PR makes `bumpfee` aware of `-maxtxfee`.

  It also prevents dangling locked unspents when calling `fundrawtransaction` - because the previous check was after `LockCoin`.

ACKs for top commit:
  MarcoFalke:
    re-ACK 0d101a340c, only change is small test fixup

Tree-SHA512: 3464b24ae7cd4e72ed41438c6661828ba1304af020f05da62720b23668ae734e16cf47c6d97e150cc84ef631ee099b16fc786c858f3d089905845437338fd512
2019-07-10 14:00:52 +02:00
Wladimir J. van der Laan
8d1286014c
Merge #16237: Have the wallet give out destinations instead of keys
8e7f930828 Add GetNewChangeDestination for getting new change Destinations (Andrew Chow)
33d13edd2b Replace CReserveKey with ReserveDestinatoin (Andrew Chow)
172213be5b Add GetNewDestination to CWallet to fetch new destinations (Andrew Chow)

Pull request description:

  The wallet should give out destinations instead of keys. It should be the one that handles the conversion from key to destination and the setting of the label, not the caller. In order to do this, two new member functions are introduced `GetNewDestination()` and `GetNewChangeDestination()`. Additionally, `CReserveKey` is changed to be `ReserveDestination` and represents destinations whose keys can be returned to the keypool.

ACKs for top commit:
  instagibbs:
    re-utACK https://github.com/bitcoin/bitcoin/pull/16237/commits/8e7f930828a9f8f9be1c90ff45e3fdfef1980eaf
  sipa:
    ACK 8e7f930828. Concept ACK as this gives a much cleaner abstraction to work with, and light code review ACK.
  laanwj:
    ACK 8e7f930828

Tree-SHA512: 5be7051409232b71e0ef2c1fd1a3e76964ed2f5b14d47d06edc2ad3b3687abd0be2803a1adc45c0433aa2c3bed172e14f8a7e9f4a23bff70f86260b5a0497500
2019-07-10 11:45:55 +02:00
Andrew Chow
1aecdf2063 Move wallet creation out of the createwallet rpc into its own function 2019-07-09 19:50:16 -04:00
Andrew Chow
8e7f930828 Add GetNewChangeDestination for getting new change Destinations
Adds a GetNewChangeDestination that has the same objective as GetNewDestination
2019-07-09 16:43:10 -04:00
Andrew Chow
33d13edd2b Replace CReserveKey with ReserveDestinatoin
Instead of reserving keys, reserve destinations which are backed by keys
2019-07-09 16:43:10 -04:00
Andrew Chow
172213be5b Add GetNewDestination to CWallet to fetch new destinations
Instead of having the same multiple lines of code everywhere
that new destinations are fetched, introduce GetNewDestination as
a member function of CWallet which does the key fetching, label
setting, script generation, and destination generation.
2019-07-09 16:43:10 -04:00
MarcoFalke
4882040182
Merge #16291: gui: Stop translating PACKAGE_NAME
fa64b947bb util: No translation of `Bitcoin Core` in the copyright (MarcoFalke)
fab85208f6 qt: Run «make translate» in ./src/ (MarcoFalke)
fabe87d2c9 scripted-diff: Avoid passing PACKAGE_NAME for translation (MarcoFalke)
fa5e9f157e build: Stop translating PACKAGE_NAME (MarcoFalke)

Pull request description:

  Generally the package name is not translated, but the package description is.

  E.g. `GIMP` or `Firefox` are always called that way regardless of the system language. However, "`Firefox` webbrowser" or "`GIMP` image manipulation program" are translated.

ACKs for top commit:
  hebasto:
    ACK fa64b947bb, I have not tested the code, but I have reviewed it and it looks OK, I agree it can be merged.

Tree-SHA512: 626f811531182d0ba0ef1044930d32726773349bcb49b10261288a86ee6b80a183db30a87d817d5b0d501fad058ac22d6272311716b4f5a154f17c6f391a5a1a
2019-07-08 13:39:59 -04:00