interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added default registrar

This commit is contained in:
obscuren 2015-04-09 16:37:04 +02:00
parent c6b25a4046
commit 0636e17dbe
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/geth/js.go
View File

@ -136,6 +136,7 @@ var net = web3.net;
utils.Fatalf("Error setting namespaces: %v", err) utils.Fatalf("Error setting namespaces: %v", err)
} }
js.re.Eval(registrar + "registrar = new Registrar(" + registrarAddr + ");")
} }
func (self *jsre) ConfirmTransaction(tx *types.Transaction) bool { func (self *jsre) ConfirmTransaction(tx *types.Transaction) bool {

10
core/chain_manager.go
View File

@ -50,15 +50,7 @@ func CalcDifficulty(block, parent *types.Header) *big.Int {
} }
func CalculateTD(block, parent *types.Block) *big.Int { func CalculateTD(block, parent *types.Block) *big.Int {
uncleDiff := new(big.Int) td := new(big.Int).Add(parent.Td, block.Header().Difficulty)
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)
return td return td
} }