Byron Hambly
1ba6aeea51
Merge 99c2ee7f9a into merged_master (Elements PR #1399 )
2025-02-12 14:47:53 +02:00
Andrew Poelstra
bd4ae1bcc4
rpc: fix crash in getcompactsketch
...
This originates in 8723debb3d
2025-02-11 02:58:41 +00:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
c794f76ea8
asan: lock cs_main for calls to chainman
2025-01-06 15:29:01 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
1006327a13
Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707 )
2024-11-04 11:26:40 +02:00
Byron Hambly
fd9ee039c0
Merge 95d4744f02 into merged_master (Bitcoin PR bitcoin/bitcoin#19391 )
2024-11-03 14:48:48 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
b9abd5638d
Merge a65f6d8cbb into merged_master (Bitcoin PR bitcoin/bitcoin#25699 )
2024-10-18 14:44:59 +02:00
James Dorfman
17851700b4
Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290 )
2024-09-19 18:56:19 +00:00
James Dorfman
616633ec35
Merge a7a36590f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25223 )
2024-09-10 19:59:14 +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
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +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
0e02561a73
Merge fdb82a30be into merged_master (Bitcoin PR bitcoin/bitcoin#25147 )
2024-08-13 05:07:06 +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
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +00:00
James Dorfman
757c338ae3
Merge 2c56404088 into merged_master (Bitcoin PR bitcoin/bitcoin#25029 )
2024-08-08 20:45:21 +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
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +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
Byron Hambly
545d29ca21
Merge 85ae549a46 into merged_master (Bitcoin PR bitcoin/bitcoin#24137 )
2023-07-02 05:40:27 +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
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
0bb272ba16
Merge aaaceb7fb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23766 )
2023-06-13 09:50:10 +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
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
99df552f36
Merge 084c81c8b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23547 )
2023-06-02 12:50:20 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +00:00
Byron Hambly
8250bf53d2
Merge 606e306277 into merged_master (Bitcoin PR bitcoin/bitcoin#22981 )
2023-05-26 13:47:21 +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
d1a87496d0
Merge cdb4dfcbf1 into merged_master (Bitcoin PR bitcoin/bitcoin#20452 )
2023-05-09 10:47:06 +00:00
James Dorfman
434565be81
Merge b55232a337 into merged_master (Bitcoin PR bitcoin/bitcoin#22722 )
2023-04-27 05:19:44 +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
e27cb19846
Merge dd097c42df into merged_master (Bitcoin PR bitcoin/bitcoin#18448 )
2023-04-13 12:34:47 +00:00
Jeff Frontz
1b0424530a
Remove erroneous PAK-checking info from testproposedblock help
2023-03-05 09:05:38 -03:00
Steven Roose
30f02624c7
Have testproposedblock return RPC_VERIFY_ALREADY_IN_CHAIN
...
Instead of RPC_VERIFY_ERROR when the block is already in the chain.
2022-11-24 14:08:51 +00:00
MacroFake
239757409b
Merge bitcoin/bitcoin#26118 : log: Use steady clock for bench logging
...
fabf1cdb20faed342a23fabf1cdb20
2022-10-10 12:00:34 +02:00
MacroFake
33eef562a3
Merge bitcoin/bitcoin#26074 : refactor: Set RPCArg options with designated initializers
...
fa2c72dda0fa2c72dda0
2022-09-30 10:06:14 +02:00
MacroFake
faed342a23
scripted-diff: Rename time symbols
...
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s:\<$1\>:$2:g" $(git grep -l "\<$1\>" ':(exclude)src/versionbits.cpp') ; }
ren nStart time_start
ren nTimeStart time_start
ren nTimeReadFromDiskTotal time_read_from_disk_total
ren nTimeConnectTotal time_connect_total
ren nTimeFlush time_flush
ren nTimeChainState time_chainstate
ren nTimePostConnect time_post_connect
ren nTimeCheck time_check
ren nTimeForks time_forks
ren nTimeConnect time_connect
ren nTimeVerify time_verify
ren nTimeUndo time_undo
ren nTimeIndex time_index
ren nTimeTotal time_total
ren nTime1 time_1
ren nTime2 time_2
ren nTime3 time_3
ren nTime4 time_4
ren nTime5 time_5
ren nTime6 time_6
ren nBlocksTotal num_blocks_total
# Newline after semicolon
perl -0777 -pi -e 's/; time_connect_total/;\n time_connect_total/g' src/validation.cpp
perl -0777 -pi -e 's/; time_/;\n time_/g' src/validation.cpp
-END VERIFY SCRIPT-
2022-09-19 10:45:49 +02:00
MacroFake
fa2c72dda0
rpc: Set RPCArg options with designated initializers
2022-09-13 18:37:15 +02:00
James O'Beirne
00eeb31c76
scripted-diff: rename CChainState -> Chainstate
...
-BEGIN VERIFY SCRIPT-
sed -i 's/CChainState/Chainstate/g' $(git grep -l CChainState ':(exclude)doc/release-notes*')
-END VERIFY SCRIPT-
Co-authored-by: MacroFake <falke.marco@gmail.com>
2022-09-09 11:47:27 -04:00
Byron Hambly
661c6c7094
feat: change getnewblockhex to take multiple commitments
...
Modifies the getnewblockhex json rpc call to accept an array of
commitments instead of a single commitment.
Backwards compatibility is maintained by first attempting to parse as a
string for a singular commitment.
2022-09-07 14:43:10 +02:00
Suhas Daftuar
ed6cddd98e
Require callers of AcceptBlockHeader() to perform anti-dos checks
...
In order to prevent memory DoS, we must ensure that we don't accept a new
header into memory until we've performed anti-DoS checks, such as verifying
that the header is part of a sufficiently high work chain. This commit adds a
new argument to AcceptBlockHeader() so that we can ensure that all call-sites
which might cause a new header to be accepted into memory have to grapple with
the question of whether the header is safe to accept, or needs further
validation.
This patch also fixes two places where low-difficulty-headers could have been
processed without such validation (processing an unrequested block from the
network, and processing a compact block).
Credit to Niklas Gögge for noticing this issue, and thanks to Sjors Provoost
for test code.
2022-08-29 08:10:35 -04:00
MacroFake
9eaef10801
Merge bitcoin/bitcoin#25707 : refactor: Make const references to avoid unnecessarily copying objects and enable two clang-tidy checks
...
ae7ae36d31081b0e53e3https://releases.llvm.org/11.1.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-for-range-copy.html ) and [performance-unnecessary-copy-initialization](https://releases.llvm.org/12.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-unnecessary-copy-initialization.html ).
ACKs for top commit:
vasild:
ACK ae7ae36d31ae7ae36d31
2022-08-19 17:11:06 +02:00
Luke Dashjr
90a5dfa509
RPC/Mining: Clean out pre-Segwit miner compatibility code
2022-08-09 22:15:34 +00:00
Aurèle Oulès
081b0e53e3
refactor: Make const refs vars where applicable
...
This avoids initializing variables with the copy-constructor of a
non-trivially copyable type.
2022-07-27 13:27:57 +02:00
