From 25e6c4eff8364770cfd2908db9c54a012b9e4ec4 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 6 Jan 2015 14:02:47 +0100
Subject: [PATCH] Adjusted difficulty and skip get tx messages
---
core/block_processor.go | 1 +
core/chain_manager.go | 2 +-
eth/protocol.go | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/core/block_processor.go b/core/block_processor.go
index 127e97921..233e5e4db 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -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)
}
diff --git a/core/chain_manager.go b/core/chain_manager.go
index 82b17cd93..e73ea6378 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -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)
diff --git a/eth/protocol.go b/eth/protocol.go
index 723ab5502..736bcd94b 100644
--- a/eth/protocol.go
+++ b/eth/protocol.go
@@ -122,7 +122,7 @@ func (self *ethProtocol) handle() error {
defer msg.Discard()
switch msg.Code {
-
+ case GetTxMsg: // ignore
case StatusMsg:
return self.protoError(ErrExtraStatusMsg, "")
--
GitLab