DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Add z_getinfo, a place for various shielded details that do not fit other places

Browse Source
This commit is contained in:
Duke Leto
2020-03-09 16:31:54 -04:00
parent ad4d87c653
commit 2aa376d286
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -1936,7 +1936,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
pwalletMain->GenerateNewSeed(); pwalletMain->GenerateNewSeed();
} }
//Set Sapling Consolidation //Set Sapling Consolidation
pwalletMain->fSaplingConsolidationEnabled = GetBoolArg("-consolidation", false); pwalletMain->fSaplingConsolidationEnabled = GetBoolArg("-consolidation", false);
fConsolidationTxFee = GetArg("-consolidationtxfee", DEFAULT_CONSOLIDATION_FEE); fConsolidationTxFee = GetArg("-consolidationtxfee", DEFAULT_CONSOLIDATION_FEE);
fConsolidationMapUsed = !mapMultiArgs["-consolidatesaplingaddress"].empty(); fConsolidationMapUsed = !mapMultiArgs["-consolidatesaplingaddress"].empty();

29
src/wallet/rpcwallet.cpp
View File

@@ -79,6 +79,7 @@ int32_t komodo_dpowconfs(int32_t height,int32_t numconfs);
int32_t komodo_isnotaryvout(char *coinaddr,uint32_t tiptime); // from ac_private chains only int32_t komodo_isnotaryvout(char *coinaddr,uint32_t tiptime); // from ac_private chains only
CBlockIndex *komodo_getblockindex(uint256 hash); CBlockIndex *komodo_getblockindex(uint256 hash);
extern string randomSietchZaddr(); extern string randomSietchZaddr();
extern CAmount fConsolidationTxFee;
int64_t nWalletUnlockTime; int64_t nWalletUnlockTime;
static CCriticalSection cs_nWalletUnlockTime; static CCriticalSection cs_nWalletUnlockTime;
@@ -3479,6 +3480,33 @@ UniValue z_listreceivedaddress(const UniValue& params, bool fHelp,const CPubKey&
return ret; return ret;
} }
UniValue z_getinfo(const UniValue& params, bool fHelp,const CPubKey&)
{
if (fHelp || params.size() > 0) {
throw runtime_error(
"z_getinfo\n"
"\nReturns various information about shielded operations, such as sapling consolidation details.\n"
);
}
UniValue result(UniValue::VOBJ);
result.push_back(Pair("consolidation_enabled",(bool)pwalletMain->fSaplingConsolidationEnabled ));
result.push_back(Pair("consolidationtxfee",(int)fConsolidationTxFee));
result.push_back(Pair("deletetx",(int)fTxDeleteEnabled));
result.push_back(Pair("delete_interval",(int)fDeleteInterval));
result.push_back(Pair("keeptxnum",(int)fKeepLastNTransactions));
result.push_back(Pair("keeptxfornblocks",(int)fDeleteTransactionsAfterNBlocks));
std::set<libzcash::SaplingPaymentAddress> saplingzaddrs = {};
pwalletMain->GetSaplingPaymentAddresses(saplingzaddrs);
result.push_back(Pair("num_sapling_zaddrs",(int)saplingzaddrs.size()));
std::shared_ptr<AsyncRPCQueue> q = getAsyncRPCQueue();
std::vector<AsyncRPCOperationId> ids = q->getAllOperationIds();
result.push_back(Pair("num_op_ids",(int)ids.size()));
return result;
}
UniValue z_listsentbyaddress(const UniValue& params, bool fHelp,const CPubKey&) UniValue z_listsentbyaddress(const UniValue& params, bool fHelp,const CPubKey&)
{ {
if (!EnsureWalletIsAvailable(fHelp)) if (!EnsureWalletIsAvailable(fHelp))
@@ -8326,6 +8354,7 @@ static const CRPCCommand commands[] =
{ "wallet", "z_exportwallet", &z_exportwallet, true }, { "wallet", "z_exportwallet", &z_exportwallet, true },
{ "wallet", "z_importwallet", &z_importwallet, true }, { "wallet", "z_importwallet", &z_importwallet, true },
{ "wallet", "z_viewtransaction", &z_viewtransaction, true }, { "wallet", "z_viewtransaction", &z_viewtransaction, true },
{ "wallet", "z_getinfo", &z_getinfo, true },
{ "wallet", "z_listsentbyaddress", &z_listsentbyaddress, true }, { "wallet", "z_listsentbyaddress", &z_listsentbyaddress, true },
{ "wallet", "z_listreceivedbyaddress", &z_listreceivedbyaddress, true }, { "wallet", "z_listreceivedbyaddress", &z_listreceivedbyaddress, true },
// TODO: rearrange into another category // TODO: rearrange into another category