Merge branch 'develop' of github.com:jedmccaleb/NewCoin into develop

src/cpp/ripple/AccountSetTransactor.cpp

@@ -44,7 +44,7 @@ TER AccountSetTransactor::doApply()
 		uFlagsOut	|= lsfRequireAuth;
 	}
 
-	if (uTxFlags & tfOptionalAuth)
+	if ((uTxFlags & tfOptionalAuth) && isSetBit(uFlagsIn, lsfRequireAuth))
 	{
 		cLog(lsINFO) << "AccountSet: Clear RequireAuth.";
 
@@ -62,16 +62,16 @@ TER AccountSetTransactor::doApply()
 		return temINVALID_FLAG;
 	}
 
-	if (uTxFlags & tfRequireDestTag)
+	if ((uTxFlags & tfOptionalDestTag) && !isSetBit(uFlagsIn, lsfRequireDestTag))
 	{
-		cLog(lsINFO) << "AccountSet: Set RequireDestTag.";
+		cLog(lsINFO) << "AccountSet: Set lsfRequireDestTag.";
 
 		uFlagsOut	|= lsfRequireDestTag;
 	}
 
-	if (uTxFlags & tfOptionalDestTag)
+	if ((uTxFlags & tfOptionalDestTag) && isSetBit(uFlagsIn, lsfRequireDestTag))
 	{
-		cLog(lsINFO) << "AccountSet: Clear RequireDestTag.";
+		cLog(lsINFO) << "AccountSet: Clear lsfRequireDestTag.";
 
 		uFlagsOut	&= ~lsfRequireDestTag;
 	}
@@ -79,6 +79,31 @@ TER AccountSetTransactor::doApply()
 	if (uFlagsIn != uFlagsOut)
 		mTxnAccount->setFieldU32(sfFlags, uFlagsOut);
 
+	//
+	// DisallowXRP
+	//
+
+	if ((tfDisallowXRP|tfAllowXRP) == (uTxFlags & (tfDisallowXRP|tfAllowXRP)))
+	{
+		cLog(lsINFO) << "AccountSet: Malformed transaction: Contradictory flags set.";
+
+		return temINVALID_FLAG;
+	}
+
+	if ((uTxFlags & tfDisallowXRP) && !isSetBit(uFlagsIn, lsfDisallowXRP))
+	{
+		cLog(lsINFO) << "AccountSet: Set lsfDisallowXRP.";
+
+		uFlagsOut	|= lsfDisallowXRP;
+	}
+
+	if ((uTxFlags & tfAllowXRP) && isSetBit(uFlagsIn, lsfDisallowXRP))
+	{
+		cLog(lsINFO) << "AccountSet: Clear lsfDisallowXRP.";
+
+		uFlagsOut	&= ~lsfDisallowXRP;
+	}
+
 	//
 	// EmailHash
 	//

src/cpp/ripple/LedgerFormats.h

@@ -42,6 +42,7 @@ enum LedgerSpecificFlags
 	lsfPasswordSpent	= 0x00010000,	// True, if password set fee is spent.
 	lsfRequireDestTag	= 0x00020000,	// True, to require a DestinationTag for payments.
 	lsfRequireAuth		= 0x00040000,	// True, to require a authorization to hold IOUs.
+	lsfDisallowXRP		= 0x00080000,	// True, to disallow sending XRP.
 
 	// ltOFFER
 	lsfPassive			= 0x00010000,

src/cpp/ripple/PaymentTransactor.cpp

@@ -146,7 +146,7 @@ TER PaymentTransactor::doApply()
 	{
 		cLog(lsINFO) << "Payment: Malformed transaction: DestinationTag required.";
 
-		return temDST_TAG_NEEDED;
+		return tefDST_TAG_NEEDED;
 	}
 	else
 	{

src/cpp/ripple/TransactionErr.cpp

@@ -34,6 +34,7 @@ bool transResultInfo(TER terCode, std::string& strToken, std::string& strHuman)
 		{	tefBAD_LEDGER,			"tefBAD_LEDGER",			"Ledger in unexpected state."							},
 		{	tefCLAIMED,				"tefCLAIMED",				"Can not claim a previously claimed account."			},
 		{	tefCREATED,				"tefCREATED",				"Can't add an already created account."					},
+		{	tefDST_TAG_NEEDED,		"tefDST_TAG_NEEDED",		"Destination tag required."								},
 		{	tefEXCEPTION,			"tefEXCEPTION",				"Unexpected program state."								},
 		{	tefGEN_IN_USE,			"tefGEN_IN_USE",			"Generator already in use."								},
 		{	tefINTERNAL,			"tefINTERNAL",				"Internal error."										},
@@ -71,7 +72,6 @@ bool transResultInfo(TER terCode, std::string& strToken, std::string& strHuman)
 		{	temBAD_SEND_XRP_PATHS,		"temBAD_SEND_XRP_PATHS",		"Malformed: Paths are not allowed for XRP to XRP."				},
 		{	temDST_IS_SRC,			"temDST_IS_SRC",			"Destination may not be source."						},
 		{	temDST_NEEDED,			"temDST_NEEDED",			"Destination not specified."							},
-		{	temDST_TAG_NEEDED,		"temDST_TAG_NEEDED",		"Destination tag required."								},
 		{	temINVALID,				"temINVALID",				"The transaction is ill-formed."						},
 		{	temINVALID_FLAG,		"temINVALID_FLAG",			"The transaction has an invalid flag."					},
 		{	temREDUNDANT,			"temREDUNDANT",				"Sends same currency to self."							},

src/cpp/ripple/TransactionErr.h

@@ -51,7 +51,6 @@ enum TER	// aka TransactionEngineResult
 	temBAD_SEQUENCE,
 	temDST_IS_SRC,
 	temDST_NEEDED,
-	temDST_TAG_NEEDED,
 	temINVALID,
 	temINVALID_FLAG,
 	temREDUNDANT,
@@ -78,6 +77,7 @@ enum TER	// aka TransactionEngineResult
 	tefBAD_LEDGER,
 	tefCLAIMED,
 	tefCREATED,
+	tefDST_TAG_NEEDED,
 	tefEXCEPTION,
 	tefGEN_IN_USE,
 	tefINTERNAL,

src/cpp/ripple/TransactionFormats.h

@@ -64,7 +64,11 @@ const uint32 tfRequireDestTag		= 0x00010000;
 const uint32 tfOptionalDestTag		= 0x00020000;
 const uint32 tfRequireAuth			= 0x00040000;
 const uint32 tfOptionalAuth			= 0x00080000;
-const uint32 tfAccountSetMask		= ~(tfRequireDestTag|tfOptionalDestTag|tfRequireAuth|tfOptionalAuth);
+const uint32 tfDisallowXRP			= 0x00100000;
+const uint32 tfAllowXRP				= 0x00200000;
+const uint32 tfAccountSetMask		= ~(tfRequireDestTag|tfOptionalDestTag
+										|tfRequireAuth|tfOptionalAuth
+										|tfDisallowXRP|tfAllowXRP);
 
 // OfferCreate flags:
 const uint32 tfPassive				= 0x00010000;

src/cpp/ripple/TrustSetTransactor.cpp

@@ -17,7 +17,7 @@ TER TrustSetTransactor::doApply()
 	const bool			bHigh			= mTxnAccountID > uDstAccountID;		// true, iff current is high account.
 
 	uint32				uQualityIn		= bQualityIn ? mTxn.getFieldU32(sfQualityIn) : 0;
-	uint32				uQualityOut		= bQualityIn ? mTxn.getFieldU32(sfQualityOut) : 0;
+	uint32				uQualityOut		= bQualityOut ? mTxn.getFieldU32(sfQualityOut) : 0;
 
 	if (bQualityIn && QUALITY_ONE == uQualityIn)
 		uQualityIn	= 0;