Byron Hambly
19eece4f40
Merge 3c1e75ef60 into merged_master (Bitcoin PR bitcoin/bitcoin#25865 )
2024-11-21 14:58:09 +02:00
Byron Hambly
bd875beb2a
Merge 713ea7a418 into merged_master (Bitcoin PR bitcoin/bitcoin#25906 )
2024-11-21 14:39:57 +02:00
Byron Hambly
f46275d011
Merge 2bd9aa5a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25647 )
...
This was a difficult merge as always with diffs that touch spend.cpp and
createtransactioninternal. Added a FIXME NB for fundrawtransaction with
external outputs, which MUST be fixed before a new release.
2024-11-21 14:29:21 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +02:00
Byron Hambly
b07694187c
Merge 607d5a46aa into merged_master (Bitcoin PR bitcoin/bitcoin#23202 )
...
added a FIXME for the new bumpfee tests on non-owned inputs
2024-11-04 15:03:28 +02:00
Byron Hambly
fd5f2960c7
Merge c73c8d53fe into merged_master (Bitcoin PR bitcoin/bitcoin#25878 )
2024-11-04 12:02:20 +02:00
Byron Hambly
f9e2640d86
Merge 0425ce577f into merged_master (Bitcoin PR bitcoin/bitcoin#25679 )
...
fundrawtransaction.py can be a bit flaky, added a FIXME
2024-11-04 11:11:25 +02:00
Byron Hambly
ee6cc528c6
Merge 64f7a1940d into merged_master (Bitcoin PR bitcoin/bitcoin#25734 )
2024-11-03 14:28:09 +02:00
Byron Hambly
d6e6f35037
Merge c336f813b3 into merged_master (Bitcoin PR bitcoin/bitcoin#25504 )
2024-11-02 17:28:21 +02:00
Byron Hambly
c341afe4c0
Merge cf39913e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25803 )
2024-11-02 17:16:19 +02:00
Byron Hambly
3aec1a9069
Merge 22d96d76ab into merged_master (Bitcoin PR bitcoin/bitcoin#25720 )
2024-11-02 16:49:35 +02:00
Byron Hambly
55abe4544f
Merge dc9d662683 into merged_master (Bitcoin PR bitcoin/bitcoin#25235 )
2024-11-01 16:18:43 +02:00
Byron Hambly
b30fd6f694
Merge 29c195cf6a into merged_master (Bitcoin PR bitcoin/bitcoin#25792 )
2024-11-01 15:07:02 +02:00
Byron Hambly
024bf01b6c
Merge 0094ff3947 into merged_master (Bitcoin PR bitcoin/bitcoin#25812 )
2024-11-01 14:02:21 +02:00
Byron Hambly
891686a9c5
Merge 251c535800 into merged_master (Bitcoin PR bitcoin/bitcoin#25810 )
2024-11-01 13:25:11 +02:00
Byron Hambly
ccdfcdc4f0
Merge f89ce1fdb5 into merged_master (Bitcoin PR bitcoin/bitcoin#25811 )
2024-11-01 13:16:01 +02:00
Byron Hambly
961b1d8851
Merge aac200801b into merged_master (Bitcoin PR bitcoin/bitcoin#25794 )
2024-10-30 10:07:37 +02:00
Byron Hambly
0288865bb6
Merge ebf094ff3a into merged_master (Bitcoin PR bitcoin/bitcoin#25731 )
2024-10-30 10:00:36 +02:00
Byron Hambly
85cd9e605d
Merge ac59112a6a into merged_master (Bitcoin PR bitcoin/bitcoin#23480 )
2024-10-30 09:49:14 +02:00
Byron Hambly
c80fe4de04
Merge e7ca8afef6 into merged_master (Bitcoin PR bitcoin/bitcoin#25782 )
2024-10-29 15:21:32 +02:00
Byron Hambly
16f25771a0
Merge 35305c759a into merged_master (Bitcoin PR bitcoin/bitcoin#22751 )
...
This PR introduced a new RPC "simulaterawtransaction". It has been modified from
upstream and from ElementsProject/elements#1016
to work correctly with Elements blinded transactions and issued assets.
2024-10-29 10:15:55 +02:00
Byron Hambly
b8927c447e
Merge 7d82f86341 into merged_master (Bitcoin PR bitcoin/bitcoin#25650 )
2024-10-25 12:16:28 +02:00
Byron Hambly
b11cdfc92b
Merge 2c3115d4f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25773 )
2024-10-25 12:00:10 +02:00
Byron Hambly
48d663a3d6
Merge 9155f9b7af into merged_master (Bitcoin PR bitcoin/bitcoin#25379 )
2024-10-25 09:50:32 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
f17a9fd322
Merge 2bca32b7c3 into merged_master (Bitcoin PR bitcoin/bitcoin#24799 )
2024-10-24 14:55:38 +02:00
Byron Hambly
080268f4dc
Merge eeb5a94e27 into merged_master (Bitcoin PR bitcoin/bitcoin#25528 )
2024-10-24 14:42:59 +02:00
Byron Hambly
641fbe39e8
Merge c5ba1d92b6 into merged_master (Bitcoin PR bitcoin/bitcoin#25610 )
2024-10-24 13:55:08 +02:00
Byron Hambly
f7b03ad72e
Merge 1abbae65eb into merged_master (Bitcoin PR bitcoin/bitcoin#24584 )
...
This should be reviewed carefully. The new availablecoins_test was
showing an intermittent error [1]. The test variants were split out into
their own test cases to work around the issue, but requires further
investigation.
[1]: https://github.com/ElementsProject/elements/issues/1370
2024-10-24 12:08:44 +02:00
Byron Hambly
80c47aa8aa
Merge 317ef0368b into merged_master (Bitcoin PR bitcoin/bitcoin#25670 )
...
related to the FIXME in #25625 , PSBT python class needs to be reworked
for elements
2024-10-21 11:06:06 +02:00
Byron Hambly
e228c836f1
Merge c991132b04 into merged_master (Bitcoin PR bitcoin/bitcoin#25693 )
2024-10-18 14:02:28 +02:00
Byron Hambly
6db4ca0b66
Merge d67f89bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25625 )
...
Commented out the change to the psbt test with a FIXME, due to
differences between PSBT/PSET
2024-10-18 12:05:54 +02:00
Byron Hambly
ad4ecee6c0
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285 )
2024-10-17 17:33:20 +02:00
Byron Hambly
2081703f71
Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494 )
2024-10-17 17:06:13 +02:00
Byron Hambly
66e36f95c5
Merge 47dad42833 into merged_master (Bitcoin PR bitcoin/bitcoin#25629 )
2024-10-17 15:04:30 +02:00
Byron Hambly
e1add57650
Merge 1b285b7807 into merged_master (Bitcoin PR bitcoin/bitcoin#25590 )
2024-10-17 14:15:20 +02:00
Byron Hambly
6742dac5d2
Merge 4aaa3b5200 into merged_master (Bitcoin PR bitcoin/bitcoin#25351 )
2024-10-17 10:12:52 +02:00
Byron Hambly
076e809b74
Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487 )
2024-10-17 09:16:23 +02:00
James Dorfman
d94f55ff58
Merge 85b601e043 into merged_master (Bitcoin PR bitcoin/bitcoin#24148 )
2024-10-16 06:54:02 +00:00
James Dorfman
3e5580265d
Merge 8efa73e7ce into merged_master (Bitcoin PR bitcoin/bitcoin#25557 )
2024-10-16 06:40:15 +00:00
James Dorfman
35cd74da0f
Merge 31c6309cc6 into merged_master (Bitcoin PR bitcoin/bitcoin#25596 )
2024-10-16 06:30:40 +00:00
James Dorfman
00aa7139b8
Fix invalid RPC call within feature_rbf functional test
2024-10-16 05:42:41 +00:00
James Dorfman
a6d5d4ead6
Merge 46fcb52cb1 into merged_master (Bitcoin PR bitcoin/bitcoin#24944 )
2024-10-16 05:04:19 +00:00
James Dorfman
93553f8b27
Merge 01ae8d9cd2 into merged_master (Bitcoin PR bitcoin/bitcoin#25592 )
2024-10-16 05:04:02 +00:00
James Dorfman
a1bb92a8d7
Merge 39d111aee7 into merged_master (Bitcoin PR bitcoin/bitcoin#25575 )
2024-10-16 04:56:58 +00:00
James Dorfman
931968befd
Merge 6c0c2620c2 into merged_master (Bitcoin PR bitcoin/bitcoin#25589 )
2024-10-15 17:16:29 +00:00
James Dorfman
a695dd7f01
Elements-specific functional test fixes for 2a62c870
2024-10-15 16:50:28 +00:00
James Dorfman
2a62c87084
Merge 0817cc379f into merged_master (Bitcoin PR bitcoin/bitcoin#25512 )
2024-10-15 15:56:45 +00:00
James Dorfman
3f20b33a51
Merge 327b7e9236 into merged_master (Bitcoin PR bitcoin/bitcoin#25581 )
2024-10-15 06:51:23 +00:00
James Dorfman
a20940b37c
Merge 194710d8ff into merged_master (Bitcoin PR bitcoin/bitcoin#25481 )
...
Please reviewthis commit *extremely thoroughly*.
This commit changed how certain transaction size calculations are done.
This altered fee estiimation for certain elements transactions, and caused a lot
of things to break in the `wallet_bumpfee` functional test.
After *extensive* work (~10 hours), I managed to figure all this out and properly
reconcile the functional test to work with the new fee calculations.
However, the original bitcoin commit didn't have any changes to this functional test.
So, it's also simply possible that I may have made an actual bug and these fee issues
I was seeing in the functional test were pointing at this bug.
I'm not sure if there is a bug. I don't think so... I think the transaction estimations just got
bigger in certain cases.
But... please verify this. Look into the diff of this commit, and compare how use_max_sig used
to be calculated in a bunch of different ways for different use cases, but is now being calculated
only once (inside of DummySignInput), in the same way for all use cases. Did I accidentally introduce
a bug there?
In other words... I'm not certain about the wallet changes here. Please double and triple check them.
Thanks!
2024-10-15 06:42:26 +00:00
