bitcoinrb 0.5.0 → 0.6.0

data/lib/bitcoin/tx.rb

@@ -36,13 +36,13 @@ module Bitcoin
     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
+      tx.version = buf.read(4).unpack1('V')
 
       in_count = Bitcoin.unpack_var_int_from_io(buf)
       witness = false
       if in_count.zero? && !non_witness
         tx.marker = 0
-        tx.flag = buf.read(1).unpack('c').first
+        tx.flag = buf.read(1).unpack1('c')
         if tx.flag.zero?
           buf.pos -= 1
         else
@@ -66,7 +66,7 @@ module Bitcoin
         end
       end
 
-      tx.lock_time = buf.read(4).unpack('V').first
+      tx.lock_time = buf.read(4).unpack1('V')
 
       tx
     end
@@ -188,22 +188,22 @@ module Bitcoin
     # @param [Integer] input_index input index.
     # @param [Integer] hash_type signature hash type
     # @param [Bitcoin::Script] output_script script pubkey or script code. if script pubkey is P2WSH, set witness script to this.
+    # @param [Hash] opts Data required for each sig version (amount and skip_separator_index params can also be set to this parameter)
     # @param [Integer] amount bitcoin amount locked in input. required for witness input only.
     # @param [Integer] skip_separator_index If output_script is P2WSH and output_script contains any OP_CODESEPARATOR,
     # the script code needs  is the witnessScript but removing everything up to and including the last executed OP_CODESEPARATOR before the signature checking opcode being executed.
-    def sighash_for_input(input_index, output_script, hash_type: SIGHASH_TYPE[:all],
+    def sighash_for_input(input_index, output_script = nil, opts: {}, hash_type: SIGHASH_TYPE[:all],
                           sig_version: :base, amount: nil, skip_separator_index: 0)
       raise ArgumentError, 'input_index must be specified.' unless input_index
       raise ArgumentError, 'does not exist input corresponding to input_index.' if input_index >= inputs.size
-      raise ArgumentError, 'script_pubkey must be specified.' unless output_script
-      raise ArgumentError, 'unsupported sig version specified.' unless SIG_VERSION.include?(sig_version)
-
-      if sig_version == :witness_v0
-        raise ArgumentError, 'amount must be specified.' unless amount
-        sighash_for_witness(input_index, output_script, hash_type, amount, skip_separator_index)
-      else
-        sighash_for_legacy(input_index, output_script, hash_type)
-      end
+      raise ArgumentError, 'script_pubkey must be specified.' if [:base, :witness_v0].include?(sig_version) && output_script.nil?
+
+      opts[:amount] = amount if amount
+      opts[:skip_separator_index] = skip_separator_index
+      opts[:sig_version] = sig_version
+      opts[:script_code] = output_script
+      sig_hash_gen = SigHashGenerator.load(sig_version)
+      sig_hash_gen.generate(self, input_index, hash_type, opts)
     end
 
     # verify input signature.
@@ -245,73 +245,6 @@ module Bitcoin
 
     private
 
-    # generate sighash with legacy format
-    def sighash_for_legacy(index, script_code, hash_type)
-      ins = inputs.map.with_index do |i, idx|
-        if idx == index
-          i.to_payload(script_code.delete_opcode(Bitcoin::Opcodes::OP_CODESEPARATOR))
-        else
-          case hash_type & 0x1f
-            when SIGHASH_TYPE[:none], SIGHASH_TYPE[:single]
-              i.to_payload(Bitcoin::Script.new, 0)
-            else
-              i.to_payload(Bitcoin::Script.new)
-          end
-        end
-      end
-
-      outs = outputs.map(&:to_payload)
-      out_size = Bitcoin.pack_var_int(outputs.size)
-
-      case hash_type & 0x1f
-        when SIGHASH_TYPE[:none]
-          outs = ''
-          out_size = Bitcoin.pack_var_int(0)
-        when SIGHASH_TYPE[:single]
-          return "\x01".ljust(32, "\x00") if index >= outputs.size
-          outs = outputs[0...(index + 1)].map.with_index { |o, idx| (idx == index) ? o.to_payload : o.to_empty_payload }.join
-          out_size = Bitcoin.pack_var_int(index + 1)
-      end
-
-      if hash_type & SIGHASH_TYPE[:anyonecanpay] != 0
-        ins = [ins[index]]
-      end
-
-      buf = [[version].pack('V'), Bitcoin.pack_var_int(ins.size),
-          ins, out_size, outs, [lock_time, hash_type].pack('VV')].join
-
-      Bitcoin.double_sha256(buf)
-    end
-
-    # generate sighash with BIP-143 format
-    # https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki
-    def sighash_for_witness(index, script_pubkey_or_script_code, hash_type, amount, skip_separator_index)
-      hash_prevouts = Bitcoin.double_sha256(inputs.map{|i|i.out_point.to_payload}.join)
-      hash_sequence = Bitcoin.double_sha256(inputs.map{|i|[i.sequence].pack('V')}.join)
-      outpoint = inputs[index].out_point.to_payload
-      amount = [amount].pack('Q')
-      nsequence = [inputs[index].sequence].pack('V')
-      hash_outputs = Bitcoin.double_sha256(outputs.map{|o|o.to_payload}.join)
-
-      script_code = script_pubkey_or_script_code.to_script_code(skip_separator_index)
-
-      case (hash_type & 0x1f)
-      when SIGHASH_TYPE[:single]
-        hash_outputs = index >= outputs.size ? "\x00".ljust(32, "\x00") : Bitcoin.double_sha256(outputs[index].to_payload)
-        hash_sequence = "\x00".ljust(32, "\x00")
-      when SIGHASH_TYPE[:none]
-        hash_sequence = hash_outputs = "\x00".ljust(32, "\x00")
-      end
-
-      if (hash_type & SIGHASH_TYPE[:anyonecanpay]) != 0
-        hash_prevouts = hash_sequence ="\x00".ljust(32, "\x00")
-      end
-
-      buf = [ [version].pack('V'), hash_prevouts, hash_sequence, outpoint,
-              script_code ,amount, nsequence, hash_outputs, [@lock_time, hash_type].pack('VV')].join
-      Bitcoin.double_sha256(buf)
-    end
-
     # verify input signature for legacy tx.
     def verify_input_sig_for_legacy(input_index, script_pubkey, flags)
       script_sig = inputs[input_index].script_sig

data/lib/bitcoin/tx_in.rb

@@ -42,7 +42,7 @@ module Bitcoin
       else
         i.script_sig = Script.parse_from_payload(buf.read(sig_length))
       end
-      i.sequence = buf.read(4).unpack('V').first
+      i.sequence = buf.read(4).unpack1('V')
       i
     end
 

data/lib/bitcoin/tx_out.rb

@@ -18,14 +18,13 @@ module Bitcoin
 
     def self.parse_from_payload(payload)
       buf = payload.is_a?(String) ? StringIO.new(payload) : payload
-      value = buf.read(8).unpack('q').first
+      value = buf.read(8).unpack1('q')
       script_size = Bitcoin.unpack_var_int_from_io(buf)
       new(value: value, script_pubkey: Script.parse_from_payload(buf.read(script_size)))
     end
 
     def to_payload
-      s = script_pubkey.to_payload
-      [value].pack('Q') << Bitcoin.pack_var_int(s.length) << s
+      [value].pack('Q') << script_pubkey.to_payload(true)
     end
 
     def to_empty_payload

data/lib/bitcoin/util.rb

@@ -33,7 +33,7 @@ module Bitcoin
 
     # @return an integer for a valid payload, otherwise nil
     def unpack_var_int(payload)
-      case payload.unpack('C').first
+      case payload.unpack1('C')
       when 0xfd
         payload.unpack('xva*')
       when 0xfe
@@ -47,14 +47,14 @@ module Bitcoin
 
     # @return an integer for a valid payload, otherwise nil
     def unpack_var_int_from_io(buf)
-      uchar = buf.read(1)&.unpack('C')&.first
+      uchar = buf.read(1)&.unpack1('C')
       case uchar
       when 0xfd
-        buf.read(2)&.unpack('v')&.first
+        buf.read(2)&.unpack1('v')
       when 0xfe
-        buf.read(4)&.unpack('V')&.first
+        buf.read(4)&.unpack1('V')
       when 0xff
-        buf.read(8)&.unpack('Q')&.first
+        buf.read(8)&.unpack1('Q')
       else
         uchar
       end
@@ -79,7 +79,7 @@ module Bitcoin
 
     # byte convert to the sequence of bits packed eight in a byte with the least significant bit first.
     def byte_to_bit(byte)
-      byte.unpack('b*').first
+      byte.unpack1('b*')
     end
 
     # padding zero to the left of binary string until bytesize.
@@ -96,6 +96,15 @@ module Bitcoin
       Digest::RMD160.hexdigest(Digest::SHA256.digest(hex.htb))
     end
 
+    # Generate tagged hash value.
+    # @param [String] tag tag value.
+    # @param [String] msg the message to be hashed.
+    # @return [String] the hash value with binary format.
+    def tagged_hash(tag, msg)
+      tag_hash = Digest::SHA256.digest(tag)
+      Digest::SHA256.digest(tag_hash + tag_hash + msg)
+    end
+
     # encode Base58 check address.
     # @param [String] hex the address payload.
     # @param [String] addr_version the address version for P2PKH and P2SH.

data/lib/bitcoin/version.rb

@@ -1,3 +1,3 @@
 module Bitcoin
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/bitcoin/wallet/account.rb

@@ -43,7 +43,7 @@ module Bitcoin
 
       def to_payload
         payload = account_key.to_payload
-        payload << Bitcoin.pack_var_string(name.unpack('H*').first.htb)
+        payload << Bitcoin.pack_var_string(name.unpack1('H*').htb)
         payload << [purpose, index, receive_depth, change_depth, lookahead].pack('I*')
         payload
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitcoinrb
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -179,33 +179,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.8.5
 - !ruby/object:Gem::Dependency
-  name: scrypt
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: bip-schnorr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: leveldb-native
   requirement: !ruby/object:Gem::Requirement
@@ -280,17 +280,17 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-description: "[WIP]The implementation of Bitcoin Protocol for Ruby."
+        version: 3.11.1
+description: The implementation of Bitcoin Protocol for Ruby.
 email:
 - azuchi@chaintope.com
 executables:
@@ -326,10 +326,13 @@ files:
 - lib/bitcoin/chain_params.rb
 - lib/bitcoin/chainparams/mainnet.yml
 - lib/bitcoin/chainparams/regtest.yml
+- lib/bitcoin/chainparams/signet.yml
 - lib/bitcoin/chainparams/testnet.yml
 - lib/bitcoin/constants.rb
 - lib/bitcoin/descriptor.rb
+- lib/bitcoin/errors.rb
 - lib/bitcoin/ext.rb
+- lib/bitcoin/ext/ecdsa.rb
 - lib/bitcoin/ext/json_parser.rb
 - lib/bitcoin/ext_key.rb
 - lib/bitcoin/gcs_filter.rb
@@ -429,6 +432,7 @@ files:
 - lib/bitcoin/secp256k1/native.rb
 - lib/bitcoin/secp256k1/rfc6979.rb
 - lib/bitcoin/secp256k1/ruby.rb
+- lib/bitcoin/sighash_generator.rb
 - lib/bitcoin/slip39.rb
 - lib/bitcoin/slip39/share.rb
 - lib/bitcoin/slip39/sss.rb
@@ -474,8 +478,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
-summary: "[WIP]The implementation of Bitcoin Protocol for Ruby."
+summary: The implementation of Bitcoin Protocol for Ruby.
 test_files: []