From 26de12d9bf23bce7de26b3b6629601ec2e58ad5b Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 21:04:31 +0100 Subject: Changed nonce to a uint64 --- core/genesis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/genesis.go') diff --git a/core/genesis.go b/core/genesis.go index decffc541..3e90aa91d 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -23,7 +23,7 @@ var EmptyShaList = crypto.Sha3(ethutil.Encode([]interface{}{})) var EmptyListRoot = crypto.Sha3(ethutil.Encode("")) func GenesisBlock(db ethutil.Database) *types.Block { - genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, big.NewInt(131072), crypto.Sha3(big.NewInt(42).Bytes()), "") + genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, big.NewInt(131072), 42, "") genesis.Header().Number = ethutil.Big0 genesis.Header().GasLimit = big.NewInt(1000000) genesis.Header().GasUsed = ethutil.Big0 -- cgit v1.2.3 From 08fd0715f9504edcc81029ffebee794b06fe4653 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 21:09:29 +0100 Subject: updated genesis --- core/genesis.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'core/genesis.go') diff --git a/core/genesis.go b/core/genesis.go index 3e90aa91d..78c7a353a 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -28,6 +28,9 @@ func GenesisBlock(db ethutil.Database) *types.Block { genesis.Header().GasLimit = big.NewInt(1000000) genesis.Header().GasUsed = ethutil.Big0 genesis.Header().Time = 0 + genesis.Header().MixDigest = make([]byte, 32) + genesis.Header().SeedHash = make([]byte, 32) + genesis.Td = ethutil.Big0 genesis.SetUncles([]*types.Header{}) @@ -50,6 +53,7 @@ func GenesisBlock(db ethutil.Database) *types.Block { } statedb.Sync() genesis.Header().Root = statedb.Root() + fmt.Println(genesis) return genesis } -- cgit v1.2.3 From d4d505c868fcd0f692ec3573bd6cfcb1c5230fe2 Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Mar 2015 21:48:05 +0100 Subject: Fixed genesis --- core/genesis.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'core/genesis.go') diff --git a/core/genesis.go b/core/genesis.go index 78c7a353a..f675be53f 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -23,13 +23,13 @@ var EmptyShaList = crypto.Sha3(ethutil.Encode([]interface{}{})) var EmptyListRoot = crypto.Sha3(ethutil.Encode("")) func GenesisBlock(db ethutil.Database) *types.Block { - genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, big.NewInt(131072), 42, "") + genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, big.NewInt(2048), 42, "") genesis.Header().Number = ethutil.Big0 genesis.Header().GasLimit = big.NewInt(1000000) genesis.Header().GasUsed = ethutil.Big0 genesis.Header().Time = 0 - genesis.Header().MixDigest = make([]byte, 32) genesis.Header().SeedHash = make([]byte, 32) + genesis.Header().MixDigest = make([]byte, 32) genesis.Td = ethutil.Big0 @@ -59,6 +59,10 @@ func GenesisBlock(db ethutil.Database) *types.Block { } var genesisData = []byte(`{ + "0000000000000000000000000000000000000001": {"balance": "1"}, + "0000000000000000000000000000000000000002": {"balance": "1"}, + "0000000000000000000000000000000000000003": {"balance": "1"}, + "0000000000000000000000000000000000000004": {"balance": "1"}, "dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, "e4157b34ea9615cfbde6b4fda419828124b70c78": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, "b9c015918bdaba24b4ff057a92a3873d6eb201be": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, @@ -66,9 +70,5 @@ var genesisData = []byte(`{ "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, "2ef47100e0787b915105fd5e3f4ff6752079d5cb": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, "e6716f9544a56c530d868e4bfbacb172315bdead": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, - "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": {"balance": "1606938044258990275541962092341162602522202993782792835301376"}, - "b0afc46d9ce366d06ab4952ca27db1d9557ae9fd": {"balance": "154162184000000000000000"}, - "f6b1e9dc460d4d62cc22ec5f987d726929c0f9f0": {"balance": "102774789000000000000000"}, - "cc45122d8b7fa0b1eaa6b29e0fb561422a9239d0": {"balance": "51387394000000000000000"}, - "b7576e9d314df41ec5506494293afb1bd5d3f65d": {"balance": "69423399000000000000000"} + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": {"balance": "1606938044258990275541962092341162602522202993782792835301376"} }`) -- cgit v1.2.3 From c47866d25174bd783ee6bcd5b400d81d7bf598bb Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 5 Mar 2015 09:14:58 +0100 Subject: Miner fixes and updates (including miner) --- core/genesis.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'core/genesis.go') diff --git a/core/genesis.go b/core/genesis.go index f675be53f..a3f5dfb38 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -22,8 +22,10 @@ var ZeroHash512 = make([]byte, 64) var EmptyShaList = crypto.Sha3(ethutil.Encode([]interface{}{})) var EmptyListRoot = crypto.Sha3(ethutil.Encode("")) +var GenesisDiff = big.NewInt(131072) + func GenesisBlock(db ethutil.Database) *types.Block { - genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, big.NewInt(2048), 42, "") + genesis := types.NewBlock(ZeroHash256, ZeroHash160, nil, GenesisDiff, 42, "") genesis.Header().Number = ethutil.Big0 genesis.Header().GasLimit = big.NewInt(1000000) genesis.Header().GasUsed = ethutil.Big0 @@ -53,7 +55,6 @@ func GenesisBlock(db ethutil.Database) *types.Block { } statedb.Sync() genesis.Header().Root = statedb.Root() - fmt.Println(genesis) return genesis } -- cgit v1.2.3