diff --git a/addmultisigaddress.html b/addmultisigaddress.html index 47c646f..ee5fb45 100644 --- a/addmultisigaddress.html +++ b/addmultisigaddress.html @@ -3,10 +3,10 @@ - + - addmultisigaddress - Zcash 1.1.1 RPC Docs + addmultisigaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

addmultisigaddress - Zcash 1.1.1 RPC

+

addmultisigaddress - Zcash 2.0.0 RPC

addmultisigaddress nrequired ["key",...] ( "account" )
 
@@ -67,7 +67,7 @@ As json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/addnode.html b/addnode.html index 608542a..f0139b8 100644 --- a/addnode.html +++ b/addnode.html @@ -3,10 +3,10 @@ - + - addnode - Zcash 1.1.1 RPC Docs + addnode - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

addnode - Zcash 1.1.1 RPC

+

addnode - Zcash 2.0.0 RPC

addnode "node" "add|remove|onetry"
 
@@ -54,7 +54,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/backupwallet.html b/backupwallet.html index 7fc6c2a..1c77eec 100644 --- a/backupwallet.html +++ b/backupwallet.html @@ -3,10 +3,10 @@ - + - backupwallet - Zcash 1.1.1 RPC Docs + backupwallet - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

backupwallet - Zcash 1.1.1 RPC

+

backupwallet - Zcash 2.0.0 RPC

backupwallet "destination"
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/clearbanned.html b/clearbanned.html index f697b0e..02bb1af 100644 --- a/clearbanned.html +++ b/clearbanned.html @@ -3,10 +3,10 @@ - + - clearbanned - Zcash 1.1.1 RPC Docs + clearbanned - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

clearbanned - Zcash 1.1.1 RPC

+

clearbanned - Zcash 2.0.0 RPC

clearbanned
 
@@ -49,7 +49,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/createmultisig.html b/createmultisig.html index e182a7f..6f2c70c 100644 --- a/createmultisig.html +++ b/createmultisig.html @@ -3,10 +3,10 @@ - + - createmultisig - Zcash 1.1.1 RPC Docs + createmultisig - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

createmultisig - Zcash 1.1.1 RPC

+

createmultisig - Zcash 2.0.0 RPC

createmultisig nrequired ["key",...]
 
@@ -68,7 +68,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/createrawtransaction.html b/createrawtransaction.html index 0e5415c..6553da8 100644 --- a/createrawtransaction.html +++ b/createrawtransaction.html @@ -3,10 +3,10 @@ - + - createrawtransaction - Zcash 1.1.1 RPC Docs + createrawtransaction - Zcash 2.0.0 RPC Docs @@ -25,16 +25,16 @@
-

createrawtransaction - Zcash 1.1.1 RPC

+

createrawtransaction - Zcash 2.0.0 RPC

- 
createrawtransaction [{"txid":"id","vout":n},...] {"address":amount,...} ( locktime )
+            
createrawtransaction [{"txid":"id","vout":n},...] {"address":amount,...} ( locktime ) ( expiryheight )
 
 Create a transaction spending the given inputs and sending to the given addresses.
 Returns hex-encoded raw transaction.
@@ -45,7 +45,7 @@ Arguments:
 1. "transactions"        (string, required) A json array of json objects
      [
        {
-         "txid":"id",  (string, required) The transaction id
+         "txid":"id",    (string, required) The transaction id
          "vout":n        (numeric, required) The output number
          "sequence":n    (numeric, optional) The sequence number
        }
@@ -56,7 +56,8 @@ Arguments:
       "address": x.xxx   (numeric, required) The key is the Zcash address, the value is the ZEC amount
       ,...
     }
-3. locktime                (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs
+3. locktime              (numeric, optional, default=0) Raw locktime. Non-0 value also locktime-activates inputs
+4. expiryheight          (numeric, optional, default=20) Expiry height of transaction (if Overwinter is active)
 
 Result:
 "transaction"            (string) hex string of the transaction
@@ -72,7 +73,7 @@ Examples
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/decoderawtransaction.html b/decoderawtransaction.html index f9626c8..e8386f2 100644 --- a/decoderawtransaction.html +++ b/decoderawtransaction.html @@ -3,10 +3,10 @@ - + - decoderawtransaction - Zcash 1.1.1 RPC Docs + decoderawtransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

decoderawtransaction - Zcash 1.1.1 RPC

+

decoderawtransaction - Zcash 2.0.0 RPC

decoderawtransaction "hexstring"
 
@@ -118,7 +118,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/decodescript.html b/decodescript.html index 4bea6f8..4538ee4 100644 --- a/decodescript.html +++ b/decodescript.html @@ -3,10 +3,10 @@ - + - decodescript - Zcash 1.1.1 RPC Docs + decodescript - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

decodescript - Zcash 1.1.1 RPC

+

decodescript - Zcash 2.0.0 RPC

decodescript "hex"
 
@@ -65,7 +65,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/disconnectnode.html b/disconnectnode.html index 07323f9..c3d3b2d 100644 --- a/disconnectnode.html +++ b/disconnectnode.html @@ -3,10 +3,10 @@ - + - disconnectnode - Zcash 1.1.1 RPC Docs + disconnectnode - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

disconnectnode - Zcash 1.1.1 RPC

+

disconnectnode - Zcash 2.0.0 RPC

disconnectnode "node" 
 
@@ -52,7 +52,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/dumpprivkey.html b/dumpprivkey.html index 0acf689..af309e5 100644 --- a/dumpprivkey.html +++ b/dumpprivkey.html @@ -3,10 +3,10 @@ - + - dumpprivkey - Zcash 1.1.1 RPC Docs + dumpprivkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

dumpprivkey - Zcash 1.1.1 RPC

+

dumpprivkey - Zcash 2.0.0 RPC

dumpprivkey "t-addr"
 
@@ -57,7 +57,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/dumpwallet.html b/dumpwallet.html index 941b5d6..ac5e0a1 100644 --- a/dumpwallet.html +++ b/dumpwallet.html @@ -3,10 +3,10 @@ - + - dumpwallet - Zcash 1.1.1 RPC Docs + dumpwallet - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

dumpwallet - Zcash 1.1.1 RPC

+

dumpwallet - Zcash 2.0.0 RPC

dumpwallet "filename"
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/encryptwallet.html b/encryptwallet.html index da8aba5..3cbcd8f 100644 --- a/encryptwallet.html +++ b/encryptwallet.html @@ -3,10 +3,10 @@ - + - encryptwallet - Zcash 1.1.1 RPC Docs + encryptwallet - Zcash 2.0.0 RPC Docs @@ -25,18 +25,24 @@
-

encryptwallet - Zcash 1.1.1 RPC

+

encryptwallet - Zcash 2.0.0 RPC

encryptwallet "passphrase"
 
-WARNING: Wallet encryption is DISABLED. This call always fails.
+WARNING: encryptwallet is disabled.
+To enable it, restart zcashd with the -experimentalfeatures and
+-developerencryptwallet commandline options, or add these two lines
+to the zcash.conf file:
+
+experimentalfeatures=1
+developerencryptwallet=1
 
 Encrypts the wallet with 'passphrase'. This is for first time encryption.
 After this, any calls that interact with private keys such as sending or signing 
@@ -72,7 +78,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/estimatefee.html b/estimatefee.html index 9f0afc9..34faca1 100644 --- a/estimatefee.html +++ b/estimatefee.html @@ -3,10 +3,10 @@ - + - estimatefee - Zcash 1.1.1 RPC Docs + estimatefee - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

estimatefee - Zcash 1.1.1 RPC

+

estimatefee - Zcash 2.0.0 RPC

estimatefee nblocks
 
@@ -59,7 +59,7 @@ Example:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/estimatepriority.html b/estimatepriority.html index 3c6207a..5aa0e92 100644 --- a/estimatepriority.html +++ b/estimatepriority.html @@ -3,10 +3,10 @@ - + - estimatepriority - Zcash 1.1.1 RPC Docs + estimatepriority - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

estimatepriority - Zcash 1.1.1 RPC

+

estimatepriority - Zcash 2.0.0 RPC

estimatepriority nblocks
 
@@ -59,7 +59,7 @@ Example:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/fundrawtransaction.html b/fundrawtransaction.html index c3ed912..bea31d8 100644 --- a/fundrawtransaction.html +++ b/fundrawtransaction.html @@ -3,10 +3,10 @@ - + - fundrawtransaction - Zcash 1.1.1 RPC Docs + fundrawtransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

fundrawtransaction - Zcash 1.1.1 RPC

+

fundrawtransaction - Zcash 2.0.0 RPC

fundrawtransaction "hexstring"
 
@@ -73,7 +73,7 @@ Send the transaction
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/generate.html b/generate.html index 917ff75..7839ad6 100644 --- a/generate.html +++ b/generate.html @@ -3,10 +3,10 @@ - + - generate - Zcash 1.1.1 RPC Docs + generate - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

generate - Zcash 1.1.1 RPC

+

generate - Zcash 2.0.0 RPC

generate numblocks
 
@@ -58,7 +58,7 @@ Generate 11 blocks
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getaccount.html b/getaccount.html index 15809ba..c6faf8d 100644 --- a/getaccount.html +++ b/getaccount.html @@ -3,10 +3,10 @@ - + - getaccount - Zcash 1.1.1 RPC Docs + getaccount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getaccount - Zcash 1.1.1 RPC

+

getaccount - Zcash 2.0.0 RPC

getaccount "zcashaddress"
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getaccountaddress.html b/getaccountaddress.html index 6afda0e..24e3dad 100644 --- a/getaccountaddress.html +++ b/getaccountaddress.html @@ -3,10 +3,10 @@ - + - getaccountaddress - Zcash 1.1.1 RPC Docs + getaccountaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getaccountaddress - Zcash 1.1.1 RPC

+

getaccountaddress - Zcash 2.0.0 RPC

getaccountaddress "account"
 
@@ -57,7 +57,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getaddednodeinfo.html b/getaddednodeinfo.html index 2652c47..6fa8348 100644 --- a/getaddednodeinfo.html +++ b/getaddednodeinfo.html @@ -3,10 +3,10 @@ - + - getaddednodeinfo - Zcash 1.1.1 RPC Docs + getaddednodeinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getaddednodeinfo - Zcash 1.1.1 RPC

+

getaddednodeinfo - Zcash 2.0.0 RPC

getaddednodeinfo dns ( "node" )
 
@@ -73,7 +73,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getaddressesbyaccount.html b/getaddressesbyaccount.html index 027e855..d074b07 100644 --- a/getaddressesbyaccount.html +++ b/getaddressesbyaccount.html @@ -3,10 +3,10 @@ - + - getaddressesbyaccount - Zcash 1.1.1 RPC Docs + getaddressesbyaccount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getaddressesbyaccount - Zcash 1.1.1 RPC

+

getaddressesbyaccount - Zcash 2.0.0 RPC

getaddressesbyaccount "account"
 
@@ -58,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getbalance.html b/getbalance.html index 3342feb..f4e7f16 100644 --- a/getbalance.html +++ b/getbalance.html @@ -3,10 +3,10 @@ - + - getbalance - Zcash 1.1.1 RPC Docs + getbalance - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getbalance - Zcash 1.1.1 RPC

+

getbalance - Zcash 2.0.0 RPC

getbalance ( "account" minconf includeWatchonly )
 
@@ -64,7 +64,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getbestblockhash.html b/getbestblockhash.html index 269f0e7..33e1311 100644 --- a/getbestblockhash.html +++ b/getbestblockhash.html @@ -3,10 +3,10 @@ - + - getbestblockhash - Zcash 1.1.1 RPC Docs + getbestblockhash - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getbestblockhash - Zcash 1.1.1 RPC

+

getbestblockhash - Zcash 2.0.0 RPC

getbestblockhash
 
@@ -52,7 +52,7 @@ Examples
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblock.html b/getblock.html index 01751b4..372f384 100644 --- a/getblock.html +++ b/getblock.html @@ -3,10 +3,10 @@ - + - getblock - Zcash 1.1.1 RPC Docs + getblock - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblock - Zcash 1.1.1 RPC

+

getblock - Zcash 2.0.0 RPC

getblock "hash|height" ( verbosity )
 
@@ -55,6 +55,7 @@ Result (for verbosity = 1):
   "height" : n,          (numeric) The block height or index (same as provided height)
   "version" : n,         (numeric) The block version
   "merkleroot" : "xxxx", (string) The merkle root
+  "finalsaplingroot" : "xxxx", (string) The root of the Sapling commitment tree after applying this block
   "tx" : [               (array of string) The transaction ids
      "transactionid"     (string) The transaction id
      ,...
@@ -89,7 +90,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblockchaininfo.html b/getblockchaininfo.html index 26acf23..a5474e8 100644 --- a/getblockchaininfo.html +++ b/getblockchaininfo.html @@ -3,10 +3,10 @@ - + - getblockchaininfo - Zcash 1.1.1 RPC Docs + getblockchaininfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblockchaininfo - Zcash 1.1.1 RPC

+

getblockchaininfo - Zcash 2.0.0 RPC

getblockchaininfo
 Returns an object containing various state info regarding block chain processing.
@@ -88,7 +88,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblockcount.html b/getblockcount.html index ac6caf9..d6df17c 100644 --- a/getblockcount.html +++ b/getblockcount.html @@ -3,10 +3,10 @@ - + - getblockcount - Zcash 1.1.1 RPC Docs + getblockcount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblockcount - Zcash 1.1.1 RPC

+

getblockcount - Zcash 2.0.0 RPC

getblockcount
 
@@ -52,7 +52,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblockhash.html b/getblockhash.html index 8763ca7..f734179 100644 --- a/getblockhash.html +++ b/getblockhash.html @@ -3,10 +3,10 @@ - + - getblockhash - Zcash 1.1.1 RPC Docs + getblockhash - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblockhash - Zcash 1.1.1 RPC

+

getblockhash - Zcash 2.0.0 RPC

getblockhash index
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblockheader.html b/getblockheader.html index 2d12498..c4b16e1 100644 --- a/getblockheader.html +++ b/getblockheader.html @@ -3,10 +3,10 @@ - + - getblockheader - Zcash 1.1.1 RPC Docs + getblockheader - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblockheader - Zcash 1.1.1 RPC

+

getblockheader - Zcash 2.0.0 RPC

getblockheader "hash" ( verbose )
 
@@ -50,6 +50,7 @@ Result (for verbose = true):
   "height" : n,          (numeric) The block height or index
   "version" : n,         (numeric) The block version
   "merkleroot" : "xxxx", (string) The merkle root
+  "finalsaplingroot" : "xxxx", (string) The root of the Sapling commitment tree after applying this block
   "time" : ttt,          (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)
   "nonce" : n,           (numeric) The nonce
   "bits" : "1d00ffff", (string) The bits
@@ -72,7 +73,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblocksubsidy.html b/getblocksubsidy.html index 41e9627..12d100a 100644 --- a/getblocksubsidy.html +++ b/getblocksubsidy.html @@ -3,10 +3,10 @@ - + - getblocksubsidy - Zcash 1.1.1 RPC Docs + getblocksubsidy - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblocksubsidy - Zcash 1.1.1 RPC

+

getblocksubsidy - Zcash 2.0.0 RPC

getblocksubsidy height
 
@@ -58,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getblocktemplate.html b/getblocktemplate.html index c30fb7e..49fd6f4 100644 --- a/getblocktemplate.html +++ b/getblocktemplate.html @@ -3,10 +3,10 @@ - + - getblocktemplate - Zcash 1.1.1 RPC Docs + getblocktemplate - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getblocktemplate - Zcash 1.1.1 RPC

+

getblocktemplate - Zcash 2.0.0 RPC

getblocktemplate ( "jsonrequestobject" )
 
@@ -53,9 +53,10 @@ Arguments:
 
 Result:
 {
-  "version" : n,                    (numeric) The block version
+  "version" : n,                     (numeric) The block version
   "previousblockhash" : "xxxx",    (string) The hash of current highest block
-  "transactions" : [                (array) contents of non-coinbase transactions that should be included in the next block
+  "finalsaplingroothash" : "xxxx", (string) The hash of the final sapling root
+  "transactions" : [                 (array) contents of non-coinbase transactions that should be included in the next block
       {
          "data" : "xxxx",          (string) transaction data encoded in hexadecimal (byte-for-byte)
          "hash" : "xxxx",          (string) hash/id encoded in little-endian hexadecimal
@@ -95,7 +96,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getchaintips.html b/getchaintips.html index 191bf54..7e4769f 100644 --- a/getchaintips.html +++ b/getchaintips.html @@ -3,10 +3,10 @@ - + - getchaintips - Zcash 1.1.1 RPC Docs + getchaintips - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getchaintips - Zcash 1.1.1 RPC

+

getchaintips - Zcash 2.0.0 RPC

getchaintips
 Return information about all known tips in the block tree, including the main chain as well as orphaned branches.
@@ -70,7 +70,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getconnectioncount.html b/getconnectioncount.html index ac901b9..6495fe0 100644 --- a/getconnectioncount.html +++ b/getconnectioncount.html @@ -3,10 +3,10 @@ - + - getconnectioncount - Zcash 1.1.1 RPC Docs + getconnectioncount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getconnectioncount - Zcash 1.1.1 RPC

+

getconnectioncount - Zcash 2.0.0 RPC

getconnectioncount
 
@@ -52,7 +52,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getdeprecationinfo.html b/getdeprecationinfo.html index 79f4e4b..9b0d532 100644 --- a/getdeprecationinfo.html +++ b/getdeprecationinfo.html @@ -3,10 +3,10 @@ - + - getdeprecationinfo - Zcash 1.1.1 RPC Docs + getdeprecationinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getdeprecationinfo - Zcash 1.1.1 RPC

+

getdeprecationinfo - Zcash 2.0.0 RPC

getdeprecationinfo
 Returns an object containing current version and deprecation block height. Applicable only on mainnet.
@@ -41,7 +41,7 @@ Result:
 {
   "version": xxxxx,                      (numeric) the server version
   "subversion": "/MagicBean:x.y.z[-v]/",     (string) the server subversion string
-  "deprecationheight": xxxxx,            (numeric) the block height at which this version will deprecate and shut down (unless -disabledeprecation is set)
+  "deprecationheight": xxxxx,            (numeric) the block height at which this version will deprecate and shut down
 }
 
 Examples:
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getdifficulty.html b/getdifficulty.html index 73d8bb8..52938aa 100644 --- a/getdifficulty.html +++ b/getdifficulty.html @@ -3,10 +3,10 @@ - + - getdifficulty - Zcash 1.1.1 RPC Docs + getdifficulty - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getdifficulty - Zcash 1.1.1 RPC

+

getdifficulty - Zcash 2.0.0 RPC

getdifficulty
 
@@ -52,7 +52,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getgenerate.html b/getgenerate.html index c6d2257..8858212 100644 --- a/getgenerate.html +++ b/getgenerate.html @@ -3,10 +3,10 @@ - + - getgenerate - Zcash 1.1.1 RPC Docs + getgenerate - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getgenerate - Zcash 1.1.1 RPC

+

getgenerate - Zcash 2.0.0 RPC

getgenerate
 
@@ -54,7 +54,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getinfo.html b/getinfo.html index 1d78bab..9d001cc 100644 --- a/getinfo.html +++ b/getinfo.html @@ -3,10 +3,10 @@ - + - getinfo - Zcash 1.1.1 RPC Docs + getinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getinfo - Zcash 1.1.1 RPC

+

getinfo - Zcash 2.0.0 RPC

getinfo
 Returns an object containing various state info.
@@ -68,7 +68,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getlocalsolps.html b/getlocalsolps.html index 204e0d0..0960b5c 100644 --- a/getlocalsolps.html +++ b/getlocalsolps.html @@ -3,10 +3,10 @@ - + - getlocalsolps - Zcash 1.1.1 RPC Docs + getlocalsolps - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getlocalsolps - Zcash 1.1.1 RPC

+

getlocalsolps - Zcash 2.0.0 RPC

getlocalsolps
 
@@ -53,7 +53,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getmempoolinfo.html b/getmempoolinfo.html index 588d1e4..1c88f9c 100644 --- a/getmempoolinfo.html +++ b/getmempoolinfo.html @@ -3,10 +3,10 @@ - + - getmempoolinfo - Zcash 1.1.1 RPC Docs + getmempoolinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getmempoolinfo - Zcash 1.1.1 RPC

+

getmempoolinfo - Zcash 2.0.0 RPC

getmempoolinfo
 
@@ -56,7 +56,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getmininginfo.html b/getmininginfo.html index fb26c2b..e969156 100644 --- a/getmininginfo.html +++ b/getmininginfo.html @@ -3,10 +3,10 @@ - + - getmininginfo - Zcash 1.1.1 RPC Docs + getmininginfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getmininginfo - Zcash 1.1.1 RPC

+

getmininginfo - Zcash 2.0.0 RPC

getmininginfo
 
@@ -64,7 +64,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getnettotals.html b/getnettotals.html index 7bbbb16..bbb8e38 100644 --- a/getnettotals.html +++ b/getnettotals.html @@ -3,10 +3,10 @@ - + - getnettotals - Zcash 1.1.1 RPC Docs + getnettotals - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getnettotals - Zcash 1.1.1 RPC

+

getnettotals - Zcash 2.0.0 RPC

getnettotals
 
@@ -57,7 +57,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getnetworkhashps.html b/getnetworkhashps.html index 4945ea2..8a95785 100644 --- a/getnetworkhashps.html +++ b/getnetworkhashps.html @@ -3,10 +3,10 @@ - + - getnetworkhashps - Zcash 1.1.1 RPC Docs + getnetworkhashps - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getnetworkhashps - Zcash 1.1.1 RPC

+

getnetworkhashps - Zcash 2.0.0 RPC

getnetworkhashps ( blocks height )
 
@@ -60,7 +60,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getnetworkinfo.html b/getnetworkinfo.html index 6faa883..c1ea5a3 100644 --- a/getnetworkinfo.html +++ b/getnetworkinfo.html @@ -3,10 +3,10 @@ - + - getnetworkinfo - Zcash 1.1.1 RPC Docs + getnetworkinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getnetworkinfo - Zcash 1.1.1 RPC

+

getnetworkinfo - Zcash 2.0.0 RPC

getnetworkinfo
 Returns an object containing various state info regarding P2P networking.
@@ -77,7 +77,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getnetworksolps.html b/getnetworksolps.html index e5fb82a..d39b095 100644 --- a/getnetworksolps.html +++ b/getnetworksolps.html @@ -3,10 +3,10 @@ - + - getnetworksolps - Zcash 1.1.1 RPC Docs + getnetworksolps - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getnetworksolps - Zcash 1.1.1 RPC

+

getnetworksolps - Zcash 2.0.0 RPC

getnetworksolps ( blocks height )
 
@@ -58,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getnewaddress.html b/getnewaddress.html index ab61920..d6d5905 100644 --- a/getnewaddress.html +++ b/getnewaddress.html @@ -3,10 +3,10 @@ - + - getnewaddress - Zcash 1.1.1 RPC Docs + getnewaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getnewaddress - Zcash 1.1.1 RPC

+

getnewaddress - Zcash 2.0.0 RPC

getnewaddress ( "account" )
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getpeerinfo.html b/getpeerinfo.html index caf65d0..1a6b2be 100644 --- a/getpeerinfo.html +++ b/getpeerinfo.html @@ -3,10 +3,10 @@ - + - getpeerinfo - Zcash 1.1.1 RPC Docs + getpeerinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getpeerinfo - Zcash 1.1.1 RPC

+

getpeerinfo - Zcash 2.0.0 RPC

getpeerinfo
 
@@ -79,7 +79,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getrawchangeaddress.html b/getrawchangeaddress.html index 0e1841d..cf793f0 100644 --- a/getrawchangeaddress.html +++ b/getrawchangeaddress.html @@ -3,10 +3,10 @@ - + - getrawchangeaddress - Zcash 1.1.1 RPC Docs + getrawchangeaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getrawchangeaddress - Zcash 1.1.1 RPC

+

getrawchangeaddress - Zcash 2.0.0 RPC

getrawchangeaddress
 
@@ -53,7 +53,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getrawmempool.html b/getrawmempool.html index 9946401..fd28c38 100644 --- a/getrawmempool.html +++ b/getrawmempool.html @@ -3,10 +3,10 @@ - + - getrawmempool - Zcash 1.1.1 RPC Docs + getrawmempool - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getrawmempool - Zcash 1.1.1 RPC

+

getrawmempool - Zcash 2.0.0 RPC

getrawmempool ( verbose )
 
@@ -73,7 +73,7 @@ Examples
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getrawtransaction.html b/getrawtransaction.html index 0103af6..496989b 100644 --- a/getrawtransaction.html +++ b/getrawtransaction.html @@ -3,10 +3,10 @@ - + - getrawtransaction - Zcash 1.1.1 RPC Docs + getrawtransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getrawtransaction - Zcash 1.1.1 RPC

+

getrawtransaction - Zcash 2.0.0 RPC

getrawtransaction "txid" ( verbose )
 
@@ -133,7 +133,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getreceivedbyaccount.html b/getreceivedbyaccount.html index 5bbe580..9b56e3c 100644 --- a/getreceivedbyaccount.html +++ b/getreceivedbyaccount.html @@ -3,10 +3,10 @@ - + - getreceivedbyaccount - Zcash 1.1.1 RPC Docs + getreceivedbyaccount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getreceivedbyaccount - Zcash 1.1.1 RPC

+

getreceivedbyaccount - Zcash 2.0.0 RPC

getreceivedbyaccount "account" ( minconf )
 
@@ -66,7 +66,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getreceivedbyaddress.html b/getreceivedbyaddress.html index ec07c72..972c6f3 100644 --- a/getreceivedbyaddress.html +++ b/getreceivedbyaddress.html @@ -3,10 +3,10 @@ - + - getreceivedbyaddress - Zcash 1.1.1 RPC Docs + getreceivedbyaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getreceivedbyaddress - Zcash 1.1.1 RPC

+

getreceivedbyaddress - Zcash 2.0.0 RPC

getreceivedbyaddress "zcashaddress" ( minconf )
 
@@ -66,7 +66,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/gettransaction.html b/gettransaction.html index 6111023..c32662f 100644 --- a/gettransaction.html +++ b/gettransaction.html @@ -3,10 +3,10 @@ - + - gettransaction - Zcash 1.1.1 RPC Docs + gettransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

gettransaction - Zcash 1.1.1 RPC

+

gettransaction - Zcash 2.0.0 RPC

gettransaction "txid" ( includeWatchonly )
 
@@ -88,7 +88,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/gettxout.html b/gettxout.html index 41824d2..d041e61 100644 --- a/gettxout.html +++ b/gettxout.html @@ -3,10 +3,10 @@ - + - gettxout - Zcash 1.1.1 RPC Docs + gettxout - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

gettxout - Zcash 1.1.1 RPC

+

gettxout - Zcash 2.0.0 RPC

gettxout "txid" n ( includemempool )
 
@@ -80,7 +80,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/gettxoutproof.html b/gettxoutproof.html index 15b2e2a..52448fd 100644 --- a/gettxoutproof.html +++ b/gettxoutproof.html @@ -3,10 +3,10 @@ - + - gettxoutproof - Zcash 1.1.1 RPC Docs + gettxoutproof - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

gettxoutproof - Zcash 1.1.1 RPC

+

gettxoutproof - Zcash 2.0.0 RPC

gettxoutproof ["txid",...] ( blockhash )
 
@@ -63,7 +63,7 @@ Result:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/gettxoutsetinfo.html b/gettxoutsetinfo.html index cd87da0..903e6f8 100644 --- a/gettxoutsetinfo.html +++ b/gettxoutsetinfo.html @@ -3,10 +3,10 @@ - + - gettxoutsetinfo - Zcash 1.1.1 RPC Docs + gettxoutsetinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

gettxoutsetinfo - Zcash 1.1.1 RPC

+

gettxoutsetinfo - Zcash 2.0.0 RPC

gettxoutsetinfo
 
@@ -61,7 +61,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getunconfirmedbalance.html b/getunconfirmedbalance.html index 613f66d..b4365e9 100644 --- a/getunconfirmedbalance.html +++ b/getunconfirmedbalance.html @@ -3,10 +3,10 @@ - + - getunconfirmedbalance - Zcash 1.1.1 RPC Docs + getunconfirmedbalance - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getunconfirmedbalance - Zcash 1.1.1 RPC

+

getunconfirmedbalance - Zcash 2.0.0 RPC

getunconfirmedbalance
 Returns the server's total unconfirmed balance
@@ -44,7 +44,7 @@ Returns the server's total unconfirmed balance
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/getwalletinfo.html b/getwalletinfo.html index a1322a2..b37178f 100644 --- a/getwalletinfo.html +++ b/getwalletinfo.html @@ -3,10 +3,10 @@ - + - getwalletinfo - Zcash 1.1.1 RPC Docs + getwalletinfo - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

getwalletinfo - Zcash 1.1.1 RPC

+

getwalletinfo - Zcash 2.0.0 RPC

getwalletinfo
 Returns an object containing various wallet state info.
@@ -61,7 +61,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/help.html b/help.html index 447b6bb..491619d 100644 --- a/help.html +++ b/help.html @@ -3,10 +3,10 @@ - + - help - Zcash 1.1.1 RPC Docs + help - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

help - Zcash 1.1.1 RPC

+

help - Zcash 2.0.0 RPC

help ( "command" )
 
@@ -51,7 +51,7 @@ Result:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/importaddress.html b/importaddress.html index 8e33145..2ba131e 100644 --- a/importaddress.html +++ b/importaddress.html @@ -3,10 +3,10 @@ - + - importaddress - Zcash 1.1.1 RPC Docs + importaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

importaddress - Zcash 1.1.1 RPC

+

importaddress - Zcash 2.0.0 RPC

importaddress "address" ( "label" rescan )
 
@@ -63,7 +63,7 @@ As a JSON-RPC call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/importprivkey.html b/importprivkey.html index 339c631..e1b13f7 100644 --- a/importprivkey.html +++ b/importprivkey.html @@ -3,10 +3,10 @@ - + - importprivkey - Zcash 1.1.1 RPC Docs + importprivkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

importprivkey - Zcash 1.1.1 RPC

+

importprivkey - Zcash 2.0.0 RPC

importprivkey "zcashprivkey" ( "label" rescan )
 
@@ -66,7 +66,7 @@ As a JSON-RPC call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/importwallet.html b/importwallet.html index f630afc..8d9ce39 100644 --- a/importwallet.html +++ b/importwallet.html @@ -3,10 +3,10 @@ - + - importwallet - Zcash 1.1.1 RPC Docs + importwallet - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

importwallet - Zcash 1.1.1 RPC

+

importwallet - Zcash 2.0.0 RPC

importwallet "filename"
 
@@ -59,7 +59,7 @@ Import using the json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/index.html b/index.html index 31b1301..885861c 100644 --- a/index.html +++ b/index.html @@ -3,10 +3,10 @@ - + - Zcash 1.1.1 RPC Docs + Zcash 2.0.0 RPC Docs @@ -25,20 +25,20 @@
-

Zcash 1.1.1 RPC

+

Zcash 2.0.0 RPC

Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)

- Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have. + Note it uses a mainnet node

diff --git a/keypoolrefill.html b/keypoolrefill.html index 7be632d..1f33b56 100644 --- a/keypoolrefill.html +++ b/keypoolrefill.html @@ -3,10 +3,10 @@ - + - keypoolrefill - Zcash 1.1.1 RPC Docs + keypoolrefill - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

keypoolrefill - Zcash 1.1.1 RPC

+

keypoolrefill - Zcash 2.0.0 RPC

keypoolrefill ( newsize )
 
@@ -52,7 +52,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listaccounts.html b/listaccounts.html index 48ffa54..7d51ae6 100644 --- a/listaccounts.html +++ b/listaccounts.html @@ -3,10 +3,10 @@ - + - listaccounts - Zcash 1.1.1 RPC Docs + listaccounts - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listaccounts - Zcash 1.1.1 RPC

+

listaccounts - Zcash 2.0.0 RPC

listaccounts ( minconf includeWatchonly)
 
@@ -69,7 +69,7 @@ As json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listaddressgroupings.html b/listaddressgroupings.html index 21056a0..5fe1768 100644 --- a/listaddressgroupings.html +++ b/listaddressgroupings.html @@ -3,10 +3,10 @@ - + - listaddressgroupings - Zcash 1.1.1 RPC Docs + listaddressgroupings - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listaddressgroupings - Zcash 1.1.1 RPC

+

listaddressgroupings - Zcash 2.0.0 RPC

listaddressgroupings
 
@@ -64,7 +64,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listbanned.html b/listbanned.html index d3b98c7..cbcc26a 100644 --- a/listbanned.html +++ b/listbanned.html @@ -3,10 +3,10 @@ - + - listbanned - Zcash 1.1.1 RPC Docs + listbanned - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listbanned - Zcash 1.1.1 RPC

+

listbanned - Zcash 2.0.0 RPC

listbanned
 
@@ -49,7 +49,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listlockunspent.html b/listlockunspent.html index e2bd38c..6f62f5f 100644 --- a/listlockunspent.html +++ b/listlockunspent.html @@ -3,10 +3,10 @@ - + - listlockunspent - Zcash 1.1.1 RPC Docs + listlockunspent - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listlockunspent - Zcash 1.1.1 RPC

+

listlockunspent - Zcash 2.0.0 RPC

listlockunspent
 
@@ -72,7 +72,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listreceivedbyaccount.html b/listreceivedbyaccount.html index db8e7e4..4ea230f 100644 --- a/listreceivedbyaccount.html +++ b/listreceivedbyaccount.html @@ -3,10 +3,10 @@ - + - listreceivedbyaccount - Zcash 1.1.1 RPC Docs + listreceivedbyaccount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listreceivedbyaccount - Zcash 1.1.1 RPC

+

listreceivedbyaccount - Zcash 2.0.0 RPC

listreceivedbyaccount ( minconf includeempty includeWatchonly)
 
@@ -66,7 +66,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listreceivedbyaddress.html b/listreceivedbyaddress.html index 66d6b6c..c73c503 100644 --- a/listreceivedbyaddress.html +++ b/listreceivedbyaddress.html @@ -3,10 +3,10 @@ - + - listreceivedbyaddress - Zcash 1.1.1 RPC Docs + listreceivedbyaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listreceivedbyaddress - Zcash 1.1.1 RPC

+

listreceivedbyaddress - Zcash 2.0.0 RPC

listreceivedbyaddress ( minconf includeempty includeWatchonly)
 
@@ -67,7 +67,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listsinceblock.html b/listsinceblock.html index 596131c..1542742 100644 --- a/listsinceblock.html +++ b/listsinceblock.html @@ -3,10 +3,10 @@ - + - listsinceblock - Zcash 1.1.1 RPC Docs + listsinceblock - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listsinceblock - Zcash 1.1.1 RPC

+

listsinceblock - Zcash 2.0.0 RPC

listsinceblock ( "blockhash" target-confirmations includeWatchonly)
 
@@ -77,7 +77,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listtransactions.html b/listtransactions.html index 407fbcc..24ebd65 100644 --- a/listtransactions.html +++ b/listtransactions.html @@ -3,10 +3,10 @@ - + - listtransactions - Zcash 1.1.1 RPC Docs + listtransactions - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listtransactions - Zcash 1.1.1 RPC

+

listtransactions - Zcash 2.0.0 RPC

listtransactions ( "account" count from includeWatchonly)
 
@@ -97,7 +97,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/listunspent.html b/listunspent.html index 62c3dc3..c9baa41 100644 --- a/listunspent.html +++ b/listunspent.html @@ -3,10 +3,10 @@ - + - listunspent - Zcash 1.1.1 RPC Docs + listunspent - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

listunspent - Zcash 1.1.1 RPC

+

listunspent - Zcash 2.0.0 RPC

listunspent ( minconf maxconf  ["address",...] )
 
@@ -80,7 +80,7 @@ Examples
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/lockunspent.html b/lockunspent.html index 35f1acc..2057a18 100644 --- a/lockunspent.html +++ b/lockunspent.html @@ -3,10 +3,10 @@ - + - lockunspent - Zcash 1.1.1 RPC Docs + lockunspent - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

lockunspent - Zcash 1.1.1 RPC

+

lockunspent - Zcash 2.0.0 RPC

lockunspent unlock [{"txid":"txid","vout":n},...]
 
@@ -81,7 +81,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/move.html b/move.html index cce3996..6bf480f 100644 --- a/move.html +++ b/move.html @@ -3,10 +3,10 @@ - + - move - Zcash 1.1.1 RPC Docs + move - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

move - Zcash 1.1.1 RPC

+

move - Zcash 2.0.0 RPC

move "fromaccount" "toaccount" amount ( minconf "comment" )
 
@@ -66,7 +66,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/ping.html b/ping.html index fcce6b3..fadaf84 100644 --- a/ping.html +++ b/ping.html @@ -3,10 +3,10 @@ - + - ping - Zcash 1.1.1 RPC Docs + ping - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

ping - Zcash 1.1.1 RPC

+

ping - Zcash 2.0.0 RPC

ping
 
@@ -51,7 +51,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/prioritisetransaction.html b/prioritisetransaction.html index c239810..82b8e9e 100644 --- a/prioritisetransaction.html +++ b/prioritisetransaction.html @@ -3,10 +3,10 @@ - + - prioritisetransaction - Zcash 1.1.1 RPC Docs + prioritisetransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

prioritisetransaction - Zcash 1.1.1 RPC

+

prioritisetransaction - Zcash 2.0.0 RPC

prioritisetransaction <txid> <priority delta> <fee delta>
 Accepts the transaction into mined blocks at a higher (or lower) priority
@@ -60,7 +60,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/script/.bitcoin.go.swp b/script/.bitcoin.go.swp deleted file mode 100644 index de0ffd4..0000000 Binary files a/script/.bitcoin.go.swp and /dev/null differ diff --git a/script/.template.html.swp b/script/.template.html.swp deleted file mode 100644 index 1eb1b29..0000000 Binary files a/script/.template.html.swp and /dev/null differ diff --git a/sendfrom.html b/sendfrom.html index 91ecbb2..04f31ee 100644 --- a/sendfrom.html +++ b/sendfrom.html @@ -3,10 +3,10 @@ - + - sendfrom - Zcash 1.1.1 RPC Docs + sendfrom - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

sendfrom - Zcash 1.1.1 RPC

+

sendfrom - Zcash 2.0.0 RPC

sendfrom "fromaccount" "tozcashaddress" amount ( minconf "comment" "comment-to" )
 
@@ -71,7 +71,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/sendmany.html b/sendmany.html index cccaa0f..70a3f9b 100644 --- a/sendmany.html +++ b/sendmany.html @@ -3,10 +3,10 @@ - + - sendmany - Zcash 1.1.1 RPC Docs + sendmany - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

sendmany - Zcash 1.1.1 RPC

+

sendmany - Zcash 2.0.0 RPC

sendmany "fromaccount" {"address":amount,...} ( minconf "comment" ["address",...] )
 
@@ -81,7 +81,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/sendrawtransaction.html b/sendrawtransaction.html index 34f7cf1..69040b8 100644 --- a/sendrawtransaction.html +++ b/sendrawtransaction.html @@ -3,10 +3,10 @@ - + - sendrawtransaction - Zcash 1.1.1 RPC Docs + sendrawtransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

sendrawtransaction - Zcash 1.1.1 RPC

+

sendrawtransaction - Zcash 2.0.0 RPC

sendrawtransaction "hexstring" ( allowhighfees )
 
@@ -67,7 +67,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/sendtoaddress.html b/sendtoaddress.html index 26c0df8..5bb43b7 100644 --- a/sendtoaddress.html +++ b/sendtoaddress.html @@ -3,10 +3,10 @@ - + - sendtoaddress - Zcash 1.1.1 RPC Docs + sendtoaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

sendtoaddress - Zcash 1.1.1 RPC

+

sendtoaddress - Zcash 2.0.0 RPC

sendtoaddress "zcashaddress" amount ( "comment" "comment-to" subtractfeefromamount )
 
@@ -65,7 +65,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/setaccount.html b/setaccount.html index e0b4d5a..43e53a6 100644 --- a/setaccount.html +++ b/setaccount.html @@ -3,10 +3,10 @@ - + - setaccount - Zcash 1.1.1 RPC Docs + setaccount - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

setaccount - Zcash 1.1.1 RPC

+

setaccount - Zcash 2.0.0 RPC

setaccount "zcashaddress" "account"
 
@@ -53,7 +53,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/setban.html b/setban.html index 0c8085a..b1762c7 100644 --- a/setban.html +++ b/setban.html @@ -3,10 +3,10 @@ - + - setban - Zcash 1.1.1 RPC Docs + setban - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

setban - Zcash 1.1.1 RPC

+

setban - Zcash 2.0.0 RPC

setban "ip(/netmask)" "add|remove" (bantime) (absolute)
 
@@ -56,7 +56,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/setgenerate.html b/setgenerate.html index d63d2c6..074dc9a 100644 --- a/setgenerate.html +++ b/setgenerate.html @@ -3,10 +3,10 @@ - + - setgenerate - Zcash 1.1.1 RPC Docs + setgenerate - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

setgenerate - Zcash 1.1.1 RPC

+

setgenerate - Zcash 2.0.0 RPC

setgenerate generate ( genproclimit )
 
@@ -65,7 +65,7 @@ Using json rpc
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/settxfee.html b/settxfee.html index b4f8633..2514b9a 100644 --- a/settxfee.html +++ b/settxfee.html @@ -3,10 +3,10 @@ - + - settxfee - Zcash 1.1.1 RPC Docs + settxfee - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

settxfee - Zcash 1.1.1 RPC

+

settxfee - Zcash 2.0.0 RPC

settxfee amount
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/signmessage.html b/signmessage.html index 0b5649c..408764c 100644 --- a/signmessage.html +++ b/signmessage.html @@ -3,10 +3,10 @@ - + - signmessage - Zcash 1.1.1 RPC Docs + signmessage - Zcash 2.0.0 RPC Docs @@ -25,21 +25,21 @@
-

signmessage - Zcash 1.1.1 RPC

+

signmessage - Zcash 2.0.0 RPC

- 
signmessage "zcashaddress" "message"
+            
signmessage "t-addr" "message"
 
-Sign a message with the private key of an address
+Sign a message with the private key of a t-addr
 
 Arguments:
-1. "zcashaddress"  (string, required) The Zcash address to use for the private key.
+1. "t-addr"  (string, required) The transparent address to use for the private key.
 2. "message"         (string, required) The message to create a signature of.
 
 Result:
@@ -66,7 +66,7 @@ As json rpc
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/signrawtransaction.html b/signrawtransaction.html index 80e2e87..e06e48a 100644 --- a/signrawtransaction.html +++ b/signrawtransaction.html @@ -3,10 +3,10 @@ - + - signrawtransaction - Zcash 1.1.1 RPC Docs + signrawtransaction - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

signrawtransaction - Zcash 1.1.1 RPC

+

signrawtransaction - Zcash 2.0.0 RPC

signrawtransaction "hexstring" ( [{"txid":"id","vout":n,"scriptPubKey":"hex","redeemScript":"hex"},...] ["privatekey1",...] sighashtype )
 
@@ -96,7 +96,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/stop.html b/stop.html index 555115e..4698b8f 100644 --- a/stop.html +++ b/stop.html @@ -3,10 +3,10 @@ - + - stop - Zcash 1.1.1 RPC Docs + stop - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

stop - Zcash 1.1.1 RPC

+

stop - Zcash 2.0.0 RPC

stop
 
@@ -44,7 +44,7 @@ Stop Zcash server.
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/submitblock.html b/submitblock.html index 6f197de..f715eb4 100644 --- a/submitblock.html +++ b/submitblock.html @@ -3,10 +3,10 @@ - + - submitblock - Zcash 1.1.1 RPC Docs + submitblock - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

submitblock - Zcash 1.1.1 RPC

+

submitblock - Zcash 2.0.0 RPC

submitblock "hexdata" ( "jsonparametersobject" )
 
@@ -66,7 +66,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/validateaddress.html b/validateaddress.html index 57fb805..7891a31 100644 --- a/validateaddress.html +++ b/validateaddress.html @@ -3,10 +3,10 @@ - + - validateaddress - Zcash 1.1.1 RPC Docs + validateaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

validateaddress - Zcash 1.1.1 RPC

+

validateaddress - Zcash 2.0.0 RPC

validateaddress "zcashaddress"
 
@@ -64,7 +64,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/verifychain.html b/verifychain.html index b9db60a..e5d18ad 100644 --- a/verifychain.html +++ b/verifychain.html @@ -3,10 +3,10 @@ - + - verifychain - Zcash 1.1.1 RPC Docs + verifychain - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

verifychain - Zcash 1.1.1 RPC

+

verifychain - Zcash 2.0.0 RPC

verifychain ( checklevel numblocks )
 
@@ -56,7 +56,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/verifymessage.html b/verifymessage.html index 1b6d4df..ea9ca8e 100644 --- a/verifymessage.html +++ b/verifymessage.html @@ -3,10 +3,10 @@ - + - verifymessage - Zcash 1.1.1 RPC Docs + verifymessage - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

verifymessage - Zcash 1.1.1 RPC

+

verifymessage - Zcash 2.0.0 RPC

verifymessage "zcashaddress" "signature" "message"
 
@@ -67,7 +67,7 @@ As json rpc
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/verifytxoutproof.html b/verifytxoutproof.html index 119749f..52a255b 100644 --- a/verifytxoutproof.html +++ b/verifytxoutproof.html @@ -3,10 +3,10 @@ - + - verifytxoutproof - Zcash 1.1.1 RPC Docs + verifytxoutproof - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

verifytxoutproof - Zcash 1.1.1 RPC

+

verifytxoutproof - Zcash 2.0.0 RPC

verifytxoutproof "proof"
 
@@ -52,7 +52,7 @@ Result:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_exportkey.html b/z_exportkey.html index 5927979..0b86617 100644 --- a/z_exportkey.html +++ b/z_exportkey.html @@ -3,10 +3,10 @@ - + - z_exportkey - Zcash 1.1.1 RPC Docs + z_exportkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_exportkey - Zcash 1.1.1 RPC

+

z_exportkey - Zcash 2.0.0 RPC

z_exportkey "zaddr"
 
@@ -57,7 +57,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_exportviewingkey.html b/z_exportviewingkey.html index 6fcc0cb..2cf6854 100644 --- a/z_exportviewingkey.html +++ b/z_exportviewingkey.html @@ -3,10 +3,10 @@ - + - z_exportviewingkey - Zcash 1.1.1 RPC Docs + z_exportviewingkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_exportviewingkey - Zcash 1.1.1 RPC

+

z_exportviewingkey - Zcash 2.0.0 RPC

z_exportviewingkey "zaddr"
 
@@ -56,7 +56,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_exportwallet.html b/z_exportwallet.html index b7a5ead..233262b 100644 --- a/z_exportwallet.html +++ b/z_exportwallet.html @@ -3,10 +3,10 @@ - + - z_exportwallet - Zcash 1.1.1 RPC Docs + z_exportwallet - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_exportwallet - Zcash 1.1.1 RPC

+

z_exportwallet - Zcash 2.0.0 RPC

z_exportwallet "filename"
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_getbalance.html b/z_getbalance.html index 74e25dd..31682f4 100644 --- a/z_getbalance.html +++ b/z_getbalance.html @@ -3,10 +3,10 @@ - + - z_getbalance - Zcash 1.1.1 RPC Docs + z_getbalance - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_getbalance - Zcash 1.1.1 RPC

+

z_getbalance - Zcash 2.0.0 RPC

z_getbalance "address" ( minconf )
 
@@ -66,7 +66,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_getnewaddress.html b/z_getnewaddress.html index e53aaf0..b485ffd 100644 --- a/z_getnewaddress.html +++ b/z_getnewaddress.html @@ -3,10 +3,10 @@ - + - z_getnewaddress - Zcash 1.1.1 RPC Docs + z_getnewaddress - Zcash 2.0.0 RPC Docs @@ -25,26 +25,30 @@
-

z_getnewaddress - Zcash 1.1.1 RPC

+

z_getnewaddress - Zcash 2.0.0 RPC

- 
z_getnewaddress
+            
z_getnewaddress ( type )
 
-Returns a new zaddr for receiving payments.
+Returns a new shielded address for receiving payments.
+
+With no arguments, returns a Sprout address.
 
 Arguments:
+1. "type"         (string, optional, default="sprout") The type of address. One of ["sprout", "sapling"].
 
 Result:
-"zcashaddress"    (string) The new zaddr
+"zcashaddress"    (string) The new shielded address.
 
 Examples:
 > zcash-cli z_getnewaddress 
+> zcash-cli z_getnewaddress sapling
 > curl --user myusername --data-binary '{"jsonrpc": "1.0", "id":"curltest", "method": "z_getnewaddress", "params": [] }' -H 'content-type: text/plain;' http://127.0.0.1:8232/
 
 

@@ -54,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_getoperationresult.html b/z_getoperationresult.html index f97db8a..86495f8 100644 --- a/z_getoperationresult.html +++ b/z_getoperationresult.html @@ -3,10 +3,10 @@ - + - z_getoperationresult - Zcash 1.1.1 RPC Docs + z_getoperationresult - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_getoperationresult - Zcash 1.1.1 RPC

+

z_getoperationresult - Zcash 2.0.0 RPC

z_getoperationresult (["operationid", ... ]) 
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_getoperationstatus.html b/z_getoperationstatus.html index 004ce1b..24fb6a9 100644 --- a/z_getoperationstatus.html +++ b/z_getoperationstatus.html @@ -3,10 +3,10 @@ - + - z_getoperationstatus - Zcash 1.1.1 RPC Docs + z_getoperationstatus - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_getoperationstatus - Zcash 1.1.1 RPC

+

z_getoperationstatus - Zcash 2.0.0 RPC

z_getoperationstatus (["operationid", ... ]) 
 
@@ -55,7 +55,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_getpaymentdisclosure.html b/z_getpaymentdisclosure.html index e5ffcc3..d2e57f2 100644 --- a/z_getpaymentdisclosure.html +++ b/z_getpaymentdisclosure.html @@ -3,10 +3,10 @@ - + - z_getpaymentdisclosure - Zcash 1.1.1 RPC Docs + z_getpaymentdisclosure - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_getpaymentdisclosure - Zcash 1.1.1 RPC

+

z_getpaymentdisclosure - Zcash 2.0.0 RPC

z_getpaymentdisclosure "txid" "js_index" "output_index" ("message") 
 
@@ -40,7 +40,13 @@ Generate a payment disclosure for a given joinsplit output.
 
 EXPERIMENTAL FEATURE
 
-WARNING: Payment disclosure is currently DISABLED. This call always fails.
+WARNING: z_getpaymentdisclosure is disabled.
+To enable it, restart zcashd with the -experimentalfeatures and
+-paymentdisclosure commandline options, or add these two lines
+to the zcash.conf file:
+
+experimentalfeatures=1
+paymentdisclosure=1
 
 Arguments:
 1. "txid"            (string, required) 
@@ -62,7 +68,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_gettotalbalance.html b/z_gettotalbalance.html index 5496e12..c5f143f 100644 --- a/z_gettotalbalance.html +++ b/z_gettotalbalance.html @@ -3,10 +3,10 @@ - + - z_gettotalbalance - Zcash 1.1.1 RPC Docs + z_gettotalbalance - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_gettotalbalance - Zcash 1.1.1 RPC

+

z_gettotalbalance - Zcash 2.0.0 RPC

z_gettotalbalance ( minconf includeWatchonly )
 
@@ -70,7 +70,7 @@ As a json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_importkey.html b/z_importkey.html index 4777cb5..68550ac 100644 --- a/z_importkey.html +++ b/z_importkey.html @@ -3,10 +3,10 @@ - + - z_importkey - Zcash 1.1.1 RPC Docs + z_importkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_importkey - Zcash 1.1.1 RPC

+

z_importkey - Zcash 2.0.0 RPC

z_importkey "zkey" ( rescan startHeight )
 
@@ -69,7 +69,7 @@ As a JSON-RPC call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_importviewingkey.html b/z_importviewingkey.html index 3c13d01..19e9a33 100644 --- a/z_importviewingkey.html +++ b/z_importviewingkey.html @@ -3,10 +3,10 @@ - + - z_importviewingkey - Zcash 1.1.1 RPC Docs + z_importviewingkey - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_importviewingkey - Zcash 1.1.1 RPC

+

z_importviewingkey - Zcash 2.0.0 RPC

z_importviewingkey "vkey" ( rescan startHeight )
 
@@ -69,7 +69,7 @@ As a JSON-RPC call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_importwallet.html b/z_importwallet.html index 5ed67f1..74b67cd 100644 --- a/z_importwallet.html +++ b/z_importwallet.html @@ -3,10 +3,10 @@ - + - z_importwallet - Zcash 1.1.1 RPC Docs + z_importwallet - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_importwallet - Zcash 1.1.1 RPC

+

z_importwallet - Zcash 2.0.0 RPC

z_importwallet "filename"
 
@@ -59,7 +59,7 @@ Import using the json rpc call
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_listaddresses.html b/z_listaddresses.html index ad3c2c5..bcb1e97 100644 --- a/z_listaddresses.html +++ b/z_listaddresses.html @@ -3,10 +3,10 @@ - + - z_listaddresses - Zcash 1.1.1 RPC Docs + z_listaddresses - Zcash 2.0.0 RPC Docs @@ -25,18 +25,18 @@
-

z_listaddresses - Zcash 1.1.1 RPC

+

z_listaddresses - Zcash 2.0.0 RPC

z_listaddresses ( includeWatchonly )
 
-Returns the list of zaddr belonging to the wallet.
+Returns the list of Sprout and Sapling shielded addresses belonging to the wallet.
 
 Arguments:
 1. includeWatchonly (bool, optional, default=false) Also include watchonly addresses (see 'z_importviewingkey')
@@ -58,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_listoperationids.html b/z_listoperationids.html index 8e12da6..8cd986c 100644 --- a/z_listoperationids.html +++ b/z_listoperationids.html @@ -3,10 +3,10 @@ - + - z_listoperationids - Zcash 1.1.1 RPC Docs + z_listoperationids - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_listoperationids - Zcash 1.1.1 RPC

+

z_listoperationids - Zcash 2.0.0 RPC

z_listoperationids
 
@@ -58,7 +58,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_listreceivedbyaddress.html b/z_listreceivedbyaddress.html index 85b0a72..a441899 100644 --- a/z_listreceivedbyaddress.html +++ b/z_listreceivedbyaddress.html @@ -3,10 +3,10 @@ - + - z_listreceivedbyaddress - Zcash 1.1.1 RPC Docs + z_listreceivedbyaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_listreceivedbyaddress - Zcash 1.1.1 RPC

+

z_listreceivedbyaddress - Zcash 2.0.0 RPC

z_listreceivedbyaddress "address" ( minconf )
 
@@ -44,9 +44,10 @@ Arguments:
 
 Result:
 {
-  "txid": xxxxx,     (string) the transaction id
-  "amount": xxxxx,   (numeric) the amount of value in the note
-  "memo": xxxxx,     (string) hexademical string representation of memo field
+  "txid": xxxxx,           (string) the transaction id
+  "amount": xxxxx,         (numeric) the amount of value in the note
+  "memo": xxxxx,           (string) hexademical string representation of memo field
+  "change": true|false,    (boolean) true if the address that received the note is also one of the sending addresses
 }
 
 Examples:
@@ -60,7 +61,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_listunspent.html b/z_listunspent.html index 04382fd..5c60e72 100644 --- a/z_listunspent.html +++ b/z_listunspent.html @@ -3,10 +3,10 @@ - + - z_listunspent - Zcash 1.1.1 RPC Docs + z_listunspent - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_listunspent - Zcash 1.1.1 RPC

+

z_listunspent - Zcash 2.0.0 RPC

z_listunspent ( minconf maxconf includeWatchonly ["zaddr",...] )
 
@@ -63,6 +63,7 @@ Result
     "address" : "address",    (string) the shielded address
     "amount": xxxxx,          (numeric) the amount of value in the note
     "memo": xxxxx,            (string) hexademical string representation of memo field
+    "change": true|false,     (boolean) true if the address that received the note is also one of the sending addresses
   }
   ,...
 ]
@@ -79,7 +80,7 @@ Examples
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_mergetoaddress.html b/z_mergetoaddress.html index 305902e..61d2e9c 100644 --- a/z_mergetoaddress.html +++ b/z_mergetoaddress.html @@ -3,10 +3,10 @@ - + - z_mergetoaddress - Zcash 1.1.1 RPC Docs + z_mergetoaddress - Zcash 2.0.0 RPC Docs @@ -25,18 +25,24 @@
-

z_mergetoaddress - Zcash 1.1.1 RPC

+

z_mergetoaddress - Zcash 2.0.0 RPC

z_mergetoaddress ["fromaddress", ... ] "toaddress" ( fee ) ( transparent_limit ) ( shielded_limit ) ( memo )
 
-WARNING: z_mergetoaddress is DISABLED but can be enabled as an experimental feature.
+WARNING: z_mergetoaddress is disabled.
+To enable it, restart zcashd with the -experimentalfeatures and
+-zmergetoaddress commandline options, or add these two lines
+to the zcash.conf file:
+
+experimentalfeatures=1
+zmergetoaddress=1
 
 Merge multiple UTXOs and notes into a single UTXO or note.  Coinbase UTXOs are ignored; use `z_shieldcoinbase`
 to combine those into a single note.
@@ -46,7 +52,8 @@ are unlocked.  The RPC call `listlockunspent` can be used to return a list of lo
 
 The number of UTXOs and notes selected for merging can be limited by the caller.  If the transparent limit
 parameter is set to zero, and Overwinter is not yet active, the -mempooltxinputlimit option will determine the
-number of UTXOs.  Any limit is constrained by the consensus rule defining a maximum transaction size of 100000 bytes before Sapling, and 2000000 bytes once Sapling activates.
+number of UTXOs.  Any limit is constrained by the consensus rule defining a maximum transaction size of
+100000 bytes before Sapling, and 2000000 bytes once Sapling activates.
 
 Arguments:
 1. fromaddresses         (string, required) A JSON array with addresses.
@@ -89,7 +96,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_sendmany.html b/z_sendmany.html index 8fe6592..1f69277 100644 --- a/z_sendmany.html +++ b/z_sendmany.html @@ -3,10 +3,10 @@ - + - z_sendmany - Zcash 1.1.1 RPC Docs + z_sendmany - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_sendmany - Zcash 1.1.1 RPC

+

z_sendmany - Zcash 2.0.0 RPC

z_sendmany "fromaddress" [{"address":... ,"amount":...},...] ( minconf ) ( fee )
 
@@ -67,7 +67,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_shieldcoinbase.html b/z_shieldcoinbase.html index aeeb4fd..0b67579 100644 --- a/z_shieldcoinbase.html +++ b/z_shieldcoinbase.html @@ -3,10 +3,10 @@ - + - z_shieldcoinbase - Zcash 1.1.1 RPC Docs + z_shieldcoinbase - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_shieldcoinbase - Zcash 1.1.1 RPC

+

z_shieldcoinbase - Zcash 2.0.0 RPC

z_shieldcoinbase "fromaddress" "tozaddress" ( fee ) ( limit )
 
@@ -69,7 +69,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_validateaddress.html b/z_validateaddress.html index d11ed2c..1e9941b 100644 --- a/z_validateaddress.html +++ b/z_validateaddress.html @@ -3,10 +3,10 @@ - + - z_validateaddress - Zcash 1.1.1 RPC Docs + z_validateaddress - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_validateaddress - Zcash 1.1.1 RPC

+

z_validateaddress - Zcash 2.0.0 RPC

z_validateaddress "zaddr"
 
@@ -45,9 +45,12 @@ Result:
 {
   "isvalid" : true|false,      (boolean) If the address is valid or not. If not, this is the only property returned.
   "address" : "zaddr",         (string) The z address validated
+  "type" : "xxxx",             (string) "sprout" or "sapling"
   "ismine" : true|false,       (boolean) If the address is yours or not
-  "payingkey" : "hex",         (string) The hex value of the paying key, a_pk
-  "transmissionkey" : "hex",   (string) The hex value of the transmission key, pk_enc
+  "payingkey" : "hex",         (string) [sprout] The hex value of the paying key, a_pk
+  "transmissionkey" : "hex",   (string) [sprout] The hex value of the transmission key, pk_enc
+  "diversifier" : "hex",       (string) [sapling] The hex value of the diversifier, d
+  "diversifiedtransmissionkey" : "hex", (string) [sapling] The hex value of pk_d
 }
 
 Examples:
@@ -61,7 +64,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/z_validatepaymentdisclosure.html b/z_validatepaymentdisclosure.html index d12f571..7f51200 100644 --- a/z_validatepaymentdisclosure.html +++ b/z_validatepaymentdisclosure.html @@ -3,10 +3,10 @@ - + - z_validatepaymentdisclosure - Zcash 1.1.1 RPC Docs + z_validatepaymentdisclosure - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

z_validatepaymentdisclosure - Zcash 1.1.1 RPC

+

z_validatepaymentdisclosure - Zcash 2.0.0 RPC

z_validatepaymentdisclosure "paymentdisclosure"
 
@@ -40,7 +40,13 @@ Validates a payment disclosure.
 
 EXPERIMENTAL FEATURE
 
-WARNING: Payment disclosure is curretly DISABLED. This call always fails.
+WARNING: z_validatepaymentdisclosure is disabled.
+To enable it, restart zcashd with the -experimentalfeatures and
+-paymentdisclosure commandline options, or add these two lines
+to the zcash.conf file:
+
+experimentalfeatures=1
+paymentdisclosure=1
 
 Arguments:
 1. "paymentdisclosure"     (string, required) Hex data string, with "zpd:" prefix.
@@ -56,7 +62,7 @@ Examples:
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/zcbenchmark.html b/zcbenchmark.html index 3e33587..c418f66 100644 --- a/zcbenchmark.html +++ b/zcbenchmark.html @@ -3,10 +3,10 @@ - + - zcbenchmark - Zcash 1.1.1 RPC Docs + zcbenchmark - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

zcbenchmark - Zcash 1.1.1 RPC

+

zcbenchmark - Zcash 2.0.0 RPC

zcbenchmark benchmarktype samplecount
 
@@ -56,7 +56,7 @@ Output: [
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/zcrawjoinsplit.html b/zcrawjoinsplit.html index 9eea582..164f755 100644 --- a/zcrawjoinsplit.html +++ b/zcrawjoinsplit.html @@ -3,10 +3,10 @@ - + - zcrawjoinsplit - Zcash 1.1.1 RPC Docs + zcrawjoinsplit - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

zcrawjoinsplit - Zcash 1.1.1 RPC

+

zcrawjoinsplit - Zcash 2.0.0 RPC

zcrawjoinsplit rawtx inputs outputs vpub_old vpub_new
   inputs: a JSON object mapping {note: zcsecretkey, ...}
@@ -61,7 +61,7 @@ Output: {
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/zcrawkeygen.html b/zcrawkeygen.html index f796852..fd876a3 100644 --- a/zcrawkeygen.html +++ b/zcrawkeygen.html @@ -3,10 +3,10 @@ - + - zcrawkeygen - Zcash 1.1.1 RPC Docs + zcrawkeygen - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

zcrawkeygen - Zcash 1.1.1 RPC

+

zcrawkeygen - Zcash 2.0.0 RPC

zcrawkeygen
 
@@ -51,7 +51,7 @@ Output: {
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/zcrawreceive.html b/zcrawreceive.html index d7233fc..745308a 100644 --- a/zcrawreceive.html +++ b/zcrawreceive.html @@ -3,10 +3,10 @@ - + - zcrawreceive - Zcash 1.1.1 RPC Docs + zcrawreceive - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

zcrawreceive - Zcash 1.1.1 RPC

+

zcrawreceive - Zcash 2.0.0 RPC

zcrawreceive zcsecretkey encryptednote
 
@@ -52,7 +52,7 @@ Output: {
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node
diff --git a/zcsamplejoinsplit.html b/zcsamplejoinsplit.html index e4c5668..2c4aaca 100644 --- a/zcsamplejoinsplit.html +++ b/zcsamplejoinsplit.html @@ -3,10 +3,10 @@ - + - zcsamplejoinsplit - Zcash 1.1.1 RPC Docs + zcsamplejoinsplit - Zcash 2.0.0 RPC Docs @@ -25,14 +25,14 @@
-

zcsamplejoinsplit - Zcash 1.1.1 RPC

+

zcsamplejoinsplit - Zcash 2.0.0 RPC

zcsamplejoinsplit
 
@@ -45,7 +45,7 @@ Perform a joinsplit and return the JSDescription.
           Made by @karel_3d; license of the docs is MIT (see zcash repo), license of the scripts and webpage is also MIT ((C) 2018 Karel Bilek) (github repo)
           

           

-          Note it uses a regtest node, so it includes some additional calls that a regular node doesn't have.
+          Note it uses a mainnet node