From 0636e17dbee3accf6291000f0e4f4e713a97a207 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 9 Apr 2015 16:37:04 +0200
Subject: [PATCH] Added default registrar

---
 cmd/geth/js.go        |  1 +
 core/chain_manager.go | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/cmd/geth/js.go b/cmd/geth/js.go
index 59a8469fa3..ec3b7a7aef 100644
--- a/cmd/geth/js.go
+++ b/cmd/geth/js.go
@@ -136,6 +136,7 @@ var net = web3.net;
 		utils.Fatalf("Error setting namespaces: %v", err)
 	}
 
+	js.re.Eval(registrar + "registrar = new Registrar(" + registrarAddr + ");")
 }
 
 func (self *jsre) ConfirmTransaction(tx *types.Transaction) bool {
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 3ab95d272b..9c66a9f539 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -50,15 +50,7 @@ func CalcDifficulty(block, parent *types.Header) *big.Int {
 }
 
 func CalculateTD(block, parent *types.Block) *big.Int {
-	uncleDiff := new(big.Int)
-	for _, uncle := range block.Uncles() {
-		uncleDiff = uncleDiff.Add(uncleDiff, uncle.Difficulty)
-	}
-
-	// TD(genesis_block) = 0 and TD(B) = TD(B.parent) + sum(u.difficulty for u in B.uncles) + B.difficulty
-	td := new(big.Int)
-	td = td.Add(parent.Td, uncleDiff)
-	td = td.Add(td, block.Header().Difficulty)
+	td := new(big.Int).Add(parent.Td, block.Header().Difficulty)
 
 	return td
 }