Byron Hambly
b9abd5638d
Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699 )
2024-10-18 14:44:59 +02:00
Byron Hambly
bcb3d32074
Merge f27d5f6305 into merged_master (Bitcoin PR bitcoin/bitcoin#25691 )
2024-10-18 13:54:51 +02:00
Byron Hambly
ad4ecee6c0
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285 )
2024-10-17 17:33:20 +02:00
Byron Hambly
21648b79ea
Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645 )
2024-10-17 17:15:38 +02:00
James Dorfman
e938673fbd
Merge 55b76ac1c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25615 )
2024-10-16 07:07:54 +00:00
James Dorfman
bf5189aa76
Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472 )
2024-10-16 05:44:43 +00:00
James Dorfman
a6d5d4ead6
Merge 46fcb52cb1 into merged_master (Bitcoin PR bitcoin/bitcoin#24944 )
2024-10-16 05:04:19 +00:00
James Dorfman
d2ee4baaa2
Merge 53b1a2426c into merged_master (Bitcoin PR bitcoin/bitcoin#25471 )
2024-10-09 05:41:28 +00:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
James Dorfman
412ab3ab46
Merge ee3ba5a76f into merged_master (Bitcoin PR bitcoin/bitcoin#25485 )
2024-09-17 18:36:11 +00:00
James Dorfman
a95a6d31b2
Merge fa07ee165e into merged_master (Bitcoin PR bitcoin/bitcoin#25339 )
2024-09-10 19:20:49 +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
d4a4f5d919
Merge 581e2bdbac into merged_master (Bitcoin PR bitcoin/bitcoin#24629 )
2024-09-09 17:35:34 +00:00
James Dorfman
25c2ea0027
Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249 )
2024-09-06 19:20:19 +00:00
James Dorfman
db3aa6dd4a
Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410 )
2024-09-06 06:21:07 +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
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +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
a738660dbd
Merge 8270740bef into merged_master (Bitcoin PR bitcoin/bitcoin#25114 )
2024-08-12 04:44:05 +00:00
James Dorfman
72c9d9e01c
Merge b019cdc036 into merged_master (Bitcoin PR bitcoin/bitcoin#25095 )
2024-08-12 04:01:58 +00:00
James Dorfman
cb961ed28e
Merge 1511c9efb4 into merged_master (Bitcoin PR bitcoin/bitcoin#24640 )
2024-08-12 03:16:51 +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
3eb8d9b89e
Merge 27d7b11e8c into merged_master (Bitcoin PR bitcoin/bitcoin#25106 )
2024-08-09 17:48:02 +00:00
James Dorfman
3361822d32
Merge 59ac8bacd5 into merged_master (Bitcoin PR bitcoin/bitcoin#24804 )
2024-08-09 16:39:33 +00:00
James Dorfman
387cfbcfe8
Merge 194b414697 into merged_master (Bitcoin PR bitcoin/bitcoin#25016 )
2024-08-08 17:30:27 +00:00
James Dorfman
4fa1263693
Merge dabec99013 into merged_master (Bitcoin PR bitcoin/bitcoin#24956 )
2024-08-06 20:09:11 +00:00
James Dorfman
01e944c8aa
Merge 34ae04d775 into merged_master (Bitcoin PR bitcoin/bitcoin#21726 )
...
This changed the node pruning logic and moved test/functional/feature_blockfilterindex_prune.py
to test/functional/feature_index_prune.py.
Please verify that:
1. I migrated the test correctly
2. The magic numbers in the test look fine
With respect to #2 : I believe the magic numbers are wrong. I previously had to tweak them heavily
in commit 1278b31
2024-08-06 16:43:47 +00:00
James Dorfman
56b04fea6d
Merge 23ebd7a802 into merged_master (Bitcoin PR bitcoin/bitcoin#24959 )
2024-08-02 17:42:57 +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
d4aa6eba2f
Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909 )
2024-08-01 18:03:20 +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
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
9616104db4
Merge a2e1590f67 into merged_master (Bitcoin PR bitcoin/bitcoin#24673 )
2024-07-08 06:22:20 +00:00
Byron Hambly
eed85dc5df
getblockchaininfo: add trim_headers field
2024-06-05 11:21:16 +02:00
James Dorfman
4e288c66ce
fix errors from merge of bitcoin/bitcoin#23083
...
Notes:
- bitcoin/bitcoin#23083 increassed how stict the RPC documentation type checks are
- I initially tried fixing all the types -- you can see that work in this commit.
- In the end, I decided there were way too many discrepencies and that it would take
way too long to fix them all. So I just disabled the type check for elements (also in this commit).
2024-05-23 06:33:42 +00:00
James Dorfman
b4185c7008
CI: fix asan lock issues
2024-05-21 16:56:01 +00:00
Pablo Greco
4259278ff5
Reload trimmed header from index instead of block, block may have been pruned
2024-05-21 05:34:30 +00:00
James Dorfman
82b188df34
Merge 138d55e6a0 into merged_master (Bitcoin PR bitcoin/bitcoin#24579 )
...
In blockchain.cpp: set optional=true for 'softforks' argument in getblockchaininfo
docs.
Also removed two levels of indentation from that function (to match the associated
formatting fix in upstream).
2024-01-08 21:05:37 +00:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
James Dorfman
e382a490a7
Merge 310ba92494 into merged_master (Bitcoin PR bitcoin/bitcoin#24537 )
2023-10-16 04:28:12 +00:00
Byron Hambly
b7467fc044
Merge e04720ec33 into merged_master (Bitcoin PR bitcoin/bitcoin#24528 )
2023-10-15 13:33:48 +00:00
Byron Hambly
b7ad3576f5
Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050 )
2023-10-13 12:02:55 +00:00
James Dorfman
dabea18f29
rpc: fix bug in 'utxo_size_inc' calculation
2023-09-13 09:27:52 +02:00
Byron Hambly
1e1030496e
Merge 7d9dade900 into merged_master (Elements PR #1256 )
2023-08-29 11:32:50 +00:00
Pablo Greco
c87c8acabe
Rename dynafed_block method for clarity
2023-08-08 09:28:13 -07:00
Byron Hambly
5e994b4aa6
Merge 1443d302ae into merged_master (Elements PR #1231 )
2023-07-03 12:27:53 +00:00
Byron Hambly
d4f242b3c3
Merge 6b826d5004 into merged_master (Elements PR #1225 )
2023-07-03 12:14:31 +00:00
Byron Hambly
8576423f9a
Merge 1337b93f50 into merged_master (Bitcoin PR bitcoin/bitcoin#24339 )
2023-07-02 05:40:34 +00:00
Byron Hambly
9c6e41c9e4
Merge 7cc39b1838 into merged_master (Bitcoin PR bitcoin/bitcoin#24347 )
2023-07-01 07:10:37 +00:00
Byron Hambly
fdfefc520a
Merge af0b578041 into merged_master (Bitcoin PR bitcoin/bitcoin#24187 )
2023-06-30 16:06:00 +00:00
