Merge pull request tronprotocol#2267 from tronprotocol/hotfix/new_storage_create2_1

create2 new storage-key

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/runtime/vm/program/Program.java

@@ -453,8 +453,8 @@ public void createContract(DataWord value, DataWord memStart, DataWord memSize)
     createContractImpl(value, programCode, newAddress, false);
   }
 
-  private void createContractImpl(DataWord value, byte[] programCode, byte[] newAddress
-      , boolean isCreate2) {
+  private void createContractImpl(DataWord value, byte[] programCode, byte[] newAddress,
+      boolean isCreate2) {
     byte[] senderAddress = convertToTronAddress(this.getContractAddress().getLast20Bytes());
 
     if (logger.isDebugEnabled()) {

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

@@ -8,7 +8,6 @@
 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;
 
@@ -21,26 +20,25 @@ public class Storage {
   @Getter
   private final Map<DataWord, StorageRowCapsule> rowCache = new HashMap<>();
 
+  @Getter
+  private byte[] address;
+
   private static final int PREFIX_BYTES = 16;
 
   public Storage(byte[] address, StorageRowStore store) {
     addrHash = addrHash(address);
+    this.address = address;
     this.store = store;
   }
 
-  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;
+  public void generateAddrHash(byte[] trxId) {
+    // update addreHash for create2
+    addrHash = addrHash(address, trxId);
   }
 
   public Storage(Storage storage) {
     this.addrHash = storage.addrHash.clone();
+    this.address = storage.getAddress().clone();
     this.store = storage.store;
     storage.getRowCache().forEach((DataWord rowKey, StorageRowCapsule row) -> {
       StorageRowCapsule newRow = new StorageRowCapsule(row);
@@ -90,7 +88,6 @@ private static byte[] addrHash(byte[] address, byte[] trxHash) {
     return Hash.sha3(ByteUtil.merge(address, trxHash));
   }
 
-
   public void commit() {
     rowCache.forEach((DataWord rowKey, StorageRowCapsule row) -> {
       if (row.isDirty()) {

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

@@ -329,22 +329,21 @@ public synchronized Storage getStorage(byte[] address) {
     if (storageCache.containsKey(key)) {
       return storageCache.get(key);
     }
-
     Storage storage;
     if (this.parent != null) {
       Storage parentStorage = parent.getStorage(address);
       if (VMConfig.getEnergyLimitHardFork()) {
+        // deep copy
         storage = new Storage(parentStorage);
       } else {
         storage = parentStorage;
       }
     } else {
-      if (VMConfig.allowTvmConstantinople()) {
-        ContractCapsule contract = getContract(address);
-        storage = new Storage(address, dbManager.getStorageRowStore(), contract);
-      } else {
-        storage = new Storage(address, dbManager.getStorageRowStore());
-      }
+      storage = new Storage(address, dbManager.getStorageRowStore());
+    }
+    ContractCapsule contract = getContract(address);
+    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;
     }