status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't spend reserved gas

This commit is contained in:
nicksavers 2014-08-21 16:12:02 +02:00
parent e592e24eb2
commit 334f4ceb20
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ public class VM {
break; break;
case CALL: case CALL:
assert(stack.size() == 7); assert(stack.size() == 7);
program.spendGas(GasCost.CALL + stack.get(stack.size()-1).longValue(), op.name()); program.spendGas(GasCost.CALL, op.name());
long x = stack.get(stack.size()-6).longValue() + stack.get(stack.size()-7).longValue(); long x = stack.get(stack.size()-6).longValue() + stack.get(stack.size()-7).longValue();
long y = stack.get(stack.size()-4).longValue() + stack.get(stack.size()-5).longValue(); long y = stack.get(stack.size()-4).longValue() + stack.get(stack.size()-5).longValue();
newMemSize = Math.max(x, y); newMemSize = Math.max(x, y);
@ -546,13 +546,6 @@ public class VM {
DataWord memOffsetData = program.stackPop(); DataWord memOffsetData = program.stackPop();
DataWord dataOffsetData = program.stackPop(); DataWord dataOffsetData = program.stackPop();
DataWord lengthData = program.stackPop(); DataWord lengthData = program.stackPop();
// gas calculation
long price = GasCost.MEMORY * lengthData.value().intValue();
System.out.println("Spneding "+price+" gas " );
if( price < 0 ) // special case because of BigInteger to int conversion
price = Long.MAX_VALUE;
program.spendGas(price, op.name());
byte[] msgData = program.getDataCopy(dataOffsetData, lengthData); byte[] msgData = program.getDataCopy(dataOffsetData, lengthData);