diff --git a/ripple2010.sln b/ripple2010.sln
new file mode 100644
index 0000000000..36241841d9
--- /dev/null
+++ b/ripple2010.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ripple2010", "ripple2010.vcxproj", "{19465545-42EE-42FA-9CC8-F8975F8F1CC7}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.ActiveCfg = Debug|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Debug|Win32.Build.0 = Debug|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.ActiveCfg = Release|Win32
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
diff --git a/ripple2010.vcxproj b/ripple2010.vcxproj
new file mode 100644
index 0000000000..b4d6300571
--- /dev/null
+++ b/ripple2010.vcxproj
@@ -0,0 +1,309 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {19465545-42EE-42FA-9CC8-F8975F8F1CC7}
+ Win32Proj
+ newcoin
+
+
+
+ Application
+ true
+ MultiByte
+
+
+ Application
+ false
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+ false
+
+
+
+ NotUsing
+ Level3
+ Disabled
+ BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ .\src;..\OpenSSL\include;..\boost_1_47_0;..\protobuf\src\
+ ProgramDatabase
+
+
+ Console
+ true
+ ..\OpenSSL\lib\VC;..\boost_1_47_0\stage\lib;..\protobuf\vsprojects\Debug
+ ssleay32MDd.lib;libeay32MTd.lib;libprotobuf.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+ c:/code/protoc-2.4.1-win32/protoc -I=C:\code\newcoin --cpp_out=C:\code\newcoin C:\code\newcoin/newcoin.proto
+
+
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ BOOST_TEST_ALTERNATIVE_INIT_API;BOOST_TEST_NO_MAIN;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0501;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ ..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src
+
+
+ Console
+ true
+ true
+ true
+ ..\OpenSSL\lib\VC;..\boost_1_47_0\stage\lib;..\protobuf-2.4.1\vsprojects\Release
+ libprotobuf.lib;ssleay32MD.lib;libeay32MD.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .\;..\OpenSSL\include;..\boost_1_47_0;..\protobuf-2.4.1\src\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Designer
+
+
+
+
+
+ Document
+ /code/protobuf/protoc -I=..\newcoin --cpp_out=\code\newcoin\ ..\newcoin/src/cpp/ripple/ripple.proto
+ \code\newcoin\src\ripple.pb.h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ripple2010.vcxproj.filters b/ripple2010.vcxproj.filters
new file mode 100644
index 0000000000..115c673a97
--- /dev/null
+++ b/ripple2010.vcxproj.filters
@@ -0,0 +1,614 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+ {54608e0e-4ac4-44d6-af96-0c278457ac6f}
+
+
+ {c642219d-cace-47c1-828a-58ba570da63a}
+
+
+ {c717b139-5eba-454b-8888-9bf54ce0a652}
+
+
+ {77d2a621-b503-4ce4-aee8-ef0b337c4ee2}
+
+
+ {60c3631e-8855-4a61-bdd3-9892d96242d5}
+
+
+ {92775c5f-dc9f-4a97-a9a6-6d4bd4e424b4}
+
+
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\websocketpp
+
+
+ Source Files\database
+
+
+ Source Files\database
+
+
+ Source Files\database
+
+
+ Source Files\json
+
+
+ Source Files\json
+
+
+ Source Files\json
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files
+
+
+ Source Files\database
+
+
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files\util
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
+
+
+
+
+ html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/cpp/ripple/AccountState.h b/src/cpp/ripple/AccountState.h
index f2587ac501..2b02c79205 100644
--- a/src/cpp/ripple/AccountState.h
+++ b/src/cpp/ripple/AccountState.h
@@ -33,12 +33,12 @@ public:
bool bHaveAuthorizedKey()
{
- return mLedgerEntry->isFieldPresent(sfAuthorizedKey);
+ return mLedgerEntry->isFieldPresent(sfRegularKey);
}
RippleAddress getAuthorizedKey()
{
- return mLedgerEntry->getFieldAccount(sfAuthorizedKey);
+ return mLedgerEntry->getFieldAccount(sfRegularKey);
}
STAmount getBalance() const { return mLedgerEntry->getFieldAmount(sfBalance); }
diff --git a/src/cpp/ripple/LedgerFormats.cpp b/src/cpp/ripple/LedgerFormats.cpp
index b4cd7890eb..b775ff14a9 100644
--- a/src/cpp/ripple/LedgerFormats.cpp
+++ b/src/cpp/ripple/LedgerFormats.cpp
@@ -21,7 +21,7 @@ static bool LEFInit()
<< SOElement(sfBalance, SOE_REQUIRED)
<< SOElement(sfPreviousTxnID, SOE_REQUIRED)
<< SOElement(sfPreviousTxnLgrSeq, SOE_REQUIRED)
- << SOElement(sfAuthorizedKey, SOE_OPTIONAL)
+ << SOElement(sfRegularKey, SOE_OPTIONAL)
<< SOElement(sfEmailHash, SOE_OPTIONAL)
<< SOElement(sfWalletLocator, SOE_OPTIONAL)
<< SOElement(sfWalletSize, SOE_OPTIONAL)
diff --git a/src/cpp/ripple/SerializeProto.h b/src/cpp/ripple/SerializeProto.h
index 00677319a8..542451f1ae 100644
--- a/src/cpp/ripple/SerializeProto.h
+++ b/src/cpp/ripple/SerializeProto.h
@@ -116,7 +116,7 @@
FIELD(Destination, ACCOUNT, 3)
FIELD(Issuer, ACCOUNT, 4)
FIELD(Target, ACCOUNT, 7)
- FIELD(AuthorizedKey, ACCOUNT, 8)
+ FIELD(RegularKey, ACCOUNT, 8)
// path set
FIELD(Paths, PATHSET, 1)
diff --git a/src/cpp/ripple/TransactionAction.cpp b/src/cpp/ripple/TransactionAction.cpp
index 591cfc6b04..05bdc79d58 100644
--- a/src/cpp/ripple/TransactionAction.cpp
+++ b/src/cpp/ripple/TransactionAction.cpp
@@ -71,8 +71,8 @@ TER TransactionEngine::setAuthorized(const SerializedTransaction& txn, bool bMus
: txn.getFieldAccount160(sfAuthorizedKey); // PasswordSet
*/
- uint160 uAuthKeyID=txn.getFieldAccount160(sfAuthorizedKey);
- mTxnAccount->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
+ uint160 uAuthKeyID=txn.getFieldAccount160(sfRegularKey);
+ mTxnAccount->setFieldAccount(sfRegularKey, uAuthKeyID);
return tesSUCCESS;
}
@@ -195,17 +195,6 @@ TER TransactionEngine::doAccountSet(const SerializedTransaction& txn)
return tesSUCCESS;
}
-TER TransactionEngine::doClaim(const SerializedTransaction& txn)
-{
- Log(lsINFO) << "doClaim>";
-
- //TER terResult = setAuthorized(txn, true);
- TER terResult=tefEXCEPTION;
-
- Log(lsINFO) << "doClaim<";
-
- return terResult;
-}
TER TransactionEngine::doTrustSet(const SerializedTransaction& txn)
{
@@ -573,7 +562,7 @@ TER TransactionEngine::doWalletAdd(const SerializedTransaction& txn)
const std::vector vucPubKey = txn.getFieldVL(sfPublicKey);
const std::vector vucSignature = txn.getFieldVL(sfSignature);
- const uint160 uAuthKeyID = txn.getFieldAccount160(sfAuthorizedKey);
+ const uint160 uAuthKeyID = txn.getFieldAccount160(sfRegularKey);
const RippleAddress naMasterPubKey = RippleAddress::createAccountPublic(vucPubKey);
const uint160 uDstAccountID = naMasterPubKey.getAccountID();
@@ -617,7 +606,7 @@ TER TransactionEngine::doWalletAdd(const SerializedTransaction& txn)
sleDst->setFieldAccount(sfAccount, uDstAccountID);
sleDst->setFieldU32(sfSequence, 1);
sleDst->setFieldAmount(sfBalance, saAmount);
- sleDst->setFieldAccount(sfAuthorizedKey, uAuthKeyID);
+ sleDst->setFieldAccount(sfRegularKey, uAuthKeyID);
std::cerr << "WalletAdd<" << std::endl;
diff --git a/src/cpp/ripple/TransactionEngine.cpp b/src/cpp/ripple/TransactionEngine.cpp
index cb2ffe72ca..cd77712c5b 100644
--- a/src/cpp/ripple/TransactionEngine.cpp
+++ b/src/cpp/ripple/TransactionEngine.cpp
@@ -227,7 +227,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
else
{
saSrcBalance = mTxnAccount->getFieldAmount(sfBalance);
- bHaveAuthKey = mTxnAccount->isFieldPresent(sfAuthorizedKey);
+ bHaveAuthKey = mTxnAccount->isFieldPresent(sfRegularKey);
}
// Check if account claimed.
@@ -283,7 +283,7 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
default:
// Verify the transaction's signing public key is the key authorized for signing.
- if (bHaveAuthKey && naSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfAuthorizedKey).getAccountID())
+ if (bHaveAuthKey && naSigningPubKey.getAccountID() == mTxnAccount->getFieldAccount(sfRegularKey).getAccountID())
{
// Authorized to continue.
nothing();
@@ -384,9 +384,6 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
terResult = doAccountSet(txn);
break;
- case ttCLAIM:
- terResult = doClaim(txn);
- break;
case ttTRUST_SET:
terResult = doTrustSet(txn);
@@ -397,10 +394,6 @@ TER TransactionEngine::applyTransaction(const SerializedTransaction& txn, Transa
terResult = temINVALID;
break;
- //case ttINVOICE:
- // terResult = doInvoice(txn);
- // break;
-
case ttOFFER_CREATE:
terResult = doOfferCreate(txn);
break;
diff --git a/src/cpp/ripple/TransactionEngine.h b/src/cpp/ripple/TransactionEngine.h
index 13e5729f25..1ecfadd43a 100644
--- a/src/cpp/ripple/TransactionEngine.h
+++ b/src/cpp/ripple/TransactionEngine.h
@@ -63,7 +63,6 @@ protected:
void txnWrite();
TER doAccountSet(const SerializedTransaction& txn);
- TER doClaim(const SerializedTransaction& txn);
TER doTrustSet(const SerializedTransaction& txn);
TER doOfferCreate(const SerializedTransaction& txn);
TER doOfferCancel(const SerializedTransaction& txn);
diff --git a/src/cpp/ripple/TransactionFormats.cpp b/src/cpp/ripple/TransactionFormats.cpp
index 7c5a2157a7..f70a09116a 100644
--- a/src/cpp/ripple/TransactionFormats.cpp
+++ b/src/cpp/ripple/TransactionFormats.cpp
@@ -45,7 +45,7 @@ static bool TFInit()
;
DECLARE_TF(SetRegularKey, ttREGULAR_KEY_SET)
- << SOElement(sfAuthorizedKey, SOE_REQUIRED)
+ << SOElement(sfRegularKey, SOE_REQUIRED)
;
DECLARE_TF(Payment, ttPAYMENT)