GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29954 commits 49 branches 359 tags 252 MiB
Commit graph

3467 commits

Author SHA1 Message Date
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
021eccb56e Merge 6cb80a068d into merged_master (Bitcoin PR #17806) 2020-11-14 16:52:01 +00:00
Andrew Poelstra
37b9b15143 Merge a595011f5a into merged_master (Bitcoin PR #17728) 2020-11-14 16:51:59 +00:00
Andrew Poelstra
7776084b8f Merge 988fe5b1ad into merged_master (Bitcoin PR #12763) 2020-11-14 16:51:58 +00:00
Andrew Poelstra
7187ea2de7 Merge 3f1966ead6 into merged_master (Bitcoin PR #17705) 2020-11-14 16:51:57 +00:00
Andrew Poelstra
c9585d0fde Merge 3d6752779f into merged_master (Bitcoin PR #17633) 2020-11-14 16:51:56 +00:00
Andrew Poelstra
9709d02c23 Merge fae94785d9 into merged_master (Bitcoin PR #17524) 
lol converting the psbt test vector to a pset one was pretty brutal. Conversion to
hex using rust-bitcoin and then manual hex-editing in vim.
 2020-11-14 16:51:56 +00:00
Andrew Poelstra
11487538e9 Merge df2b743759 into merged_master (Bitcoin PR #17675) 2020-11-14 16:51:55 +00:00
Andrew Poelstra
96822eee94 Merge 910a4301b1 into merged_master (Bitcoin PR #17522) 2020-11-14 16:51:53 +00:00
Andrew Poelstra
0c0b496469 Merge 5aee0e2163 into merged_master (Bitcoin PR #17650) 2020-11-14 16:51:53 +00:00
Andrew Poelstra
c7bf5baf96 Merge 526e802d69 into merged_master (Elements PR #755) 
This Elements PR includes components of Core PR #17211, which since the
refactors to use effective value landed, no longer provides the right
error message when a user provides an unowned input from a wallet tx.
See https://github.com/bitcoin/bitcoin/pull/17211#pullrequestreview-528389011

This breaks a functional test which was included in this PR, but which
conveniently has been changed in the current version of the Core PR. I
fixed the behavior (commented, in SelectCoins) rather than updating the
test to the most recent version.
 2020-11-14 16:51:53 +00:00
Andrew Poelstra
5a48ca16e3 Merge fee01bb053 into merged_master (Bitcoin PR #17517) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
fd78a12518 Merge 2949ea924f into merged_master (Elements PR #751) 2020-11-14 16:51:52 +00:00
Andrew Poelstra
c3c860b38a Merge 69ca6cdd66 into merged_master (Bitcoin PR #17599) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
05bbc1a822 Merge 2b6575d989 into merged_master (Bitcoin PR #17643) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
27de4bdecf Merge 19698ac6bc into merged_master (Bitcoin PR #17568) 2020-11-14 16:51:51 +00:00
Andrew Poelstra
6a5fc1dd58 Merge d8a66626d6 into merged_master (Bitcoin PR #17283) 2020-11-14 16:51:50 +00:00
Andrew Poelstra
569c46ca22 Merge 6d00035cae into merged_master (Elements PR #778) 2020-11-14 16:51:50 +00:00
Andrew Poelstra
6da00c1830 Merge 4effd67bf4 into merged_master (Bitcoin PR #17387) 2020-11-14 16:51:48 +00:00
Jon Atack
05e82d86b0
wallet: override minfee checks (fOverrideFeeRate) for fee_rate 
in RPCs fundrawtransaction and walletcreatefundedpsbt only.

This provides the existing feeRate (BTC/kvB) behavior in these two RPCs to the
new fee_rate (sat/vB) param also.

See these two GitHub review discussions for more info:
https://github.com/bitcoin/bitcoin/pull/10706/#discussion_r126560525
https://github.com/bitcoin/bitcoin/pull/20305#discussion_r520032533
 2020-11-12 11:44:15 +01:00
Jon Atack
449b730579
wallet: provide valid values if invalid estimate mode passed 
Co-authored-by: Murch <murch@murch.one>
 2020-11-12 11:43:17 +01:00
Jon Atack
173b5b5fe0
wallet: update fee rate units, use sat/vB for fee_rate error messages 
and BTC/kvB for feeRate error messages.
 2020-11-12 11:43:03 +01:00
Samuel Dobson
c2d8ba6265
Merge #19502: Bugfix: Wallet: Soft-fail exceptions within ListWalletDir file checks 
24d2d3341d QA: wallet_multiwallet: Check that recursive symlink directory and wallet.dat loops are ignored (Luke Dashjr)
69f59af54d Bugfix: Wallet: Soft-fail exceptions within ListWalletDir file checks (Luke Dashjr)

Pull request description:

  Previously, an exception would be thrown, which could kill the node in some circumstances.

  Includes test changes to cause failure.

  Review with `?w=1`

ACKs for top commit:
  hebasto:
    re-ACK 24d2d3341d, rebased only since my [previous](https://github.com/bitcoin/bitcoin/pull/19502#pullrequestreview-520552944) review.
  promag:
    Tested ACK 24d2d3341d, test change fails on master.
  meshcollider:
    utACK 24d2d3341d

Tree-SHA512: f701f81b3aa3d3e15cee52ac9e7c31a73c0d8166e56bf077235294507cbcee099829fedc432a1c4b6d8780885f4e37897b44b980b08125771de3c849c000499e
 2020-11-12 13:26:38 +13:00
Jon Atack
410e471fa4
wallet: remove redundant bumpfee fee_rate checks 
SetFeeEstimateMode() handles these checks now and provides a more actionable
error message.
 2020-11-11 15:56:01 +01:00
Jon Atack
a0d4957473
wallet: introduce fee_rate (sat/vB) param/option 
Create a fee_rate (sat/vB) RPC param and replace overloading the conf_target and
estimate_mode params in the following 6 RPCs with it:

- sendtoaddress
- sendmany
- send
- fundrawtransaction
- walletcreatefundedpsbt
- bumpfee

In RPC bumpfee, the previously existing fee_rate remains but the unit is changed
from BTC/kvB to sat/vB. This is a breaking change, but it should not be an
overly risky one, as the units change by a factor of 1e5 and any fees specified
in BTC/kvB after this commit will either be too low and raise an error or be 1
sat/vB and can be RBFed.

Update the test coverage for each RPC.

Co-authored-by: Murch <murch@murch.one>
 2020-11-11 15:55:59 +01:00
Jon Atack
3f72791613
wallet: fix bug in RPC send options 
when empty, options were not being populated by arguments of the same name

found while adding test coverage in 603c0050
 2020-11-11 15:55:46 +01:00
MarcoFalke
42f950cb27
Merge #20322: test: Fix intermittent issue in wallet_listsinceblock 
444412821e test: Fix intermittent issue in wallet_listsinceblock (MarcoFalke)

Pull request description:

ACKs for top commit:
  Empact:
    Code Review ACK https://github.com/bitcoin/bitcoin/pull/20322/commits/444412821e5349ce0e0b039d884583edb70c4399

Tree-SHA512: 86d47b1e3c8681dd479654589c894016ac81a3c96a34c3b4a75278b2af85054ea8c6f768e518a5322a4928d82d5e99105bbce0f4fa6a7a18c40e3e0799f9ab54
 2020-11-10 09:20:51 +01:00
Andrew Poelstra
01f4eb2404 Merge 5ff798c39b into merged_master (Bitcoin PR #17439) 2020-11-09 23:10:13 +00:00
Andrew Poelstra
2720aad76b Merge 3671c5721d into merged_master (Bitcoin PR #17532) 2020-11-09 23:10:13 +00:00
Andrew Poelstra
4cc150cd4a Merge e1df922132 into merged_master (Bitcoin PR #17497) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
f9acc8330d Merge ca1eeba0b0 into merged_master (Bitcoin PR #17488) 2020-11-09 23:10:12 +00:00
Andrew Poelstra
d0e2b032a8 Merge 422ec33d45 into merged_master (Bitcoin PR #17322) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
2b6199bf17 Merge c7709cbf4c into merged_master (Bitcoin PR #17469) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
19ad9587c8 Merge ccf6697e3b into merged_master (Elements PR #780) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
90d5425abf Merge 8237889e8d into merged_master (Bitcoin PR #17435) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
bce97903cf Merge 1028882eea into merged_master (Bitcoin PR #17437) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
3613ae283d Merge f60e0684d1 into merged_master (Elements PR #773) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
9f605a7f7c Merge 270616228b into merged_master (Bitcoin PR #17362) 2020-11-09 23:10:09 +00:00
Andrew Poelstra
111ab7d824 Merge e65b4160e9 into merged_master (Bitcoin PR #17340) 2020-11-09 23:10:08 +00:00
Andrew Poelstra
1d3555cdaf Merge b05b28183c into merged_master (Bitcoin PR #16899) 2020-11-09 21:20:53 +00:00
Andrew Poelstra
132dcf17c7 Merge 54a337478d into merged_master (Bitcoin PR #17378) 2020-11-09 21:20:52 +00:00
Andrew Poelstra
c3b2f1d8c0 Merge bdda137878 into merged_master (Bitcoin PR #16766) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
47f60c4e53 Merge bfc4c896d6 into merged_master (Bitcoin PR #17258) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
7494bc176f Merge bc38bb9a60 into merged_master (Bitcoin PR #17288) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
b9140de11e Merge 6cb10c14c6 into merged_master (Bitcoin PR #17199) 2020-11-09 21:20:51 +00:00
Andrew Poelstra
3875efaaa2 Merge 6a7c40bee4 into merged_master (Bitcoin PR #15888) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
5f236f427b Merge bc3fcf3c0d into merged_master (Bitcoin PR #17327) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
a19375575a Merge 222b7d0ca7 into merged_master (Bitcoin PR #17330) 2020-11-09 21:20:49 +00:00
Andrew Poelstra
bde84fefc4 Merge 3c40bc6726 into merged_master (Bitcoin PR #15921) 2020-11-09 21:20:48 +00:00
Andrew Poelstra
cda20329e8 Merge cab94cc074 into merged_master (Bitcoin PR #16943) 2020-11-09 21:20:48 +00:00