tapyrus 0.2.1 → 0.2.6

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.6"
 end

data/tapyrusrb.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["azuchi"]
   spec.email         = ["azuchi@chaintope.com"]
 
-  spec.summary       = %q{[WIP]The implementation of Tapyrus Protocol for Ruby.}
-  spec.description   = %q{[WIP]The implementation of Tapyrus Protocol for Ruby.}
+  spec.summary       = %q{The implementation of Tapyrus Protocol for Ruby.}
+  spec.description   = %q{The implementation of Tapyrus Protocol for Ruby.}
   spec.homepage      = 'https://github.com/chaintope/tapyrusrb'
   spec.license       = "MIT"
 
@@ -30,8 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'eventmachine_httpserver'
   spec.add_runtime_dependency 'iniparse'
   spec.add_runtime_dependency 'siphash'
-  spec.add_runtime_dependency 'protobuf', '3.8.5'
-  spec.add_runtime_dependency 'scrypt'
   spec.add_runtime_dependency 'activesupport', '>= 5.2.3'
   spec.add_runtime_dependency 'json_pure', '>= 2.3.1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tapyrus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - azuchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ecdsa
@@ -150,34 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.8.5
-- !ruby/object:Gem::Dependency
-  name: scrypt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +262,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: "[WIP]The implementation of Tapyrus Protocol for Ruby."
+description: The implementation of Tapyrus Protocol for Ruby.
 email:
 - azuchi@chaintope.com
 executables:
@@ -328,7 +300,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
@@ -447,8 +421,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: "[WIP]The implementation of Tapyrus Protocol for Ruby."
+summary: The implementation of Tapyrus Protocol for Ruby.
 test_files: []