Andrew Poelstra
5af69f3cb4
Merge 3a2d5bfeb3 into merged_master (Bitcoin PR #21201 )
2021-06-24 14:15:01 +00:00
Andrew Poelstra
c1e4d9e7b0
Merge db656db2ed into merged_master (Bitcoin PR #19136 )
2021-06-24 13:27:40 +00:00
Andrew Poelstra
29d002046c
Merge 43981ee2c8 into merged_master (Bitcoin PR #21127 )
2021-06-23 12:39:41 +00:00
Andrew Poelstra
f250da483b
Merge 8e1913ae02 into merged_master (Bitcoin PR #21062 )
2021-06-22 22:39:50 +00:00
Andrew Poelstra
5e2b1c591f
Merge e498aeffbe into merged_master (Bitcoin PR #20211 )
2021-06-26 18:18:18 +00:00
Andrew Poelstra
c2ebafe4a8
Merge f61c3a1090 into merged_master (Bitcoin PR #21125 )
2021-06-21 15:09:51 +00:00
Andrew Poelstra
5313c74e69
Merge 4e946ebcf1 into merged_master (Bitcoin PR #20715 )
2021-06-20 23:51:29 +00:00
Andrew Poelstra
9a3b7cda65
Merge 2c0fc856a6 into merged_master (Bitcoin PR #20464 )
2021-06-20 19:00:02 +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
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
561bf64d1b
Merge 80e16cadd5 into merged_master (Bitcoin PR #20012 )
...
Made some edits to rpc/client.cpp on the advice of test/functional/rpc_help.py
to make the "RPC conversion tables" consistent, but I have no idea what these
tables are or what they're for. I assume, given that nobody has noticed these
inconsistencies ever, that they're fine.
2021-06-19 16:30:37 +00:00
Andrew Poelstra
402bba0e4f
Merge 9deba2de76 into merged_master (Bitcoin PR #20226 )
...
Had to change a test vector to match our test framework's different deterministic
keys (when I produced these during the 0.21 rebase I made new random keys rather
than converting the existing ones, it appears).
2021-06-19 02:35:13 +00:00
Andrew Poelstra
6a7359d623
Merge 15a9df0706 into merged_master (Bitcoin PR #20964 )
2021-06-19 01:19:46 +00:00
Andrew Poelstra
6f81fd3b1d
Merge 16ae3368f2 into merged_master (Bitcoin PR #17350 )
2021-06-18 20:50:35 +00:00
Andrew Poelstra
d6c85c5620
Merge 4b15ffe991 into merged_master (Bitcoin PR #20832 )
2021-06-18 20:35:42 +00:00
Andrew Poelstra
76075ee96a
Merge 45952dab9d into merged_master (Bitcoin PR #20932 )
2021-06-18 15:00:45 +00:00
Andrew Poelstra
00d89d372d
Merge 80486e7e2d into merged_master (Bitcoin PR #20952 )
2021-06-18 03:22:42 +00:00
Andrew Poelstra
9e4190cd76
Merge bc51b99bd5 into merged_master (Bitcoin PR #20891 )
2021-06-18 02:53:26 +00:00
Andrew Poelstra
81f3883b46
Merge 8ffaf5c2f5 into merged_master (Bitcoin PR #19935 )
2021-06-17 20:19:16 +00:00
Andrew Poelstra
acf709b3ab
Merge bd6af53e1f into merged_master (Bitcoin PR #20480 )
...
what a trainwreck of a programming language..
2021-06-17 15:15:29 +00:00
Andrew Poelstra
e5cb4cb00e
Merge f13e03cda2 into merged_master (Bitcoin PR #20584 )
2021-06-16 20:58:56 +00:00
Andrew Poelstra
617905a928
Merge 34322b7f5c into merged_master (Bitcoin PR #20842 )
2021-06-16 18:28:04 +00:00
Andrew Poelstra
27930edc9c
Merge 4a540683ec into merged_master (Bitcoin PR #20813 )
2021-06-16 14:11:07 +00:00
Andrew Poelstra
0a58119253
Merge 68c7acf6bb into merged_master (Bitcoin PR #20671 )
2021-06-15 16:40:45 +00:00
Andrew Poelstra
f1767b4fe3
Merge b27104dc52 into merged_master (Bitcoin PR #20687 )
2021-06-15 13:27:44 +00:00
Andrew Poelstra
e5d61f39b4
Merge 143bd108ed into merged_master (Bitcoin PR #19137 )
2021-06-15 02:39:30 +00:00
Andrew Poelstra
0d66f6cf42
Merge af4ce674da into merged_master (Bitcoin PR #20635 )
2021-06-14 23:58:34 +00:00
Andrew Poelstra
bc9605a44a
Merge 1811e488d5 into merged_master (Bitcoin PR #20575 )
2021-06-14 20:45:55 +00:00
Andrew Poelstra
d52727714b
Merge 69f1ee1922 into merged_master (Bitcoin PR #20365 )
2021-06-14 18:47:18 +00:00
Andrew Poelstra
939d8ee135
Merge ade38b6ee8 into merged_master (Bitcoin PR #20588 )
...
o.O apparently the `tx_aux` argument to `createrawpegin` was literally unused
2021-06-14 02:19:09 +00:00
Andrew Poelstra
0cabbc6b4a
Merge ffc4d04990 into merged_master (Bitcoin PR #20275 )
...
As always, `git diff HEAD^ HEAD^2 -- <filename>` is your friend when understanding conflicts..
2021-06-14 01:22:11 +00:00
Andrew Poelstra
ee43c19115
Merge 736eb4d808 into merged_master (Bitcoin PR #19982 )
2021-06-14 00:27:44 +00:00
Andrew Poelstra
c8d2647081
Merge 38176dc665 into merged_master (Bitcoin PR #20573 )
2021-06-13 21:04:50 +00:00
Andrew Poelstra
a3b6f760ed
Merge e98d1d6740 into merged_master (Bitcoin PR #19425 )
2021-06-11 19:06:47 +00:00
Andrew Poelstra
34db56ae3a
Merge 9385549a31 into merged_master (Bitcoin PR #20581 )
2021-06-11 13:09:57 +00:00
Andrew Poelstra
6d1ef33bf4
Merge c1604483d3 into merged_master (Bitcoin PR #20566 )
2021-06-11 03:34:33 +00:00
Andrew Poelstra
406e81efb5
Merge 0a13d15c14 into merged_master (Bitcoin PR #20530 )
2021-06-10 23:32:14 +00:00
Andrew Poelstra
2ec2763700
Merge 80d4231e16 into merged_master (Bitcoin PR #19980 )
2021-06-10 21:23:06 +00:00
Andrew Poelstra
1521881ad8
Merge 24e4857b29 into merged_master (Bitcoin PR #20494 )
2021-06-10 18:09:55 +00:00
Andrew Poelstra
2522ba9f6d
Merge 1ae5758981 into merged_master (Bitcoin PR #20448 )
2021-05-07 23:27:40 +00:00
Andrew Poelstra
8d52d54329
Merge afdfd3c8c1 into merged_master (Bitcoin PR #20403 )
2021-05-07 21:52:40 +00:00
Andrew Poelstra
d3321390c2
Merge ca4a784942 into merged_master (Bitcoin PR #20410 )
2021-05-07 20:56:02 +00:00
Andrew Poelstra
c9266f6d1c
Merge 3a32b62fa7 into merged_master (Bitcoin PR #20462 )
2021-05-07 19:41:18 +00:00
Andrew Poelstra
0a5257d126
Merge 86bf3ae3b5 into merged_master (Bitcoin PR #20202 )
2021-05-07 17:19:00 +00:00
Andrew Poelstra
d16f8ae480
Merge 816132e6eb into merged_master (Bitcoin PR #20426 )
...
Needed to restore an #include in wallet/rpcwallet.cpp for several
functions (ChainActive, IsDynaFedActive, GetFeeMap and others)
2021-05-07 16:18:13 +00:00
Andrew Poelstra
620add9627
Merge 9ab9665c74 into merged_master (Bitcoin PR #15710 )
2021-05-06 19:50:01 +00:00
Andrew Poelstra
40c09f637c
rpc: fix error message accidentally changed in 5e62edc
2021-04-15 18:06:52 +00:00
Andrew Poelstra
14ff891036
Various ubsan fixes
...
Mostly harmless signed/unsigned conversions but also an actual
memory leak related to `BlindingData`.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
47885e97bf
ci: tighten locking in signblock to ensure consistent main/wallet locking order
2021-03-26 17:33:05 +00:00
Andrew Poelstra
2f5c624b18
ci: eliminate a bunch of build warnings
...
Includes removing some variables from qt/intro.cpp that've been
unused since #13216 and ought to have been removed in the 0.17
rebase, but our linters were not so agressive then. Similarly
fix the BITCOIN_PID_FILE, whose value was incorrectly changed
in the 0.18 rebase.
2021-03-26 17:33:05 +00:00
