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 pull request #23 from nicksavers/master 

Merge small changes
This commit is contained in:
romanman 2014-06-07 09:42:36 +01:00
parent 11cbb3c1b6 a3f2206d51
commit a22dfb99f9
6 changed files with 323 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ public class AccountState {
this.rlpEncoded = rlpData; this.rlpEncoded = rlpData;
RLPList items = (RLPList) RLP.decode2(rlpEncoded).get(0); RLPList items = (RLPList) RLP.decode2(rlpEncoded).get(0);
this.nonce = new BigInteger(1, ((items.get(0).getRLPData()) == null ? new byte[]{} : items.get(0).getRLPData())); this.nonce = new BigInteger(1, ((items.get(0).getRLPData()) == null ? new byte[0] : items.get(0).getRLPData()));
this.balance = new BigInteger(1, items.get(1).getRLPData()); this.balance = new BigInteger(1, items.get(1).getRLPData());
this.stateRoot = items.get(2).getRLPData(); this.stateRoot = items.get(2).getRLPData();
this.codeHash = items.get(3).getRLPData(); this.codeHash = items.get(3).getRLPData();

10
ethereumj-core/src/main/java/org/ethereum/core/Block.java
View File

@ -89,6 +89,8 @@ public class Block {
this.transactionsList.add(tx); this.transactionsList.add(tx);
this.txsState.update(RLP.encodeInt(i), tx.getEncoded()); this.txsState.update(RLP.encodeInt(i), tx.getEncoded());
// this.accountState.update();
// YP 4.3.1 // YP 4.3.1
RLPElement cummGas = ((RLPList)rlpTxReceipt).get(1); RLPElement cummGas = ((RLPList)rlpTxReceipt).get(1);
RLPElement pstTxState = ((RLPList)rlpTxReceipt).get(2); RLPElement pstTxState = ((RLPList)rlpTxReceipt).get(2);
@ -184,6 +186,14 @@ public class Block {
return this.header.getNonce(); return this.header.getNonce();
} }
public Trie getAccountState() {
return this.accountState;
}
public Trie getTxsState() {
return this.txsState;
}
public List<Transaction> getTransactionsList() { public List<Transaction> getTransactionsList() {
if (!parsed) parseRLP(); if (!parsed) parseRLP();
if (transactionsList == null) { if (transactionsList == null) {

4
ethereumj-core/src/main/java/org/ethereum/trie/Trie.java
View File

@ -104,9 +104,7 @@ public class Trie {
* @return value * @return value
*/ */
public byte[] get(String key) { public byte[] get(String key) {
byte[] k = binToNibbles(key.getBytes()); return this.get(key.getBytes());
Value c = new Value( this.get(this.root, k) );
return c.asBytes();
} }
/** /**

101
ethereumj-core/src/main/java/org/ethereum/vm/Program.java
View File

@ -35,7 +35,8 @@ public class Program {
public Program(byte[] ops, ProgramInvoke invokeData) { public Program(byte[] ops, ProgramInvoke invokeData) {
if (ops == null) throw new RuntimeException("program can not run with ops: null"); if (ops == null)
throw new RuntimeException("program can not run with ops: null");
this.invokeData = invokeData; this.invokeData = invokeData;
this.ops = ops; this.ops = ops;
@ -45,7 +46,6 @@ public class Program {
return ops[pc]; return ops[pc];
} }
public void stackPush(byte[] data) { public void stackPush(byte[] data) {
DataWord stackWord = new DataWord(data); DataWord stackWord = new DataWord(data);
stack.push(stackWord); stack.push(stackWord);
@ -86,19 +86,22 @@ public class Program {
public void step() { public void step() {
++pc; ++pc;
if (pc >= ops.length) stop(); if (pc >= ops.length)
stop();
} }
public byte[] sweep(int n) { public byte[] sweep(int n) {
if (pc + n > ops.length) { if (pc + n > ops.length) {
stop(); stop();
throw new RuntimeException("pc overflow sweep n: " + n + " pc: " + pc); throw new RuntimeException("pc overflow sweep n: " + n + " pc: "
+ pc);
} }
byte[] data = Arrays.copyOfRange(ops, pc, pc + n); byte[] data = Arrays.copyOfRange(ops, pc, pc + n);
pc += n; pc += n;
if (pc >= ops.length) stop(); if (pc >= ops.length)
stop();
return data; return data;
} }
@ -115,7 +118,8 @@ public class Program {
public int getMemSize() { public int getMemSize() {
int memSize = 0; int memSize = 0;
if (memory != null) memSize = memory.limit(); if (memory != null)
memSize = memory.limit();
return memSize; return memSize;
} }
@ -149,18 +153,19 @@ public class Program {
byte[] chunk = new byte[size]; byte[] chunk = new byte[size];
if (memory.limit() < offset + size) size = memory.limit() - offset; if (memory.limit() < offset + size)
size = memory.limit() - offset;
System.arraycopy(memory.array(), offset, chunk, 0, size); System.arraycopy(memory.array(), offset, chunk, 0, size);
return ByteBuffer.wrap(chunk); return ByteBuffer.wrap(chunk);
} }
private void allocateMemory(int address, byte[] value) { private void allocateMemory(int address, byte[] value) {
int memSize = 0; int memSize = 0;
if (memory != null) memSize = memory.limit(); if (memory != null)
memSize = memory.limit();
// check if you need to allocate // check if you need to allocate
if (memSize < (address + value.length)) { if (memSize < (address + value.length)) {
@ -174,20 +179,20 @@ public class Program {
} }
// complete to 32 // complete to 32
sizeToAllocate = (sizeToAllocate % 32)==0 ? sizeToAllocate : sizeToAllocate = (sizeToAllocate % 32) == 0 ? sizeToAllocate
sizeToAllocate + (32 - sizeToAllocate % 32); : sizeToAllocate + (32 - sizeToAllocate % 32);
sizeToAllocate = (sizeToAllocate == 0) ? 32 : sizeToAllocate; sizeToAllocate = (sizeToAllocate == 0) ? 32 : sizeToAllocate;
ByteBuffer tmpMem = ByteBuffer.allocate(sizeToAllocate); ByteBuffer tmpMem = ByteBuffer.allocate(sizeToAllocate);
if (memory != null) if (memory != null)
System.arraycopy(memory.array(), 0, tmpMem.array(), 0, memory.limit()); System.arraycopy(memory.array(), 0, tmpMem.array(), 0,
memory.limit());
memory = tmpMem; memory = tmpMem;
} }
} }
public void spendGas(int gasValue) { public void spendGas(int gasValue) {
// todo: check it against avail gas // todo: check it against avail gas
// todo: out of gas will revert the changes [YP 5, 6 ] // todo: out of gas will revert the changes [YP 5, 6 ]
@ -204,50 +209,57 @@ public class Program {
storage.put(keyWord, valWord); storage.put(keyWord, valWord);
} }
public DataWord getOwnerAddress() { public DataWord getOwnerAddress() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getOwnerAddress(); return invokeData.getOwnerAddress();
} }
public DataWord getBalance() { public DataWord getBalance() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getBalance(); return invokeData.getBalance();
} }
public DataWord getOriginAddress() { public DataWord getOriginAddress() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getOriginAddress(); return invokeData.getOriginAddress();
} }
public DataWord getCallerAddress() { public DataWord getCallerAddress() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getCallerAddress(); return invokeData.getCallerAddress();
} }
public DataWord getMinGasPrice() { public DataWord getMinGasPrice() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getMinGasPrice(); return invokeData.getMinGasPrice();
} }
public DataWord getCallValue() { public DataWord getCallValue() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getCallValue(); return invokeData.getCallValue();
} }
public DataWord getDataSize() { public DataWord getDataSize() {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getDataSize(); return invokeData.getDataSize();
} }
public DataWord getDataValue(DataWord index) { public DataWord getDataValue(DataWord index) {
if (invokeData == null) return new DataWord( new byte[0]); if (invokeData == null)
return new DataWord(new byte[0]);
return invokeData.getDataValue(index); return invokeData.getDataValue(index);
} }
public byte[] getDataCopy(DataWord offset, DataWord length) { public byte[] getDataCopy(DataWord offset, DataWord length) {
if (invokeData == null) return new byte[0]; if (invokeData == null)
return new byte[0];
return invokeData.getDataCopy(offset, length); return invokeData.getDataCopy(offset, length);
} }
@ -255,7 +267,6 @@ public class Program {
return storage.get(key); return storage.get(key);
} }
public void fullTrace() { public void fullTrace() {
// todo: add gas to full trace calc // todo: add gas to full trace calc
@ -266,16 +277,20 @@ public class Program {
for (int i = 0; i < stack.size(); ++i) { for (int i = 0; i < stack.size(); ++i) {
stackData.append(" ").append(stack.get(i)); stackData.append(" ").append(stack.get(i));
if (i < stack.size() - 1) stackData.append("\n"); if (i < stack.size() - 1)
stackData.append("\n");
} }
if (stackData.length() > 0) stackData.insert(0, "\n"); if (stackData.length() > 0)
stackData.insert(0, "\n");
StringBuilder storageData = new StringBuilder(); StringBuilder storageData = new StringBuilder();
for (DataWord key : storage.keySet()) { for (DataWord key : storage.keySet()) {
storageData.append(" ").append(key).append(" -> ").append(storage.get(key)).append("\n"); storageData.append(" ").append(key).append(" -> ")
.append(storage.get(key)).append("\n");
} }
if (storageData.length() > 0) storageData.insert(0, "\n"); if (storageData.length() > 0)
storageData.insert(0, "\n");
StringBuilder memoryData = new StringBuilder(); StringBuilder memoryData = new StringBuilder();
StringBuilder oneLine = new StringBuilder(); StringBuilder oneLine = new StringBuilder();
@ -286,21 +301,25 @@ public class Program {
if ((i + 1) % 16 == 0) { if ((i + 1) % 16 == 0) {
String tmp = String.format("[%4s]-[%4s]", Integer.toString(i - 15, 16), String tmp = String.format("[%4s]-[%4s]",
Integer.toString(i - 15, 16),
Integer.toString(i, 16)).replace(" ", "0"); Integer.toString(i, 16)).replace(" ", "0");
memoryData.append("").append(tmp).append(" "); memoryData.append("").append(tmp).append(" ");
memoryData.append(oneLine); memoryData.append(oneLine);
if (i < memory.limit()) memoryData.append("\n"); if (i < memory.limit())
memoryData.append("\n");
oneLine.setLength(0); oneLine.setLength(0);
} }
} }
if (memoryData.length() > 0) memoryData.insert(0, "\n"); if (memoryData.length() > 0)
memoryData.insert(0, "\n");
StringBuilder opsString = new StringBuilder(); StringBuilder opsString = new StringBuilder();
for (int i = 0; i < ops.length; ++i) { for (int i = 0; i < ops.length; ++i) {
String tmpString = Integer.toString(ops[i] & 0xFF, 16); String tmpString = Integer.toString(ops[i] & 0xFF, 16);
tmpString = tmpString.length() == 1? "0" + tmpString : tmpString; tmpString = tmpString.length() == 1 ? "0" + tmpString
: tmpString;
if (i != pc) if (i != pc)
opsString.append(tmpString); opsString.append(tmpString);
@ -308,17 +327,19 @@ public class Program {
opsString.append(" >>").append(tmpString).append(""); opsString.append(" >>").append(tmpString).append("");
} }
if (pc >= ops.length) opsString.append(" >>"); if (pc >= ops.length)
if (opsString.length() > 0) opsString.insert(0, "\n "); opsString.append(" >>");
if (opsString.length() > 0)
opsString.insert(0, "\n ");
logger.debug(" -- OPS -- {}", opsString); logger.debug(" -- OPS -- {}", opsString);
logger.debug(" -- STACK -- {}", stackData); logger.debug(" -- STACK -- {}", stackData);
logger.debug(" -- MEMORY -- {}", memoryData); logger.debug(" -- MEMORY -- {}", memoryData);
logger.debug(" -- STORAGE -- {}\n", storageData); logger.debug(" -- STORAGE -- {}\n", storageData);
StringBuilder global = new StringBuilder("\n"); StringBuilder global = new StringBuilder("\n");
if (stackData.length() > 0) stackData.append("\n"); if (stackData.length() > 0)
stackData.append("\n");
global.append(" -- OPS -- ").append(opsString).append("\n"); global.append(" -- OPS -- ").append(opsString).append("\n");
global.append(" -- STACK -- ").append(stackData).append("\n"); global.append(" -- STACK -- ").append(stackData).append("\n");
@ -326,14 +347,14 @@ public class Program {
global.append(" -- STORAGE -- ").append(storageData).append("\n"); global.append(" -- STORAGE -- ").append(storageData).append("\n");
if (hReturn != null) { if (hReturn != null) {
global.append("\n HReturn: ").append(Hex.toHexString(hReturn.array())); global.append("\n HReturn: ").append(
Hex.toHexString(hReturn.array()));
} }
if (listener != null) { if (listener != null) {
listener.output(global.toString()); listener.output(global.toString());
} }
}
};
} }
public void addListener(ProgramListener listener) { public void addListener(ProgramListener listener) {

41
ethereumj-core/src/test/java/org/ethereum/core/StateTest.java
View File

@ -1,5 +1,9 @@
package org.ethereum.core; package org.ethereum.core;
import static org.junit.Assert.*;
import java.math.BigInteger;
import org.ethereum.crypto.HashUtil; import org.ethereum.crypto.HashUtil;
import org.ethereum.trie.MockDB; import org.ethereum.trie.MockDB;
import org.ethereum.trie.Trie; import org.ethereum.trie.Trie;
@ -7,10 +11,6 @@ import org.ethereum.util.RLP;
import org.junit.Test; import org.junit.Test;
import org.spongycastle.util.encoders.Hex; import org.spongycastle.util.encoders.Hex;
import java.math.BigInteger;
import static org.junit.Assert.assertEquals;
public class StateTest { public class StateTest {
@Test @Test
@ -19,7 +19,6 @@ public class StateTest {
assertEquals("23b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc", Hex.toHexString(trie.getRootHash())); assertEquals("23b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc", Hex.toHexString(trie.getRootHash()));
} }
@Test // right way to calc tx trie hash @Test // right way to calc tx trie hash
public void testCalculatePostTxState() { public void testCalculatePostTxState() {
@ -82,10 +81,6 @@ public class StateTest {
*/ */
} }
@Test // calc state after applying first tx on genesis @Test // calc state after applying first tx on genesis
public void test2() { public void test2() {
@ -99,24 +94,28 @@ public class StateTest {
Trie trie = generateGenesis(); Trie trie = generateGenesis();
String expected = "69c21ff84a5af0b53b11c61110a16d6ad43dad37b3eb29ae8e88c936eb06456a"; String expected = "69c21ff84a5af0b53b11c61110a16d6ad43dad37b3eb29ae8e88c936eb06456a";
byte[] data = trie.get(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826")); // Get and update sender in world state
AccountState account_1 = new AccountState(data); byte[] cowAddress = Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826");
byte[] rlpEncodedState = trie.get(cowAddress);
AccountState account_1 = new AccountState(rlpEncodedState);
account_1.addToBalance(new BigInteger("-6260000000001000")); account_1.addToBalance(new BigInteger("-6260000000001000"));
account_1.incrementNonce(); account_1.incrementNonce();
trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), account_1.getEncoded()); trie.update(cowAddress, account_1.getEncoded());
String code = "61778e600054"; // Add contract to world state
byte[] codeData = Hex.decode(code); byte[] codeData = Hex.decode("61778e600054");
AccountState account_2 = new AccountState(BigInteger.ZERO, new BigInteger("1000")); AccountState account_2 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(1000));
account_2.setCodeHash(HashUtil.sha3(codeData)); account_2.setCodeHash(HashUtil.sha3(codeData));
trie.update(Hex.decode("77045e71a7a2c50903d88e564cd72fab11e82051"), account_2.getEncoded()); byte[] contractAddress = Hex.decode("77045e71a7a2c50903d88e564cd72fab11e82051"); // generated based on sender + nonce
trie.update(contractAddress, account_2.getEncoded());
// this is saved in the db // this is saved in the db
// trie.update(HashUtil.sha3(codeData), codeData); // trie.update(HashUtil.sha3(codeData), codeData);
// Update miner in world state
byte[] minerAddress = Hex.decode("4c5f4d519dff3c16f0d54b6866e256fbbbc1a600");
AccountState account_3 = new AccountState(BigInteger.ZERO, new BigInteger("1506260000000000000")); AccountState account_3 = new AccountState(BigInteger.ZERO, new BigInteger("1506260000000000000"));
trie.update(Hex.decode("4c5f4d519dff3c16f0d54b6866e256fbbbc1a600"), account_3.getEncoded()); trie.update(minerAddress, account_3.getEncoded());
assertEquals(expected, Hex.toHexString(trie.getRootHash())); assertEquals(expected, Hex.toHexString(trie.getRootHash()));
@ -155,10 +154,9 @@ public class StateTest {
* cd2a3d9f938e13cd947ec05abc7fe734df8dd826: #1 1606938044258990275541962092341162602522202987522792835300376 (-6260000000001000) * cd2a3d9f938e13cd947ec05abc7fe734df8dd826: #1 1606938044258990275541962092341162602522202987522792835300376 (-6260000000001000)
*/ */
assertEquals("69c21ff84a5af0b53b11c61110a16d6ad43dad37b3eb29ae8e88c936eb06456a", Hex.toHexString(trie.getRootHash()));
} }
private Trie generateGenesis() { private Trie generateGenesis() {
Trie trie = new Trie(new MockDB()); Trie trie = new Trie(new MockDB());
@ -195,8 +193,5 @@ public class StateTest {
trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), acct6.getEncoded()); trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), acct6.getEncoded());
return trie; return trie;
} }
} }

2
ethereumj-core/src/test/java/org/ethereum/vm/ProgramInvokeMockImpl.java
View File

@ -19,7 +19,7 @@ public class ProgramInvokeMockImpl implements ProgramInvoke{
this.msgData = msgDataRaw; this.msgData = msgDataRaw;
} }
ProgramInvokeMockImpl() { public ProgramInvokeMockImpl() {
} }
/* ADDRESS op */ /* ADDRESS op */