set contractVersion

rw97 · Aug 26, 2021 · 1646399 · 1646399
1 parent a1f430a
commit 1646399
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/actuator/src/main/java/org/tron/core/actuator/VMActuator.java b/actuator/src/main/java/org/tron/core/actuator/VMActuator.java
@@ -377,6 +377,9 @@ private void create()
               vmShouldEndInUs, energyLimit);
       this.vm = new VM();
       this.program = new Program(ops, programInvoke, rootInternalTransaction, vmConfig);
+      if (VMConfig.allowTvmCompatibleEvm()) {
+        this.program.setContractVersion(1);
+      }
       byte[] txId = TransactionUtil.getTransactionId(trx).getBytes();
       this.program.setRootTransactionId(txId);
       if (enableEventListener && isCheckTransaction()) {
@@ -486,7 +489,10 @@ private void call()
       this.vm = new VM();
       rootInternalTransaction = new InternalTransaction(trx, trxType);
       this.program = new Program(code, programInvoke, rootInternalTransaction, vmConfig);
-      this.program.setContractVersion(repository.getContract(contractAddress).getContractVersion());
+      if (VMConfig.allowTvmCompatibleEvm()) {
+      this.program.setContractVersion(
+          repository.getContract(contractAddress).getContractVersion());
+      }
       byte[] txId = TransactionUtil.getTransactionId(trx).getBytes();
       this.program.setRootTransactionId(txId);
 

diff --git a/actuator/src/main/java/org/tron/core/vm/program/Program.java b/actuator/src/main/java/org/tron/core/vm/program/Program.java
@@ -796,6 +796,9 @@ this, new DataWord(newAddress), getContractAddress(), value, new DataWord(0),
       VM vm = new VM(config);
       Program program = new Program(programCode, programInvoke, internalTx, config);
       program.setRootTransactionId(this.rootTransactionId);
+      if (VMConfig.allowTvmCompatibleEvm()) {
+        program.setContractVersion(this.contractVersion);
+      }
       vm.play(program);
       createResult = program.getResult();
       getTrace().merge(program.getTrace());
@@ -1019,7 +1022,10 @@ this, new DataWord(contextAddress),
       VM vm = new VM(config);
       Program program = new Program(programCode, programInvoke, internalTx, config);
       program.setRootTransactionId(this.rootTransactionId);
-      program.setContractVersion(invoke.getDeposit().getContract(codeAddress).getContractVersion());
+      if (VMConfig.allowTvmCompatibleEvm()) {
+        program.setContractVersion(
+            invoke.getDeposit().getContract(codeAddress).getContractVersion());
+      }
       vm.play(program);
       callResult = program.getResult();