diff --git a/src/cpp/ripple/Amount.cpp b/src/cpp/ripple/Amount.cpp index 64e4cc1fa3..c3d2c7a571 100644 --- a/src/cpp/ripple/Amount.cpp +++ b/src/cpp/ripple/Amount.cpp @@ -230,6 +230,10 @@ std::string STAmount::createHumanCurrency(const uint160& uCurrency) { return "1"; } + else if (CURRENCY_BAD == uCurrency) + { + return uCurrency.ToString(); + } else { Serializer s(160/8); diff --git a/src/cpp/ripple/OfferCreateTransactor.cpp b/src/cpp/ripple/OfferCreateTransactor.cpp index c415522b28..9e7593275a 100644 --- a/src/cpp/ripple/OfferCreateTransactor.cpp +++ b/src/cpp/ripple/OfferCreateTransactor.cpp @@ -357,7 +357,7 @@ TER OfferCreateTransactor::takeOffers( TER OfferCreateTransactor::doApply() { - cLog(lsWARNING) << "OfferCreate> " << mTxn.getJson(0); + cLog(lsDEBUG) << "OfferCreate> " << mTxn.getJson(0); const uint32 uTxFlags = mTxn.getFlags(); const bool bPassive = isSetBit(uTxFlags, tfPassive); const bool bImmediateOrCancel = isSetBit(uTxFlags, tfImmediateOrCancel); @@ -507,24 +507,24 @@ TER OfferCreateTransactor::doApply() saGot, // How much was got. bUnfunded); - cLog(lsWARNING) << "OfferCreate: takeOffers=" << terResult; - cLog(lsWARNING) << "OfferCreate: takeOffers: saPaid=" << saPaid.getFullText(); - cLog(lsWARNING) << "OfferCreate: takeOffers: saGot=" << saGot.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers=" << terResult; + cLog(lsDEBUG) << "OfferCreate: takeOffers: saPaid=" << saPaid.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: saGot=" << saGot.getFullText(); if (tesSUCCESS == terResult && !bUnfunded) { saTakerPays -= saGot; // Reduce pay in from takers by what offer just got. saTakerGets -= saPaid; // Reduce pay out to takers by what srcAccount just paid. - cLog(lsWARNING) << "OfferCreate: takeOffers: AFTER saTakerPays=" << saTakerPays.getFullText(); - cLog(lsWARNING) << "OfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: AFTER saTakerPays=" << saTakerPays.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: AFTER saTakerGets=" << saTakerGets.getFullText(); } } - cLog(lsWARNING) << "OfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText(); - cLog(lsWARNING) << "OfferCreate: takeOffers: saTakerGets=" << saTakerGets.getFullText(); - cLog(lsWARNING) << "OfferCreate: takeOffers: mTxnAccountID=" << RippleAddress::createHumanAccountID(mTxnAccountID); - cLog(lsWARNING) << "OfferCreate: takeOffers: FUNDS=" << lesActive.accountFunds(mTxnAccountID, saTakerGets).getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: saTakerPays=" << saTakerPays.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: saTakerGets=" << saTakerGets.getFullText(); + cLog(lsDEBUG) << "OfferCreate: takeOffers: mTxnAccountID=" << RippleAddress::createHumanAccountID(mTxnAccountID); + cLog(lsDEBUG) << "OfferCreate: takeOffers: FUNDS=" << lesActive.accountFunds(mTxnAccountID, saTakerGets).getFullText(); // cLog(lsWARNING) << "OfferCreate: takeOffers: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID); // cLog(lsWARNING) << "OfferCreate: takeOffers: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID); @@ -611,13 +611,13 @@ TER OfferCreateTransactor::doApply() if (tesSUCCESS == terResult) { - cLog(lsWARNING) << "OfferCreate: sfAccount=" << RippleAddress::createHumanAccountID(mTxnAccountID); - cLog(lsWARNING) << "OfferCreate: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID); - cLog(lsWARNING) << "OfferCreate: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID); - cLog(lsWARNING) << "OfferCreate: saTakerPays.isNative()=" << saTakerPays.isNative(); - cLog(lsWARNING) << "OfferCreate: saTakerGets.isNative()=" << saTakerGets.isNative(); - cLog(lsWARNING) << "OfferCreate: uPaysCurrency=" << saTakerPays.getHumanCurrency(); - cLog(lsWARNING) << "OfferCreate: uGetsCurrency=" << saTakerGets.getHumanCurrency(); + cLog(lsDEBUG) << "OfferCreate: sfAccount=" << RippleAddress::createHumanAccountID(mTxnAccountID); + cLog(lsDEBUG) << "OfferCreate: uPaysIssuerID=" << RippleAddress::createHumanAccountID(uPaysIssuerID); + cLog(lsDEBUG) << "OfferCreate: uGetsIssuerID=" << RippleAddress::createHumanAccountID(uGetsIssuerID); + cLog(lsDEBUG) << "OfferCreate: saTakerPays.isNative()=" << saTakerPays.isNative(); + cLog(lsDEBUG) << "OfferCreate: saTakerGets.isNative()=" << saTakerGets.isNative(); + cLog(lsDEBUG) << "OfferCreate: uPaysCurrency=" << saTakerPays.getHumanCurrency(); + cLog(lsDEBUG) << "OfferCreate: uGetsCurrency=" << saTakerGets.getHumanCurrency(); SLE::pointer sleOffer = mEngine->entryCreate(ltOFFER, uLedgerIndex); diff --git a/src/cpp/ripple/SerializedTypes.h b/src/cpp/ripple/SerializedTypes.h index c2047a52b0..5b0df2fedf 100644 --- a/src/cpp/ripple/SerializedTypes.h +++ b/src/cpp/ripple/SerializedTypes.h @@ -39,10 +39,10 @@ static inline const uint160& get_u160_zero() { return u160_zero; } static inline const uint160& get_u160_one() { return u160_one; } #define CURRENCY_XRP get_u160_zero() -#define CURRENCY_ONE get_u160_one() // Used as a place holder +#define CURRENCY_ONE get_u160_one() // Used as a place holder. #define CURRENCY_BAD uint160(0x5852500000000000) // Do not allow XRP as an IOU currency. #define ACCOUNT_XRP get_u160_zero() -#define ACCOUNT_ONE get_u160_one() // Used as a place holder +#define ACCOUNT_ONE get_u160_one() // Used as a place holder. class SerializedType { diff --git a/src/cpp/ripple/Version.h b/src/cpp/ripple/Version.h index 897a19d97e..930c0b9dbf 100644 --- a/src/cpp/ripple/Version.h +++ b/src/cpp/ripple/Version.h @@ -6,7 +6,7 @@ #define SERVER_VERSION_MAJOR 0 #define SERVER_VERSION_MINOR 8 -#define SERVER_VERSION_SUB "-b" +#define SERVER_VERSION_SUB "-c" #define SERVER_NAME "Ripple" #define SV_STRINGIZE(x) SV_STRINGIZE2(x)