Byron Hambly
06009b9841
Merge a8f69541ad into merged_master (Bitcoin PR bitcoin/bitcoin#25748 )
2024-11-03 16:54:57 +02:00
Byron Hambly
52699c29d7
Merge e078ee9d9d into merged_master (Bitcoin PR bitcoin/bitcoin#25664 )
2024-11-01 15:14:19 +02:00
Byron Hambly
5104b4635b
Merge 93999a5fbe into merged_master (Bitcoin PR bitcoin/bitcoin#25642 )
2024-11-01 13:41:41 +02:00
Byron Hambly
85cd9e605d
Merge ac59112a6a into merged_master (Bitcoin PR bitcoin/bitcoin#23480 )
2024-10-30 09:49:14 +02:00
Byron Hambly
79d275ea14
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527 )
2024-10-25 11:03:47 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
50a5a78d8d
Merge 5215c80edc into merged_master (Bitcoin PR bitcoin/bitcoin#25709 )
2024-10-24 13:06:05 +02:00
Byron Hambly
da5b3cf786
Merge 9ba73758c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24697 )
...
Also removes the redundant redeclaration of CheckMinimalPush from
interpreter.h that was moved to script.h in f4e289f384
2024-10-20 20:19:04 +02:00
Byron Hambly
28d35f619e
Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331 )
2024-10-18 13:14:02 +02:00
James Dorfman
d94f55ff58
Merge 85b601e043 into merged_master (Bitcoin PR bitcoin/bitcoin#24148 )
2024-10-16 06:54:02 +00:00
Byron Hambly
2d07ef8fc1
Merge 5bf65ec66e into merged_master (Bitcoin PR bitcoin/bitcoin#22558 )
2024-09-19 13:24:19 +02:00
James Dorfman
a52fff5abe
Merge 695ca641a4 into merged_master (Bitcoin PR bitcoin/bitcoin#24860 )
2024-09-09 17:06:48 +00:00
James Dorfman
bcc0b07392
Merge cacbdbaa95 into merged_master (Bitcoin PR bitcoin/bitcoin#25132 )
2024-09-06 06:39:01 +00:00
James Dorfman
f9c08c4566
Merge 66e3b16b8b into merged_master (Bitcoin PR bitcoin/bitcoin#25184 )
2024-08-13 22:08:12 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +00:00
James Dorfman
cf81ccbd1f
Merge b557a24be9 into merged_master (Bitcoin PR bitcoin/bitcoin#19426 )
2024-08-09 16:00:17 +00:00
James Dorfman
d7c7eadebe
Merge 30c1c6ed80 into merged_master (Bitcoin PR bitcoin/bitcoin#24979 )
2024-08-02 05:29:00 +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
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
94e058d3b7
Merge d492dc1cda into merged_master (Bitcoin PR bitcoin/bitcoin#24147 )
2024-07-08 17:49:09 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
dbbde2d123
Merge df8e57296c into merged_master (Elements PR ElementsProject/elements#1286 )
2024-05-24 06:48:04 +00:00
James Dorfman
a0093e2760
Merge d6f225f5c9 into merged_master (Bitcoin PR bitcoin/bitcoin#24462 )
2024-01-09 00:06:54 +00:00
Christian Lewe
f4243128ee
Script: Move SCRIPT_ERR_COUNT
...
SCRIPT_ERR_COUNT is a pseudo error that returns the number of errors.
It must always be last in the enum.
2023-11-10 17:04:29 +01:00
Byron Hambly
35e8c6d908
Merge e7db4e245a into merged_master (Bitcoin PR bitcoin/bitcoin#24164 )
2023-10-14 19:42:34 +00:00
Byron Hambly
45f83fd396
Merge bada9636d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24043 )
2023-10-13 07:53:59 +00:00
Byron Hambly
eef2269720
Merge 72f97289c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24343 )
...
Had to change some hashes in descriptor_tests, presumably because of the
differences between when Elements and Bitcoin when it comes to Taproot.
Please review this carefully and investigate the FIXME
2023-07-02 05:17:22 +00:00
Byron Hambly
e7f3a397f2
Merge 5034b7fa3b into merged_master (Bitcoin PR bitcoin/bitcoin#24217 )
2023-06-30 09:16:02 +00:00
Byron Hambly
a992ccaac2
Merge 196b459920 into merged_master (Bitcoin PR bitcoin/bitcoin#23438 )
2023-06-29 08:37:35 +00:00
Byron Hambly
23ffcd4fc8
Merge bd482b3ffe into merged_master (Bitcoin PR bitcoin/bitcoin#24105 )
2023-06-21 11:44:35 +00:00
Byron Hambly
d3148d2497
Merge a1e04e1079 into merged_master (Bitcoin PR bitcoin/bitcoin#23926 )
2023-06-14 16:12:54 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
James Dorfman
536c7fee81
Merge 50c502f54a into merged_master (Bitcoin PR bitcoin/bitcoin#17034 )
2023-06-13 03:51:10 +00:00
James Dorfman
72a90148c8
Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413 )
2023-06-01 18:51:42 +00:00
Byron Hambly
00f2e32c8e
Merge 47fe7445e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22364 )
...
- some fixmes in this commit, related to invalid schnorr signatures
which need investigation
2023-05-29 12:58:36 +00:00
Byron Hambly
6a650c1a67
Merge 398fd63356 into merged_master (Bitcoin PR bitcoin/bitcoin#23525 )
2023-05-26 13:06:05 +00:00
Byron Hambly
1beaa601b4
Merge 5ccab7187b into merged_master (Bitcoin PR bitcoin/bitcoin#23394 )
...
- commented out some script tests that need to be fixed
- commented out feature_taproot.py since it needs significant updates
2023-05-26 09:14:20 +00:00
Byron Hambly
498907a233
Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951 )
2023-05-09 11:50:39 +00:00
James Dorfman
ff57e1e65f
Merge d6492d4ed0 into merged_master (Bitcoin PR bitcoin/bitcoin#22650 )
2023-04-27 04:55:34 +00:00
Byron Hambly
b33a4cdb4f
elements: fixes for bitcoin/bitcoin#22976
2023-04-24 12:05:24 +00:00
Byron Hambly
eea9829aa6
Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976 )
2023-04-24 11:40:49 +00:00
Byron Hambly
2097ef98ed
Merge f4e12fd50c into merged_master (Bitcoin PR bitcoin/bitcoin#22278 )
2023-04-20 12:38:44 +00:00
Byron Hambly
8e28696e5b
Merge 9a86327512 into merged_master (Bitcoin PR bitcoin/bitcoin#22512 )
2023-04-13 10:35:57 +00:00
James Dorfman
ab7a42420a
Merge e826b22da2 into merged_master (Bitcoin PR bitcoin/bitcoin#22275 )
2023-04-10 19:25:44 +00:00
Byron Hambly
c70b9b1b43
Merge a93e7a4422 into merged_master (Bitcoin PR bitcoin/bitcoin#22748 )
2023-04-10 13:22:14 +00:00
Byron Hambly
a20c67310c
Merge b1a672d158 into merged_master (Bitcoin PR bitcoin/bitcoin#22337 )
2023-04-07 11:57:51 +00:00
James Dorfman
a124f16efc
Merge fd557ceb88 into merged_master (Bitcoin PR bitcoin/bitcoin#13533 )
...
Temporarily disable failing tests that use elements-specific interpreter flags
2023-03-24 19:33:46 +00:00
James Dorfman
91eba3427c
Merge a3791da0e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22428 )
2023-03-21 16:20:59 +00:00
James Dorfman
400c44abcc
Merge 9faa4b68db into merged_master (Bitcoin PR #22232 )
2023-03-16 04:51:52 +00:00
roconnor-blockstream
707cf20b12
Fix tapscript comment
...
In elements tapscript is verison 0xc4
2022-08-12 11:56:15 -04:00
