Merge pull request #395 from tronprotocol/develop

merge develop

Author: Lredhdx

src/main/java/org/tron/walletcli/Client.java

@@ -2198,7 +2198,10 @@ private void triggerContract(String[] parameters, boolean isConstant)
     if (tokenId.equalsIgnoreCase("#")) {
       tokenId = "";
     }
-    byte[] input = Hex.decode(AbiUtil.parseMethod(methodStr, argsStr, isHex));
+    byte[] input = new byte[0];
+    if (!methodStr.equalsIgnoreCase("#")) {
+      input = Hex.decode(AbiUtil.parseMethod(methodStr, argsStr, isHex));
+    }
     byte[] contractAddress = WalletApi.decodeFromBase58Check(contractAddrStr);
 
     boolean result = walletApiWrapper

src/main/java/org/tron/walletserver/WalletApi.java

@@ -1693,6 +1693,8 @@ public static SmartContract.ABI.Entry.EntryType getEntryType(String type) {
         return SmartContract.ABI.Entry.EntryType.Event;
       case "fallback":
         return SmartContract.ABI.Entry.EntryType.Fallback;
+      case "receive":
+        return SmartContract.ABI.Entry.EntryType.Receive;
       default:
         return SmartContract.ABI.Entry.EntryType.UNRECOGNIZED;
     }
@@ -1767,11 +1769,12 @@ public static SmartContract.ABI jsonStr2ABI(String jsonStr) {
         System.out.println("No type!");
         return null;
       }
-      if (!type.equalsIgnoreCase("fallback") && null == inputs) {
-        System.out.println("No inputs!");
-        return null;
+      if(inputs == null) {
+        if(!(type.equalsIgnoreCase("fallback") || type.equalsIgnoreCase("receive"))) {
+          logger.error("No inputs!");
+          return null;
+        }
       }
-
       SmartContract.ABI.Entry.Builder entryBuilder = SmartContract.ABI.Entry.newBuilder();
       entryBuilder.setAnonymous(anonymous);
       entryBuilder.setConstant(constant);

src/main/protos/core/contract/smart_contract.proto

@@ -17,6 +17,7 @@ message SmartContract {
                 Function = 2;
                 Event = 3;
                 Fallback = 4;
+                Receive = 5;
             }
             message Param {
                 bool indexed = 1;