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

Mini merge

This commit is contained in:
nicksavers 2014-06-07 18:49:58 +02:00
parent a00ff1e205 f59e2408f9
commit f4d933f445
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ public class Blockchain extends ArrayList<Block> {
// on this price will use default 10000000000000 // on this price will use default 10000000000000
// todo: refactor this longValue some constant defaults class 10000000000000L // todo: refactor this longValue some constant defaults class 10000000000000L
this.gasPrice = block.isGenesis() ? INITIAL_MIN_GAS_PRICE : block.getMinGasPrice(); this.gasPrice = block.isGenesis() ? INITIAL_MIN_GAS_PRICE : block.getMinGasPrice();
if(lastBlock == null || block.getNumber() > lastBlock.getNumber()) if(lastBlock == null || block.getNumber() > lastBlock.getNumber())
this.lastBlock = block; this.lastBlock = block;
this.add(block); this.add(block);
} }