Merge pull request #426

1228f7d Remove devOmni bypass (zathras-crypto)
013d23f Update the fee test script. (zathras-crypto)
b856b29 This commit fixes the evaluation of whether a trade should incur a fee. (zathras-crypto)
cacd1b2 Fix RPC output for trade matches. (zathras-crypto)

src/omnicore/mdex.cpp

@@ -263,7 +263,7 @@ static MatchReturnType x_Trade(CMPMetaDEx* const pnew)
 
             // strip a 0.05% fee from non-OMNI pairs if fees are activated
             if (IsFeatureActivated(FEATURE_FEES, pnew->getBlock())) {
-                if ( (pold->getProperty() != (OMNI_PROPERTY_MSC || OMNI_PROPERTY_TMSC)) || (pold->getDesProperty() != (OMNI_PROPERTY_MSC || OMNI_PROPERTY_TMSC)) ) {
+                if (pold->getProperty() > OMNI_PROPERTY_TMSC && pold->getDesProperty() > OMNI_PROPERTY_TMSC) {
                     int64_t feeDivider = 2000; // 0.05%
                     tradingFee = buyer_amountGot / feeDivider;
 

src/omnicore/omnicore.cpp

@@ -3328,7 +3328,8 @@ bool CMPTradeList::getMatchingTrades(const uint256& txid, uint32_t propertyId, A
 
       std::string strAmount1 = FormatMP(prop1, amount1);
       std::string strAmount2 = FormatMP(prop2, amount2);
-      std::string strTradingFee = FormatMP(prop1, tradingFee);
+      std::string strTradingFee = FormatMP(prop2, tradingFee);
+      std::string strAmount2PlusFee = FormatMP(prop2, amount2+tradingFee);
 
       // populate trade object and add to the trade array, correcting for orientation of trade
       Object trade;
@@ -3338,13 +3339,14 @@ bool CMPTradeList::getMatchingTrades(const uint256& txid, uint32_t propertyId, A
           trade.push_back(Pair("address", address1));
           trade.push_back(Pair("amountsold", strAmount1));
           trade.push_back(Pair("amountreceived", strAmount2));
+          trade.push_back(Pair("tradingfee", strTradingFee));
           totalReceived += amount2;
           totalSold += amount1;
       } else {
           trade.push_back(Pair("address", address2));
-          trade.push_back(Pair("amountsold", strAmount2));
+          trade.push_back(Pair("amountsold", strAmount2PlusFee));
           trade.push_back(Pair("amountreceived", strAmount1));
-          trade.push_back(Pair("tradingfee", strTradingFee));
+          trade.push_back(Pair("tradingfee", FormatMP(prop1, 0))); // not the liquidity taker so no fee for this participant - include attribute for standardness
           totalReceived += amount1;
           totalSold += amount2;
       }