Merge branch 'develop' into fix/constant_call

JackyKen · Sep 6, 2018 · 20c9b8d · 20c9b8d
2 parents b36a8b7 + 987f99a
commit 20c9b8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/org/tron/common/runtime/Runtime.java b/src/main/java/org/tron/common/runtime/Runtime.java
@@ -324,6 +324,12 @@ private void create()
     byte[] code = newSmartContract.getBytecode().toByteArray();
     byte[] contractAddress = Wallet.generateContractAddress(trx);
     byte[] ownerAddress = contract.getOwnerAddress().toByteArray();
+    byte[] contractName = newSmartContract.getName().getBytes();
+
+    if (contractName.length > 200) {
+      logger.error("contractName's length mustn't  greater than 200");
+      throw new ContractValidateException("contractName's length mustn't  greater than 200");
+    }
 
     long percent = contract.getNewContract().getConsumeUserResourcePercent();
     if (percent < 0 || percent > 100) {

diff --git a/src/main/java/org/tron/core/Wallet.java b/src/main/java/org/tron/core/Wallet.java
@@ -895,8 +895,9 @@ public Transaction triggerContract(TriggerSmartContract triggerSmartContract,
       runtime.finalization();
       // TODO exception
       if (runtime.getResult().getException() != null) {
-//          runtime.getResult().getException().printStackTrace();
-        throw new RuntimeException(runtime.getResult().getException().getMessage());
+        RuntimeException e = runtime.getResult().getException();
+        logger.warn(e);
+        throw new RuntimeException(e.getMessage());
       }
 
       ProgramResult result = runtime.getResult();