James Dorfman
6ca494eded
Merge aa54132bac into merged_master (Bitcoin PR bitcoin/bitcoin#24454 )
2024-08-01 23:29:18 +00:00
James Dorfman
1af96cd932
Merge b1c5991eeb into merged_master (Bitcoin PR bitcoin/bitcoin#24812 )
2024-08-01 21:46:36 +00:00
James Dorfman
8733f8df12
Merge 7a4ac713aa into merged_master (Bitcoin PR bitcoin/bitcoin#24936 )
2024-08-01 20:56:46 +00:00
James Dorfman
914f571c09
Merge 346e780442 into merged_master (Bitcoin PR bitcoin/bitcoin#24918 )
2024-08-01 18:25:58 +00:00
James Dorfman
2c58f992c5
Merge 8d3743a365 into merged_master (Bitcoin PR bitcoin/bitcoin#24896 )
2024-08-01 15:58:52 +00:00
James Dorfman
5585b749b6
Merge 013daed9ac into merged_master (Bitcoin PR bitcoin/bitcoin#24919 )
2024-08-01 06:17:00 +00:00
James Dorfman
530c5ea7e6
Merge 2095f19db9 into merged_master (Bitcoin PR bitcoin/bitcoin#24859 )
2024-08-01 01:18:15 +00:00
James Dorfman
28023d45b1
Merge d1b3dfb275 into merged_master (Bitcoin PR bitcoin/bitcoin#24855 )
2024-08-01 00:50:18 +00:00
James Dorfman
91173e1408
Disables functional test tool_signet_miner.py, since signet mining is not needed in Elements.
...
Ideally, this new test (added in last commit) should work in Elements, but I couldn't get
it working. Please look into if you can get this test working. Perhaps we need to set
g_con_elementsmode to False, or something similar.
2024-07-30 17:31:59 +00:00
James Dorfman
de5fe0b74d
Merge cf0a8b9c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24559 )
2024-07-30 15:23:21 +00:00
James Dorfman
a0419d9629
Merge cd110cdd0e into merged_master (Bitcoin PR bitcoin/bitcoin#24817 )
2024-07-30 04:25:47 +00:00
James Dorfman
e97784928b
Merge 4a58b6acd2 into merged_master (Bitcoin PR bitcoin/bitcoin#24797 )
2024-07-30 03:33:05 +00:00
James Dorfman
3ef748701c
Merge c1059c9fef into merged_master (Bitcoin PR bitcoin/bitcoin#24770 )
2024-07-30 02:08:55 +00:00
James Dorfman
41e72be6e1
Merge 10f629e644 into merged_master (Bitcoin PR bitcoin/bitcoin#24576 )
2024-07-29 19:15:06 +00:00
James Dorfman
b0c4300d1d
Merge 6c9460edae into merged_master (Bitcoin PR bitcoin/bitcoin#24358 )
2024-07-29 18:46:45 +00:00
James Dorfman
c40923460a
Fix test/functional/mining_basic which broke in merge of bitcoin/bitcoin#24753 in 372f1a3c25.
...
Please review the last merge (not this commit) carefully. The bitcoin merge of bitcoin/bitcoin#24753
did not lead to any changes in the mining_basic functional test, so it's possible I made a mistake
which caused this test to be affected.
2024-07-29 15:23:45 +00:00
James Dorfman
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +00:00
James Dorfman
18d0ebdd77
Merge 27cfaeed1e into merged_master (Bitcoin PR bitcoin/bitcoin#24098 )
2024-07-09 02:27:59 +00:00
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
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
