zold 0.13.34 → 0.13.35

data/lib/zold/commands/routines/bonuses.rb

@@ -51,10 +51,13 @@ module Zold
           (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
         )
         return if winners.empty?
-        winners.each do |score|
+        unless @wallets.find(Id.new(@opts['bonus-wallet'])).exists?
           Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
-            ['pull', @opts['bonus-wallet']]
+            ['pull', @opts['bonus-wallet']] +
+            (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
           )
+        end
+        winners.each do |score|
           Pay.new(wallets: @wallets, remotes: @remotes, log: @log).run(
             [
               'pay', @opts['bonus-wallet'], score.invoice, @opts['bonus-amount'].to_s,
@@ -62,10 +65,11 @@ module Zold
               '--private-key', @opts['private-key']
             ]
           )
-          Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
-            ['push', @opts['bonus-wallet']]
-          )
         end
+        Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+          ['push', @opts['bonus-wallet']] +
+          (@opts['ignore-score-weakness'] ? ['--ignore-score-weakness'] : [])
+        )
       end
     end
   end

data/lib/zold/commands/routines/spread.rb

@@ -41,7 +41,10 @@ module Zold
 
       def exec(_ = 0)
         sleep(60) unless @opts['routine-immediately']
-        @entrance.spread(@wallets.all.sample(10).map { |w| Id.new(w) })
+        @wallets.all.sample(10).map do |w|
+          id = Id.new(w)
+          @entrance.push(id, File.read(@wallets.find(id).path))
+        end
       end
     end
   end

data/lib/zold/commands/show.rb

@@ -50,8 +50,8 @@ Available options:"
         List.new(wallets: @wallets, log: @log).run(args)
       else
         total = Amount::ZERO
-        mine.each do |id|
-          total += show(@wallets.find(Id.new(id)), opts)
+        mine.map { |i| Id.new(i) }.each do |id|
+          total += show(@wallets.find(id), opts)
         end
         total
       end

data/lib/zold/commands/taxes.rb

@@ -24,6 +24,7 @@ require 'rainbow'
 require_relative 'args'
 require_relative 'pay'
 require_relative '../log'
+require_relative '../json_page'
 require_relative '../score'
 require_relative '../id'
 require_relative '../tax'
@@ -120,7 +121,7 @@ Available options:"
       @remotes.iterate(@log) do |r|
         res = r.http.get
         r.assert_code(200, res)
-        json = JSON.parse(res.body)
+        json = JsonPage.new(res.body).to_hash
         score = Score.parse_json(json['score'])
         r.assert_valid_score(score)
         r.assert_score_strength(score)

data/lib/zold/http.rb

@@ -42,11 +42,18 @@ module Zold
     # reboot itself, if the version is higher.
     VERSION_HEADER = 'X-Zold-Version'.freeze
 
-    def initialize(uri, score = Score::ZERO)
+    # HTTP header we add, in order to inform the node about our
+    # network. This is done in order to isolate test networks from
+    # production one.
+    NETWORK_HEADER = 'X-Zold-Network'.freeze
+
+    def initialize(uri, score = Score::ZERO, network: 'test')
       raise 'URI can\'t be nil' if uri.nil?
       @uri = uri.is_a?(String) ? URI(uri) : uri
       raise 'Score can\'t be nil' if score.nil?
       @score = score
+      raise 'Network can\'t be nil' if network.nil?
+      @network = network
     end
 
     def get
@@ -105,6 +112,7 @@ module Zold
         'Accept-Encoding': 'gzip'
       }
       headers[Http::VERSION_HEADER] = VERSION
+      headers[Http::NETWORK_HEADER] = @network
       headers[Http::SCORE_HEADER] = @score.reduced(4).to_text if @score.valid? && !@score.expired? && @score.value > 3
       headers
     end

data/lib/zold/id.rb

@@ -51,6 +51,10 @@ module Zold
       to_s == other.to_s
     end
 
+    def to_str
+      to_s
+    end
+
     def to_s
       format('%016x', @id)
     end

data/lib/zold/json_page.rb

@@ -0,0 +1,43 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'json'
+
+# JSON page.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # JSON page
+  class JsonPage
+    def initialize(text)
+      raise 'JSON text can\'t be nil' if text.nil?
+      raise 'JSON must be of type String' unless text.is_a?(String)
+      @text = text
+    end
+
+    def to_hash
+      raise 'JSON is empty, can\'t parse' if @text.empty?
+      JSON.parse(@text)
+    rescue JSON::ParserError => e
+      raise "Failed to parse JSON (#{e.message}): #{@text}"
+    end
+  end
+end

data/lib/zold/metronome.rb

@@ -48,11 +48,12 @@ module Zold
     end
 
     def start
+      alive = true
       @routines.each do |r|
         @threads << Thread.start do
           Thread.current.name = r.class.name
           step = 0
-          loop do
+          while alive
             start = Time.now
             begin
               r.exec(step)
@@ -69,21 +70,20 @@ module Zold
       begin
         yield(self)
       ensure
-        stop
-      end
-    end
-
-    private
-
-    def stop
-      @log.info("Terminating the metronome with #{@threads.count} threads...")
-      start = Time.now
-      @threads.each do |t|
-        tstart = Time.now
-        t.exit
-        @log.info("Thread #{t.name} terminated in #{(Time.now - tstart).round(2)}s")
+        alive = false
+        @log.info("Stopping the metronome with #{@threads.count} threads: #{@threads.map(&:name).join(', ')}")
+        start = Time.now
+        @threads.each do |t|
+          tstart = Time.now
+          if t.join(60)
+            @log.info("Thread #{t.name} finished in #{(Time.now - tstart).round(2)}s")
+          else
+            t.exit
+            @log.info("Thread #{t.name} killed in #{(Time.now - tstart).round(2)}s")
+          end
+        end
+        @log.info("Metronome stopped in #{(Time.now - start).round(2)}s, #{@failures.count} failures")
       end
-      @log.info("Metronome stopped in #{(Time.now - start).round(2)}s, #{@failures.count} failures")
     end
   end
 end

data/lib/zold/node/async_entrance.rb

@@ -0,0 +1,81 @@
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'concurrent'
+require_relative '../log'
+require_relative '../verbose_thread'
+
+# The async entrance of the web front.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The entrance
+  class AsyncEntrance
+    def initialize(entrance, log: Log::Quiet.new)
+      raise 'Entrance can\'t be nil' if entrance.nil?
+      @entrance = entrance
+      raise 'Log can\'t be nil' if log.nil?
+      @log = log
+    end
+
+    def start
+      @entrance.start do
+        @pool = Concurrent::FixedThreadPool.new(
+          Concurrent.processor_count,
+          max_queue: Concurrent.processor_count * 10,
+          fallback_policy: :abort
+        )
+        begin
+          yield(self)
+        ensure
+          @log.info("Stopping async entrance, pool length is #{@pool.length}, queue length is #{@pool.queue_length}")
+          @pool.shutdown
+          if @pool.wait_for_termination(10)
+            @log.info('Async entrance terminated peacefully')
+          else
+            @pool.kill
+            @log.info('Async entrance was killed')
+          end
+        end
+      end
+    end
+
+    def to_json
+      @entrance.to_json.merge(
+        'pool.completed_task_count': @pool.completed_task_count,
+        'pool.largest_length': @pool.largest_length,
+        'pool.length': @pool.length,
+        'pool.queue_length': @pool.queue_length,
+        'pool.running': @pool.running?
+      )
+    end
+
+    def push(id, body)
+      @pool.post do
+        VerboseThread.new(@log).run(true) do
+          @entrance.push(id, body)
+        end
+      end
+      @log.debug("Pushed #{id}/#{body.length}b to #{@entrance.class.name}, \
+pool: #{@pool.length}/#{@pool.queue_length}")
+    end
+  end
+end

data/lib/zold/node/entrance.rb

@@ -18,17 +18,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'concurrent'
 require 'tempfile'
-require_relative 'emission'
 require_relative '../log'
 require_relative '../remotes'
 require_relative '../copies'
 require_relative '../tax'
+require_relative '../commands/clean'
 require_relative '../commands/merge'
 require_relative '../commands/fetch'
 require_relative '../commands/push'
-require_relative '../commands/clean'
 
 # The entrance of the web front.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -38,115 +36,52 @@ module Zold
   # The entrance
   class Entrance
     def initialize(wallets, remotes, copies, address, log: Log::Quiet.new)
+      raise 'Wallets can\'t be nil' if wallets.nil?
+      raise 'Wallets must be of type Wallets' unless wallets.is_a?(Wallets)
       @wallets = wallets
+      raise 'Remotes can\'t be nil' if remotes.nil?
+      raise "Remotes must be of type Remotes: #{remotes.class.name}" unless remotes.is_a?(Remotes)
       @remotes = remotes
+      raise 'Copies can\'t be nil' if copies.nil?
       @copies = copies
+      raise 'Address can\'t be nil' if address.nil?
       @address = address
+      raise 'Log can\'t be nil' if log.nil?
       @log = log
-      @semaphores = Concurrent::Map.new
-      @push_mutex = Mutex.new
-      @modified = Set.new
-      @pool = Concurrent::FixedThreadPool.new(16, max_queue: 64, fallback_policy: :abort)
-      @pushes = Concurrent::FixedThreadPool.new(1, max_queue: 64, fallback_policy: :abort)
-    end
-
-    def to_json
-      {
-        'semaphores': @semaphores.size,
-        'modified': @modified.length,
-        'pool': {
-          'completed_task_count': @pool.completed_task_count,
-          'largest_length': @pool.largest_length,
-          'length': @pool.length,
-          'queue_length': @pool.queue_length
-        },
-        'pushes': {
-          'completed_task_count': @pushes.completed_task_count,
-          'largest_length': @pushes.largest_length,
-          'length': @pushes.length,
-          'queue_length': @pushes.queue_length
-        }
-      }
-    end
-
-    def push(id, body, sync: true)
-      check(body)
-      if sync
-        push_sync(id, body)
-      else
-        @pool.post do
-          push_sync(id, body)
-        end
-      end
-    end
-
-    def check(body)
-      Tempfile.open do |f|
-        File.write(f.path, body)
-        wallet = Wallet.new(f)
-        break unless wallet.network == Wallet::MAIN_NETWORK
-        balance = wallet.balance
-        if balance.negative? && !wallet.root?
-          raise "The balance #{balance} of #{wallet.id} is negative and it's not a root wallet"
-        end
-        Emission.new(wallet).check
-        tax = Tax.new(wallet)
-        if tax.in_debt?
-          raise "Taxes are not paid, can't accept the wallet; the debt is #{tax.debt} (#{tax.debt.to_i} zents)"
-        end
-      end
     end
 
-    def spread(ids)
-      return if ids.empty?
-      @push_mutex.synchronize { @modified += ids }
-      @pushes.post { push_one } if @pushes.length < 2
+    def start
+      yield(self)
     end
 
-    private
-
-    # Returns a list of modifed wallets (as Zold::Id)
-    def push_sync(id, body)
-      @semaphores.put_if_absent(id.to_s, Mutex.new)
-      @semaphores.get(id.to_s).synchronize do
-        start = Time.now
-        modified = push_unsafe(id, body)
-        if modified.empty?
-          @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s \
-and modified nothing (this is most likely a bug!)")
-        else
-          @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s and modified #{modified.join(', ')}")
-        end
-        modified
-      end
+    def to_json
+      {}
     end
 
     # Returns a list of modifed wallets (as Zold::Id)
-    def push_unsafe(id, body)
+    def push(id, body)
+      raise 'Id can\'t be nil' if id.nil?
+      raise 'Id must be of type Id' unless id.is_a?(Id)
+      raise 'Body can\'t be nil' if body.nil?
+      start = Time.now
       copies = Copies.new(File.join(@copies, id.to_s))
       localhost = '0.0.0.0'
       copies.add(body, localhost, Remotes::PORT, 0)
-      Fetch.new(
-        wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
-      ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
+      unless @remotes.all.empty?
+        Fetch.new(
+          wallets: @wallets, remotes: @remotes, copies: copies.root, log: @log
+        ).run(['fetch', id.to_s, "--ignore-node=#{@address}"])
+      end
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log
       ).run(['merge', id.to_s, '--no-baseline'])
       Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove(localhost, Remotes::PORT)
-      spread(modified)
-      modified
-    end
-
-    def push_one
-      @push_mutex.synchronize do
-        id = @modified.to_a[0]
-        @modified.delete(id)
-        return if id.nil?
-        Push.new(
-          wallets: @wallets, remotes: @remotes, log: @log
-        ).run(['push', "--ignore-node=#{@address}"] + [id.to_s])
+      unless modified.empty?
+        @log.info("Accepted #{id} in #{(Time.now - start).round(2)}s \
+and modified #{modified.join(', ')}")
       end
+      modified
     end
   end
 end