From 3f7891ff3634561aac8623f53ccfd9870bc942f8 Mon Sep 17 00:00:00 2001 From: romanman Date: Fri, 6 Jun 2014 15:10:07 +0100 Subject: [PATCH] merge conflict --- .../java/org/ethereum/core/StateTest.java | 119 ++++++++++++------ 1 file changed, 81 insertions(+), 38 deletions(-) diff --git a/ethereumj-core/src/test/java/org/ethereum/core/StateTest.java b/ethereumj-core/src/test/java/org/ethereum/core/StateTest.java index 906c9a19..553d9235 100644 --- a/ethereumj-core/src/test/java/org/ethereum/core/StateTest.java +++ b/ethereumj-core/src/test/java/org/ethereum/core/StateTest.java @@ -1,53 +1,21 @@ package org.ethereum.core; -import static org.junit.Assert.*; - -import java.math.BigInteger; - +import org.ethereum.crypto.HashUtil; import org.ethereum.trie.MockDB; import org.ethereum.trie.Trie; import org.ethereum.util.RLP; import org.junit.Test; import org.spongycastle.util.encoders.Hex; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; + public class StateTest { @Test public void testGenesisAccounts() { - Trie trie = new Trie(new MockDB()); - - // 2ef47100e0787b915105fd5e3f4ff6752079d5cb # (M) - AccountState acct5 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("2ef47100e0787b915105fd5e3f4ff6752079d5cb"), acct5.getEncoded()); - - // 1a26338f0d905e295fccb71fa9ea849ffa12aaf4 # (A) - AccountState acct4 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("1a26338f0d905e295fccb71fa9ea849ffa12aaf4"), acct4.getEncoded()); - - // e6716f9544a56c530d868e4bfbacb172315bdead # (J) - AccountState acct2 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("e6716f9544a56c530d868e4bfbacb172315bdead"), acct2.getEncoded()); - - // 8a40bfaa73256b60764c1bf40675a99083efb075 # (G) - AccountState acct1 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("8a40bfaa73256b60764c1bf40675a99083efb075"), acct1.getEncoded()); - - // e4157b34ea9615cfbde6b4fda419828124b70c78 # (CH) - AccountState acct8 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("e4157b34ea9615cfbde6b4fda419828124b70c78"), acct8.getEncoded()); - - // 1e12515ce3e0f817a4ddef9ca55788a1d66bd2df # (V) - AccountState acct3 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("1e12515ce3e0f817a4ddef9ca55788a1d66bd2df"), acct3.getEncoded()); - - // 6c386a4b26f73c802f34673f7248bb118f97424a # (HH) - AccountState acct7 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("6c386a4b26f73c802f34673f7248bb118f97424a"), acct7.getEncoded()); - - // cd2a3d9f938e13cd947ec05abc7fe734df8dd826 # (R) - AccountState acct6 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); - trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), acct6.getEncoded()); - + Trie trie = generateGenesis(); assertEquals("23b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc", Hex.toHexString(trie.getRootHash())); } @@ -118,5 +86,80 @@ public class StateTest { + @Test // calc state after applying first tx on genesis + public void test2(){ + + // 0) create genesis + // 1) apply cost of tx to cd2a3d9f938e13cd947ec05abc7fe734df8dd826 + // 2) create AccountState for 77045e71a7a2c50903d88e564cd72fab11e82051 + // 3) save the contract data --> sha3(data), data + // 4) calc the root + + Trie trie = generateGenesis(); + + byte[] data = trie.get(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826")); + AccountState account_1 = new AccountState(data); + account_1.addToBalance(new BigInteger("-6260000000001000")); + account_1.incrementNonce(); + trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), account_1.getEncoded()); + + String code = "61778e600054"; + byte[] codeData = Hex.decode(code); + AccountState account_2 = new AccountState(BigInteger.ZERO, new BigInteger("1000")); + account_2.setCodeHash(HashUtil.sha3(codeData)); + trie.update(Hex.decode("77045e71a7a2c50903d88e564cd72fab11e82051"), account_2.getEncoded()); + + trie.update(HashUtil.sha3(codeData), codeData); + + AccountState account_3 = new AccountState(BigInteger.ZERO, new BigInteger("6260000000000000")); + trie.update(Hex.decode("4c5f4d519dff3c16f0d54b6866e256fbbbc1a600"), account_3.getEncoded()); + + + + + System.out.println(Hex.toHexString(trie.getRootHash())); + + } + + + private Trie generateGenesis(){ + + Trie trie = new Trie(new MockDB()); + // 2ef47100e0787b915105fd5e3f4ff6752079d5cb # (M) + AccountState acct5 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("2ef47100e0787b915105fd5e3f4ff6752079d5cb"), acct5.getEncoded()); + + // 1a26338f0d905e295fccb71fa9ea849ffa12aaf4 # (A) + AccountState acct4 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("1a26338f0d905e295fccb71fa9ea849ffa12aaf4"), acct4.getEncoded()); + + // e6716f9544a56c530d868e4bfbacb172315bdead # (J) + AccountState acct2 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("e6716f9544a56c530d868e4bfbacb172315bdead"), acct2.getEncoded()); + + // 8a40bfaa73256b60764c1bf40675a99083efb075 # (G) + AccountState acct1 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("8a40bfaa73256b60764c1bf40675a99083efb075"), acct1.getEncoded()); + + // e4157b34ea9615cfbde6b4fda419828124b70c78 # (CH) + AccountState acct8 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("e4157b34ea9615cfbde6b4fda419828124b70c78"), acct8.getEncoded()); + + // 1e12515ce3e0f817a4ddef9ca55788a1d66bd2df # (V) + AccountState acct3 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("1e12515ce3e0f817a4ddef9ca55788a1d66bd2df"), acct3.getEncoded()); + + // 6c386a4b26f73c802f34673f7248bb118f97424a # (HH) + AccountState acct7 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("6c386a4b26f73c802f34673f7248bb118f97424a"), acct7.getEncoded()); + + // cd2a3d9f938e13cd947ec05abc7fe734df8dd826 # (R) + AccountState acct6 = new AccountState(BigInteger.ZERO, BigInteger.valueOf(2).pow(200)); + trie.update(Hex.decode("cd2a3d9f938e13cd947ec05abc7fe734df8dd826"), acct6.getEncoded()); + return trie; + } + + + }