Merge branch 'develop' into feat/update_logback

Author: halibobo1205

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -934,6 +934,10 @@ public static void setParam(final Config config) {
           + "vm.saveInternalTx or vm.saveFeaturedInternalTx is off.");
     }
 
+    PARAMETER.saveCancelAllUnfreezeV2Details =
+        config.hasPath(Constant.VM_SAVE_CANCEL_ALL_UNFREEZE_V2_DETAILS)
+            && config.getBoolean(Constant.VM_SAVE_CANCEL_ALL_UNFREEZE_V2_DETAILS);
+
     // PARAMETER.allowShieldedTransaction =
     //     config.hasPath(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) ? config
     //         .getInt(Constant.COMMITTEE_ALLOW_SHIELDED_TRANSACTION) : 0;

framework/src/main/java/org/tron/core/net/service/relay/RelayService.java

@@ -21,6 +21,8 @@
 import org.tron.common.log.layout.DesensitizedConverter;
 import org.tron.common.parameter.CommonParameter;
 import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.ByteUtil;
+import org.tron.common.utils.DecodeUtil;
 import org.tron.common.utils.Sha256Hash;
 import org.tron.core.ChainBaseManager;
 import org.tron.core.capsule.TransactionCapsule;