Merge pull request #401 from tronprotocol/develop

merge develop

Author: Lredhdx

README.md

@@ -25,9 +25,13 @@ fullnode = {
 }
 
 soliditynode = {
+  // the IPs in this list can only be totally set to solidity or pBFT.
   ip.list = [
-    "solidity ip : port"
+    "ip : solidity port" // default solidity
   ]
+#  ip.list = [
+#    "ip : pBFT port" // or pBFT
+#  ]
 } // NOTE: solidity node is optional
 
 blockNumberStartToScan = 22690588 // NOTE: this field is optional

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

@@ -56,6 +56,7 @@
 import org.tron.protos.contract.SmartContractOuterClass.SmartContract;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.TransactionInfo;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContractDataWrapper;
 import org.tron.walletserver.WalletApi;
 
 
@@ -108,6 +109,7 @@ public class Client {
       "GetBrokerage",
       "GetChainParameters",
       "GetContract contractAddress",
+      "GetContractInfo contractAddress",
       "GetDelegatedResource",
       "GetDelegatedResourceAccountIndex",
       "GetDiversifier",
@@ -237,6 +239,7 @@ public class Client {
       "GetBrokerage",
       "GetChainParameters",
       "GetContract",
+      "GetContractInfo",
       "GetDelegatedResource",
       "GetDelegatedResourceAccountIndex",
       "GetDiversifier",
@@ -2108,11 +2111,11 @@ private void deployContract(String[] parameter)
       System.out.println("origin_energy_limit must > 0");
       return;
     }
-    if (!constructorStr.equals("#")) {
+    if (!(constructorStr.equals("#") || argsStr.equals("#"))) {
       if (isHex) {
         codeStr += argsStr;
       } else {
-        codeStr += AbiUtil.parseMethod(constructorStr, argsStr);
+        codeStr += Hex.toHexString(AbiUtil.encodeInput(constructorStr, argsStr));
       }
     }
     long value = 0;
@@ -2240,6 +2243,28 @@ private void getContract(String[] parameters) {
     }
   }
 
+  private void getContractInfo(String[] parameters) {
+    if (parameters == null ||
+        parameters.length != 1) {
+      System.out.println("Using getContractInfo needs 1 parameter like: ");
+      System.out.println("GetContractInfo contractAddress");
+      return;
+    }
+
+    byte[] addressBytes = WalletApi.decodeFromBase58Check(parameters[0]);
+    if (addressBytes == null) {
+      System.out.println("GetContractInfo: invalid address !!!");
+      return;
+    }
+
+    SmartContractDataWrapper contractDeployContract = WalletApi.getContractInfo(addressBytes);
+    if (contractDeployContract != null) {
+      System.out.println(Utils.formatMessageString(contractDeployContract));
+    } else {
+      System.out.println("Query contract failed !!!");
+    }
+  }
+
   private void generateAddress() {
     AddressPrKeyPairMessage result = walletApiWrapper.generateAddress();
     if (null != result) {
@@ -3682,7 +3707,7 @@ public static String[] getCmd(String cmdLine) {
         || cmdLine.toLowerCase().startsWith("triggercontract")
         || cmdLine.toLowerCase().startsWith("triggerconstantcontract")
         || cmdLine.toLowerCase().startsWith("updateaccountpermission")) {
-      return cmdLine.split(" ", -1);
+      return cmdLine.split("\\s+", -1);
     }
     String[] strArray = cmdLine.split("\"");
     int num = strArray.length;
@@ -4081,6 +4106,10 @@ private void run() {
               getContract(parameters);
               break;
             }
+            case "getcontractinfo": {
+              getContractInfo(parameters);
+              break;
+            }
             case "generateaddress": {
               generateAddress();
               break;

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

@@ -62,6 +62,7 @@
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.Protocol.TransactionInfo;
 import org.tron.protos.Protocol.TransactionSign;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContractDataWrapper;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 import org.tron.protos.contract.SmartContractOuterClass.UpdateEnergyLimitContract;
 import org.tron.protos.contract.SmartContractOuterClass.UpdateSettingContract;
@@ -838,6 +839,12 @@ public SmartContract getContract(byte[] address) {
     return blockingStubFull.getContract(bytesMessage);
   }
 
+  public SmartContractDataWrapper getContractInfo(byte[] address) {
+    ByteString byteString = ByteString.copyFrom(address);
+    BytesMessage bytesMessage = BytesMessage.newBuilder().setValue(byteString).build();
+    return blockingStubFull.getContractInfo(bytesMessage);
+  }
+
   public TransactionExtention accountPermissionUpdate(
       AccountPermissionUpdateContract request) {
     return blockingStubFull.accountPermissionUpdate(request);

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

@@ -108,6 +108,7 @@
 import org.tron.protos.contract.ShieldContract.OutputPointInfo;
 import org.tron.protos.contract.ShieldContract.ShieldedTransferContract;
 import org.tron.protos.contract.ShieldContract.SpendDescription;
+import org.tron.protos.contract.SmartContractOuterClass.SmartContractDataWrapper;
 import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract;
 import org.tron.protos.contract.StorageContract.BuyStorageBytesContract;
 import org.tron.protos.contract.StorageContract.BuyStorageContract;
@@ -139,6 +140,7 @@
 import org.tron.protos.contract.WitnessContract.WitnessUpdateContract;
 import org.tron.protos.contract.MarketContract.MarketCancelOrderContract;
 import org.tron.protos.contract.MarketContract.MarketSellAssetContract;
+import org.tron.protos.contract.MarketContract.MarketSellAssetContract;
 
 import java.io.File;
 import java.io.IOException;
@@ -2211,6 +2213,10 @@ public static SmartContract getContract(byte[] address) {
     return rpcCli.getContract(address);
   }
 
+  public static SmartContractDataWrapper getContractInfo(byte[] address) {
+    return rpcCli.getContractInfo(address);
+  }
+
   public boolean accountPermissionUpdate(byte[] owner, String permissionJson)
       throws CipherException, IOException, CancelException {
     AccountPermissionUpdateContract contract =

src/main/protos/api/api.proto

@@ -433,6 +433,9 @@ service Wallet {
   rpc GetContract (BytesMessage) returns (SmartContract) {
   }
 
+  rpc GetContractInfo (BytesMessage) returns (SmartContractDataWrapper) {
+  }
+
   rpc TriggerContract (TriggerSmartContract) returns (TransactionExtention) {
   }
 

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

@@ -88,3 +88,8 @@ message UpdateEnergyLimitContract {
     bytes contract_address = 2;
     int64 origin_energy_limit = 3;
 }
+
+message SmartContractDataWrapper {
+    SmartContract smart_contract = 1;
+    bytes runtimecode = 2;
+}

src/main/resources/config.conf

@@ -9,8 +9,12 @@ fullnode = {
 }
 
 #soliditynode = {
+#  // the IPs in this list can only be totally set to solidity or pBFT.
 #  ip.list = [
-#    "127.0.0.1:50052"
+#    "127.0.0.1:50052" // default solidity
+#  ]
+#  ip.list = [
+#    "127.0.0.1:50071" // or pBFT
 #  ]
 #}