From 547f4ac3ccbb4c2c720dd49415b47109d09a5a4b Mon Sep 17 00:00:00 2001 From: jed Date: Wed, 10 Oct 2012 02:07:13 -0700 Subject: [PATCH 1/3] . --- src/Pathfinder.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Pathfinder.cpp b/src/Pathfinder.cpp index 9290f921ae..cab078a0a3 100644 --- a/src/Pathfinder.cpp +++ b/src/Pathfinder.cpp @@ -77,16 +77,18 @@ PathOption::PathOption(PathOption::pointer other) Pathfinder::Pathfinder(NewcoinAddress& srcAccountID, NewcoinAddress& dstAccountID, uint160& srcCurrencyID, STAmount dstAmount) : - mSrcAccountID(srcAccountID.getAccountID()), mDstAccountID(dstAccountID.getAccountID()), mDstAmount(dstAmount), mSrcCurrencyID(srcCurrencyID), mOrderBook(theApp->getMasterLedger().getCurrentLedger()) + mSrcAccountID(srcAccountID.getAccountID()), mDstAccountID(dstAccountID.getAccountID()), mDstAmount(dstAmount), + mSrcCurrencyID(srcCurrencyID), mOrderBook(theApp->getMasterLedger().getCurrentLedger()) { mLedger=theApp->getMasterLedger().getCurrentLedger(); } bool Pathfinder::findPaths(int maxSearchSteps, int maxPay, STPathSet& retPathSet) { - if(mLedger) { - std::queue pqueue; - STPathElement ele(mSrcAccountID, + if(mLedger) + { + std::queue pqueue; + STPathElement ele(mSrcAccountID, mSrcCurrencyID, uint160()); STPath path; From c1fbb6010e2a2ed5eaf0651d6fcfeafb2d6fd3c8 Mon Sep 17 00:00:00 2001 From: jed Date: Sat, 27 Oct 2012 07:02:50 -0700 Subject: [PATCH 2/3] . --- src/Config.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index e4fb3f79ae..1f75b1e5bb 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -34,8 +34,8 @@ #define SECTION_VALIDATORS "validators" #define SECTION_VALIDATORS_SITE "validators_site" -// Fees are in XNB. -#define DEFAULT_FEE_DEFAULT 100 +// Fees are in XNS. +#define DEFAULT_FEE_DEFAULT 10 #define DEFAULT_FEE_ACCOUNT_CREATE 1000 #define DEFAULT_FEE_NICKNAME_CREATE 1000 #define DEFAULT_FEE_OFFER DEFAULT_FEE_DEFAULT From b5fa6e2bac320982ec12fbfae3c62feb2a401015 Mon Sep 17 00:00:00 2001 From: jed Date: Sat, 27 Oct 2012 10:11:43 -0700 Subject: [PATCH 3/3] . --- newcoin.vcxproj | 4 ++-- src/Config.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 273a5a4197..1d7e3a6d26 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -274,8 +274,8 @@ Document - d:/code/protoc-2.4.1-win32/protoc -I=..\newcoin --cpp_out=D:\code\newcoin\obj\ ..\newcoin/src/ripple.proto - D:\code\newcoin\obj\src\ripple.pb.h + /code/protoc-2.4.1-win32/protoc -I=..\newcoin --cpp_out=\code\newcoin\obj\ ..\newcoin/src/ripple.proto + \code\newcoin\obj\src\ripple.pb.h diff --git a/src/Config.cpp b/src/Config.cpp index c0ac11fa3a..2faed71d30 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -37,7 +37,7 @@ // Fees are in XNS. #define DEFAULT_FEE_DEFAULT 10 -#define DEFAULT_FEE_ACCOUNT_CREATE 1000 +#define DEFAULT_FEE_ACCOUNT_CREATE 1000*SYSTEM_CURRENCY_PARTS #define DEFAULT_FEE_NICKNAME_CREATE 1000 #define DEFAULT_FEE_OFFER DEFAULT_FEE_DEFAULT #define DEFAULT_FEE_OPERATION 1