Merge branch 'hotfix/new_storage_create2' of https://github.com/tronprotocol/java-tron into hotfix/new_storage_create2

Author: BlueHoopor

src/main/java/org/tron/common/runtime/vm/program/Storage.java

@@ -8,6 +8,7 @@
 import org.tron.common.crypto.Hash;
 import org.tron.common.runtime.vm.DataWord;
 import org.tron.common.utils.ByteUtil;
+import org.tron.core.capsule.ContractCapsule;
 import org.tron.core.capsule.StorageRowCapsule;
 import org.tron.core.db.StorageRowStore;
 
@@ -27,7 +28,13 @@ public Storage(byte[] address, StorageRowStore store) {
     this.store = store;
   }
 
-  public Storage(byte[] address, StorageRowStore store, byte[] trxHash) {
+  public Storage(byte[] address, StorageRowStore store, ContractCapsule contract) {
+    byte[] trxHash;
+    if (contract == null) {
+      trxHash = new byte[0];
+    } else {
+      trxHash = contract.getTrxHash();
+    }
     addrHash = addrHash(address, trxHash);
     this.store = store;
   }

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

@@ -341,7 +341,7 @@ public synchronized Storage getStorage(byte[] address) {
     } else {
       if (VMConfig.allowTvmConstantinople()) {
         ContractCapsule contract = getContract(address);
-        storage = new Storage(address, dbManager.getStorageRowStore(), contract.getTrxHash());
+        storage = new Storage(address, dbManager.getStorageRowStore(), contract);
       } else {
         storage = new Storage(address, dbManager.getStorageRowStore());
       }