tapyrus 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0742065204db9e10454dbdc9afc4401be70659e9998376d944b4e0f61a75cf27
-  data.tar.gz: 578bd756abb67374d62951526638c9328c3f9e70f9925cd7e3f16f079093843b
+  metadata.gz: a1abedf80b636e2bfd80db4617ca9f92e703148f07e59c08b14860c13ac57689
+  data.tar.gz: 21b478051eb01354e410475e15761f24773fe164fcd9abf3307acb231b5c8ae3
 SHA512:
-  metadata.gz: 584cf7b8ce40aeb94ecce56c393ab52805b5af76bf91439f5f1b39cf28ce15a723bc2b37862773e5c1cd994cb6d72f270b4f77c828708384e9fe70990efbd19c
-  data.tar.gz: cdc17bfad7962a3900ad567c07d0d53550f0db4eacf8b10c80e76017206aeed702c336fee9a7283502ae3ebdcf68de6da45e90a22ea0044e22e80839fa6cd43d
+  metadata.gz: 61c8cc2439074666abffc6ff85ffaa40811e8e0992edb19846876dabf9a300f4822af522a6f621271f310a9b1ea3f9429f30e86452d29b0f2216052568a72a6a
+  data.tar.gz: f3845015c030c7ccf915700eb45ac2f743c3f0c19dbe077c72c4afe19327252d1f3a64ffb29c1f5790997c8f6f2317930ab5ae99a894687a86f6381154c5429d

data/lib/schnorr.rb

@@ -76,7 +76,7 @@ module Schnorr
   # @return (Integer) digest e.
   def create_challenge(x, p, message)
     r_x = ECDSA::Format::IntegerOctetString.encode(x, GROUP.byte_length)
-    p_str= ECDSA::Format::PointOctetString.encode(p, compression:true)
+    p_str= p.to_hex.htb
     (ECDSA.normalize_digest(Digest::SHA256.digest(r_x + p_str + message), GROUP.bit_length)) % GROUP.order
   end
 

data/lib/tapyrus.rb

@@ -48,8 +48,10 @@ module Tapyrus
   autoload :KeyPath, 'tapyrus/key_path'
   autoload :SLIP39, 'tapyrus/slip39'
   autoload :Color, 'tapyrus/script/color'
+  autoload :Errors, 'tapyrus/errors'
 
   require_relative 'tapyrus/constants'
+  require_relative 'tapyrus/ext/ecdsa'
 
   extend Util
 
@@ -207,11 +209,4 @@ module Tapyrus
     end
   end
 
-  class ::ECDSA::Signature
-    # convert signature to der string.
-    def to_der
-      ECDSA::Format::SignatureDerString.encode(self)
-    end
-  end
-
 end

data/lib/tapyrus/block.rb

@@ -1,5 +1,6 @@
 module Tapyrus
   class Block
+    include Tapyrus::Util
 
     attr_accessor :header
     attr_accessor :transactions
@@ -32,14 +33,9 @@ module Tapyrus
     end
 
     # return this block height. block height is included in coinbase.
-    # if block version under 1, height does not include in coinbase, so return nil.
+    # @return [Integer] block height.
     def height
-      return nil if header.features < 2
-      coinbase_tx = transactions[0]
-      return nil unless coinbase_tx.coinbase_tx?
-      buf = StringIO.new(coinbase_tx.inputs[0].script_sig.to_payload)
-      len = Tapyrus.unpack_var_int_from_io(buf)
-      buf.read(len).reverse.bth.to_i(16)
+      transactions.first.in.first.out_point.index
     end
 
   end

data/lib/tapyrus/block_header.rb

@@ -3,61 +3,69 @@ module Tapyrus
   # Block Header
   class BlockHeader
     include Tapyrus::HexConverter
+    extend Tapyrus::Util
+    include Tapyrus::Util
+
+    X_FILED_TYPES = {none: 0, aggregate_pubkey: 1}
 
     attr_accessor :features
     attr_accessor :prev_hash
     attr_accessor :merkle_root
-    attr_accessor :time # unix timestamp
-    attr_accessor :bits
-    attr_accessor :nonce
+    attr_accessor :im_merkle_root # merkel root of immulable merkle tree which consist of immutable txid.
+    attr_accessor :time           # unix timestamp
+    attr_accessor :x_field_type
+    attr_accessor :x_field
+    attr_accessor :proof
 
-    def initialize(features, prev_hash, merkle_root, time, bits, nonce)
+    def initialize(features, prev_hash, merkle_root, im_merkle_root, time, x_field_type, x_field, proof = nil)
       @features = features
       @prev_hash = prev_hash
       @merkle_root = merkle_root
+      @im_merkle_root = im_merkle_root
       @time = time
-      @bits = bits
-      @nonce = nonce
+      @x_field_type = x_field_type
+      @x_field = x_field
+      @proof = proof
     end
 
     def self.parse_from_payload(payload)
-      features, prev_hash, merkle_root, time, bits, nonce = payload.unpack('Va32a32VVV')
-      new(features, prev_hash.bth, merkle_root.bth, time, bits, nonce)
-    end
-
-    def to_payload
-      [features, prev_hash.htb, merkle_root.htb, time, bits, nonce].pack('Va32a32VVV')
+      buf = payload.is_a?(String) ? StringIO.new(payload) : payload
+      features, prev_hash, merkle_root, im_merkle_root, time, x_filed_type = buf.read(105).unpack('Va32a32a32Vc')
+      x_field = buf.read(unpack_var_int_from_io(buf)) unless x_filed_type == X_FILED_TYPES[:none]
+      proof = buf.read(unpack_var_int_from_io(buf))
+      new(features, prev_hash.bth, merkle_root.bth, im_merkle_root.bth, time, x_filed_type, x_field ? x_field.bth : x_field, proof.bth)
     end
 
-    # compute difficulty target from bits.
-    def difficulty_target
-      exponent = ((bits >> 24) & 0xff)
-      mantissa = bits & 0x7fffff
-      mantissa *= -1 if (bits & 0x800000) > 0
-      (mantissa * 2 ** (8 * (exponent - 3)))
+    def to_payload(skip_proof = false)
+      payload = [features, prev_hash.htb, merkle_root.htb, im_merkle_root.htb, time, x_field_type].pack('Va32a32a32Vc')
+      payload << pack_var_string(x_field.htb) unless x_field_type == X_FILED_TYPES[:none]
+      payload << pack_var_string(proof.htb) if proof && !skip_proof
+      payload
     end
 
-    def hash
-      calc_hash.to_i(16)
+    # Calculate hash using sign which does not contains proof.
+    # @return [String] hash of block without proof.
+    def hash_for_sign
+      Tapyrus.double_sha256(to_payload(true)).bth
     end
 
+    # Calculate block hash
+    # @return [String] hash of block with hex format.
     def block_hash
-      calc_hash
+      Tapyrus.double_sha256(to_payload).bth
     end
 
     # block hash(big endian)
+    # @return [String] block id which is reversed version of block hash.
     def block_id
       block_hash.rhex
     end
 
     # evaluate block header
-    def valid?
-      valid_pow? && valid_timestamp?
-    end
-
-    # evaluate valid proof of work.
-    def valid_pow?
-      block_id.hex < difficulty_target
+    # @param [String] agg_pubkey aggregated public key for signers with hex format.
+    # @return [Boolean] result.
+    def valid?(agg_pubkey)
+      valid_timestamp? && valid_proof?(agg_pubkey) && valid_x_field?
     end
 
     # evaluate valid timestamp.
@@ -66,22 +74,42 @@ module Tapyrus
       time <= Time.now.to_i + Tapyrus::MAX_FUTURE_BLOCK_TIME
     end
 
-    # compute chain work of this block.
-    # @return [Integer] a chain work.
-    def work
-      target = difficulty_target
-      return 0 if target < 1
-      115792089237316195423570985008687907853269984665640564039457584007913129639936.div(target + 1) # 115792089237316195423570985008687907853269984665640564039457584007913129639936 is 2**256
+    # Check whether proof is valid.
+    # @param [String] agg_pubkey aggregated public key for signers with hex format.
+    # @return [Boolean] Return true if proof is valid, otherwise return false.
+    def valid_proof?(agg_pubkey)
+      pubkey = Tapyrus::Key.new(pubkey: agg_pubkey)
+      msg = hash_for_sign.htb
+      pubkey.verify(proof.htb, msg, algo: :schnorr)
+    end
+
+    # Check whether x_field is valid.
+    # @return [Boolean] if valid return true, otherwise false
+    def valid_x_field?
+      case x_field_type
+      when X_FILED_TYPES[:none] then
+        x_field.nil?
+      when X_FILED_TYPES[:aggregate_pubkey] then
+        Tapyrus::Key.new(pubkey: x_field).fully_valid_pubkey?
+      else
+        false
+      end
+    end
+
+    # Check this header contains upgrade aggregated publiec key.
+    # @return [Boolean] if contains return true, otherwise false.
+    def upgrade_agg_pubkey?
+      x_field_type == X_FILED_TYPES[:aggregate_pubkey]
     end
 
     def ==(other)
       other && other.to_payload == to_payload
     end
 
-    private
-
-    def calc_hash
-      Tapyrus.double_sha256(to_payload).bth
+    # get bytesize.
+    # @return [Integer] bytesize.
+    def size
+      to_payload.bytesize
     end
 
   end

data/lib/tapyrus/chain_params.rb

@@ -33,12 +33,10 @@ module Tapyrus
     attr_reader :bip34_height
     attr_reader :proof_of_work_limit
     attr_reader :dns_seeds
-    attr_reader :genesis
     attr_reader :bip44_coin_type
 
     attr_accessor :dust_relay_fee
 
-
     # production genesis
     def self.prod
       init('prod')
@@ -57,14 +55,6 @@ module Tapyrus
       network == 'dev'
     end
 
-    def genesis_block
-      header = Tapyrus::BlockHeader.new(
-          genesis['version'], genesis['prev_hash'].rhex, genesis['merkle_root'].rhex,
-          genesis['time'], genesis['bits'], genesis['nonce'])
-      Tapyrus::Block.new(header)
-    end
-
-
     def self.init(name)
       i = YAML.load(File.open("#{__dir__}/chainparams/#{name}.yml"))
       i.dust_relay_fee ||= Tapyrus::DUST_RELAY_TX_FEE

data/lib/tapyrus/chainparams/dev.yml

@@ -25,15 +25,5 @@ retarget_time: 1209600 # 2 weeks
 target_spacing: 600 # block interval
 max_money: 21000000
 bip34_height: 227931
-genesis_hash: "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
-proof_of_work_limit: 0x1d00ffff
 dns_seeds:
-genesis:
-  hash: "000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"
-  merkle_root: "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"
-  time: 1296688602
-  nonce: 414098458
-  bits: 0x1d00ffff
-  version: 1
-  prev_hash: "0000000000000000000000000000000000000000000000000000000000000000"
 bip44_coin_type: 1

data/lib/tapyrus/chainparams/prod.yml

@@ -25,14 +25,5 @@ retarget_time: 1209600 # 2 weeks
 target_spacing: 600 # block interval
 max_money: 21000000
 bip34_height: 227931
-proof_of_work_limit: 0x1d00ffff
 dns_seeds:
-genesis:
-  hash: "000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"
-  merkle_root: "4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"
-  time: 1231006505
-  nonce: 2083236893
-  bits: 0x1d00ffff
-  version: 1
-  prev_hash: "0000000000000000000000000000000000000000000000000000000000000000"
 bip44_coin_type: 0

data/lib/tapyrus/errors.rb

@@ -0,0 +1,17 @@
+module Tapyrus
+  module Errors
+    module Messages
+
+      INVALID_PUBLIC_KEY = 'Invalid public key.'
+      INVALID_BIP32_PRIV_PREFIX = 'Invalid BIP32 private key prefix. prefix must be 0x00.'
+      INVALID_BIP32_FINGERPRINT = 'Invalid parent fingerprint.'
+      INVALID_BIP32_ZERO_INDEX = 'Invalid index. Depth 0 must have 0 index.'
+      INVALID_BIP32_ZERO_DEPTH = 'Invalid depth. Master key must have 0 depth.'
+      INVALID_BIP32_VERSION = 'An unsupported version byte was specified.'
+
+      INVALID_PRIV_KEY = 'Private key is not in range [1..n-1].'
+      INVALID_CHECKSUM = 'Invalid checksum.'
+
+    end
+  end
+end

data/lib/tapyrus/ext/ecdsa.rb

@@ -0,0 +1,39 @@
+class ::ECDSA::Signature
+  # convert signature to der string.
+  def to_der
+    ECDSA::Format::SignatureDerString.encode(self)
+  end
+end
+
+class ::ECDSA::Point
+  def to_hex(compression = true)
+    ECDSA::Format::PointOctetString.encode(self, compression: compression).bth
+  end
+end
+
+module ::ECDSA::Format::PointOctetString
+
+  def self.decode(string, group, allow_hybrid: false)
+    string = string.dup.force_encoding('BINARY')
+
+    raise ECDSA::Format::DecodeError, 'Point octet string is empty.' if string.empty?
+
+    case string[0].ord
+    when 0
+      check_length string, 1
+      return group.infinity
+    when 2
+      decode_compressed string, group, 0
+    when 3
+      decode_compressed string, group, 1
+    when 4
+      decode_uncompressed string, group
+    when 6..7
+      raise DecodeError, 'Unrecognized start byte for point octet string: 0x%x' % string[0].ord unless allow_hybrid
+      decode_uncompressed string, group if allow_hybrid
+    else
+      raise ECDSA::Format::DecodeError, 'Unrecognized start byte for point octet string: 0x%x' % string[0].ord
+    end
+  end
+
+end

data/lib/tapyrus/ext_key.rb

@@ -7,6 +7,9 @@ module Tapyrus
   class ExtKey
     include Tapyrus::HexConverter
 
+    MAX_DEPTH = 255
+    MASTER_FINGERPRINT = '00000000'
+
     attr_accessor :ver
     attr_accessor :depth
     attr_accessor :number
@@ -20,7 +23,7 @@ module Tapyrus
       ext_key = ExtKey.new
       ext_key.depth = ext_key.number = 0
       ext_key.parent_fingerprint = '00000000'
-      l = Tapyrus.hmac_sha512('Bitcoin seed', seed.htb)
+      l = Tapyrus.hmac_sha512('Tapyrus seed', seed.htb)
       left = l[0..31].bth.to_i(16)
       raise 'invalid key' if left >= CURVE_ORDER || left == 0
       ext_key.key = Tapyrus::Key.new(priv_key: l[0..31].bth, key_type: Tapyrus::Key::TYPES[:compressed])
@@ -48,9 +51,7 @@ module Tapyrus
 
     # Base58 encoded extended private key
     def to_base58
-      h = to_hex
-      hex = h + Tapyrus.calc_checksum(h)
-      Base58.encode(hex)
+      ExtPubkey.encode_base58(to_hex)
     end
 
     # get private key(hex)
@@ -141,19 +142,24 @@ module Tapyrus
       buf = StringIO.new(payload)
       ext_key = ExtKey.new
       ext_key.ver = buf.read(4).bth # version
-      raise 'An unsupported version byte was specified.' unless ExtKey.support_version?(ext_key.ver)
+      raise ArgumentError, Errors::Messages::INVALID_BIP32_VERSION unless ExtKey.support_version?(ext_key.ver)
       ext_key.depth = buf.read(1).unpack('C').first
       ext_key.parent_fingerprint = buf.read(4).bth
       ext_key.number = buf.read(4).unpack('N').first
+      if ext_key.depth == 0
+        raise ArgumentError, Errors::Messages::INVALID_BIP32_FINGERPRINT unless ext_key.parent_fingerprint == ExtKey::MASTER_FINGERPRINT
+        raise ArgumentError, Errors::Messages::INVALID_BIP32_ZERO_INDEX if ext_key.number > 0
+      end
+      raise ArgumentError, Errors::Messages:: INVALID_BIP32_ZERO_DEPTH if ext_key.parent_fingerprint == ExtKey::MASTER_FINGERPRINT && ext_key.depth > 0
       ext_key.chain_code = buf.read(32)
-      buf.read(1) # 0x00
+      raise ArgumentError, Errors::Messages::INVALID_BIP32_PRIV_PREFIX unless buf.read(1).bth == '00' # 0x00
       ext_key.key = Tapyrus::Key.new(priv_key: buf.read(32).bth, key_type: Tapyrus::Key::TYPES[:compressed])
       ext_key
     end
 
     # import private key from Base58 private key address
     def self.from_base58(address)
-      ExtKey.parse_from_payload(Base58.decode(address).htb)
+      ExtKey.parse_from_payload(ExtPubkey.validate_checksum(address))
     end
 
     # get version bytes from purpose' value.
@@ -237,9 +243,14 @@ module Tapyrus
 
     # Base58 encoded extended pubkey
     def to_base58
-      h = to_hex
-      hex = h + Tapyrus.calc_checksum(h)
-      Base58.encode(hex)
+      ExtPubkey.encode_base58(to_hex)
+    end
+
+    # Generate Base58 encoded key from BIP32 payload with hex format.
+    # @param [String] hex BIP32 payload with hex format.
+    # @return [String] Base58 encoded extended key.
+    def self.encode_base58(hex)
+      Base58.encode(hex + Tapyrus.calc_checksum(hex))
     end
 
     # whether hardened key.
@@ -260,7 +271,7 @@ module Tapyrus
       raise 'invalid key' if left >= CURVE_ORDER
       p1 = Tapyrus::Secp256k1::GROUP.generator.multiply_by_scalar(left)
       p2 = Tapyrus::Key.new(pubkey: pubkey, key_type: key_type).to_point
-      new_key.pubkey = ECDSA::Format::PointOctetString.encode(p1 + p2, compression: true).bth
+      new_key.pubkey = (p1 + p2).to_hex
       new_key.chain_code = l[32..-1]
       new_key.ver = version
       new_key
@@ -293,19 +304,32 @@ module Tapyrus
       buf = StringIO.new(payload)
       ext_pubkey = ExtPubkey.new
       ext_pubkey.ver = buf.read(4).bth # version
-      raise 'An unsupported version byte was specified.' unless ExtPubkey.support_version?(ext_pubkey.ver)
+      raise ArgumentError, Errors::Messages::INVALID_BIP32_VERSION unless ExtPubkey.support_version?(ext_pubkey.ver)
       ext_pubkey.depth = buf.read(1).unpack('C').first
       ext_pubkey.parent_fingerprint = buf.read(4).bth
       ext_pubkey.number = buf.read(4).unpack('N').first
+      if ext_pubkey.depth == 0
+        raise ArgumentError, Errors::Messages::INVALID_BIP32_FINGERPRINT unless ext_pubkey.parent_fingerprint == ExtKey::MASTER_FINGERPRINT
+        raise ArgumentError, Errors::Messages::INVALID_BIP32_ZERO_INDEX if ext_pubkey.number > 0
+      end
+      raise ArgumentError, Errors::Messages::INVALID_BIP32_ZERO_DEPTH if ext_pubkey.parent_fingerprint == ExtKey::MASTER_FINGERPRINT && ext_pubkey.depth > 0
       ext_pubkey.chain_code = buf.read(32)
-      ext_pubkey.pubkey = buf.read(33).bth
+      ext_pubkey.pubkey = Tapyrus::Key.new(pubkey: buf.read(33).bth).pubkey
       ext_pubkey
     end
 
-
     # import pub key from Base58 private key address
     def self.from_base58(address)
-      ExtPubkey.parse_from_payload(Base58.decode(address).htb)
+      ExtPubkey.parse_from_payload(ExtPubkey.validate_checksum(address))
+    end
+
+    # Validate address checksum and return payload.
+    # @param [String] BIP32 Base58 address
+    # @return [String] BIP32 payload with binary format
+    def self.validate_checksum(base58)
+      raw = Base58.decode(base58)
+      raise ArgumentError, Errors::Messages::INVALID_CHECKSUM unless Tapyrus.calc_checksum(raw[0...-8]) == raw[-8..-1]
+      raw[0...-8].htb
     end
 
     # get version bytes from purpose' value.

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]
@@ -223,10 +224,10 @@ module Tapyrus
     end
 
     # fully validate whether this is a valid public key (more expensive than IsValid())
-    def fully_valid_pubkey?
+    def fully_valid_pubkey?(allow_hybrid = false)
       return false unless valid_pubkey?
       begin
-        point = ECDSA::Format::PointOctetString.decode(pubkey.htb, ECDSA::Group::Secp256k1)
+        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

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/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/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,7 +24,7 @@ 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.

data/lib/tapyrus/store/chain_entry.rb

@@ -36,7 +36,7 @@ module Tapyrus
 
       # whether genesis block
       def genesis?
-        Tapyrus.chain_params.genesis_block.header == header
+        height == 0
       end
 
       # @param [String] payload a payload with binary format.
@@ -44,7 +44,7 @@ module Tapyrus
         buf = StringIO.new(payload)
         len = Tapyrus.unpack_var_int_from_io(buf)
         height = buf.read(len).reverse.bth.to_i(16)
-        new(Tapyrus::BlockHeader.parse_from_payload(buf.read(80)), height)
+        new(Tapyrus::BlockHeader.parse_from_payload(buf), height)
       end
 
       # build next block +StoredBlock+ instance.

data/lib/tapyrus/store/db/level_db.rb

@@ -58,14 +58,64 @@ module Tapyrus
           db.get(KEY_PREFIX[:entry] + hash)
         end
 
+        # Save entry.
+        # @param [Tapyrus::Store::ChainEntry]
         def save_entry(entry)
           db.batch do
             db.put(entry.key ,entry.to_payload)
             db.put(height_key(entry.height), entry.block_hash)
+            add_agg_pubkey(entry.height == 0 ? 0 : entry.height + 1, entry.header.x_field) if entry.header.upgrade_agg_pubkey?
             connect_entry(entry)
           end
         end
 
+        # Add aggregated public key.
+        # @param [Integer] activate_height
+        # @param [String] agg_pubkey aggregated public key with hex format.
+        def add_agg_pubkey(activate_height, agg_pubkey)
+          payload = activate_height.to_even_length_hex + agg_pubkey
+          index = latest_agg_pubkey_index
+          next_index = (index.nil? ? 0 : index + 1).to_even_length_hex
+          db.batch do
+            db.put(KEY_PREFIX[:agg_pubkey] + next_index, payload)
+            db.put(KEY_PREFIX[:latest_agg_pubkey], next_index)
+          end
+        end
+
+        # Get aggregated public key by specifying +index+.
+        # @param [Integer] index
+        # @return [Array] tupple of activate height and aggregated public key.
+        def agg_pubkey(index)
+          payload = db.get(KEY_PREFIX[:agg_pubkey] + index.to_even_length_hex)
+          [payload[0...(payload.length - 66)].to_i(16), payload[(payload.length - 66)..-1]]
+        end
+
+        # Get aggregated public key by specifying block +height+.
+        # @param [Integer] height block height.
+        # @return [String] aggregated public key with hex format.
+        def agg_pubkey_with_height(height)
+          index = latest_agg_pubkey_index
+          index ||= 0
+          (index + 1).times do |i|
+            target = index - i
+            active_height, pubkey = agg_pubkey(target)
+            return pubkey unless active_height > height
+          end
+        end
+
+        # Get latest aggregated public key.
+        # @return [Array] aggregated public key with hex format.
+        def latest_agg_pubkey
+          agg_pubkey(latest_agg_pubkey_index)[1]
+        end
+
+        # Get aggregated public key list.
+        # @return [Array[Array]] list of public key and index
+        def agg_pubkeys
+          index = latest_agg_pubkey_index
+          (index + 1).times.map { |i| agg_pubkey(i) }
+        end
+
         def close
           db.close
         end
@@ -91,6 +141,14 @@ module Tapyrus
           db.put(KEY_PREFIX[:best], entry.block_hash)
           db.put(KEY_PREFIX[:next] + entry.prev_hash, entry.block_hash)
         end
+
+        # Get latest aggregated public key index.
+        # @return [Integer] key index
+        def latest_agg_pubkey_index
+          index = db.get(KEY_PREFIX[:latest_agg_pubkey])
+          index&.to_i(16)
+        end
+
       end
 
     end

data/lib/tapyrus/store/spv_chain.rb

@@ -3,10 +3,12 @@ module Tapyrus
   module Store
 
     KEY_PREFIX = {
-        entry: 'e',   # key: block hash, value: Tapyrus::Store::ChainEntry payload
-        height: 'h',  # key: block height, value: block hash.
-        best: 'B',    # value: best block hash.
-        next: 'n'     # key: block hash, value: A hash of the next block of the specified hash
+        entry: 'e',             # key: block hash, value: Tapyrus::Store::ChainEntry payload
+        height: 'h',            # key: block height, value: block hash.
+        best: 'B',              # value: best block hash.
+        next: 'n',              # key: block hash, value: A hash of the next block of the specified hash
+        agg_pubkey: 'a',        # key: index, value: Activated block height | aggregated public key.
+        latest_agg_pubkey: 'g'  # value: latest agg pubkey index.
     }
 
     class SPVChain
@@ -14,10 +16,14 @@ module Tapyrus
       attr_reader :db
       attr_reader :logger
 
-      def initialize(db = Tapyrus::Store::DB::LevelDB.new)
+      # initialize spv chain
+      # @param[Tapyrus::Store::DB::LevelDB] db
+      # @param[Tapyrus::Block] genesis genesis block
+      def initialize(db = Tapyrus::Store::DB::LevelDB.new, genesis: nil)
+        raise ArgumentError, 'genesis block should be specified.' unless genesis
         @db = db # TODO multiple db switch
         @logger = Tapyrus::Logger.create(:debug)
-        initialize_block
+        initialize_block(genesis)
       end
 
       # get latest block in the store.
@@ -45,9 +51,9 @@ module Tapyrus
       # @return [Tapyrus::Store::ChainEntry] appended block header entry.
       def append_header(header)
         logger.info("append header #{header.block_id}")
-        raise "this header is invalid. #{header.block_hash}" unless header.valid?
         best_block = latest_block
         current_height = best_block.height
+        raise "this header is invalid. #{header.block_hash}" unless header.valid?(db.agg_pubkey_with_height(current_height + 1))
         if best_block.block_hash == header.prev_hash
           entry = Tapyrus::Store::ChainEntry.new(header, current_height + 1)
           db.save_entry(entry)
@@ -83,14 +89,26 @@ module Tapyrus
         time[time.size / 2]
       end
 
+      # Add aggregated public key.
+      # @param [Integer] active_height
+      # @param [String] agg_pubkey aggregated public key with hex format.
+      def add_agg_pubkey(active_height, agg_pubkey)
+        db.add_agg_pubkey(active_height, agg_pubkey)
+      end
+
+      # get aggregated public key keys.
+      # @return [Array[Array(height, agg_pubkey)]] the list of public keys.
+      def agg_pubkeys
+        db.agg_pubkeys
+      end
+
       private
 
       # if database is empty, put genesis block.
-      def initialize_block
+      # @param [Tapyrus::Block] genesis genesis block
+      def initialize_block(genesis)
         unless latest_block
-          block = Tapyrus.chain_params.genesis_block
-          genesis = ChainEntry.new(block.header, 0)
-          db.save_entry(genesis)
+          db.save_entry(ChainEntry.new(genesis.header, 0))
         end
       end
 

data/lib/tapyrus/version.rb

@@ -1,3 +1,3 @@
 module Tapyrus
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapyrus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -328,7 +328,9 @@ files:
 - lib/tapyrus/chainparams/dev.yml
 - lib/tapyrus/chainparams/prod.yml
 - lib/tapyrus/constants.rb
+- lib/tapyrus/errors.rb
 - lib/tapyrus/ext.rb
+- lib/tapyrus/ext/ecdsa.rb
 - lib/tapyrus/ext/json_parser.rb
 - lib/tapyrus/ext_key.rb
 - lib/tapyrus/key.rb