Skip to content

Commit

Permalink
Merge branch 'develop' into rlpx-framing
Browse files Browse the repository at this point in the history
Conflicts:
	ethereumj-core/src/test/java/org/ethereum/util/RLPTest.java
  • Loading branch information
Nashatyrev committed Oct 19, 2015
2 parents 57024bf + fedd876 commit 871c056
Showing 1 changed file with 110 additions and 0 deletions.
110 changes: 110 additions & 0 deletions ethereumj-core/src/main/resources/genesis/frontier-test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
{
"alloc": {

"a0c76d13c8e63978dd3315faa526038c3b6b5c33": {
"balance": "1000000000000000000000000000000"
},

"d0487b571998c573103f90f9873f5f2d17e46811": {
"balance": "1000000000000000000000000000000"
},

"dedb49385ad5b94a16f236a6890cf9e0b1e30392": {
"balance": "1000000000000000000000000000000"
},

"6c1aaf3866c47107f198027cfa13d1144fac8ac9": {
"balance": "1000000000000000000000000000000"
},

"5c3b947d4ec2b9818fce862f84cbe95a79589061": {
"balance": "1000000000000000000000000000000"
},

"7336d9aa4bc13d68a1eefe75e8f00b09b6232152": {
"balance": "1000000000000000000000000000000"
},

"26ac60acb581516b175010730a2bcee041bb0099": {
"balance": "1000000000000000000000000000000"
},

"3e6d543ec5c3713969dc0aae54cd5cbc7d913b49": {
"balance": "1000000000000000000000000000000"
},

"4d5064af72a2c829c81a20c376e3308e13e8c0bb": {
"balance": "1000000000000000000000000000000"
},

"5031a1e8db96e1d168341536262d0039602b2390": {
"balance": "1000000000000000000000000000000"
},

"1691747b4769a4547ce736b298274a93bd80d6b9": {
"balance": "1000000000000000000000000000000"
},

"50b8f981ce93fd5b81b844409169148428400bf3": {
"balance": "1000000000000000000000000000000"
},

"62a496c75751c67e600f5d04e763b85d4069af8e": {
"balance": "1000000000000000000000000000000"
},

"640eb8074d09975f11d756985e4fe0863e52c393": {
"balance": "1000000000000000000000000000000"
},

"87bfb103ceb130a5378a1cd0453f38e536a87317": {
"balance": "1000000000000000000000000000000"
},

"589df60674c2b8a290d1603bce19134bef00b7ed": {
"balance": "1000000000000000000000000000000"
},

"5011d782860bc428c3928672e057120064295769": {
"balance": "1000000000000000000000000000000"
},

"ea8cae0ea58fe8cb92e8c6ecba5972b613d7d6ee": {
"balance": "1000000000000000000000000000000"
},

"b2cfb1dd530a21048b36fe6c26956054ddf4659e": {
"balance": "1000000000000000000000000000000"
},

"4cb053eb53a5d5ec2824da87ab925da8b51d65b7": {
"balance": "1000000000000000000000000000000"
},

"17f0b8ab865a0ccdf93eec8327af62fd620f061a": {
"balance": "1000000000000000000000000000000"
},

"51f7934930e502a1a8381e9fec9d933cf7350285": {
"balance": "1000000000000000000000000000000"
},

"40a87f4e51786d86c7729967dca96642710074ca": {
"balance": "1000000000000000000000000000000"
},

"2e5b91ac3b6f501a555d27e3dd6295339f1310f3": {
"balance": "1000000000000000000000000000000"
}

},

"nonce": "0x0000000000000042",
"difficulty": "0x020000",
"mixhash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"coinbase": "0x0000000000000000000000000000000000000000",
"timestamp": "0x00",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
"gasLimit": "0x1388"
}

0 comments on commit 871c056

Please sign in to comment.