ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve feedback for RPC wallet_claim.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-15 13:04:02 -07:00
parent 383e9c69aa
commit 329b1437b0
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/RPCServer.cpp
View File

@@ -645,10 +645,26 @@ Json::Value RPCServer::doValidatorCreate(Json::Value& params) {
// To provide an example to client writers, we do everything we expect a client to do here.
Json::Value RPCServer::doWalletClaim(Json::Value& params)
{
NewcoinAddress naTemp;
if (params.size() < 2 || params.size() > 4)
{
return "invalid params";
}
else if (naTemp.setAccountID(params[0u].asString())
|| naTemp.setAccountPublic(params[0u].asString())
|| naTemp.setAccountPrivate(params[0u].asString()))
{
// Should also not allow account id's as seeds.
return "master seed expected";
}
else if (naTemp.setAccountID(params[1u].asString())
|| naTemp.setAccountPublic(params[1u].asString())
|| naTemp.setAccountPrivate(params[1u].asString()))
{
// Should also not allow account id's as seeds.
return "regular seed expected";
}
else
{
// Trying to build:
@@ -671,7 +687,6 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate;
NewcoinAddress naUnset;
naMasterSeed.setFamilySeedGeneric(params[0u].asString());
naRegularSeed.setFamilySeedGeneric(params[1u].asString());
@@ -689,7 +704,6 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
uint160 uGeneratorID = naRegularReservedPublic.getAccountID();
std::vector<unsigned char> vucGeneratorCipher = naRegularReservedPrivate.accountPrivateEncrypt(naRegularReservedPublic, naMasterGenerator.getFamilyGenerator());
Transaction::pointer trns = Transaction::sharedClaim(
naAccountPublic, naAccountPrivate,
naAccountPublic,
@@ -697,6 +711,8 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
naRegularReservedPublic, // GeneratorID
vucGeneratorCipher);
(void) theApp->getOPs().processTransaction(trns);
Json::Value obj(Json::objectValue);
// We "echo" the seeds so they can be checked.
@@ -711,6 +727,7 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
obj["annotation"] = strAnnotation;
obj["transaction"] = trns->getSTransaction()->getJson(0);
obj["status"] = trns->getStatus();
return obj;
}