bitcoin-ruby 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6e9a50f3285c39f0a718769237121861b3e03a5
-  data.tar.gz: d7a08090502517977afd036fd825267673ceda18
+  metadata.gz: 0d147f8bf63febaaeb3a38004c78f7b143284de5
+  data.tar.gz: f3fc9dcebed29a46a5ad850e19eb21468c9c6915
 SHA512:
-  metadata.gz: bf14f375a775ec99c019689dd6c75ec87e676d02001d12d6131e782e412e53204afc9e6d4a4b28ffb2e9ecb015db6d8aa0381e82e952ab1e718ea1f080815a08
-  data.tar.gz: 35b1ff06e6f2c212157d75fe07fe5ab7a0805df6d9dde15b2b3e5359cfe662c3fbd9a047fc15547942d8957b12e50ce0d8e0fde000f141d5b2886169bd037aaf
+  metadata.gz: '0896c7cac52a99f68a6b6aee884d87a10516a8d419182b00f44b7e95fc2b1a9676e600d5c8bd1c373af19e17c1c72ba110c9449d4b8a8ef5bcce7918fb2cb12b'
+  data.tar.gz: d33dca0010b3dab6181602b8b27f4099b0814659882a64e3e298b22a9b1a71c3ac82402df5119e33dcee63224f421b1a06104ed179544c39b50ba1e43574f8c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bitcoin-ruby (0.0.12)
+    bitcoin-ruby (0.0.13)
 
 GEM
   remote: https://rubygems.org/

data/lib/bitcoin/protocol/tx.rb

@@ -81,23 +81,18 @@ module Bitcoin
 
         return false if buf.eof?
 
-        in_size = Protocol.unpack_var_int_from_io(buf)
-
         # segwit serialization format is defined by https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki
-        witness = false
-        if in_size.zero?
-          @marker = 0
-          @flag = buf.read(1).unpack('c').first
-
-          # marker must be zero and flag must be non-zero to be valid segwit
-          if @marker == 0 && @flag != 0
-            in_size = Protocol.unpack_var_int_from_io(buf)
-            witness = true
-          else
-            # Undo the last read in case this isn't a segwit transaction
-            buf.seek(buf.pos - 1)
-          end
-        end
+        # Also note that it is impossible to parse 0 input transactions. Regular transactions with 0 inputs look
+        # like malformed segwit transactions.
+        @marker = buf.read(1).unpack('c').first
+        @flag = buf.read(1).unpack('c').first
+
+        witness = @marker == 0 && @flag != 0
+
+        # Non-segwit format does not contain marker or flag fields.
+        buf.seek(buf.pos - 2) unless witness
+
+        in_size = Protocol.unpack_var_int_from_io(buf)
 
         @in = []
         in_size.times{
@@ -271,12 +266,12 @@ module Bitcoin
 
       # verify input signature +in_idx+ against the corresponding
       # output in +outpoint_tx+
-      # outpoint
+      # outpoint. This arg can also be a Script or TxOut.
       #
       # options are: verify_sigpushonly, verify_minimaldata, verify_cleanstack, verify_dersig, verify_low_s, verify_strictenc, fork_id
-      def verify_input_signature(in_idx, outpoint_tx_or_script, block_timestamp=Time.now.to_i, opts={})
+      def verify_input_signature(in_idx, outpoint_data, block_timestamp=Time.now.to_i, opts={})
         if @enable_bitcoinconsensus
-          return bitcoinconsensus_verify_script(in_idx, outpoint_tx_or_script, block_timestamp, opts)
+          return bitcoinconsensus_verify_script(in_idx, outpoint_data, block_timestamp, opts)
         end
 
         # If FORKID is enabled, we also ensure strict encoding.
@@ -285,21 +280,12 @@ module Bitcoin
         outpoint_idx  = @in[in_idx].prev_out_index
         script_sig    = @in[in_idx].script_sig
 
-        amount = nil
-        script_pubkey = nil
-        if outpoint_tx_or_script.respond_to?(:out)
-          # If given an entire previous transaction, take the script from it
-          prevout = outpoint_tx_or_script.out[outpoint_idx]
-          amount = prevout.value
-          script_pubkey = prevout.pk_script
-        else
-          if opts[:fork_id]
-            raise "verify_input_signature must be called with a previous transaction if " \
-                  "SIGHASH_FORKID is enabled"
-          end
+        amount = amount_from_outpoint_data(outpoint_data, outpoint_idx)
+        script_pubkey = script_pubkey_from_outpoint_data(outpoint_data, outpoint_idx)
 
-          # Otherwise, it's already a script.
-          script_pubkey = outpoint_tx_or_script
+        if opts[:fork_id] && amount.nil?
+          raise "verify_input_signature must be called with a previous transaction or " \
+            "transaction output if SIGHASH_FORKID is enabled"
         end
 
         @scripts[in_idx] = Bitcoin::Script.new(script_sig, script_pubkey)
@@ -317,24 +303,19 @@ module Bitcoin
 
       # verify witness input signature +in_idx+ against the corresponding
       # output in +outpoint_tx+
-      # outpoint
+      # outpoint. This arg can also be a Script or TxOut
       #
       # options are: verify_sigpushonly, verify_minimaldata, verify_cleanstack, verify_dersig, verify_low_s, verify_strictenc
-      def verify_witness_input_signature(in_idx, outpoint_tx_or_script, prev_out_amount, block_timestamp=Time.now.to_i, opts={})
+      def verify_witness_input_signature(in_idx, outpoint_data, prev_out_amount, block_timestamp=Time.now.to_i, opts={})
         if @enable_bitcoinconsensus
-          return bitcoinconsensus_verify_script(in_idx, outpoint_tx_or_script, block_timestamp, opts)
+          return bitcoinconsensus_verify_script(in_idx, outpoint_data, block_timestamp, opts)
         end
 
         outpoint_idx  = @in[in_idx].prev_out_index
         script_sig    = ''
 
-        # If given an entire previous transaction, take the script from it
-        script_pubkey = if outpoint_tx_or_script.respond_to?(:out)
-          Bitcoin::Script.new(outpoint_tx_or_script.out[outpoint_idx].pk_script)
-        else
-          # Otherwise, it's already a script.
-          Bitcoin::Script.new(outpoint_tx_or_script)
-        end
+        script_pubkey = script_pubkey_from_outpoint_data(outpoint_data, outpoint_idx)
+        script_pubkey = Bitcoin::Script.new(script_pubkey)
 
         if script_pubkey.is_p2sh?
           redeem_script = Bitcoin::Script.new(@in[in_idx].script_sig).get_pubkey
@@ -372,17 +353,11 @@ module Bitcoin
         return sig_valid
       end
 
-      def bitcoinconsensus_verify_script(in_idx, outpoint_tx_or_script, block_timestamp=Time.now.to_i, opts={})
+      def bitcoinconsensus_verify_script(in_idx, outpoint_data, block_timestamp=Time.now.to_i, opts={})
         raise "Bitcoin::BitcoinConsensus shared library not found" unless Bitcoin::BitcoinConsensus.lib_available?
 
-        # If given an entire previous transaction, take the script from it
-        script_pubkey = if outpoint_tx_or_script.respond_to?(:out)
-          outpoint_idx  = @in[in_idx].prev_out_index
-          outpoint_tx_or_script.out[outpoint_idx].pk_script
-        else
-          # Otherwise, it's already a script.
-          outpoint_tx_or_script
-        end
+        outpoint_idx  = @in[in_idx].prev_out_index
+        script_pubkey = script_pubkey_from_outpoint_data(outpoint_data, outpoint_idx)
 
         flags  = Bitcoin::BitcoinConsensus::SCRIPT_VERIFY_NONE
         flags |= Bitcoin::BitcoinConsensus::SCRIPT_VERIFY_P2SH        if block_timestamp >= 1333238400
@@ -583,6 +558,30 @@ module Bitcoin
 
         Digest::SHA256.digest( Digest::SHA256.digest( buf ) )
       end
+
+      def script_pubkey_from_outpoint_data(outpoint_data, outpoint_idx)
+        if outpoint_data.respond_to?(:out)
+          # If given an entire previous transaction, take the script from it
+          outpoint_data.out[outpoint_idx].pk_script
+        elsif outpoint_data.respond_to?(:pk_script)
+          # If given an transaction output, take the script
+          outpoint_data.pk_script
+        else
+          # Otherwise, we assume it's already a script.
+          outpoint_data
+        end
+      end
+
+      def amount_from_outpoint_data(outpoint_data, outpoint_idx)
+        if outpoint_data.respond_to?(:out)
+          # If given an entire previous transaction, take the amount from the
+          # output at the outpoint_idx
+          outpoint_data.out[outpoint_idx].amount
+        elsif outpoint_data.respond_to?(:pk_script)
+          # If given an transaction output, take the amount
+          outpoint_data.amount
+        end
+      end
     end
   end
 end

data/lib/bitcoin/script.rb

@@ -1435,8 +1435,10 @@ class Bitcoin::Script
   def sighash_subscript(drop_sigs, opts = {})
     if opts[:fork_id]
       drop_sigs.reject! do |signature|
-        _, hash_type = parse_sig(signature)
-        (hash_type&SIGHASH_TYPE[:forkid]) != 0
+        if signature && signature.size > 0
+          _, hash_type = parse_sig(signature)
+          (hash_type&SIGHASH_TYPE[:forkid]) != 0
+        end
       end
     end
 

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/bitcoin/protocol/tx_spec.rb

@@ -316,6 +316,9 @@ describe 'Tx' do
 
     tx.verify_input_signature(0, outpoint_tx).should == true
 
+    # Only one test where we provide the TxOut is needed since when providing
+    # the full outpoint_tx the verification logic doesn't change.
+    tx.verify_input_signature(0, outpoint_tx.out[0]).should == true
 
     tx = Tx.from_json( fixtures_file('rawtx-c99c49da4c38af669dea436d3e73780dfdb6c1ecf9958baa52960e8baee30e73.json') )
     tx.hash.should == 'c99c49da4c38af669dea436d3e73780dfdb6c1ecf9958baa52960e8baee30e73'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoin-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - lian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies: []
 description: This is a ruby library for interacting with the bitcoin protocol/network
 email: