Merge pull request #1204 from ethereum/feature/create2-gas-cost-update

CREATE2 gas cost update

Author: mkalinin

ethereumj-core/src/main/java/org/ethereum/vm/PrecompiledContracts.java

@@ -30,6 +30,7 @@
 import static org.ethereum.util.BIUtil.isLessThan;
 import static org.ethereum.util.BIUtil.isZero;
 import static org.ethereum.util.ByteUtil.*;
+import static org.ethereum.vm.VMUtils.getSizeInWords;
 
 /**
  * @author Roman Mandeleil
@@ -102,7 +103,7 @@ public long getGasForData(byte[] data) {
             // gas charge for the execution:
             // minimum 1 and additional 1 for each 32 bytes word (round  up)
             if (data == null) return 15;
-            return 15 + (data.length + 31) / 32 * 3;
+            return 15 + getSizeInWords(data.length) * 3;
         }
 
         @Override
@@ -120,7 +121,7 @@ public long getGasForData(byte[] data) {
             // gas charge for the execution:
             // minimum 50 and additional 50 for each 32 bytes word (round  up)
             if (data == null) return 60;
-            return 60 + (data.length + 31) / 32 * 12;
+            return 60 + getSizeInWords(data.length) * 12;
         }
 
         @Override
@@ -142,7 +143,7 @@ public long getGasForData(byte[] data) {
             // gas charge for the execution:
             // minimum 50 and additional 50 for each 32 bytes word (round  up)
             if (data == null) return 600;
-            return 600 + (data.length + 31) / 32 * 120;
+            return 600 + getSizeInWords(data.length) * 120;
         }
 
         @Override

ethereumj-core/src/main/java/org/ethereum/vm/VM.java

@@ -41,6 +41,7 @@
 import static org.ethereum.util.ByteUtil.EMPTY_BYTE_ARRAY;
 import static org.ethereum.util.ByteUtil.toHexString;
 import static org.ethereum.vm.OpCode.*;
+import static org.ethereum.vm.VMUtils.getSizeInWords;
 
 /**
  * The Ethereum Virtual Machine (EVM) is responsible for initialization
@@ -320,7 +321,7 @@ else if (!currentValue.isZero() && newValue.isZero()) {
                 case SHA3:
                     gasCost = gasCosts.getSHA3() + calcMemGas(gasCosts, oldMemSize, memNeeded(stack.peek(), stack.get(stack.size() - 2)), 0);
                     DataWord size = stack.get(stack.size() - 2);
-                    long chunkUsed = (size.longValueSafe() + 31) / 32;
+                    long chunkUsed = getSizeInWords(size.longValueSafe());
                     gasCost += chunkUsed * gasCosts.getSHA3_WORD();
                     break;
                 case CALLDATACOPY:
@@ -394,8 +395,10 @@ else if (!currentValue.isZero() && newValue.isZero()) {
                             memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0);
                     break;
                 case CREATE2:
-                    gasCost = gasCosts.getCREATE() + calcMemGas(gasCosts, oldMemSize,
-                            memNeeded(stack.get(stack.size() - 2), stack.get(stack.size() - 3)), 0);
+                    DataWord codeSize = stack.get(stack.size() - 3);
+                    gasCost = gasCosts.getCREATE() +
+                            calcMemGas(gasCosts, oldMemSize, memNeeded(stack.get(stack.size() - 2), codeSize), 0) +
+                            getSizeInWords(codeSize.longValueSafe()) * gasCosts.getSHA3_WORD();
                     break;
                 case LOG0:
                 case LOG1:

ethereumj-core/src/main/java/org/ethereum/vm/VMUtils.java

@@ -153,4 +153,11 @@ public static String unzipAndDecode(String content) {
             return content;
         }
     }
+
+    /**
+     * Returns number of VM words required to hold data of size {@code size}
+     */
+    public static long getSizeInWords(long size) {
+        return size == 0 ? 0 : (size - 1) / 32 + 1;
+    }
 }