From fdc11b76b2c382b26b7617038c63f737df8ede34 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Wed, 23 Dec 2015 04:36:08 -0800
Subject: [PATCH] start checking for height coinbases earlier.

---
 lib/bcoin/script.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/bcoin/script.js b/lib/bcoin/script.js
index 87578ed4..22270349 100644
--- a/lib/bcoin/script.js
+++ b/lib/bcoin/script.js
@@ -1174,19 +1174,25 @@ script.coinbaseBits = function coinbaseBits(s, block) {
 
   value = new bn(s[0].reverse()).toNumber();
 
+  // Test for bits and ts
   if (block) {
     if (value === block.bits)
       return { type: 'bits', value: value };
 
     if (value === block.ts)
       return { type: 'ts', value: value };
+  }
 
+  // Test for height
+  if (block) {
     if (block.version < 2)
       return { type: 'value', value: value };
+  } else {
+    if (value <= 227835)
+      return { type: 'value', value: value };
   }
 
-  // Last v1 block
-  if (s[0].length < 3 || value < 227835)
+  if (s[0].length < 3)
     return { type: 'value', value: value };
 
   return { type: 'height', value: value };