Merge branch 'develop' into longvalue_exact

CodeNinjaEvan · web-flow · commit 5ce7d1bc880a · 2018-08-29T19:16:44.000+08:00
diff --git a/src/main/java/org/tron/common/runtime/Runtime.java b/src/main/java/org/tron/common/runtime/Runtime.java
@@ -333,8 +333,11 @@ private void create()
       //   thisTxENERGYLimitInUs = Constant.ENERGY_LIMIT_IN_ONE_TX_OF_SMART_CONTRACT;
       // }
 
-      long thisTxCPULimitInUs =
-          (long) (Constant.MAX_CPU_TIME_OF_ONE_TX * getThisTxCPULimitInUsRatio());
+      long MAX_CPU_TIME_OF_ONE_TX = deposit.getDbManager().getDynamicPropertiesStore()
+          .getMaxCpuTimeOfOneTX() * 1000;
+
+      long thisTxCPULimitInUs = (long) (MAX_CPU_TIME_OF_ONE_TX * getThisTxCPULimitInUsRatio());
+
       long vmStartInUs = System.nanoTime() / 1000;
       long vmShouldEndInUs = vmStartInUs + thisTxCPULimitInUs;
 
@@ -401,8 +404,10 @@ private void call()
           this.deposit.getContract(contractAddress).getInstance()
               .getOriginAddress().toByteArray());
 
+      long MAX_CPU_TIME_OF_ONE_TX = deposit.getDbManager().getDynamicPropertiesStore()
+          .getMaxCpuTimeOfOneTX() * 1000;
       long thisTxCPULimitInUs =
-          (long) (Constant.MAX_CPU_TIME_OF_ONE_TX * getThisTxCPULimitInUsRatio());
+          (long) (MAX_CPU_TIME_OF_ONE_TX * getThisTxCPULimitInUsRatio());
 
       long vmStartInUs = System.nanoTime() / 1000;
       long vmShouldEndInUs = vmStartInUs + thisTxCPULimitInUs;
diff --git a/src/main/java/org/tron/common/runtime/vm/program/Storage.java b/src/main/java/org/tron/common/runtime/vm/program/Storage.java
@@ -48,6 +48,7 @@ public void put(DataWord key, DataWord value) {
       if (row == null || row.getInstance() == null) {
         row = new StorageRowCapsule(rowKey, value.getData());
       } else {
+        row.setValue(value);
         beforeUseSize += row.getInstance().length;
       }
       rowCache.put(key, row);
diff --git a/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeFactoryImpl.java b/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeFactoryImpl.java
@@ -74,7 +74,7 @@ public ProgramInvoke createProgramInvoke(InternalTransaction.TrxType trxType,
           if (null != block) {
             lastHash = block.getBlockHeader().getRawDataOrBuilder().getParentHash().toByteArray();
             coinbase = block.getBlockHeader().getRawDataOrBuilder().getWitnessAddress().toByteArray();
-            timestamp = block.getBlockHeader().getRawDataOrBuilder().getTimestamp();
+            timestamp = block.getBlockHeader().getRawDataOrBuilder().getTimestamp() / 1000;
             number = block.getBlockHeader().getRawDataOrBuilder().getNumber();
           }
           break;
@@ -130,7 +130,7 @@ public ProgramInvoke createProgramInvoke(InternalTransaction.TrxType trxType,
             /***   COINBASE  op ***/
             coinbase = block.getBlockHeader().getRawDataOrBuilder().getWitnessAddress().toByteArray();
             /*** TIMESTAMP  op  ***/
-            timestamp = block.getBlockHeader().getRawDataOrBuilder().getTimestamp();
+            timestamp = block.getBlockHeader().getRawDataOrBuilder().getTimestamp() / 1000;
             /*** NUMBER  op  ***/
             number = block.getBlockHeader().getRawDataOrBuilder().getNumber();
           }
diff --git a/src/main/java/org/tron/core/Wallet.java b/src/main/java/org/tron/core/Wallet.java
@@ -580,6 +580,30 @@ public Protocol.ChainParameters getChainParameters() {
             dynamicPropertiesStore.getAllowCreationOfContracts())
         .build());
 
+    builder.addChainParameter(builder1
+        .setKey(ChainParameters.REMOVE_THE_POWER_OF_THE_GR.name())
+        .setValue(
+            dynamicPropertiesStore.getRemoveThePowerOfTheGr())
+        .build());
+
+    builder.addChainParameter(builder1
+        .setKey(ChainParameters.ENERGY_FEE.name())
+        .setValue(
+            dynamicPropertiesStore.getEnergyFee())
+        .build());
+
+    builder.addChainParameter(builder1
+        .setKey(ChainParameters.EXCHANGE_CREATE_FEE.name())
+        .setValue(
+            dynamicPropertiesStore.getExchangeCreateFee())
+        .build());
+
+    builder.addChainParameter(builder1
+        .setKey(ChainParameters.MAX_CPU_TIME_OF_ONE_TX.name())
+        .setValue(
+            dynamicPropertiesStore.getMaxCpuTimeOfOneTX())
+        .build());
+
     return builder.build();
   }
 
diff --git a/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java b/src/main/java/org/tron/core/actuator/ProposalCreateActuator.java
@@ -127,13 +127,14 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
           throw new ContractValidateException(
               "Bad chain parameter value,valid range is [0,100_000_000_000_000_000L]");
         }
-        return;
+        break;
       }
       case (9):{
         if(entry.getValue() != 1){
           throw new ContractValidateException(
               "This value[ALLOW_CREATION_OF_CONTRACTS] is only allowed to be 1");
         }
+        break;
       }
       case (10):{
         if(dbManager.getDynamicPropertiesStore().getRemoveThePowerOfTheGr() == -1){
@@ -145,7 +146,14 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE
           throw new ContractValidateException(
               "This value[REMOVE_THE_POWER_OF_THE_GR] is only allowed to be 1");
         }
+        break;
       }
+      case (11):
+        break;
+      case (12):
+        break;
+      case (13):
+        break;
       default:
         break;
     }
diff --git a/src/main/java/org/tron/core/config/Parameter.java b/src/main/java/org/tron/core/config/Parameter.java
@@ -67,7 +67,10 @@ enum ChainParameters {
     CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT, //drop ,7
     CREATE_NEW_ACCOUNT_BANDWIDTH_RATE, // 1 ~ ,8
     ALLOW_CREATION_OF_CONTRACTS, // 0 / >0 ,9
-    REMOVE_THE_POWER_OF_THE_GR  // 1 ,10
+    REMOVE_THE_POWER_OF_THE_GR,  // 1 ,10
+    ENERGY_FEE, // drop, 11
+    EXCHANGE_CREATE_FEE, // drop, 12
+    MAX_CPU_TIME_OF_ONE_TX // ms, 13
 //    ONE_DAY_NET_LIMIT,
 //    MAX_FROZEN_TIME,
 //    MIN_FROZEN_TIME,
@@ -77,7 +80,9 @@ enum ChainParameters {
 //    WITNESS_ALLOWANCE_FROZEN_TIME,
 //    PUBLIC_NET_LIMIT,
 //    FREE_NET_LIMIT,
-//    TOTAL_NET_LIMIT
+//    TOTAL_NET_LIMIT,
+//    EXCHANGE_BALANCE_LIMIT,
+//    TOTAL_ENERGY_LIMIT,
   }
 
 }
diff --git a/src/main/java/org/tron/core/db/DynamicPropertiesStore.java b/src/main/java/org/tron/core/db/DynamicPropertiesStore.java
@@ -81,11 +81,13 @@ public class DynamicPropertiesStore extends TronStoreWithRevoking<BytesCapsule>
 
   private static final byte[] ENERGY_FEE = "ENERGY_FEE".getBytes();
 
+  private static final byte[] MAX_CPU_TIME_OF_ONE_TX = "MAX_CPU_TIME_OF_ONE_TX".getBytes();
+
   //abandon
   private static final byte[] CREATE_ACCOUNT_FEE = "CREATE_ACCOUNT_FEE".getBytes();
 
-  private static final byte[] CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT = "CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT"
-      .getBytes();
+  private static final byte[] CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT
+      = "CREATE_NEW_ACCOUNT_FEE_IN_SYSTEM_CONTRACT".getBytes();
 
   private static final byte[] CREATE_NEW_ACCOUNT_BANDWIDTH_RATE = "CREATE_NEW_ACCOUNT_BANDWIDTH_RATE"
       .getBytes();
@@ -294,6 +296,12 @@ private DynamicPropertiesStore(@Value("properties") String dbName) {
       this.saveEnergyFee(100L);// 100 sun per energy
     }
 
+    try {
+      this.getMaxCpuTimeOfOneTX();
+    } catch (IllegalArgumentException e) {
+      this.saveMaxCpuTimeOfOneTX(50L);
+    }
+
     try {
       this.getCreateAccountFee();
     } catch (IllegalArgumentException e) {
@@ -710,6 +718,19 @@ public long getEnergyFee() {
             () -> new IllegalArgumentException("not found ENERGY_FEE"));
   }
 
+  public void saveMaxCpuTimeOfOneTX(long time) {
+    this.put(MAX_CPU_TIME_OF_ONE_TX,
+        new BytesCapsule(ByteArray.fromLong(time)));
+  }
+
+  public long getMaxCpuTimeOfOneTX() {
+    return Optional.ofNullable(getUnchecked(MAX_CPU_TIME_OF_ONE_TX))
+        .map(BytesCapsule::getData)
+        .map(ByteArray::toLong)
+        .orElseThrow(
+            () -> new IllegalArgumentException("not found MAX_CPU_TIME_OF_ONE_TX"));
+  }
+
   public void saveCreateAccountFee(long fee) {
     this.put(CREATE_ACCOUNT_FEE,
         new BytesCapsule(ByteArray.fromLong(fee)));
diff --git a/src/main/java/org/tron/core/witness/ProposalController.java b/src/main/java/org/tron/core/witness/ProposalController.java
@@ -138,6 +138,18 @@ public void setDynamicParameters(ProposalCapsule proposalCapsule) {
           manager.getDynamicPropertiesStore().saveRemoveThePowerOfTheGr(entry.getValue());
           break;
         }
+        case (11): {
+          manager.getDynamicPropertiesStore().saveEnergyFee(entry.getValue());
+          break;
+        }
+        case (12): {
+          manager.getDynamicPropertiesStore().saveExchangeCreateFee(entry.getValue());
+          break;
+        }
+        case (13): {
+          manager.getDynamicPropertiesStore().saveMaxCpuTimeOfOneTX(entry.getValue());
+          break;
+        }
         default:
           break;
       }
diff --git a/src/test/java/stest/tron/wallet/committee/WalletTestCommittee004.java b/src/test/java/stest/tron/wallet/committee/WalletTestCommittee004.java
@@ -189,7 +189,7 @@ public void testGetChainParameters() {
       logger.info(getChainParameters.get().getChainParameter(i).getKey());
       logger.info(Long.toString(getChainParameters.get().getChainParameter(i).getValue()));
     }
-    Assert.assertTrue(getChainParameters.get().getChainParameterCount() == 10);
+    Assert.assertTrue(getChainParameters.get().getChainParameterCount() >= 10);
     Assert.assertTrue(getChainParameters.get()
         .getChainParameter(1).getValue() == 9999000000L);
     Assert.assertTrue(getChainParameters.get().getChainParameter(4)

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ public void put(DataWord key, DataWord value) {`
`48`	`48`	`if (row == null \|\| row.getInstance() == null) {`
`49`	`49`	`row = new StorageRowCapsule(rowKey, value.getData());`
`50`	`50`	`} else {`
	`51`	`+ row.setValue(value);`
`51`	`52`	`beforeUseSize += row.getInstance().length;`
`52`	`53`	`}`
`53`	`54`	`rowCache.put(key, row);`
Original file line number	Diff line number	Diff line change
`@@ -127,13 +127,14 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE`
`127`	`127`	`throw new ContractValidateException(`
`128`	`128`	`"Bad chain parameter value,valid range is [0,100_000_000_000_000_000L]");`
`129`	`129`	`}`
`130`		`- return;`
	`130`	`+ break;`
`131`	`131`	`}`
`132`	`132`	`case (9):{`
`133`	`133`	`if(entry.getValue() != 1){`
`134`	`134`	`throw new ContractValidateException(`
`135`	`135`	`"This value[ALLOW_CREATION_OF_CONTRACTS] is only allowed to be 1");`
`136`	`136`	`}`
	`137`	`+ break;`
`137`	`138`	`}`
`138`	`139`	`case (10):{`
`139`	`140`	`if(dbManager.getDynamicPropertiesStore().getRemoveThePowerOfTheGr() == -1){`
`@@ -145,7 +146,14 @@ private void validateValue(Map.Entry<Long, Long> entry) throws ContractValidateE`
`145`	`146`	`throw new ContractValidateException(`
`146`	`147`	`"This value[REMOVE_THE_POWER_OF_THE_GR] is only allowed to be 1");`
`147`	`148`	`}`
	`149`	`+ break;`
`148`	`150`	`}`
	`151`	`+ case (11):`
	`152`	`+ break;`
	`153`	`+ case (12):`
	`154`	`+ break;`
	`155`	`+ case (13):`
	`156`	`+ break;`
`149`	`157`	`default:`
`150`	`158`	`break;`
`151`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ public void testGetChainParameters() {`
`189`	`189`	`logger.info(getChainParameters.get().getChainParameter(i).getKey());`
`190`	`190`	`logger.info(Long.toString(getChainParameters.get().getChainParameter(i).getValue()));`
`191`	`191`	`}`
`192`		`- Assert.assertTrue(getChainParameters.get().getChainParameterCount() == 10);`
	`192`	`+ Assert.assertTrue(getChainParameters.get().getChainParameterCount() >= 10);`
`193`	`193`	`Assert.assertTrue(getChainParameters.get()`
`194`	`194`	`.getChainParameter(1).getValue() == 9999000000L);`
`195`	`195`	`Assert.assertTrue(getChainParameters.get().getChainParameter(4)`