diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-07 19:18:48 +0800 |
| commit | 429dd2a100f3b9e2b612b59bcb48f79a805cd6f9 (patch) | |
| tree | c91fee673e461a192d4d783193c8ddbead4a97d2 /block_pool.go | |
| parent | 48488017e498916c81122c01cfe1880afdd00d48 (diff) | |
| download | go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.gz go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.tar.zst go-tangerine-429dd2a100f3b9e2b612b59bcb48f79a805cd6f9.zip | |
Implemented new miner w/ ui interface for merged mining. Closes #177
* Miner has been rewritten
* Added new miner pane
* Added option for local txs
* Added option to read from MergeMining contract and list them for
merged mining
Diffstat (limited to 'block_pool.go')
| -rw-r--r-- | block_pool.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/block_pool.go b/block_pool.go index ff0675c50..ec945fa6e 100644 --- a/block_pool.go +++ b/block_pool.go @@ -315,9 +315,12 @@ out: // otherwise process and don't emit anything if len(blocks) > 0 { chainManager := self.eth.ChainManager() + // Test and import chain := chain.NewChain(blocks) - _, err := chainManager.TestChain(chain) + _, err := chainManager.TestChain(chain, true) if err != nil { + poollogger.Debugln(err) + self.Reset() poollogger.Debugf("Punishing peer for supplying bad chain (%v)\n", self.peer.conn.RemoteAddr()) @@ -327,7 +330,7 @@ out: self.td = ethutil.Big0 self.peer = nil } else { - chainManager.InsertChain(chain) + //chainManager.InsertChain(chain) for _, block := range blocks { self.Remove(block.Hash()) } |