rpc: remove deprecated getaddressinfo fields #19200

pull jonatack wants to merge 4 commits into bitcoin:master from jonatack:remove-deprecated-getaddressinfo-fields changing 5 files +12 −118

jonatack commented at 2:09 PM on June 7, 2020: member

These were deprecated in #17578 and #17585, with expected 0.21 removal notified in the 0.20 release notes.

- The `getaddressinfo` RPC has had its `label` field deprecated
  (re-enable for this release using the configuration parameter
  `-deprecatedrpc=label`).  The `labels` field is altered from returning
  JSON objects to returning a JSON array of label names (re-enable
  previous behavior for this release using the configuration parameter
  `-deprecatedrpc=labelspurpose`).  Backwards compatibility using the
  deprecated configuration parameters is expected to be dropped in the
  0.21 release.  (#17585, [#17578](/bitcoin-bitcoin/17578/))

fanquake added the label RPC/REST/ZMQ on Jun 7, 2020
jonatack force-pushed on Jun 7, 2020
MarcoFalke commented at 4:48 PM on June 7, 2020: member

Concept ACK
DrahtBot commented at 11:35 PM on June 7, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #15936 (Unify bitcoin-qt and bitcoind persistent settings by ryanofsky)
- #15935 (Add <datadir>/settings.json persistent settings storage by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
rpc: remove deprecated getaddressinfo `label` field 645a8653c8
rpc: remove deprecated getaddressinfo `labels: purpose` a8507c99da
rpc: getaddressinfo RPCResult fixup 90e989390e
doc: release note for rpc getaddressinfo removals bc01f7ae05
jonatack force-pushed on Jun 8, 2020
Sjors commented at 10:28 AM on June 8, 2020: member

utACK bc01f7a
in src/wallet/rpcwallet.cpp:3744 in bc01f7ae05
```
3740 | @@ -3741,25 +3741,18 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
3741 |                          {RPCResult::Type::STR_HEX, "pubkey", /* optional */ true, "The hex value of the raw public key for single-key addresses (possibly embedded in P2SH or P2WSH)."},
3742 |                          {RPCResult::Type::OBJ, "embedded", /* optional */ true, "Information about the address embedded in P2SH or P2WSH, if relevant and known.",
3743 |                          {
3744 | -                            {RPCResult::Type::ELISION, "", "Includes all\n"
```
adamjonas commented at 1:31 PM on June 11, 2020:

Unrelated, but if you are reformatting these lines could you clean up line 1544?

jonatack commented at 10:41 AM on June 17, 2020:

Good idea. Will touch up in the next PR to not invalidate review.

jonatack commented at 4:58 PM on October 22, 2020:

Done in https://github.com/bitcoin/bitcoin/pull/20220/files#diff-63c7710d72381cffe692175dd70e47f1891bf75c3e09249ed826f9df3917d02dR3791

jonatack commented at 11:05 AM on October 23, 2020:

Decided to do it in another PR or code a general solution to line wrapping in the RPC help rather than manual adjustments.
adamjonas commented at 1:32 PM on June 11, 2020: member

utACK bc01f7a
meshcollider commented at 8:55 AM on June 21, 2020: contributor

utACK bc01f7ae0538d3c647ce8dfbc29f7914d5df3fbb
meshcollider merged this on Jun 21, 2020
meshcollider closed this on Jun 21, 2020
jonatack deleted the branch on Jun 21, 2020
sidhujag referenced this in commit 0039aa5c7a on Jul 7, 2020
Fabcien referenced this in commit 5f4b8a11f7 on Jun 3, 2021
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#17578 rpc: simplify getaddressinfo labels, deprecate previous behavior #17585 rpc: deprecate getaddressinfo label

rpc: remove deprecated getaddressinfo fields #19200

Conflicts