tapyrus 0.1.0 → 0.2.4

data/lib/tapyrus/key.rb

@@ -11,6 +11,8 @@ module Tapyrus
     SIGNATURE_SIZE = 72
     COMPACT_SIGNATURE_SIZE = 65
 
+    SIG_ALGO = [:ecdsa, :schnorr]
+
     attr_accessor :priv_key
     attr_accessor :pubkey
     attr_accessor :key_type
@@ -28,7 +30,7 @@ module Tapyrus
     # @param [Integer] key_type a key type which determine address type.
     # @param [Boolean] compressed [Deprecated] whether public key is compressed.
     # @return [Tapyrus::Key] a key object.
-    def initialize(priv_key: nil, pubkey: nil, key_type: nil, compressed: true)
+    def initialize(priv_key: nil, pubkey: nil, key_type: nil, compressed: true, allow_hybrid: false)
       puts "[Warning] Use key_type parameter instead of compressed. compressed parameter removed in the future." if key_type.nil? && !compressed.nil? && pubkey.nil?
       if key_type
         @key_type = key_type
@@ -39,13 +41,14 @@ module Tapyrus
       @secp256k1_module =  Tapyrus.secp_impl
       @priv_key = priv_key
       if @priv_key
-        raise ArgumentError, 'private key is not on curve' unless validate_private_key_range(@priv_key)
+        raise ArgumentError, Errors::Messages::INVALID_PRIV_KEY unless validate_private_key_range(@priv_key)
       end
       if pubkey
         @pubkey = pubkey
       else
         @pubkey = generate_pubkey(priv_key, compressed: compressed) if priv_key
       end
+      raise ArgumentError, Errors::Messages::INVALID_PUBLIC_KEY unless fully_valid_pubkey?(allow_hybrid)
     end
 
     # generate key pair
@@ -63,7 +66,7 @@ module Tapyrus
       data = hex[2...-8].htb
       checksum = hex[-8..-1]
       raise ArgumentError, 'invalid version' unless version == Tapyrus.chain_params.privkey_version
-      raise ArgumentError, 'invalid checksum' unless Tapyrus.calc_checksum(version + data.bth) == checksum
+      raise ArgumentError, Errors::Messages::INVALID_CHECKSUM unless Tapyrus.calc_checksum(version + data.bth) == checksum
       key_len = data.bytesize
       if key_len == COMPRESSED_PUBLIC_KEY_SIZE && data[-1].unpack('C').first == 1
         key_type = TYPES[:compressed]
@@ -89,29 +92,31 @@ module Tapyrus
     # @param [String] data a data to be signed with binary format
     # @param [Boolean] low_r flag to apply low-R.
     # @param [String] extra_entropy the extra entropy for rfc6979.
+    # @param [Symbol] algo Algorithms used for verification. Either :ecdsa or :schnorr is supported. default value is :ecdsa.
     # @return [String] signature data with binary format
-    def sign(data, low_r = true, extra_entropy = nil)
-      sig = secp256k1_module.sign_data(data, priv_key, extra_entropy)
-      if low_r && !sig_has_low_r?(sig)
-        counter = 1
-        until sig_has_low_r?(sig)
-          extra_entropy = [counter].pack('I*').bth.ljust(64, '0').htb
-          sig = secp256k1_module.sign_data(data, priv_key, extra_entropy)
-          counter += 1
-        end
+    def sign(data, low_r = true, extra_entropy = nil, algo: :ecdsa)
+      raise ArgumentError, "Unsupported algorithm has been specified." unless SIG_ALGO.include?(algo)
+      case algo
+      when :ecdsa
+        sign_ecdsa(data, low_r, extra_entropy)
+      when :schnorr
+        secp256k1_module.sign_data(data, priv_key, extra_entropy, algo: algo)
+      else
+        false
       end
-      sig
     end
 
     # verify signature using public key
     # @param [String] sig signature data with binary format
     # @param [String] origin original message
+    # @param [Symbol] algo Algorithms used for verification. Either :ecdsa or :schnorr is supported. default value is :ecdsa.
     # @return [Boolean] verify result
-    def verify(sig, origin)
+    def verify(sig, origin, algo: :ecdsa)
       return false unless valid_pubkey?
       begin
-        sig = ecdsa_signature_parse_der_lax(sig)
-        secp256k1_module.verify_sig(origin, sig, pubkey)
+        raise ArgumentError, "Unsupported algorithm has been specified." unless SIG_ALGO.include?(algo)
+        sig = ecdsa_signature_parse_der_lax(sig) if algo == :ecdsa
+        secp256k1_module.verify_sig(origin, sig, pubkey, algo: algo)
       rescue Exception
         false
       end
@@ -128,18 +133,6 @@ module Tapyrus
       Tapyrus::Script.to_p2pkh(hash160).addresses.first
     end
 
-    # get pay to witness pubkey hash address
-    # @deprecated
-    def to_p2wpkh
-      Tapyrus::Script.to_p2wpkh(hash160).addresses.first
-    end
-
-    # get p2wpkh address nested in p2sh.
-    # @deprecated
-    def to_nested_p2wpkh
-      Tapyrus::Script.to_p2wpkh(hash160).to_p2sh.addresses.first
-    end
-
     def compressed?
       key_type != TYPES[:uncompressed]
     end
@@ -191,18 +184,24 @@ module Tapyrus
 
     # check +sig+ is correct der encoding.
     # This function is consensus-critical since BIP66.
-    def self.valid_signature_encoding?(sig)
-      return false if sig.bytesize < 9 || sig.bytesize > 73 # Minimum and maximum size check
+    # @param [String] sig a signature data with binary format.
+    # @param [Boolean] data_sig whether data signature or not.
+    # @return [Boolean] result
+    def self.valid_signature_encoding?(sig, data_sig = false)
+      num_parts = data_sig ? 8 : 9
+      size = data_sig ? 72 : 73
+
+      return false if sig.bytesize < num_parts || sig.bytesize > size # Minimum and maximum size check
 
       s = sig.unpack('C*')
 
-      return false if s[0] != 0x30 || s[1] != s.size - 3 # A signature is of type 0x30 (compound). Make sure the length covers the entire signature.
+      return false if s[0] != 0x30 || s[1] != s.size - (data_sig ? 2 : 3) # A signature is of type 0x30 (compound). Make sure the length covers the entire signature.
 
       len_r = s[3]
       return false if 5 + len_r >= s.size # Make sure the length of the S element is still inside the signature.
 
       len_s = s[5 + len_r]
-      return false unless len_r + len_s + 7 == s.size #Verify that the length of the signature matches the sum of the length of the elements.
+      return false unless len_r + len_s + (data_sig ? 6 : 7) == s.size #Verify that the length of the signature matches the sum of the length of the elements.
 
       return false unless s[2] == 0x02 # Check whether the R element is an integer.
 
@@ -225,14 +224,8 @@ module Tapyrus
     end
 
     # fully validate whether this is a valid public key (more expensive than IsValid())
-    def fully_valid_pubkey?
-      return false unless valid_pubkey?
-      begin
-        point = ECDSA::Format::PointOctetString.decode(pubkey.htb, ECDSA::Group::Secp256k1)
-        ECDSA::Group::Secp256k1.valid_public_key?(point)
-      rescue ECDSA::Format::DecodeError
-        false
-      end
+    def fully_valid_pubkey?(allow_hybrid = false)
+      valid_pubkey? && secp256k1_module.parse_ec_pubkey?(pubkey, allow_hybrid)
     end
 
     private
@@ -291,6 +284,20 @@ module Tapyrus
       sig[3].bth.to_i(16) == 0x20 && sig[4].bth.to_i(16) < 0x80
     end
 
+    # generate ecdsa signature
+    def sign_ecdsa(data, low_r, extra_entropy)
+      sig = secp256k1_module.sign_data(data, priv_key, extra_entropy, algo: :ecdsa)
+      if low_r && !sig_has_low_r?(sig)
+        counter = 1
+        until sig_has_low_r?(sig)
+          extra_entropy = [counter].pack('I*').bth.ljust(64, '0').htb
+          sig = secp256k1_module.sign_data(data, priv_key, extra_entropy,  algo: :ecdsa)
+          counter += 1
+        end
+      end
+      sig
+    end
+
   end
 
 end

data/lib/tapyrus/message.rb

@@ -45,13 +45,13 @@ module Tapyrus
         network: 1 << 0,  # the node is capable of serving the block chain. It is currently set by all Bitcoin Core node, and is unset by SPV clients or other peers that just want network services but don't provide them.
         # getutxo: 1 << 1, # BIP-64. not implemented in Bitcoin Core.
         bloom: 1 << 2,    # the node is capable and willing to handle bloom-filtered connections. Bitcoin Core node used to support this by default, without advertising this bit, but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)
-        witness: 1 << 3,  # the node can be asked for blocks and transactions including witness data.
+        #witness: 1 << 3,  # the node can be asked for blocks and transactions including witness data.
         # xthin: 1 << 4 # support Xtreme Thinblocks. not implemented in Bitcoin Core
     }
 
     # DEFAULT_SERVICE_FLAGS = SERVICE_FLAGS[:network] | SERVICE_FLAGS[:bloom] | SERVICE_FLAGS[:witness]
 
-    DEFAULT_SERVICE_FLAGS = SERVICE_FLAGS[:none] | SERVICE_FLAGS[:witness]
+    DEFAULT_SERVICE_FLAGS = SERVICE_FLAGS[:none]
 
     DEFAULT_STOP_HASH = "00"*32
 

data/lib/tapyrus/message/base.rb

@@ -3,6 +3,7 @@ module Tapyrus
 
     # Base message class
     class Base
+      include Tapyrus::HexConverter
       include Tapyrus::Util
       extend Tapyrus::Util
 

data/lib/tapyrus/message/block.rb

@@ -11,15 +11,15 @@ module Tapyrus
 
       COMMAND = 'block'
 
-      def initialize(header, transactions = [], use_segwit = false)
+      def initialize(header, transactions = [])
         @header = header
         @transactions = transactions
-        @use_segwit = use_segwit
+        @use_segwit = false
       end
 
       def self.parse_from_payload(payload)
         buf = StringIO.new(payload)
-        header = Tapyrus::BlockHeader.parse_from_payload(buf.read(80))
+        header = Tapyrus::BlockHeader.parse_from_payload(buf)
         transactions = []
         unless buf.eof?
           tx_count = Tapyrus.unpack_var_int_from_io(buf)
@@ -32,7 +32,7 @@ module Tapyrus
 
       def to_payload
         header.to_payload << Tapyrus.pack_var_int(transactions.size) <<
-          transactions.map{|t|use_segwit ? t.to_payload : t.serialize_old_format}.join
+          transactions.map(&:to_payload).join
       end
 
       # generate Tapyrus::Block object.

data/lib/tapyrus/message/cmpct_block.rb

@@ -1,7 +1,7 @@
 module Tapyrus
   module Message
 
-    # cmpctblock message
+    # cmpctblock message. support only version 1.
     # https://github.com/bitcoin/bips/blob/master/bip-0152.mediawiki
     class CmpctBlock < Base
 
@@ -15,14 +15,12 @@ module Tapyrus
 
       # generate CmpctBlock from Block data.
       # @param [Tapyrus::Block] block the block to generate CmpctBlock.
-      # @param [Integer] version Compact Block version specified by sendcmpct message.
       # @param [Integer] nonce
       # @return [Tapyrus::Message::CmpctBlock]
-      def self.from_block(block, version, nonce = SecureRandom.hex(8).to_i(16))
-        raise 'Unsupported version.' unless [1, 2].include?(version)
+      def self.from_block(block, nonce = SecureRandom.hex(8).to_i(16))
         h = HeaderAndShortIDs.new(block.header, nonce)
         block.transactions[1..-1].each do |tx|
-          h.short_ids << h.short_id(version == 1 ? tx.txid : tx.wtxid)
+          h.short_ids << h.short_id(tx.txid)
         end
         h.prefilled_txn << PrefilledTx.new(0, block.transactions.first)
         self.new(h)

data/lib/tapyrus/message/header_and_short_ids.rb

@@ -21,7 +21,7 @@ module Tapyrus
 
       def self.parse_from_payload(payload)
         buf = StringIO.new(payload)
-        header = Tapyrus::BlockHeader.parse_from_payload(buf.read(80))
+        header = Tapyrus::BlockHeader.parse_from_payload(buf)
         nonce = buf.read(8).unpack('q*').first
         short_ids_len = Tapyrus.unpack_var_int_from_io(buf)
         short_ids = short_ids_len.times.map do

data/lib/tapyrus/message/headers.rb

@@ -19,7 +19,7 @@ module Tapyrus
         header_count = Tapyrus.unpack_var_int_from_io(buf)
         h = new
         header_count.times do
-          h.headers << Tapyrus::BlockHeader.parse_from_payload(buf.read(80))
+          h.headers << Tapyrus::BlockHeader.parse_from_payload(buf)
           buf.read(1) # read tx count 0x00 (headers message doesn't include any tx.)
         end
         h

data/lib/tapyrus/message/merkle_block.rb

@@ -19,7 +19,7 @@ module Tapyrus
       def self.parse_from_payload(payload)
         m = new
         buf = StringIO.new(payload)
-        m.header = Tapyrus::BlockHeader.parse_from_payload(buf.read(80))
+        m.header = Tapyrus::BlockHeader.parse_from_payload(buf)
         m.tx_count = buf.read(4).unpack('V').first
         hash_count = Tapyrus.unpack_var_int_from_io(buf)
         hash_count.times do

data/lib/tapyrus/message/tx.rb

@@ -17,11 +17,11 @@ module Tapyrus
 
       def self.parse_from_payload(payload)
         tx = Tapyrus::Tx.parse_from_payload(payload)
-        new(tx, tx.witness?)
+        new(tx)
       end
 
       def to_payload
-        use_segwit ? tx.to_payload : tx.serialize_old_format
+        tx.to_payload
       end
 
     end

data/lib/tapyrus/network/peer.rb

@@ -99,21 +99,7 @@ module Tapyrus
 
       # broadcast tx.
       def broadcast_tx(tx)
-        conn.send_message(Tapyrus::Message::Tx.new(tx, support_witness?))
-      end
-
-      # check the remote peer support witness.
-      def support_witness?
-        return false unless remote_version
-        remote_version.services & Tapyrus::Message::SERVICE_FLAGS[:witness] > 0
-      end
-
-      # check the remote peer supports compact block.
-      def support_cmpct?
-        return false if remote_version.version < Tapyrus::Message::VERSION[:compact]
-        return true unless local_version.services & Tapyrus::Message::SERVICE_FLAGS[:witness] > 0
-        return false unless support_witness?
-        remote_version.version >= Tapyrus::Message::VERSION[:compact_witness]
+        conn.send_message(Tapyrus::Message::Tx.new(tx))
       end
 
       # get peer's block type.

data/lib/tapyrus/node/cli.rb

@@ -1,4 +1,4 @@
-require 'rest-client'
+require 'net/http'
 require 'thor'
 require 'json'
 
@@ -7,7 +7,7 @@ module Tapyrus
 
     class CLI < Thor
 
-      class_option :network, aliases: '-n', default: :mainnet
+      class_option :network, aliases: '-n', default: :prod
 
       desc 'getblockchaininfo', 'Returns an object containing various state info regarding blockchain processing.'
       def getblockchaininfo
@@ -92,15 +92,19 @@ module Tapyrus
             :id => 'jsonrpc'
         }
         begin
-          RestClient::Request.execute(method: :post, url: config.server_url, payload: data.to_json,
-                                      headers: {content_type: :json}) do |response, request, result|
-            return false if !result.kind_of?(Net::HTTPSuccess) && response.empty?
-            begin
-              json = JSON.parse(response.to_str)
-              puts JSON.pretty_generate(json)
-            rescue Exception
-              puts response.to_str
-            end
+          uri = URI.parse(config.server_url)
+          http = Net::HTTP.new(uri.hostname, uri.port)
+          http.use_ssl = uri.scheme === "https"
+          request = Net::HTTP::Post.new('/')
+          request.content_type = 'application/json'
+          request.body = data.to_json
+          response = http.request(request)
+          body = response.body
+          begin
+            json = JSON.parse(body.to_str)
+            puts JSON.pretty_generate(json)
+          rescue Exception
+            puts body.to_str
           end
         rescue Exception => e
           puts e.message

data/lib/tapyrus/node/configuration.rb

@@ -8,7 +8,7 @@ module Tapyrus
 
       def initialize(opts = {})
         # TODO apply configuration file.
-        opts[:network] = :mainnet unless opts[:network]
+        opts[:network] = :prod unless opts[:network]
         opts[:relay] = false unless opts[:relay]
         Tapyrus.chain_params = opts[:network]
 

data/lib/tapyrus/node/spv.rb

@@ -45,7 +45,7 @@ module Tapyrus
       # broadcast a transaction
       def broadcast(tx)
         pool.broadcast(tx)
-        logger.debug "broadcast tx: #{tx.to_payload.bth}"
+        logger.debug "broadcast tx: #{tx.to_hex}"
       end
 
       # add filter element to bloom filter.

data/lib/tapyrus/opcodes.rb

@@ -141,6 +141,11 @@ module Tapyrus
     OP_PUBKEY = 0xfe
     OP_INVALIDOPCODE = 0xff
 
+    # tapyrus extension
+    OP_CHECKDATASIG = 0xba
+    OP_CHECKDATASIGVERIFY = 0xbb
+    OP_COLOR = 0xbc
+
     DUPLICATE_KEY = [:OP_NOP2, :OP_NOP3]
     OPCODES_MAP = Hash[*(constants.grep(/^OP_/) - [:OP_NOP2, :OP_NOP3, :OP_CHECKLOCKTIMEVERIFY, :OP_CHECKSEQUENCEVERIFY]).map { |c| [const_get(c), c.to_s] }.flatten]
     NAME_MAP = Hash[*constants.grep(/^OP_/).map { |c| [c.to_s, const_get(c)] }.flatten]

data/lib/tapyrus/out_point.rb

@@ -19,7 +19,7 @@ module Tapyrus
     end
 
     def coinbase?
-      tx_hash == COINBASE_HASH && index == COINBASE_INDEX
+      tx_hash == COINBASE_HASH
     end
 
     def to_payload

data/lib/tapyrus/rpc/request_handler.rb

@@ -11,7 +11,6 @@ module Tapyrus
         best_block = node.chain.latest_block
         h[:headers] = best_block.height
         h[:bestblockhash] = best_block.header.block_id
-        h[:chainwork] = best_block.header.work
         h[:mediantime] = node.chain.mtp(best_block.block_hash)
         h
       end
@@ -31,18 +30,20 @@ module Tapyrus
           {
               hash: block_id,
               height: entry.height,
-              version: entry.header.version,
-              versionHex: entry.header.version.to_even_length_hex,
+              features: entry.header.features,
+              featuresHex: entry.header.features.to_even_length_hex.ljust(8, '0'),
               merkleroot: entry.header.merkle_root.rhex,
+              immutablemerkleroot: entry.header.im_merkle_root.rhex,
               time: entry.header.time,
               mediantime: node.chain.mtp(block_hash),
-              nonce: entry.header.nonce,
-              bits: entry.header.bits.to_even_length_hex,
+              xfield_type: entry.header.x_field_type,
+              xfield: entry.header.x_field,
+              proof: entry.header.proof,
               previousblockhash: entry.prev_hash.rhex,
               nextblockhash: node.chain.next_hash(block_hash).rhex
           }
         else
-          entry.header.to_payload.bth
+          entry.header.to_hex
         end
       end
 

data/lib/tapyrus/rpc/tapyrus_core_client.rb

@@ -1,15 +1,16 @@
-require 'rest-client'
+require 'net/http'
+require 'json/pure'
 
 module Tapyrus
   module RPC
 
-    # Client implementation for RPC to Bitcoin Core.
+    # Client implementation for RPC to Tapyrus Core.
     #
     # [Usage]
     # config = {schema: 'http', host: 'localhost', port: 18332, user: 'xxx', password: 'yyy'}
-    # client = Tapyrus::RPC::BitcoinCoreClient.new(config)
+    # client = Tapyrus::RPC::TapyrusCoreClient.new(config)
     #
-    # You can execute the CLI command supported by Bitcoin Core as follows:
+    # You can execute the CLI command supported by Tapyrus Core as follows:
     #
     # client.listunspent
     # client.getblockchaininfo
@@ -53,17 +54,18 @@ module Tapyrus
             :params => params,
             :id => 'jsonrpc'
         }
-        post(server_url, @config[:timeout], @config[:open_timeout], data.to_json, content_type: :json) do |respdata, request, result|
-          raise result.message if !result.kind_of?(Net::HTTPSuccess) && respdata.empty?
-          response = JSON.parse(respdata.gsub(/\\u([\da-fA-F]{4})/) { [$1].pack('H*').unpack('n*').pack('U*').encode('ISO-8859-1').force_encoding('UTF-8') })
-          raise response['error'] if response['error']
-          response['result']
-        end
-      end
-
-      def post(url, timeout, open_timeout, payload, headers={}, &block)
-        RestClient::Request.execute(method: :post, url: url, timeout: timeout,
-                                    open_timeout: open_timeout, payload: payload, headers: headers, &block)
+        uri = URI.parse(server_url)
+        http = Net::HTTP.new(uri.hostname, uri.port)
+        http.use_ssl = uri.scheme === "https"
+        request = Net::HTTP::Post.new(uri.path.empty? ? '/' : uri.path)
+        request.basic_auth(uri.user, uri.password)
+        request.content_type = 'application/json'
+        request.body = data.to_json
+        response = http.request(request)
+        body = response.body
+        response = Tapyrus::Ext::JsonParser.new(body.gsub(/\\u([\da-fA-F]{4})/) { [$1].pack('H*').unpack('n*').pack('U*').encode('ISO-8859-1').force_encoding('UTF-8') }).parse
+        raise response['error'].to_json if response['error']
+        response['result']
       end
 
     end