money-tree 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d626fc55825195bcbd6c57406598ed66ed9ebeaf
-  data.tar.gz: b1e82a84328bf2fcf4366ccf7995a156f5a09b43
+  metadata.gz: b30fcb1b0feac18dde7d94b62a0ff97666209d3f
+  data.tar.gz: ffa45ca51da46d1d56d701f24e36d61848e261ea
 SHA512:
-  metadata.gz: 56e979b90b695673384164ef2c371160ae8d9988b7c9f7b4dcc4f0822c1619fbee7b0c0698605f3edd5fde8cd7f09f88233e83477e6537bb1e50ae60f19d9f22
-  data.tar.gz: 04d26f09a34e7b51cd4f42ff33b7b942a19b4d710f07738b29d5e60c02086e2f4d7ea271139a665f1195ef4bce8ce9264da4cc715bdb2dfcfc8c16903a4e1e09
+  metadata.gz: 859a1b5a4dfd21fafb73dba60ad6d243c3d8462bba900aed584934e463976fd0075abd5fa83b6317f54ce9801f342e3ba31ac639bb53ee9769068fd1f1cbda13
+  data.tar.gz: 3609f386e6fc5276f41a51221898dc0ebb10d314fd4b76a6ea4522ced950738b064167fb0f4d6a7d84c1b12823dd255494043e817b9dd7562f3f3eb4c02e093d

data/lib/money-tree/address.rb

@@ -8,8 +8,8 @@ module MoneyTree
       @public_key = MoneyTree::PublicKey.new(@private_key, opts)
     end
     
-    def to_s
-      public_key.to_s
+    def to_s(network: :bitcoin)
+      public_key.to_s(network: network)
     end
 
   end

data/lib/money-tree/key.rb

@@ -13,10 +13,10 @@ module MoneyTree
     class KeyFormatNotFound < Exception; end
     class InvalidWIFFormat < Exception; end
     class InvalidBase64Format < Exception; end
-    
-    attr_reader :options, :key, :raw_key, :network, :network_key
+
+    attr_reader :options, :key, :raw_key
     attr_accessor :ec_key
-    
+
     GROUP_NAME = 'secp256k1'
     ORDER = "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141".to_i(16)
 
@@ -24,23 +24,21 @@ module MoneyTree
       eckey ||= ec_key
       eckey.nil? ? false : eckey.check_key
     end
-    
+
     def to_bytes
       hex_to_bytes to_hex
     end
-    
+
     def to_i
       bytes_to_int to_bytes
     end
   end
-  
+
   class PrivateKey < Key
-        
+
     def initialize(opts = {})
       @options = opts
       @ec_key = PKey::EC.new GROUP_NAME
-      @network_key = options[:network] || :bitcoin
-      @network = MoneyTree::NETWORKS[network_key]
       if @options[:key]
         @raw_key = @options[:key]
         @key = parse_raw_key
@@ -50,34 +48,34 @@ module MoneyTree
         @key = to_hex
       end
     end
-    
+
     def generate
       ec_key.generate_key
     end
-    
+
     def import
       ec_key.private_key = BN.new(key, 16)
       set_public_key
     end
-    
+
     def calculate_public_key(opts = {})
       opts[:compressed] = true unless opts[:compressed] == false
       group = ec_key.group
       group.point_conversion_form = opts[:compressed] ? :compressed : :uncompressed
       point = group.generator.mul ec_key.private_key
     end
-    
+
     def set_public_key(opts = {})
       ec_key.public_key = calculate_public_key(opts)
     end
-    
+
     def parse_raw_key
       result = if raw_key.is_a?(Bignum) then from_bignum
       elsif hex_format? then from_hex
       elsif base64_format? then from_base64
       elsif compressed_wif_format? then from_wif
       elsif uncompressed_wif_format? then from_wif
-      else 
+      else
         raise KeyFormatNotFound
       end
       result.downcase
@@ -91,25 +89,15 @@ module MoneyTree
     def from_hex(hex = raw_key)
       hex
     end
-    
+
     def from_wif(wif = raw_key)
       compressed = wif.length == 52
-      parse_network_from_wif(wif, compressed: compressed)
       validate_wif(wif)
       hex = decode_base58(wif)
       last_char = compressed ? -11 : -9
       hex.slice(2..last_char)
     end
 
-    def parse_network_from_wif(wif, opts = {})
-      networks = MoneyTree::NETWORKS
-      chars_key = opts[:compressed] ? :compressed_wif_chars : :uncompressed_wif_chars
-      @network_key = networks.keys.select do |k|
-        networks[k][chars_key].include?(wif.slice(0))
-      end.first
-      @network = networks[network_key]
-    end
-    
     def from_base64(base64_key = raw_key)
       raise InvalidBase64Format unless base64_format?(base64_key)
       decode_base64(base64_key)
@@ -118,7 +106,7 @@ module MoneyTree
     def compressed_wif_format?
       wif_format?(:compressed)
     end
-    
+
     def uncompressed_wif_format?
       wif_format?(:uncompressed)
     end
@@ -132,19 +120,18 @@ module MoneyTree
     def base64_format?(base64_key = raw_key)
       base64_key.length == 44 && base64_key =~ /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/
     end
-    
+
     def hex_format?
       raw_key.length == 64 && !raw_key[/\H/]
     end
-    
+
     def to_hex
       int_to_hex @ec_key.private_key, 64
     end
-    
-    def to_wif(opts = {})
-      opts[:compressed] = true unless opts[:compressed] == false
-      source = network[:privkey_version] + to_hex
-      source += network[:privkey_compression_flag] if opts[:compressed]
+
+    def to_wif(compressed: true, network: :bitcoin)
+      source = NETWORKS[network][:privkey_version] + to_hex
+      source += NETWORKS[network][:privkey_compression_flag] if compressed
       hash = sha256(source)
       hash = sha256(hash)
       checksum = hash.slice(0..7)
@@ -154,7 +141,6 @@ module MoneyTree
 
     def wif_valid?(wif)
       hex = decode_base58(wif)
-      return false unless hex.slice(0..1) == network[:privkey_version]
       checksum = hex.chars.to_a.pop(8).join
       source = hex.slice(0..-9)
       hash = sha256(source)
@@ -162,68 +148,61 @@ module MoneyTree
       hash_checksum = hash.slice(0..7)
       checksum == hash_checksum
     end
-    
+
     def validate_wif(wif)
       raise InvalidWIFFormat unless wif_valid?(wif)
     end
-    
+
     def to_base64
       encode_base64(to_hex)
     end
-    
-    def to_s
-      to_wif
+
+    def to_s(network: :bitcoin)
+      to_wif(network: network)
     end
-    
+
   end
-  
+
   class PublicKey < Key
     attr_reader :private_key, :point, :group, :key_int
-    
+
     def initialize(p_key, opts = {})
       @options = opts
       @options[:compressed] = true if @options[:compressed].nil?
-      
       if p_key.is_a?(PrivateKey)
         @private_key = p_key
-        @network_key = private_key.network_key
-        @network = MoneyTree::NETWORKS[network_key]
         @point = @private_key.calculate_public_key(@options)
         @group = @point.group
         @key = @raw_key = to_hex
       else
-        @network_key = @options[:network] || :bitcoin
-        @network = MoneyTree::NETWORKS[network_key]
         @raw_key = p_key
         @group = PKey::EC::Group.new GROUP_NAME
         @key = parse_raw_key
       end
 
-      @options[:network] = @network_key # remember for deep clone
-
       raise ArgumentError, "Must initialize with a MoneyTree::PrivateKey or a public key value" if @key.nil?
     end
-    
+
     def compression
       @group.point_conversion_form
     end
-    
+
     def compression=(compression_type = :compressed)
       @group.point_conversion_form = compression_type
     end
-    
+
     def compressed
       compressed_key = self.class.new raw_key, options # deep clone
       compressed_key.set_point to_i, compressed: true
       compressed_key
     end
-    
+
     def uncompressed
       uncompressed_key = self.class.new raw_key, options # deep clone
       uncompressed_key.set_point to_i, compressed: false
       uncompressed_key
     end
-    
+
     def set_point(int = to_i, opts = {})
       opts = options.merge(opts)
       opts[:compressed] = true if opts[:compressed].nil?
@@ -232,7 +211,7 @@ module MoneyTree
       @point = PKey::EC::Point.new group, bn
       raise KeyInvalid, 'point is not on the curve' unless @point.on_curve?
     end
-    
+
     def parse_raw_key
       result = if raw_key.is_a?(Bignum)
         set_point raw_key
@@ -240,45 +219,45 @@ module MoneyTree
         set_point hex_to_int(raw_key), compressed: false
       elsif compressed_hex_format?
         set_point hex_to_int(raw_key), compressed: true
-      else 
+      else
         raise KeyFormatNotFound
       end
       to_hex
     end
-    
+
     def hex_format?
       raw_key.length == 130 && !raw_key[/\H/]
     end
-    
+
     def compressed_hex_format?
       raw_key.length == 66 && !raw_key[/\H/]
     end
-    
+
     def to_hex
       int_to_hex to_i, 66
     end
-    
+
     def to_i
       point.to_bn.to_i
     end
-    
+
     def to_ripemd160
       hash = sha256 to_hex
       ripemd160 hash
     end
-    
-    def to_address
+
+    def to_address(network: :bitcoin)
       hash = to_ripemd160
-      address = network[:address_version] + hash
+      address = NETWORKS[network][:address_version] + hash
       to_serialized_base58 address
     end
     alias :to_s :to_address
-    
+
     def to_fingerprint
       hash = to_ripemd160
       hash.slice(0..7)
     end
-    
+
     def to_bytes
       int_to_bytes to_i
     end

data/lib/money-tree/networks.rb

@@ -1,28 +1,35 @@
 module MoneyTree
-  NETWORKS = {
-    bitcoin: {
-      address_version: '00',
-      p2sh_version: '05',
-      p2sh_char: '3',
-      privkey_version: '80',
-      privkey_compression_flag: '01',
-      extended_privkey_version: "0488ade4",
-      extended_pubkey_version: "0488b21e",
-      compressed_wif_chars: %w(K L),
-      uncompressed_wif_chars: %w(5),
-      protocol_version: 70001
-    },
-    bitcoin_testnet: {
-      address_version: '6f',
-      p2sh_version: 'c4',
-      p2sh_char: '2',
-      privkey_version: 'ef',
-      privkey_compression_flag: '01',
-      extended_privkey_version: "04358394",
-      extended_pubkey_version: "043587cf",
-      compressed_wif_chars: %w(c),
-      uncompressed_wif_chars: %w(9),
-      protocol_version: 70001
-    }
-  }
+  NETWORKS =
+    begin
+      hsh = Hash.new do |_, key|
+        raise "#{key} is not a valid network!"
+      end.merge(
+        bitcoin: {
+          address_version: '00',
+          p2sh_version: '05',
+          p2sh_char: '3',
+          privkey_version: '80',
+          privkey_compression_flag: '01',
+          extended_privkey_version: "0488ade4",
+          extended_pubkey_version: "0488b21e",
+          compressed_wif_chars: %w(K L),
+          uncompressed_wif_chars: %w(5),
+          protocol_version: 70001
+        },
+        bitcoin_testnet: {
+          address_version: '6f',
+          p2sh_version: 'c4',
+          p2sh_char: '2',
+          privkey_version: 'ef',
+          privkey_compression_flag: '01',
+          extended_privkey_version: "04358394",
+          extended_pubkey_version: "043587cf",
+          compressed_wif_chars: %w(c),
+          uncompressed_wif_chars: %w(9),
+          protocol_version: 70001
+        }
+      )
+      hsh[:testnet3] = hsh[:bitcoin_testnet]
+      hsh
+    end
 end

data/lib/money-tree/node.rb

@@ -2,62 +2,52 @@ module MoneyTree
   class Node
     include Support
     extend Support
-    attr_reader :private_key, :public_key, :chain_code, 
-      :is_private, :depth, :index, :parent, :network, :network_key
-    
+    attr_reader :private_key, :public_key, :chain_code,
+      :is_private, :depth, :index, :parent
+
     class PublicDerivationFailure < Exception; end
     class InvalidKeyForIndex < Exception; end
     class ImportError < Exception; end
     class PrivatePublicMismatch < Exception; end
-    
+
     def initialize(opts = {})
-      @network_key = opts.delete(:network) || :bitcoin
-      @network = MoneyTree::NETWORKS[network_key]
       opts.each { |k, v| instance_variable_set "@#{k}", v }
     end
-    
-    def self.from_serialized_address(address)
+
+    def self.from_bip32(address, has_version: true)
       hex = from_serialized_base58 address
-      version = from_version_hex hex.slice!(0..7)
+      hex.slice!(0..7) if has_version
       self.new({
         depth: hex.slice!(0..1).to_i(16),
         parent_fingerprint: hex.slice!(0..7),
         index: hex.slice!(0..7).to_i(16),
         chain_code: hex.slice!(0..63).to_i(16)
-      }.merge(key_options(hex, version)))
-    end
-    
-    def self.key_options(hex, version)
-      k_opts = { network: version[:network] }
-      if version[:private_key] && hex.slice(0..1) == '00'
-        private_key = MoneyTree::PrivateKey.new({ key: hex.slice(2..-1) }.merge(k_opts))
-        k_opts.merge private_key: private_key, public_key: MoneyTree::PublicKey.new(private_key)
+      }.merge(parse_out_key(hex)))
+    end
+
+    def self.from_serialized_address(address)
+      puts 'Node.from_serialized_address is DEPRECATED. Please use .from_bip32 instead.'
+      from_bip32(address)
+    end
+
+    def self.parse_out_key(hex)
+      if hex.slice(0..1) == '00'
+        private_key = MoneyTree::PrivateKey.new(key: hex.slice(2..-1))
+        {
+          private_key: private_key,
+          public_key: MoneyTree::PublicKey.new(private_key)
+        }
       elsif %w(02 03).include? hex.slice(0..1)
-        k_opts.merge public_key: MoneyTree::PublicKey.new(hex, k_opts)
+        { public_key: MoneyTree::PublicKey.new(hex) }
       else
         raise ImportError, 'Public or private key data does not match version type'
       end
     end
-    
-    def self.from_version_hex(hex)
-      case hex
-      when MoneyTree::NETWORKS[:bitcoin][:extended_privkey_version]
-        { private_key: true, network: :bitcoin }
-      when MoneyTree::NETWORKS[:bitcoin][:extended_pubkey_version]
-        { private_key: false, network: :bitcoin }
-      when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_privkey_version]
-        { private_key: true, network: :bitcoin_testnet }
-      when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_pubkey_version]
-        { private_key: false, network: :bitcoin_testnet }
-      else 
-        raise ImportError, 'invalid version bytes'
-      end
-    end
-    
+
     def is_private?
       index >= 0x80000000 || index < 0
     end
-    
+
     def index_hex(i = index)
       if i < 0
         [i].pack('l>').unpack('H*').first
@@ -65,15 +55,15 @@ module MoneyTree
         i.to_s(16).rjust(8, "0")
       end
     end
-    
+
     def depth_hex(depth)
       depth.to_s(16).rjust(2, "0")
     end
-    
+
     def private_derivation_message(i)
       "\x00" + private_key.to_bytes + i_as_bytes(i)
     end
-    
+
     def public_derivation_message(i)
       public_key.to_bytes << i_as_bytes(i)
     end
@@ -81,7 +71,7 @@ module MoneyTree
     def i_as_bytes(i)
       [i].pack('N')
     end
-    
+
     def derive_private_key(i = 0)
       message = i >= 0x80000000 || i < 0 ? private_derivation_message(i) : public_derivation_message(i)
       hash = hmac_sha512 hex_to_bytes(chain_code_hex), message
@@ -92,7 +82,7 @@ module MoneyTree
       child_chain_code = right_from_hash(hash)
       return child_private_key, child_chain_code
     end
-    
+
     def derive_public_key(i = 0)
       raise PrivatePublicMismatch if i >= 0x80000000
       message = public_derivation_message(i)
@@ -105,40 +95,45 @@ module MoneyTree
       child_chain_code = right_from_hash(hash)
       return child_public_key, child_chain_code
     end
-    
+
     def left_from_hash(hash)
       bytes_to_int hash.bytes.to_a[0..31]
     end
-    
+
     def right_from_hash(hash)
       bytes_to_int hash.bytes.to_a[32..-1]
     end
 
-    def to_serialized_hex(type = :public)
+    def to_serialized_hex(type = :public, network: :bitcoin)
       raise PrivatePublicMismatch if type.to_sym == :private && private_key.nil?
       version_key = type.to_sym == :private ? :extended_privkey_version : :extended_pubkey_version
-      hex = network[version_key] # version (4 bytes)
+      hex = NETWORKS[network][version_key] # version (4 bytes)
       hex += depth_hex(depth) # depth (1 byte)
       hex += parent_fingerprint # fingerprint of key (4 bytes)
       hex += index_hex(index) # child number i (4 bytes)
       hex += chain_code_hex
       hex += type.to_sym == :private ? "00#{private_key.to_hex}" : public_key.compressed.to_hex
     end
-    
-    def to_serialized_address(type = :public)
+
+    def to_bip32(type = :public, network: :bitcoin)
       raise PrivatePublicMismatch if type.to_sym == :private && private_key.nil?
-      to_serialized_base58 to_serialized_hex(type)
+      to_serialized_base58 to_serialized_hex(type, network: network)
+    end
+
+    def to_serialized_address(type = :public, network: :bitcoin)
+      puts 'Node.to_serialized_address is DEPRECATED. Please use .to_bip32.'
+      to_bip32(type, network: network)
     end
 
     def to_identifier(compressed=true)
       key = compressed ? public_key.compressed : public_key.uncompressed
       key.to_ripemd160
     end
-    
+
     def to_fingerprint
       public_key.compressed.to_fingerprint
     end
-    
+
     def parent_fingerprint
       if @parent_fingerprint
         @parent_fingerprint
@@ -147,40 +142,39 @@ module MoneyTree
       end
     end
 
-    def to_address(compressed=true)
-      address = network[:address_version] + to_identifier(compressed)
+    def to_address(compressed=true, network: :bitcoin)
+      address = NETWORKS[network][:address_version] + to_identifier(compressed)
       to_serialized_base58 address
     end
-    
+
     def subnode(i = 0, opts = {})
       if private_key.nil?
         child_public_key, child_chain_code = derive_public_key(i)
-        child_public_key = MoneyTree::PublicKey.new child_public_key, network: network_key
+        child_public_key = MoneyTree::PublicKey.new child_public_key
       else
         child_private_key, child_chain_code = derive_private_key(i)
-        child_private_key = MoneyTree::PrivateKey.new key: child_private_key, network: network_key
+        child_private_key = MoneyTree::PrivateKey.new key: child_private_key
         child_public_key = MoneyTree::PublicKey.new child_private_key
       end
-            
-      MoneyTree::Node.new network: network_key,
-                          depth: depth+1, 
-                          index: i, 
+
+      MoneyTree::Node.new( depth: depth+1,
+                          index: i,
                           private_key: private_key.nil? ? nil : child_private_key,
                           public_key: child_public_key,
                           chain_code: child_chain_code,
-                          parent: self
+                          parent: self)
     end
-    
+
     # path: a path of subkeys denoted by numbers and slashes. Use
     #     p or i<0 for private key derivation. End with .pub to force
     #     the key public.
-    # 
+    #
     # Examples:
     #     1p/-5/2/1 would call subkey(i=1, is_prime=True).subkey(i=-5).
     #         subkey(i=2).subkey(i=1) and then yield the private key
     #     0/0/458.pub would call subkey(i=0).subkey(i=0).subkey(i=458) and
     #         then yield the public key
-    # 
+    #
     # You should choose either the p or the negative number convention for private key derivation.
     def node_for_path(path)
       force_public = path[-4..-1] == '.pub'
@@ -204,11 +198,11 @@ module MoneyTree
         nodes.last
       end
     end
-    
+
     def parse_index(path_part)
       is_prime = %w(p ').include? path_part[-1]
       i = path_part.to_i
-      
+
       i = if i < 0
         i
       elsif is_prime
@@ -217,16 +211,16 @@ module MoneyTree
         i & 0x7fffffff
       end
     end
-    
+
     def strip_private_info!
       @private_key = nil
     end
-    
+
     def chain_code_hex
       int_to_hex chain_code, 64
     end
   end
-  
+
   class Master < Node
     module SeedGeneration
       class Failure < Exception; end
@@ -236,18 +230,16 @@ module MoneyTree
       class ImportError < Failure; end
       class TooManyAttempts < Failure; end
     end
-    
+
     HD_WALLET_BASE_KEY = "Bitcoin seed"
     RANDOM_SEED_SIZE = 32
-    
+
     attr_reader :seed, :seed_hash
-    
+
     def initialize(opts = {})
       @depth = 0
       @index = 0
       opts[:seed] = [opts[:seed_hex]].pack("H*") if opts[:seed_hex]
-      @network_key = opts[:network] || :bitcoin
-      @network = MoneyTree::NETWORKS[network_key]
       if opts[:seed]
         @seed = opts[:seed]
         @seed_hash = generate_seed_hash(@seed)
@@ -258,14 +250,12 @@ module MoneyTree
         @chain_code = opts[:chain_code]
         if opts[:private_key]
           @private_key = opts[:private_key]
-          @network_key = @private_key.network_key
-          @network = MoneyTree::NETWORKS[network_key]
           @public_key = MoneyTree::PublicKey.new @private_key
         else opts[:public_key]
           @public_key = if opts[:public_key].is_a?(MoneyTree::PublicKey)
             opts[:public_key]
           else
-            MoneyTree::PublicKey.new(opts[:public_key], network: network_key)
+            MoneyTree::PublicKey.new(opts[:public_key])
           end
         end
       else
@@ -273,29 +263,29 @@ module MoneyTree
         set_seeded_keys
       end
     end
-    
+
     def is_private?
       true
     end
-    
+
     def generate_seed
       @seed = OpenSSL::Random.random_bytes(32)
       @seed_hash = generate_seed_hash(@seed)
       raise SeedGeneration::ValidityError unless seed_valid?(@seed_hash)
     end
-    
+
     def generate_seed_hash(seed)
       hmac_sha512 HD_WALLET_BASE_KEY, seed
     end
-    
+
     def seed_valid?(seed_hash)
       return false unless seed_hash.bytesize == 64
       master_key = left_from_hash(seed_hash)
       !master_key.zero? && master_key < MoneyTree::Key::ORDER
     end
-    
+
     def set_seeded_keys
-      @private_key = MoneyTree::PrivateKey.new key: left_from_hash(seed_hash), network: network_key
+      @private_key = MoneyTree::PrivateKey.new key: left_from_hash(seed_hash)
       @chain_code = right_from_hash(seed_hash)
       @public_key = MoneyTree::PublicKey.new @private_key
     end

data/lib/money-tree/version.rb

@@ -1,3 +1,3 @@
 module MoneyTree
-  VERSION = "0.8.9"
+  VERSION = "0.9.0"
 end

data/lib/openssl_extensions.rb

@@ -40,6 +40,12 @@ module MoneyTree
       EC_POINT_clear_free(point_0_pt)
       EC_POINT_clear_free(point_1_pt)
 
+      eckey = nil
+      group = nil
+      sum_point = nil
+      point_0_pt = nil
+      point_1_pt = nil
+
       hex
     end
 

data/money-tree.gemspec

@@ -18,6 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   
+  # used with gem i coin-op -P HighSecurity
+  spec.cert_chain  = ["certs/jvergeldedios.pem"]
+  # Sign gem when evaluating spec with `gem` command
+  #  unless ENV has set a SKIP_GEM_SIGNING
+  if ($0 =~ /gem\z/) and not ENV.include?("SKIP_GEM_SIGNING")
+    spec.signing_key = File.join(Gem.user_home, ".ssh", "gem-private_key.pem")
+  end
+
+ 
   spec.add_dependency "ffi"
     
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/lib/money-tree/address_spec.rb

@@ -56,7 +56,7 @@ describe MoneyTree::Address do
     end
 
     it "returns a testnet address" do
-      expect(%w(m n)).to include(@address.to_s[0])
+      expect(%w(m n)).to include(@address.to_s(network: :bitcoin_testnet)[0])
     end
   end
 end

data/spec/lib/money-tree/node_spec.rb

@@ -24,49 +24,49 @@ describe MoneyTree::Master do
       end
 
       it "generates testnet address" do
-        expect(%w(m n)).to include(@master.to_address[0])
+        expect(%w(m n)).to include(@master.to_address(network: :bitcoin_testnet)[0])
       end
 
       it "generates testnet compressed wif" do
-        expect(@master.private_key.to_wif[0]).to eql('c')
+        expect(@master.private_key.to_wif(network: :bitcoin_testnet)[0]).to eql('c')
       end
 
       it "generates testnet uncompressed wif" do
-        expect(@master.private_key.to_wif(compressed: false)[0]).to eql('9')
+        expect(@master.private_key.to_wif(compressed: false, network: :bitcoin_testnet)[0]).to eql('9')
       end
 
       it "generates testnet serialized private address" do
-        expect(@master.to_serialized_address(:private).slice(0, 4)).to eql("tprv")
+        expect(@master.to_serialized_address(:private, network: :bitcoin_testnet).slice(0, 4)).to eql("tprv")
       end
 
       it "generates testnet serialized public address" do
-        expect(@master.to_serialized_address.slice(0, 4)).to eql("tpub")
+        expect(@master.to_serialized_address(network: :bitcoin_testnet).slice(0, 4)).to eql("tpub")
       end
 
       it "imports from testnet serialized private address" do
         node = MoneyTree::Node.from_serialized_address 'tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE'
-        expect(node.to_serialized_address(:private)).to eql('tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE')
+        expect(node.to_serialized_address(:private, network: :bitcoin_testnet)).to eql('tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE')
       end
 
       it "imports from testnet serialized public address" do
         node = MoneyTree::Node.from_serialized_address 'tpubD6NzVbkrYhZ4YA8aUE9bBZTSyHJibBqwDny5urfwDdJc4W8od3y3Ebzy6CqsYn9CCC5P5VQ7CeZYpnT1kX3RPVPysU2rFRvYSj8BCoYYNqT'
-        expect(%w(m n)).to include(node.public_key.to_s[0])
-        expect(node.to_serialized_address).to eql('tpubD6NzVbkrYhZ4YA8aUE9bBZTSyHJibBqwDny5urfwDdJc4W8od3y3Ebzy6CqsYn9CCC5P5VQ7CeZYpnT1kX3RPVPysU2rFRvYSj8BCoYYNqT')
+        expect(%w(m n)).to include(node.public_key.to_s(network: :bitcoin_testnet)[0])
+        expect(node.to_serialized_address(network: :bitcoin_testnet)).to eql('tpubD6NzVbkrYhZ4YA8aUE9bBZTSyHJibBqwDny5urfwDdJc4W8od3y3Ebzy6CqsYn9CCC5P5VQ7CeZYpnT1kX3RPVPysU2rFRvYSj8BCoYYNqT')
       end
 
       it "generates testnet subnodes from serialized private address" do
         node = MoneyTree::Node.from_serialized_address 'tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE'
         subnode = node.node_for_path('1/1/1')
-        expect(%w(m n)).to include(subnode.public_key.to_s[0])
-        expect(subnode.to_serialized_address(:private).slice(0,4)).to eql('tprv')
-        expect(subnode.to_serialized_address.slice(0,4)).to eql('tpub')
+        expect(%w(m n)).to include(subnode.public_key.to_s(network: :bitcoin_testnet)[0])
+        expect(subnode.to_serialized_address(:private, network: :bitcoin_testnet).slice(0,4)).to eql('tprv')
+        expect(subnode.to_serialized_address(network: :bitcoin_testnet).slice(0,4)).to eql('tpub')
       end
 
       it "generates testnet subnodes from serialized public address" do
         node = MoneyTree::Node.from_serialized_address 'tpubD6NzVbkrYhZ4YA8aUE9bBZTSyHJibBqwDny5urfwDdJc4W8od3y3Ebzy6CqsYn9CCC5P5VQ7CeZYpnT1kX3RPVPysU2rFRvYSj8BCoYYNqT'
         subnode = node.node_for_path('1/1/1')
-        expect(%w(m n)).to include(subnode.public_key.to_s[0])
-        expect(subnode.to_serialized_address.slice(0,4)).to eql('tpub')
+        expect(%w(m n)).to include(subnode.public_key.to_s(network: :bitcoin_testnet)[0])
+        expect(subnode.to_serialized_address(network: :bitcoin_testnet).slice(0,4)).to eql('tpub')
       end
     end
 
@@ -799,7 +799,7 @@ describe MoneyTree::Master do
         it "correctly derives from a node with a chain code represented in 31 bytes" do
           @node = MoneyTree::Node.from_serialized_address "tpubD6NzVbkrYhZ4WM42MZZmUZ7LjxyjBf5bGjEeLf9nJnMZqocGJWu94drvpqWsE9jE7k3h22v6gjpPGnqgBrqwGsRYwDXVRfQ2M9dfHbXP5zA"
           @subnode = @node.node_for_path('m/1')
-          expect(@subnode.to_serialized_address).to eql("tpubDA7bCxb3Nrcz2ChXyPqXxbG4q5oiAZUHR7wD3LAiXukuxmT65weWw84XYmjhkJTkJEM6LhNWioWTpKEkQp7j2fgVccj3PPc271xHDeMsaTY")
+          expect(@subnode.to_serialized_address(network: :bitcoin_testnet)).to eql("tpubDA7bCxb3Nrcz2ChXyPqXxbG4q5oiAZUHR7wD3LAiXukuxmT65weWw84XYmjhkJTkJEM6LhNWioWTpKEkQp7j2fgVccj3PPc271xHDeMsaTY")
         end
       end
     end

data/spec/lib/money-tree/private_key_spec.rb

@@ -45,7 +45,7 @@ describe MoneyTree::PrivateKey do
     end
     
     it "is valid" do
-      expect(@key.to_wif(compressed: false)).to eql('5JXz5ZyFk31oHVTQxqce7yitCmTAPxBqeGQ4b7H3Aj3L45wUhoa'      )
+      expect(@key.to_wif(compressed: false)).to eql('5JXz5ZyFk31oHVTQxqce7yitCmTAPxBqeGQ4b7H3Aj3L45wUhoa')
     end
   end
   
@@ -104,7 +104,7 @@ describe MoneyTree::PrivateKey do
 
     describe "to_wif" do
       it "returns same wif" do
-        expect(@key.to_wif).to eql('cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD')
+        expect(@key.to_wif(network: :bitcoin_testnet)).to eql('cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD')
       end
     end
   end

data/spec/lib/money-tree/public_key_spec.rb

@@ -161,26 +161,26 @@ describe MoneyTree::PublicKey do
   context "testnet" do
     context 'with private key' do
       before do
-        @private_key = MoneyTree::PrivateKey.new network: :bitcoin_testnet
+        @private_key = MoneyTree::PrivateKey.new
         @key = MoneyTree::PublicKey.new(@private_key)
       end
 
       it "should have an address starting with m or n" do
-        expect(%w(m n)).to include(@key.to_s[0])
+        expect(%w(m n)).to include(@key.to_s(network: :bitcoin_testnet)[0])
       end
 
       it "should have an uncompressed address starting with m or n" do
-        expect(%w(m n)).to include(@key.uncompressed.to_s[0])
+        expect(%w(m n)).to include(@key.uncompressed.to_s(network: :bitcoin_testnet)[0])
       end
     end
 
     context 'without private key' do
       before do
-        @key = MoneyTree::PublicKey.new('0297b033ba894611345a0e777861237ef1632370fbd58ebe644eb9f3714e8fe2bc', network: :bitcoin_testnet)
+        @key = MoneyTree::PublicKey.new('0297b033ba894611345a0e777861237ef1632370fbd58ebe644eb9f3714e8fe2bc')
       end
 
       it "should have an address starting with m or n" do
-        expect(%w(m n)).to include(@key.to_s[0])
+        expect(%w(m n)).to include(@key.to_s(network: :bitcoin_testnet)[0])
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 require 'simplecov'
 require 'money-tree'
+require 'pry'

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: money-tree
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Micah Winkelspecht
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDXDCCAkSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA6MQ8wDQYDVQQDDAZqdWxp
+  YW4xEzARBgoJkiaJk/IsZAEZFgNnZW0xEjAQBgoJkiaJk/IsZAEZFgJjbzAeFw0x
+  NTA0MDMwODAwMTdaFw0xNjA0MDIwODAwMTdaMDoxDzANBgNVBAMMBmp1bGlhbjET
+  MBEGCgmSJomT8ixkARkWA2dlbTESMBAGCgmSJomT8ixkARkWAmNvMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp0qCsOUQyTRA4f7WxoU2ctpUO5+eLZw8
+  ILvHJy/0dC2nnIgib+FaFA8TRIGw6fjX2hQ43QJyO36zkjUhAwNu/+TBCfG+Grut
+  2dI9XmqU5Z6PvvXRj6Gu5IkDeIVDKILZv3bDugHJalre4BUKnwPYv5WpZ/e/c6+z
+  E4fwe4ZQzqslSXZo0o/wFvs5dGuIoP93bazSeqddre0JKFFiEP/SNGP9e/lXEd2V
+  rLFYAY409no9J+VQOHP0Nu9ShlCZp8M45abKd2ykuSDaT6jH9YcUHBr3/IEsA4+f
+  DypeS1ySVvad+o8iTnfz1Hyohz4ORm3spf0BOtGI/Swbv3LObZJqkwIDAQABo20w
+  azAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUERhBDW/kkq7tz2hN
+  hPNHtounnkowGAYDVR0RBBEwD4ENanVsaWFuQGdlbS5jbzAYBgNVHRIEETAPgQ1q
+  dWxpYW5AZ2VtLmNvMA0GCSqGSIb3DQEBBQUAA4IBAQAgnumhg8ST8JohYWcoDoQt
+  3BUG5rbfJ/qE0utOt6esi9d6Vz6YHpiT08woaj68OWl9U9N4vjox+ckkTRs93KBd
+  y3thnK9cIEAzoEZs3BBguXYOoFLughGD7hEuLlRYbwZzyIdzx/XdLgsy5Di8Gqaa
+  RKurfXP+dERQww34CUhmhOLO4/rYGqaD88so0MzCImgS+OX+G4ppqd38iQpaxCHL
+  tdc4VS7IlSRxlZ3dBOgiigy9GXpJ+7F831AqjxL39EPwdr7RguTNz+pi//RKaT/U
+  IlpVB+Xfk0vQdP7iYfjGxDzUf0FACMjsR95waJmadKW1Iy6STw2hwPhYIQz1Hu1A
+  -----END CERTIFICATE-----
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi