Develop

Makefile

@@ -0,0 +1,20 @@
+UNAME = $(shell uname)
+
+# Default is building
+all:
+	go install
+
+install:
+# Linux build
+ifeq ($(UNAME),Linux)
+	mkdir /usr/local/ethereal
+	files=(wallet.qml net.png network.png new.png tx.png)
+	for file in "${files[@]}"; do
+		cp $file /usr/share/ethereal
+	done
+	cp $GOPATH/bin/go-ethereum /usr/local/bin/ethereal
+endif
+# OS X build
+ifeq ($(UNAME),Darwin)
+	# Execute py script
+endif

README.md

@@ -5,8 +5,7 @@ Ethereum
 
 Ethereum Go Client (c) Jeffrey Wilcke
 
-The current state is "Proof of Concept 3". For build instructions see
-the [Wiki](https://github.com/ethereum/go-ethereum/wiki/Building-Edge).
+The current state is "Proof of Concept 3".
 
 For the development Go Package please see [eth-go package](https://github.com/ethereum/eth-go).
 

dev_console.go

@@ -158,11 +158,11 @@ func (i *Console) ParseInput(input string) bool {
 			fmt.Println(value)
 		case "getaddr":
 			encoded, _ := hex.DecodeString(tokens[1])
-			addr := i.ethereum.BlockManager.BlockChain().CurrentBlock.GetAddr(encoded)
+			addr := i.ethereum.BlockChain().CurrentBlock.State().GetAccount(encoded)
 			fmt.Println("addr:", addr)
 		case "block":
 			encoded, _ := hex.DecodeString(tokens[1])
-			block := i.ethereum.BlockManager.BlockChain().GetBlock(encoded)
+			block := i.ethereum.BlockChain().GetBlock(encoded)
 			info := block.BlockInfo()
 			fmt.Printf("++++++++++ #%d ++++++++++\n%v\n", info.Number, block)
 		case "say":
@@ -182,7 +182,7 @@ func (i *Console) ParseInput(input string) bool {
 
 				key := ethutil.Config.Db.GetKeys()[0]
 				tx.Sign(key.PrivateKey)
-				i.ethereum.TxPool.QueueTransaction(tx)
+				i.ethereum.TxPool().QueueTransaction(tx)
 
 				fmt.Printf("%x\n", tx.Hash())
 			}
@@ -204,7 +204,7 @@ func (i *Console) ParseInput(input string) bool {
 			key := ethutil.Config.Db.GetKeys()[0]
 			contract.Sign(key.PrivateKey)
 
-			i.ethereum.TxPool.QueueTransaction(contract)
+			i.ethereum.TxPool().QueueTransaction(contract)
 
 			fmt.Printf("%x\n", contract.Hash()[12:])
 		case "exit", "quit", "q":

ethereum.go

@@ -144,7 +144,7 @@ func main() {
 	}
 
 	if ShowGenesis {
-		fmt.Println(ethereum.BlockManager.BlockChain().Genesis())
+		fmt.Println(ethereum.BlockChain().Genesis())
 		os.Exit(0)
 	}
 
@@ -183,22 +183,24 @@ func main() {
 				addr := keyRing.Get(1).Bytes()
 
 				for {
-					txs := ethereum.TxPool.Flush()
+					txs := ethereum.TxPool().Flush()
 					// Create a new block which we're going to mine
-					block := ethereum.BlockManager.BlockChain().NewBlock(addr, txs)
+					block := ethereum.BlockChain().NewBlock(addr, txs)
+					log.Println("Mining on new block. Includes", len(block.Transactions()), "transactions")
 					// Apply all transactions to the block
-					ethereum.BlockManager.ApplyTransactions(block, block.Transactions())
+					ethereum.StateManager().ApplyTransactions(block, block.Transactions())
 
-					ethereum.BlockManager.AccumelateRewards(block, block)
+					ethereum.StateManager().AccumelateRewards(block, block)
 
 					// Search the nonce
 					block.Nonce = pow.Search(block)
 					ethereum.Broadcast(ethwire.MsgBlockTy, []interface{}{block.Value().Val})
-					err := ethereum.BlockManager.ProcessBlock(block)
+					err := ethereum.StateManager().ProcessBlock(block)
 					if err != nil {
 						log.Println(err)
 					} else {
-						log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockManager.BlockChain().CurrentBlock)
+						//log.Println("\n+++++++ MINED BLK +++++++\n", ethereum.BlockChain().CurrentBlock)
+						log.Printf("🔨  Mined block %x\n", block.Hash())
 					}
 				}
 			}()