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 some address logging in VM

This commit is contained in:
nicksavers 2014-08-06 01:32:54 +02:00
parent 237d538f52 3e71d0d122
commit 4668f33e57
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethereumj-core/src/main/java/org/ethereum/db/TrackDatabase.java
View File

@ -5,6 +5,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.ethereum.util.LRUMap;
/** /**
* www.ethereumJ.com * www.ethereumJ.com
* *

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

@ -382,7 +382,7 @@ public class VM {
DataWord address = program.getOwnerAddress(); DataWord address = program.getOwnerAddress();
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
hint = address.toString(); hint = "address: " + Hex.toHexString(address.getLast20Bytes());
program.stackPush(address); program.stackPush(address);
program.step(); program.step();
@ -392,7 +392,9 @@ public class VM {
DataWord balance = program.getBalance(address); DataWord balance = program.getBalance(address);
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
hint = "address: " + address.toString() + " balance: " + balance.longValue(); hint = "address: "
+ Hex.toHexString(address.getLast20Bytes())
+ " balance: " + balance.longValue();
program.stackPush(balance); program.stackPush(balance);
program.step(); program.step();
@ -401,7 +403,7 @@ public class VM {
DataWord originAddress = program.getOriginAddress(); DataWord originAddress = program.getOriginAddress();
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
hint = "address: " + originAddress.toString(); hint = "address: " + Hex.toHexString(originAddress.getLast20Bytes());
program.stackPush(originAddress); program.stackPush(originAddress);
program.step(); program.step();
@ -410,7 +412,7 @@ public class VM {
DataWord callerAddress = program.getCallerAddress(); DataWord callerAddress = program.getCallerAddress();
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
hint = "address: " + callerAddress.toString(); hint = "address: " + Hex.toHexString(callerAddress.getLast20Bytes());
program.stackPush(callerAddress); program.stackPush(callerAddress);
program.step(); program.step();
@ -513,7 +515,7 @@ public class VM {
DataWord coinbase = program.getCoinbase(); DataWord coinbase = program.getCoinbase();
if (logger.isInfoEnabled()) if (logger.isInfoEnabled())
hint = "coinbase: " + coinbase; hint = "coinbase: " + Hex.toHexString(coinbase.getLast20Bytes());
program.stackPush(coinbase); program.stackPush(coinbase);
program.step(); program.step();

2
ethereumj-core/src/main/resources/system.properties
View File

@ -81,7 +81,7 @@ samples.dir = samples
# the existing database will be # the existing database will be
# destroyed and all the data will be # destroyed and all the data will be
# downloaded from peers again # downloaded from peers again
database.reset = true database.reset = false
# place to save physical storage files # place to save physical storage files
database.dir = database database.dir = database