doc: Mark proprietary array optional #23975

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:2201-docrpc changing 1 files +5 −4

MarcoFalke commented at 3:57 PM on January 4, 2022: member

The global one is returned all the time, but the input/output array is returned optionally
MarcoFalke commented at 4:05 PM on January 4, 2022: member

Needed for #23083
DrahtBot commented at 4:16 PM on January 4, 2022: 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:
- #23578 (Add external signer taproot support by Sjors)
- #22558 (psbt: Taproot fields for PSBT by achow101)
- #21283 (Implement BIP 370 PSBTv2 by achow101)
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.

doc: Mark proprietary array optional

Also, remove not needed '\n's.
Can be reviewed with --word-diff-regex=.

faa51a6aa9

MarcoFalke force-pushed on Jan 4, 2022

MarcoFalke commented at 5:09 PM on January 4, 2022: member

Rendered diff:

diff --git a/decodepsbt b/decodepsbt
index f87d3b4..c223073 100644
--- a/decodepsbt
+++ b/decodepsbt
@@ -97,7 +97,7 @@ Result:
         "key" : "hex",                     (string) (key-value pair) An unknown key-value pair
         ...
       },
-      "proprietary" : [                    (json array) The input proprietary map
+      "proprietary" : [                    (json array, optional) The input proprietary map
         {                                  (json object)
           "identifier" : "hex",            (string) The hex string for the proprietary identifier
           "subtype" : n,                   (numeric) The number for the subtype
@@ -133,7 +133,7 @@ Result:
         "key" : "hex",                     (string) (key-value pair) An unknown key-value pair
         ...
       },
-      "proprietary" : [                    (json array) The output proprietary map
+      "proprietary" : [                    (json array, optional) The output proprietary map
         {                                  (json object)
           "identifier" : "hex",            (string) The hex string for the proprietary identifier
           "subtype" : n,                   (numeric) The number for the subtype

DrahtBot added the label RPC/REST/ZMQ on Jan 4, 2022
fanquake approved
fanquake commented at 12:59 AM on January 5, 2022: member

ACK faa51a6aa92966403b1c46d4047f5b3aafcccd1d
fanquake merged this on Jan 5, 2022
fanquake closed this on Jan 5, 2022
MarcoFalke deleted the branch on Jan 5, 2022
sidhujag referenced this in commit 9195836fd6 on Jan 6, 2022
DrahtBot locked this on Jan 5, 2023

Contributors

Labels

doc: Mark proprietary array optional #23975

Conflicts