From a24a2e1144452323f5e3ad9af2b37a9c4660981f Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 24 Jul 2016 10:05:20 -0700 Subject: [PATCH 1/2] Inform user that zcraw... rpc calls are being deprecated. --- src/wallet/rpcwallet.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ed8aec4c6..2670bcbb1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2466,7 +2466,7 @@ Value zc_raw_receive(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 2) { throw runtime_error( - "zcrawreceive zcsecretkey encryptednote\n" + "*** DEPRECATED *** zcrawreceive zcsecretkey encryptednote\n" "\n" "Decrypts encryptednote and checks if the coin commitments\n" "are in the blockchain as indicated by the \"exists\" result.\n" @@ -2547,7 +2547,7 @@ Value zc_raw_joinsplit(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 5) { throw runtime_error( - "zcrawjoinsplit rawtx inputs outputs vpub_old vpub_new\n" + "*** DEPRECATED *** zcrawjoinsplit rawtx inputs outputs vpub_old vpub_new\n" " inputs: a JSON object mapping {note: zcsecretkey, ...}\n" " outputs: a JSON object mapping {zcaddr: value, ...}\n" "\n" @@ -2732,7 +2732,7 @@ Value zc_raw_keygen(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 0) { throw runtime_error( - "zcrawkeygen\n" + "*** DEPRECATED *** zcrawkeygen\n" "\n" "Generate a zcaddr which can send and receive confidential values.\n" "\n" From eae3794152008a538537f7de67504940cb70968d Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 27 Jul 2016 21:40:26 -0700 Subject: [PATCH 2/2] Update deprecation message for zcraw api. --- src/wallet/rpcwallet.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 2670bcbb1..77ec55a34 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -2466,8 +2466,9 @@ Value zc_raw_receive(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 2) { throw runtime_error( - "*** DEPRECATED *** zcrawreceive zcsecretkey encryptednote\n" + "zcrawreceive zcsecretkey encryptednote\n" "\n" + "Scheduled for deprecation. This call will be removed in 1.0.\n" "Decrypts encryptednote and checks if the coin commitments\n" "are in the blockchain as indicated by the \"exists\" result.\n" "\n" @@ -2547,10 +2548,11 @@ Value zc_raw_joinsplit(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 5) { throw runtime_error( - "*** DEPRECATED *** zcrawjoinsplit rawtx inputs outputs vpub_old vpub_new\n" + "zcrawjoinsplit rawtx inputs outputs vpub_old vpub_new\n" " inputs: a JSON object mapping {note: zcsecretkey, ...}\n" " outputs: a JSON object mapping {zcaddr: value, ...}\n" "\n" + "Scheduled for deprecation. This call will be removed in 1.0.\n" "Splices a joinsplit into rawtx. Inputs are unilaterally confidential.\n" "Outputs are confidential between sender/receiver. The vpub_old and\n" "vpub_new values are globally public and move transparent value into\n" @@ -2732,8 +2734,9 @@ Value zc_raw_keygen(const json_spirit::Array& params, bool fHelp) if (fHelp || params.size() != 0) { throw runtime_error( - "*** DEPRECATED *** zcrawkeygen\n" + "zcrawkeygen\n" "\n" + "Scheduled for deprecation. This call will be removed in 1.0.\n" "Generate a zcaddr which can send and receive confidential values.\n" "\n" "Output: {\n"