diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj
index c419a2592..f5a12e385 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj
+++ b/Builds/VisualStudio2013/RippleD.vcxproj
@@ -3290,9 +3290,6 @@
-
- True
-
True
@@ -3316,11 +3313,6 @@
-
- True
-
-
-
True
diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters
index 614936eb9..b5f3dead1 100644
--- a/Builds/VisualStudio2013/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters
@@ -3846,9 +3846,6 @@
ripple\rpc\handlers
-
- ripple\rpc\handlers
-
ripple\rpc\handlers
@@ -3876,12 +3873,6 @@
ripple\rpc\impl
-
- ripple\rpc\impl
-
-
- ripple\rpc\impl
-
ripple\rpc\impl
diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp
index ac550373d..1e6063b22 100644
--- a/src/ripple/app/ledger/Ledger.cpp
+++ b/src/ripple/app/ledger/Ledger.cpp
@@ -1386,11 +1386,6 @@ SLE::pointer Ledger::getDirNode (uint256 const& uNodeIndex) const
return getASNodeI (uNodeIndex, ltDIR_NODE);
}
-SLE::pointer Ledger::getGenerator (Account const& uGeneratorID) const
-{
- return getASNodeI (getGeneratorIndex (uGeneratorID), ltGENERATOR_MAP);
-}
-
SLE::pointer
Ledger::getOffer (uint256 const& uIndex) const
{
diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h
index 42630f0b3..1b6ca47dd 100644
--- a/src/ripple/app/ledger/Ledger.h
+++ b/src/ripple/app/ledger/Ledger.h
@@ -342,12 +342,6 @@ public:
std::vector getNeededAccountStateHashes (
int max, SHAMapSyncFilter* filter) const;
- //
- // Generator Map functions
- //
-
- SLE::pointer getGenerator (Account const& uGeneratorID) const;
-
//
// Offer functions
//
diff --git a/src/ripple/app/ledger/LedgerEntrySet.cpp b/src/ripple/app/ledger/LedgerEntrySet.cpp
index 999742bc6..ba0264eeb 100644
--- a/src/ripple/app/ledger/LedgerEntrySet.cpp
+++ b/src/ripple/app/ledger/LedgerEntrySet.cpp
@@ -290,10 +290,6 @@ Json::Value LedgerEntrySet::getJson (int) const
entry[jss::type] = "dir_node";
break;
- case ltGENERATOR_MAP:
- entry[jss::type] = "generator_map";
- break;
-
case ltRIPPLE_STATE:
entry[jss::type] = "ripple_state";
break;
diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp
index 01d2189dd..8d583a3ef 100644
--- a/src/ripple/app/main/Main.cpp
+++ b/src/ripple/app/main/Main.cpp
@@ -147,9 +147,6 @@ void printHelp (const po::options_description& desc)
" unl_reset\n"
" validation_create [||]\n"
" validation_seed [||]\n"
- " wallet_accounts \n"
- " wallet_add [] []\n"
- " wallet_claim [] []\n"
" wallet_propose []\n"
" wallet_seed [||]\n";
}
diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp
index 254e361e3..5b730abf4 100644
--- a/src/ripple/app/misc/NetworkOPs.cpp
+++ b/src/ripple/app/misc/NetworkOPs.cpp
@@ -260,8 +260,6 @@ public:
std::function func) const override;
AccountState::pointer getAccountState (
Ledger::ref lrLedger, RippleAddress const& accountID);
- SLE::pointer getGenerator (
- Ledger::ref lrLedger, Account const& uGeneratorID);
//
// Directory functions
@@ -1196,15 +1194,6 @@ AccountState::pointer NetworkOPsImp::getAccountState (
return lrLedger->getAccountState (accountID);
}
-SLE::pointer NetworkOPsImp::getGenerator (
- Ledger::ref lrLedger, Account const& uGeneratorID)
-{
- if (!lrLedger)
- return SLE::pointer ();
-
- return lrLedger->getGenerator (uGeneratorID);
-}
-
//
// Directory functions
//
@@ -1295,7 +1284,6 @@ Json::Value NetworkOPsImp::getOwnerInfo (
case ltACCOUNT_ROOT:
case ltDIR_NODE:
- case ltGENERATOR_MAP:
default:
assert (false);
break;
diff --git a/src/ripple/app/misc/NetworkOPs.h b/src/ripple/app/misc/NetworkOPs.h
index d9f2c8049..8f72930d1 100644
--- a/src/ripple/app/misc/NetworkOPs.h
+++ b/src/ripple/app/misc/NetworkOPs.h
@@ -171,8 +171,6 @@ public:
std::function func) const = 0;
virtual AccountState::pointer getAccountState (Ledger::ref lrLedger,
RippleAddress const& accountID) = 0;
- virtual SLE::pointer getGenerator (Ledger::ref lrLedger,
- Account const& uGeneratorID) = 0;
//--------------------------------------------------------------------------
//
diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp
index be8362f24..78097bc75 100644
--- a/src/ripple/net/impl/RPCCall.cpp
+++ b/src/ripple/net/impl/RPCCall.cpp
@@ -721,16 +721,6 @@ private:
return jvRequest;
}
- // wallet_accounts
- Json::Value parseWalletAccounts (Json::Value const& jvParams)
- {
- Json::Value jvRequest;
-
- jvRequest[jss::seed] = jvParams[0u].asString ();
-
- return jvRequest;
- }
-
// wallet_propose []
// is only for testing. Master seeds should only be generated randomly.
Json::Value parseWalletPropose (Json::Value const& jvParams)
@@ -859,7 +849,6 @@ public:
{ "validation_create", &RPCParser::parseValidationCreate, 0, 1 },
{ "validation_seed", &RPCParser::parseValidationSeed, 0, 1 },
{ "version", &RPCParser::parseAsIs, 0, 0 },
- { "wallet_accounts", &RPCParser::parseWalletAccounts, 1, 1 },
{ "wallet_propose", &RPCParser::parseWalletPropose, 0, 1 },
{ "wallet_seed", &RPCParser::parseWalletSeed, 0, 1 },
{ "internal", &RPCParser::parseInternal, 1, -1 },
diff --git a/src/ripple/protocol/ErrorCodes.h b/src/ripple/protocol/ErrorCodes.h
index 5f1c5b5a3..bd90fa8b3 100644
--- a/src/ripple/protocol/ErrorCodes.h
+++ b/src/ripple/protocol/ErrorCodes.h
@@ -110,10 +110,8 @@ enum error_code_i
// Internal error (should never happen)
rpcINTERNAL, // Generic internal error.
- rpcFAIL_GEN_DECRYPT,
rpcNOT_IMPL,
rpcNOT_SUPPORTED,
- rpcNO_GEN_DECRYPT,
};
//------------------------------------------------------------------------------
diff --git a/src/ripple/protocol/LedgerFormats.h b/src/ripple/protocol/LedgerFormats.h
index d3398bb99..e6fd73f72 100644
--- a/src/ripple/protocol/LedgerFormats.h
+++ b/src/ripple/protocol/LedgerFormats.h
@@ -50,8 +50,6 @@ enum LedgerEntryType
*/
ltDIR_NODE = 'd',
- ltGENERATOR_MAP = 'g',
-
/** Describes a trust line.
*/
ltRIPPLE_STATE = 'r',
diff --git a/src/ripple/protocol/SField.h b/src/ripple/protocol/SField.h
index 7d3f9b7ed..b08dd4e11 100644
--- a/src/ripple/protocol/SField.h
+++ b/src/ripple/protocol/SField.h
@@ -386,7 +386,6 @@ extern TypedField const sfPublicKey;
extern SField const sfMessageKey;
extern TypedField const sfSigningPubKey;
extern SField const sfTxnSignature;
-extern SField const sfGenerator;
extern TypedField const sfSignature;
extern SField const sfDomain;
extern SField const sfFundCode;
diff --git a/src/ripple/protocol/impl/ErrorCodes.cpp b/src/ripple/protocol/impl/ErrorCodes.cpp
index 1fabb2f4c..8649a1ff5 100644
--- a/src/ripple/protocol/impl/ErrorCodes.cpp
+++ b/src/ripple/protocol/impl/ErrorCodes.cpp
@@ -64,7 +64,6 @@ public:
add (rpcDST_ACT_MISSING, "dstActMissing", "Destination account does not exist.");
add (rpcDST_AMT_MALFORMED, "dstAmtMalformed", "Destination amount/currency/issuer is malformed.");
add (rpcDST_ISR_MALFORMED, "dstIsrMalformed", "Destination issuer is malformed.");
- add (rpcFAIL_GEN_DECRYPT, "failGenDecrypt", "Failed to decrypt generator.");
add (rpcFORBIDDEN, "forbidden", "Bad credentials.");
add (rpcGENERAL, "general", "Generic error reason.");
add (rpcGETS_ACT_MALFORMED, "getsActMalformed", "Gets account malformed.");
@@ -89,7 +88,6 @@ public:
add (rpcNO_CLOSED, "noClosed", "Closed ledger is unavailable.");
add (rpcNO_CURRENT, "noCurrent", "Current ledger is unavailable.");
add (rpcNO_EVENTS, "noEvents", "Current transport does not support events.");
- add (rpcNO_GEN_DECRYPT, "noGenDecrypt", "Password failed to decrypt master public generator.");
add (rpcNO_NETWORK, "noNetwork", "Not synced to Ripple network.");
add (rpcNO_PATH, "noPath", "Unable to find a ripple path.");
add (rpcNO_PERMISSION, "noPermission", "You don't have permission for this command.");
diff --git a/src/ripple/protocol/impl/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp
index 3d121ab97..3dcd08643 100644
--- a/src/ripple/protocol/impl/LedgerFormats.cpp
+++ b/src/ripple/protocol/impl/LedgerFormats.cpp
@@ -54,10 +54,6 @@ LedgerFormats::LedgerFormats ()
<< SOElement (sfIndexPrevious, SOE_OPTIONAL)
;
- add ("GeneratorMap", ltGENERATOR_MAP)
- << SOElement (sfGenerator, SOE_REQUIRED)
- ;
-
add ("Offer", ltOFFER)
<< SOElement (sfAccount, SOE_REQUIRED)
<< SOElement (sfSequence, SOE_REQUIRED)
diff --git a/src/ripple/protocol/impl/SField.cpp b/src/ripple/protocol/impl/SField.cpp
index 2febff314..0637fb3c3 100644
--- a/src/ripple/protocol/impl/SField.cpp
+++ b/src/ripple/protocol/impl/SField.cpp
@@ -176,7 +176,6 @@ TypedField const sfSigningPubKey = make::one(&sfSigningPubKey
TypedField const sfSignature = make::one(&sfSignature, STI_VL, 6, "Signature", SField::sMD_Default, false);
SField const sfMessageKey = make::one(&sfMessageKey, STI_VL, 2, "MessageKey");
SField const sfTxnSignature = make::one(&sfTxnSignature, STI_VL, 4, "TxnSignature", SField::sMD_Default, false);
-SField const sfGenerator = make::one(&sfGenerator, STI_VL, 5, "Generator");
SField const sfDomain = make::one(&sfDomain, STI_VL, 7, "Domain");
SField const sfFundCode = make::one(&sfFundCode, STI_VL, 8, "FundCode");
SField const sfRemoveCode = make::one(&sfRemoveCode, STI_VL, 9, "RemoveCode");
diff --git a/src/ripple/rpc/handlers/AccountObjects.cpp b/src/ripple/rpc/handlers/AccountObjects.cpp
index f1bcf1816..363843325 100644
--- a/src/ripple/rpc/handlers/AccountObjects.cpp
+++ b/src/ripple/rpc/handlers/AccountObjects.cpp
@@ -161,7 +161,6 @@ Json::Value doAccountObjects (RPC::Context& context)
// case ltACCOUNT_ROOT:
// case ltDIR_NODE:
- // case ltGENERATOR_MAP:
default:
if (! jv.isNull ())
jv = Json::nullValue;
diff --git a/src/ripple/rpc/handlers/Handlers.h b/src/ripple/rpc/handlers/Handlers.h
index 2ca0a4762..f2f652d15 100644
--- a/src/ripple/rpc/handlers/Handlers.h
+++ b/src/ripple/rpc/handlers/Handlers.h
@@ -79,7 +79,6 @@ Json::Value doUnlScore (RPC::Context&);
Json::Value doUnsubscribe (RPC::Context&);
Json::Value doValidationCreate (RPC::Context&);
Json::Value doValidationSeed (RPC::Context&);
-Json::Value doWalletAccounts (RPC::Context&);
Json::Value doWalletLock (RPC::Context&);
Json::Value doWalletPropose (RPC::Context&);
Json::Value doWalletSeed (RPC::Context&);
diff --git a/src/ripple/rpc/handlers/WalletAccounts.cpp b/src/ripple/rpc/handlers/WalletAccounts.cpp
deleted file mode 100644
index 9d92eb55f..000000000
--- a/src/ripple/rpc/handlers/WalletAccounts.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012-2014 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include
-#include
-#include
-
-namespace ripple {
-
-// {
-// seed:
-// ledger_hash :
-// ledger_index :
-// }
-Json::Value doWalletAccounts (RPC::Context& context)
-{
- Ledger::pointer ledger;
- Json::Value jvResult
- = RPC::lookupLedger (context.params, ledger, context.netOps);
-
- if (!ledger)
- return jvResult;
-
- RippleAddress naSeed;
-
- if (!context.params.isMember (jss::seed)
- || !naSeed.setSeedGeneric (context.params[jss::seed].asString ()))
- {
- return rpcError (rpcBAD_SEED);
- }
-
- // Try the seed as a master seed.
- RippleAddress naMasterGenerator
- = RippleAddress::createGeneratorPublic (naSeed);
-
- Json::Value jsonAccounts
- = RPC::accounts (ledger, naMasterGenerator, context.netOps);
-
- if (jsonAccounts.empty ())
- {
- // No account via seed as master, try seed a regular.
- Json::Value ret = RPC::getMasterGenerator (
- ledger, naSeed, naMasterGenerator, context.netOps);
-
- if (!ret.empty ())
- return ret;
-
- ret[jss::accounts]
- = RPC::accounts (ledger, naMasterGenerator, context.netOps);
- return ret;
- }
- else
- {
- // Had accounts via seed as master, return them.
- return RPC::makeObjectValue (jsonAccounts, jss::accounts);
- }
-}
-
-} // ripple
diff --git a/src/ripple/rpc/impl/AccountFromString.cpp b/src/ripple/rpc/impl/AccountFromString.cpp
index ed7373f2d..cb6b09a38 100644
--- a/src/ripple/rpc/impl/AccountFromString.cpp
+++ b/src/ripple/rpc/impl/AccountFromString.cpp
@@ -60,30 +60,10 @@ Json::Value accountFromString (
// We allow the use of the seeds to access #0.
// This is poor practice and merely for debugging convenience.
- RippleAddress naRegular0Public;
- RippleAddress naRegular0Private;
auto naGenerator = RippleAddress::createGeneratorPublic (naSeed);
- naRegular0Public.setAccountPublic (naGenerator, 0);
- naRegular0Private.setAccountPrivate (naGenerator, naSeed, 0);
-
- SLE::pointer sleGen = netOps.getGenerator (
- lrLedger, naRegular0Public.getAccountID ());
-
- if (sleGen)
- {
- // Found master public key.
- Blob vucCipher = sleGen->getFieldVL (sfGenerator);
- Blob vucMasterGenerator = naRegular0Private.accountPrivateDecrypt (
- naRegular0Public, vucCipher);
-
- if (vucMasterGenerator.empty ())
- rpcError (rpcNO_GEN_DECRYPT);
-
- naGenerator.setGenerator (vucMasterGenerator);
- }
- // Otherwise, if we didn't find a generator map, assume it is a master
+ // Generator maps don't exist. Assume it is a master
// generator.
bIndex = !iIndex;
diff --git a/src/ripple/rpc/impl/GetMasterGenerator.cpp b/src/ripple/rpc/impl/GetMasterGenerator.cpp
deleted file mode 100644
index 8e2174ec7..000000000
--- a/src/ripple/rpc/impl/GetMasterGenerator.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012-2014 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#include
-#include
-
-namespace ripple {
-namespace RPC {
-
-// Look up the master public generator for a regular seed so we may index source accounts ids.
-// --> naRegularSeed
-// <-- naMasterGenerator
-Json::Value getMasterGenerator (
- Ledger::ref lrLedger, RippleAddress const& naRegularSeed,
- RippleAddress& naMasterGenerator, NetworkOPs& netOps)
-{
- RippleAddress na0Public; // To find the generator's index.
- RippleAddress na0Private; // To decrypt the master generator's cipher.
- RippleAddress naGenerator = RippleAddress::createGeneratorPublic (naRegularSeed);
-
- na0Public.setAccountPublic (naGenerator, 0);
- na0Private.setAccountPrivate (naGenerator, naRegularSeed, 0);
-
- SLE::pointer sleGen = netOps.getGenerator (lrLedger, na0Public.getAccountID ());
-
- if (!sleGen)
- {
- // No account has been claimed or has had it password set for seed.
- return rpcError (rpcNO_ACCOUNT);
- }
-
- Blob vucCipher = sleGen->getFieldVL (sfGenerator);
- Blob vucMasterGenerator = na0Private.accountPrivateDecrypt (na0Public, vucCipher);
-
- if (vucMasterGenerator.empty ())
- {
- return rpcError (rpcFAIL_GEN_DECRYPT);
- }
-
- naMasterGenerator.setGenerator (vucMasterGenerator);
-
- return Json::Value (Json::objectValue);
-}
-
-} // RPC
-} // ripple
diff --git a/src/ripple/rpc/impl/GetMasterGenerator.h b/src/ripple/rpc/impl/GetMasterGenerator.h
deleted file mode 100644
index d4e5f0587..000000000
--- a/src/ripple/rpc/impl/GetMasterGenerator.h
+++ /dev/null
@@ -1,35 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- This file is part of rippled: https://github.com/ripple/rippled
- Copyright (c) 2012-2014 Ripple Labs Inc.
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
-
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_RPC_GETMASTERGENERATOR_H_INCLUDED
-#define RIPPLE_RPC_GETMASTERGENERATOR_H_INCLUDED
-
-namespace ripple {
-namespace RPC {
-
-Json::Value getMasterGenerator (
- Ledger::ref lrLedger,
- RippleAddress const& naRegularSeed,
- RippleAddress& naMasterGenerator,
- NetworkOPs& netOps);
-
-} // RPC
-} // ripple
-
-#endif
diff --git a/src/ripple/rpc/impl/Handler.cpp b/src/ripple/rpc/impl/Handler.cpp
index bcfbc6463..9a24cbe5c 100644
--- a/src/ripple/rpc/impl/Handler.cpp
+++ b/src/ripple/rpc/impl/Handler.cpp
@@ -149,7 +149,6 @@ HandlerTable HANDLERS({
{ "unl_score", byRef (&doUnlScore), Role::ADMIN, NO_CONDITION },
{ "validation_create", byRef (&doValidationCreate), Role::ADMIN, NO_CONDITION },
{ "validation_seed", byRef (&doValidationSeed), Role::ADMIN, NO_CONDITION },
- { "wallet_accounts", byRef (&doWalletAccounts), Role::USER, NO_CONDITION },
{ "wallet_propose", byRef (&doWalletPropose), Role::ADMIN, NO_CONDITION },
{ "wallet_seed", byRef (&doWalletSeed), Role::ADMIN, NO_CONDITION },
diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp
index 2732e6840..db1030254 100644
--- a/src/ripple/unity/rpcx.cpp
+++ b/src/ripple/unity/rpcx.cpp
@@ -89,13 +89,11 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include