Andrew Poelstra
c2ebafe4a8
Merge f61c3a1090 into merged_master (Bitcoin PR #21125 )
2021-06-21 15:09:51 +00:00
Andrew Poelstra
ca010c3309
Merge 09530b0255 into merged_master (Bitcoin PR #21126 )
2021-06-21 14:57:29 +00:00
Andrew Poelstra
c0a01c55e9
Merge d202054675 into merged_master (Bitcoin PR #21052 )
2021-06-21 14:45:12 +00:00
Andrew Poelstra
50a0a6246b
Merge d48f9e8ebb into merged_master (Bitcoin PR #21124 )
2021-06-21 14:32:43 +00:00
Andrew Poelstra
a90e0beffe
Merge b847f49717 into merged_master (Bitcoin PR #20557 )
2021-06-21 14:20:26 +00:00
Andrew Poelstra
705b45662c
Merge 3641ec1aac into merged_master (Bitcoin PR #21112 )
2021-06-21 14:08:14 +00:00
Andrew Poelstra
11b1ad9b50
Merge 19b1ceddc7 into merged_master (Bitcoin PR #21075 )
2021-06-21 13:42:59 +00:00
Andrew Poelstra
e71719db1a
Merge c4214d0e0d into merged_master (Bitcoin PR #21117 )
2021-06-21 13:28:28 +00:00
Andrew Poelstra
5a2d5da06f
Merge a0077a80b0 into merged_master (Bitcoin PR #21116 )
2021-06-21 13:15:59 +00:00
Andrew Poelstra
114f1b9ccc
Merge d864696649 into merged_master (Bitcoin PR #21115 )
2021-06-21 13:03:47 +00:00
Andrew Poelstra
77f846938e
Merge b09ad737ee into merged_master (Bitcoin PR #20944 )
2021-06-21 12:51:08 +00:00
Andrew Poelstra
323f9bf6cd
Merge b401b09355 into merged_master (Bitcoin PR #21107 )
2021-06-21 08:23:27 +00:00
Andrew Poelstra
43da2e129e
Merge ca85449f22 into merged_master (Bitcoin PR #21036 )
2021-06-21 08:11:10 +00:00
Andrew Poelstra
bbfd887a43
Merge c969ab43c3 into merged_master (Bitcoin PR #21084 )
2021-06-21 07:59:08 +00:00
Andrew Poelstra
b4d8577949
Merge e51f6c4dee into merged_master (Bitcoin PR #20936 )
2021-06-21 07:46:25 +00:00
Andrew Poelstra
2bdd3e5d35
Merge 8636288db1 into merged_master (Bitcoin PR #20720 )
2021-06-21 04:04:22 +00:00
Andrew Poelstra
0f6fcf55f7
Merge cf26ca3911 into merged_master (Bitcoin PR #21081 )
2021-06-21 03:52:27 +00:00
Andrew Poelstra
8960226b7c
Merge 1815847103 into merged_master (Bitcoin PR #21105 )
2021-06-21 03:40:29 +00:00
Andrew Poelstra
0136cbc8db
Merge 6c6140846f into merged_master (Bitcoin PR bitcoin-core/gui#203 )
2021-06-21 03:28:29 +00:00
Andrew Poelstra
a62aec5b6c
Merge 173cf31299 into merged_master (Bitcoin PR #20839 )
2021-06-21 03:16:34 +00:00
Andrew Poelstra
639c731236
Merge b829894f84 into merged_master (Bitcoin PR #20764 )
2021-06-21 03:04:45 +00:00
Andrew Poelstra
bcd5f2207c
Merge a6b1bf6439 into merged_master (Bitcoin PR #20267 )
2021-06-21 02:52:43 +00:00
Andrew Poelstra
829f929d4e
Merge 3931732191 into merged_master (Bitcoin PR #20646 )
2021-06-21 02:29:21 +00:00
Andrew Poelstra
d9966231cf
Merge 53730a78bc into merged_master (Bitcoin PR #21077 )
2021-06-21 02:17:09 +00:00
Andrew Poelstra
8ab7e2f350
Merge 01d2cf2674 into merged_master (Bitcoin PR #21080 )
2021-06-21 02:04:35 +00:00
Andrew Poelstra
57b2a4e57d
Merge 4013e44c74 into merged_master (Bitcoin PR #21082 )
2021-06-21 01:52:16 +00:00
Andrew Poelstra
b8d3a6ea22
Merge ea5a50f92a into merged_master (Bitcoin PR #21042 )
2021-06-21 01:40:03 +00:00
Andrew Poelstra
e66b70d884
Merge f1239b70d1 into merged_master (Bitcoin PR #21025 )
2021-06-21 00:03:36 +00:00
Andrew Poelstra
5313c74e69
Merge 4e946ebcf1 into merged_master (Bitcoin PR #20715 )
2021-06-20 23:51:29 +00:00
Andrew Poelstra
6638e8203d
Merge 5a429d3d0f into merged_master (Bitcoin PR #21049 )
2021-06-20 20:36:02 +00:00
Andrew Poelstra
df51ae7a8c
Merge 5f18080c29 into merged_master (Bitcoin PR #21065 )
2021-06-20 20:24:10 +00:00
Andrew Poelstra
84118435fe
Merge ea96e17e1f into merged_master (Bitcoin PR #21060 )
2021-06-20 20:12:17 +00:00
Andrew Poelstra
81622629c1
Merge 384e090f93 into merged_master (Bitcoin PR #19509 )
2021-06-20 20:00:04 +00:00
Andrew Poelstra
3755e6d66f
Merge 1e69800d5e into merged_master (Bitcoin PR #21059 )
2021-06-20 19:25:08 +00:00
Andrew Poelstra
b6935e8759
Merge f72d80b07a into merged_master (Bitcoin PR #21051 )
2021-06-20 19:12:29 +00:00
Andrew Poelstra
9a3b7cda65
Merge 2c0fc856a6 into merged_master (Bitcoin PR #20464 )
2021-06-20 19:00:02 +00:00
Andrew Poelstra
5c323ec746
Merge 56fcf93349 into merged_master (Bitcoin PR #21026 )
2021-06-20 15:30:27 +00:00
Andrew Poelstra
bc289db9e0
Merge d0d256536c into merged_master (Bitcoin PR #21016 )
...
Copied the node.scheduler syntax to node.reverification_scheduler
2021-06-20 15:17:57 +00:00
Andrew Poelstra
2885d86bf7
Merge 44f4bcd302 into merged_master (Bitcoin PR #20749 )
...
More-or-less mechanical fixes to conflicts (checking upstream diff and chasing
compiler errors).
2021-06-20 14:54:25 +00:00
Andrew Poelstra
f49e10d604
Merge 636e754a81 into merged_master (Bitcoin PR #20941 )
2021-06-20 14:25:21 +00:00
Andrew Poelstra
1594d797c4
Merge 87394b6741 into merged_master (Bitcoin PR #20868 )
2021-06-20 14:13:18 +00:00
Andrew Poelstra
a0fc7ebcf2
Merge 7dc4807691 into merged_master (Bitcoin PR #20040 )
...
This is a really non-trivial wallet refactor "effective value" which has been
in the Core queue for a pretty long time. There were a ton of merge conflicts
but they were mostly mechanical (all the benchmarks) or "take the Core side
of the diff" (most of wallet.cpp).
The two nontrivial things were:
* In `SelectCoinsMinConf` in wallet.cpp I had to slightly move the asset
filtering logic (but I didn't change it)
* In `OutputGroup::Insert' in coinselection.cpp I changed the effective
value computation to only consider policyAsset values
2021-06-20 13:56:56 +00:00
Andrew Poelstra
4fc9d12dc4
Merge 4c55f92c76 into merged_master (Bitcoin PR #20954 )
2021-06-20 02:12:30 +00:00
Andrew Poelstra
7fcad5b81d
Merge 1f514332ed into merged_master (Bitcoin PR #21037 )
2021-06-20 01:39:06 +00:00
Andrew Poelstra
167d384951
Merge 16b784d953 into merged_master (Bitcoin PR #20689 )
2021-06-20 01:26:49 +00:00
Andrew Poelstra
7d94f4b120
Merge c8b83510f4 into merged_master (Bitcoin PR #20724 )
2021-06-20 01:14:29 +00:00
Andrew Poelstra
2575f618b0
Merge 40dd757bf6 into merged_master (Bitcoin PR #21012 )
2021-06-19 17:24:40 +00:00
Andrew Poelstra
eaa65e760b
Merge bc5f26d4ee into merged_master (Bitcoin PR bitcoin-core/gui#139 )
2021-06-19 17:12:11 +00:00
Andrew Poelstra
713526f9ff
Merge e213382920 into merged_master (Bitcoin PR #21029 )
2021-06-19 16:59:56 +00:00
Andrew Poelstra
a38a514045
Merge 6a726cb534 into merged_master (Bitcoin PR #20963 )
2021-06-19 16:47:08 +00:00
