money-tree 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838719a8f745234b8e08d8726d2e4af5b61d93de
-  data.tar.gz: 9391e5eebd7b8b71dfe98ef61f2ff5e3ad0094ad
+  metadata.gz: fd86557ea3684c83ffae3308afb125c6bcea3af7
+  data.tar.gz: 3d74748c57a91fff5b027f11a9f8eaa16f0740e4
 SHA512:
-  metadata.gz: 73142e1cd77e36e4a4750b0a7f2e4f34f47f9320a27144ea412fd5149073598642624a37d63aca0417136c4acb9bb2e1043ec8d679384fe5a5eb415e8fc033e8
-  data.tar.gz: 6e0e848c4b968c004ca66acfd5ff1e917978fd9af63fea16264785d36ab6219ba6ef8a493919607c40789335f87d85f02d6a9c444fae3494f8d70b1e9f5ee55c
+  metadata.gz: 5d996d51da2dc16fe070bb5d68f192c56fb21709d8da2f80a6f952346869641cddc84f74dde1fe9735436a952be175284875a5995bfb1adfe372e7090eb9f50d
+  data.tar.gz: a7510386042a6a1367773cea6948a4a5a0cf455e5434d9e0446f1b106a783092c21a52c95a7606f0762bbf6086d6d09596565035b45d02b1bf528bbf80a000fc

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/wink/money-tree.png)](https://travis-ci.org/wink/money-tree) [![Coverage Status](https://coveralls.io/repos/wink/money-tree/badge.png?branch=master)](https://coveralls.io/r/wink/money-tree?branch=master) [![Gem Version](https://badge.fury.io/rb/money-tree.png)](http://badge.fury.io/rb/money-tree)
+[![Build Status](https://travis-ci.org/wink/money-tree.png)](https://travis-ci.org/wink/money-tree) [![Coverage Status](https://coveralls.io/repos/wink/money-tree/badge.png?branch=master)](https://coveralls.io/r/wink/money-tree?branch=master) [![Code Climate](https://codeclimate.com/github/wink/money-tree.png)](https://codeclimate.com/github/wink/money-tree) [![Gem Version](https://badge.fury.io/rb/money-tree.png)](http://badge.fury.io/rb/money-tree)
 # MoneyTree
 
 MoneyTree is a Ruby implementation of Bitcoin Wallets. Specifically, it supports [Hierachical Deterministic wallets](https://en.bitcoin.it/wiki/Deterministic_Wallet) according to the protocol specified in [BIP0032](https://en.bitcoin.it/wiki/BIP_0032).

data/lib/money-tree/key.rb

@@ -14,14 +14,12 @@ module MoneyTree
     class InvalidWIFFormat < Exception; end
     class InvalidBase64Format < Exception; end
     
-    attr_reader :options, :key
+    attr_reader :options, :key, :raw_key
     attr_accessor :ec_key
     
     GROUP_NAME = 'secp256k1'
-    GROUP_UNCOMPRESSED = "0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8".to_i(16)
-    GROUP_COMPRESSED = "0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798".to_i(16)
     ORDER = "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141".to_i(16)
-    
+
     def valid?(eckey = nil)
       eckey ||= ec_key
       eckey.nil? ? false : eckey.check_key
@@ -37,13 +35,11 @@ module MoneyTree
   end
   
   class PrivateKey < Key
-    
-    attr_reader :raw_key
-    
+        
     def initialize(opts = {})
       @options = opts
       # @ec_key = EC_KEY_new_by_curve_name(NID_secp256k1)
-      @ec_key = PKey::EC.new 'secp256k1'
+      @ec_key = PKey::EC.new GROUP_NAME
       if @options[:key]
         @raw_key = @options[:key]
         @key = parse_raw_key
@@ -156,46 +152,103 @@ module MoneyTree
   end
   
   class PublicKey < Key
-    attr_reader :private_key
+    attr_reader :private_key, :point, :group, :key_int
     
     def initialize(p_key, opts = {})
-      raise "Must initialize with a MoneyTree::PrivateKey" unless p_key.is_a?(PrivateKey)
-      @private_key = p_key
-      @ec_key = @private_key.ec_key
       @options = opts
-      @key = @options[:key] || to_hex
+      @options[:compressed] = true if @options[:compressed].nil?
+      
+      if p_key.is_a?(PrivateKey)
+        @private_key = p_key
+        @point = @private_key.calculate_public_key(@options)
+        @group = @point.group
+        @key = @raw_key = to_hex
+      else
+        @raw_key = p_key
+        @group = PKey::EC::Group.new GROUP_NAME
+        @key = parse_raw_key
+        # set_point
+      end
+      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 to_hex(opts = {})
-      int_to_hex to_i(opts)
+    def compression=(compression_type = :compressed)
+      @group.point_conversion_form = compression_type
     end
     
-    def to_i(opts = {})
-      private_key.calculate_public_key(opts).to_bn.to_i
+    def compressed
+      compressed_key = self.dup
+      compressed_key.set_point to_i, compressed: true
+      compressed_key
     end
     
-    def to_ripemd160(opts = {})
-      hash = sha256 to_hex(opts)
+    def uncompressed
+      uncompressed_key = self.dup
+      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?
+      self.compression = opts[:compressed] ? :compressed : :uncompressed
+      bn = BN.new int_to_hex(int), 16
+      @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
+      elsif hex_format?
+        set_point hex_to_int(raw_key), compressed: false
+      elsif compressed_hex_format?
+        set_point hex_to_int(raw_key), compressed: true
+      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
+    end
+    
+    def to_i
+      point.to_bn.to_i
+    end
+    
+    def to_ripemd160
+      hash = sha256 to_hex
       ripemd160 hash
     end
     
-    def to_address(opts = {})
-      hash = to_ripemd160(opts)
+    def to_address
+      hash = to_ripemd160
       address = MoneyTree::NETWORKS[:bitcoin][:address_version] + hash
       to_serialized_base58 address
     end
+    alias :to_s :to_address
     
-    def to_fingerprint(opts = {})
-      hash = to_ripemd160(opts)
+    def to_fingerprint
+      hash = to_ripemd160
       hash.slice(0..7)
     end
-
-    def to_s(opts = {})
-      to_address(opts)
-    end
     
-    def to_bytes(opts = {})
-      int_to_bytes to_i(opts)
+    def to_bytes
+      int_to_bytes to_i
     end
   end
 end

data/lib/money-tree/node.rb

@@ -5,6 +5,8 @@ module MoneyTree
     
     class PublicDerivationFailure < Exception; end
     class InvalidKeyForIndex < Exception; end
+    class ImportError < Exception; end
+    class PrivatePublicMismatch < Exception; end
     
     def initialize(opts = {})
       @depth = opts[:depth]
@@ -16,6 +18,10 @@ module MoneyTree
       @parent = opts[:parent]
     end
     
+    def is_private?
+      is_private == true
+    end
+    
     def index_hex(i = index)
       if i < 0
         [i].pack('l>').unpack('H*').first
@@ -28,34 +34,42 @@ module MoneyTree
       depth.to_s(16).rjust(2, "0")
     end
     
-    def private_derivation_private_key_message(i)
+    def private_derivation_message(i)
       "\x00" + private_key.to_bytes + i_as_bytes(i)
     end
     
-    def public_derivation_private_key_message(i)
+    def public_derivation_message(i)
       public_key.to_bytes << i_as_bytes(i)
     end
-    
-    # TODO: Complete public key derivation message
-    # def public_derivation_public_key_message(i)
-    #   public_key.to_bytes + i_as_bytes(i)
-    # end
-    
+
     def i_as_bytes(i)
       [i].pack('N')
     end
     
     def derive_private_key(i = 0)
-      message = i >= 0x80000000 ? private_derivation_private_key_message(i) : public_derivation_private_key_message(i)
+      message = i >= 0x80000000 ? private_derivation_message(i) : public_derivation_message(i)
       hash = hmac_sha512 int_to_bytes(chain_code), message
       left_int = left_from_hash(hash)
-      raise InvalidKeyForIndex if left_int >= MoneyTree::Key::ORDER # very low probability
+      raise InvalidKeyForIndex, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
       child_private_key = (left_int + private_key.to_i) % MoneyTree::Key::ORDER
-      raise InvalidKeyForIndex if child_private_key == 0 # very low probability
+      raise InvalidKeyForIndex, 'equal to zero' if child_private_key == 0 # very low probability
       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)
+      hash = hmac_sha512 int_to_bytes(chain_code), message
+      left_int = left_from_hash(hash)
+      raise InvalidKeyForIndex, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
+      factor = BN.new left_int.to_s
+      child_public_key = public_key.uncompressed.group.generator.mul(factor).add(public_key.uncompressed.point).to_bn.to_i
+      raise InvalidKeyForIndex, 'at infinity' if child_public_key == 1/0.0 # very low probability
+      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
@@ -76,25 +90,31 @@ module MoneyTree
     # end
     
     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 += 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)
       hex += chain_code_hex
-      hex += type.to_sym == :private ? "00#{private_key.to_hex}" : public_key.to_hex
+      hex += if type.to_sym == :private
+        "00#{private_key.to_hex}"
+      else
+        public_key.compressed.to_hex
+      end
     end
     
     def to_serialized_address(type = :public)
+      raise PrivatePublicMismatch if type.to_sym == :private && private_key.nil?
       to_serialized_base58 to_serialized_hex(type)
     end
     
     def to_identifier
-      public_key.to_ripemd160
+      public_key.compressed.to_ripemd160
     end
     
     def to_fingerprint
-      public_key.to_fingerprint
+      public_key.compressed.to_fingerprint
     end
     
     def to_address
@@ -104,18 +124,24 @@ module MoneyTree
     
     def subnode(i = 0, opts = {})
       # opts[:as_private] = is_private? unless opts[:as_private] == false
-      child_private_key, child_chain_code = derive_private_key(i)
-      child_private_key = MoneyTree::PrivateKey.new key: child_private_key
-      child_public_key = MoneyTree::PublicKey.new child_private_key
+      if private_key.nil?
+        child_public_key, child_chain_code = derive_public_key(i)
+        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
+        child_public_key = MoneyTree::PublicKey.new child_private_key
+      end
+        
       index = i 
       
       MoneyTree::Node.new depth: depth+1, 
-                                index: i, 
-                                is_private: i >= 0x80000000 || i < 0,
-                                private_key: child_private_key,
-                                public_key: child_public_key,
-                                chain_code: child_chain_code,
-                                parent: self
+                          index: i, 
+                          is_private: i >= 0x80000000 || i < 0,
+                          private_key: private_key.nil? ? nil : child_private_key,
+                          public_key: child_public_key,
+                          chain_code: child_chain_code,
+                          parent: self
     end
     
     # path: a path of subkeys denoted by numbers and slashes. Use
@@ -182,28 +208,34 @@ module MoneyTree
       @depth = 0
       @index = 0
       @is_private = true
-      @seed_generation_attempt = 0
       opts[:seed] = [opts[:seed_hex]].pack("H*") if opts[:seed_hex]
       if opts[:seed]
         @seed = opts[:seed]
         @seed_hash = generate_seed_hash(@seed)
         raise SeedGeneration::ImportError unless seed_valid?(@seed_hash)
+        set_seeded_keys
+      elsif opts[:private_key] || opts[:public_key]
+        raise ImportError, 'chain code required' unless opts[:chain_code]
+        @chain_code = opts[:chain_code]
+        if opts[:private_key]
+          @private_key = opts[:private_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])
+          @is_private = false
+        end
       else
-        generate_seed_until_valid
+        generate_seed
+        set_seeded_keys
       end
-      set_master_keys
     end
     
-    def generate_seed_until_valid
-      @seed = generate_seed
+    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
-      OpenSSL::Random.random_bytes(32)
-    end
-    
     def generate_seed_hash(seed)
       hmac_sha512 HD_WALLET_BASE_KEY, seed
     end
@@ -214,7 +246,7 @@ module MoneyTree
       !master_key.zero? && master_key < MoneyTree::Key::ORDER
     end
     
-    def set_master_keys
+    def set_seeded_keys
       @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

data/lib/money-tree/support.rb

@@ -3,24 +3,25 @@ require 'base64'
 
 module MoneyTree
   module Support
+    include OpenSSL
+    
     INT32_MAX = 256 ** [1].pack("L*").size
     INT64_MAX = 256 ** [1].pack("Q*").size
+    BASE58_CHARS = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
     
     def int_to_base58(int_val, leading_zero_bytes=0)
-      alpha = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-      base58_val, base = '', alpha.size
+      base58_val, base = '', BASE58_CHARS.size
       while int_val > 0
         int_val, remainder = int_val.divmod(base)
-        base58_val = alpha[remainder] + base58_val
+        base58_val = BASE58_CHARS[remainder] + base58_val
       end
       base58_val
     end
 
     def base58_to_int(base58_val)
-      alpha = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
-      int_val, base = 0, alpha.size
+      int_val, base = 0, BASE58_CHARS.size
       base58_val.reverse.each_char.with_index do |char,index|
-        raise ArgumentError, 'Value not a valid Base58 String.' unless char_index = alpha.index(char)
+        raise ArgumentError, 'Value not a valid Base58 String.' unless char_index = BASE58_CHARS.index(char)
         int_val += char_index*(base**index)
       end
       int_val
@@ -48,14 +49,17 @@ module MoneyTree
       encode_base58 address
     end
     
-    def sha256(source, opts = {})
+    def digestify(digest_type, source, opts = {})
       source = [source].pack("H*") unless opts[:ascii]
-      bytes_to_hex OpenSSL::Digest::SHA256.digest(source)
+      bytes_to_hex Digest.digest(digest_type, source)
+    end
+    
+    def sha256(source, opts = {})
+      digestify('SHA256', source, opts)
     end
     
     def ripemd160(source, opts = {})
-      source = [source].pack("H*") unless opts[:ascii]
-      bytes_to_hex OpenSSL::Digest::RIPEMD160.digest(source)
+      digestify('RIPEMD160', source, opts)
     end
     
     def encode_base64(hex)
@@ -67,8 +71,8 @@ module MoneyTree
     end
     
     def hmac_sha512(key, message)
-      digest = OpenSSL::Digest::SHA512.new
-      OpenSSL::HMAC.digest digest, key, message
+      digest = Digest::SHA512.new
+      HMAC.digest digest, key, message
     end
     
     def hmac_sha512_hex(key, message)

data/lib/money-tree/version.rb

@@ -1,3 +1,3 @@
 module MoneyTree
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/money-tree.rb

@@ -1,3 +1,4 @@
+require "openssl_extensions"
 require "money-tree/version"
 require "money-tree/support"
 require "money-tree/networks"

data/lib/openssl_extensions.rb

@@ -0,0 +1,52 @@
+# encoding: ascii-8bit
+
+require 'openssl'
+require 'ffi'
+
+module MoneyTree
+  module OpenSSLExtensions
+    extend FFI::Library
+    ffi_lib 'ssl'
+
+    NID_secp256k1 = 714
+    POINT_CONVERSION_COMPRESSED = 2
+    POINT_CONVERSION_UNCOMPRESSED = 4
+
+    attach_function :EC_KEY_free, [:pointer], :int
+    attach_function :EC_KEY_get0_group, [:pointer], :pointer
+    attach_function :EC_KEY_new_by_curve_name, [:int], :pointer
+    attach_function :EC_POINT_free, [:pointer], :int
+    attach_function :EC_POINT_add, [:pointer, :pointer, :pointer, :pointer, :pointer], :int
+    attach_function :EC_POINT_point2hex, [:pointer, :pointer, :int, :pointer], :string
+    attach_function :EC_POINT_hex2point, [:pointer, :string, :pointer, :pointer], :pointer
+    attach_function :EC_POINT_new, [:pointer], :pointer
+    
+    def self.add(point_0, point_1)
+      eckey = EC_KEY_new_by_curve_name(NID_secp256k1)
+      group = EC_KEY_get0_group(eckey)
+      
+      point_0_hex = point_0.to_bn.to_s(16)
+      point_0_pt = EC_POINT_hex2point(group, point_0_hex, nil, nil)
+      point_1_hex = point_1.to_bn.to_s(16)
+      point_1_pt = EC_POINT_hex2point(group, point_1_hex, nil, nil)
+
+      sum_point = EC_POINT_new(group)
+      success = EC_POINT_add(group, sum_point, point_0_pt, point_1_pt, nil)
+      hex = EC_POINT_point2hex(group, sum_point, POINT_CONVERSION_UNCOMPRESSED, nil)
+      EC_KEY_free(eckey)
+      EC_POINT_free(sum_point)
+      hex
+    end
+  end
+end
+
+
+class OpenSSL::PKey::EC::Point
+  include MoneyTree::OpenSSLExtensions
+  
+  def add(point)
+    sum_point_hex = MoneyTree::OpenSSLExtensions.add(self, point)
+    self.class.new group, OpenSSL::BN.new(sum_point_hex, 16)
+  end
+  
+end

data/money-tree.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  
+  spec.add_dependency "ffi"
     
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

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

@@ -302,8 +302,9 @@ describe MoneyTree::Master do
           end
         end
       
-        describe "m/0" do
+        describe "m/0 (testing imported private key)" do
           before do
+            @master = MoneyTree::Master.new private_key: @master.private_key, chain_code: @master.chain_code
             @node = @master.node_for_path "m/0"
           end
         
@@ -348,6 +349,53 @@ describe MoneyTree::Master do
             @node.to_serialized_address.should == "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH"
           end
         end
+
+        describe "M/0 (testing import of public key)" do
+          before do
+            @master = MoneyTree::Master.new public_key: "03cbcaa9c98c877a26977d00825c956a238e8dddfbd322cce4f74b0b5bd6ace4a7", chain_code: @master.chain_code
+            @node = @master.node_for_path "M/0"
+          end
+        
+          it "has an index of 0" do
+            @node.index.should == 0
+          end
+        
+          it "has a depth of 1" do
+            @node.depth.should == 1
+          end
+          
+          it "is public" do
+            @node.is_private.should == false
+          end
+            
+          it "generates subnode" do
+            @node.to_identifier.should == "5a61ff8eb7aaca3010db97ebda76121610b78096"
+            @node.to_fingerprint.should == "5a61ff8e"
+            @node.to_address.should == "19EuDJdgfRkwCmRzbzVBHZWQG9QNWhftbZ"
+          end
+            
+          it "does not generate a private key" do
+            @node.private_key.should be_nil
+          end
+            
+          it "generates a public key" do
+            @node.public_key.to_hex.should == "02fc9e5af0ac8d9b3cecfe2a888e2117ba3d089d8585886c9c826b6b22a98d12ea"
+          end
+        
+          it "generates a chain code" do
+            @node.chain_code_hex.should == "f0909affaa7ee7abe5dd4e100598d4dc53cd709d5a5c2cac40e7412f232f7c9c"
+          end
+        
+          it "does not generate a serialized private key" do
+            lambda { @node.to_serialized_hex(:private) }.should raise_error(MoneyTree::Node::PrivatePublicMismatch)
+            lambda { @node.to_serialized_address(:private) }.should raise_error(MoneyTree::Node::PrivatePublicMismatch)
+          end
+              
+          it "generates a serialized public_key" do
+            @node.to_serialized_hex.should == "0488b21e01bd16bee500000000f0909affaa7ee7abe5dd4e100598d4dc53cd709d5a5c2cac40e7412f232f7c9c02fc9e5af0ac8d9b3cecfe2a888e2117ba3d089d8585886c9c826b6b22a98d12ea"
+            @node.to_serialized_address.should == "xpub69H7F5d8KSRgmmdJg2KhpAK8SR3DjMwAdkxj3ZuxV27CprR9LgpeyGmXUbC6wb7ERfvrnKZjXoUmmDznezpbZb7ap6r1D3tgFxHmwMkQTPH"
+          end
+        end
         
         describe "m/0/2147483647'" do
           before do

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

@@ -2,54 +2,109 @@ require 'spec_helper'
 require 'money-tree'
 
 describe MoneyTree::PublicKey do
-  before do
-    @private_key = MoneyTree::PrivateKey.new key: "5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b"
-    @key = MoneyTree::PublicKey.new @private_key
-  end
   
-  describe "to_hex(compressed: false)" do
-    it "has 65 bytes" do
-      @key.to_hex(compressed: false).length.should == 130
-    end
-    
-    it "is a valid hex" do
-      @key.to_hex(compressed: false).should == '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      
+  describe "with a private key" do
+    before do
+      @private_key = MoneyTree::PrivateKey.new key: "5eae5375fb5f7a0ea650566363befa2830ef441bdcb19198adf318faee86d64b"
+      @key = MoneyTree::PublicKey.new @private_key
     end
-  end
   
-  describe "to_hex" do
-    it "has 33 bytes" do
-      @key.to_hex.length.should == 66
+    # describe "to_hex(compressed: false)" do
+    #   it "has 65 bytes" do
+    #     @key.uncompressed.to_hex.length.should == 130
+    #   end
+    # 
+    #   it "is a valid hex" do
+    #     @key.uncompressed.to_hex.should == '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      
+    #   end
+    # end
+  
+    describe "to_hex" do
+      it "has 33 bytes" do
+        @key.to_hex.length.should == 66
+      end
+  
+      it "is a valid compressed hex" do
+        @key.to_hex.should == '022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      
+      end
     end
   
-    it "is a valid compressed hex" do
-      @key.to_hex.should == '022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      
+    describe "to_fingerprint" do
+      it "returns a valid fingerprint" do
+        @key.to_fingerprint.should == "1fddf42e"
+      end
     end
-  end
   
-  describe "to_fingerprint" do
-    it "returns a valid fingerprint" do
-      @key.to_fingerprint.should == "1fddf42e"
+    # describe "to_address(compressed: false)" do
+    #   it "has 34 characters" do
+    #     @key.uncompressed.to_address.length.should == 34
+    #   end
+    # 
+    #   it "is a valid bitcoin address" do
+    #     @key.uncompressed.to_address.should == '133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      
+    #   end
+    # end
+  
+    describe "to_compressed_address" do
+      it "has 34 characters" do
+        @key.to_address.length.should == 34
+      end
+    
+      it "is a valid compressed bitcoin address" do
+        @key.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
+      end
     end
   end
   
-  describe "to_address(compressed: false)" do
-    it "has 34 characters" do
-      @key.to_address(compressed: false).length.should == 34
+  describe "without a private key" do
+    before do
+      @key = MoneyTree::PublicKey.new '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'
     end
     
-    it "is a valid bitcoin address" do
-      @key.to_address(compressed: false).should == '133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      
+    # describe "to_hex(compressed: false)" do
+    #   it "has 65 bytes" do
+    #     @key.uncompressed.to_hex.length.should == 130
+    #   end
+    # 
+    #   it "is a valid hex" do
+    #     @key.uncompressed.to_hex.should == '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'      
+    #   end
+    # end
+  
+    describe "to_hex" do
+      it "has 33 bytes" do
+        @key.compressed.to_hex.length.should == 66
+      end
+  
+      it "is a valid compressed hex" do
+        @key.compressed.to_hex.should == '022dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b'      
+      end
     end
-  end
   
-  describe "to_compressed_address" do
-    it "has 34 characters" do
-      @key.to_address.length.should == 34
+    describe "to_fingerprint" do
+      it "returns a valid fingerprint" do
+        @key.compressed.to_fingerprint.should == "1fddf42e"
+      end
     end
+  
+    # describe "to_address(compressed: false)" do
+    #   it "has 34 characters" do
+    #     @key.uncompressed.to_address.length.should == 34
+    #   end
+    # 
+    #   it "is a valid bitcoin address" do
+    #     @key.uncompressed.to_address.should == '133bJA2xoVqBUsiR3uSkciMo5r15fLAaZg'      
+    #   end
+    # end
+  
+    describe "to_compressed_address" do
+      it "has 34 characters" do
+        @key.compressed.to_address.length.should == 34
+      end
     
-    it "is a valid compressed bitcoin address" do
-      @key.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
+      it "is a valid compressed bitcoin address" do
+        @key.compressed.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
+      end
     end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: money-tree
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Micah Winkelspecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .simplecov
 - .travis.yml
 - Gemfile
@@ -115,6 +130,7 @@ files:
 - lib/money-tree/node.rb
 - lib/money-tree/support.rb
 - lib/money-tree/version.rb
+- lib/openssl_extensions.rb
 - money-tree.gemspec
 - spec/lib/money-tree/address_spec.rb
 - spec/lib/money-tree/node_spec.rb