Minor updates for release

cmd/ethereum/main.go

@@ -37,7 +37,7 @@ import (
 
 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.8.3"
+	Version          = "0.9.0"
 )
 
 var clilogger = logger.NewLogger("CLI")

cmd/mist/assets/qml/main.qml

@@ -964,7 +964,7 @@ ApplicationWindow {
                  anchors.top: parent.top
                  anchors.topMargin: 30
                  font.pointSize: 12
-                 text: "<h2>Mist (0.7.10)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br><h3>UX</h3>Alex van de Sande<br>"
+                 text: "<h2>Mist (0.9.0)</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Viktor Trón<br>Felix Lange<br>Taylor Gerring<br>Daniel Nagy<br>Gustav Simonsson<br><h3>UX/UI</h3>Alex van de Sande<br>Fabian Vogelsteller"
              }
          }
 

cmd/mist/main.go

@@ -36,7 +36,7 @@ import (
 
 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.8.3"
+	Version          = "0.9.0"
 )
 
 var ethereum *eth.Ethereum

core/chain_manager.go

@@ -268,6 +268,7 @@ func (self *ChainManager) GetBlockHashesFromHash(hash []byte, max uint64) (chain
 			break
 		}
 	}
+	fmt.Printf("get hash %x (%d)\n", hash, len(chain))
 
 	return
 }
@@ -396,7 +397,7 @@ func (self *ChainManager) InsertChain(chain types.Blocks) error {
 		self.mu.Unlock()
 
 		if chain {
-			go self.eventMux.Post(ChainEvent{block, td})
+			self.eventMux.Post(ChainEvent{block, td})
 		}
 
 		if split {

core/genesis.go

@@ -1,7 +1,10 @@
 package core
 
 import (
+	"encoding/json"
+	"fmt"
 	"math/big"
+	"os"
 
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -31,24 +34,39 @@ func GenesisBlock(db ethutil.Database) *types.Block {
 	genesis.SetTransactions(types.Transactions{})
 	genesis.SetReceipts(types.Receipts{})
 
+	var accounts map[string]struct{ Balance string }
+	err := json.Unmarshal(genesisData, &accounts)
+	if err != nil {
+		fmt.Println("enable to decode genesis json data:", err)
+		os.Exit(1)
+	}
+
 	statedb := state.New(genesis.Root(), db)
-	for _, addr := range []string{
+	for addr, account := range accounts {
-		"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6",
-		"e4157b34ea9615cfbde6b4fda419828124b70c78",
-		"b9c015918bdaba24b4ff057a92a3873d6eb201be",
-		"6c386a4b26f73c802f34673f7248bb118f97424a",
-		"cd2a3d9f938e13cd947ec05abc7fe734df8dd826",
-		"2ef47100e0787b915105fd5e3f4ff6752079d5cb",
-		"e6716f9544a56c530d868e4bfbacb172315bdead",
-		"1a26338f0d905e295fccb71fa9ea849ffa12aaf4",
-	} {
 		codedAddr := ethutil.Hex2Bytes(addr)
-		account := statedb.GetAccount(codedAddr)
+		accountState := statedb.GetAccount(codedAddr)
-		account.SetBalance(ethutil.Big("1606938044258990275541962092341162602522202993782792835301376")) //ethutil.BigPow(2, 200)
+		accountState.SetBalance(ethutil.Big(account.Balance))
-		statedb.UpdateStateObject(account)
+		statedb.UpdateStateObject(accountState)
 	}
 	statedb.Sync()
 	genesis.Header().Root = statedb.Root()
 
+	fmt.Printf("+++ genesis +++\nRoot: %x\nHash: %x\n", genesis.Header().Root, genesis.Hash())
+
 	return genesis
 }
+
+var genesisData = []byte(`{
+	"dbdbdb2cbd23b783741e8d7fcf51e459b497e4a6": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"e4157b34ea9615cfbde6b4fda419828124b70c78": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"b9c015918bdaba24b4ff057a92a3873d6eb201be": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"6c386a4b26f73c802f34673f7248bb118f97424a": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"2ef47100e0787b915105fd5e3f4ff6752079d5cb": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"e6716f9544a56c530d868e4bfbacb172315bdead": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"1a26338f0d905e295fccb71fa9ea849ffa12aaf4": {"balance": "1606938044258990275541962092341162602522202993782792835301376"},
+	"b0afc46d9ce366d06ab4952ca27db1d9557ae9fd": {"balance": "154162184000000000000000"},
+	"f6b1e9dc460d4d62cc22ec5f987d726929c0f9f0": {"balance": "102774789000000000000000"},
+	"cc45122d8b7fa0b1eaa6b29e0fb561422a9239d0": {"balance": "51387394000000000000000"},
+	"b7576e9d314df41ec5506494293afb1bd5d3f65d": {"balance": "69423399000000000000000"}
+}`)

eth/protocol.go

@@ -13,7 +13,7 @@ import (
 )
 
 const (
-	ProtocolVersion    = 53
+	ProtocolVersion    = 54
 	NetworkId          = 0
 	ProtocolLength     = uint64(8)
 	ProtocolMaxMsgSize = 10 * 1024 * 1024

ethutil/common_test.go

@@ -39,7 +39,7 @@ func (s *CommonSuite) TestCommon(c *checker.C) {
 	douglas := CurrencyToString(BigPow(10, 43))
 	einstein := CurrencyToString(BigPow(10, 22))
 	ether := CurrencyToString(BigPow(10, 19))
-	finney := CurrencyToString(BigPow(10, 16))
+	finney := CurrencyToString(BigPow(10, 15))
 	szabo := CurrencyToString(BigPow(10, 13))
 	shannon := CurrencyToString(BigPow(10, 10))
 	babbage := CurrencyToString(BigPow(10, 7))

miner/worker.go

@@ -117,11 +117,9 @@ out:
 		case event := <-events.Chan():
 			switch ev := event.(type) {
 			case core.ChainEvent:
-				println("miner start")
 				if self.current.block != ev.Block {
 					self.commitNewWork()
 				}
-				println("miner end")
 			case core.NewMinedBlockEvent:
 				self.commitNewWork()
 			}