Commit graph

778 commits

Author SHA1 Message Date
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
Byron Hambly
eea9829aa6 Merge 825f4a64e6 into merged_master (Bitcoin PR bitcoin/bitcoin#22976) 2023-04-24 11:40:49 +00:00
Byron Hambly
6790225b8b Merge faecb2ee0a into merged_master (Bitcoin PR bitcoin/bitcoin#22798) 2023-04-23 07:58:26 +00:00
Byron Hambly
e536247471 Merge c3545a7396 into merged_master (Bitcoin PR bitcoin/bitcoin#22653) 2023-04-09 06:06:44 +00:00
Andrea Bonel
8d844c79e3 Fix dynamic_parameters root in getblockheader rpc 2023-04-03 18:02:24 -03:00
Byron Hambly
d60b269083 Merge 31fef69c03 into merged_master (Bitcoin PR bitcoin/bitcoin#22047) 2023-03-31 18:32:13 +00:00
James Dorfman
b936a034a6 Merge a273e3c58a into merged_master (Bitcoin PR bitcoin/bitcoin#21934) 2023-03-17 14:59:12 +00:00
James Dorfman
c5226be2a5 Merge 458d6ac23b into merged_master (Bitcoin PR bitcoin/bitcoin#22407) 2023-03-17 14:24:43 +00:00
Pablo Greco
8f16e00ee2 Avoid reloading the block before calling blockheaderToJSON, the loaded block is incomplete and makes it crash 2023-03-16 09:21:50 -03:00
Pablo Greco
3c8d3a2a7d RPC: Avoid assert by keeping a flag to identify trimmed dynafed blocks 2023-03-16 09:21:49 -03:00