ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic work on RPC wallet_create.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-16 17:18:40 -07:00
parent e4d5d1c725
commit 4b1dd5dee0
1 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/RPCServer.cpp
View File

@@ -628,31 +628,57 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
} }
} }
// wallet_create paying_account account_id [initial_funds] // wallet_create regular_seed paying_account account_id [initial_funds]
Json::Value RPCServer::doWalletCreate(Json::Value& params) Json::Value RPCServer::doWalletCreate(Json::Value& params)
{ {
NewcoinAddress naSourceID; NewcoinAddress naSourceID;
NewcoinAddress naCreateID; NewcoinAddress naCreateID;
if (params.size() < 2 || params.size() > 3) if (params.size() < 3 || params.size() > 2)
{ {
return "invalid params"; return "invalid params";
} }
else if (!naSourceID.setAccountID(params[0u].asString())) else if (!naSourceID.setAccountID(params[1u].asString()))
{ {
return "source account id needed"; return "source account id needed";
} }
else if (!naCreateID.setAccountID(params[1u].asString())) else if (!naCreateID.setAccountID(params[2u].asString()))
{ {
return "create account id needed"; return "create account id needed";
} }
else else
{ {
// Trying to build: // Trying to build:
// peer_wallet_create <paying_account> <paying_signature> <account_id> [<initial_funds>] [<annotation>]
// peer_payment // peer_payment
// //
// Which has no confidential information. // Which has no confidential information.
#if 0
NewcoinAddress naRegularSeed;
NewcoinAddress naRegularGenerator;
NewcoinAddress naRegularReservedPublic;
NewcoinAddress naRegularReservedPrivate;
NewcoinAddress naRegularAccountPublic;
NewcoinAddress naRegularAccountPrivate;
naRegularSeed.setFamilySeedGeneric(params[0u].asString());
seed-> master_public_generator -> master_accounts & regular_accounts
-> regular_public_key (verified) -> regular_private_key
AccountState::pointer account=theApp->getMasterLedger().getCurrentLedger()->getAccountState(naAccount);
Transaction::pointer trans = Transaction::sharedCreate(
const NewcoinAddress& naPublicKey, const NewcoinAddress& naPrivateKey,
naSourceID,
uint32 uSeq,
uint64 uFee,
uint32 uSourceTag,
uint32 uLedger,
const NewcoinAddress& naCreateAccountID, // Account to create.
uint64 uFund); // Initial funds in XNC.
#endif
return "not implemented"; return "not implemented";
#if 0 #if 0
// XXX Need better parsing. // XXX Need better parsing.
@@ -664,16 +690,10 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
NewcoinAddress naMasterSeed; NewcoinAddress naMasterSeed;
NewcoinAddress naMasterGenerator; NewcoinAddress naMasterGenerator;
NewcoinAddress naRegularSeed;
NewcoinAddress naRegularGenerator;
NewcoinAddress naRegularReservedPublic;
NewcoinAddress naRegularReservedPrivate;
NewcoinAddress naAccountPublic; NewcoinAddress naAccountPublic;
NewcoinAddress naAccountPrivate; NewcoinAddress naAccountPrivate;
naMasterSeed.setFamilySeedGeneric(params[0u].asString()); naMasterSeed.setFamilySeedGeneric(params[0u].asString());
naRegularSeed.setFamilySeedGeneric(params[1u].asString());
naMasterGenerator.setFamilyGenerator(naMasterSeed); naMasterGenerator.setFamilyGenerator(naMasterSeed);
naAccountPublic.setAccountPublic(naMasterGenerator, 0); naAccountPublic.setAccountPublic(naMasterGenerator, 0);
@@ -923,6 +943,7 @@ Json::Value RPCServer::doCommand(const std::string& command, Json::Value& params
if (command == "validation_create") return doValidatorCreate(params); if (command == "validation_create") return doValidatorCreate(params);
if (command == "wallet_claim") return doWalletClaim(params); if (command == "wallet_claim") return doWalletClaim(params);
if (command == "wallet_create") return doWalletCreate(params);
if (command == "wallet_propose") return doWalletPropose(params); if (command == "wallet_propose") return doWalletPropose(params);
if (command == "wallet_seed") return doWalletSeed(params); if (command == "wallet_seed") return doWalletSeed(params);