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
James Dorfman
d72be3f6b9
Merge b9f9ed4640 into merged_master (Bitcoin PR bitcoin/bitcoin#25337 )
2024-10-13 18:07:54 +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
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
James Dorfman
b60117c595
Merge 67c6b61f96 into merged_master (Bitcoin PR bitcoin/bitcoin#25525 )
2024-10-11 04:48:27 +00:00
James Dorfman
a16c0bdbc3
Merge 195e07feaf into merged_master (Bitcoin PR bitcoin/bitcoin#19393 )
2024-10-09 19:34:15 +00:00
James Dorfman
6e9f70937f
Merge 87d012324a into merged_master (Bitcoin PR bitcoin/bitcoin#25454 )
2024-10-09 18:16:23 +00:00
James Dorfman
400a87e626
Merge fbc01d56d7 into merged_master (Elements PR #1366 )
2024-10-09 05:59:56 +00:00
James Dorfman
5d43651b1c
Merge 9c55091be2 into merged_master (Bitcoin PR bitcoin/bitcoin#25535 )
2024-10-09 05:56:27 +00:00
James Dorfman
94c44698f4
Move the slow feature_trim_headers functional test to the extended tests, so that it doesn't automatically run
2024-10-09 05:28:58 +00:00
James Dorfman
0fff8eea05
Merge 5d68d6840d into merged_master (Bitcoin PR bitcoin/bitcoin#25364 )
2024-10-09 05:20:03 +00:00
James Dorfman
9e9b73df05
Merge 6adae27f8c into merged_master (Bitcoin PR bitcoin/bitcoin#24836 )
2024-10-08 18:34:54 +00:00
James Dorfman
15228d78aa
Merge 99ca072a94 into merged_master (Elements PR #1362 )
2024-10-08 06:01:08 +00:00
James Dorfman
05090af6ca
Merge 639715df61 into merged_master (Elements PR #1356 )
2024-10-08 05:49:33 +00:00
James Dorfman
a61b1d1240
Merge e1d6b66ead into merged_master (Elements PR #1346 )
2024-10-08 05:35:12 +00:00
James Dorfman
ead0ddfef6
tests: increase sync_all timeout in feature_trim_headers functional test
...
This gives the 2 rebooted nodes enough time to sync all the blocks from
node 0 (which had been online throughout the entire test).
2024-10-08 04:59:26 +00:00
Byron Hambly
09c5068ab1
discount: fix weight calculation
...
Thanks to Jon Griffiths for picking up that the amount and nonce discount
should be multiplied by the witness scaling factor as they form part of
the base transaction.
2024-09-25 15:18:38 +02:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
Byron Hambly
d0f714638a
feat: add discountweight to TxToUniv
2024-09-20 14:39:13 +02:00
James Dorfman
901c7c148e
Merge 1ee597817f into merged_master (Bitcoin PR bitcoin/bitcoin#25503 )
2024-09-19 19:48:57 +00:00
James Dorfman
a43f34f24c
Merge b6cf0f8848 into merged_master (Bitcoin PR bitcoin/bitcoin#25511 )
2024-09-19 19:28:20 +00:00
James Dorfman
17851700b4
Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290 )
2024-09-19 18:56:19 +00:00
Byron Hambly
d5a5556674
fix for rpc_psbt.py
...
replaced the failing sendall call with walletcreatefundedpsbt
saw this in wallet_taproot.py during the merge (line 454)
obviously something is missing in sendall when the psbt is serialized it
is missing the asset for the outputs
2024-09-19 13:57:22 +02:00
Byron Hambly
2d07ef8fc1
Merge 5bf65ec66e into merged_master (Bitcoin PR bitcoin/bitcoin#22558 )
2024-09-19 13:24:19 +02:00
James Dorfman
217fbdc530
Merge 78957e71e8 into merged_master (Bitcoin PR bitcoin/bitcoin#25486 )
2024-09-17 18:36:14 +00:00
James Dorfman
7c29c4bcdd
Merge c8261026a4 into merged_master (Bitcoin PR bitcoin/bitcoin#25445 )
...
Please double check my changes here -- I had to adjust some units
in test/functional/test_framework/wallet.py.
2024-09-17 18:35:09 +00:00
James Dorfman
ed625a6abc
Merge dde7205c57 into merged_master (Bitcoin PR bitcoin/bitcoin#23418 )
2024-09-16 06:14:02 +00:00
James Dorfman
aa54d7bc2f
Merge f52d074363 into merged_master (Bitcoin PR bitcoin/bitcoin#25439 )
2024-09-16 05:31:22 +00:00
James Dorfman
6c48e048dd
Merge c1acd34984 into merged_master (Bitcoin PR bitcoin/bitcoin#25476 )
2024-09-16 05:25:39 +00:00
James Dorfman
088bedeff2
Merge 01e9e2d1ca into merged_master (Bitcoin PR bitcoin/bitcoin#25451 )
2024-09-16 05:06:23 +00:00
James Dorfman
d923eab56e
Merge 0808c88d7b into merged_master (Bitcoin PR bitcoin/bitcoin#25443 )
2024-09-16 05:05:56 +00:00
James Dorfman
fa1a985ef3
Merge 1b71c76886 into merged_master (Bitcoin PR bitcoin/bitcoin#25435 )
2024-09-16 04:45:07 +00:00
