bitcoinrb 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dea1d2e52223f2754f748f612c5d3df9606988476ee0c1f5b1ad03e71ba0ead
-  data.tar.gz: baedfcc44fdacd0c2c46766a360fb76404630bd01dbaf034664d358f5564d5b8
+  metadata.gz: 14d06b76233959dbd16e89459a109982612c8ec6e91b746328fac54bb0d6ddae
+  data.tar.gz: ca60bd4fb4f1075335a0806bfdb5cd829da3f2a2d0b3794012e55ee17c7d417c
 SHA512:
-  metadata.gz: 851b762a403ebd8a0f175171e000650b76b5380522c174cbea3c03817477aa89e98b8a3e204c0cc3c223fb281dfbc75ae936cd1b1fe6e6f6b06ae5aeca74b335
-  data.tar.gz: 75fd1e350ab651a01b1eae0d0b6885ca933a60efcfc237ad75de55002777806aaf805c4a724430535521c421a10111871838d97bfaf94d93766f93e433e33160
+  metadata.gz: d49893ec5f8819dc78c19974bd74e1cf2545a787e8861b212a2801e40135b3c0f22650e46df9d5089bbae47dd9c6b74ce13320763a4107633fce5a1355cbbc5b
+  data.tar.gz: b2d422ecfc721e2e41b87d089dd2e6727f564f1346ae8a05b7e0d0b16247f8ca4b4113190c92d6e6abedb6180c8373289773ee6648963a10dbe9f3b0f726f471

data/.travis.yml

@@ -6,4 +6,6 @@ rvm:
 addons:
   apt:
     packages:
-      - libleveldb-dev
+      - libleveldb-dev
+script:
+  - bundle exec parallel_test spec/ -n 6 --type rspec

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bitcoinrb.gemspec
 gemspec
+
+gem 'parallel_tests'

data/README.md

@@ -9,13 +9,14 @@ NOTE: Bitcoinrb work in progress, and there is a possibility of incompatible cha
 
 Bitcoinrb supports following feature:
 
-* Bitcoin script interpreter
+* Bitcoin script interpreter(including [BIP-65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki), [BIP-68](https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki), [BIP-112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki))
 * De/serialization of Bitcoin protocol network messages
 * De/serialization of blocks and transactions
 * Key generation and verification for ECDSA, including [BIP-32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) and [BIP-39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki) supports.
 * ECDSA signature(RFC6979 -Deterministic ECDSA, LOW-S, LOW-R support)
-* Segwit support (parsing segwit payload, Bech32 address, sign for segwit tx, etc..)
-* PSBT(Partially Signed Bitcoin Transaction) support
+* Segwit support (parsing segwit payload, Bech32 address, sign for segwit tx, [BIP-141](https://github.com/bitcoin/bips/blob/master/bip-0141.mediawiki), [BIP-143](https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki), [BIP-144](https://github.com/bitcoin/bips/blob/master/bip-0144.mediawiki))
+* [BIP-173](https://github.com/bitcoin/bips/blob/master/bip-0173.mediawiki) Bech32 address support
+* [BIP-174](https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki) PSBT(Partially Signed Bitcoin Transaction) support
 * [WIP] SPV node
 * [WIP] 0ff-chain protocol
 

data/lib/bitcoin/psbt/input.rb

@@ -29,9 +29,13 @@ module Bitcoin
       # @return [Bitcoin::PSBTInput] psbt input.
       def self.parse_from_buf(buf)
         input = self.new
+        found_sep = false
         until buf.eof?
           key_len = Bitcoin.unpack_var_int_from_io(buf)
-          break if key_len == 0
+          if key_len == 0
+            found_sep = true
+            break
+          end
           key_type = buf.read(1).unpack('C').first
           key = buf.read(key_len - 1)
           value = buf.read(Bitcoin.unpack_var_int_from_io(buf))
@@ -83,6 +87,7 @@ module Bitcoin
             input.unknowns[unknown_key] = value
           end
         end
+        raise ArgumentError, 'Separator is missing at the end of an input map.' unless found_sep
         input
       end
 
@@ -116,28 +121,35 @@ module Bitcoin
       # Check whether input's scriptPubkey is correct witness.
       # @return [Boolean]
       def valid_witness_input?
-        return true if witness_utxo.script_pubkey.p2wpkh? # P2WPKH
-        return true if witness_utxo.script_pubkey.p2wsh? && witness_utxo.script_pubkey == redeem_script.to_p2wsh # P2WSH
-        return true if witness_utxo.script_pubkey.p2sh? && redeem_script&.witness_program? && # segwit nested in P2SH
-            redeem_script.to_p2sh == witness_utxo.script_pubkey && witness_script&.to_sha256 == redeem_script.witness_data[1].bth
+        return true if witness_utxo&.script_pubkey.p2wpkh? # P2WPKH
+        return true if witness_utxo&.script_pubkey.p2wsh? && witness_utxo&.script_pubkey == redeem_script.to_p2wsh # P2WSH
+        # segwit nested in P2SH
+        if witness_utxo&.script_pubkey.p2sh? && redeem_script&.witness_program? && redeem_script.to_p2sh == witness_utxo&.script_pubkey
+          return true if redeem_script.p2wpkh?# nested p2wpkh
+          return true if witness_script&.to_sha256 == redeem_script.witness_data[1].bth # nested p2wsh
+        end
         false
       end
 
       # Check whether input's scriptPubkey is correct witness.
       # @return [Boolean]
-      def valid_non_witness_input?
-        non_witness_utxo.outputs.each do |o|
-          return true if o.script_pubkey.p2sh? && redeem_script.to_p2sh == o.script_pubkey
-        end
-        false
+      def valid_non_witness_input?(utxo)
+        utxo.script_pubkey.p2sh? && redeem_script.to_p2sh == utxo.script_pubkey
       end
 
       # Check whether the signer can sign this input.
+      # @param [Bitcoin::TxOut] utxo utxo object which input refers.
       # @return [Boolean]
-      def ready_to_sign?
+      def ready_to_sign?(utxo)
         return false unless sane?
         return valid_witness_input? if witness_utxo
-        valid_non_witness_input? # non_witness_utxo
+        valid_non_witness_input?(utxo) # non_witness_utxo
+      end
+
+      # Checks whether a PSBTInput is already signed.
+      # @return [Boolean] return true if already signed.
+      def signed?
+        final_script_sig || final_script_witness
       end
 
       # add signature as partial sig.

data/lib/bitcoin/psbt/output.rb

@@ -19,9 +19,13 @@ module Bitcoin
       # @return [Bitcoin::PSBTOutput] psbt output.
       def self.parse_from_buf(buf)
         output = self.new
+        found_sep = false
         until buf.eof?
           key_len = Bitcoin.unpack_var_int_from_io(buf)
-          break if key_len == 0
+          if key_len == 0
+            found_sep = true
+            break
+          end
           key_type = buf.read(1).unpack('C').first
           key = buf.read(key_len - 1)
           value = buf.read(Bitcoin.unpack_var_int_from_io(buf))
@@ -43,6 +47,7 @@ module Bitcoin
             output.unknowns[unknown_key] = value
           end
         end
+        raise ArgumentError, 'Separator is missing at the end of an output map.' unless found_sep
         output
       end
 

data/lib/bitcoin/psbt/tx.rb

@@ -29,11 +29,14 @@ module Bitcoin
         raise ArgumentError, 'Invalid PSBT magic bytes.' unless buf.read(4).unpack('N').first == PSBT_MAGIC_BYTES
         raise ArgumentError, 'Invalid PSBT separator.' unless buf.read(1).bth.to_i(16) == 0xff
         partial_tx = self.new
-
+        found_sep = false
         # read global data.
         until buf.eof?
           key_len = Bitcoin.unpack_var_int_from_io(buf)
-          break if key_len == 0
+          if key_len == 0
+            found_sep = true
+            break
+          end
           key_type = buf.read(1).unpack('C').first
           key = buf.read(key_len - 1)
           value = buf.read(Bitcoin.unpack_var_int_from_io(buf))
@@ -42,7 +45,7 @@ module Bitcoin
           when PSBT_GLOBAL_TYPES[:unsigned_tx]
             raise ArgumentError, 'Invalid global transaction typed key.' unless key_len == 1
             raise ArgumentError, 'Duplicate Key, unsigned tx already provided.' if partial_tx.tx
-            partial_tx.tx = Bitcoin::Tx.parse_from_payload(value)
+            partial_tx.tx = Bitcoin::Tx.parse_from_payload(value, non_witness: true)
             partial_tx.tx.in.each do |tx_in|
               raise ArgumentError, 'Unsigned tx does not have empty scriptSigs and scriptWitnesses.' if !tx_in.script_sig.empty? || !tx_in.script_witness.empty?
             end
@@ -52,6 +55,7 @@ module Bitcoin
           end
         end
 
+        raise ArgumentError, 'Separator is missing at the end of an output map.' unless found_sep
         raise ArgumentError, 'No unsigned transaction was provided.' unless partial_tx.tx
 
         # read input data.
@@ -83,6 +87,17 @@ module Bitcoin
         partial_tx
       end
 
+      # Finds the UTXO for a given input index
+      # @param [Integer] index input_index Index of the input to retrieve the UTXO of
+      # @return [Bitcoin::TxOut] The UTXO of the input if found.
+      def input_utxo(index)
+        input = inputs[index]
+        prevout_index = tx.in[index].out_point.index
+        return input.non_witness_utxo.out[prevout_index] if input.non_witness_utxo
+        return input.witness_utxo if input.witness_utxo
+        nil
+      end
+
       # generate payload.
       # @return [String] a payload with binary format.
       def to_payload
@@ -136,7 +151,8 @@ module Bitcoin
       # * If a witnessScript is provided, the scriptPubKey or the redeemScript must be for that witnessScript
       # @return [Boolean]
       def ready_to_sign?
-        inputs.all?(&:ready_to_sign?)
+        inputs.each.with_index{|psbt_in, index|return false unless psbt_in.ready_to_sign?(input_utxo(index))}
+        true
       end
 
       # get signature script of input specified by +index+

data/lib/bitcoin/secp256k1/ruby.rb

@@ -87,17 +87,22 @@ module Bitcoin
         end
       end
 
+      INITIAL_V = '0101010101010101010101010101010101010101010101010101010101010101'.htb
+      INITIAL_K = '0000000000000000000000000000000000000000000000000000000000000000'.htb
+      ZERO_B = '00'.htb
+      ONE_B = '01'.htb
+
       # generate temporary key k to be used when ECDSA sign.
       # https://tools.ietf.org/html/rfc6979#section-3.2
       def generate_rfc6979_nonce(data, privkey, extra_entropy)
-        v = ('01' * 32).htb # 3.2.b
-        k = ('00' * 32).htb # 3.2.c
+        v = INITIAL_V # 3.2.b
+        k = INITIAL_K # 3.2.c
         # 3.2.d
-        k = Bitcoin.hmac_sha256(k, v + '00'.htb + privkey + data + extra_entropy)
+        k = Bitcoin.hmac_sha256(k, v + ZERO_B + privkey + data + extra_entropy)
         # 3.2.e
         v = Bitcoin.hmac_sha256(k, v)
         # 3.2.f
-        k = Bitcoin.hmac_sha256(k, v + '01'.htb + privkey + data + extra_entropy)
+        k = Bitcoin.hmac_sha256(k, v + ONE_B + privkey + data + extra_entropy)
         # 3.2.g
         v = Bitcoin.hmac_sha256(k, v)
         # 3.2.h

data/lib/bitcoin/tx.rb

@@ -31,14 +31,14 @@ module Bitcoin
     alias_method :in, :inputs
     alias_method :out, :outputs
 
-    def self.parse_from_payload(payload)
+    def self.parse_from_payload(payload, non_witness: false)
       buf = payload.is_a?(String) ? StringIO.new(payload) : payload
       tx = new
       tx.version = buf.read(4).unpack('V').first
 
       in_count = Bitcoin.unpack_var_int_from_io(buf)
       witness = false
-      if in_count.zero?
+      if in_count.zero? && !non_witness
         tx.marker = 0
         tx.flag = buf.read(1).unpack('c').first
         if tx.flag.zero?

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa