Merge pull request #388 from tronprotocol/release_v4.1

Release v4.1.0

Author: renchenchang

README.md

@@ -215,6 +215,27 @@ public class HttpSelfFormatFieldName {
     NameFieldNameMap.put("protocol.Transaction.Contract.ContractName", 1);
     //TransactionInfo
     NameFieldNameMap.put("protocol.TransactionInfo.resMessage", 1);
+
+    // MarketSellAssetContract
+    AddressFieldNameMap.put("protocol.MarketSellAssetContract.owner_address", 1);
+    NameFieldNameMap.put("protocol.MarketSellAssetContract.sell_token_id", 1);
+    NameFieldNameMap.put("protocol.MarketSellAssetContract.buy_token_id", 1);
+
+    // MarketCancelOrderContract
+    AddressFieldNameMap.put("protocol.MarketCancelOrderContract.owner_address", 1);
+
+    // MarketOrder
+    AddressFieldNameMap.put("protocol.MarketOrder.owner_address", 1);
+    NameFieldNameMap.put("protocol.MarketOrder.sell_token_id", 1);
+    NameFieldNameMap.put("protocol.MarketOrder.buy_token_id", 1);
+
+    // MarketOrderPair
+    NameFieldNameMap.put("protocol.MarketOrderPair.sell_token_id", 1);
+    NameFieldNameMap.put("protocol.MarketOrderPair.buy_token_id", 1);
+
+    // MarketPriceList
+    NameFieldNameMap.put("protocol.MarketPriceList.sell_token_id", 1);
+    NameFieldNameMap.put("protocol.MarketPriceList.buy_token_id", 1);
   }
 
   public static boolean isAddressFormat(final String name) {

src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java

@@ -76,6 +76,8 @@
 import org.tron.protos.contract.WitnessContract.WitnessCreateContract;
 import org.tron.protos.contract.WitnessContract.WitnessUpdateContract;
 import org.tron.protos.contract.ShieldContract.ShieldedTransferContract;
+import org.tron.protos.contract.MarketContract.MarketCancelOrderContract;
+import org.tron.protos.contract.MarketContract.MarketSellAssetContract;
 
 public class Utils {
   public static final String PERMISSION_ID = "Permission_id";
@@ -567,7 +569,19 @@ public static JSONObject printTransactionToJSON(Transaction transaction, boolean
                         JSONObject.parseObject(
                             JsonFormat.printToString(updateBrokerageContract, selfType));
                     break;
-                    // todo add other contract
+                  case MarketSellAssetContract:
+                    MarketSellAssetContract marketSellAssetContract = contract.getParameter()
+                        .unpack(MarketSellAssetContract.class);
+                    contractJson = JSONObject
+                        .parseObject(JsonFormat.printToString(marketSellAssetContract, selfType));
+                    break;
+                  case MarketCancelOrderContract:
+                    MarketCancelOrderContract marketCancelOrderContract = contract.getParameter()
+                        .unpack(MarketCancelOrderContract.class);
+                    contractJson = JSONObject
+                        .parseObject(JsonFormat.printToString(marketCancelOrderContract, selfType));
+                    break;
+                  // todo add other contract
                   default:
                 }
                 JSONObject parameter = new JSONObject();