tapyrus 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ad31bf4aa539aa394eeb5002fe11fc9b8c6a43aab73c9e36a63220159c2fb30
-  data.tar.gz: 8b7aaacfd238de278b334b7b26249045facf14843b8fb32985045c0a52b9cdc9
+  metadata.gz: 82146cdd150374b76b593273e44c31f4f578d38a1b7dcabea0b0d1fd9acbbb5f
+  data.tar.gz: 8895de33dd2b36412f509c4e35465d513d3d6c98a0bcfc0e7db241a77acd8b3b
 SHA512:
-  metadata.gz: ad3bc4d2fbaaf0e228cd7c07ee78e878f6b913e971645b8a6e188df70c9e363fbc210456833436f1e7ea780881bd10accdd7a069365e26fc09195744fe606766
-  data.tar.gz: b267bb2ff699df8822feffc75573db5e506dc5490f5f79146cfaf16d20abfd14660ddbfa4f2f01401d54b5bb9ecdb646613de8c7a28b01d48260aebb862834d3
+  metadata.gz: e386ac9d8578846437902e78d79b3d4419c85df861c831c92641da94d2d46a37c4793efaafa8e28a1da4466e5347fbe79f66beb0d925fe2bfc83cca1d1e90c99
+  data.tar.gz: a34fa0709093aafb118356b7736b409c733e1185a22538f7e2ed4392dac0ac661a652a31853f652d988860ee66c8b57124815b0fc28dd795b7bea97ad44182c5

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.0.2

data/lib/schnorr/sign_to_contract.rb

@@ -0,0 +1,51 @@
+module Schnorr
+  module SignToContract
+    module_function
+
+    GROUP = ECDSA::Group::Secp256k1
+
+    # Generate schnorr signature for sign-to-signature.
+    # @param message [String] A message to be signed with binary format.
+    # @param private_key [Integer] The private key.
+    # @param contract [String] A contract information with 32-bytes binary format.
+    # @return [(Schnorr::Signature, ECDSA::Point)] signature and point to prove the commitment to contract.
+    def sign(message, private_key, contract)
+      raise 'The message must be a 32-byte array.' unless message.bytesize == 32
+      raise 'private_key is zero or over the curve order.' if private_key == 0 || private_key >= GROUP.order
+      raise 'The contract must be a 32-byte binary string.' unless contract.bytesize == 32
+
+      p = GROUP.new_point(private_key)
+      k0 = Schnorr.deterministic_nonce(message, private_key)
+
+      k1, r = tweak(k0, contract)
+
+      q = GROUP.new_point(k1)
+      k = ECDSA::PrimeField.jacobi(q.y, GROUP.field.prime) == 1 ? k1 : GROUP.order - k1
+
+      e = Schnorr.create_challenge(q.x, p, message)
+
+      [Schnorr::Signature.new(q.x, (k + e * private_key) % GROUP.order), r]
+    end
+
+    def tweak(k, contract)
+      r = GROUP.new_point(k)
+      rx = ECDSA::Format::IntegerOctetString.encode(r.x, GROUP.byte_length)
+      h = Tapyrus.sha256(rx + contract)
+      k1 = (k + h.bth.to_i(16)) % GROUP.order
+      raise 'Creation of signature failed. k + h(R || c) is zero' if k1.zero?
+      [k1, r]
+    end
+
+    # Validate contract
+    # @param r [ECDSA::Point] point to prove the commitment.
+    # @param signature [Schnorr::Signature] signature.
+    # @param contract [String]  A contract information with 32-bytes binary format.
+    # @return true if commitment for contract is valid, otherwise false
+    def valid_contract?(r, signature, contract)
+      rx = ECDSA::Format::IntegerOctetString.encode(r.x, GROUP.byte_length)
+      commitment = Tapyrus.sha256(rx + contract).bth.to_i(16) % GROUP.order
+      point = r + GROUP.generator.multiply_by_scalar(commitment)
+      signature.r == point.x
+    end
+  end
+end

data/lib/schnorr.rb

@@ -1,5 +1,6 @@
 module Schnorr
   autoload :Signature, 'schnorr/signature'
+  autoload :SignToContract, 'schnorr/sign_to_contract'
 
   module_function
 
@@ -16,12 +17,7 @@ module Schnorr
     raise 'private_key is zero or over the curve order.' if private_key == 0 || private_key >= GROUP.order
 
     p = GROUP.new_point(private_key)
-    secret = ECDSA::Format::IntegerOctetString.encode(private_key, GROUP.byte_length)
-    secret = secret + message + ALGO16
-    nonce = Tapyrus::Secp256k1::RFC6979.generate_rfc6979_nonce(secret, '')
-
-    k0 = nonce % GROUP.order
-    raise 'Creation of signature failed. k is zero' if k0.zero?
+    k0 = deterministic_nonce(message, private_key)
 
     r = GROUP.new_point(k0)
     k = ECDSA::PrimeField.jacobi(r.y, GROUP.field.prime) == 1 ? k0 : GROUP.order - k0
@@ -31,6 +27,16 @@ module Schnorr
     Schnorr::Signature.new(r.x, (k + e * private_key) % GROUP.order)
   end
 
+  def deterministic_nonce(message, private_key)
+    secret = ECDSA::Format::IntegerOctetString.encode(private_key, GROUP.byte_length)
+    secret = secret + message + ALGO16
+    nonce = Tapyrus::Secp256k1::RFC6979.generate_rfc6979_nonce(secret, '')
+
+    k0 = nonce % GROUP.order
+    raise 'Creation of signature failed. k is zero' if k0.zero?
+    k0
+  end
+
   # Verifies the given {Signature} and returns true if it is valid.
   # @param message (String) A message to be signed with binary format.
   # @param public_key (String) The public key with binary format.

data/lib/tapyrus/bip175.rb

@@ -0,0 +1,78 @@
+module Tapyrus
+  # Key generation based on BIP-175
+  #
+  # @example
+  #
+  # master = Tapyrus::ExtKey.from_base58('xprv9s21ZrQH143K2JF8RafpqtKiTbsbaxEeUaMnNHsm5o6wCW3z8ySyH4UxFVSfZ8n7ESu7fgir8imbZKLYVBxFPND1pniTZ81vKfd45EHKX73')
+  # bip175 = Tapyrus::BIP175.from_private_key(master)
+  # bip175 << "foo"
+  # bip175 << "bar"
+  # bip175.addr
+  # > 1C7f322izqMqLzZzfzkPAjxBzprxDi47Yf
+  #
+  # @see https://github.com/bitcoin/bips/blob/master/bip-0175.mediawiki
+  class BIP175
+    PURPOSE_TYPE = 175
+
+    attr_accessor :master_ext_key, :payment_base
+
+    def initialize
+      @contracts = []
+    end
+
+    # @param key [Tapyrus::ExtKey] master private extended key
+    def self.from_ext_key(key)
+      raise ArgumentError, 'key should be Tapyrus::ExtKey' unless key.is_a?(Tapyrus::ExtKey)
+      raise ArgumentError, 'key should be master private extended key' unless key.master?
+      new.tap do |bip175|
+        bip175.master_ext_key = key
+        bip175.payment_base =
+          key.derive(PURPOSE_TYPE, true).derive(Tapyrus.chain_params.bip44_coin_type, true).ext_pubkey
+      end
+    end
+
+    # @param key [Tapyrus::ExtPubkey] contract base public key
+    def self.from_ext_pubkey(key)
+      raise ArgumentError, 'key should be Tapyrus::ExtPubkey' unless key.is_a?(Tapyrus::ExtPubkey)
+      new.tap { |bip175| bip175.payment_base = key }
+    end
+
+    # Add value of hashed contract
+    # @param contract [String] contract information
+    def add(contract)
+      @contracts << Tapyrus.sha256(contract)
+      self
+    end
+    alias << add
+
+    # Return combined hash consist of payment_base and contract hashes
+    # @return [String] contract_hash
+    def combined_hash
+      hashes = @contracts.map { |c| c.bth }.sort
+      concatenated_hash = [payment_base.to_base58].concat(hashes).join
+      Tapyrus.sha256(concatenated_hash)
+    end
+
+    # Return pay-to-contract extended private key
+    # @return [Tapyrus::ExtKey] extended private key
+    def priv_key
+      key = master_ext_key.derive(PURPOSE_TYPE, true).derive(Tapyrus.chain_params.bip44_coin_type, true)
+
+      # Split every 2 bytes
+      paths = combined_hash.unpack('S>*')
+      paths.inject(key) { |key, p| key.derive(p) }
+    end
+
+    # Return pay-to-contract extended public key
+    # @return [Tapyrus::ExtPubkey] extended public key
+    def pubkey
+      # Split every 2 bytes
+      paths = combined_hash.unpack('S>*')
+      paths.inject(payment_base) { |key, p| key.derive(p) }
+    end
+
+    def addr
+      pubkey.addr
+    end
+  end
+end

data/lib/tapyrus/ext_key.rb

@@ -196,6 +196,10 @@ module Tapyrus
         Tapyrus.chain_params.extended_pubkey_version
       end
     end
+
+    def master?
+      depth == 0 && number == 0 && parent_fingerprint == '00000000'
+    end
   end
 
   # BIP-32 Extended public key
@@ -356,5 +360,9 @@ module Tapyrus
       p = Tapyrus.chain_params
       [p.bip49_pubkey_p2wpkh_p2sh_version, p.bip84_pubkey_p2wpkh_version, p.extended_pubkey_version].include?(version)
     end
+
+    def master?
+      depth == 0 && number == 0 && parent_fingerprint == '00000000'
+    end
   end
 end

data/lib/tapyrus/key.rb

@@ -31,7 +31,7 @@ module Tapyrus
     # @return [Tapyrus::Key] a key object.
     def initialize(priv_key: nil, pubkey: nil, key_type: nil, compressed: true, allow_hybrid: false)
       if key_type.nil? && !compressed.nil? && pubkey.nil?
-        puts '[Warning] Use key_type parameter instead of compressed. compressed parameter removed in the future.'
+        warn('Use key_type parameter instead of compressed. compressed parameter removed in the future.')
       end
       if key_type
         @key_type = key_type

data/lib/tapyrus/merkle_tree.rb

@@ -16,11 +16,14 @@ module Tapyrus
         nodes = [Node.new(txids.first)]
       else
         nodes =
-          txids.each_slice(2).map do |m|
-            left = Node.new(m[0])
-            right = Node.new(m[1] ? m[1] : m[0])
-            [left, right]
-          end.flatten
+          txids
+            .each_slice(2)
+            .map do |m|
+              left = Node.new(m[0])
+              right = Node.new(m[1] ? m[1] : m[0])
+              [left, right]
+            end
+            .flatten
       end
       new(build_initial_tree(nodes))
     end

data/lib/tapyrus/network/peer_discovery.rb

@@ -26,14 +26,17 @@ module Tapyrus
 
       def find_from_dns_seeds
         logger.debug 'discover peer address from DNS seeds.'
-        dns_seeds.map do |seed|
-          begin
-            Socket.getaddrinfo(seed, Tapyrus.chain_params.default_port).map { |a| a[2] }.uniq
-          rescue SocketError => e
-            logger.error "SocketError occurred when load DNS seed: #{seed}, error: #{e.message}"
-            nil
+        dns_seeds
+          .map do |seed|
+            begin
+              Socket.getaddrinfo(seed, Tapyrus.chain_params.default_port).map { |a| a[2] }.uniq
+            rescue SocketError => e
+              logger.error "SocketError occurred when load DNS seed: #{seed}, error: #{e.message}"
+              nil
+            end
           end
-        end.flatten.compact
+          .flatten
+          .compact
       end
     end
   end

data/lib/tapyrus/rpc/request_handler.rb

@@ -47,32 +47,29 @@ module Tapyrus
 
       # Returns connected peer information.
       def getpeerinfo
-        node
-          .pool
-          .peers
-          .map do |peer|
-            local_addr = "#{peer.remote_version.remote_addr.ip}:18333"
-            {
-              id: peer.id,
-              addr: "#{peer.host}:#{peer.port}",
-              addrlocal: local_addr,
-              services: peer.remote_version.services.to_even_length_hex.rjust(16, '0'),
-              relaytxes: peer.remote_version.relay,
-              lastsend: peer.last_send,
-              lastrecv: peer.last_recv,
-              bytessent: peer.bytes_sent,
-              bytesrecv: peer.bytes_recv,
-              conntime: peer.conn_time,
-              pingtime: peer.ping_time,
-              minping: peer.min_ping,
-              version: peer.remote_version.version,
-              subver: peer.remote_version.user_agent,
-              inbound: !peer.outbound?,
-              startingheight: peer.remote_version.start_height,
-              best_hash: peer.best_hash,
-              best_height: peer.best_height
-            }
-          end
+        node.pool.peers.map do |peer|
+          local_addr = "#{peer.remote_version.remote_addr.ip}:18333"
+          {
+            id: peer.id,
+            addr: "#{peer.host}:#{peer.port}",
+            addrlocal: local_addr,
+            services: peer.remote_version.services.to_even_length_hex.rjust(16, '0'),
+            relaytxes: peer.remote_version.relay,
+            lastsend: peer.last_send,
+            lastrecv: peer.last_recv,
+            bytessent: peer.bytes_sent,
+            bytesrecv: peer.bytes_recv,
+            conntime: peer.conn_time,
+            pingtime: peer.ping_time,
+            minping: peer.min_ping,
+            version: peer.remote_version.version,
+            subver: peer.remote_version.user_agent,
+            inbound: !peer.outbound?,
+            startingheight: peer.remote_version.start_height,
+            best_hash: peer.best_hash,
+            best_height: peer.best_height
+          }
+        end
       end
 
       # broadcast transaction

data/lib/tapyrus/rpc/tapyrus_core_client.rb

@@ -16,22 +16,36 @@ module Tapyrus
     #   end
     # end
     class Error < StandardError
-      attr_reader :message
+      attr_reader :response_code, :response_msg, :rpc_error
 
-      def initialize(response)
-        raise ArgumentError, 'Must set response as cause.' unless response
+      def initialize(response_code, response_msg, rpc_error)
+        @response_code = response_code
+        @response_msg = response_msg
+        @rpc_error = rpc_error
+      end
 
-        # set message from response body or status code.
-        @message = { response_code: response&.code, response_msg: response&.msg }
-        begin
-          @message.merge!({ rpc_error: Tapyrus::RPC.response_body2json(response.body)['error'] })
-        rescue JSON::ParserError => _
-          # if RPC server don't send error message.
-        end
+      # Return response object as Hash
+      # @return [Hash] response
+      # @option response_code [Integer] HTTP status code
+      # @option response_msg [String] HTTP response body
+      # @option rpc_error [String] error message received from Tapyrus Core
+      def response
+        @response ||=
+          begin
+            m = { response_code: response_code, response_msg: response_msg }
+            m.merge!(rpc_error: rpc_error) if rpc_error
+            m
+          end
+      end
+
+      # Return string that represents error message.
+      # @return [String] error message
+      def message
+        response.to_json
       end
 
       def to_s
-        @message.to_s
+        message
       end
     end
 
@@ -83,10 +97,21 @@ module Tapyrus
         request.content_type = 'application/json'
         request.body = data.to_json
         response = http.request(request)
-        raise Error.new(response) unless response.is_a? Net::HTTPOK
+        raise error!(response) unless response.is_a? Net::HTTPOK
         response = Tapyrus::RPC.response_body2json(response.body)
         response['result']
       end
+
+      def error!(response)
+        rpc_error =
+          begin
+            Tapyrus::RPC.response_body2json(response.body)['error']
+          rescue JSON::ParserError => _
+            # if RPC server don't send error message.
+          end
+
+        raise Error.new(response.code, response.msg, rpc_error)
+      end
     end
 
     def response_body2json(body)

data/lib/tapyrus/rpc.rb

@@ -3,5 +3,6 @@ module Tapyrus
     autoload :HttpServer, 'tapyrus/rpc/http_server'
     autoload :RequestHandler, 'tapyrus/rpc/request_handler'
     autoload :TapyrusCoreClient, 'tapyrus/rpc/tapyrus_core_client'
+    autoload :Error, 'tapyrus/rpc/tapyrus_core_client'
   end
 end

data/lib/tapyrus/script/script.rb

@@ -281,10 +281,12 @@ module Tapyrus
     # get public keys in the stack.
     # @return[Array[String]] an array of the pubkeys with hex format.
     def get_pubkeys
-      chunks.select do |c|
-        c.pushdata? && [33, 65].include?(c.pushed_data.bytesize) &&
-          [2, 3, 4, 6, 7].include?(c.pushed_data[0].bth.to_i(16))
-      end.map { |c| c.pushed_data.bth }
+      chunks
+        .select do |c|
+          c.pushdata? && [33, 65].include?(c.pushed_data.bytesize) &&
+            [2, 3, 4, 6, 7].include?(c.pushed_data[0].bth.to_i(16))
+        end
+        .map { |c| c.pushed_data.bth }
     end
 
     # returns the self payload. ScriptInterpreter does not use this.
@@ -349,30 +351,32 @@ module Tapyrus
     end
 
     def to_s
-      chunks.map do |c|
-        case c
-        when Integer
-          opcode_to_name(c)
-        when String
-          return c if c.empty?
-          if c.pushdata?
-            v = Opcodes.opcode_to_small_int(c.ord)
-            if v
-              v
-            else
-              data = c.pushed_data
-              if data.bytesize <= 4
-                Script.decode_number(data.bth) # for scriptnum
+      chunks
+        .map do |c|
+          case c
+          when Integer
+            opcode_to_name(c)
+          when String
+            return c if c.empty?
+            if c.pushdata?
+              v = Opcodes.opcode_to_small_int(c.ord)
+              if v
+                v
               else
-                data.bth
+                data = c.pushed_data
+                if data.bytesize <= 4
+                  Script.decode_number(data.bth) # for scriptnum
+                else
+                  data.bth
+                end
               end
+            else
+              opcode = Opcodes.opcode_to_name(c.ord)
+              opcode ? opcode : 'OP_UNKNOWN [error]'
             end
-          else
-            opcode = Opcodes.opcode_to_name(c.ord)
-            opcode ? opcode : 'OP_UNKNOWN [error]'
           end
         end
-      end.join(' ')
+        .join(' ')
     end
 
     # generate sha-256 hash for payload

data/lib/tapyrus/slip39/sss.rb

@@ -190,9 +190,15 @@ module Tapyrus
         shares.each do |share|
           log_basis_eval = (log_prod - LOG_TABLE[share[0] ^ x] - shares.sum { |s| LOG_TABLE[share[0] ^ s[0]] }) % 255
           result =
-            share[1].htb.bytes.each.map.with_index do |v, i|
-              (result[i].bti ^ (v == 0 ? 0 : (EXP_TABLE[(LOG_TABLE[v] + log_basis_eval) % 255]))).itb
-            end.join
+            share[1]
+              .htb
+              .bytes
+              .each
+              .map
+              .with_index do |v, i|
+                (result[i].bti ^ (v == 0 ? 0 : (EXP_TABLE[(LOG_TABLE[v] + log_basis_eval) % 255]))).itb
+              end
+              .join
         end
         result.bth
       end
@@ -206,14 +212,10 @@ module Tapyrus
         l, r = ems[0...(ems.length / 2)].htb, ems[(ems.length / 2)..-1].htb
         salt = get_salt(id)
         e = (Tapyrus::SLIP39::BASE_ITERATION_COUNT << exp) / Tapyrus::SLIP39::ROUND_COUNT
-        Tapyrus::SLIP39::ROUND_COUNT
-          .times
-          .to_a
-          .reverse
-          .each do |i|
-            f = OpenSSL::PKCS5.pbkdf2_hmac((i.itb + passphrase), salt + r, e, r.bytesize, 'sha256')
-            l, r = padding_zero(r, r.bytesize), padding_zero((l.bti ^ f.bti).itb, r.bytesize)
-          end
+        Tapyrus::SLIP39::ROUND_COUNT.times.to_a.reverse.each do |i|
+          f = OpenSSL::PKCS5.pbkdf2_hmac((i.itb + passphrase), salt + r, e, r.bytesize, 'sha256')
+          l, r = padding_zero(r, r.bytesize), padding_zero((l.bti ^ f.bti).itb, r.bytesize)
+        end
         (r + l).bth
       end
 
@@ -228,13 +230,10 @@ module Tapyrus
         l, r = s[0...(s.bytesize / 2)], s[(s.bytesize / 2)..-1]
         salt = get_salt(id)
         e = (Tapyrus::SLIP39::BASE_ITERATION_COUNT << exp) / Tapyrus::SLIP39::ROUND_COUNT
-        Tapyrus::SLIP39::ROUND_COUNT
-          .times
-          .to_a
-          .each do |i|
-            f = OpenSSL::PKCS5.pbkdf2_hmac((i.itb + passphrase), salt + r, e, r.bytesize, 'sha256')
-            l, r = padding_zero(r, r.bytesize), padding_zero((l.bti ^ f.bti).itb, r.bytesize)
-          end
+        Tapyrus::SLIP39::ROUND_COUNT.times.to_a.each do |i|
+          f = OpenSSL::PKCS5.pbkdf2_hmac((i.itb + passphrase), salt + r, e, r.bytesize, 'sha256')
+          l, r = padding_zero(r, r.bytesize), padding_zero((l.bti ^ f.bti).itb, r.bytesize)
+        end
         (r + l).bth
       end
 

data/lib/tapyrus/tx_builder.rb

@@ -31,6 +31,8 @@ module Tapyrus
   #     .build
   #
   class TxBuilder
+    attr_reader :outputs, :utxos
+
     def initialize
       @utxos = []
       @incomings = {}

data/lib/tapyrus/version.rb

@@ -1,3 +1,3 @@
 module Tapyrus
-  VERSION = '0.2.8'
+  VERSION = '0.2.13'
 end

data/lib/tapyrus.rb

@@ -49,6 +49,7 @@ module Tapyrus
   autoload :Color, 'tapyrus/script/color'
   autoload :Errors, 'tapyrus/errors'
   autoload :TxBuilder, 'tapyrus/tx_builder'
+  autoload :BIP175, 'tapyrus/bip175'
 
   require_relative 'tapyrus/constants'
   require_relative 'tapyrus/ext/ecdsa'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapyrus
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.13
 platform: ruby
 authors:
 - azuchi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -306,9 +306,11 @@ files:
 - lib/openassets/payload.rb
 - lib/openassets/util.rb
 - lib/schnorr.rb
+- lib/schnorr/sign_to_contract.rb
 - lib/schnorr/signature.rb
 - lib/tapyrus.rb
 - lib/tapyrus/base58.rb
+- lib/tapyrus/bip175.rb
 - lib/tapyrus/block.rb
 - lib/tapyrus/block_header.rb
 - lib/tapyrus/bloom_filter.rb
@@ -423,7 +425,7 @@ homepage: https://github.com/chaintope/tapyrusrb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -438,8 +440,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: The implementation of Tapyrus Protocol for Ruby.
 test_files: []