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

Fixing invoke bug

This commit is contained in:
romanman 2014-06-27 01:19:26 +01:00
parent 7cf755f448
commit 6540331acb
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ethereumj-core/src/main/java/org/ethereum/manager/WorldManager.java
View File

@ -76,7 +76,6 @@ public class WorldManager {
public void applyTransaction(Transaction tx, byte[] coinbase) { public void applyTransaction(Transaction tx, byte[] coinbase) {
// TODO: refactor the wallet pending transactions to the world manager // TODO: refactor the wallet pending transactions to the world manager
if (blockChain != null) if (blockChain != null)
blockChain.addWalletTransaction(tx); blockChain.addWalletTransaction(tx);
@ -94,7 +93,6 @@ public class WorldManager {
return; return;
} }
BigInteger nonce = repository.getNonce(senderAddress); BigInteger nonce = repository.getNonce(senderAddress);
if (nonce.compareTo(new BigInteger(tx.getNonce())) != 0) { if (nonce.compareTo(new BigInteger(tx.getNonce())) != 0) {
if (stateLogger.isWarnEnabled()) if (stateLogger.isWarnEnabled())
@ -108,7 +106,6 @@ public class WorldManager {
// first of all debit the gas from the issuer // first of all debit the gas from the issuer
BigInteger gasDebit = tx.getTotalGasValueDebit(); BigInteger gasDebit = tx.getTotalGasValueDebit();
gasDebit = gasDebit.multiply(new BigInteger(tx.getGasPrice()));
// The coinbase get the gas cost // The coinbase get the gas cost
repository.addBalance(coinbase, gasDebit); repository.addBalance(coinbase, gasDebit);
@ -302,13 +299,9 @@ public class WorldManager {
} }
public void applyTransactionList(List<Transaction> txList) {
}
public void applyBlock(Block block) { public void applyBlock(Block block) {
// miner reward // miner reward
if (repository.getAccountState(block.getCoinbase()) == null ) if (repository.getAccountState(block.getCoinbase()) == null )
repository.createAccount(block.getCoinbase()); repository.createAccount(block.getCoinbase());

4
ethereumj-core/src/main/java/org/ethereum/vm/ProgramInvokeFactory.java
View File

@ -48,7 +48,7 @@ public class ProgramInvokeFactory {
byte[] gas = tx.getGasLimit(); byte[] gas = tx.getGasLimit();
/*** CALLVALUE op ***/ /*** CALLVALUE op ***/
byte[] callValue = tx.getValue(); byte[] callValue = tx.getValue() == null ? new byte[]{0} : tx.getValue();
/*** CALLDATALOAD op ***/ /*** CALLDATALOAD op ***/
@ -76,8 +76,6 @@ public class ProgramInvokeFactory {
long gaslimit = lastBlock.getGasLimit(); long gaslimit = lastBlock.getGasLimit();
repository.startTracking();
if (logger.isInfoEnabled()){ if (logger.isInfoEnabled()){
logger.info("Program invocation: \n" + logger.info("Program invocation: \n" +
"address={}\n" + "address={}\n" +