Merge pull request #2259 from tronprotocol/hotfix/new_storage_create2

create2 new storage-key

Author: CodeNinjaEvan

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

@@ -79,6 +79,7 @@
 import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.AccountType;
 import org.tron.protos.Protocol.SmartContract;
+import org.tron.protos.Protocol.SmartContract.Builder;
 
 /**
  * @author Roman Mandeleil
@@ -449,10 +450,11 @@ public void createContract(DataWord value, DataWord memStart, DataWord memSize)
     byte[] newAddress = Wallet
         .generateContractAddress(rootTransactionId, nonce);
 
-    createContractImpl(value, programCode, newAddress);
+    createContractImpl(value, programCode, newAddress, false);
   }
 
-  private void createContractImpl(DataWord value, byte[] programCode, byte[] newAddress) {
+  private void createContractImpl(DataWord value, byte[] programCode, byte[] newAddress
+      , boolean isCreate2) {
     byte[] senderAddress = convertToTronAddress(this.getContractAddress().getLast20Bytes());
 
     if (logger.isDebugEnabled()) {
@@ -485,9 +487,14 @@ private void createContractImpl(DataWord value, byte[] programCode, byte[] newAd
       }
 
       if (!contractAlreadyExists) {
-        SmartContract newSmartContract = SmartContract.newBuilder()
-            .setContractAddress(ByteString.copyFrom(newAddress)).setConsumeUserResourcePercent(100)
-            .setOriginAddress(ByteString.copyFrom(senderAddress)).build();
+        Builder builder = SmartContract.newBuilder();
+        builder.setContractAddress(ByteString.copyFrom(newAddress))
+            .setConsumeUserResourcePercent(100)
+            .setOriginAddress(ByteString.copyFrom(senderAddress));
+        if (isCreate2) {
+          builder.setTrxHash(ByteString.copyFrom(rootTransactionId));
+        }
+        SmartContract newSmartContract = builder.build();
         deposit.createContract(newAddress, new ContractCapsule(newSmartContract));
       }
     } else {
@@ -1237,7 +1244,7 @@ public void createContract2(DataWord value, DataWord memStart, DataWord memSize,
 
     byte[] contractAddress = Wallet
         .generateContractAddress2(senderAddress, salt.getData(), programCode);
-    createContractImpl(value, programCode, contractAddress);
+    createContractImpl(value, programCode, contractAddress, true);
   }
 
   static class ByteCodeIterator {

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

@@ -5,9 +5,10 @@
 import java.util.HashMap;
 import java.util.Map;
 import lombok.Getter;
-import org.spongycastle.util.encoders.Hex;
 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,6 +28,17 @@ public Storage(byte[] address, StorageRowStore store) {
     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 Storage(Storage storage) {
     this.addrHash = storage.addrHash.clone();
     this.store = storage.store;
@@ -71,6 +83,14 @@ private static byte[] addrHash(byte[] address) {
     return Hash.sha3(address);
   }
 
+  private static byte[] addrHash(byte[] address, byte[] trxHash) {
+    if (ByteUtil.isNullOrZeroArray(trxHash)) {
+      return Hash.sha3(address);
+    }
+    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

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

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

@@ -113,4 +113,8 @@ public long getOriginEnergyLimit() {
   public void clearABI() {
     this.smartContract = this.smartContract.toBuilder().setAbi(ABI.getDefaultInstance()).build();
   }
+
+  public byte[] getTrxHash() {
+    return this.smartContract.getTrxHash().toByteArray();
+  }
 }

src/main/protos/core/Tron.proto

@@ -543,6 +543,7 @@ message SmartContract {
   string name = 7;
   int64 origin_energy_limit = 8;
   bytes code_hash = 9;
+  bytes trx_hash = 10;
 }
 
 message InternalTransaction {