diff options
| author | obscuren <geffobscura@gmail.com> | 2014-02-19 18:40:02 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-02-19 18:40:02 +0800 |
| commit | 0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f (patch) | |
| tree | 9c867dbb5061be01bb040f9bafcf12236679383e /ethchain | |
| parent | 24f2b2afc3a848190822c382e6aa31c8ab120f07 (diff) | |
| parent | 531b3a96ebc408c00f67cee00ebe7fe192bf0b8c (diff) | |
| download | dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar.gz dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar.bz2 dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar.lz dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar.xz dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.tar.zst dexon-0936e5ccf5c8fc842cbd135c02a6abcd009b4e7f.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Conflicts:
ethutil/config.go
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/genesis.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethchain/genesis.go b/ethchain/genesis.go index 060d347e4..935978a69 100644 --- a/ethchain/genesis.go +++ b/ethchain/genesis.go @@ -13,7 +13,7 @@ var ZeroHash256 = make([]byte, 32) var ZeroHash160 = make([]byte, 20) var EmptyShaList = ethutil.Sha3Bin(ethutil.Encode([]interface{}{})) -var GenisisHeader = []interface{}{ +var GenesisHeader = []interface{}{ // Previous hash (none) //"", ZeroHash256, @@ -36,4 +36,4 @@ var GenisisHeader = []interface{}{ ethutil.Sha3Bin(big.NewInt(42).Bytes()), } -var Genesis = []interface{}{GenisisHeader, []interface{}{}, []interface{}{}} +var Genesis = []interface{}{GenesisHeader, []interface{}{}, []interface{}{}} |