for a new block to extend the main chain, make sure the prev block is…

… the current head and not just some old block in the main chain; in that case the new block becomes side branch
kristianmandrup · Sep 13, 2012 · c737be3 · c737be3
1 parent 0295bb0
commit c737be3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/bitcoin/storage/storage.rb b/lib/bitcoin/storage/storage.rb
@@ -78,14 +78,13 @@ def store_block blk
         end
         depth = prev_block.depth + 1
         if prev_block.chain == MAIN
-          next_block = prev_block.get_next_block
-          if next_block && next_block.chain == MAIN
-            log.debug { "=> side (#{depth})" }
-            return persist_block(blk, SIDE, depth)
-          else
+          if prev_block == get_head
             log.debug { "=> main (#{depth})" }
             validator.validate(rules: [:context], raise_errors: true)
             return persist_block(blk, MAIN, depth)
+          else
+            log.debug { "=> side (#{depth})" }
+            return persist_block(blk, SIDE, depth)
           end
         else
           head = get_head