Adjusted difficulty and skip get tx messages

This commit is contained in:
obscuren 2015-01-06 14:02:47 +01:00
parent a76b7dadae
commit 25e6c4eff8
3 changed files with 3 additions and 2 deletions

@ -264,6 +264,7 @@ func (sm *BlockProcessor) ValidateBlock(block, parent *types.Block) error {
expd := CalcDifficulty(block, parent)
if expd.Cmp(block.Header().Difficulty) < 0 {
fmt.Println("parent\n", parent)
return fmt.Errorf("Difficulty check failed for block %v, %v", block.Header().Difficulty, expd)
}

@ -25,7 +25,7 @@ func CalcDifficulty(block, parent *types.Block) *big.Int {
bh, ph := block.Header(), parent.Header()
adjust := new(big.Int).Rsh(ph.Difficulty, 10)
if bh.Time >= ph.Time+5 {
if bh.Time >= ph.Time+13 {
diff.Sub(ph.Difficulty, adjust)
} else {
diff.Add(ph.Difficulty, adjust)

@ -122,7 +122,7 @@ func (self *ethProtocol) handle() error {
defer msg.Discard()
switch msg.Code {
case GetTxMsg: // ignore
case StatusMsg:
return self.protoError(ErrExtraStatusMsg, "")