James Dorfman
66c8ae2b78
Merge 37e49cc1b5 into merged_master (Bitcoin PR bitcoin-core/gui#580 )
2024-08-01 16:46:42 +00:00
James Dorfman
b4321ae5f1
Merge 8103fffe5c into merged_master (Bitcoin PR bitcoin/bitcoin#24906 )
2024-08-01 16:36:50 +00:00
James Dorfman
5fa8f4dda7
Merge 6300b9556e into merged_master (Bitcoin PR bitcoin/bitcoin#24357 )
2024-08-01 16:18:44 +00:00
James Dorfman
5aecf43b57
Merge f8b2e9bcfc into merged_master (Bitcoin PR bitcoin/bitcoin#24772 )
2024-08-01 16:18:21 +00:00
James Dorfman
0884ced1ec
Merge e0ff55a836 into merged_master (Bitcoin PR bitcoin/bitcoin#24871 )
2024-08-01 16:09:20 +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
03e84eb465
Merge b297b945f7 into merged_master (Bitcoin PR bitcoin/bitcoin#21279 )
2024-08-01 06:17:05 +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
8a90920f2e
Merge ff78833d3c into merged_master (Bitcoin PR bitcoin/bitcoin#24776 )
2024-08-01 06:16:31 +00:00
James Dorfman
ab1389c69b
Merge 907659770b into merged_master (Bitcoin PR bitcoin/bitcoin#24913 )
2024-08-01 06:06:27 +00:00
James Dorfman
e8ba951dbc
Merge 57a73d71a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24794 )
2024-08-01 06:06:21 +00:00
James Dorfman
2dbf842435
Merge 5fdf37e14b into merged_master (Bitcoin PR bitcoin/bitcoin#24853 )
...
This commit removed a bash script and added in a Python version of the same script.
There did not appear to be anything elements-related in the script, but for some
reason git marked it as a merge conflict. Please verify that the removed / rewritten
script had no elements-specific changes.
2024-08-01 06:04:25 +00:00
James Dorfman
13315e3cdd
Merge 3059d4dd72 into merged_master (Bitcoin PR bitcoin/bitcoin#24844 )
2024-08-01 01:29:16 +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
77ac341fbf
Merge d2e04196b6 into merged_master (Bitcoin PR bitcoin/bitcoin#24862 )
2024-08-01 01:09:06 +00:00
James Dorfman
9589e4d604
Merge 2074d7df20 into merged_master (Bitcoin PR bitcoin/bitcoin#24837 )
2024-08-01 00:59:25 +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
f0f70cefd8
Merge 6be319beb8 into merged_master (Bitcoin PR bitcoin/bitcoin#24841 )
2024-08-01 00:41:04 +00:00
James Dorfman
b9fa64ad24
Merge f3e0ace8ec into merged_master (Bitcoin PR bitcoin-core/gui#579 )
2024-08-01 00:13:39 +00:00
James Dorfman
c831de4f54
Merge 72477ebb11 into merged_master (Bitcoin PR bitcoin-core/gui#556 )
...
Please test this commit by manually launching the elements QT gui and
making sure that all the units are displayed properly in elements
2024-07-31 23:59:08 +00:00
James Dorfman
8318077f07
Merge 7190de9fb8 into merged_master (Bitcoin PR bitcoin-core/gui#552 )
2024-07-30 17:59:28 +00:00
James Dorfman
a64661d051
Merge 012d33f70b into merged_master (Bitcoin PR bitcoin/bitcoin#24847 )
2024-07-30 17:50:26 +00:00
James Dorfman
46162b40bd
Merge 333a41882c into merged_master (Bitcoin PR bitcoin/bitcoin#24172 )
2024-07-30 17:50:20 +00:00
James Dorfman
341f5c222c
Merge 7da4f65a00 into merged_master (Bitcoin PR bitcoin/bitcoin#24818 )
2024-07-30 17:41:16 +00:00
James Dorfman
73346e81f8
Merge e14f0fa6a3 into merged_master (Bitcoin PR bitcoin/bitcoin#19952 )
2024-07-30 17:32:03 +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
da14cb0b26
Merge d0f7493b6c into merged_master (Bitcoin PR bitcoin/bitcoin#24849 )
2024-07-30 15:14:02 +00:00
James Dorfman
de36637d9c
Merge b69fd5eaa9 into merged_master (Bitcoin PR bitcoin/bitcoin#22052 )
2024-07-30 06:40:58 +00:00
James Dorfman
5b1a4e1dd3
Merge 1e3ed01faa into merged_master (Bitcoin PR bitcoin/bitcoin#23416 )
2024-07-30 06:40:35 +00:00
James Dorfman
1bc6917a7a
Merge 6c9bc14a3f into merged_master (Bitcoin PR bitcoin/bitcoin#24842 )
2024-07-30 06:29:12 +00:00
James Dorfman
48c8ab569b
Merge 8e3c266a4f into merged_master (Bitcoin PR bitcoin/bitcoin#24077 )
2024-07-30 06:06:22 +00:00
James Dorfman
098585cb1c
Merge decde9bba6 into merged_master (Bitcoin PR bitcoin/bitcoin#24355 )
2024-07-30 05:44:26 +00:00
James Dorfman
ff18798461
Merge 9b7eb584ad into merged_master (Bitcoin PR bitcoin/bitcoin#24285 )
2024-07-30 05:35:32 +00:00
James Dorfman
1fda45d8e8
Merge 3bbc46ddaf into merged_master (Bitcoin PR bitcoin/bitcoin#24632 )
2024-07-30 05:26:33 +00:00
James Dorfman
1f0a4760ba
Merge f60a63cc5f into merged_master (Bitcoin PR bitcoin-core/gui#577 )
2024-07-30 05:17:21 +00:00
James Dorfman
8c5d4d132d
Merge f509760026 into merged_master (Bitcoin PR bitcoin-core/gui#576 )
2024-07-30 05:08:10 +00:00
James Dorfman
696422b3b7
Merge 0f46e73c74 into merged_master (Bitcoin PR bitcoin-core/gui#543 )
2024-07-30 04:57:11 +00:00
James Dorfman
84413436a5
Merge 2b5a741e98 into merged_master (Bitcoin PR bitcoin/bitcoin#24826 )
2024-07-30 04:56:45 +00:00
James Dorfman
5a24a3c13f
Merge 7626e547b8 into merged_master (Bitcoin PR bitcoin/bitcoin#24337 )
2024-07-30 04:47:52 +00:00
James Dorfman
de364241b4
Merge 22e3b6f4d5 into merged_master (Bitcoin PR bitcoin/bitcoin#24800 )
...
git claimed we had some differences in the Elements version of
test/lint/lint-python-mutable-default-parameters.sh which did not
exist in the bitcoin version, so it marked a conflict for me when
bitcoin deleted the file. However, I don't see anything elements-specific.
Please review this file and confirm that there is nothing elements-specific
which needs to go into the new python version of the file introduced
in this commit, named test/lint/lint-python-mutable-default-parameters.py.
2024-07-30 04:36:37 +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
d3eb9580ec
Fix bug introduced in merge of bitcoin/bitcoin#24152 in d844b5e799
2024-07-30 04:06:48 +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
21bc5cd263
Merge 747cdf1d65 into merged_master (Bitcoin PR bitcoin/bitcoin#24792 )
...
This is an empty commit. Ignored all secp256k1 changes, since the
corresponding changes in secp256k1-zkp for elements get merged
separately.
2024-07-30 03:32:02 +00:00
James Dorfman
df428b0489
Merge 87c7dcc60d into merged_master (Bitcoin PR bitcoin/bitcoin#24808 )
2024-07-30 03:09:29 +00:00
James Dorfman
f62a9f1386
Merge e0680bbce8 into merged_master (Bitcoin PR bitcoin/bitcoin#24806 )
2024-07-30 02:59:41 +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
e17aba0c07
Merge 38d3d0bfc4 into merged_master (Bitcoin PR bitcoin/bitcoin#24796 )
2024-07-30 01:52:26 +00:00
James Dorfman
381c18e20a
Merge 323d4c09c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24784 )
2024-07-30 01:43:18 +00:00
