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

Get rid of word Family from NewcoinAddress routines.

Browse Source
This commit is contained in:
Arthur Britto
2012-06-13 23:46:00 -07:00
parent 8264fc1d1a
commit 617bd47d07
6 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/RPCServer.cpp
View File

@@ -262,7 +262,7 @@ Json::Value RPCServer::getMasterGenerator(const uint256& uLedger, const NewcoinA
return RPCError(rpcFAIL_GEN_DECRPYT);
}
naMasterGenerator.setFamilyGenerator(vucMasterGenerator);
naMasterGenerator.setGenerator(vucMasterGenerator);
return Json::Value(Json::objectValue);
}
@@ -362,7 +362,7 @@ Json::Value RPCServer::accountFromString(const uint256& uLedger, NewcoinAddress&
bIndex = false;
}
// Must be a seed.
else if (!naSeed.setFamilySeedGeneric(strIdent))
else if (!naSeed.setSeedGeneric(strIdent))
{
return RPCError(rpcBAD_SEED);
}
@@ -395,7 +395,7 @@ Json::Value RPCServer::accountFromString(const uint256& uLedger, NewcoinAddress&
RPCError(rpcNO_GEN_DECRPYT);
}
naGenerator.setFamilyGenerator(vucMasterGenerator);
naGenerator.setGenerator(vucMasterGenerator);
}
bIndex = !iIndex;
@@ -413,7 +413,7 @@ Json::Value RPCServer::doAccountEmailSet(Json::Value &params)
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -617,7 +617,7 @@ Json::Value RPCServer::doAccountMessageSet(Json::Value& params) {
uint256 uLedger = mNetOps->getCurrentLedger();
NewcoinAddress naMessagePubKey;
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -668,7 +668,7 @@ Json::Value RPCServer::doAccountWalletSet(Json::Value& params) {
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -753,7 +753,7 @@ Json::Value RPCServer::doCreditSet(Json::Value& params)
uint256 uLedger = mNetOps->getCurrentLedger();
uint32 uAcceptRate = params.size() >= 6 ? boost::lexical_cast<uint32>(params[5u].asString()) : 0;
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -796,7 +796,7 @@ Json::Value RPCServer::doCreditSet(Json::Value& params)
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["seed"] = naSeed.humanSeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["dstAccountID"] = naDstAccountID.humanAccountID();
obj["limitAmount"] = saLimitAmount.getText();
@@ -897,7 +897,7 @@ Json::Value RPCServer::doNicknameSet(Json::Value& params)
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -983,7 +983,7 @@ Json::Value RPCServer::doPasswordFund(Json::Value &params)
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1032,12 +1032,12 @@ Json::Value RPCServer::doPasswordSet(Json::Value& params)
NewcoinAddress naRegularSeed;
NewcoinAddress naAccountID;
if (!naMasterSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naMasterSeed.setSeedGeneric(params[0u].asString()))
{
// Should also not allow account id's as seeds.
return RPCError(rpcBAD_SEED);
}
else if (!naRegularSeed.setFamilySeedGeneric(params[1u].asString()))
else if (!naRegularSeed.setSeedGeneric(params[1u].asString()))
{
// Should also not allow account id's as seeds.
return RPCError(rpcBAD_SEED);
@@ -1065,7 +1065,7 @@ Json::Value RPCServer::doPasswordSet(Json::Value& params)
// Hash of regular account #0 public key.
// uint160 uGeneratorID = naRegular0Public.getAccountID();
std::vector<unsigned char> vucGeneratorCipher = naRegular0Private.accountPrivateEncrypt(naRegular0Public, naMasterGenerator.getFamilyGenerator());
std::vector<unsigned char> vucGeneratorCipher = naRegular0Private.accountPrivateEncrypt(naRegular0Public, naMasterGenerator.getGenerator());
std::vector<unsigned char> vucGeneratorSig;
// Prove that we have the corresponding private key to the generator id. So, we can get the generator id.
@@ -1108,10 +1108,10 @@ Json::Value RPCServer::doPasswordSet(Json::Value& params)
Json::Value obj(Json::objectValue);
// We "echo" the seeds so they can be checked.
obj["master_seed"] = naMasterSeed.humanFamilySeed();
obj["master_key"] = naMasterSeed.humanFamilySeed1751();
obj["regular_seed"] = naRegularSeed.humanFamilySeed();
obj["regular_key"] = naRegularSeed.humanFamilySeed1751();
obj["master_seed"] = naMasterSeed.humanSeed();
obj["master_key"] = naMasterSeed.humanSeed1751();
obj["regular_seed"] = naRegularSeed.humanSeed();
obj["regular_key"] = naRegularSeed.humanSeed1751();
obj["transaction"] = trns->getSTransaction()->getJson(0);
obj["status"] = trns->getStatus();
@@ -1146,7 +1146,7 @@ Json::Value RPCServer::doSend(Json::Value& params)
if (params.size() >= 7)
sSrcCurrency = params[6u].asString();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1231,7 +1231,7 @@ Json::Value RPCServer::doSend(Json::Value& params)
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["seed"] = naSeed.humanSeed();
obj["fee"] = saFee.getText();
obj["create"] = bCreate;
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
@@ -1267,7 +1267,7 @@ Json::Value RPCServer::doTransitSet(Json::Value& params)
if (params.size() >= 8)
sTransitExpire = params[8u].asString();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1306,7 +1306,7 @@ Json::Value RPCServer::doTransitSet(Json::Value& params)
obj["transaction"] = trans->getSTransaction()->getJson(0);
obj["status"] = trans->getStatus();
obj["seed"] = naSeed.humanFamilySeed();
obj["seed"] = naSeed.humanSeed();
obj["srcAccountID"] = naSrcAccountID.humanAccountID();
obj["transitRate"] = uTransitRate;
obj["transitStart"] = uTransitStart;
@@ -1490,16 +1490,16 @@ Json::Value RPCServer::doValidationCreate(Json::Value& params) {
{
std::cerr << "Creating random validation seed." << std::endl;
naSeed.setFamilySeedRandom(); // Get a random seed.
naSeed.setSeedRandom(); // Get a random seed.
}
else if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
else if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
obj["validation_public_key"] = NewcoinAddress::createNodePublic(naSeed).humanNodePublic();
obj["validation_seed"] = naSeed.humanFamilySeed();
obj["validation_key"] = naSeed.humanFamilySeed1751();
obj["validation_seed"] = naSeed.humanSeed();
obj["validation_key"] = naSeed.humanSeed1751();
return obj;
}
@@ -1517,15 +1517,15 @@ Json::Value RPCServer::doValidationSeed(Json::Value& params) {
theConfig.VALIDATION_SEED.clear();
}
else if (!theConfig.VALIDATION_SEED.setFamilySeedGeneric(params[0u].asString()))
else if (!theConfig.VALIDATION_SEED.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
else
{
obj["validation_public_key"] = NewcoinAddress::createNodePublic(theConfig.VALIDATION_SEED).humanNodePublic();
obj["validation_seed"] = theConfig.VALIDATION_SEED.humanFamilySeed();
obj["validation_key"] = theConfig.VALIDATION_SEED.humanFamilySeed1751();
obj["validation_seed"] = theConfig.VALIDATION_SEED.humanSeed();
obj["validation_key"] = theConfig.VALIDATION_SEED.humanSeed1751();
}
return obj;
@@ -1568,7 +1568,7 @@ Json::Value RPCServer::doWalletAccounts(Json::Value& params)
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1611,7 +1611,7 @@ Json::Value RPCServer::doWalletAdd(Json::Value& params)
std::string sDstCurrency;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naRegularSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naRegularSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1619,7 +1619,7 @@ Json::Value RPCServer::doWalletAdd(Json::Value& params)
{
return RPCError(rpcSRC_ACT_MALFORMED);
}
else if (!naMasterSeed.setFamilySeedGeneric(params[2u].asString()))
else if (!naMasterSeed.setSeedGeneric(params[2u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1712,12 +1712,12 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
NewcoinAddress naMasterSeed;
NewcoinAddress naRegularSeed;
if (!naMasterSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naMasterSeed.setSeedGeneric(params[0u].asString()))
{
// Should also not allow account id's as seeds.
return RPCError(rpcBAD_SEED);
}
else if (!naRegularSeed.setFamilySeedGeneric(params[1u].asString()))
else if (!naRegularSeed.setSeedGeneric(params[1u].asString()))
{
// Should also not allow account id's as seeds.
return RPCError(rpcBAD_SEED);
@@ -1752,7 +1752,7 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
// Hash of regular account #0 public key.
uint160 uGeneratorID = naRegular0Public.getAccountID();
std::vector<unsigned char> vucGeneratorCipher = naRegular0Private.accountPrivateEncrypt(naRegular0Public, naMasterGenerator.getFamilyGenerator());
std::vector<unsigned char> vucGeneratorCipher = naRegular0Private.accountPrivateEncrypt(naRegular0Public, naMasterGenerator.getGenerator());
std::vector<unsigned char> vucGeneratorSig;
// Prove that we have the corresponding private key to the generator id. So, we can get the generator id.
@@ -1771,10 +1771,10 @@ Json::Value RPCServer::doWalletClaim(Json::Value& params)
Json::Value obj(Json::objectValue);
// We "echo" the seeds so they can be checked.
obj["master_seed"] = naMasterSeed.humanFamilySeed();
obj["master_key"] = naMasterSeed.humanFamilySeed1751();
obj["regular_seed"] = naRegularSeed.humanFamilySeed();
obj["regular_key"] = naRegularSeed.humanFamilySeed1751();
obj["master_seed"] = naMasterSeed.humanSeed();
obj["master_key"] = naMasterSeed.humanSeed1751();
obj["regular_seed"] = naRegularSeed.humanSeed();
obj["regular_key"] = naRegularSeed.humanSeed1751();
obj["account_id"] = naAccountPublic.humanAccountID();
obj["generator_id"] = strHex(uGeneratorID);
@@ -1799,7 +1799,7 @@ Json::Value RPCServer::doWalletCreate(Json::Value& params)
NewcoinAddress naSeed;
uint256 uLedger = mNetOps->getCurrentLedger();
if (!naSeed.setFamilySeedGeneric(params[0u].asString()))
if (!naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1858,15 +1858,15 @@ Json::Value RPCServer::doWalletPropose(Json::Value& params)
NewcoinAddress naSeed;
NewcoinAddress naAccount;
naSeed.setFamilySeedRandom();
naSeed.setSeedRandom();
NewcoinAddress naGenerator = NewcoinAddress::createGeneratorPublic(naSeed);
naAccount.setAccountPublic(naGenerator, 0);
Json::Value obj(Json::objectValue);
obj["master_seed"] = naSeed.humanFamilySeed();
obj["master_key"] = naSeed.humanFamilySeed1751();
obj["master_seed"] = naSeed.humanSeed();
obj["master_key"] = naSeed.humanSeed1751();
obj["account_id"] = naAccount.humanAccountID();
return obj;
@@ -1878,7 +1878,7 @@ Json::Value RPCServer::doWalletSeed(Json::Value& params)
NewcoinAddress naSeed;
if (params.size()
&& !naSeed.setFamilySeedGeneric(params[0u].asString()))
&& !naSeed.setSeedGeneric(params[0u].asString()))
{
return RPCError(rpcBAD_SEED);
}
@@ -1888,7 +1888,7 @@ Json::Value RPCServer::doWalletSeed(Json::Value& params)
if (!params.size())
{
naSeed.setFamilySeedRandom();
naSeed.setSeedRandom();
}
NewcoinAddress naGenerator = NewcoinAddress::createGeneratorPublic(naSeed);
@@ -1897,8 +1897,8 @@ Json::Value RPCServer::doWalletSeed(Json::Value& params)
Json::Value obj(Json::objectValue);
obj["seed"] = naSeed.humanFamilySeed();
obj["key"] = naSeed.humanFamilySeed1751();
obj["seed"] = naSeed.humanSeed();
obj["key"] = naSeed.humanSeed1751();
return obj;
}