modify getCallEnergy

rw97 · Aug 27, 2021 · 0a234bc · 0a234bc
1 parent 1646399
commit 0a234bc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 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
@@ -190,8 +190,6 @@ public void execute(Object object) throws ContractExeException {
           byte[] code = program.getResult().getHReturn();
           if (vmConfig.allowTvmLondon() && code[0] == (byte) 0xEF) {
             // todo deal with exception
-            // throw new Program.BytecodeExecutionException("Contract creation error: code cannot "
-            //     + "start with {}", "0xEF");
             if (null == result.getException()) {
               result.setException(Program.Exception
                   .invalidOpCode((byte) 0xEF));

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
@@ -1689,7 +1689,7 @@ public void checkTokenIdInTokenBalance(DataWord tokenIdDataWord) {
   public DataWord getCallEnergy(OpCode op, DataWord requestedEnergy, DataWord availableEnergy) {
     if (getContractVersion() == 1) {
       DataWord availableEnergyReduce = availableEnergy.clone();
-      availableEnergyReduce.div(new DataWord(intToBytes(64)));
+      availableEnergyReduce.div(new DataWord(64));
       availableEnergy.sub(availableEnergyReduce);
     }
     return requestedEnergy.compareTo(availableEnergy) > 0 ? availableEnergy : requestedEnergy;