Byron Hambly
1773a10586
Merge 8c9ea8a556 into merged_master (Bitcoin PR bitcoin/bitcoin#25612 )
2024-10-17 13:56:06 +02:00
Byron Hambly
ad90efac48
Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466 )
2024-10-17 10:54:37 +02:00
Byron Hambly
299207b5d6
Merge 2bdce7f7ad into merged_master (Bitcoin PR bitcoin/bitcoin#25514 )
...
Note I did manually run the trim headers functional test successfully on
this commit, since it touched some of trim headers code.
2024-10-17 10:44:56 +02:00
Byron Hambly
b81762fcb2
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997 )
2024-10-17 10:15:38 +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
0889a08688
Merge f002f8a0e7 into merged_master (Bitcoin PR bitcoin/bitcoin#25599 )
2024-10-17 09:30:31 +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
434ecd3804
Merge c395c8d6bb into merged_master (Bitcoin PR bitcoin/bitcoin#25624 )
2024-10-16 07:25:18 +00:00
James Dorfman
c44412b959
Merge d806407173 into merged_master (Bitcoin PR bitcoin/bitcoin#25542 )
2024-10-16 07:25:12 +00:00
James Dorfman
dfa9412306
Merge c5fa7ed409 into merged_master (Bitcoin PR bitcoin/bitcoin#25544 )
2024-10-16 07:10:53 +00:00
James Dorfman
0fc13e69d9
Merge 4e2929e987 into merged_master (Bitcoin PR bitcoin/bitcoin#25617 )
2024-10-16 07:08:03 +00:00
James Dorfman
d5d175898d
Merge 82ab22af3a into merged_master (Bitcoin PR bitcoin/bitcoin#25605 )
2024-10-16 07:07:59 +00:00
James Dorfman
e938673fbd
Merge 55b76ac1c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25615 )
2024-10-16 07:07:54 +00:00
James Dorfman
a6c560a364
Merge 826fae6a0f into merged_master (Bitcoin PR bitcoin/bitcoin#25618 )
2024-10-16 07:07:43 +00:00
James Dorfman
8201d06e41
Merge 6decdedaf9 into merged_master (Bitcoin PR bitcoin-core/gui#469 )
2024-10-16 07:07:39 +00:00
James Dorfman
3ebf01fa42
Merge a969b2fcd3 into merged_master (Bitcoin PR bitcoin/bitcoin#25551 )
2024-10-16 07:03:13 +00:00
James Dorfman
d94f55ff58
Merge 85b601e043 into merged_master (Bitcoin PR bitcoin/bitcoin#24148 )
2024-10-16 06:54:02 +00:00
James Dorfman
261587da79
Merge 02ede4f1fd into merged_master (Bitcoin PR bitcoin/bitcoin#25607 )
2024-10-16 06:40:29 +00:00
James Dorfman
66071a5dbb
Merge 062b9db0cc into merged_master (Bitcoin PR bitcoin/bitcoin#25594 )
2024-10-16 06:40:24 +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
bf5189aa76
Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472 )
2024-10-16 05:44:43 +00:00
James Dorfman
86f958f394
Merge 081965ccc3 into merged_master (Bitcoin PR bitcoin/bitcoin#25464 )
2024-10-16 05:42:48 +00:00
James Dorfman
00aa7139b8
Fix invalid RPC call within feature_rbf functional test
2024-10-16 05:42:41 +00:00
James Dorfman
98c5ad9be1
Merge 1d89fc695a into merged_master (Bitcoin PR bitcoin/bitcoin#25324 )
2024-10-16 05:06:15 +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
8195abbd21
Merge 7d258ee8bc into merged_master (Bitcoin PR bitcoin/bitcoin#25489 )
2024-10-16 05:04:06 +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
c86e00508f
Merge dd13d7bf16 into merged_master (Bitcoin PR bitcoin/bitcoin#25591 )
2024-10-16 05:03:53 +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
e22bfb3011
Merge 316afb1eca into merged_master (Bitcoin PR bitcoin/bitcoin#25218 )
2024-10-16 04:56:53 +00:00
James Dorfman
142bfd6d0b
Merge 27a4dd055b into merged_master (Bitcoin PR bitcoin-core/gui#627 )
2024-10-15 17:17:08 +00:00
James Dorfman
eb0e9f9d2e
Merge 8479ed02d7 into merged_master (Bitcoin PR bitcoin/bitcoin#25565 )
2024-10-15 17:17:05 +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
f6f9f6b155
Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036 )
2024-10-15 17:03:37 +00:00
James Dorfman
d6108a5ed1
Merge c92eb6cda0 into merged_master (Bitcoin PR bitcoin/bitcoin#25562 )
2024-10-15 16:50:52 +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
49ad81a3da
Merge f9783b0f07 into merged_master (Bitcoin PR bitcoin-core/gui#471 )
2024-10-15 06:49:00 +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
James Dorfman
d72be3f6b9
Merge b9f9ed4640 into merged_master (Bitcoin PR bitcoin/bitcoin#25337 )
2024-10-13 18:07:54 +00:00
James Dorfman
9a2c16494f
Merge 994573726f into merged_master (Bitcoin PR bitcoin/bitcoin#25549 )
2024-10-13 18:06:17 +00:00
James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00
James Dorfman
69e9c5ae97
Merge 172823e4d5 into merged_master (Bitcoin PR bitcoin/bitcoin#25568 )
2024-10-13 07:26:13 +00:00
James Dorfman
cdfea908b0
Merge 5abbc9afec into merged_master (Bitcoin PR bitcoin/bitcoin#24832 )
2024-10-13 07:21:48 +00:00
James Dorfman
f84ebdaea8
Merge d571cf2d24 into merged_master (Bitcoin PR bitcoin/bitcoin#25500 )
2024-10-13 06:59:23 +00:00
James Dorfman
4eedc6ecad
Merge a658a02c79 into merged_master (Bitcoin PR bitcoin/bitcoin#25524 )
2024-10-13 06:58:42 +00:00
James Dorfman
1aeb46938b
Merge c49b0405fb into merged_master (Bitcoin PR bitcoin/bitcoin#25558 )
2024-10-13 06:58:09 +00:00
James Dorfman
9841d576fb
Merge 8ef096d4f8 into merged_master (Bitcoin PR bitcoin/bitcoin#25522 )
...
This commit made a lot of changes to test/functional/feature_rbf.py.
That functional test already had each subtest commented out, because
they weren't working properly.
For the most part, I simply accepted the incoming changes, and did not
actually get the functional test to start working.
2024-10-13 06:56:17 +00:00
