James Dorfman
115b62e5ec
Merge ede9089096 into merged_master (Bitcoin PR bitcoin/bitcoin#25156 )
2024-09-10 19:08:58 +00:00
James Dorfman
c472e94b84
Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931 )
2024-09-09 21:13:17 +00:00
James Dorfman
caa3ef8844
Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254 )
...
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
2024-09-09 18:21:18 +00:00
James Dorfman
033f17b1df
Merge 00ce8543f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24171 )
...
Please review the changes to src/net_processing.cpp carefully, I'm not sure
if I adapted new IBD logic to work properly for elements.
2024-09-09 16:33:14 +00:00
James Dorfman
1aff5fa9e9
Merge 5f65afff9c into merged_master (Bitcoin PR bitcoin/bitcoin#24178 )
2024-09-06 18:21:45 +00:00
James Dorfman
9cb0f04edb
Merge aac99faa66 into merged_master (Bitcoin PR bitcoin/bitcoin#25175 )
2024-08-13 20:39:38 +00:00
James Dorfman
66bc45020f
Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168 )
2024-08-13 20:10:21 +00:00
James Dorfman
0e02561a73
Merge fdb82a30be into merged_master (Bitcoin PR bitcoin/bitcoin#25147 )
2024-08-13 05:07:06 +00:00
James Dorfman
cef04ed2a5
Merge 986bae8e72 into merged_master (Bitcoin PR bitcoin/bitcoin#22778 )
2024-08-13 04:41:52 +00:00
James Dorfman
57c149aa06
Merge 0be1dc1f56 into merged_master (Bitcoin PR bitcoin/bitcoin#24062 )
2024-08-12 04:44:23 +00:00
James Dorfman
09739a82e2
Merge aa3200d896 into merged_master (Bitcoin PR bitcoin/bitcoin#25109 )
2024-08-12 03:41:59 +00:00
James Dorfman
ab65a98a04
Merge dc0ee57373 into merged_master (Bitcoin PR bitcoin/bitcoin#20799 )
2024-08-12 03:28:06 +00:00
James Dorfman
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +00:00
James Dorfman
7effbfd139
Merge a2a8e919ee into merged_master (Bitcoin PR bitcoin/bitcoin#24925 )
2024-08-09 21:08:52 +00:00
James Dorfman
56ea06cc37
Merge 5d53cf3878 into merged_master (Bitcoin PR bitcoin/bitcoin#24543 )
2024-08-08 19:37:59 +00:00
James Dorfman
e7759695ba
Merge f0a834e2f1 into merged_master (Bitcoin PR bitcoin/bitcoin#18642 )
2024-08-06 18:37:18 +00:00
James Dorfman
f86857195f
Merge 43bb106613 into merged_master (Bitcoin PR bitcoin/bitcoin#24213 )
2024-08-01 20:20:30 +00:00
James Dorfman
d4aa6eba2f
Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909 )
2024-08-01 18:03:20 +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
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
James Dorfman
e860ace1e4
Merge f089a0802c into merged_master (Bitcoin PR bitcoin/bitcoin#24692 )
2024-05-23 23:51:34 +00:00
Byron Hambly
c85f0d4fda
discount: implement net processing
2024-05-14 19:03:36 +02:00
James Dorfman
363d930f8e
Merge 9344697e57 into merged_master (Bitcoin PR bitcoin/bitcoin#21160 )
2024-03-19 20:07:00 +00:00
Byron Hambly
9af9536b24
Merge 213e98ca82 into merged_master (Bitcoin PR bitcoin/bitcoin#24169 )
2024-02-02 11:12:43 +02:00
Byron Hambly
6768c48aee
Merge 6c72f3192a into merged_master (Bitcoin PR bitcoin/bitcoin#23880 )
2023-10-16 12:54:38 +00:00
Byron Hambly
c1a9e05f44
Merge 384866e870 into merged_master (Bitcoin PR bitcoin/bitcoin#24427 )
2023-10-13 08:48:05 +00:00
James Dorfman
0b913592b2
Merge f20016d1ab into merged_master (Elements PR #1252 )
2023-08-29 04:36:30 +00:00
Byron Hambly
d9e021486f
lint: fix codespell lint issues
2023-07-28 12:07:19 +02:00
Byron Hambly
6f90a02548
Merge 30308cc380 into merged_master (Bitcoin PR bitcoin/bitcoin#20196 )
2023-07-03 11:17:52 +00:00
Byron Hambly
1dc6ad6ea9
Merge ba11eb354b into merged_master (Bitcoin PR bitcoin/bitcoin#23542 )
2023-07-03 09:44:18 +00:00
Byron Hambly
063acc7793
Merge cf5bb048e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22932 )
2023-06-28 17:12:24 +00:00
Byron Hambly
9aa813fbc8
Merge 39d9bbe4ac into merged_master (Bitcoin PR bitcoin/bitcoin#23706 )
2023-06-28 14:25:29 +00:00
Byron Hambly
97153c657b
Merge 973c390298 into merged_master (Bitcoin PR bitcoin/bitcoin#24078 )
2023-06-20 13:11:19 +00:00
Byron Hambly
5fd03f5cdb
Merge 6d859cbd79 into merged_master (Bitcoin PR bitcoin/bitcoin#24021 )
2023-06-20 12:55:58 +00:00
Byron Hambly
77e3aef46b
Merge dbf81a73e3 into merged_master (Bitcoin PR bitcoin/bitcoin#24079 )
2023-06-20 11:34:15 +00:00
Byron Hambly
7878ba47b9
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497 )
2023-06-19 09:28:31 +00:00
Byron Hambly
9044eee63e
Merge 06209574da into merged_master (Bitcoin PR bitcoin/bitcoin#23832 )
2023-06-15 10:50:26 +00:00
Byron Hambly
334188e09d
Merge 17fdbefd3f into merged_master (Bitcoin PR bitcoin/bitcoin#23970 )
2023-06-15 09:43:05 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
bd0af938dc
Merge 3ec8f9f123 into merged_master (Bitcoin PR bitcoin/bitcoin#23801 )
2023-06-13 19:43:04 +00:00
Byron Hambly
a23bba068f
Merge 14ba286556 into merged_master (Bitcoin PR bitcoin/bitcoin#23695 )
2023-06-13 15:16:02 +00:00
Byron Hambly
413786c613
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785 )
2023-06-13 14:30:53 +00:00
Byron Hambly
8edcc34130
Merge 60b5795133 into merged_master (Bitcoin PR bitcoin/bitcoin#23758 )
2023-06-13 12:26:03 +00:00
Byron Hambly
54c9ee347d
Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777 )
2023-06-13 10:06:36 +00:00
Byron Hambly
70c69d94f6
Merge 9f7661c0c4 into merged_master (Bitcoin PR bitcoin/bitcoin#19499 )
2023-06-12 13:11:30 +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
16ce576d1d
Merge e457513eb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23631 )
2023-06-02 12:58:30 +00:00
James Dorfman
72a90148c8
Merge 8b1de78577 into merged_master (Bitcoin PR bitcoin/bitcoin#23413 )
2023-06-01 18:51:42 +00:00
James Dorfman
5aadbb7a9d
Merge 63c0d0e937 into merged_master (Bitcoin PR bitcoin/bitcoin#21327 )
...
I commented out a few new lines at the bottom of test/functional/p2p_ibd_txrelay.py
It tests that nodes process certain transactions, after IBD. These new assertions
from upstream are failing, but it may be because our IBD / tx sharing logic is different.
We should revisit this.
2023-06-01 05:27:06 +00:00
Byron Hambly
8250bf53d2
Merge 606e306277 into merged_master (Bitcoin PR bitcoin/bitcoin#22981 )
2023-05-26 13:47:21 +00:00
