bitcoin-cigs 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitcoin-cigs (0.0.5)
+    bitcoin-cigs (0.0.6)
 
 GEM
   remote: http://rubygems.org/

data/lib/bitcoin_cigs/version.rb

@@ -1,3 +1,3 @@
 module BitcoinCigs
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/bitcoin_cigs.rb

@@ -35,9 +35,27 @@ module BitcoinCigs
     end
     
     def verify_message!(address, signature, message, options = {:network => :mainnet})
+
       decoded_address = decode58(address)
       raise ::BitcoinCigs::Error.new("Incorrect address or message for signature.") if decoded_address.nil?
-      network_version = str_to_num(decoded_address) >> (8 * 24)
+      # network_version = str_to_num(decoded_address) >> (8 * 24)
+
+      addr = get_signature_address!(signature, message, options)
+
+      raise ::BitcoinCigs::Error.new("Incorrect address or message for signature.") if address != addr
+      
+      nil
+    end
+
+    def get_signature_address(signature, message, options = {:network => :mainnet})
+      begin
+        get_signature_address!(signature, message, options)
+      rescue ::BitcoinCigs::Error
+        false
+      end 
+    end
+
+    def get_signature_address!(signature, message, options = {:network => :mainnet})
 
       message = calculate_hash(format_message_to_sign(message))
 
@@ -82,10 +100,8 @@ module BitcoinCigs
       
     
       public_key = ::BitcoinCigs::PublicKey.new(g, q, compressed)
-      addr = public_key_to_bc_address(public_key.ser(), NETWORK_VERSION[options[:network]])
-      raise ::BitcoinCigs::Error.new("Incorrect address or message for signature.") if address != addr
       
-      nil
+      public_key_to_bc_address(public_key.ser(), NETWORK_VERSION[options[:network]])
     end
     
     def sign_message(wallet_key, message, options = {:network => :mainnet})

data/spec/bitcoin_cigs_spec.rb

@@ -194,5 +194,52 @@ describe BitcoinCigs do
       end
     end
   end
+
+  describe "get_signature_address!" do
+    subject { BitcoinCigs.get_signature_address!(signature, message, :network => network) }
+    
+    context "with valid data" do
+      it "returns correct address" do
+        expect(subject).to eq(address)
+      end
+    end
+    
+    context "with invalid signature" do
+      let(:signature) { "invalid" }
+      
+      it "raises ::BitcoinCigs::Error" do
+        expect { subject }.to raise_error(::BitcoinCigs::Error, "Bad signature length")
+      end
+    end
+    
+    context "with invalid message" do
+      let(:message) { "invalid" }
+      
+      it "returns wrong address" do
+        expect(subject).not_to eq(address)
+      end
+    end
+    
+    context "with testnet" do
+      use_testnet
+      
+      context "with valid data" do
+        it "returns valid address" do
+          expect(subject).to eq(address)
+        end
+      end
+    end
+  end
+
+  describe "get_signature_address" do
+    subject { BitcoinCigs.get_signature_address(signature, message) }
+    
+    context "with valid data" do
+      it "returns true" do
+        expect(subject).to eq(address)
+      end
+    end
+  end
+
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-cigs
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70337710906420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: 2.13.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.13.0
+  version_requirements: *70337710906420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70337710905920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,12 +32,7 @@ dependencies:
         version: 10.0.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.4
+  version_requirements: *70337710905920
 description: Create and Verify Bitcoin Signatures.
 email:
 - michaelgpearce@yahoo.com
@@ -96,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bitcoin-cigs
-rubygems_version: 1.8.21
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Create and Verify Bitcoin Signatures