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

Move Wallet files to ripple_ledger module

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-22 17:34:12 -07:00
parent 6775ae60e0
commit d2fecb5364
6 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/ripple_ledger/ripple_ledger.cpp
View File

@@ -33,10 +33,13 @@
#include "ripple_ledger.h" #include "ripple_ledger.h"
//#define WIN32_LEAN_AND_MEAN
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <openssl/ec.h>
#include <openssl/ripemd.h> #include <openssl/ripemd.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <string> #include <string>
@@ -182,6 +185,8 @@
#include "src/cpp/ripple/TransactionQueue.cpp" // no log #include "src/cpp/ripple/TransactionQueue.cpp" // no log
#include "src/cpp/ripple/Transactor.cpp" #include "src/cpp/ripple/Transactor.cpp"
#include "src/cpp/ripple/TrustSetTransactor.cpp" #include "src/cpp/ripple/TrustSetTransactor.cpp"
#include "src/cpp/ripple/Wallet.cpp"
#include "src/cpp/ripple/WalletAddTransactor.cpp"
#ifdef _MSC_VER #ifdef _MSC_VER
//#pragma warning (pop) //#pragma warning (pop)

28
newcoin.vcxproj
View File

@@ -988,7 +988,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Suppression.cpp" /> <ClCompile Include="src\cpp\ripple\Suppression.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Transaction.cpp"> <ClCompile Include="src\cpp\ripple\Transaction.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1055,7 +1060,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp" /> <ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp" /> <ClCompile Include="src\cpp\ripple\UpdateTables.cpp" />
<ClCompile Include="src\cpp\ripple\utils.cpp"> <ClCompile Include="src\cpp\ripple\utils.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1069,8 +1079,18 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Wallet.cpp" /> <ClCompile Include="src\cpp\ripple\Wallet.cpp">
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp" /> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\WSDoor.cpp"> <ClCompile Include="src\cpp\ripple\WSDoor.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

24
newcoin.vcxproj.filters
View File

@@ -412,12 +412,6 @@
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp"> <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Wallet.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\websocket_core.cpp"> <ClCompile Include="src\cpp\websocket_core.cpp">
<Filter>0. Third Party Code\websocket</Filter> <Filter>0. Third Party Code\websocket</Filter>
</ClCompile> </ClCompile>
@@ -727,6 +721,12 @@
<ClCompile Include="src\cpp\ripple\RippleAddress.cpp"> <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
<Filter>1. Modules\ripple_basics\types</Filter> <Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\WalletAddTransactor.cpp">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Wallet.cpp">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="database\sqlite3ext.h"> <ClInclude Include="database\sqlite3ext.h">
@@ -1044,12 +1044,6 @@
<ClInclude Include="src\cpp\ripple\Version.h"> <ClInclude Include="src\cpp\ripple\Version.h">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\Wallet.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\ScopedLock.h"> <ClInclude Include="src\cpp\ripple\ScopedLock.h">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClInclude> </ClInclude>
@@ -1365,6 +1359,12 @@
<ClInclude Include="src\cpp\ripple\RippleAddress.h"> <ClInclude Include="src\cpp\ripple\RippleAddress.h">
<Filter>1. Modules\ripple_basics\types</Filter> <Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\WalletAddTransactor.h">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Wallet.h">
<Filter>1. Modules\ripple_ledger\transactions</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="wallet.xml" /> <None Include="wallet.xml" />

16
src/cpp/ripple/Wallet.cpp
View File

@@ -1,19 +1,3 @@
#define WIN32_LEAN_AND_MEAN
#include <string>
#include "openssl/ec.h"
#include <boost/foreach.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/make_shared.hpp>
#include "Wallet.h"
#include "Ledger.h"
#include "RippleAddress.h"
#include "Application.h"
#include "utils.h"
Wallet::Wallet() : mDh512(NULL), mDh1024(NULL), mLedger(0) Wallet::Wallet() : mDh512(NULL), mDh1024(NULL), mLedger(0)
{ ; } { ; }

8
src/cpp/ripple/WalletAddTransactor.cpp
View File

@@ -1,7 +1,3 @@
#include "WalletAddTransactor.h"
SETUP_LOG();
TER WalletAddTransactor::doApply() TER WalletAddTransactor::doApply()
{ {
std::cerr << "WalletAdd>" << std::endl; std::cerr << "WalletAdd>" << std::endl;
@@ -16,7 +12,7 @@ TER WalletAddTransactor::doApply()
if (uTxFlags) if (uTxFlags)
{ {
cLog(lsINFO) << "WalletAdd: Malformed transaction: Invalid flags set."; WriteLog (lsINFO, WalletAddTransactor) << "WalletAdd: Malformed transaction: Invalid flags set.";
return temINVALID_FLAG; return temINVALID_FLAG;
} }
@@ -50,7 +46,7 @@ TER WalletAddTransactor::doApply()
if (saSrcBalance + saPaid < saDstAmount + uReserve) // Reserve is not scaled by fee. if (saSrcBalance + saPaid < saDstAmount + uReserve) // Reserve is not scaled by fee.
{ {
// Vote no. However, transaction might succeed, if applied in a different order. // Vote no. However, transaction might succeed, if applied in a different order.
cLog(lsINFO) << boost::str(boost::format("WalletAdd: Delay transaction: Insufficient funds: %s / %s (%d)") WriteLog (lsINFO, WalletAddTransactor) << boost::str(boost::format("WalletAdd: Delay transaction: Insufficient funds: %s / %s (%d)")
% saSrcBalance.getText() % (saDstAmount + uReserve).getText() % uReserve); % saSrcBalance.getText() % (saDstAmount + uReserve).getText() % uReserve);
return tecUNFUNDED_ADD; return tecUNFUNDED_ADD;

5
src/cpp/ripple/WalletAddTransactor.h
View File

@@ -1,5 +1,5 @@
#include "Transactor.h" #ifndef WALLETADDTRANSACTOR_H
#define WALLETADDTRANSACTOR_H
class WalletAddTransactor : public Transactor class WalletAddTransactor : public Transactor
{ {
@@ -8,5 +8,6 @@ public:
TER doApply(); TER doApply();
}; };
#endif
// vim:ts=4 // vim:ts=4