Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
a6f8dc6a86
tidy: fixes for clang tidy ci job
2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
James Dorfman
400a87e626
Merge fbc01d56d7 into merged_master (Elements PR #1366 )
2024-10-09 05:59:56 +00:00
Byron Hambly
d0f714638a
feat: add discountweight to TxToUniv
2024-09-20 14:39:13 +02:00
James Dorfman
9616104db4
Merge a2e1590f67 into merged_master (Bitcoin PR bitcoin/bitcoin#24673 )
2024-07-08 06:22:20 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
Byron Hambly
b7b2288a74
discount: implement mempool logic
2024-05-14 19:03:36 +02:00
James Dorfman
5e7204072c
Merge e7b6272b30 into merged_master (Bitcoin PR bitcoin/bitcoin#24636 )
2024-02-02 10:35:55 +02:00
Byron Hambly
f9aca0e104
Merge fd25d3493d into merged_master (Bitcoin PR bitcoin/bitcoin#24319 )
2023-06-30 15:07:15 +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
3ce9952451
Merge 66be456d93 into merged_master (Bitcoin PR bitcoin/bitcoin#23320 )
2023-06-15 04:56:56 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +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
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
Hennadii Stepanov
306ccd4927
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
- 2021: f47dda2c58fa0074e2d8aaaaad6ac9
2022-12-24 23:49:50 +00:00
Glenn Willen
16507123c0
Merge 80862ff943 into merged_master (Elements PR ElementsProject/elements#1075 )
2022-05-25 13:00:55 -07:00
James Dorfman
79f5a000a8
getblockheader: properly display 'signblock_witness_hex' field and remove irrelevant 'signblock_witness_asm' field in post-dynafed RPC response
2022-04-25 13:08:48 -04:00
fanquake
9563a645c2
refactor: add stdd:: includes to core_write
2022-03-30 20:11:15 +01:00
Michael Dietz
22f25a6116
refactor: prefer snake case, TxToUniv arg hashBlock renamed block_hash
2022-03-30 20:00:27 +01:00
Michael Dietz
828a094ecf
refactor: merge ScriptPubKeyToUniv & ScriptToUniv into one function
2022-03-30 20:00:23 +01:00
MarcoFalke
faf37c217a
rpc: Exclude descriptor when address is excluded
2022-03-23 11:09:34 +01:00
MarcoFalke
fa6065661a
refactor: Avoid unsigned integer overflow in core_write
2022-02-11 17:21:44 +01:00
Gregory Sanders
6498ba151b
transaction decoding infer output descriptors
2022-01-26 09:56:51 +08:00
W. J. van der Laan
66be456d93
Merge bitcoin/bitcoin#23320 : rpc: Add RPC help for getblock verbosity level 3
...
059f88b6a91bdd5f6322#22918 (Kiminuo)
Pull request description:
This is a follow-up PR to #22918 which addresses review comments (first commit). The second commit adds missing RPC help for verbosity level 3.
ACKs for top commit:
pg156:
ACK https://github.com/bitcoin/bitcoin/pull/23320/commits/059f88b6a97b7a3ae1f033885e40ac01f91e6d60
laanwj:
re-ACK 059f88b6a9
2022-01-04 15:35:42 +01:00
Hennadii Stepanov
f47dda2c58
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
Commits of previous years:
* 2020: fa0074e2d8aaaaad6ac9
2021-12-30 19:36:57 +02:00
Kiminuo
1bdd5f6322
Address review comments from #22918
...
* fix English in release notes
* Simplify `switch` to `if`.
2021-10-20 10:51:01 +02:00
fyquah
5c34507ecb
core_write: Rename calculate_fee to have_undo for clarity
2021-10-05 10:42:34 +02:00
fyquah
51dbc167e9
rpc: Add level 3 verbosity to getblock RPC call.
...
Display the prevout in transaction inputs when calling getblock level 3
verbosity.
Co-authored-by: Luke Dashjr <luke_github1@dashjr.org>
Co-authored-by: 0xB10C <19157360+0xB10C@users.noreply.github.com>
2021-10-05 10:42:34 +02:00
fanquake
d09071da5b
[MOVEONLY] consensus: move amount.h into consensus
...
Move amount.h to consensus/amount.h.
Renames, adds missing and removes uneeded includes.
2021-09-30 07:41:57 +08:00
Michael Dietz
2b1fdc2c6c
refactor: minor styling, prefer snake case and same line if
2021-09-24 14:22:53 -05:00
Michael Dietz
d64deac7b8
refactor: share logic between ScriptPubKeyToUniv and ScriptToUniv
2021-09-24 14:22:53 -05:00
Michael Dietz
8721638daa
rpc: remove deprecated addresses and reqSigs from rpc outputs
2021-09-24 14:22:49 -05:00
Andrew Poelstra
d39d57c704
Merge 1c7be9ab90 into merged_master (Bitcoin PR #20286 )
...
I hate this PR.
2021-06-28 21:30:17 +00:00
Andrew Poelstra
bf95eb15d9
Merge 47b99ab1a9 into merged_master (Bitcoin PR #20406 )
2021-06-25 23:14:56 +00:00
Andrew Poelstra
27930edc9c
Merge 4a540683ec into merged_master (Bitcoin PR #20813 )
2021-06-16 14:11:07 +00:00
Andrew Poelstra
658b2312da
Merge f656165e9c into merged_master (Bitcoin PR #18772 )
...
I'm gonna be honest, I largely just rewrote this one. It adds a "fee" field
to the RPC transaction output, which I replaced with a feemap which is
directly extracted from the transaction rather than computed implicitly
from inputs - outputs.
Removed a functional test that fee computations become impossible without
chain data, since in Elements there is no chain data lookup involved.
2021-06-16 01:07:10 +00:00
Michael Dietz
085b3a7299
rpc: deprecate addresses and reqSigs from rpc outputs
...
1) add a new sane "address" field (for outputs that have an
identifiable address, which doesn't include bare multisig)
2) with -deprecatedrpc: leave "reqSigs" and "addresses" intact
(with all weird/wrong behavior they have now)
3) without -deprecatedrpc: drop "reqSigs" and "addresses" entirely,
always.
2021-03-23 10:51:43 -04:00
practicalswift
1f05dbd06d
util: Avoid invalid integer negation in ValueFromAmount: make ValueFromAmount(const CAmount& n) well-defined also when n is std::numeric_limits<CAmount>::min()
2021-03-02 16:05:28 +00:00
MarcoFalke
fa0074e2d8
scripted-diff: Bump copyright headers
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
2020-12-31 09:45:41 +01:00
Andrew Poelstra
ecf4d0de5c
Merge 81a19e7253 into merged_master (Bitcoin PR #19852 )
2020-11-28 23:16:39 +00:00
Andrew Poelstra
419fd4f90d
Merge b75f2ad72d into merged_master (Bitcoin PR #19660 )
2020-11-27 04:05:36 +00:00
Andrew Poelstra
c6cb7be640
Merge c57dc566b0 into merged_master (Bitcoin PR #16525 )
2020-11-26 12:15:14 +00:00
Andrew Poelstra
dc44b27189
Merge d3a5dbfd1f into merged_master (Bitcoin PR #19114 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
b431cfa2d7
Merge 532b134cb0 into merged_master (Bitcoin PR #19373 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
7444e07772
Merge 297466b49f into merged_master (Bitcoin PR #18826 )
2020-11-26 01:09:01 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
3d7ed201af
Merge 335b34c30c into merged_master (Bitcoin PR #16725 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
62ce823f8f
Merge c67ef2938c into merged_master (Elements PR #600 )
...
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
