update condition

Author: BlueHoopor

src/main/java/org/tron/common/runtime/RuntimeImpl.java

@@ -315,7 +315,7 @@ public long getTotalEnergyLimitWithFixRatio(AccountCapsule creator, AccountCapsu
   public long getTotalEnergyLimit(AccountCapsule creator, AccountCapsule caller,
       TriggerSmartContract contract, long feeLimit, long callValue)
       throws ContractValidateException {
-    if (VMConfig.allowTvmConstantinople() && Objects.isNull(creator)) {
+    if (Objects.isNull(creator) && VMConfig.allowTvmConstantinople()) {
       return getAccountEnergyLimitWithFixRatio(caller, feeLimit, callValue);
     }
     //  according to version

src/main/java/org/tron/common/storage/DepositImpl.java

@@ -342,7 +342,7 @@ public synchronized Storage getStorage(byte[] address) {
       storage = new Storage(address, dbManager.getStorageRowStore());
     }
     ContractCapsule contract = getContract(address);
-    if (contract != null) {
+    if (contract != null && !ByteUtil.isNullOrZeroArray(contract.getTrxHash())) {
       storage.generateAddrHash(contract.getTrxHash());
     }
     return storage;

src/main/java/org/tron/core/capsule/ReceiptCapsule.java

@@ -106,7 +106,7 @@ public void payEnergyBill(Manager manager, AccountCapsule origin, AccountCapsule
       return;
     }
 
-    if (VMConfig.allowTvmConstantinople() && Objects.isNull(origin)) {
+    if (Objects.isNull(origin) && VMConfig.allowTvmConstantinople()) {
       payEnergyBill(manager, caller, receipt.getEnergyUsageTotal(), energyProcessor, now);
       return;
     }