money-tree 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a3ecbdcd5b3a5f520f5d34eedb0158ad7ad716
-  data.tar.gz: 999bc086f43b012af5b2de444c43bac102e2cbe1
+  metadata.gz: ed8522c0f961d7b6556cc9067455f12d65bcfd0f
+  data.tar.gz: 02857ab85d9b22a1a96c71f6d47c957a9310eb23
 SHA512:
-  metadata.gz: 10019f4bf74c84af796336033c0f67ae2fac8df851c028e95942a1c717a9afe78be6ae190c9d8de932a16e461e950645c9d0023e9a2e084a8e54a09fd1df6e3d
-  data.tar.gz: 70d2850af773d64babf1ce5711e055f79bdfa281fc1b92d7a07bdecad4bed3022977e06d079eed64573e2ecc1e633b429af7b7063cc1c552ea9711459af61f0b
+  metadata.gz: b9d8647c31dccee3b9c34ad46e533bbd0cd37c8407402caa1356e8282b3e3e422637b69ebbee42a840c64948ccca8e9d5479fb0a260fa7d8508790210f9317ae
+  data.tar.gz: 22fbe674fbb0919ced227c8d3bd5f9f554b76726fca29442b2dd545c810f05e9dd5b97fa1f2f2ceaedaeb06e8b58f7b2c6bcb8f8e6d57e4d1103cc3c250369ac

data/lib/money-tree/address.rb

@@ -1,10 +1,11 @@
 module MoneyTree
   class Address
-    attr_accessor :private_key, :public_key
+    attr_reader :private_key, :public_key
     
     def initialize(opts = {})
-      @private_key = MoneyTree::PrivateKey.new key: opts[:private_key]
-      @public_key = MoneyTree::PublicKey.new(@private_key)
+      private_key = opts.delete(:private_key)
+      @private_key = MoneyTree::PrivateKey.new({ key: private_key }.merge(opts))
+      @public_key = MoneyTree::PublicKey.new(@private_key, opts)
     end
     
     def to_s

data/lib/money-tree/key.rb

@@ -15,7 +15,7 @@ module MoneyTree
     class InvalidWIFFormat < Exception; end
     class InvalidBase64Format < Exception; end
     
-    attr_reader :options, :key, :raw_key
+    attr_reader :options, :key, :raw_key, :network, :network_key
     attr_accessor :ec_key
     
     GROUP_NAME = 'secp256k1'
@@ -40,6 +40,8 @@ module MoneyTree
     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
@@ -71,8 +73,8 @@ module MoneyTree
     end
     
     def parse_raw_key
-      result = if raw_key.is_a?(Bignum) then int_to_hex(raw_key)
-      elsif hex_format? then 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
@@ -81,28 +83,52 @@ module MoneyTree
       end
       result.downcase
     end
+
+    def from_bignum(bignum = raw_key)
+      int_to_hex(bignum)
+    end
+
+    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)
     end
-    
+
     def compressed_wif_format?
-      raw_key.length == 52 && MoneyTree::NETWORKS[:bitcoin][:compressed_wif_chars].include?(raw_key.slice(0))
+      wif_format?(:compressed)
     end
     
     def uncompressed_wif_format?
-      raw_key.length == 51 && raw_key.slice(0) == MoneyTree::NETWORKS[:bitcoin][:uncompressed_wif_char]
+      wif_format?(:uncompressed)
     end
-    
+
+    def wif_format?(compression)
+      length = compression == :compressed ? 52 : 51
+      wif_prefixes = MoneyTree::NETWORKS.map {|k, v| v["#{compression}_wif_chars".to_sym]}.flatten
+      raw_key.length == length && wif_prefixes.include?(raw_key.slice(0))
+    end
+
     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
@@ -117,8 +143,8 @@ module MoneyTree
     
     def to_wif(opts = {})
       opts[:compressed] = true unless opts[:compressed] == false
-      source = MoneyTree::NETWORKS[:bitcoin][:privkey_version] + to_hex
-      source += MoneyTree::NETWORKS[:bitcoin][:privkey_compression_flag] if opts[:compressed]
+      source = network[:privkey_version] + to_hex
+      source += network[:privkey_compression_flag] if opts[:compressed]
       hash = sha256(source)
       hash = sha256(hash)
       checksum = hash.slice(0..7)
@@ -128,7 +154,7 @@ module MoneyTree
 
     def wif_valid?(wif)
       hex = decode_base58(wif)
-      return false unless hex.slice(0..1) == MoneyTree::NETWORKS[:bitcoin][:privkey_version]
+      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)
@@ -160,10 +186,14 @@ module MoneyTree
       
       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
@@ -180,13 +210,13 @@ module MoneyTree
     end
     
     def compressed
-      compressed_key = self.class.new raw_key # deep clone
+      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 # deep clone
+      uncompressed_key = self.class.new raw_key, options # deep clone
       uncompressed_key.set_point to_i, compressed: false
       uncompressed_key
     end
@@ -236,7 +266,7 @@ module MoneyTree
     
     def to_address
       hash = to_ripemd160
-      address = MoneyTree::NETWORKS[:bitcoin][:address_version] + hash
+      address = network[:address_version] + hash
       to_serialized_base58 address
     end
     alias :to_s :to_address

data/lib/money-tree/networks.rb

@@ -3,24 +3,26 @@ module MoneyTree
     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_char: '5',
+      uncompressed_wif_chars: %w(5),
       protocol_version: 70001
     },
     bitcoin_testnet: {
       address_version: '6f',
-      p2sh_version: '05',
-      privkey_version: '80',
+      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(K L),
-      uncompressed_wif_char: '5',
+      compressed_wif_chars: %w(c),
+      uncompressed_wif_chars: %w(9),
       protocol_version: 70001
     }
   }
-end
+end

data/lib/money-tree/node.rb

@@ -2,7 +2,7 @@ module MoneyTree
   class Node
     include Support
     extend Support
-    attr_reader :private_key, :public_key, :chain_code, :is_private, :depth, :index, :parent, :is_test
+    attr_reader :private_key, :public_key, :chain_code, :is_private, :depth, :index, :parent, :network, :network_key
     
     class PublicDerivationFailure < Exception; end
     class InvalidKeyForIndex < Exception; end
@@ -10,6 +10,8 @@ module MoneyTree
     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
     
@@ -17,7 +19,6 @@ module MoneyTree
       hex = from_serialized_base58 address
       version = from_version_hex hex.slice!(0..7)
       self.new({
-        is_test: version[:test],
         depth: hex.slice!(0..1).to_i(16),
         fingerprint: hex.slice!(0..7),
         index: hex.slice!(0..7).to_i(16),
@@ -26,11 +27,12 @@ module MoneyTree
     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)
-        { private_key: private_key, public_key: MoneyTree::PublicKey.new(private_key) }
+        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)
       elsif %w(02 03).include? hex.slice(0..1)
-        { public_key: MoneyTree::PublicKey.new(hex) }
+        k_opts.merge public_key: MoneyTree::PublicKey.new(hex, k_opts)
       else
         raise ImportError, 'Public or private key data does not match version type'
       end
@@ -39,13 +41,13 @@ module MoneyTree
     def self.from_version_hex(hex)
       case hex
       when MoneyTree::NETWORKS[:bitcoin][:extended_privkey_version]
-        { private_key: true, test: false }
+        { private_key: true, network: :bitcoin }
       when MoneyTree::NETWORKS[:bitcoin][:extended_pubkey_version]
-        { private_key: false, test: false }
+        { private_key: false, network: :bitcoin }
       when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_privkey_version]
-        { private_key: true, test: true }
+        { private_key: true, network: :bitcoin_testnet }
       when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_pubkey_version]
-        { private_key: false, test: true }
+        { private_key: false, network: :bitcoin_testnet }
       else 
         raise ImportError, 'invalid version bytes'
       end
@@ -114,7 +116,7 @@ module MoneyTree
     def to_serialized_hex(type = :public)
       raise PrivatePublicMismatch if type.to_sym == :private && private_key.nil?
       version_key = type.to_sym == :private ? :extended_privkey_version : :extended_pubkey_version
-      hex = MoneyTree::NETWORKS[:bitcoin][version_key] # version (4 bytes)
+      hex = network[version_key] # version (4 bytes)
       hex += depth_hex(depth) # depth (1 byte)
       hex += depth.zero? ? '00000000' : parent.to_fingerprint# fingerprint of key (4 bytes)
       hex += index_hex(index) # child number i (4 bytes)
@@ -136,21 +138,22 @@ module MoneyTree
     end
     
     def to_address
-      address = MoneyTree::NETWORKS[:bitcoin][:address_version] + to_identifier
+      address = network[:address_version] + to_identifier
       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
+        child_public_key = MoneyTree::PublicKey.new child_public_key, network: network_key
       else
         child_private_key, child_chain_code = derive_private_key(i)
-        child_private_key = MoneyTree::PrivateKey.new key: child_private_key
+        child_private_key = MoneyTree::PrivateKey.new key: child_private_key, network: network_key
         child_public_key = MoneyTree::PublicKey.new child_private_key
       end
             
-      MoneyTree::Node.new depth: depth+1, 
+      MoneyTree::Node.new network: network_key,
+                          depth: depth+1, 
                           index: i, 
                           private_key: private_key.nil? ? nil : child_private_key,
                           public_key: child_public_key,
@@ -233,6 +236,8 @@ module MoneyTree
       @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)
@@ -243,9 +248,15 @@ 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 = opts[:public_key].is_a?(MoneyTree::PublicKey) ? opts[:public_key] : MoneyTree::PublicKey.new(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)
+          end
         end
       else
         generate_seed
@@ -274,7 +285,7 @@ module MoneyTree
     end
     
     def set_seeded_keys
-      @private_key = MoneyTree::PrivateKey.new key: left_from_hash(seed_hash)
+      @private_key = MoneyTree::PrivateKey.new key: left_from_hash(seed_hash), network: network_key
       @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.4"
+  VERSION = "0.8.5"
 end

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

@@ -49,4 +49,14 @@ describe MoneyTree::Address do
       @address.private_key.to_s.should == "KzPkwAXJ4wtXHnbamTaJqoMrzwCUUJaqhUxnqYhnZvZH6KhgmDPK"
     end
   end
+
+  context "testnet3" do
+    before do
+      @address = MoneyTree::Address.new network: :bitcoin_testnet
+    end
+
+    it "returns a testnet address" do
+      %w(m n).should include(@address.to_s[0])
+    end
+  end
 end

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

@@ -12,7 +12,59 @@ describe MoneyTree::Master do
         @master.seed.bytesize.should == 32
       end
     end
-    
+
+    context "testnet" do
+      before do
+        @master = MoneyTree::Master.new network: :bitcoin_testnet
+      end
+
+      it "generates testnet address" do
+        %w(m n).should include(@master.to_address[0])
+      end
+
+      it "generates testnet compressed wif" do
+        @master.private_key.to_wif[0].should == 'c'
+      end
+
+      it "generates testnet uncompressed wif" do
+        @master.private_key.to_wif(compressed: false)[0].should == '9'
+      end
+
+      it "generates testnet serialized private address" do
+        @master.to_serialized_address(:private).slice(0, 4).should == "tprv"
+      end
+
+      it "generates testnet serialized public address" do
+        @master.to_serialized_address.slice(0, 4).should == "tpub"
+      end
+
+      it "imports from testnet serialized private address" do
+        node = MoneyTree::Node.from_serialized_address 'tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE'
+        node.to_serialized_address(:private).should == 'tprv8ZgxMBicQKsPcuN7bfUZqq78UEYapr3Tzmc9NcDXw8BnBJ47dZYr6SusnfYj7vbAYP9CP8ZiD5aVBTUo1yU5QP56mepKVvuEbu8KZQXMKNE'
+      end
+
+      it "imports from testnet serialized public address" do
+        node = MoneyTree::Node.from_serialized_address 'tpubD6NzVbkrYhZ4YA8aUE9bBZTSyHJibBqwDny5urfwDdJc4W8od3y3Ebzy6CqsYn9CCC5P5VQ7CeZYpnT1kX3RPVPysU2rFRvYSj8BCoYYNqT'
+        %w(m n).should include(node.public_key.to_s[0])
+        node.to_serialized_address.should == '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')
+        %w(m n).should include(subnode.public_key.to_s[0])
+        subnode.to_serialized_address(:private).slice(0,4).should == 'tprv'
+        subnode.to_serialized_address.slice(0,4).should == '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')
+        %w(m n).should include(subnode.public_key.to_s[0])
+        subnode.to_serialized_address.slice(0,4).should == 'tpub'
+      end
+    end
+
     describe "Test vector 1" do
       describe "from a seed" do
         before do

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

@@ -91,4 +91,16 @@ describe MoneyTree::PrivateKey do
       
     end
   end
+
+  context "testnet" do
+    before do
+      @key = MoneyTree::PrivateKey.new key: 'cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD'
+    end
+
+    describe "to_wif" do
+      it "returns same wif" do
+        @key.to_wif.should == 'cRhes8SBnsF6WizphaRKQKZZfDniDa9Bxcw31yKeEC1KDExhxFgD'
+      end
+    end
+  end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-tree
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Micah Winkelspecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi