fix broken script types in namecoin module

Author: mhanne

lib/bitcoin/namecoin.rb

@@ -37,24 +37,15 @@ def get_hash160
         end
 
         # get all addresses this script corresponds to (if possible)
-        def get_addresses
+        def new_get_addresses
           return [get_pubkey_address]    if is_pubkey?
-          return [get_hash160_address]   if is_hash160? || is_namecoin?
+          return [get_hash160_address]   if is_pubkey_hash? || is_namecoin?
           return get_multisig_addresses  if is_multisig?
+          return [get_p2sh_address]      if is_script_hash?
+          []
         end
 
-        # get type of this tx
-        def type
-          if is_name_new?;            :name_new
-          elsif is_name_firstupdate?; :name_firstupdate
-          elsif is_name_update?;      :name_update
-          elsif is_pubkey_hash?;      :pubkey_hash
-          elsif is_pubkey?;           :pubkey
-          elsif is_multisig?;         :multisig
-          elsif is_script_hash?;      :script_hash
-          else;                       :unknown
-          end
-        end
+        TYPES.unshift :name_new, :name_firstupdate, :name_update
 
         # is namecoin name_new script
         # OP_1 name_hash OP_2DROP <hash160_script>

lib/bitcoin/script.rb

@@ -492,15 +492,14 @@ def is_op_return?
     @chunks[0] == OP_RETURN && @chunks.size <= 2
   end
 
+  TYPES = [:pubkey_hash, :pubkey, :multisig, :script_hash, :op_return]
+
   # get type of this script
   def type
-    if is_pubkey_hash?; :pubkey_hash
-    elsif is_pubkey?;   :pubkey
-    elsif is_multisig?; :multisig
-    elsif is_p2sh?;     :script_hash
-    elsif is_op_return?;:op_return
-    else;               :unknown
+    TYPES.each do |type|
+      return type  if send("is_#{type}?")
     end
+    :unknown
   end
 
   # get the public key for this pubkey script

lib/bitcoin/storage/storage.rb

@@ -43,10 +43,7 @@ class StoreBase
       ORPHAN = 2
 
       # possible script types
-      SCRIPT_TYPES = [:unknown, :pubkey, :pubkey_hash, :multisig, :script_hash, :op_return]
-      if Bitcoin.namecoin?
-        [:name_new, :name_firstupdate, :name_update].each {|n| SCRIPT_TYPES << n }
-      end
+      SCRIPT_TYPES = [:unknown] + Bitcoin::Script::TYPES
 
       # possible address types
       ADDRESS_TYPES = [:pubkey_hash, :script_hash]