From c7a99a6084ee5ff015fdd0ee70d0553c04f36985 Mon Sep 17 00:00:00 2001 From: Michael Rotarius Date: Tue, 15 Nov 2016 17:17:05 +0100 Subject: [PATCH 1/4] RPC Developer reference updated based on 0.12.1 I updated all changes to the RPC API from 0.11.0 to 0.12.1. An update based on 0.13.1 will follow soon. --- _autocrossref.yaml | 12 ++ _config.yml | 6 + .../devdoc/bitcoin-core/rpcs/quick-ref.md | 43 ++-- .../rpcs/rpcs/abandontransaction.md | 52 +++++ .../bitcoin-core/rpcs/rpcs/clearbanned.md | 45 +++++ .../rpcs/rpcs/createrawtransaction.md | 10 + .../bitcoin-core/rpcs/rpcs/disconnectnode.md | 52 +++++ .../rpcs/rpcs/getbestblockhash.md | 2 - .../rpcs/rpcs/getblockchaininfo.md | 170 +++++++++++++++- .../bitcoin-core/rpcs/rpcs/getblockheader.md | 183 ++++++++++++++++++ .../bitcoin-core/rpcs/rpcs/getmempoolinfo.md | 24 ++- .../bitcoin-core/rpcs/rpcs/getnetworkinfo.md | 2 - .../bitcoin-core/rpcs/rpcs/gettransaction.md | 3 +- .../bitcoin-core/rpcs/rpcs/getwalletinfo.md | 2 +- .../bitcoin-core/rpcs/rpcs/listbanned.md | 88 +++++++++ .../rpcs/rpcs/listtransactions.md | 27 ++- .../devdoc/bitcoin-core/rpcs/rpcs/setban.md | 83 ++++++++ _includes/helpers/summaries.md | 5 + _includes/helpers/vars.md | 5 + _includes/references.md | 6 + en/developer-reference.md | 12 ++ 21 files changed, 791 insertions(+), 41 deletions(-) create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/disconnectnode.md create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/listbanned.md create mode 100644 _includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md diff --git a/_autocrossref.yaml b/_autocrossref.yaml index 59f52d02..bdf99d7a 100644 --- a/_autocrossref.yaml +++ b/_autocrossref.yaml @@ -177,12 +177,16 @@ BIP72: CVE-2012-2459: ## RPCs +'`abandontransaction`': rpc abandontransaction +'`abandontransaction` RPC': rpc abandontransaction '`addmultisigaddress`': rpc addmultisigaddress '`addmultisigaddress` RPC': rpc addmultisigaddress '`addnode`': rpc addnode '`addnode` RPC': rpc addnode '`backupwallet`': rpc backupwallet '`backupwallet` RPC': rpc backupwallet +'`clearbanned`': rpc clearbanned +'`clearbanned` RPC': rpc clearbanned '`createmultisig`': rpc createmultisig '`createmultisig` RPC': rpc createmultisig '`createrawtransaction`': rpc createrawtransaction @@ -191,6 +195,8 @@ CVE-2012-2459: '`decoderawtransaction` RPC': rpc decoderawtransaction '`decodescript`': rpc decodescript '`decodescript` RPC': rpc decodescript +'`disconnectnode`': rpc disconnectnode +'`disconnectnode` RPC': rpc disconnectnode '`dumpprivkey`': rpc dumpprivkey '`dumpprivkey` RPC': rpc dumpprivkey '`dumpwallet`': rpc dumpwallet @@ -223,6 +229,8 @@ CVE-2012-2459: '`getblockcount` RPC': rpc getblockcount '`getblockhash`': rpc getblockhash '`getblockhash` RPC': rpc getblockhash +'`getblockheader`': rpc getblockheader +'`getblockheader` RPC': rpc getblockheader '`getblocktemplate`': rpc getblocktemplate '`getblocktemplate` RPC': rpc getblocktemplate '`getchaintips`': rpc getchaintips @@ -289,6 +297,8 @@ CVE-2012-2459: '`listaccounts` RPC': rpc listaccounts '`listaddressgroupings`': rpc listaddressgroupings '`listaddressgroupings` RPC': rpc listaddressgroupings +'`listbanned`': rpc listbanned +'`listbanned` RPC': rpc listbanned '`listlockunspent`': rpc listlockunspent '`listlockunspent` RPC': rpc listlockunspent '`listreceivedbyaccount`': rpc listreceivedbyaccount @@ -320,6 +330,8 @@ CVE-2012-2459: '`sendtoaddress` RPC': rpc sendtoaddress '`setaccount`': rpc setaccount '`setaccount` RPC': rpc setaccount +'`setban`': rpc setban +'`setban` RPC': rpc setban '`setgenerate`': rpc setgenerate '`setgenerate` RPC': rpc setgenerate '`settxfee`': rpc settxfee diff --git a/_config.yml b/_config.yml index 3cc17823..ea87e555 100644 --- a/_config.yml +++ b/_config.yml @@ -247,13 +247,16 @@ devsearches: ## RPCs currently documented on Bitcoin.org. CamelCase names (with ## leading capital) for easier quick scanning "RPCs": + - 'AbandonTransaction': "/en/developer-reference#abandontransaction" - 'AddMultiSigAddress': "/en/developer-reference#addmultisigaddress" - 'AddNode': "/en/developer-reference#addnode" - 'BackupWallet': "/en/developer-reference#backupwallet" + - 'ClearBanned': "/en/developer-reference#clearbanned" - 'CreateMultisig': "/en/developer-reference#createmultisig" - 'CreateRawTransaction': "/en/developer-reference#createrawtransaction" - 'DecodeRawTransaction': "/en/developer-reference#decoderawtransaction" - 'DecodeScript': "/en/developer-reference#decodescript" + - 'DisconnectNode': "/en/developer-reference#disconnectnode" - 'DumpPrivKey': "/en/developer-reference#dumpprivkey" - 'DumpWallet': "/en/developer-reference#dumpwallet" - 'EncryptWallet': "/en/developer-reference#encryptwallet" @@ -269,6 +272,7 @@ devsearches: - 'GetBlockChainInfo': "/en/developer-reference#getblockchaininfo" - 'GetBlockCount': "/en/developer-reference#getblockcount" - 'GetBlockHash': "/en/developer-reference#getblockhash" + - 'GetBlockHeader': "/en/developer-reference#getblockheader" - 'GetBlockTemplate': "/en/developer-reference#getblocktemplate" - 'GetChainTips': "/en/developer-reference#getchaintips" - 'GetConnectionCount': "/en/developer-reference#getconnectioncount" @@ -302,6 +306,7 @@ devsearches: - 'KeypoolRefill': "/en/developer-reference#keypoolrefill" - 'ListAccounts': "/en/developer-reference#listaccounts" - 'ListAddressGroupings': "/en/developer-reference#listaddressgroupings" + - 'ListBanned': "/en/developer-reference#listbanned" - 'ListLockUnspent': "/en/developer-reference#listlockunspent" - 'ListReceivedByAccount': "/en/developer-reference#listreceivedbyaccount" - 'ListReceivedByAddress': "/en/developer-reference#listreceivedbyaddress" @@ -316,6 +321,7 @@ devsearches: - 'SendRawTransaction': "/en/developer-reference#sendrawtransaction" - 'SendToAddress': "/en/developer-reference#sendtoaddress" - 'SetAccount': "/en/developer-reference#setaccount" + - 'SetBan': "/en/developer-reference#setban" - 'SetGenerate': "/en/developer-reference#setgenerate" - 'SetTxFee': "/en/developer-reference#settxfee" - 'SignMessage': "/en/developer-reference#signmessage" diff --git a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md index 57aef82f..b3a116fe 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md +++ b/_includes/devdoc/bitcoin-core/rpcs/quick-ref.md @@ -19,18 +19,21 @@ Use v0.n.n in abbreviation title to prevent autocrossrefing. {% assign NEW_MASTER='**New in master**' %} {% assign UPDATED_MASTER='**Updated in master**' %} - - {% assign DEPRECATED='**Deprecated**' %} -{% assign NEW0_10_0='**New in 0.10.0**' %} -{% assign NEW0_11_0='**New in 0.11.0**' %} -{% assign UPDATED0_10_0='**Updated in 0.10.0**' %} - -{% assign NEW0_9_2='*New in 0.9.2*' %} + +{% assign UPDATED0_12_1='*Updated in 0.12.1*' %} - -{% assign NEW0_9_0='*New in 0.9.0*' %} + +{% assign NEW0_12_0='*New in 0.12.0*' %} +{% assign UPDATED0_12_0='*Updated in 0.12.0*' %} + + +{% assign NEW0_11_0='*New in 0.11.0*' %} + + +{% assign NEW0_10_0='*New in 0.10.0*' %} +{% assign UPDATED0_10_0='*Updated in 0.10.0*' %} to the specified file, which can be a directory or a path with filename." %} +{% assign summary_clearBanned="Clears list of banned nodes." %} {% assign summary_createMultiSig="creates a P2SH multi-signature address." %} {% assign summary_createRawTransaction="creates an unsigned serialized transaction that spends a previous output to a new output with a P2PKH or P2SH address. The transaction is not stored in the wallet or transmitted to the network." %} {% assign summary_decodeRawTransaction="decodes a serialized transaction hex string into a JSON object describing the transaction." %} @@ -23,6 +25,7 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_getBlockChainInfo="provides information about the current state of the block chain." %} {% assign summary_getBlockCount="returns the number of blocks in the local best block chain." %} {% assign summary_getBlockHash="returns the header hash of a block at the given height in the local best block chain." %} +{% assign summary_getBlockHeader="gets a block header with a particular header hash from the local block database either as a JSON object or as a serialized block header." %} {% assign summary_getBlockTemplate="gets a block template or proposal for use with mining software." %} {% assign summary_getChainTips="returns information about the highest-height block (tip) of each local block chain." %} {% assign summary_getConnectionCount="returns the number of connections to other nodes." %} @@ -56,6 +59,7 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_keyPoolRefill="fills the cache of unused pre-generated keys (the keypool)." %} {% assign summary_listAccounts="lists accounts and their balances." %} {% assign summary_listAddressGroupings="lists groups of addresses that may have had their common ownership made public by common use as inputs in the same transaction or from being used as change from a previous transaction." %} +{% assign summary_listBanned="lists all banned IPs/Subnets." %} {% assign summary_listLockUnspent="returns a list of temporarily unspendable (locked) outputs." %} {% assign summary_listReceivedByAccount="lists the total number of bitcoins received by each account." %} {% assign summary_listReceivedByAddress="lists the total number of bitcoins received by each address." %} @@ -74,6 +78,7 @@ This file is licensed under the terms of its source texts{%endcomment%} {% assign summary_sendRawTransaction="validates a transaction and broadcasts it to the peer-to-peer network." %} {% assign summary_sendToAddress="spends an amount to a given address." %} {% assign summary_setAccount="puts the specified address in the given account." %} +{% assign summary_setBan="attempts add or remove a IP/Subnet from the banned list." %} {% assign summary_setGenerate="enables or disables hashing to attempt to find the next block." %} {% assign summary_setTxFee="sets the transaction fee per kilobyte paid by transactions created by this wallet." %} {% assign summary_signMessage="signs a message with the private key of an address." %} diff --git a/_includes/helpers/vars.md b/_includes/helpers/vars.md index 86c24b41..5dd4fd92 100644 --- a/_includes/helpers/vars.md +++ b/_includes/helpers/vars.md @@ -93,6 +93,11 @@ http://opensource.org/licenses/MIT. p: "Required
(exactly 1)" d: "A Unix epoch time when the transaction was detected by the local node, or the time of the block on the local best block chain that included the transaction" +- n: "{{DEPTH}}
`bip125-replaceable`" + t: "string" + p: "Required
(exactly 1)" + d: "*Added in Bitcoin Core 0.12.0*

Indicates if a transaction is replaceable under BIP 125:
• `yes` is replaceable
• `no` not replaceable
• `unknown` for unconfirmed transactions not in the mempool" + - n: "{{DEPTH}}
`comment`" t: "string" p: "Optional
(0 or 1)" diff --git a/_includes/references.md b/_includes/references.md index 9ce26ee8..fdf11eba 100644 --- a/_includes/references.md +++ b/_includes/references.md @@ -66,13 +66,16 @@ http://opensource.org/licenses/MIT. [wallet support]: /en/developer-reference#term-wallet-support "A Bitcoin Core ./configure option that enables (default) or disables the wallet" {% comment %}{% endcomment %} +[rpc abandontransaction]: /en/developer-reference#abandontransaction [rpc addmultisigaddress]: /en/developer-reference#addmultisigaddress [rpc addnode]: /en/developer-reference#addnode [rpc backupwallet]: /en/developer-reference#backupwallet +[rpc clearbanned]: /en/developer-reference#clearbanned [rpc createmultisig]: /en/developer-reference#createmultisig [rpc createrawtransaction]: /en/developer-reference#createrawtransaction [rpc decoderawtransaction]: /en/developer-reference#decoderawtransaction [rpc decodescript]: /en/developer-reference#decodescript +[rpc disconnectnode]: /en/developer-reference#disconnectnode [rpc dumpprivkey]: /en/developer-reference#dumpprivkey [rpc dumpwallet]: /en/developer-reference#dumpwallet [rpc encryptwallet]: /en/developer-reference#encryptwallet @@ -89,6 +92,7 @@ http://opensource.org/licenses/MIT. [rpc getblockchaininfo]: /en/developer-reference#getblockchaininfo [rpc getblockcount]: /en/developer-reference#getblockcount [rpc getblockhash]: /en/developer-reference#getblockhash +[rpc getblockheader]: /en/developer-reference#getblockheader [rpc getblocktemplate]: /en/developer-reference#getblocktemplate [rpc getchaintips]: /en/developer-reference#getchaintips [rpc getconnectioncount]: /en/developer-reference#getconnectioncount @@ -122,6 +126,7 @@ http://opensource.org/licenses/MIT. [rpc keypoolrefill]: /en/developer-reference#keypoolrefill [rpc listaccounts]: /en/developer-reference#listaccounts [rpc listaddressgroupings]: /en/developer-reference#listaddressgroupings +[rpc listbanned]: /en/developer-reference#listbanned [rpc listlockunspent]: /en/developer-reference#listlockunspent [rpc listreceivedbyaccount]: /en/developer-reference#listreceivedbyaccount [rpc listreceivedbyaddress]: /en/developer-reference#listreceivedbyaddress @@ -137,6 +142,7 @@ http://opensource.org/licenses/MIT. [rpc sendrawtransaction]: /en/developer-reference#sendrawtransaction [rpc sendtoaddress]: /en/developer-reference#sendtoaddress [rpc setaccount]: /en/developer-reference#setaccount +[rpc setban]: /en/developer-reference#setban [rpc setgenerate]: /en/developer-reference#setgenerate [rpc settxfee]: /en/developer-reference#settxfee [rpc signmessage]: /en/developer-reference#signmessage diff --git a/en/developer-reference.md b/en/developer-reference.md index d8acf564..f2212a9f 100644 --- a/en/developer-reference.md +++ b/en/developer-reference.md @@ -68,12 +68,16 @@ create a cross-site scripting (XSS) exploit. To avoid problems, please treat block chain and memory pool data as an arbitrary input from an untrusted source. +{% include devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/addmultisigaddress.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/addnode.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/backupwallet.md %} +{% include devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/createmultisig.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md %} @@ -82,6 +86,8 @@ untrusted source. {% include devdoc/bitcoin-core/rpcs/rpcs/decodescript.md %} +{% include devdoc/bitcoin-core/rpcs/rpcs/disconnectnode.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/dumpprivkey.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/dumpwallet.md %} @@ -114,6 +120,8 @@ untrusted source. {% include devdoc/bitcoin-core/rpcs/rpcs/getblockhash.md %} +{% include devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/getblocktemplate.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/getchaintips.md %} @@ -180,6 +188,8 @@ untrusted source. {% include devdoc/bitcoin-core/rpcs/rpcs/listaddressgroupings.md %} +{% include devdoc/bitcoin-core/rpcs/rpcs/listbanned.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/listlockunspent.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/listreceivedbyaccount.md %} @@ -210,6 +220,8 @@ untrusted source. {% include devdoc/bitcoin-core/rpcs/rpcs/setaccount.md %} +{% include devdoc/bitcoin-core/rpcs/rpcs/setban.md %} + {% include devdoc/bitcoin-core/rpcs/rpcs/setgenerate.md %} {% include devdoc/bitcoin-core/rpcs/rpcs/settxfee.md %} From 9ba2fc5e010469e10c5c186b57301b8a092d2d28 Mon Sep 17 00:00:00 2001 From: "David A. Harding" Date: Tue, 15 Nov 2016 20:22:47 -0500 Subject: [PATCH 2/4] Dev Docs: RPCs: minor typo fixes and edits for 0.12.0 update --- _includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md | 4 ++-- _includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md | 2 +- .../devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md | 2 +- _includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md | 4 ++-- _includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md | 4 ++-- _includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md | 4 ++-- _includes/devdoc/bitcoin-core/rpcs/rpcs/gettransaction.md | 2 +- _includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md index 8f986e1b..e6b538e1 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/abandontransaction.md @@ -7,7 +7,7 @@ http://opensource.org/licenses/MIT. ##### AbandonTransaction {% include helpers/subhead-links.md %} -{% assign summary_abandonTransaction="marks an in-wallet transaction and all its in-wallet descendants as abandoned. This allows their inputs to be respend." %} +{% assign summary_abandonTransaction="marks an in-wallet transaction and all its in-wallet descendants as abandoned. This allows their inputs to be respent." %} {% autocrossref %} @@ -37,7 +37,7 @@ The `abandontransaction` RPC {{summary_abandonTransaction}} *Example from Bitcoin Core 0.13.1* -Disconnects following node from your node. +Abandons the transaction on your node. {% highlight bash %} bitcoin-cli abandontransaction fa3970c341c9f5de6ab13f128cbfec58d732e736a505fe32137ad551c799ecc4 diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md index e1988262..390d3230 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/clearbanned.md @@ -29,7 +29,7 @@ The `clearbanned` RPC {{summary_clearBanned}} *Example from Bitcoin Core 0.13.1* -Disconnects following node from your node. +Clears the ban list. {% highlight bash %} bitcoin-cli clearbanned diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md index 185824a6..a7754188 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/createrawtransaction.md @@ -53,7 +53,7 @@ The `createrawtransaction` RPC {{summary_createRawTransaction}} {% enditemplate %} -*Parameter #3---locktime +*Parameter #3---locktime* {% itemplate ntpd1 %} - n: "Locktime" diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md index 0fa42972..44ef728c 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md @@ -51,7 +51,7 @@ The `getblockchaininfo` RPC {{summary_getBlockChainInfo}} - n: "→
`mediantime`" t: "number (int)" p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.12.0*

The difficulty of the highest-height block in the best block chain" + d: "*Added in Bitcoin Core 0.12.0*

The median time of the 11 blocks before the most recent block on the blockchain. Used for validating transaction locktime under BIP113." - n: "→
`verificationprogress`" t: "number (real)" @@ -175,7 +175,7 @@ The `getblockchaininfo` RPC {{summary_getBlockChainInfo}} {% enditemplate %} -*Example from Bitcoin Core 0.12.1* +*Example from Bitcoin Core 0.13.1* {% highlight bash %} bitcoin-cli -testnet getblockchaininfo diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md index 1b291138..8683b75f 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md @@ -91,7 +91,7 @@ The `getblockheader` RPC {{summary_getBlockHeader}} - n: "→
`mediantime`" t: "number (int)" p: "Required
(exactly 1)" - d: "The value of the *time* field in the block header, indicating approximately when the block was created" + d: "The computed median time of the previous 11 blocks. Used for validating transaction locktime under BIP113." - n: "→
`nonce`" t: "number (int)" @@ -127,7 +127,7 @@ The `getblockheader` RPC {{summary_getBlockHeader}} *Example from Bitcoin Core 0.12.1* -Get a block in raw hex: +Get a block header in raw hex: {% highlight bash %} bitcoin-cli -testnet getblockheader \ diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md index a35e1c2f..ac2fa8c2 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getmempoolinfo.md @@ -48,8 +48,8 @@ The `getmempoolinfo` RPC {{summary_getMemPoolInfo}} - n: "→
`mempoolminfee`" t: "number (int)" p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.12.0*

The total number of bytes in the transactions in the memory pool" - + d: "*Added in Bitcoin Core 0.12.0*

The lowest fee per kilobyte paid by any transaction in the memory pool" + {% enditemplate %} *Example from Bitcoin Core 0.12.0* diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/gettransaction.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/gettransaction.md index 47412594..476df9f4 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/gettransaction.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/gettransaction.md @@ -120,7 +120,7 @@ Result: ], "time" : 1396321351, "timereceived" : 1418924711, - "bip125-replaceable" : "no", + "bip125-replaceable" : "no", "details" : [ { "account" : "", diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md index fab4cd57..cd5b79e5 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md @@ -13,7 +13,7 @@ http://opensource.org/licenses/MIT. *Added in Bitcoin Core 0.12.0* -The `setban` RPC {{summary_addNode}} +The `setban` RPC {{summary_setBan}} *Parameter #1---IP/Subnet of the node* @@ -67,7 +67,7 @@ The `setban` RPC {{summary_addNode}} *Example from Bitcoin Core 0.12.1* -Try connecting to the following node. +Ban the following node. {% highlight bash %} bitcoin-cli -testnet setban 192.0.2.113:18333 add 2592000 From f7a97d15f7e72b5d852950ffa490b90999f62727 Mon Sep 17 00:00:00 2001 From: Michael Rotarius Date: Wed, 16 Nov 2016 20:04:58 +0100 Subject: [PATCH 3/4] Small fixes based on harding's input --- _includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md | 5 ----- .../devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md index 8683b75f..7928c54b 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md @@ -63,11 +63,6 @@ The `getblockheader` RPC {{summary_getBlockHeader}} p: "Required
(exactly 1)" d: "The number of confirmations the transactions in this block have, starting at 1 when this block is at the tip of the best block chain. This score will be -1 if the the block is not part of the best block chain" -- n: "→
`size`" - t: "number (int)" - p: "Required
(exactly 1)" - d: "The size of this block in serialized block format, counted in bytes" - - n: "→
`height`" t: "number (int)" p: "Required
(exactly 1)" diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md index 71402c32..c38755de 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md @@ -1,4 +1,4 @@ -{% comment %} +{% comment %} This file is licensed under the MIT License (MIT) available on http://opensource.org/licenses/MIT. {% endcomment %} @@ -100,7 +100,7 @@ The `listtransactions` RPC {{summary_listTransactions}} - n: "→ →
`trusted`" t: "bool" p: "Optional
(0 or 1)" - d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend" + d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend. The field is only visible for unconfirmed transactions." - n: "→ →
`generated`" t: "bool" @@ -204,8 +204,8 @@ Result: ], "time" : 1418695703, "timereceived" : 1418925580, - "bip125-replaceable" : "no", - "abandoned": false + "bip125-replaceable" : "no", + "abandoned": false } ] {% endhighlight %} From 4f03c65653ce8e76e9dad899ebbf74ece5654e16 Mon Sep 17 00:00:00 2001 From: Michael Rotarius Date: Wed, 16 Nov 2016 20:15:02 +0100 Subject: [PATCH 4/4] Small formatting fixes --- .../devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md | 8 ++++---- _includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md | 2 +- .../devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md | 4 ++-- _includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md index 44ef728c..b1e2e92f 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockchaininfo.md @@ -51,7 +51,7 @@ The `getblockchaininfo` RPC {{summary_getBlockChainInfo}} - n: "→
`mediantime`" t: "number (int)" p: "Required
(exactly 1)" - d: "*Added in Bitcoin Core 0.12.0*

The median time of the 11 blocks before the most recent block on the blockchain. Used for validating transaction locktime under BIP113." + d: "*Added in Bitcoin Core 0.12.0*

The median time of the 11 blocks before the most recent block on the blockchain. Used for validating transaction locktime under BIP113" - n: "→
`verificationprogress`" t: "number (real)" @@ -161,17 +161,17 @@ The `getblockchaininfo` RPC {{summary_getBlockChainInfo}} - n: "→ → →
`bit`" t: "numeric
(int)" p: "Optional
(0 or 1)" - d: "The bit (0-28) in the block version field used to signal this softfork. Field is only shown when status is `started`." + d: "The bit (0-28) in the block version field used to signal this softfork. Field is only shown when status is `started`" - n: "→ → →
`startTime`" t: "numeric
(int)" p: "Required
(exactly 1)" - d: "The Unix epoch time when the softfork voting begins." + d: "The Unix epoch time when the softfork voting begins" - n: "→ → →
`timeout`" t: "numeric
(int)" p: "Required
(exactly 1)" - d: "The Unix epoch time at which the deployment is considered failed if not yet locked in." + d: "The Unix epoch time at which the deployment is considered failed if not yet locked in" {% enditemplate %} diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md index 7928c54b..bc3239dd 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/getblockheader.md @@ -86,7 +86,7 @@ The `getblockheader` RPC {{summary_getBlockHeader}} - n: "→
`mediantime`" t: "number (int)" p: "Required
(exactly 1)" - d: "The computed median time of the previous 11 blocks. Used for validating transaction locktime under BIP113." + d: "The computed median time of the previous 11 blocks. Used for validating transaction locktime under BIP113" - n: "→
`nonce`" t: "number (int)" diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md index c38755de..2270560e 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/listtransactions.md @@ -21,7 +21,7 @@ The `listtransactions` RPC {{summary_listTransactions}} - n: "Account" t: "string" p: "Optional
(0 or 1)" - d: "The name of an account to get transactinos from. Use an empty string (\"\") to get transactions for the default account. Default is `*` to get transactions for all accounts. The account feature is deprecated." + d: "The name of an account to get transactinos from. Use an empty string (\"\") to get transactions for the default account. Default is `*` to get transactions for all accounts. The account feature is deprecated" {% enditemplate %} @@ -100,7 +100,7 @@ The `listtransactions` RPC {{summary_listTransactions}} - n: "→ →
`trusted`" t: "bool" p: "Optional
(0 or 1)" - d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend. The field is only visible for unconfirmed transactions." + d: "Indicates wether we consider the outputs of this unconfirmed transaction safe to spend. The field is only visible for unconfirmed transactions" - n: "→ →
`generated`" t: "bool" diff --git a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md index cd5b79e5..e7f26d12 100644 --- a/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md +++ b/_includes/devdoc/bitcoin-core/rpcs/rpcs/setban.md @@ -41,7 +41,7 @@ The `setban` RPC {{summary_setBan}} - n: "Bantime" t: "numeric
(int)" p: "Optional
(0 or 1)" - d: "Time in seconds how long (or until when if `absolute` is set) the entry is banned. The default is 24h which can also be overwritten by the -bantime startup argument." + d: "Time in seconds how long (or until when if `absolute` is set) the entry is banned. The default is 24h which can also be overwritten by the -bantime startup argument" {% enditemplate %}