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

Fix OOG while A calls B makes A call unsuccesful

This commit is contained in:
nicksavers 2014-10-18 20:28:24 +02:00
parent 6e32c4a958
commit 4f10a0bec2
1 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ethereumj-core/src/main/java/org/ethereum/vm/Program.java
View File

@ -269,7 +269,7 @@ public class Program {
logger.info("creating a new contract inside contract run: [{}]", Hex.toHexString(senderAddress));
// actual gas subtract
int gas = this.getGas().intValue();
long gas = this.getGas().longValue();
this.spendGas(gas, "internal call");
// [2] CREATE THE CONTRACT ADDRESS
@ -365,8 +365,7 @@ public class Program {
logger.info("No gas for the internal call, \n" +
"fromAddress={}, codeAddress={}",
Hex.toHexString(senderAddress), Hex.toHexString(codeAddress));
this.stackPushZero();
return;
throw new OutOfGasException();
}
BigInteger endowment = msg.getEndowment().value();
@ -376,32 +375,26 @@ public class Program {
return;
}
result.getRepository().addBalance(senderAddress, endowment.negate());
BigInteger contextBalance = result.getRepository().addBalance(contextAddress, endowment);
if (invokeData.byTestingSuite()) {
logger.info("[testing suite] - omit real call");
stackPushOne();
// This keeps track of the calls created for a test
this.getResult().addCallCreate(data.array(),
msg.getCodeAddress().getLast20Bytes(),
msg.getGas().getNoLeadZeroesData(),
msg.getEndowment().getNoLeadZeroesData());
return;
}
// actual gas subtract
this.spendGas(msg.getGas().intValue(), "internal call");
this.spendGas(msg.getGas().longValue(), "internal call");
Repository trackRepository = result.getRepository().getTrack();
trackRepository.startTracking();
trackRepository.addBalance(contextAddress, msg.getEndowment().value());
ProgramInvoke programInvoke =
ProgramInvokeFactory.createProgramInvoke(this, msg.getCodeAddress(),
msg.getEndowment(), msg.getGas(), result.getRepository().getBalance(contextAddress),
data.array(),
trackRepository, this.invokeData.getCallDeep() + 1);
ProgramInvoke programInvoke = ProgramInvokeFactory.createProgramInvoke(
this, msg.getCodeAddress(), msg.getEndowment(), msg.getGas(),
contextBalance, data.array(), trackRepository,
this.invokeData.getCallDeep() + 1);
ProgramResult result = null;
@ -445,13 +438,12 @@ public class Program {
if (result != null) {
BigInteger refundGas = msg.getGas().value().subtract(BigInteger.valueOf(result.getGasUsed()));
if (refundGas.compareTo(BigInteger.ZERO) == 1) {
this.refundGas(refundGas.intValue(), "remaining gas from the internal call");
this.refundGas(refundGas.longValue(), "remaining gas from the internal call");
logger.info("The remaining gas refunded, account: [{}], gas: [{}] ",
Hex.toHexString(senderAddress), refundGas.toString());
}
} else {
this.refundGas(msg.getGas().intValue(), "remaining gas from the internal call");
this.refundGas(msg.getGas().longValue(), "remaining gas from the internal call");
}
}