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
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
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
Byron Hambly
b87b7f49ad
Merge af7b077973 into merged_master (Bitcoin PR bitcoin/bitcoin#24203 )
2023-06-29 12:42:57 +00:00
Byron Hambly
5931d7d47c
Merge d4e92d8436 into merged_master (Bitcoin PR bitcoin/bitcoin#23508 )
2023-06-29 11:46:17 +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
62697be8d9
Merge 3d223712d3 into merged_master (Bitcoin PR bitcoin/bitcoin#16795 )
2023-06-28 16:32:17 +00:00
Byron Hambly
7c13fb38ec
Merge e3699b71c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24155 )
2023-06-28 15:51:53 +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
7878ba47b9
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497 )
2023-06-19 09:28:31 +00:00
Byron Hambly
78a8032c1e
Merge 4ada74206a into merged_master (Bitcoin PR bitcoin/bitcoin#23974 )
2023-06-15 13:21:10 +00:00
Byron Hambly
7ef4aa0c17
Merge af7fba3af7 into merged_master (Bitcoin PR bitcoin/bitcoin#23980 )
2023-06-15 08:14:41 +00:00
Byron Hambly
b8e9358d8c
Merge e31cdb0238 into merged_master (Bitcoin PR bitcoin/bitcoin#23411 )
2023-06-15 07:42:35 +00:00
Byron Hambly
a3cf308f4b
Merge 300124dedf into merged_master (Bitcoin PR bitcoin/bitcoin#23936 )
2023-06-15 05:14:12 +00:00
Byron Hambly
3ce9952451
Merge 66be456d93 into merged_master (Bitcoin PR bitcoin/bitcoin#23320 )
2023-06-15 04:56:56 +00:00
Byron Hambly
1a60074750
Merge af863b6f16 into merged_master (Bitcoin PR bitcoin/bitcoin#23937 )
2023-06-14 17:17:33 +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
e0583f04ee
Merge 5dd28e5cff into merged_master (Bitcoin PR bitcoin/bitcoin#23755 )
2023-06-13 08:58:20 +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
5854e5e087
Merge 7908772244 into merged_master (Bitcoin PR bitcoin/bitcoin#23703 )
2023-06-06 11:15:42 +00:00
Byron Hambly
8436894eec
Merge 577bd51a4b into merged_master (Bitcoin PR bitcoin/bitcoin#23702 )
2023-06-06 09:26:49 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
James Dorfman
a5a9e11b83
Merge 13f41855c5 into merged_master (Bitcoin PR bitcoin/bitcoin#23694 )
2023-06-02 15:43:00 +00:00
James Dorfman
669c52f7e8
Merge 4fd0ce75c5 into merged_master (Bitcoin PR bitcoin/bitcoin#22689 )
2023-06-02 15:34:33 +00:00
Byron Hambly
c7e8ed8105
Merge 6ac8c4f700 into merged_master (Bitcoin PR bitcoin/bitcoin#23634 )
2023-06-02 13:47:17 +00:00
Byron Hambly
42d0d33457
Merge 6acda4b00b into merged_master (Bitcoin PR bitcoin/bitcoin#23155 )
2023-06-01 11:31:51 +00:00
Byron Hambly
c6412b29d2
Merge ed479497bd into merged_master (Bitcoin PR bitcoin/bitcoin#23398 )
2023-05-24 10:35:24 +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
3caddc4317
Merge 986003aff9 into merged_master (Bitcoin PR bitcoin/bitcoin#22918 )
2023-05-13 10:47:39 +00:00
Byron Hambly
2b8eef42dd
Merge 1884ce2f4c into merged_master (Bitcoin PR bitcoin/bitcoin#22937 )
2023-05-11 12:38:50 +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
