diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2020-08-13 11:58:23 +1200 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2020-08-13 12:21:11 +1200 |
| commit | 8a85377cd0b60cb00dae4f595d628d1afbd28bd5 (patch) | |
| tree | f66952701fab0d3173314edeb2d79e91042c59f4 /src/rpc/client.cpp | |
| parent | 038a04eb80a5d3c731ffdbc7d855aced50270eed (diff) | |
| parent | 79d6332e9e4fc01e6418247c31e31b4faa1b3b84 (diff) | |
| download | bitcoin-8a85377cd0b60cb00dae4f595d628d1afbd28bd5.tar.xz | |
Merge #18654: rpc: separate bumpfee's psbt creation function into psbtbumpfee
79d6332e9e4fc01e6418247c31e31b4faa1b3b84 moveonly: Fix indentation in bumpfee RPC (Andrew Chow)
431071c28ae35be8aa012df51233be19067d625c Hide bumpfee's psbt creation behavior behind -deprecatedrpc (Andrew Chow)
4638224f64ba7c8ea7c4fb550ec89c6a6d8c7887 Add psbtbumpfee RPC (Andrew Chow)
Pull request description:
Adds a new RPC `psbtbumpfee` which always creates a psbt. `bumpfee` will then only be able to create and broadcast fee bumping transactions instead of changing its behavior based on `IsWalletSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)`.
Split from #18627
ACKs for top commit:
Sjors:
re-utACK 79d6332
meshcollider:
utACK 79d6332e9e4fc01e6418247c31e31b4faa1b3b84
fjahr:
Code review ACK 79d6332e9e4fc01e6418247c31e31b4faa1b3b84
Tree-SHA512: 1c92c4b4461bb30e78be3ee73165f624398ef33996ce36043b61a8931be667030d0fca12fd0b30097b78c56e4e9092c69582b237cbdac51d56f6be23d8c0f1bb
Diffstat (limited to 'src/rpc/client.cpp')
| -rw-r--r-- | src/rpc/client.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index 97d1c00369..d61e02aee2 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -151,6 +151,7 @@ static const CRPCConvertParam vRPCConvertParams[] = { "getmempoolancestors", 1, "verbose" }, { "getmempooldescendants", 1, "verbose" }, { "bumpfee", 1, "options" }, + { "psbtbumpfee", 1, "options" }, { "logging", 0, "include" }, { "logging", 1, "exclude" }, { "disconnectnode", 1, "nodeid" }, |