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

Small refactoring

This commit is contained in:
nicksavers 2014-08-03 23:02:54 +02:00
parent ac8d2a96f9
commit 028dc5f1d4
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ethereumj-core/src/main/java/org/ethereum/core/Genesis.java
View File

@ -1,6 +1,7 @@
package org.ethereum.core;
import org.ethereum.crypto.HashUtil;
import org.ethereum.db.Repository;
import org.ethereum.manager.WorldManager;
import org.ethereum.util.RLP;
import org.slf4j.Logger;
@ -64,17 +65,18 @@ public class Genesis extends Block {
NUMBER, MIN_GAS_PRICE, GAS_LIMIT, GAS_USED, TIMESTAMP,
EXTRA_DATA, NONCE, null, null);
Repository repository = WorldManager.getInstance().getRepository();
// The proof-of-concept series include a development premine, making the state root hash
// some value stateRoot. The latest documentation should be consulted for the value of the state root.
for (String address : premine) {
WorldManager.getInstance().getRepository().createAccount(Hex.decode(address));
WorldManager.getInstance().getRepository().addBalance (Hex.decode(address), BigInteger.valueOf(2).pow(200) );
repository.createAccount(Hex.decode(address));
repository.addBalance (Hex.decode(address), BigInteger.valueOf(2).pow(200) );
}
this.setStateRoot(WorldManager.getInstance().getRepository().getRootHash());
WorldManager.getInstance().getRepository().dumpState(0, 0, null);
setStateRoot(repository.getWorldState().getRootHash());
repository.dumpState(0, 0, null);
logger.info("Genesis-hash: " + Hex.toHexString(this.getHash()));
logger.info("Genesis-stateRoot: " + Hex.toHexString(this.getStateRoot()));
logger.info("Genesis-hash: {}", Hex.toHexString(this.getHash()));
logger.info("Genesis-stateRoot: {}", Hex.toHexString(this.getStateRoot()));
}
public static Block getInstance() {

25
ethereumj-core/src/main/java/org/ethereum/db/Repository.java
View File

@ -7,7 +7,6 @@ import org.ethereum.core.Blockchain;
import org.ethereum.core.Genesis;
import org.ethereum.crypto.HashUtil;
import org.ethereum.json.JSONHelper;
import org.ethereum.manager.WorldManager;
import org.ethereum.trie.TrackTrie;
import org.ethereum.trie.Trie;
import org.ethereum.util.ByteUtil;
@ -181,9 +180,9 @@ public class Repository {
byte[] accountStateRLP = accountStateDB.get(addr);
if (accountStateRLP.length == 0) {
if (accountStateRLP.length == 0)
return null;
}
AccountState state = new AccountState(accountStateRLP);
return state;
}
@ -196,11 +195,10 @@ public class Repository {
logger.debug("Get contract details for: [ {} ]", Hex.toHexString(addr));
byte[] accountDetailsRLP = contractDetailsDB.get(addr);
if (accountDetailsRLP == null) {
return null;
}
if (accountDetailsRLP == null)
return null;
if (logger.isDebugEnabled())
logger.debug("Contract details RLP: [ {} ]", Hex.toHexString(accountDetailsRLP));
@ -214,10 +212,9 @@ public class Repository {
AccountState state = getAccountState(addr);
if (state == null){
if (state == null)
state = createAccount(addr);
}
BigInteger newBalance = state.addToBalance(value);
if (logger.isDebugEnabled())
@ -347,10 +344,6 @@ public class Repository {
contractDetailsDB.delete(addr);
}
public byte[] getRootHash() {
return this.worldState.getRootHash();
}
public List<ByteArrayWrapper> dumpKeys(){
return stateDB.dumpKeys();
}
@ -413,7 +406,7 @@ public class Repository {
bw.write("\n");
}
String rootHash = Hex.toHexString(WorldManager.getInstance().getRepository().getRootHash());
String rootHash = Hex.toHexString(this.getWorldState().getRootHash());
bw.write(
String.format(" => Global State Root: [ %s ]", rootHash)
);