use 3M to checkmemsize in anyplace

Author: tjchern

src/main/java/org/tron/common/runtime/vm/VM.java

@@ -63,18 +63,12 @@ private void checkMemorySize(OpCode op, BigInteger newMemSize) {
 
 
   private long calcMemEnergy(EnergyCost energyCosts, long oldMemSize, BigInteger newMemSize,
-      long copySize) {
+      long copySize, OpCode op) {
     //todo: simpfy this calc, just use energy relative to energy time
 
     long energyCost = 0;
 
-    // Avoid overflows
-    if (newMemSize.compareTo(MAX_MEM_SIZE) > 0) {
-      // throw VMMemoryOverflowException();
-      throw Program.Exception.energyOverflow(newMemSize, MAX_MEM_SIZE);
-      // todo: add memory overflow
-      // throw Program.Exception.memoryOverflow();
-    }
+    checkMemorySize(op, newMemSize);
 
     // memory drop consume calc
     long memoryUsage = (newMemSize.longValue() + 31) / 32 * 32;
@@ -160,26 +154,26 @@ public void step(Program program) {
         case MSTORE:
           energyCost = calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.peek(), new DataWord(32)),
-              0);
+              0, op);
           break;
         case MSTORE8:
           energyCost = calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.peek(), new DataWord(1)),
-              0);
+              0, op);
           break;
         case MLOAD:
           energyCost = calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.peek(), new DataWord(32)),
-              0);
+              0, op);
           break;
         case RETURN:
         case REVERT:
           energyCost = energyCosts.getSTOP() + calcMemEnergy(energyCosts, oldMemSize,
-              memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0);
+              memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0, op);
           break;
         case SHA3:
           energyCost = energyCosts.getSHA3() + calcMemEnergy(energyCosts, oldMemSize,
-              memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0);
+              memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0, op);
           DataWord size = stack.get(stack.size() - 2);
           long chunkUsed = (size.longValueSafe() + 31) / 32;
           energyCost += chunkUsed * energyCosts.getSHA3_WORD();
@@ -188,20 +182,20 @@ public void step(Program program) {
         case RETURNDATACOPY:
           energyCost = calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.peek(), stack.get(stack.size() - 3)),
-              stack.get(stack.size() - 3).longValueSafe());
+              stack.get(stack.size() - 3).longValueSafe(), op);
           break;
         case CODECOPY:
           energyCost = calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.peek(), stack.get(stack.size() - 3)),
-              stack.get(stack.size() - 3).longValueSafe());
+              stack.get(stack.size() - 3).longValueSafe(), op);
           break;
         case EXTCODESIZE:
           energyCost = energyCosts.getEXT_CODE_SIZE();
           break;
         case EXTCODECOPY:
           energyCost = energyCosts.getEXT_CODE_COPY() + calcMemEnergy(energyCosts, oldMemSize,
               memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 4)),
-              stack.get(stack.size() - 4).longValueSafe());
+              stack.get(stack.size() - 4).longValueSafe(), op);
           break;
         case CALL:
         case CALLCODE:
@@ -232,7 +226,7 @@ public void step(Program program) {
               stack.get(stack.size() - opOff - 1)); // in offset+size
           BigInteger out = memNeeded(stack.get(stack.size() - opOff - 2),
               stack.get(stack.size() - opOff - 3)); // out offset+size
-          energyCost += calcMemEnergy(energyCosts, oldMemSize, in.max(out), 0);
+          energyCost += calcMemEnergy(energyCosts, oldMemSize, in.max(out), 0, op);
           checkMemorySize(op, in.max(out));
 
           if (energyCost > program.getEnergyLimitLeft().longValueSafe()) {
@@ -249,7 +243,7 @@ public void step(Program program) {
           break;
         case CREATE:
           energyCost = energyCosts.getCREATE() + calcMemEnergy(energyCosts, oldMemSize,
-              memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0);
+              memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0, op);
           break;
         case LOG0:
         case LOG1:
@@ -271,7 +265,7 @@ public void step(Program program) {
               energyCosts.getLOG_DATA_ENERGY() * stack.get(stack.size() - 2).longValue() +
               calcMemEnergy(energyCosts, oldMemSize,
                   memNeeded(stack.peek(), stack.get(stack.size() - 2)),
-                  0);
+                  0, op);
 
           checkMemorySize(op, memNeeded(stack.peek(), stack.get(stack.size() - 2)));
           break;

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

@@ -1472,7 +1472,7 @@ public static OutOfResourceException notEnoughTime(String op) {
 
 
     public static OutOfMemoryException memoryOverflow(OpCode op) {
-      return new OutOfMemoryException("Out of Memory when '%s' operation executing", op);
+      return new OutOfMemoryException("Out of Memory when '%s' operation executing", op.name());
     }
 
     public static OutOfStorageException notEnoughStorage() {

src/main/java/org/tron/core/db/Manager.java

@@ -1053,7 +1053,7 @@ public boolean processTransaction(final TransactionCapsule trxCap, BlockCapsule
     // if (blockCap != null && blockCap.generatedByMyself &&
     //     !blockCap.getInstance().getBlockHeader().getWitnessSignature().isEmpty() &&
     //     trxCap.getInstance().getRet(0).getContractRet() != contractResult.SUCCESS) {
-    //
+    // setBill(energyUsage);
     // } else {
     // }