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

Merge branch 'master' of https://github.com/romanman/ethereumj

This commit is contained in:
romanman 2014-05-22 15:31:02 +03:00
parent 17af20ab50 571c1916a2
commit cff3395b78
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethereumj-core/src/main/java/org/ethereum/core/Denomination.java
View File

@ -1,6 +1,5 @@
package org.ethereum.core; package org.ethereum.core;
import java.math.BigDecimal;
import java.math.BigInteger; import java.math.BigInteger;
public enum Denomination { public enum Denomination {
@ -23,7 +22,7 @@ public enum Denomination {
return amount; return amount;
} }
private static BigInteger newBigInt(double value) { private static BigInteger newBigInt(int value) {
return BigDecimal.valueOf(Math.pow(10, value)).toBigInteger(); return BigInteger.valueOf(10).pow(value);
} }
} }

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

@ -18,7 +18,7 @@ public class Genesis extends Block {
private static byte[] stateRoot = // TODO: Get stateRoot from actual state private static byte[] stateRoot = // TODO: Get stateRoot from actual state
Hex.decode("12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16"); Hex.decode("12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16");
private static byte[] txTrieRoot = new byte[0]; private static byte[] txTrieRoot = new byte[0];
private static byte[] difficulty = BigInteger.valueOf((long) Math.pow(2, 22)).toByteArray(); private static byte[] difficulty = BigInteger.valueOf(2).pow(22).toByteArray();
private static long number = 0; private static long number = 0;
private static long minGasPrice = 0; private static long minGasPrice = 0;
private static long gasLimit = 1000000; private static long gasLimit = 1000000;