tapyrus 0.2.1 → 0.2.6

data/lib/tapyrus/key.rb

@@ -30,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
@@ -41,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
@@ -65,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]
@@ -95,10 +96,13 @@ module Tapyrus
     # @return [String] signature data with binary format
     def sign(data, low_r = true, extra_entropy = nil, algo: :ecdsa)
       raise ArgumentError, "Unsupported algorithm has been specified." unless SIG_ALGO.include?(algo)
-      if algo == :ecdsa
+      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
-        sign_schnorr(data)
+        false
       end
     end
 
@@ -111,11 +115,8 @@ module Tapyrus
       return false unless valid_pubkey?
       begin
         raise ArgumentError, "Unsupported algorithm has been specified." unless SIG_ALGO.include?(algo)
-        if algo == :ecdsa
-          verify_ecdsa_sig(sig, origin)
-        else
-          verify_schnorr_sig(sig, origin)
-        end
+        sig = ecdsa_signature_parse_der_lax(sig) if algo == :ecdsa
+        secp256k1_module.verify_sig(origin, sig, pubkey, algo: algo)
       rescue Exception
         false
       end
@@ -223,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,34 +286,18 @@ module Tapyrus
 
     # generate ecdsa signature
     def sign_ecdsa(data, low_r, extra_entropy)
-      sig = secp256k1_module.sign_data(data, priv_key, 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)
+          sig = secp256k1_module.sign_data(data, priv_key, extra_entropy,  algo: :ecdsa)
           counter += 1
         end
       end
       sig
     end
 
-    # generate schnorr signature
-    def sign_schnorr(msg)
-      Schnorr.sign(msg, priv_key.to_i(16)).encode
-    end
-
-    # verify ecdsa signature
-    def verify_ecdsa_sig(sig, message)
-      sig = ecdsa_signature_parse_der_lax(sig)
-      secp256k1_module.verify_sig(message, sig, pubkey)
-    end
-
-    # verify schnorr signature
-    def verify_schnorr_sig(sig, message)
-      Schnorr.valid_sig?(message, sig, pubkey.htb)
-    end
-
   end
 
 end

data/lib/tapyrus/message/block.rb

@@ -19,7 +19,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)
         transactions = []
         unless buf.eof?
           tx_count = Tapyrus.unpack_var_int_from_io(buf)

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/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
@@ -32,12 +31,14 @@ module Tapyrus
               hash: block_id,
               height: entry.height,
               features: entry.header.features,
-              featuresHex: entry.header.features.to_even_length_hex,
+              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
           }

data/lib/tapyrus/rpc/tapyrus_core_client.rb

@@ -64,7 +64,7 @@ module Tapyrus
         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_s if response['error']
+        raise response['error'].to_json if response['error']
         response['result']
       end
 

data/lib/tapyrus/script/color.rb

@@ -43,6 +43,14 @@ module Tapyrus
         true
       end
 
+      def hash
+        to_payload.hash
+      end
+
+      def eql?(other)
+        to_payload.eql?(other.to_payload)
+      end
+
       private
 
       def initialize(type, payload)
@@ -53,11 +61,11 @@ module Tapyrus
 
     module ColoredOutput
       def colored?
-        script_pubkey.cp2pkh? || script_pubkey.cp2sh?
+        script_pubkey.colored?
       end
 
       def color_id
-        @color_id ||= ColorIdentifier.parse_from_payload(script_pubkey.chunks[0].pushed_data)
+        @color_id ||= script_pubkey.color_id
       end
 
       def reissuable?

data/lib/tapyrus/script/script.rb

@@ -75,6 +75,18 @@ module Tapyrus
       end
     end
 
+    # Remove color identifier from cp2pkh or cp2sh
+    # @param [ColorIdentifier] color identifier
+    # @return [Script] P2PKH or P2SH script
+    # @raise [RuntimeError] if script is neither cp2pkh nor cp2sh
+    def remove_color
+      raise RuntimeError, 'Only cp2pkh and cp2sh can remove color' unless cp2pkh? or cp2sh?
+
+      Tapyrus::Script.new.tap do |s|
+        s.chunks = self.chunks[2..-1]
+      end
+    end
+
     def get_multisig_pubkeys
       num = Tapyrus::Opcodes.opcode_to_small_int(chunks[-2].bth.to_i(16))
       (1..num).map{ |i| chunks[i].pushed_data }
@@ -214,6 +226,8 @@ module Tapyrus
           (chunks.size == 1 || chunks[1].opcode <= OP_16)
     end
 
+    # Return whether this script is a CP2PKH format script or not.
+    # @return [Boolean] true if this script is cp2pkh, otherwise false.
     def cp2pkh?
       return false unless chunks.size == 7
       return false unless chunks[0].bytesize == 34
@@ -223,6 +237,8 @@ module Tapyrus
           (chunks[2..3]+ chunks[5..6]).map(&:ord) && chunks[4].bytesize == 21
     end
 
+    # Return whether this script is a CP2SH format script or not.
+    # @return [Boolean] true if this script is cp2pkh, otherwise false.
     def cp2sh?
       return false unless chunks.size == 5
       return false unless chunks[0].bytesize == 34
@@ -230,6 +246,20 @@ module Tapyrus
       return false unless chunks[1].ord == OP_COLOR
       OP_HASH160 == chunks[2].ord && OP_EQUAL == chunks[4].ord && chunks[3].bytesize == 21
     end
+  
+    # Return whether this script represents colored coin.
+    # @return [Boolean] true if this script is colored, otherwise false.
+    def colored?
+      cp2pkh? || cp2sh?
+    end
+
+    # Return color identifier for this script.
+    # @return [ColorIdentifer] color identifier for this script if this script is colored. return nil if this script is not colored.
+    def color_id
+      return nil unless colored?
+
+      Tapyrus::Color::ColorIdentifier.parse_from_payload(chunks[0].pushed_data)
+    end
 
     def op_return_data
       return nil unless op_return?

data/lib/tapyrus/script/tx_checker.rb

@@ -32,12 +32,16 @@ module Tapyrus
     # @param [String] pubkey a public key with hex format.
     # @param [String] digest a message digest with binary format to be verified.
     # @return [Boolean] if check is passed return true, otherwise false.
-    def verify_sig(sig, pubkey, digest)
+    def verify_sig(sig, pubkey, digest, allow_hybrid: false)
       key_type = pubkey.start_with?('02') || pubkey.start_with?('03') ? Key::TYPES[:compressed] : Key::TYPES[:uncompressed]
       sig = sig.htb
       algo = sig.bytesize == 64 ? :schnorr : :ecdsa
-      key = Key.new(pubkey: pubkey, key_type: key_type)
-      key.verify(sig, digest, algo: algo)
+      begin
+        key = Key.new(pubkey: pubkey, key_type: key_type, allow_hybrid: allow_hybrid)
+        key.verify(sig, digest, algo: algo)
+      rescue Exception
+        false
+      end
     end
 
     def check_locktime(locktime)

data/lib/tapyrus/secp256k1/native.rb

@@ -4,8 +4,8 @@
 module Tapyrus
   module Secp256k1
 
-    # binding for secp256k1 (https://github.com/bitcoin/bitcoin/tree/v0.14.2/src/secp256k1)
-    # tag: v0.14.2
+    # binding for secp256k1 (https://github.com/chaintope/tapyrus-core/tree/v0.4.0/src/secp256k1)
+    # tag: v0.4.0
     # this is not included by default, to enable set shared object path to ENV['SECP256K1_LIB_PATH']
     # for linux, ENV['SECP256K1_LIB_PATH'] = '/usr/local/lib/libsecp256k1.so'
     # for mac,
@@ -50,6 +50,8 @@ module Tapyrus
         attach_function(:secp256k1_ecdsa_signature_parse_der, [:pointer, :pointer, :pointer, :size_t], :int)
         attach_function(:secp256k1_ecdsa_signature_normalize, [:pointer, :pointer, :pointer], :int)
         attach_function(:secp256k1_ecdsa_verify, [:pointer, :pointer, :pointer, :pointer], :int)
+        attach_function(:secp256k1_schnorr_sign, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :int)
+        attach_function(:secp256k1_schnorr_verify, [:pointer, :pointer, :pointer, :pointer], :int)
       end
 
       def with_context(flags: (SECP256K1_CONTEXT_VERIFY | SECP256K1_CONTEXT_SIGN))
@@ -100,7 +102,68 @@ module Tapyrus
       # @param [String] privkey a private key using sign
       # @param [String] extra_entropy a extra entropy for rfc6979
       # @return [String] signature data with binary format
-      def sign_data(data, privkey, extra_entropy)
+      def sign_data(data, privkey, extra_entropy, algo: :ecdsa)
+        case algo
+        when :ecdsa
+          sign_ecdsa(data, privkey, extra_entropy)
+        when :schnorr
+          sign_schnorr(data, privkey)
+        else
+          nil
+        end
+      end
+
+      # verify signature.
+      # @param[String] data a data.
+      # @param [String] sig signature data with binary format
+      # @param [String] pub_key a public key using verify.
+      def verify_sig(data, sig, pub_key, algo: :ecdsa)
+        case algo
+        when :ecdsa
+          verify_ecdsa(data, sig, pub_key)
+        when :schnorr
+          verify_schnorr(data, sig, pub_key)
+        else
+          false
+        end
+      end
+
+      # # validate whether this is a valid public key (more expensive than IsValid())
+      # @param [String] pub_key public key with hex format.
+      # @param [Boolean] allow_hybrid whether support hybrid public key.
+      # @return [Boolean] If valid public key return true, otherwise false.
+      def parse_ec_pubkey?(pub_key, allow_hybrid = false)
+        pub_key = pub_key.htb
+        return false if !allow_hybrid && ![0x02, 0x03, 0x04].include?(pub_key[0].ord)
+        with_context do |context|
+          pubkey = FFI::MemoryPointer.new(:uchar, pub_key.bytesize).put_bytes(0, pub_key)
+          internal_pubkey = FFI::MemoryPointer.new(:uchar, 64)
+          result = secp256k1_ec_pubkey_parse(context, internal_pubkey, pubkey, pub_key.bytesize)
+          result == 1
+        end
+      end
+
+      private
+
+      def generate_pubkey_in_context(context, privkey, compressed: true)
+        internal_pubkey = FFI::MemoryPointer.new(:uchar, 64)
+        result = secp256k1_ec_pubkey_create(context, internal_pubkey, privkey.htb)
+        raise 'error creating pubkey' unless result
+
+        pubkey = FFI::MemoryPointer.new(:uchar, 65)
+        pubkey_len = FFI::MemoryPointer.new(:uint64)
+        result = if compressed
+                   pubkey_len.put_uint64(0, 33)
+                   secp256k1_ec_pubkey_serialize(context, pubkey, pubkey_len, internal_pubkey, SECP256K1_EC_COMPRESSED)
+                 else
+                   pubkey_len.put_uint64(0, 65)
+                   secp256k1_ec_pubkey_serialize(context, pubkey, pubkey_len, internal_pubkey, SECP256K1_EC_UNCOMPRESSED)
+                 end
+        raise 'error serialize pubkey' unless result || pubkey_len.read_uint64 > 0
+        pubkey.read_string(pubkey_len.read_uint64).bth
+      end
+
+      def sign_ecdsa(data, privkey, extra_entropy)
         with_context do |context|
           secret = FFI::MemoryPointer.new(:uchar, privkey.htb.bytesize).put_bytes(0, privkey.htb)
           raise 'priv_key invalid' unless secp256k1_ec_seckey_verify(context, secret)
@@ -126,7 +189,19 @@ module Tapyrus
         end
       end
 
-      def verify_sig(data, sig, pub_key)
+      def sign_schnorr(data, privkey)
+        with_context do |context|
+          secret = FFI::MemoryPointer.new(:uchar, privkey.htb.bytesize).put_bytes(0, privkey.htb)
+          raise 'priv_key invalid' unless secp256k1_ec_seckey_verify(context, secret)
+
+          signature = FFI::MemoryPointer.new(:uchar, 64)
+          msg32 = FFI::MemoryPointer.new(:uchar, 32).put_bytes(0, data)
+          raise 'Failed to generate schnorr signature.' unless secp256k1_schnorr_sign(context, signature, msg32, secret, nil, nil) == 1
+          signature.read_string(64)
+        end
+      end
+
+      def verify_ecdsa(data, sig, pub_key)
         with_context do |context|
           return false if data.bytesize == 0
 
@@ -150,25 +225,23 @@ module Tapyrus
         end
       end
 
-      private
+      def verify_schnorr(data, sig, pub_key)
+        with_context do |context|
+          return false if data.bytesize == 0
+          pubkey = FFI::MemoryPointer.new(:uchar, pub_key.htb.bytesize).put_bytes(0, pub_key.htb)
+          internal_pubkey = FFI::MemoryPointer.new(:uchar, 64)
+          result = secp256k1_ec_pubkey_parse(context, internal_pubkey, pubkey, pubkey.size)
+          return false unless result
 
-      def generate_pubkey_in_context(context, privkey, compressed: true)
-        internal_pubkey = FFI::MemoryPointer.new(:uchar, 64)
-        result = secp256k1_ec_pubkey_create(context, internal_pubkey, privkey.htb)
-        raise 'error creating pubkey' unless result
+          signature = FFI::MemoryPointer.new(:uchar, sig.bytesize).put_bytes(0, sig)
 
-        pubkey = FFI::MemoryPointer.new(:uchar, 65)
-        pubkey_len = FFI::MemoryPointer.new(:uint64)
-        result = if compressed
-                   pubkey_len.put_uint64(0, 33)
-                   secp256k1_ec_pubkey_serialize(context, pubkey, pubkey_len, internal_pubkey, SECP256K1_EC_COMPRESSED)
-                 else
-                   pubkey_len.put_uint64(0, 65)
-                   secp256k1_ec_pubkey_serialize(context, pubkey, pubkey_len, internal_pubkey, SECP256K1_EC_UNCOMPRESSED)
-                 end
-        raise 'error serialize pubkey' unless result || pubkey_len.read_uint64 > 0
-        pubkey.read_string(pubkey_len.read_uint64).bth
+          msg32 = FFI::MemoryPointer.new(:uchar, 32).put_bytes(0, data)
+          result = secp256k1_schnorr_verify(context, signature, msg32, internal_pubkey)
+
+          result == 1
+        end
       end
+
     end
   end
 end

data/lib/tapyrus/secp256k1/ruby.rb

@@ -12,8 +12,8 @@ module Tapyrus
         private_key = 1 + SecureRandom.random_number(GROUP.order - 1)
         public_key = GROUP.generator.multiply_by_scalar(private_key)
         privkey = ECDSA::Format::IntegerOctetString.encode(private_key, 32)
-        pubkey = ECDSA::Format::PointOctetString.encode(public_key, compression: compressed)
-        [privkey.bth, pubkey.bth]
+        pubkey = public_key.to_hex(compressed)
+        [privkey.bth, pubkey]
       end
 
       # generate tapyrus key object
@@ -24,14 +24,71 @@ module Tapyrus
 
       def generate_pubkey(privkey, compressed: true)
         public_key = ECDSA::Group::Secp256k1.generator.multiply_by_scalar(privkey.to_i(16))
-        ECDSA::Format::PointOctetString.encode(public_key, compression: compressed).bth
+        public_key.to_hex(compressed)
       end
 
       # sign data.
       # @param [String] data a data to be signed with binary format
       # @param [String] privkey a private key using sign
       # @return [String] signature data with binary format
-      def sign_data(data, privkey, extra_entropy)
+      def sign_data(data, privkey, extra_entropy, algo: :ecdsa)
+        case algo
+        when :ecdsa
+          sign_ecdsa(data, privkey, extra_entropy)
+        when :schnorr
+          Schnorr.sign(data, privkey.to_i(16)).encode
+        else
+          nil
+        end
+      end
+
+      # verify signature using public key
+      # @param [String] digest a SHA-256 message digest with binary format
+      # @param [String] sig a signature for +data+ with binary format
+      # @param [String] pubkey a public key corresponding to the private key used for sign
+      # @return [Boolean] verify result
+      def verify_sig(digest, sig, pubkey, algo: :ecdsa)
+        case algo
+        when :ecdsa
+          verify_ecdsa(digest, sig, pubkey)
+        when :schnorr
+          Schnorr.valid_sig?(digest, sig, pubkey.htb)
+        else
+          false
+        end
+      end
+
+      alias :valid_sig? :verify_sig
+
+      module_function :valid_sig?
+
+      # validate whether this is a valid public key (more expensive than IsValid())
+      # @param [String] pubkey public key with hex format.
+      # @param [Boolean] allow_hybrid whether support hybrid public key.
+      # @return [Boolean] If valid public key return true, otherwise false.
+      def parse_ec_pubkey?(pubkey, allow_hybrid = false)
+        begin
+          point = ECDSA::Format::PointOctetString.decode(pubkey.htb, ECDSA::Group::Secp256k1, allow_hybrid: allow_hybrid)
+          ECDSA::Group::Secp256k1.valid_public_key?(point)
+        rescue ECDSA::Format::DecodeError
+          false
+        end
+      end
+
+      # if +pubkey+ is hybrid public key format, it convert uncompressed format.
+      # https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2012-June/001578.html
+      def repack_pubkey(pubkey)
+        p = pubkey.htb
+        case p[0]
+          when "\x06", "\x07"
+            p[0] = "\x04"
+            p
+          else
+            pubkey.htb
+        end
+      end
+
+      def sign_ecdsa(data, privkey, extra_entropy)
         privkey = privkey.htb
         private_key = ECDSA::Format::IntegerOctetString.decode(privkey)
         extra_entropy ||= ''
@@ -59,12 +116,7 @@ module Tapyrus
         signature
       end
 
-      # verify signature using public key
-      # @param [String] digest a SHA-256 message digest with binary format
-      # @param [String] sig a signature for +data+ with binary format
-      # @param [String] pubkey a public key corresponding to the private key used for sign
-      # @return [Boolean] verify result
-      def verify_sig(digest, sig, pubkey)
+      def verify_ecdsa(digest, sig, pubkey)
         begin
           k = ECDSA::Format::PointOctetString.decode(repack_pubkey(pubkey), GROUP)
           signature = ECDSA::Format::SignatureDerString.decode(sig)
@@ -74,23 +126,6 @@ module Tapyrus
         end
       end
 
-      alias :valid_sig? :verify_sig
-
-      module_function :valid_sig?
-
-      # if +pubkey+ is hybrid public key format, it convert uncompressed format.
-      # https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2012-June/001578.html
-      def repack_pubkey(pubkey)
-        p = pubkey.htb
-        case p[0]
-          when "\x06", "\x07"
-            p[0] = "\x04"
-            p
-          else
-            pubkey.htb
-        end
-      end
-
     end
 
   end