Byron Hambly
39e670c88c
Merge 216f4ca9e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22674 )
2023-06-13 13:17:01 +00:00
Byron Hambly
6179a5a04e
Merge b67115dd04 into merged_master (Bitcoin PR bitcoin/bitcoin#23174 )
2023-06-13 11:41:51 +00:00
Byron Hambly
d1b42f9929
Merge 767c012665 into merged_master (Bitcoin PR bitcoin/bitcoin#23738 )
2023-06-13 08:34:23 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
Byron Hambly
6089b0123d
Merge dca9ab48b8 into merged_master (Bitcoin PR bitcoin/bitcoin#23661 )
2023-06-02 08:54:50 +00:00
James Dorfman
71f8040ba1
Merge 345c8180d7 into merged_master (Bitcoin PR bitcoin/bitcoin#23630 )
2023-06-02 04:58:15 +00:00
Byron Hambly
1aedc97366
Merge ffe414bd9a into merged_master (Bitcoin PR bitcoin/bitcoin#23649 )
2023-06-01 13:32:01 +00:00
Byron Hambly
2da6d2363d
Merge 4633199cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22677 )
2023-06-01 09:42:34 +00:00
Byron Hambly
5a723e538b
Merge 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437 )
2023-06-01 09:15:23 +00:00
James Dorfman
ec627f4ef0
Merge 9174bcf7da into merged_master (Bitcoin PR bitcoin/bitcoin#23590 )
2023-06-01 06:08:36 +00:00
Byron Hambly
936a252fea
Merge 913b7148a2 into merged_master (Bitcoin PR bitcoin/bitcoin#22902 )
2023-05-31 11:50:48 +00:00
Byron Hambly
1ff9a8afda
Merge 4aa06f9447 into merged_master (Bitcoin PR bitcoin/bitcoin#23600 )
2023-05-31 10:16:38 +00:00
James Dorfman
c134b5a012
Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512 )
2023-05-31 06:23:55 +00:00
Byron Hambly
2da8f66309
Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173 )
2023-05-24 11:45:57 +00:00
Byron Hambly
b0ba2f97e2
Merge e70fb87a4f into merged_master (Bitcoin PR bitcoin/bitcoin#23381 )
2023-05-18 09:30:53 +00:00
James Dorfman
df8f97d63b
Merge 1847ce2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#23157 )
2023-05-16 09:04:56 +00:00
Byron Hambly
7925c2a451
Merge 224e90d9fd into merged_master (Bitcoin PR bitcoin/bitcoin#23336 )
2023-05-15 12:27:08 +00:00
Byron Hambly
8299bec8a2
Merge c001da306b into merged_master (Bitcoin PR bitcoin/bitcoin#23325 )
2023-05-14 10:52:15 +00:00
James Dorfman
664122467c
Merge 0ccf9b2e55 into merged_master (Bitcoin PR bitcoin/bitcoin#23258 )
2023-05-14 00:57:27 +00:00
Byron Hambly
4d11268e6a
Merge 4b24f6bbb5 into merged_master (Bitcoin PR bitcoin/bitcoin#23302 )
2023-05-12 10:40:11 +00:00
Byron Hambly
a4b97d5a9b
Merge ec4e43c21c into merged_master (Bitcoin PR #23235 )
2023-05-11 10:44:10 +00:00
Byron Hambly
94fc4e9706
Merge 6f0cbc75be into merged_master (Bitcoin PR bitcoin/bitcoin#22539 )
2023-05-10 11:14:12 +00:00
Byron Hambly
498907a233
Merge 816e15ee81 into merged_master (Bitcoin PR bitcoin/bitcoin#22951 )
2023-05-09 11:50:39 +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
14a2c59839
Merge 632be5514c into merged_master (Bitcoin PR bitcoin/bitcoin#23061 )
2023-04-24 10:40:48 +00:00
Byron Hambly
070c52dcef
Merge b7e3600815 into merged_master (Bitcoin PR bitcoin/bitcoin#21526 )
2023-04-23 10:59:59 +00:00
Byron Hambly
e619febc41
Merge 95b16e70a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23072 )
2023-04-23 09:55:51 +00:00
Byron Hambly
f21f92ba69
Merge 8bda5e0988 into merged_master (Bitcoin PR bitcoin/bitcoin#22855 )
2023-04-23 09:29:14 +00:00
Byron Hambly
98d921235f
Merge 971cad475f into merged_master (Bitcoin PR bitcoin/bitcoin#23044 )
2023-04-23 07:40:20 +00:00
Byron Hambly
8d89f4e102
Merge 71bdf0bff1 into merged_master (Bitcoin PR bitcoin/bitcoin#22626 )
2023-04-21 12:36:24 +00:00
Byron Hambly
2a48cc4c59
Merge b8336b22d3 into merged_master (Bitcoin PR bitcoin/bitcoin#22675 )
2023-04-21 06:41:50 +00:00
James Dorfman
d625266215
Merge da67b75c5c into merged_master (Bitcoin PR bitcoin/bitcoin#22903 )
2023-04-21 02:04:22 +00:00
Byron Hambly
162e1f24bd
Merge 81f4a3e84d into merged_master (Bitcoin PR bitcoin/bitcoin#22796 )
2023-04-11 09:13:05 +00:00
Byron Hambly
cb71563589
Merge 7be143a960 into merged_master (Bitcoin PR bitcoin/bitcoin#22824 )
2023-04-11 08:37:41 +00:00
Byron Hambly
8599606ab3
Merge 21438d55d5 into merged_master (Bitcoin PR bitcoin/bitcoin#21800 )
2023-04-09 05:08:13 +00:00
James Dorfman
ea7450b099
Merge 4b1fb50def into merged_master (Bitcoin PR bitcoin/bitcoin#22528 )
2023-03-31 18:53:21 +00:00
Glenn Willen
4334fce793
Merge 61cefde7a7 into merged_master (Bitcoin PR bitcoin/bitcoin#22006 )
2023-03-28 00:12:41 +00:00
Glenn Willen
7050d04a75
Merge 7925f3aba8 into merged_master (Bitcoin PR bitcoin/bitcoin#22383 )
2023-03-22 03:54:56 +00:00
James Dorfman
17e6efe7fe
Merge 5d83e7d714 into merged_master (Bitcoin PR bitcoin/bitcoin#21090 )
...
We comment out a newly-added assert from the Bitcoin
side, because it's unclear how to replicate it
correctly in Elements.
Co-authored-by: Glenn Willen <gwillen@nerdnet.org>
2023-03-22 01:11:20 +00:00
James Dorfman
44df9bbb73
Merge 951850bebf into merged_master (Bitcoin PR #22371 )
2023-03-16 14:23:27 +00:00
Glenn Willen
b9b7f6543a
Apply suggestions from code review
...
Co-authored-by: Byron Hambly <byron@hambly.dev>
2023-01-04 15:32:04 -08:00
Glenn Willen
4f0da3ce3d
Trim headers when flushing to disk, and reduce flush interval from 1h to 5min.
2022-12-12 09:46:07 -08:00
Glenn Willen
eff6be337f
Trim headers when loading block index from disk.
2022-12-12 09:46:07 -08:00
Glenn Willen
68eb0864cb
Refactor CBlockIndex to make proof and dynafed fields optional.
2022-12-12 09:46:04 -08:00
Glenn Willen
3cef73b46c
Fix redundant assignment added by bad merge in dea074b88a
2022-06-27 13:36:12 -07:00
Glenn Willen
dea074b88a
Merge b707a6f00f into merged_master (Elements PR ElementsProject/elements#1069 )
2022-04-20 20:51:37 -07:00
Glenn Willen
04fd3d8dab
Fix dropped '&' from merge of #1022
...
When PR 1022 was merged, an & got dropped from the declarations of the two
"fStall" out-parameters, rendering them unused (and triggering a compiler
warning.) Restore them, restoring the functionality of #1022 .
2022-04-20 18:35:06 -07:00
W. J. van der Laan
216f4ca9e7
Merge bitcoin/bitcoin#22674 : validation: mempool validation and submission for packages of 1 child + parents
...
046e8ff264e12fafda2d8310d942e0be3ff151a1144a29099ad59ddc5c3dba26169f609b2fdca7f0https://gist.github.com/glozow/dc4e9d5c5b14ade7cdfac40f43adb18a ); it restricts packages to 1 child with its parents, doesn't allow conflicts, and doesn't have CPFP (yet). Future PRs (see #22290 ) will add RBF and CPFP within packages.
ACKs for top commit:
laanwj:
Code review ACK 046e8ff264
2021-12-15 20:42:33 +01:00
