Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Mar 16, 2022

Also, fix whitespace to be 4 spaces. Can be reviewed with --ignore-all-space --word-diff-regex=..

Found by #23083

@fanquake fanquake added the Docs label Mar 16, 2022
@maflcko
Copy link
Member Author

maflcko commented Mar 16, 2022

Rendered diff:

diff --git a/getblockchaininfo b/getblockchaininfo
index 683b68b..c879be5 100644
--- a/getblockchaininfo
+++ b/getblockchaininfo
@@ -19,7 +19,7 @@ Result:
   "pruneheight" : n,                      (numeric, optional) lowest-height complete block stored (only present if pruning is enabled)
   "automatic_pruning" : true|false,       (boolean, optional) whether automatic pruning is enabled (only present if pruning is enabled)
   "prune_target_size" : n,                (numeric, optional) the target size used by pruning (only present if automatic pruning is enabled)
-  "softforks" : {                         (json object) (DEPRECATED, returned only if config option -deprecatedrpc=softforks is passed) status of softforks
+  "softforks" : {                         (json object, optional) (DEPRECATED, returned only if config option -deprecatedrpc=softforks is passed) status of softforks
     "xxxx" : {                            (json object) name of the softfork
       "type" : "str",                     (string) one of "buried", "bip9"
       "height" : n,                       (numeric, optional) height of the first block which the rules are or will be enforced (only for "buried" type, or "bip9" type with "active" status)
@@ -39,7 +39,7 @@ Result:
           "count" : n,                    (numeric) the number of blocks with the version bit set in the current period
           "possible" : true|false         (boolean, optional) returns false if there are not enough blocks left in this period to pass activation threshold (only for "started" status)
         },
-        "signalling" : "str"              (string) indicates blocks that signalled with a # and blocks that did not with a -
+        "signalling" : "str"              (string, optional) indicates blocks that signalled with a # and blocks that did not with a -
       }
     },
     ...
diff --git a/getdeploymentinfo b/getdeploymentinfo
index 35cafe7..eb03010 100644
--- a/getdeploymentinfo
+++ b/getdeploymentinfo
@@ -29,9 +29,10 @@ Result:
           "count" : n,                  (numeric) the number of blocks with the version bit set in the current period
           "possible" : true|false       (boolean, optional) returns false if there are not enough blocks left in this period to pass activation threshold (only for "started" status)
         },
-        "signalling" : "str"            (string) indicates blocks that signalled with a # and blocks that did not with a -
+        "signalling" : "str"            (string, optional) indicates blocks that signalled with a # and blocks that did not with a -
       }
-    }
+    },
+    ...
   }
 }
 

Copy link
Member

@luke-jr luke-jr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

crACK facd5d9

@maflcko maflcko merged commit 138d55e into bitcoin:master Mar 22, 2022
@maflcko maflcko deleted the 2203-docRpc-🔅 branch March 22, 2022 08:21
Copy link
Member

@jonatack jonatack left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Post-merge ACK

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Mar 23, 2022
@jonatack jonatack mentioned this pull request Mar 28, 2022
fanquake added a commit that referenced this pull request Mar 31, 2022
174af33 util: Add inotify_rm_watch to syscall sandbox (AllowFileSystem) (Hennadii Stepanov)
ded10fe build: Fix Boost.Process test for Boost 1.78 (Hennadii Stepanov)
26c2f23 build: Fix Boost.Process detection on macOS arm64 (Hennadii Stepanov)
85f85c7 util: add linkat to syscall sandbox (AllowFileSystem) (fanquake)
eaa0419 contrib: fix signet miner (sighash mismatch) (Sebastian Falbesoner)
235b042 rpc: Exclude descriptor when address is excluded (MarcoFalke)
b05a59b ci: Temporarily use clang-13 to work around clang-14 TSan bug (MarcoFalke)
65b9667 doc, init: add links to doc/cjdns.md (Jon Atack)
7a553d4 doc: update i2p.md with cjdns, improve local addresses section (Jon Atack)
4148396 doc: update tor.md with cjdns and getnodeaddresses, fix tor grep, (Jon Atack)
4690e8a doc: create initial doc/cjdns.md for cjdns how-to documentation (Jon Atack)
5d24f61 Clarify in -maxtimeadjustment that only outbound peers influence time data (Jon Atack)
b1646f1 test: set segwit height back to 0 on regtest (Martin Zumsande)
ef6a37b rpc: rename getdeploymentinfo status-next to status_next (Jon Atack)
2a6fcf9 init, doc: improve -onlynet help and tor/i2p documentation (Jon Atack)

Pull request description:

  Backport the following to 23.x:

  - #24468
  - #24528
  - #24527
  - #24609
  - #24555
  - #24663
  - #24572
  - #24636
  - #24553
  - #24659
  - #24521
  - #24523
  - #24690
  - #24710

  Possibly also:
  - #24579
  - #24691

ACKs for top commit:
  laanwj:
    List-of-commits ACK 174af33, I think we should merge this and move forward with rc3..
  hebasto:
    ACK 174af33

Tree-SHA512: 5a493e1652b780b527767d6ca9e67012abd2fa5573496e85e0d8aa4bed3eb332bfcd72610b8dfb954ff274d42450623233c96c479de2085b9c8344ba5abf1935
luke-jr added a commit to luke-jr/bitcoin that referenced this pull request May 21, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Mar 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants