money-tree 0.0.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd86557ea3684c83ffae3308afb125c6bcea3af7
-  data.tar.gz: 3d74748c57a91fff5b027f11a9f8eaa16f0740e4
+  metadata.gz: ba45ee086a2a9e370b5bf2957530821a29739ea9
+  data.tar.gz: c9b4151f42445dd6199cb1a6eb36e6976ff3e0b0
 SHA512:
-  metadata.gz: 5d996d51da2dc16fe070bb5d68f192c56fb21709d8da2f80a6f952346869641cddc84f74dde1fe9735436a952be175284875a5995bfb1adfe372e7090eb9f50d
-  data.tar.gz: a7510386042a6a1367773cea6948a4a5a0cf455e5434d9e0446f1b106a783092c21a52c95a7606f0762bbf6086d6d09596565035b45d02b1bf528bbf80a000fc
+  metadata.gz: 50bb95999d9e348c34a6048198668b2b9d743295d8aa55779472f701cafb4764971a8d1a3ec4cc2995038a69884bbdb028ccfdf3368a2e90560d6166abb2b8f0
+  data.tar.gz: de5f45295af74489febf5e903c430d549b7768a0a98db823a2d5d1f05e662ae24e714441afe22a7d05c3149ffe86f8ae82fd5d69b4e69b2aebcc1a9f1554cb60

data/lib/money-tree/key.rb

@@ -38,7 +38,6 @@ module MoneyTree
         
     def initialize(opts = {})
       @options = opts
-      # @ec_key = EC_KEY_new_by_curve_name(NID_secp256k1)
       @ec_key = PKey::EC.new GROUP_NAME
       if @options[:key]
         @raw_key = @options[:key]
@@ -167,7 +166,6 @@ module MoneyTree
         @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

data/lib/money-tree/networks.rb

@@ -10,6 +10,17 @@ module MoneyTree
       compressed_wif_chars: %w(K L),
       uncompressed_wif_char: '5',
       protocol_version: 70001
+    },
+    bitcoin_testnet: {
+      address_version: '6f',
+      p2sh_version: '05',
+      privkey_version: '80',
+      privkey_compression_flag: '01',
+      extended_privkey_version: "04358394",
+      extended_pubkey_version: "043587cf",
+      compressed_wif_chars: %w(K L),
+      uncompressed_wif_char: '5',
+      protocol_version: 70001
     }
   }
 end

data/lib/money-tree/node.rb

@@ -1,7 +1,7 @@
 module MoneyTree
   class Node
     include Support
-    attr_reader :private_key, :public_key, :chain_code, :is_private, :depth, :index, :parent
+    attr_reader :private_key, :public_key, :chain_code, :is_private, :depth, :index, :parent, :is_test
     
     class PublicDerivationFailure < Exception; end
     class InvalidKeyForIndex < Exception; end
@@ -9,17 +9,49 @@ module MoneyTree
     class PrivatePublicMismatch < Exception; end
     
     def initialize(opts = {})
-      @depth = opts[:depth]
-      @index = opts[:index]
-      @is_private = opts[:is_private]
-      @private_key = opts[:private_key]
-      @public_key = opts[:public_key]
-      @chain_code = opts[:chain_code]
-      @parent = opts[:parent]
+      opts.each { |k, v| instance_variable_set "@#{k}", v }
+    end
+    
+    def self.from_serialized_address(address)
+      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),
+        chain_code: hex.slice!(0..63).to_i(16)
+      }.merge(key_options(hex, version)))
+    end
+    
+    def self.key_options(hex, version)
+      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) }
+      elsif %w(02 03).include? hex.slice(0..1)
+        { 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, test: false }
+      when MoneyTree::NETWORKS[:bitcoin][:extended_pubkey_version]
+        { private_key: false, test: false }
+      when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_privkey_version]
+        { private_key: true, test: true }
+      when MoneyTree::NETWORKS[:bitcoin_testnet][:extended_pubkey_version]
+        { private_key: false, test: true }
+      else 
+        raise ImportError, 'invalid version bytes'
+      end
     end
     
     def is_private?
-      is_private == true
+      index >= 0x80000000 || index < 0
     end
     
     def index_hex(i = index)
@@ -47,7 +79,7 @@ module MoneyTree
     end
     
     def derive_private_key(i = 0)
-      message = i >= 0x80000000 ? private_derivation_message(i) : public_derivation_message(i)
+      message = i >= 0x80000000 || i < 0 ? 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, 'greater than or equal to order' if left_int >= MoneyTree::Key::ORDER # very low probability
@@ -78,17 +110,6 @@ module MoneyTree
       bytes_to_int hash.bytes.to_a[32..-1]
     end
 
-    # TODO: Complete public key derivation
-    # def derive_public_key(i = 0, opts = {})
-    #   raise PublicDerivationFailure unless i < 0x80000000
-    #   hash = hmac_sha512([chain_code].pack("H*"), public_key.to_hex + index_hex(i))
-    #   temp_key = MoneyTree::PrivateKey.new key: hash[0..63]
-    #   temp_pub_key = MoneyTree::PublicKey.new temp_key
-    #   child_public_key = (temp_key.to_hex.to_i(16) + temp_pub_key.to_hex.to_i(16))
-    #   child_chain_code = hash[64..-1]
-    #   return child_public_key, child_chain_code
-    # 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
@@ -97,11 +118,7 @@ module MoneyTree
       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 += if type.to_sym == :private
-        "00#{private_key.to_hex}"
-      else
-        public_key.compressed.to_hex
-      end
+      hex += type.to_sym == :private ? "00#{private_key.to_hex}" : public_key.compressed.to_hex
     end
     
     def to_serialized_address(type = :public)
@@ -123,7 +140,6 @@ module MoneyTree
     end
     
     def subnode(i = 0, opts = {})
-      # opts[:as_private] = is_private? unless opts[:as_private] == false
       if private_key.nil?
         child_public_key, child_chain_code = derive_public_key(i)
         child_public_key = MoneyTree::PublicKey.new child_public_key
@@ -132,12 +148,9 @@ module MoneyTree
         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: private_key.nil? ? nil : child_private_key,
                           public_key: child_public_key,
                           chain_code: child_chain_code,
@@ -157,7 +170,7 @@ module MoneyTree
     # 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'
-      path = path[0..-4] if force_public
+      path = path[0..-5] if force_public
       parts = path.split('/')
       nodes = []
       parts.each_with_index do |part, depth|
@@ -168,7 +181,13 @@ module MoneyTree
           nodes << nodes.last.subnode(i)
         end
       end
-      nodes.last
+      if force_public or parts.first == 'M'
+        node = nodes.last
+        node.strip_private_info!
+        node
+      else
+        nodes.last
+      end
     end
     
     def parse_index(path_part)
@@ -184,6 +203,10 @@ module MoneyTree
       end
     end
     
+    def strip_private_info!
+      @private_key = nil
+    end
+    
     def chain_code_hex
       int_to_hex chain_code
     end
@@ -207,7 +230,6 @@ module MoneyTree
     def initialize(opts = {})
       @depth = 0
       @index = 0
-      @is_private = true
       opts[:seed] = [opts[:seed_hex]].pack("H*") if opts[:seed_hex]
       if opts[:seed]
         @seed = opts[:seed]
@@ -222,7 +244,6 @@ module MoneyTree
           @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
@@ -230,6 +251,10 @@ module MoneyTree
       end
     end
     
+    def is_private?
+      true
+    end
+    
     def generate_seed
       @seed = OpenSSL::Random.random_bytes(32)
       @seed_hash = generate_seed_hash(@seed)

data/lib/money-tree/support.rb

@@ -49,6 +49,14 @@ module MoneyTree
       encode_base58 address
     end
     
+    def from_serialized_base58(base58)
+      hex = decode_base58 base58
+      checksum = hex.slice!(-8..-1)
+      compare_checksum = sha256(sha256(hex)).slice(0..7)
+      raise EncodingError unless checksum == compare_checksum
+      hex
+    end
+    
     def digestify(digest_type, source, opts = {})
       source = [source].pack("H*") unless opts[:ascii]
       bytes_to_hex Digest.digest(digest_type, source)
@@ -81,8 +89,6 @@ module MoneyTree
     end
     
     def bytes_to_int(bytes, base = 16)
-      # bytes = bytes.bytes unless bytes.respond_to?(:inject)
-      # bytes.inject {|a, b| (a << 8) + b }
       if bytes.is_a?(Array)
         bytes = bytes.pack("C*")
       end

data/lib/money-tree/version.rb

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

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

@@ -26,7 +26,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @master.is_private.should == true
+            @master.is_private?.should == true
           end
         
           it "has a depth of 0" do
@@ -73,7 +73,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @node.is_private.should == true
+            @node.is_private?.should == true
           end
         
           it "has a depth of 1" do
@@ -109,6 +109,51 @@ describe MoneyTree::Master do
             @node.to_serialized_address.should == "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw"
           end
         end
+        
+        describe "m/0p.pub" do
+          before do
+            @node = @master.node_for_path "m/0p.pub"
+          end
+        
+          it "has an index of 2147483648" do
+            @node.index.should == 2147483648
+          end
+          
+          it "is private" do
+            @node.is_private?.should == true
+          end
+        
+          it "has a depth of 1" do
+            @node.depth.should == 1
+          end
+    
+          it "generates subnode" do
+            @node.to_identifier.should == "5c1bd648ed23aa5fd50ba52b2457c11e9e80a6a7"
+            @node.to_fingerprint.should == "5c1bd648"
+            @node.to_address.should == "19Q2WoS5hSS6T8GjhK8KZLMgmWaq4neXrh"
+          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 == "035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56"
+          end
+        
+          it "generates a chain code" do
+            @node.chain_code_hex.should == "47fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141"
+          end
+        
+          it "does not generate a serialized private key" do
+            lambda { @node.to_serialized_hex(:private) }.should raise_error(MoneyTree::Node::PrivatePublicMismatch)
+          end
+              
+          it "generates a serialized public_key" do
+            @node.to_serialized_hex.should == "0488b21e013442193e8000000047fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56"
+            @node.to_serialized_address.should == "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw"
+          end
+        end
       
         describe "m/0'/1" do
           before do
@@ -120,7 +165,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
         
           it "has a depth of 2" do
@@ -157,6 +202,51 @@ describe MoneyTree::Master do
           end
         end
         
+        describe "M/0'/1" do
+          before do
+            @node = @master.node_for_path "M/0'/1"
+          end
+        
+          it "has an index of 1" do
+            @node.index.should == 1
+          end
+          
+          it "is public" do
+            @node.is_private?.should == false
+          end
+        
+          it "has a depth of 2" do
+            @node.depth.should == 2
+          end
+          
+          it "generates subnode" do
+            @node.to_identifier.should == "bef5a2f9a56a94aab12459f72ad9cf8cf19c7bbe"
+            @node.to_fingerprint.should == "bef5a2f9"
+            @node.to_address.should == "1JQheacLPdM5ySCkrZkV66G2ApAXe1mqLj"
+          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 == "03501e454bf00751f24b1b489aa925215d66af2234e3891c3b21a52bedb3cd711c"
+          end
+        
+          it "generates a chain code" do
+            @node.chain_code_hex.should == "2a7857631386ba23dacac34180dd1983734e444fdbf774041578e9b6adb37c19"
+          end
+        
+          it "generates a serialized private key" do
+            lambda { @node.to_serialized_hex(:private) }.should raise_error(MoneyTree::Node::PrivatePublicMismatch)
+          end
+                
+          it "generates a serialized public_key" do
+            @node.to_serialized_hex.should == "0488b21e025c1bd648000000012a7857631386ba23dacac34180dd1983734e444fdbf774041578e9b6adb37c1903501e454bf00751f24b1b489aa925215d66af2234e3891c3b21a52bedb3cd711c"
+            @node.to_serialized_address.should == "xpub6ASuArnXKPbfEwhqN6e3mwBcDTgzisQN1wXN9BJcM47sSikHjJf3UFHKkNAWbWMiGj7Wf5uMash7SyYq527Hqck2AxYysAA7xmALppuCkwQ"
+          end
+        end
+        
         describe "m/0'/1/2p/2" do
           before do
             @node = @master.node_for_path "m/0'/1/2p/2"
@@ -167,7 +257,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
         
           it "has a depth of 4" do
@@ -214,7 +304,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
         
           it "has a depth of 2" do
@@ -269,7 +359,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @master.is_private.should == true
+            @master.is_private?.should == true
           end
           
           it "generates master node (Master)" do
@@ -317,7 +407,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
     
           it "generates subnode" do
@@ -365,7 +455,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
             
           it "generates subnode" do
@@ -411,7 +501,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @node.is_private.should == true
+            @node.is_private?.should == true
           end
             
           it "generates subnode" do
@@ -458,7 +548,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
             
           it "generates subnode" do
@@ -505,7 +595,7 @@ describe MoneyTree::Master do
           end
           
           it "is private" do
-            @node.is_private.should == true
+            @node.is_private?.should == true
           end
             
           it "generates subnode" do
@@ -552,7 +642,7 @@ describe MoneyTree::Master do
           end
           
           it "is public" do
-            @node.is_private.should == false
+            @node.is_private?.should == false
           end
             
           it "generates subnode" do
@@ -598,7 +688,7 @@ describe MoneyTree::Master do
       end
       
       it "is public" do
-        @node.is_private.should == true
+        @node.is_private?.should == true
       end
     
       it "has a depth of 2" do
@@ -606,13 +696,37 @@ describe MoneyTree::Master do
       end
       
       it "generates a serialized private key" do
-        @node.to_serialized_hex(:private).should == "0488ade4025c1bd648ffffffffeb8291afea1716eb01a1ce7e00d1843072cbd227309df728ba4015f73d5344aa00d9bd1df2ae56b5be763ddd393573497a8075352bda4aad9ea9083e4c0b1081ac"
-        @node.to_serialized_address(:private).should == "xprv9wTYmMFvAM7JKr2H3xMXcBNzPsqKgffzsM2XnrvKQLJQo2qRftY4uspJCAqjvPypq6Rgvkpoen8MGGnNBxYdeYR5jt6VFdL8cGp2qKnukbW"
+        @node.to_serialized_hex(:private).should == "0488ade4025c1bd648ffffffff0f9ca680ee23c81a305d96b86f811947e65590200b6f74d66ecf83936313a9c900235893db08ad0efc6ae4a1eac5b31a90a7d0906403d139d4d7f3c6796fb42c4e"
+        @node.to_serialized_address(:private).should == "xprv9wTYmMFvAM7JHf3RuUidc24a4y2t4gN7aNP5ABreWAqt6BUBcf6xE8RNQxj2vUssYWM8iAZiZi5H1fmKkkpXjtwDCDv1pg8fSfQMk9rhHYt"
       end
           
       it "generates a serialized public_key" do
-        @node.to_serialized_hex.should == "0488b21e025c1bd648ffffffffeb8291afea1716eb01a1ce7e00d1843072cbd227309df728ba4015f73d5344aa02bcd68031f49f6c921e24ed8c1774221433de23eb309709f571d5449909405cfc"
-        @node.to_serialized_address.should == "xpub6ASuArnozifbYL6k9ytXyKKiwufp68PrEZx8bFKvxfqPfqAaDRrKTg8n3Ren8WFSpAbbWLGTimcfYkUB2JbyYFToRBdKT6pEhmpyVe3AqZ9"
+        @node.to_serialized_hex.should == "0488b21e025c1bd648ffffffff0f9ca680ee23c81a305d96b86f811947e65590200b6f74d66ecf83936313a9c902adb7979a5e99bf8acdfec3680bf482feac9898b28808c22d47db62e98de5d3fa"
+        @node.to_serialized_address.should == "xpub6ASuArnozifbW97u1WFdyA1JczsNU95xwbJfxaGG4WNrxyoLACRCmvjrGEojsRsoZULf5FyZXv6AWAtce2UErsshvkpjNaT1fP6sMgTZdc1"
+      end
+    end
+    
+    describe "importing node" do
+      describe ".from_serialized_address(address)" do
+        it "imports a valid private node address" do
+          @node = MoneyTree::Node.from_serialized_address "xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7"
+          @node.private_key.to_hex.should == "edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea"
+          @node.index.should == 2147483648
+          @node.is_private?.should == true
+          @node.depth.should == 1
+          @node.public_key.to_hex.should == "035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56"
+          @node.chain_code_hex.should == "47fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141"        
+        end
+        
+        it "imports a valid public node address" do
+          @node = MoneyTree::Node.from_serialized_address "xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw"
+          @node.private_key.should be_nil
+          @node.index.should == 2147483648
+          @node.is_private?.should == true
+          @node.depth.should == 1
+          @node.public_key.to_hex.should == "035a784662a4a20a65bf6aab9ae98a6c068a81c52e4b032c0fb5400c706cfccc56"
+          @node.chain_code_hex.should == "47fdacbd0f1097043b78c63c20c34ef4ed9a111d980047ad16282c7ae6236141"
+        end
       end
     end
   end

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

@@ -7,8 +7,9 @@ describe MoneyTree::PrivateKey do
   end
   
   describe "to_hex" do
-    it "has 64 characters" do      
-      @key.to_hex.length.should == 64
+    it "has 62 - 64 characters" do
+      # could be only 31 bytes if key has leading zeros
+      [62, 64].should include(@key.to_hex.length)
     end
     
     it "is a valid hex" do
@@ -22,7 +23,7 @@ describe MoneyTree::PrivateKey do
     end
     
     it "starts with K or L" do
-      @key.to_wif[0].should == 'K'
+      %w(K L).should include(@key.to_wif[0])
     end
     
     it "is a valid compressed wif" do

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

@@ -9,15 +9,15 @@ describe MoneyTree::PublicKey do
       @key = MoneyTree::PublicKey.new @private_key
     end
   
-    # 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(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
@@ -35,15 +35,15 @@ describe MoneyTree::PublicKey do
       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_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
@@ -61,15 +61,15 @@ describe MoneyTree::PublicKey do
       @key = MoneyTree::PublicKey.new '042dfc2557a007c93092c2915f11e8aa70c4f399a6753e2e908330014091580e4b11203096f1a1c5276a73f91b9465357004c2103cc42c63d6d330df589080d2e4'
     end
     
-    # 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(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
@@ -87,15 +87,15 @@ describe MoneyTree::PublicKey do
       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_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
@@ -106,5 +106,20 @@ describe MoneyTree::PublicKey do
         @key.compressed.to_address.should == '13uVqa35BMo4mYq9LiZrXVzoz9EFZ6aoXe'      
       end
     end
+    
+    describe "#compression" do
+      it "returns current compression setting" do
+        @key.compression = :uncompressed
+        @key.compression.should == :uncompressed
+        @key.compression = :compressed
+        @key.compression.should == :compressed
+      end
+    end
+  end
+  
+  describe "with a bad key" do
+    it "raises KeyFormatNotFound" do
+      lambda { @key = MoneyTree::PublicKey.new 'THISISNOTAVALIDKEY' }.should raise_error(MoneyTree::Key::KeyFormatNotFound)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: money-tree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Micah Winkelspecht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi