Byron Hambly
87be495480
Merge 1220af5e6d into merged_master (Bitcoin PR bitcoin/bitcoin#23781 )
2023-06-13 16:02:01 +00:00
Byron Hambly
b2ace54856
Merge 98a2ddcd6e into merged_master (Bitcoin PR bitcoin/bitcoin#23806 )
2023-06-13 15:53:48 +00:00
Byron Hambly
ab249ee428
Merge c06cda3e48 into merged_master (Bitcoin PR bitcoin/bitcoin#23383 )
...
Kept what we already had since it's a newer version of secp256k1-zkp
2023-06-13 15:44:13 +00:00
Byron Hambly
a23bba068f
Merge 14ba286556 into merged_master (Bitcoin PR bitcoin/bitcoin#23695 )
2023-06-13 15:16:02 +00:00
Byron Hambly
b53864eef4
Merge 4ad59042b3 into merged_master (Bitcoin PR bitcoin/bitcoin#22704 )
2023-06-13 14:42:08 +00:00
Byron Hambly
413786c613
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785 )
2023-06-13 14:30:53 +00:00
Byron Hambly
84376ef08c
Merge df6e961c41 into merged_master (Bitcoin PR bitcoin/bitcoin#23777 )
2023-06-13 14:10:29 +00:00
Byron Hambly
f209652f80
Merge ce463cf450 into merged_master (Bitcoin PR bitcoin/bitcoin#23750 )
2023-06-13 13:51:56 +00:00
Byron Hambly
8bff356855
Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721 )
2023-06-13 13:41:22 +00:00
Byron Hambly
39e670c88c
Merge 216f4ca9e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22674 )
2023-06-13 13:17:01 +00:00
Byron Hambly
0963c8c2fe
Merge c09b41dc66 into merged_master (Bitcoin PR bitcoin/bitcoin#23769 )
2023-06-13 12:47:08 +00:00
Byron Hambly
abe35ac96a
Merge b8cc75435a into merged_master (Bitcoin PR bitcoin-core/gui#508 )
2023-06-13 12:36:26 +00:00
Byron Hambly
8edcc34130
Merge 60b5795133 into merged_master (Bitcoin PR bitcoin/bitcoin#23758 )
2023-06-13 12:26:03 +00:00
Byron Hambly
210c1e243a
Merge 2d0bdb2089 into merged_master (Bitcoin PR bitcoin/bitcoin#22362 )
2023-06-13 12:11:37 +00:00
Byron Hambly
3c81a0d372
Merge 965ffe2bed into merged_master (Bitcoin PR bitcoin/bitcoin#23757 )
2023-06-13 11:59:01 +00:00
Byron Hambly
6179a5a04e
Merge b67115dd04 into merged_master (Bitcoin PR bitcoin/bitcoin#23174 )
2023-06-13 11:41:51 +00:00
Byron Hambly
d90eaec39b
Merge 7006496a5c into merged_master (Bitcoin PR bitcoin/bitcoin#23756 )
2023-06-13 11:22:13 +00:00
Byron Hambly
c8ebc89963
Merge 40fdb9ece9 into merged_master (Bitcoin PR bitcoin/bitcoin#23713 )
2023-06-13 11:13:58 +00:00
Byron Hambly
54c9ee347d
Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777 )
2023-06-13 10:06:36 +00:00
Byron Hambly
5494a066ab
Merge 498fe4b780 into merged_master (Bitcoin PR bitcoin/bitcoin#23575 )
2023-06-13 09:58:15 +00:00
Byron Hambly
0bb272ba16
Merge aaaceb7fb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23766 )
2023-06-13 09:50:10 +00:00
Byron Hambly
49326aea37
Merge ab879d9885 into merged_master (Bitcoin PR bitcoin/bitcoin#23762 )
2023-06-13 09:06:27 +00:00
Byron Hambly
e0583f04ee
Merge 5dd28e5cff into merged_master (Bitcoin PR bitcoin/bitcoin#23755 )
2023-06-13 08:58:20 +00:00
Byron Hambly
831a4e4c34
Merge 42796742a4 into merged_master (Bitcoin PR bitcoin/bitcoin#23761 )
2023-06-13 08:49:48 +00:00
Byron Hambly
d1b42f9929
Merge 767c012665 into merged_master (Bitcoin PR bitcoin/bitcoin#23738 )
2023-06-13 08:34:23 +00:00
Byron Hambly
85106c0a56
Merge bf66e258a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23365 )
2023-06-13 08:34:16 +00:00
James Dorfman
b0afaee332
Merge eb63b8fab9 into merged_master (Bitcoin PR bitcoin/bitcoin#23718 )
2023-06-13 05:47:02 +00:00
James Dorfman
86f68b94d0
Merge ac92ab6da5 into merged_master (Bitcoin PR bitcoin/bitcoin#23113 )
2023-06-13 05:02:03 +00:00
James Dorfman
a7822b627c
Merge faea4c9d2b into merged_master (Bitcoin PR bitcoin/bitcoin#23128 )
2023-06-13 04:20:44 +00:00
James Dorfman
7600af2c48
Merge 7d746bdd18 into merged_master (Bitcoin PR bitcoin/bitcoin#23733 )
2023-06-13 04:12:36 +00:00
James Dorfman
536c7fee81
Merge 50c502f54a into merged_master (Bitcoin PR bitcoin/bitcoin#17034 )
2023-06-13 03:51:10 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
James Dorfman
3ef3a3ba00
Merge 011d6e429b into merged_master (Bitcoin PR bitcoin/bitcoin#22514 )
2023-06-12 17:32:45 +00:00
Byron Hambly
70c69d94f6
Merge 9f7661c0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#19499 )
2023-06-12 13:11:30 +00:00
Byron Hambly
b80f2e6593
Merge 09ad512369 into merged_master (Bitcoin PR bitcoin/bitcoin#23628 )
2023-06-12 12:43:53 +00:00
Byron Hambly
e3ab195851
Merge c840ab0231 into merged_master (Bitcoin PR bitcoin/bitcoin#22019 )
...
This was a complicated merge that had to be modified from upstream to work with multi-assets,
so it should be reviewed carefully
2023-06-12 12:36:04 +00:00
Byron Hambly
3bd9a6517b
Merge 7ce8d74156 into merged_master (Bitcoin PR bitcoin/bitcoin#23346 )
2023-06-06 11:23:40 +00:00
Byron Hambly
5854e5e087
Merge 7908772244 into merged_master (Bitcoin PR bitcoin/bitcoin#23703 )
2023-06-06 11:15:42 +00:00
Byron Hambly
3de9eba023
Merge c4ae714f55 into merged_master (Bitcoin PR bitcoin/bitcoin#23714 )
2023-06-06 09:54:08 +00:00
Byron Hambly
c7c59a27a9
Merge 926fc2a0d4 into merged_master (Bitcoin PR bitcoin/bitcoin#23707 )
2023-06-06 09:35:00 +00:00
Byron Hambly
8436894eec
Merge 577bd51a4b into merged_master (Bitcoin PR bitcoin/bitcoin#23702 )
2023-06-06 09:26:49 +00:00
Byron Hambly
b2aeec482f
Merge b692e61d61 into merged_master (Bitcoin PR bitcoin/bitcoin#23254 )
2023-06-06 09:19:04 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
Byron Hambly
eed72186c7
Merge fa3fb46b81 into merged_master (Bitcoin PR bitcoin/bitcoin#23667 )
...
This merge from upstream split the rpcwallet file out into separate
files. Leftover Elements specific funtions were moved into
wallet/rpc/elements.cpp
Co-authored-by: James Dorfman <dorfmanjames@gmail.com>
2023-06-06 08:32:04 +00:00
Byron Hambly
91f2b1114e
Merge 63c63b5533 into merged_master (Bitcoin PR bitcoin/bitcoin#14707 )
2023-06-05 11:19:58 +00:00
James Dorfman
9ff4b8e6d6
Merge eaf1c56502 into merged_master (Bitcoin PR bitcoin/bitcoin#23692 )
2023-06-02 15:51:00 +00:00
James Dorfman
a5a9e11b83
Merge 13f41855c5 into merged_master (Bitcoin PR bitcoin/bitcoin#23694 )
2023-06-02 15:43:00 +00:00
James Dorfman
669c52f7e8
Merge 4fd0ce75c5 into merged_master (Bitcoin PR bitcoin/bitcoin#22689 )
2023-06-02 15:34:33 +00:00
James Dorfman
360bf6eb36
Merge 95fe477fd1 into merged_master (Bitcoin PR bitcoin/bitcoin#23693 )
2023-06-02 15:17:50 +00:00
