Commit graph

5292 commits

Author SHA1 Message Date
James Dorfman
5896e751de Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236) 2024-07-08 20:04:51 +00:00
James Dorfman
cc29129ebc Merge ee9af95f09 into merged_master (Bitcoin PR bitcoin/bitcoin#24749) 2024-07-08 19:55:31 +00:00
James Dorfman
6c04279f86 Merge c8ac7e6a65 into merged_master (Bitcoin PR bitcoin/bitcoin#24698) 2024-07-08 06:22:34 +00:00
James Dorfman
22ccf93f29 Adapt sendall RPC to work properly in elements.
This fixes errors introduced in the merge of bitcoin/bitcoin#24118 in d5b8d28d07.

Pleaae review this commit carefully.
2024-06-21 20:19:03 +00:00
James Dorfman
d5b8d28d07 Merge f4e5d704f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24118) 2024-05-24 18:21:12 +00:00
James Dorfman
9c1d4cc8ff Merge a4d7ac7bbe into merged_master (Elements PR #1317) 2024-05-24 16:13:46 +00:00
James Dorfman
d1b8d682f2 Merge 7ff33d45df into merged_master (Elements PR #1330) 2024-05-24 16:13:43 +00:00
James Dorfman
51ce17b418 Merge 1b65d4d37b into merged_master (Elements PR #1284) 2024-05-24 07:10:54 +00:00
James Dorfman
77b849f4c6 Merge 20c5630f8c into merged_master (Elements PR #1277) 2024-05-24 06:39:06 +00:00
James Dorfman
26a2a9702e Merge c248983aab into merged_master (Elements PR #1276) 2024-05-24 05:46:29 +00:00
James Dorfman
44228c4194 Merge e14d987438 into merged_master (Elements PR #1275) 2024-05-24 05:37:54 +00:00
Byron Hambly
3ebc35359f
discount: add functional tests 2024-05-14 19:03:37 +02:00
Byron Hambly
98c8e4f387
test: fix tests broken by change to getpeginaddress
Fixes 2 functional tests failing since PR #1327 changes getpeginaddress
to only be valid when IsInitialBlockDownload is false
2024-05-06 14:21:44 +02:00
James Dorfman
3a37a8cbb5 Merge 3297f5c11c into merged_master (Bitcoin PR bitcoin/bitcoin#24623) 2024-04-10 16:04:47 +00:00
James Dorfman
c44ed1ba6b Merge 161dd7e864 into merged_master (Bitcoin PR bitcoin/bitcoin#24687) 2024-04-10 06:49:17 +00:00
James Dorfman
4a0070731e Merge 88709e9dc5 into merged_master (Bitcoin PR bitcoin/bitcoin#24258) 2024-04-10 06:32:39 +00:00
James Dorfman
641df02a8d Merge 6d5771ba07 into merged_master (Bitcoin PR bitcoin/bitcoin#24494)
Please review carefully: this touches the wallet code, and I'm not sure
I adapted the new change metrics to work correctly for multi-asset.
2024-04-10 05:12:50 +00:00
James Dorfman
100d6e7c28 Merge f66c827c2d into merged_master (Bitcoin PR bitcoin/bitcoin#24502)
Changed a bech32m address in the wallet_basic test to blech32m (for elements).
Also changed an error message in the wallet to say "blech32m" instead of "bech32m".
2024-04-08 04:17:28 +00:00
James Dorfman
7bbef5bbb1 Merge 9745e18051 into merged_master (Bitcoin PR bitcoin/bitcoin#24670) 2024-04-04 21:36:11 +00:00
James Dorfman
363d930f8e Merge 9344697e57 into merged_master (Bitcoin PR bitcoin/bitcoin#21160) 2024-03-19 20:07:00 +00:00
James Dorfman
087b2f13f4 Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536) 2024-03-19 19:58:32 +00:00
James Dorfman
17d45cdb7d Merge 3740cdd125 into merged_master (Bitcoin PR bitcoin/bitcoin#24091) 2024-03-19 06:35:30 +00:00
Byron Hambly
b9f9528b7c Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205) 2024-02-02 14:57:29 +02:00
Byron Hambly
cd652e5472 Merge a697a3fc91 into merged_master (Bitcoin PR bitcoin/bitcoin#24653) 2024-02-02 14:50:04 +02:00
Byron Hambly
7629e72362 Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626) 2024-02-02 11:54:04 +02:00
James Dorfman
2aef7af5b6 Merge 26d98d51f2 into merged_master (Bitcoin PR bitcoin/bitcoin#24574) 2024-01-17 21:09:55 +00:00
James Dorfman
c3629a2443 Merge 864fb89b2f into merged_master (Bitcoin PR bitcoin/bitcoin#24637) 2024-01-17 21:00:59 +00:00
James Dorfman
92481c3833 Merge 8234cdaf62 into merged_master (Bitcoin PR bitcoin/bitcoin#24587) 2024-01-17 01:39:36 +00:00
James Dorfman
127a28e813 Merge ce05f838f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24635) 2024-01-11 17:38:16 +00:00
James Dorfman
0ea088b896 Merge b8f498f80d into merged_master (Bitcoin PR bitcoin/bitcoin#24535) 2024-01-08 19:52:28 +00:00
James Dorfman
aa80572b01 Merge e3206c9445 into merged_master (Bitcoin PR bitcoin/bitcoin#24605)
Please review my changes in test/functional/test_framework/wallet.py.
Confirm that my change of the return value from 1 --> 2 was correct.

That fixed a failing test. I think it's needed because in elements we
have an extra fee output.
2024-01-08 19:45:18 +00:00
Byron Hambly
9368fbac1c
test: fix flaky test wallet_groups.py
since the SRD coin selection was added, Elements sometimes picks a 1.0
input instead of 0.5 in this test
2023-11-22 08:55:40 +02:00
James Dorfman
48ca8b0f76 test: fix bug in wallet_groups.py functional test that was introduced in merge of bitcoin/bitcoin#22364 in 00f2e32 2023-11-15 20:01:50 +00:00
James Dorfman
ec4c2a4898 test: fix feature_taphash_pegins_issuances.py
The first transaction was failing with bad-txns-inputs-missingorspent
because the "input" selected with fundrawtransaction was the
anyonecanspend initialfreecoins.

Fixed by first spending the initialfreecoins to "real" outputs.
2023-11-13 15:33:58 +00:00
Byron Hambly
d215bf7f91 test: fix feature_tapscript_opcodes.py
The first transaction from create_taproot_utxo was failing with
bad-txns-inputs-missingorspent because the "input" selected with
fundrawtransaction was the anyonecanspend initialfreecoins.

Fixed by first spending the initialfreecoins to "real" outputs.
2023-11-13 09:06:43 +00:00
James Dorfman
8ccb3e1604 test_runner: re-enable the now-passing 'feature_taproot.py' 2023-11-13 03:17:08 +00:00
James Dorfman
eb24b3eb39 test_runner: re-enable the now-passing 'wallet_basic.py --descriptors' 2023-11-09 06:42:33 +00:00
James Dorfman
06423a6aac test: remove useless comment from feature_taproot_opcodes
The line immediately below the commented out code I removed explicitly
tests the exact behaviour which was being questioned in the comment.

This indicates that the comment was incorrect.
2023-11-09 06:34:34 +00:00
Pablo Greco
20c5630f8c
Merge pull request #1277 from delta1/issues-1259
fix: assert failure on non-policy asset consolidation in CreateTransactionInternal
2023-10-27 12:38:05 -03:00
James Dorfman
e02024e53f test: add new elements_code_tutorial functional test 2023-10-27 15:23:36 +00:00
James Dorfman
5b72ae23af
coinselection: fail if each non-policy asset doesn't have a solution 2023-10-23 16:51:09 +02:00
Byron Hambly
d3ffd2a380
test: add functional test for issue #1259
Adds a functional test to cover the issue uncovered in #1259, where
calling fundrawtransaction with many non-policy inputs and no policy
recipients results in an assertion failure and a crash.

Fixed in #1258.

(cherry picked from commit a8b0ed6f96)
2023-10-23 16:43:20 +02:00
James Dorfman
c248983aab
Merge pull request #1276 from delta1/issues-1263
fix: segfault on getpeginaddress rpc when not in elements mode
2023-10-18 11:51:06 -04:00
Byron Hambly
181b9e5932
test: reduce sleep time in witness_script_test and bump precision for csv test 2023-10-18 14:09:09 +02:00
Byron Hambly
5326676ff3
fix: segfault on getpeginaddress rpc when not in elements mode
Fixes https://github.com/ElementsProject/elements/issues/1263

When not running in Elements mode, GetValidFedpegScripts returns an
empty vector. Subsequently `calculate_contract` is called with
`fedpegscripts.front().second` which is a null reference. This reference
is passed into `MatchLiquidWatchman` which tries to dereference the null
reference and causes a segfault.

This fix throws an exception in `getpeginaddress` if fedpegscripts is
empty, returning an error to the RPC caller. It also adds a functional
regression test.
2023-10-18 13:02:51 +02:00
James Dorfman
550563e04b test: give env more time to settle in signrawtransaction.py 2023-10-17 21:00:59 +00:00
Byron Hambly
13a3eadcc0 Merge 66e2d21ef2 into merged_master (Bitcoin PR bitcoin/bitcoin#24578) 2023-10-16 11:55:39 +00:00
Byron Hambly
67bb197647
test: fix flaky CLTV test in signrawtransaction.py 2023-10-16 13:02:43 +02:00
James Dorfman
8715ef526d Merge 7b83c7d609 into merged_master (Bitcoin PR bitcoin/bitcoin#24510) 2023-10-15 23:34:23 +00:00
James Dorfman
f3ee905625 Merge e0881aa5f0 into merged_master (Bitcoin PR bitcoin/bitcoin#24505) 2023-10-15 21:39:09 +00:00