Merge remote-tracking branch 'upstream/develop' into feature/optimize_stake2_code

Author: lxcmyf

actuator/src/main/java/org/tron/core/actuator/WithdrawExpireUnfreezeActuator.java

@@ -125,8 +125,8 @@ private long getTotalWithdrawUnfreeze(List<UnFreezeV2> unfrozenV2List, long now)
   }
 
   private List<UnFreezeV2> getTotalWithdrawList(List<UnFreezeV2> unfrozenV2List, long now) {
-    return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
-        && unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
+    return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
+        .collect(Collectors.toList());
   }
 
   private List<UnFreezeV2> getRemainWithdrawList(List<UnFreezeV2> unfrozenV2List, long now) {

actuator/src/main/java/org/tron/core/vm/nativecontract/WithdrawExpireUnfreezeProcessor.java

@@ -60,8 +60,8 @@ private long getTotalWithdrawUnfreeze(List<Protocol.Account.UnFreezeV2> unfrozen
   }
 
   private List<Protocol.Account.UnFreezeV2> getTotalWithdrawList(List<Protocol.Account.UnFreezeV2> unfrozenV2List, long now) {
-    return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
-        && unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
+    return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
+        .collect(Collectors.toList());
   }
 
   public long execute(WithdrawExpireUnfreezeParam param, Repository repo) throws ContractExeException {

actuator/src/main/java/org/tron/core/vm/utils/FreezeV2Util.java

@@ -234,8 +234,8 @@ private static long getTotalWithdrawUnfreeze(List<Protocol.Account.UnFreezeV2> u
   }
 
   private static List<Protocol.Account.UnFreezeV2> getTotalWithdrawList(List<Protocol.Account.UnFreezeV2> unfrozenV2List, long now) {
-    return unfrozenV2List.stream().filter(unfrozenV2 -> (unfrozenV2.getUnfreezeAmount() > 0
-        && unfrozenV2.getUnfreezeExpireTime() <= now)).collect(Collectors.toList());
+    return unfrozenV2List.stream().filter(unfrozenV2 -> unfrozenV2.getUnfreezeExpireTime() <= now)
+        .collect(Collectors.toList());
   }
 
   public static long getV2NetUsage(AccountCapsule ownerCapsule, long netUsage) {

chainbase/src/main/java/org/tron/core/ChainBaseManager.java

@@ -29,7 +29,6 @@
 import org.tron.core.db.RecentBlockStore;
 import org.tron.core.db.RecentTransactionStore;
 import org.tron.core.db.TransactionStore;
-import org.tron.core.db2.core.ITronChainBase;
 import org.tron.core.exception.BadItemException;
 import org.tron.core.exception.HeaderNotFound;
 import org.tron.core.exception.ItemNotFoundException;
@@ -245,54 +244,6 @@ public class ChainBaseManager {
   @Setter
   private long lowestBlockNum = -1; // except num = 0.
 
-  public void closeOneStore(ITronChainBase database) {
-    logger.info("******** Begin to close {}. ********",  database.getName());
-    try {
-      database.close();
-    } catch (Exception e) {
-      logger.info("Failed to close {}.", database.getName(), e);
-    } finally {
-      logger.info("******** End to close {}. ********", database.getName());
-    }
-  }
-
-  public void closeAllStore() {
-    dbStatService.shutdown();
-    closeOneStore(transactionRetStore);
-    closeOneStore(recentBlockStore);
-    closeOneStore(transactionHistoryStore);
-    closeOneStore(transactionStore);
-    closeOneStore(accountStore);
-    closeOneStore(blockStore);
-    closeOneStore(blockIndexStore);
-    closeOneStore(accountIdIndexStore);
-    closeOneStore(accountIndexStore);
-    closeOneStore(witnessScheduleStore);
-    closeOneStore(assetIssueStore);
-    closeOneStore(dynamicPropertiesStore);
-    closeOneStore(abiStore);
-    closeOneStore(codeStore);
-    closeOneStore(contractStore);
-    closeOneStore(contractStateStore);
-    closeOneStore(storageRowStore);
-    closeOneStore(exchangeStore);
-    closeOneStore(proposalStore);
-    closeOneStore(votesStore);
-    closeOneStore(delegatedResourceStore);
-    closeOneStore(delegatedResourceAccountIndexStore);
-    closeOneStore(assetIssueV2Store);
-    closeOneStore(exchangeV2Store);
-    closeOneStore(nullifierStore);
-    closeOneStore(merkleTreeStore);
-    closeOneStore(delegationStore);
-    closeOneStore(proofStore);
-    closeOneStore(commonStore);
-    closeOneStore(commonDataBase);
-    closeOneStore(pbftSignDataStore);
-    closeOneStore(sectionBloomStore);
-    closeOneStore(accountAssetStore);
-  }
-
   // for test only
   public List<ByteString> getWitnesses() {
     return witnessScheduleStore.getActiveWitnesses();
@@ -316,9 +267,7 @@ public BlockCapsule getHead() throws HeaderNotFound {
   }
 
   public synchronized BlockId getHeadBlockId() {
-    return new BlockId(
-        dynamicPropertiesStore.getLatestBlockHeaderHash(),
-        dynamicPropertiesStore.getLatestBlockHeaderNumber());
+    return new BlockId(dynamicPropertiesStore.getLatestBlockHeaderHash());
   }
 
   public long getHeadBlockNum() {
@@ -434,6 +383,10 @@ private void init() {
     this.nodeType = getLowestBlockNum() > 1 ? NodeType.LITE : NodeType.FULL;
   }
 
+  public void shutdown() {
+    dbStatService.shutdown();
+  }
+
   public boolean isLiteNode() {
     return getNodeType() == NodeType.LITE;
   }

chainbase/src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -346,6 +346,10 @@ public static byte[] getOwner(Transaction.Contract contract) {
         }
       }
       return owner.toByteArray();
+    } catch (InvalidProtocolBufferException invalidProtocolBufferException) {
+      logger.warn("InvalidProtocolBufferException occurred because {}, please verify the interface "
+          + "input parameters", invalidProtocolBufferException.getMessage());
+      return new byte[0];
     } catch (Exception ex) {
       logger.error(ex.getMessage());
       return new byte[0];

framework/src/main/java/org/tron/core/db/TransactionCache.java renamed to chainbase/src/main/java/org/tron/core/db/TransactionCache.java

@@ -94,7 +94,14 @@ public void reset() {
    */
   @Override
   public void close() {
-    dbSource.closeDB();
+    logger.info("******** Begin to close {}. ********", getName());
+    try {
+      dbSource.closeDB();
+    } catch (Exception e) {
+      logger.warn("Failed to close {}.", getName(), e);
+    } finally {
+      logger.info("******** End to close {}. ********", getName());
+    }
   }
 
   public abstract void put(byte[] key, T item);

chainbase/src/main/java/org/tron/core/db/TronDatabase.java

@@ -182,7 +182,14 @@ public String getName() {
 
   @Override
   public void close() {
-    revokingDB.close();
+    logger.info("******** Begin to close {}. ********", getName());
+    try {
+      revokingDB.close();
+    } catch (Exception e) {
+      logger.warn("Failed to close {}.", getName(), e);
+    } finally {
+      logger.info("******** End to close {}. ********", getName());
+    }
   }
 
   @Override